Merging upstream version 1.11.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
author: Daniel Baumann <daniel.baumann@progress-linux.org> 2024-04-14 13:17:48 +0000
committer: Daniel Baumann <daniel.baumann@progress-linux.org> 2024-04-14 13:17:48 +0000
commit: e6d4dfc040bbe3cb80a2ce65b82493b557f751fc (patch)
tree: 40bd6366b01b06f4d96fc8638f23a772263cb5e9 /application
parent: Releasing progress-linux version 1.10.2-2~progress7.99u1. (diff)
download: icingaweb2-module-director-e6d4dfc040bbe3cb80a2ce65b82493b557f751fc.tar.xz
icingaweb2-module-director-e6d4dfc040bbe3cb80a2ce65b82493b557f751fc.zip
36 files changed, 2755 insertions, 2470 deletions
diff --git a/application/clicommands/KickstartCommand.php b/application/clicommands/KickstartCommand.php
index 80aa183..79093e3 100644
--- a/application/clicommands/KickstartCommand.php
+++ b/application/clicommands/KickstartCommand.php
@@ -29,8 +29,9 @@ class KickstartCommand extends Command
      *        require => Exec['Icinga Director DB migration'],
      *     }
      *
-     * Exit code 0 means that a kickstart run is required, code 2 that it is
-     * not.
+     * Exit code 0: A kickstart run is required.
+     * Exit code 1: Kickstart is configured but a run is not required.
+     * Exit code 2: A kickstart run is not required.
      */
     public function requiredAction()
     {
diff --git a/application/controllers/BasketController.php b/application/controllers/BasketController.php
index 8733d16..8d4db03 100644
--- a/application/controllers/BasketController.php
+++ b/application/controllers/BasketController.php
@@ -9,13 +9,10 @@ use gipfl\IcingaWeb2\Link;
 use gipfl\Web\Table\NameValueTable;
 use gipfl\Web\Widget\Hint;
 use Icinga\Date\DateFormatter;
-use Icinga\Module\Director\Core\Json;
-use Icinga\Module\Director\Data\Exporter;
 use Icinga\Module\Director\Db;
 use Icinga\Module\Director\DirectorObject\Automation\Basket;
+use Icinga\Module\Director\DirectorObject\Automation\BasketDiff;
 use Icinga\Module\Director\DirectorObject\Automation\BasketSnapshot;
-use Icinga\Module\Director\DirectorObject\Automation\BasketSnapshotFieldResolver;
-use Icinga\Module\Director\DirectorObject\Automation\CompareBasketObject;
 use Icinga\Module\Director\Forms\AddToBasketForm;
 use Icinga\Module\Director\Forms\BasketCreateSnapshotForm;
 use Icinga\Module\Director\Forms\BasketForm;
@@ -24,6 +21,7 @@ use Icinga\Module\Director\Forms\RestoreBasketForm;
 use Icinga\Module\Director\Web\Controller\ActionController;
 use ipl\Html\Html;
 use Icinga\Module\Director\Web\Table\BasketSnapshotTable;
+use Ramsey\Uuid\Uuid;
 
 class BasketController extends ActionController
 {
@@ -127,6 +125,26 @@ class BasketController extends ActionController
         $this->content()->add($form);
     }
 
+    public function uploadSnapshotAction()
+    {
+        $basket = Basket::load($this->params->get('name'), $this->db());
+        $this->actions()->add(
+            Link::create(
+                $this->translate('back'),
+                'director/basket/snapshots',
+                ['name' => $basket->get('basket_name')],
+                ['class' => 'icon-left-big']
+            )
+        );
+        $this->basketTabs()->activate('snapshots');
+        $this->addTitle($this->translate('Upload a Configuration Basket Snapshot'));
+        $form = (new BasketUploadForm())
+            ->setObject($basket)
+            ->setDb($this->db())
+            ->handleRequest();
+        $this->content()->add($form);
+    }
+
     /**
      * @throws \Icinga\Exception\NotFoundError
      */
@@ -147,6 +165,12 @@ class BasketController extends ActionController
                 $basket->get('basket_name')
             ));
             $this->basketTabs()->activate('snapshots');
+            $this->actions()->add(Link::create(
+                $this->translate('Upload'),
+                'director/basket/upload-snapshot',
+                ['name' => $basket->get('basket_name')],
+                ['class' => 'icon-upload']
+            ));
         }
         if ($basket !== null) {
             $this->content()->add(
@@ -245,12 +269,9 @@ class BasketController extends ActionController
             $connection = $this->db();
         }
 
-        $json = $snapshot->getJsonDump();
         $this->addSingleTab($this->translate('Snapshot'));
-        $all = Json::decode($json);
-        $exporter = new Exporter($this->db());
-        $fieldResolver = new BasketSnapshotFieldResolver($all, $connection);
-        foreach ($all as $type => $objects) {
+        $diff = new BasketDiff($snapshot, $connection);
+        foreach ($diff->getBasketObjects() as $type => $objects) {
             if ($type === 'Datafield') {
                 // TODO: we should now be able to show all fields and link
                 //       to a "diff" for the ones that should be created
@@ -274,39 +295,33 @@ class BasketController extends ActionController
                     $linkParams['target_db'] = $targetDbName;
                 }
                 try {
-                    $current = BasketSnapshot::instanceByIdentifier($type, $key, $connection);
-                    if ($current === null) {
-                        $table->addNameValueRow(
-                            $key,
-                            Link::create(
-                                Html::tag('strong', ['style' => 'color: green'], $this->translate('new')),
+                    if ($uuid = $object->uuid ?? null) {
+                        $uuid = Uuid::fromString($uuid);
+                    }
+                    if ($diff->hasCurrentInstance($type, $key, $uuid)) {
+                        if ($diff->hasChangedFor($type, $key, $uuid)) {
+                            $link = Link::create(
+                                $this->translate('modified'),
                                 'director/basket/snapshotobject',
-                                $linkParams
-                            )
+                                $linkParams,
+                                ['class' => 'basket-modified']
+                            );
+                        } else {
+                            $link = Html::tag(
+                                'span',
+                                ['class' => 'basket-unchanged'],
+                                $this->translate('unchanged')
+                            );
+                        }
+                    } else {
+                        $link = Link::create(
+                            $this->translate('new'),
+                            'director/basket/snapshotobject',
+                            $linkParams,
+                            ['class' => 'basket-new']
                         );
-                        continue;
-                    }
-                    $currentExport = $exporter->export($current);
-                    $fieldResolver->tweakTargetIds($currentExport);
-
-                    // Ignore originalId
-                    if (isset($currentExport->originalId)) {
-                        unset($currentExport->originalId);
-                    }
-                    if (isset($object->originalId)) {
-                        unset($object->originalId);
                     }
-                    $hasChanged = ! CompareBasketObject::equals($currentExport, $object);
-                    $table->addNameValueRow(
-                        $key,
-                        $hasChanged
-                        ? Link::create(
-                            Html::tag('strong', ['style' => 'color: orange'], $this->translate('modified')),
-                            'director/basket/snapshotobject',
-                            $linkParams
-                        )
-                        : Html::tag('span', ['style' => 'color: green'], $this->translate('unchanged'))
-                    );
+                    $table->addNameValueRow($key, $link);
                 } catch (Exception $e) {
                     $table->addNameValueRow(
                         $key,
@@ -322,7 +337,6 @@ class BasketController extends ActionController
             $this->content()->add(Html::tag('h2', $type));
             $this->content()->add($table);
         }
-        $this->content()->add(Html::tag('div', ['style' => 'height: 5em']));
     }
 
     /**
@@ -368,39 +382,28 @@ class BasketController extends ActionController
             )
             */
         ]);
-        $exporter = new Exporter($this->db());
-        $json = $snapshot->getJsonDump();
+
         $this->addSingleTab($this->translate('Snapshot'));
-        $objects = Json::decode($json);
         $targetDbName = $this->params->get('target_db');
         if ($targetDbName === null) {
             $connection = $this->db();
         } else {
             $connection = Db::fromResourceName($targetDbName);
         }
-        $fieldResolver = new BasketSnapshotFieldResolver($objects, $connection);
-        $objectFromBasket = $objects->$type->$key;
-        unset($objectFromBasket->originalId);
-        CompareBasketObject::normalize($objectFromBasket);
-        $objectFromBasket = Json::encode($objectFromBasket, JSON_PRETTY_PRINT);
-        $current = BasketSnapshot::instanceByIdentifier($type, $key, $connection);
-        if ($current === null) {
-            $current = '';
-        } else {
-            $exported = $exporter->export($current);
-            $fieldResolver->tweakTargetIds($exported);
-            unset($exported->originalId);
-            CompareBasketObject::normalize($exported);
-            $current = Json::encode($exported, JSON_PRETTY_PRINT);
+        $diff = new BasketDiff($snapshot, $connection);
+        $object = $diff->getBasketObject($type, $key);
+        if ($uuid = $object->uuid ?? null) {
+            $uuid = Uuid::fromString($uuid);
         }
-
-        if ($current === $objectFromBasket) {
+        $basketJson = $diff->getBasketString($type, $key);
+        $currentJson = $diff->getCurrentString($type, $key, $uuid);
+        if ($currentJson === $basketJson) {
             $this->content()->add([
                 Hint::ok('Basket equals current object'),
-                Html::tag('pre', $current)
+                Html::tag('pre', $currentJson)
             ]);
         } else {
-            $this->content()->add(new InlineDiff(new PhpDiff($current, $objectFromBasket)));
+            $this->content()->add(new InlineDiff(new PhpDiff($currentJson, $basketJson)));
         }
     }
 
diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index 3f8a105..8a5e702 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -8,6 +8,7 @@ use gipfl\Web\Widget\Hint;
 use Icinga\Data\Filter\Filter;
 use Icinga\Exception\IcingaException;
 use Icinga\Exception\NotFoundError;
+use Icinga\Module\Director\Auth\Permission;
 use Icinga\Module\Director\Db\Branch\Branch;
 use Icinga\Module\Director\Deployment\DeploymentStatus;
 use Icinga\Module\Director\Forms\DeployConfigForm;
@@ -186,7 +187,7 @@ class ConfigController extends ActionController
                 ['class' => 'icon-user', 'data-base-target' => '_self']
             ));
         }
-        if ($this->hasPermission('director/deploy') && ! $this->getBranch()->isBranch()) {
+        if ($this->hasPermission(Permission::DEPLOY) && ! $this->getBranch()->isBranch()) {
             if ($this->db()->hasDeploymentEndpoint()) {
                 $this->actions()->add(DeployConfigForm::load()
                     ->setDb($this->db())
@@ -369,31 +370,33 @@ class ConfigController extends ActionController
 
         $configs = $db->enumDeployedConfigs();
         foreach (array($leftSum, $rightSum) as $sum) {
-            if (! array_key_exists($sum, $configs)) {
+            if ($sum && ! array_key_exists($sum, $configs)) {
                 $configs[$sum] = substr($sum, 0, 7);
             }
         }
 
         $baseUrl = $this->url()->without(['left', 'right']);
-        $this->content()->add(Html::tag('form', ['action' => (string) $baseUrl, 'method' => 'GET'], [
-            new HtmlString($this->view->formSelect(
-                'left',
-                $leftSum,
-                ['class' => 'autosubmit', 'style' => 'width: 37%'],
-                [null => $this->translate('- please choose -')] + $configs
-            )),
-            Link::create(
-                Icon::create('flapping'),
-                $baseUrl,
-                ['left' => $rightSum, 'right' => $leftSum]
-            ),
-            new HtmlString($this->view->formSelect(
-                'right',
-                $rightSum,
-                ['class' => 'autosubmit', 'style' => 'width: 37%'],
-                [null => $this->translate('- please choose -')] + $configs
-            )),
-        ]));
+        $this->content()->add(
+            Html::tag('form', ['action' => (string) $baseUrl, 'method' => 'GET', 'class' => 'director-form'], [
+                new HtmlString($this->view->formSelect(
+                    'left',
+                    $leftSum,
+                    ['class' => ['autosubmit', 'config-diff']],
+                    [null => $this->translate('- please choose -')] + $configs
+                )),
+                Link::create(
+                    Icon::create('flapping'),
+                    $baseUrl,
+                    ['left' => $rightSum, 'right' => $leftSum]
+                ),
+                new HtmlString($this->view->formSelect(
+                    'right',
+                    $rightSum,
+                    ['class' => ['autosubmit', 'config-diff']],
+                    [null => $this->translate('- please choose -')] + $configs
+                )),
+            ])
+        );
 
         if ($rightSum === null || $leftSum === null || ! strlen($rightSum) || ! strlen($leftSum)) {
             return;
@@ -500,7 +503,7 @@ class ConfigController extends ActionController
     {
         $tabs = $this->tabs();
 
-        if ($this->hasPermission('director/deploy')
+        if ($this->hasPermission(Permission::DEPLOY)
             && $deploymentId = $this->params->get('deployment_id')
         ) {
             $tabs->add('deployment', [
@@ -510,7 +513,7 @@ class ConfigController extends ActionController
             ]);
         }
 
-        if ($this->hasPermission('director/showconfig')) {
+        if ($this->hasPermission(Permission::SHOW_CONFIG)) {
             $tabs->add('config', [
                 'label'     => $this->translate('Config'),
                 'url'       => 'director/config/files',
diff --git a/application/controllers/DataController.php b/application/controllers/DataController.php
index ae4bbcf..7480db2 100644
--- a/application/controllers/DataController.php
+++ b/application/controllers/DataController.php
@@ -216,7 +216,7 @@ class DataController extends ActionController
             $subTitle = $this->translate('Add a new instance');
         }
 
-        $this->content()->add(Html::tag('h2', ['style' => 'margin-top: 2em'], $subTitle));
+        $this->content()->add(Html::tag('h2', ['class' => 'dictionary-header'], $subTitle));
         $form->handleRequest($this->getRequest());
         $this->content()->add($form);
         if ($form->succeeded()) {
@@ -326,7 +326,7 @@ class DataController extends ActionController
             Table::row([
                 $this->translate('Key / Instance'),
                 $this->translate('Properties')
-            ], ['style' => 'text-align: left'], 'th')
+            ], ['class' => 'text-align-left'], 'th')
         );
         foreach ($currentValue as $key => $item) {
             $table->add(Table::row([
diff --git a/application/controllers/HostController.php b/application/controllers/HostController.php
index e107d22..33b5ba5 100644
--- a/application/controllers/HostController.php
+++ b/application/controllers/HostController.php
@@ -3,7 +3,9 @@
 namespace Icinga\Module\Director\Controllers;
 
 use gipfl\Web\Widget\Hint;
-use Icinga\Module\Director\Monitoring;
+use Icinga\Module\Director\Auth\Permission;
+use Icinga\Module\Director\Integration\Icingadb\IcingadbBackend;
+use Icinga\Module\Director\Integration\MonitoringModule\Monitoring;
 use Icinga\Module\Director\Web\Table\ObjectsTableService;
 use ipl\Html\Html;
 use gipfl\IcingaWeb2\Link;
@@ -31,28 +33,24 @@ class HostController extends ObjectController
 {
     protected function checkDirectorPermissions()
     {
-        if ($this->isServiceAction() && (new Monitoring())->authCanEditService(
-            $this->Auth(),
-            $this->getParam('name'),
-            $this->getParam('service')
-        )) {
+        $host = $this->getHostObject();
+        $auth = $this->Auth();
+        $backend = $this->backend();
+        if ($this->isServiceAction()
+            && $backend->canModifyService($host->getObjectName(), $this->getParam('service'))
+        ) {
             return;
         }
-
-        if ($this->isServicesReadOnlyAction()) {
-            $this->assertPermission('director/monitoring/services-ro');
+        if ($this->isServicesReadOnlyAction() && $auth->hasPermission($this->getServicesReadOnlyPermission())) {
             return;
         }
-
-        if ($this->hasPermission('director/hosts')) { // faster
+        if ($auth->hasPermission(Permission::HOSTS)) { // faster
             return;
         }
-
-        if ($this->canModifyHostViaMonitoringPermissions($this->getParam('name'))) {
+        if ($backend->canModifyHost($host->getObjectName())) {
             return;
         }
-
-        $this->assertPermission('director/hosts'); // complain about default hosts permission
+        $this->assertPermission(Permission::HOSTS); // complain about default hosts permission
     }
 
     protected function isServicesReadOnlyAction()
@@ -76,16 +74,6 @@ class HostController extends ObjectController
         ]);
     }
 
-    protected function canModifyHostViaMonitoringPermissions($hostname)
-    {
-        if ($this->hasPermission('director/monitoring/hosts')) {
-            $monitoring = new Monitoring();
-            return $monitoring->authCanEditHost($this->Auth(), $hostname);
-        }
-
-        return false;
-    }
-
     /**
      * @return HostgroupRestriction
      */
@@ -150,11 +138,35 @@ class HostController extends ObjectController
 
     public function findserviceAction()
     {
+        $auth = $this->Auth();
         $host = $this->getHostObject();
-        $this->redirectNow(
-            (new ServiceFinder($host, $this->getAuth()))
-                ->getRedirectionUrl($this->params->get('service'))
-        );
+        $hostName = $host->getObjectName();
+        $serviceName = $this->params->get('service');
+        $info = ServiceFinder::find($host, $serviceName);
+        $backend = $this->backend();
+
+        if ($info && $auth->hasPermission(Permission::HOSTS)) {
+            $redirectUrl = $info->getUrl();
+        } elseif ($info
+            && (($backend instanceof Monitoring && $auth->hasPermission(Permission::MONITORING_HOSTS))
+                || ($backend instanceof IcingadbBackend && $auth->hasPermission(Permission::ICINGADB_HOSTS))
+            )
+            && $backend->canModifyService($hostName, $serviceName)
+        ) {
+            $redirectUrl = $info->getUrl();
+        } elseif ($auth->hasPermission($this->getServicesReadOnlyPermission())) {
+            $redirectUrl = Url::fromPath('director/host/servicesro', [
+                'name'    => $hostName,
+                'service' => $serviceName
+            ]);
+        } else {
+            $redirectUrl = Url::fromPath('director/host/invalidservice', [
+                'name'    => $hostName,
+                'service' => $serviceName,
+            ]);
+        }
+
+        $this->redirectNow($redirectUrl);
     }
 
     /**
@@ -207,8 +219,7 @@ class HostController extends ObjectController
         $branch = $this->getBranch();
         $hostHasBeenCreatedInBranch = $branch->isBranch() && $host->get('id');
         $content = $this->content();
-        $table = (new ObjectsTableService($this->db()))
-            ->setAuth($this->Auth())
+        $table = (new ObjectsTableService($this->db(), $this->Auth()))
             ->setHost($host)
             ->setBranch($branch)
             ->setTitle($this->translate('Individual Service objects'))
@@ -222,8 +233,7 @@ class HostController extends ObjectController
         $parents = IcingaTemplateRepository::instanceByObject($this->object)
             ->getTemplatesFor($this->object, true);
         foreach ($parents as $parent) {
-            $table = (new ObjectsTableService($this->db()))
-                ->setAuth($this->Auth())
+            $table = (new ObjectsTableService($this->db(), $this->Auth()))
                 ->setBranch($branch)
                 ->setHost($parent)
                 ->setInheritedBy($host)
@@ -279,7 +289,7 @@ class HostController extends ObjectController
      */
     public function servicesroAction()
     {
-        $this->assertPermission('director/monitoring/services-ro');
+        $this->assertPermission($this->getServicesReadOnlyPermission());
         $host = $this->getHostObject();
         $service = $this->params->getRequired('service');
         $db = $this->db();
@@ -289,8 +299,7 @@ class HostController extends ObjectController
         $this->addTitle($this->translate('Services on %s'), $host->getObjectName());
         $content = $this->content();
 
-        $table = (new ObjectsTableService($db))
-            ->setAuth($this->Auth())
+        $table = (new ObjectsTableService($db, $this->Auth()))
             ->setHost($host)
             ->setBranch($branch)
             ->setReadonly()
@@ -305,7 +314,7 @@ class HostController extends ObjectController
         $parents = IcingaTemplateRepository::instanceByObject($this->object)
             ->getTemplatesFor($this->object, true);
         foreach ($parents as $parent) {
-            $table = (new ObjectsTableService($db))
+            $table = (new ObjectsTableService($db, $this->Auth()))
                 ->setReadonly()
                 ->setBranch($branch)
                 ->setHost($parent)
@@ -387,6 +396,7 @@ class HostController extends ObjectController
                 ->setHost($host)
                 ->setBranch($this->getBranch())
                 ->setAffectedHost($affectedHost)
+                ->removeQueryLimit()
                 ->setTitle($title);
             if ($roService) {
                 $table->setReadonly()->highlightService($roService);
@@ -582,20 +592,19 @@ class HostController extends ObjectController
     {
         $host = $this->object;
         try {
-            $mon = $this->monitoring();
-            if ($host->isObject()
-                && $mon->isAvailable()
-                && $mon->hasHost($host->getObjectName())
+            $backend = $this->backend();
+            if ($host instanceof IcingaHost
+                && $host->isObject()
+                && $backend->hasHost($host->getObjectName())
             ) {
-                $this->actions()->add(Link::create(
-                    $this->translate('Show'),
-                    'monitoring/host/show',
-                    ['host' => $host->getObjectName()],
-                    [
-                        'class'            => 'icon-globe critical',
-                        'data-base-target' => '_next'
-                    ]
-                ));
+                $this->actions()->add(
+                    Link::create(
+                        $this->translate('Show'),
+                        $backend->getHostUrl($host->getObjectName()),
+                        null,
+                        ['class' => 'icon-globe critical', 'data-base-target' => '_next']
+                    )
+                );
 
                 // Intentionally placed here, show it only for deployed Hosts
                 $this->addOptionalInspectLink();
@@ -607,7 +616,7 @@ class HostController extends ObjectController
 
     protected function addOptionalInspectLink()
     {
-        if (! $this->hasPermission('director/inspect')) {
+        if (! $this->hasPermission(Permission::INSPECT)) {
             return;
         }
 
@@ -627,11 +636,25 @@ class HostController extends ObjectController
     }
 
     /**
-     * @return IcingaHost
+     * @return ?IcingaHost
      */
     protected function getHostObject()
     {
-        assert($this->object instanceof IcingaHost);
+        if ($this->object !== null) {
+            assert($this->object instanceof IcingaHost);
+        }
         return $this->object;
     }
+
+    /**
+     * Get readOnly permission of the service for the current backend
+     *
+     * @return string permission
+     */
+    protected function getServicesReadOnlyPermission(): string
+    {
+        return $this->backend() instanceof IcingadbBackend
+            ? Permission::ICINGADB_SERVICES_RO
+            : Permission::MONITORING_SERVICES_RO;
+    }
 }
diff --git a/application/controllers/ImportsourceController.php b/application/controllers/ImportsourceController.php
index cbddb9e..f417bf7 100644
--- a/application/controllers/ImportsourceController.php
+++ b/application/controllers/ImportsourceController.php
@@ -180,9 +180,7 @@ class ImportsourceController extends ActionController
                 'target' => '_blank',
                 'class'  => 'icon-download',
             ]
-        ))->add(Link::create('[..]', '#', null, [
-            'onclick' => 'javascript:$("table.raw-data-table").toggleClass("collapsed");'
-        ]));
+        ));
         try {
             (new ImportsourceHookTable())->setImportSource($source)->renderTo($this);
         } catch (Exception $e) {
diff --git a/application/controllers/ImportsourcesController.php b/application/controllers/ImportsourcesController.php
index 4287292..f0021c5 100644
--- a/application/controllers/ImportsourcesController.php
+++ b/application/controllers/ImportsourcesController.php
@@ -30,7 +30,7 @@ class ImportsourcesController extends ActionController
         }
 
         $this->addTitle($this->translate('Import source'))
-            ->setAutoRefreshInterval(10)
+            ->setAutorefreshInterval(10)
             ->addAddLink(
                 $this->translate('Add a new Import Source'),
                 'director/importsource/add'
diff --git a/application/controllers/JobsController.php b/application/controllers/JobsController.php
index 11e86ed..04c6d34 100644
--- a/application/controllers/JobsController.php
+++ b/application/controllers/JobsController.php
@@ -11,7 +11,7 @@ class JobsController extends ActionController
     public function indexAction()
     {
         $this->addTitle($this->translate('Jobs'))
-            ->setAutoRefreshInterval(10)
+            ->setAutorefreshInterval(10)
             ->addAddLink($this->translate('Add a new Job'), 'director/job/add')
             ->tabs(new ImportTabs())->activate('jobs');
 
diff --git a/application/controllers/SchemaController.php b/application/controllers/SchemaController.php
index b0ca24e..961b7b1 100644
--- a/application/controllers/SchemaController.php
+++ b/application/controllers/SchemaController.php
@@ -62,7 +62,7 @@ class SchemaController extends ActionController
         return file_get_contents(
             sprintf(
                 '%s/schema/%s.sql',
-                $this->Module()->getBasedir(),
+                $this->Module()->getBaseDir(),
                 $type
             )
         );
diff --git a/application/controllers/SelfServiceController.php b/application/controllers/SelfServiceController.php
index 0b3b642..c3c9bb5 100644
--- a/application/controllers/SelfServiceController.php
+++ b/application/controllers/SelfServiceController.php
@@ -194,7 +194,7 @@ class SelfServiceController extends ActionController
         } else {
             throw new ProgrammingError(
                 'Expected boolean value, got %s',
-                var_export($value, 1)
+                var_export($value, true)
             );
         }
     }
@@ -275,7 +275,7 @@ class SelfServiceController extends ActionController
             // PluginsUrl => framework_plugins_url
         ];
         $username = $settings->get('self-service/icinga_service_user');
-        if ($username !== null && strlen($username) > 0) {
+        if ($username) {
             $params['icinga_service_user'] = $username;
         }
 
@@ -404,7 +404,7 @@ class SelfServiceController extends ActionController
     {
         foreach ($keys as $key) {
             $value = $settings->get("self-service/$key");
-            if (strlen($value)) {
+            if ($value) {
                 $params[$key] = $value;
             }
         }
diff --git a/application/controllers/ServiceController.php b/application/controllers/ServiceController.php
index 3cd54d6..b62f317 100644
--- a/application/controllers/ServiceController.php
+++ b/application/controllers/ServiceController.php
@@ -4,11 +4,10 @@ namespace Icinga\Module\Director\Controllers;
 
 use Exception;
 use Icinga\Exception\NotFoundError;
-use Icinga\Module\Director\Data\Db\DbObjectStore;
+use Icinga\Module\Director\Auth\Permission;
 use Icinga\Module\Director\Data\Db\DbObjectTypeRegistry;
 use Icinga\Module\Director\Db\Branch\UuidLookup;
 use Icinga\Module\Director\Forms\IcingaServiceForm;
-use Icinga\Module\Director\Monitoring;
 use Icinga\Module\Director\Objects\IcingaObject;
 use Icinga\Module\Director\Web\Controller\ObjectController;
 use Icinga\Module\Director\Objects\IcingaService;
@@ -30,13 +29,14 @@ class ServiceController extends ObjectController
 
     protected function checkDirectorPermissions()
     {
-        if ($this->hasPermission('director/monitoring/services')) {
-            $monitoring = new Monitoring();
-            if ($monitoring->authCanEditService($this->Auth(), $this->getParam('host'), $this->getParam('name'))) {
-                return;
-            }
+        if ($this->host
+            && $this->object
+            && $this->backend()->canModifyService($this->host->getObjectName(), $this->object->getObjectName())
+        ) {
+            return;
         }
-        $this->assertPermission('director/hosts');
+
+        $this->assertPermission(Permission::HOSTS);
     }
 
     public function init()
@@ -62,7 +62,7 @@ class ServiceController extends ObjectController
 
     protected function getOptionalRelatedObjectFromParams($type, $parameter)
     {
-        if ($id = $this->params->get("${parameter}_id")) {
+        if ($id = $this->params->get("{$parameter}_id")) {
             $key = (int) $id;
         } else {
             $key = $this->params->get($parameter);
@@ -80,7 +80,7 @@ class ServiceController extends ObjectController
     {
         $key = $object->getUnresolvedRelated($relation);
         if ($key === null) {
-            if ($key = $object->get("${relation}_id")) {
+            if ($key = $object->get("{$relation}_id")) {
                 $key = (int) $key;
             } else {
                 $key = $object->get($relation);
diff --git a/application/controllers/SyncruleController.php b/application/controllers/SyncruleController.php
index 928cf2c..e575ad8 100644
--- a/application/controllers/SyncruleController.php
+++ b/application/controllers/SyncruleController.php
@@ -48,7 +48,7 @@ class SyncruleController extends ActionController
      */
     public function indexAction()
     {
-        $this->setAutoRefreshInterval(10);
+        $this->setAutorefreshInterval(10);
         $rule = $this->requireSyncRule();
         $this->tabs(new SyncRuleTabs($rule))->activate('show');
         $ruleName = $rule->get('rule_name');
@@ -94,7 +94,7 @@ class SyncruleController extends ActionController
                 break;
             case 'in-sync':
                 $c->add(Html::tag('p', null, sprintf(
-                    $this->translate('This Sync Rule was last found to by in Sync at %s.'),
+                    $this->translate('This Sync Rule was last found to be in Sync at %s.'),
                     $rule->get('last_attempt')
                 )));
                 /*
@@ -380,10 +380,7 @@ class SyncruleController extends ActionController
     protected function firstNames($objects, $max = 50)
     {
         $names = [];
-        $list = new UnorderedList();
-        $list->addAttributes([
-            'style' => 'list-style-type: none; marign: 0; padding: 0',
-        ]);
+        $list = new UnorderedList([], ['class' => 'unordred-list']);
         $total = count($objects);
         $i = 0;
         PrefetchCache::forget();
@@ -464,7 +461,7 @@ class SyncruleController extends ActionController
     {
         $list = new UnorderedList();
         foreach ($properties as $property => $cnt) {
-            $list->addItem("${cnt}x $property");
+            $list->addItem("{$cnt}x $property");
         }
 
         return $list;
@@ -517,7 +514,6 @@ class SyncruleController extends ActionController
             if ($this->showNotInBranch($this->translate('Modifying Sync Rules'))) {
                 return;
             }
-
         } else {
             $this->addTitle($this->translate('Add sync rule'));
             $this->tabs(new SyncRuleTabs())->activate('add');
@@ -609,12 +605,11 @@ class SyncruleController extends ActionController
         $form = SyncPropertyForm::load()->setDb($db);
         $this->tabs(new SyncRuleTabs($rule))->activate('property');
             $this->actions()->add(new Link(
-            $this->translate('back'),
-            'director/syncrule/property',
-            ['rule_id' => $ruleId],
-            ['class' => 'icon-left-big']
-        ));
-
+                $this->translate('back'),
+                'director/syncrule/property',
+                ['rule_id' => $ruleId],
+                ['class' => 'icon-left-big']
+            ));
         if ($id = $this->params->get('id')) {
             $form->loadObject((int) $id);
             $this->addTitle(
@@ -647,7 +642,7 @@ class SyncruleController extends ActionController
      */
     public function historyAction()
     {
-        $this->setAutoRefreshInterval(30);
+        $this->setAutorefreshInterval(30);
         $rule = $this->requireSyncRule();
         $this->tabs(new SyncRuleTabs($rule))->activate('history');
         $this->addTitle($this->translate('Sync history') . ': ' . $rule->get('rule_name'));
diff --git a/application/controllers/SyncrulesController.php b/application/controllers/SyncrulesController.php
index 1829ebe..1c84ecf 100644
--- a/application/controllers/SyncrulesController.php
+++ b/application/controllers/SyncrulesController.php
@@ -23,7 +23,7 @@ class SyncrulesController extends ActionController
         }
 
         $this->addTitle($this->translate('Sync rule'))
-            ->setAutoRefreshInterval(10)
+            ->setAutorefreshInterval(10)
             ->addAddLink(
                 $this->translate('Add a new Sync Rule'),
                 'director/syncrule/add'
diff --git a/application/forms/AddToBasketForm.php b/application/forms/AddToBasketForm.php
index 44b5357..36091fe 100644
--- a/application/forms/AddToBasketForm.php
+++ b/application/forms/AddToBasketForm.php
@@ -11,9 +11,6 @@ use Icinga\Module\Director\Web\Form\DirectorForm;
 
 class AddToBasketForm extends DirectorForm
 {
-    /** @var Basket */
-    private $basket;
-
     private $type = '(has not been set)';
 
     private $names = [];
@@ -30,7 +27,6 @@ class AddToBasketForm extends DirectorForm
             'b' => 'basket_name',
         ])->order('basket_name'));
 
-        $names = [];
         $basket = null;
         if ($this->hasBeenSent()) {
             $basketName = $this->getSentValue('basket');
@@ -38,25 +34,17 @@ class AddToBasketForm extends DirectorForm
                 $basket = Basket::load($basketName, $this->getDb());
             }
         }
-        $count = 0;
-        $type = $this->type;
+
+        $names = [];
         foreach ($this->names as $name) {
-            if (! empty($names)) {
-                $names[] = ', ';
-            }
-            if ($basket && $basket->hasObject($type, $name)) {
-                $names[] = Html::tag('span', [
-                    'style' => 'text-decoration: line-through'
-                ], $name);
-            } else {
-                $count++;
+            if (! $basket || ! $basket->hasObject($this->type, $name)) {
                 $names[] = $name;
             }
         }
-        $this->addHtmlHint((new HtmlDocument())->add([
-            'The following objects will be added: ',
-            $names
-        ]));
+        $this->addHtmlHint(
+            (new HtmlDocument())
+                ->add(sprintf('The following objects will be added: %s', implode(", ", $names)))
+        );
         $this->addElement('select', 'basket', [
             'label'        => $this->translate('Basket'),
             'multiOptions' => $this->optionalEnum($enum),
@@ -64,10 +52,10 @@ class AddToBasketForm extends DirectorForm
             'class'        => 'autosubmit',
         ]);
 
-        if ($count > 0) {
+        if (! empty($names)) {
             $this->setSubmitLabel(sprintf(
                 $this->translate('Add %s objects'),
-                $count
+                count($names)
             ));
         } else {
             $this->setSubmitLabel($this->translate('Add'));
@@ -112,18 +100,18 @@ class AddToBasketForm extends DirectorForm
                 'Configuration objects have been added to the chosen basket "%s"'
             ), $basketName));
             return parent::onSuccess();
-        } else {
-            $this->addHtmlHint(Hint::error(Html::sprintf($this->translate(
-                'Please check your Basket configuration, %s does not support'
-                . ' single "%s" configuration objects'
-            ), Link::create(
-                $basketName,
-                'director/basket',
-                ['name' => $basketName],
-                ['data-base-target' => '_next']
-            ), $type)));
-
-            return false;
         }
+
+        $this->addHtmlHint(Hint::error(Html::sprintf($this->translate(
+            'Please check your Basket configuration, %s does not support'
+            . ' single "%s" configuration objects'
+        ), Link::create(
+            $basketName,
+            'director/basket',
+            ['name' => $basketName],
+            ['data-base-target' => '_next']
+        ), $type)));
+
+        return false;
     }
 }
diff --git a/application/forms/BasketForm.php b/application/forms/BasketForm.php
index 8ff6cca..4ac942c 100644
--- a/application/forms/BasketForm.php
+++ b/application/forms/BasketForm.php
@@ -52,9 +52,9 @@ class BasketForm extends DirectorObjectForm
         $types = $this->getAvailableTypes();
 
         $options = [
-            'IGNORE' => $this->translate('Ignore'),
-            'ALL'    => $this->translate('All of them'),
-            '[]'     => $this->translate('Custom Selection'),
+            Basket::SELECTION_NONE   => $this->translate('Ignore'),
+            Basket::SELECTION_ALL    => $this->translate('All of them'),
+            Basket::SELECTION_CUSTOM => $this->translate('Custom Selection'),
         ];
 
         $this->addHtmlHint($this->translate(
@@ -92,13 +92,13 @@ class BasketForm extends DirectorObjectForm
         /** @var Basket $object */
         $values = [];
         foreach ($this->getAvailableTypes() as $type => $label) {
-            $values[$type] = 'IGNORE';
+            $values[$type] = Basket::SELECTION_NONE;
         }
         foreach ($object->getChosenObjects() as $type => $selection) {
             if ($selection === true) {
-                $values[$type] = 'ALL';
+                $values[$type] = Basket::SELECTION_ALL;
             } elseif (is_array($selection)) {
-                $values[$type] = '[]';
+                $values[$type] = Basket::SELECTION_CUSTOM;
             }
         }
 
diff --git a/application/forms/BasketUploadForm.php b/application/forms/BasketUploadForm.php
index a88dc06..aa26258 100644
--- a/application/forms/BasketUploadForm.php
+++ b/application/forms/BasketUploadForm.php
@@ -25,10 +25,12 @@ class BasketUploadForm extends DirectorObjectForm
      */
     public function setup()
     {
-        $this->addElement('text', 'basket_name', [
-            'label'        => $this->translate('Basket Name'),
-            'required'     => true,
-        ]);
+        if ($this->object === null) {
+            $this->addElement('text', 'basket_name', [
+                'label'        => $this->translate('Basket Name'),
+                'required'     => true,
+            ]);
+        }
         $this->setAttrib('enctype', 'multipart/form-data');
 
         $this->addElement('file', 'uploaded_file', [
@@ -53,16 +55,6 @@ class BasketUploadForm extends DirectorObjectForm
         return '\\Icinga\\Module\\Director\\DirectorObject\\Automation\\Basket';
     }
 
-    protected function setObjectSuccessUrl()
-    {
-        /** @var Basket $basket */
-        $basket = $this->object();
-        $this->setSuccessUrl(
-            'director/basket',
-            ['name' => $basket->get('basket_name')]
-        );
-    }
-
     /**
      * @return bool
      * @throws IcingaException
@@ -134,13 +126,17 @@ class BasketUploadForm extends DirectorObjectForm
 
         $basket->set('owner_type', 'user');
         $basket->set('owner_value', $this->getAuth()->getUser()->getUsername());
-        $basket->store($this->db);
+        if ($basket->hasBeenLoadedFromDb()) {
+            $this->setSuccessUrl('director/basket/snapshots', ['name' => $basket->get('basket_name')]);
+        } else {
+            $this->setSuccessUrl('director/basket', ['name' => $basket->get('basket_name')]);
+            $basket->store($this->db);
+        }
 
         BasketSnapshot::forBasketFromJson(
             $basket,
             $this->rawUpload
         )->store($this->db);
-        $this->setObjectSuccessUrl();
         $this->beforeSuccessfulRedirect();
         $this->redirectOnSuccess($this->translate('Basket has been uploaded'));
     }
diff --git a/application/forms/DeploymentLinkForm.php b/application/forms/DeploymentLinkForm.php
index f42a627..f5cd368 100644
--- a/application/forms/DeploymentLinkForm.php
+++ b/application/forms/DeploymentLinkForm.php
@@ -4,6 +4,7 @@ namespace Icinga\Module\Director\Forms;
 
 use Icinga\Authentication\Auth;
 use Icinga\Exception\IcingaException;
+use Icinga\Module\Director\Auth\Permission;
 use Icinga\Module\Director\Core\DeploymentApiInterface;
 use Icinga\Module\Director\Db;
 use Icinga\Module\Director\Deployment\DeploymentInfo;
@@ -100,7 +101,7 @@ class DeploymentLinkForm extends DirectorForm
 
     protected function canDeploy()
     {
-        return $this->auth->hasPermission('director/deploy');
+        return $this->auth->hasPermission(Permission::DEPLOY);
     }
 
     public function render(Zend_View_Interface $view = null)
diff --git a/application/forms/DirectorDatafieldForm.php b/application/forms/DirectorDatafieldForm.php
index a306bd7..ab0dcd8 100644
--- a/application/forms/DirectorDatafieldForm.php
+++ b/application/forms/DirectorDatafieldForm.php
@@ -140,8 +140,7 @@ class DirectorDatafieldForm extends DirectorObjectForm
         $this->addElement('text', 'varname', array(
             'label'       => $this->translate('Field name'),
             'description' => $this->translate(
-                'The unique name of the field. This will be the name of the custom'
-                . ' variable in the rendered Icinga configuration.'
+                'This will be the name of the custom variable in the rendered Icinga configuration.'
             ),
             'required'    => true,
         ));
@@ -166,7 +165,7 @@ class DirectorDatafieldForm extends DirectorObjectForm
 
         $this->addElement('select', 'category_id', [
             'label' => $this->translate('Data Field Category'),
-            'multiOptions'  => $this->optionalEnum($this->enumCategpories()),
+            'multiOptions'  => $this->optionalEnum($this->enumCategories()),
         ]);
 
         $error = false;
@@ -282,7 +281,7 @@ class DirectorDatafieldForm extends DirectorObjectForm
     protected function enumDataTypes()
     {
         $hooks = Hook::all('Director\\DataType');
-        $enum = array(null => '- please choose -');
+        $enum = [null => $this->translate('- please choose -')];
         /** @var DataTypeHook $hook */
         foreach ($hooks as $hook) {
             $enum[get_class($hook)] = $hook->getName();
@@ -291,7 +290,7 @@ class DirectorDatafieldForm extends DirectorObjectForm
         return $enum;
     }
 
-    protected function enumCategpories()
+    protected function enumCategories()
     {
         $db = $this->getDb()->getDbAdapter();
         return $db->fetchPairs(
diff --git a/application/forms/IcingaAddServiceForm.php b/application/forms/IcingaAddServiceForm.php
index df2302e..60ccb6f 100644
--- a/application/forms/IcingaAddServiceForm.php
+++ b/application/forms/IcingaAddServiceForm.php
@@ -3,6 +3,7 @@
 namespace Icinga\Module\Director\Forms;
 
 use gipfl\IcingaWeb2\Link;
+use Icinga\Module\Director\Auth\Permission;
 use Icinga\Module\Director\Web\Form\DirectorObjectForm;
 use Icinga\Module\Director\Objects\IcingaHost;
 use Icinga\Module\Director\Objects\IcingaService;
@@ -82,7 +83,7 @@ class IcingaAddServiceForm extends DirectorObjectForm
                 if ($this->hasBeenSent()) {
                     $this->addError($this->translate('No service has been chosen'));
                 } else {
-                    if ($this->hasPermission('director/admin')) {
+                    if ($this->hasPermission(Permission::ADMIN)) {
                         $html = sprintf(
                             $this->translate('Please define a %s first'),
                             Link::create(
diff --git a/application/forms/IcingaCloneObjectForm.php b/application/forms/IcingaCloneObjectForm.php
index 6ee99ba..8381eee 100644
--- a/application/forms/IcingaCloneObjectForm.php
+++ b/application/forms/IcingaCloneObjectForm.php
@@ -5,8 +5,10 @@ namespace Icinga\Module\Director\Forms;
 use gipfl\Web\Widget\Hint;
 use Icinga\Exception\IcingaException;
 use Icinga\Module\Director\Acl;
+use Icinga\Module\Director\Auth\Permission;
 use Icinga\Module\Director\Data\Db\DbObjectStore;
 use Icinga\Module\Director\Db\Branch\Branch;
+use Icinga\Module\Director\Objects\IcingaCommand;
 use Icinga\Module\Director\Objects\IcingaHost;
 use Icinga\Module\Director\Objects\IcingaObject;
 use Icinga\Module\Director\Objects\IcingaService;
@@ -41,7 +43,7 @@ class IcingaCloneObjectForm extends DirectorForm
             'value'    => $name,
         ));
 
-        if (!$branchOnly && Acl::instance()->hasPermission('director/admin')) {
+        if (!$branchOnly && Acl::instance()->hasPermission(Permission::ADMIN)) {
             $this->addElement('select', 'clone_type', array(
                 'label'        => 'Clone type',
                 'required'     => true,
@@ -95,7 +97,9 @@ class IcingaCloneObjectForm extends DirectorForm
             }
         }
 
-        if ($this->object->isTemplate() && $this->object->supportsFields()) {
+        if (($this->object->isTemplate() || $this->object instanceof IcingaCommand)
+            && $this->object->supportsFields()
+        ) {
             $this->addBoolean('clone_fields', [
                 'label'       => $this->translate('Clone Template Fields'),
                 'description' => $this->translate(
@@ -132,7 +136,7 @@ class IcingaCloneObjectForm extends DirectorForm
         $connection = $object->getConnection();
         $db = $connection->getDbAdapter();
         $newName = $this->getValue('new_object_name');
-        $resolve = Acl::instance()->hasPermission('director/admin')
+        $resolve = Acl::instance()->hasPermission(Permission::ADMIN)
             && $this->getValue('clone_type') === 'flat';
 
         $msg = sprintf(
@@ -189,7 +193,7 @@ class IcingaCloneObjectForm extends DirectorForm
             $fields = $db->fetchAll(
                 $db->select()
                     ->from($table . '_field')
-                    ->where("${type}_id = ?", $object->get('id'))
+                    ->where("{$type}_id = ?", $object->get('id'))
             );
         } else {
             $fields = [];
@@ -221,7 +225,7 @@ class IcingaCloneObjectForm extends DirectorForm
             }
 
             foreach ($fields as $row) {
-                $row->{"${type}_id"} = $newId;
+                $row->{"{$type}_id"} = $newId;
                 $db->insert($table . '_field', (array) $row);
             }
 
@@ -247,6 +251,7 @@ class IcingaCloneObjectForm extends DirectorForm
         return $db->fetchPairs(
             $db->select()
                 ->from('icinga_service_set', ['id', 'object_name'])
+                ->where('object_type = ?', 'template')
                 ->order('object_name')
         );
     }
diff --git a/application/forms/IcingaDependencyForm.php b/application/forms/IcingaDependencyForm.php
index ab30844..56597f9 100644
--- a/application/forms/IcingaDependencyForm.php
+++ b/application/forms/IcingaDependencyForm.php
@@ -5,6 +5,7 @@ namespace Icinga\Module\Director\Forms;
 use Icinga\Module\Director\Data\Db\DbObject;
 use Icinga\Module\Director\Web\Form\DirectorObjectForm;
 use Icinga\Module\Director\Objects\IcingaDependency;
+use Zend_Validate_Callback;
 
 class IcingaDependencyForm extends DirectorObjectForm
 {
@@ -164,7 +165,7 @@ class IcingaDependencyForm extends DirectorObjectForm
         ], null);
 
         $this->addBoolean('disable_notifications', [
-            'label'       => $this->translate('Disable Notificiations'),
+            'label'       => $this->translate('Disable Notifications'),
             'description' => $this->translate(
                 'Whether to disable notifications when this dependency fails.'
                 . ' Defaults to true.'
@@ -192,38 +193,83 @@ class IcingaDependencyForm extends DirectorObjectForm
         $parentHost = $dependency->get('parent_host');
         if ($parentHost === null) {
             $parentHostVar = $dependency->get('parent_host_var');
-            if (\strlen($parentHostVar) > 0) {
+            if ($parentHostVar !== null && \strlen($parentHostVar) > 0) {
                 $parentHost = '$' . $dependency->get('parent_host_var') . '$';
             }
         }
+
+        $parentHostDescription = $this->translate('Optional. The parent host.');
+        $applyTo = $this->getSentOrObjectValue('apply_to');
+        $parentHostValidator = new Zend_Validate_Callback(function ($value) use ($applyTo) {
+            if ($applyTo === 'host' && $this->isCustomVar($value)) {
+                return explode('.', trim($value, '$'))[0] === 'host';
+            }
+
+            return true;
+        });
+
+        $parentHostValidator->setMessage(
+            $this->translate('The parent host cannot be a service custom variable for a host dependency'),
+            Zend_Validate_Callback::INVALID_VALUE
+        );
+
+        if ($applyTo === 'service') {
+            $additionalDescription = $this->translate(
+                'You might want to refer to Host or Service Custom Variables via $host|service.vars.varname$'
+            );
+        } else {
+            $additionalDescription = $this->translate(
+                'You might want to refer to Host Custom Variables via $host.vars.varname$'
+            );
+        }
+
+        $parentHostDescription .= ' ' . $additionalDescription;
+
         $this->addElement('text', 'parent_host', [
-            'label' => $this->translate('Parent Host'),
-            'description' => $this->translate(
-                'The parent host. You might want to refer Host Custom Variables'
-                . ' via $host.vars.varname$'
-            ),
-            'class' => "autosubmit director-suggest",
+            'label'                   => $this->translate('Parent Host'),
+            'description'             => $parentHostDescription,
+            'class'                   => "autosubmit director-suggest",
             'data-suggestion-context' => 'hostnames',
-            'order' => 10,
-            'required' => $this->isObject(),
-            'value' => $parentHost
+            'order'                   => 10,
+            'required'                => $this->isObject(),
+            'value'                   => $parentHost,
+            'validators'               => [$parentHostValidator]
         ]);
         $sentParent = $this->getSentOrObjectValue('parent_host');
 
         if (!empty($sentParent) || $dependency->isApplyRule()) {
             $parentService = $dependency->get('parent_service');
+            if ($parentService === null) {
+                $parentServiceVar = $dependency->get('parent_service_by_name');
+                if ($parentServiceVar) {
+                    $parentService = '$' . $parentServiceVar . '$';
+                }
+            }
+
+            $parentServiceDescription = $this->translate(
+                'Optional. The parent service. If omitted this dependency'
+                . ' object is treated as host dependency.'
+            );
+
+            $parentServiceDescription .= ' ' . $additionalDescription;
+
+            $parentServiceValidator = clone $parentHostValidator;
+
+            $parentServiceValidator->setMessage(
+                $this->translate('The parent service cannot be a service custom variable for a host dependency'),
+                Zend_Validate_Callback::INVALID_VALUE
+            );
+
             $this->addElement('text', 'parent_service', [
-                    'label' => $this->translate('Parent Service'),
-                    'description' => $this->translate(
-                        'Optional. The parent service. If omitted this dependency'
-                         . ' object is treated as host dependency.'
-                    ),
-                    'class' => "autosubmit director-suggest",
-                    'data-suggestion-context' => 'servicenames',
-                    'data-suggestion-for-host' => $sentParent,
-                    'order' => 20,
-                    'value' => $parentService
-                ]);
+                'label'                    => $this->translate('Parent Service'),
+                'description'              => $parentServiceDescription,
+                'class'                    => "autosubmit director-suggest",
+                'data-suggestion-context'  => 'servicenames',
+                'data-suggestion-for-host' => $sentParent,
+                'order'                    => 20,
+                'value'                    => $parentService,
+                'validators'               => [$parentServiceValidator]
+            ]);
         }
 
         // If configuring Object, allow selection of child host and/or service,
@@ -290,11 +336,22 @@ class IcingaDependencyForm extends DirectorObjectForm
     protected function handleProperties(DbObject $object, &$values)
     {
         if ($this->hasBeenSent()) {
-            if (isset($values['parent_host'])
-                && $this->isCustomVar($values['parent_host'])
-            ) {
-                $values['parent_host_var'] = \trim($values['parent_host'], '$');
-                $values['parent_host'] = '';
+            if (isset($values['parent_host'])) {
+                if ($this->isCustomVar($values['parent_host'])) {
+                    $values['parent_host_var'] = \trim($values['parent_host'], '$');
+                    $values['parent_host'] = '';
+                } else {
+                    $values['parent_host_var'] = '';
+                }
+            }
+
+            if (isset($values['parent_service'])) {
+                if ($this->isCustomVar($values['parent_service'])) {
+                    $values['parent_service_by_name'] = trim($values['parent_service'], '$');
+                    $values['parent_service'] = '';
+                } else {
+                    $values['parent_service_by_name'] = '';
+                }
             }
         }
 
@@ -303,7 +360,6 @@ class IcingaDependencyForm extends DirectorObjectForm
 
     protected function isCustomVar($string)
     {
-        return \preg_match('/^\$(?:host)\.vars\..+\$$/', $string);
-        // Eventually: return \preg_match('/^\$(?:host|service)\.vars\..+\$$/', $string);
+        return preg_match('/^\$(?:host|service)\.vars\..+\$$/', $string);
     }
 }
diff --git a/application/forms/IcingaHostForm.php b/application/forms/IcingaHostForm.php
index ec71471..ed57251 100644
--- a/application/forms/IcingaHostForm.php
+++ b/application/forms/IcingaHostForm.php
@@ -3,6 +3,8 @@
 namespace Icinga\Module\Director\Forms;
 
 use Icinga\Exception\AuthenticationException;
+use Icinga\Module\Director\Auth\Permission;
+use Icinga\Module\Director\Auth\Restriction;
 use Icinga\Module\Director\Repository\IcingaTemplateRepository;
 use Icinga\Module\Director\Restriction\HostgroupRestriction;
 use Icinga\Module\Director\Web\Form\DirectorObjectForm;
@@ -162,7 +164,7 @@ class IcingaHostForm extends DirectorObjectForm
                 if ($this->hasBeenSent()) {
                     $this->addError($this->translate('No Host template has been chosen'));
                 } else {
-                    if ($this->hasPermission('director/admin')) {
+                    if ($this->hasPermission(Permission::ADMIN)) {
                         $html = sprintf(
                             $this->translate('Please define a %s first'),
                             Link::create(
@@ -208,7 +210,7 @@ class IcingaHostForm extends DirectorObjectForm
     protected function addGroupsElement()
     {
         if ($this->hasHostGroupRestriction()
-            && ! $this->getAuth()->hasPermission('director/groups-for-restricted-hosts')
+            && ! $this->getAuth()->hasPermission(Permission::GROUPS_FOR_RESTRICTED_HOSTS)
         ) {
             return $this;
         }
@@ -262,15 +264,6 @@ class IcingaHostForm extends DirectorObjectForm
         return $this;
     }
 
-    protected function strikeGroupLinks(BaseHtmlElement $links)
-    {
-        /** @var BaseHtmlElement $link */
-        foreach ($links->getContent() as $link) {
-            $link->getAttributes()->add('style', 'text-decoration: strike');
-        }
-        $links->add('aha');
-    }
-
     protected function getInheritedGroups()
     {
         if ($this->hasObject()) {
@@ -295,9 +288,7 @@ class IcingaHostForm extends DirectorObjectForm
             );
         }
 
-        return Html::tag('span', [
-            'style' => 'line-height: 2.5em; padding-left: 0.5em'
-        ], $links);
+        return Html::tag('span', ['class' => 'host-group-links'], $links);
     }
 
     protected function getAppliedGroups()
@@ -311,7 +302,7 @@ class IcingaHostForm extends DirectorObjectForm
 
     protected function hasHostGroupRestriction()
     {
-        return $this->getAuth()->getRestrictions('director/filter/hostgroups');
+        return $this->getAuth()->getRestrictions(Restriction::FILTER_HOSTGROUPS);
     }
 
     /**
diff --git a/application/forms/IcingaNotificationForm.php b/application/forms/IcingaNotificationForm.php
index 0fca6b8..bf9f75d 100644
--- a/application/forms/IcingaNotificationForm.php
+++ b/application/forms/IcingaNotificationForm.php
@@ -2,6 +2,7 @@
 
 namespace Icinga\Module\Director\Forms;
 
+use Icinga\Module\Director\DataType\DataTypeDirectorObject;
 use Icinga\Module\Director\Web\Form\DirectorObjectForm;
 
 class IcingaNotificationForm extends DirectorObjectForm
@@ -121,20 +122,32 @@ class IcingaNotificationForm extends DirectorObjectForm
     {
         $users = $this->enumUsers();
         if (empty($users)) {
-            return $this;
-        }
-
-        $this->addElement(
-            'extensibleSet',
-            'users',
-            array(
+            $this->addElement('select', 'users', [
+                'label' => $this->translate('Users'),
+                'description' => $this->translate('No User object has been created yet'),
+                'multiOptions' => $this->optionalEnum([]),
+            ]);
+        } else {
+            $this->addElement('extensibleSet', 'users', [
                 'label'       => $this->translate('Users'),
                 'description' => $this->translate(
                     'Users that should be notified by this notifications'
                 ),
                 'multiOptions' => $this->optionalEnum($users)
+            ]);
+        }
+
+        $this->addElement('select', 'users_var', [
+            'label' => $this->translate('Users Custom Variable'),
+            'multiOptions' => $this->enumDirectorObjectFields('user'),
+            'description' => $this->translate(
+                'If defined, Users from this Custom Variable will be combined with single users chosen below. '
+                . ' e.g.: when set to notification_contacts, this notification will pick Users from the Array'
+                . ' service.vars.notification_contacts and fall back to host.vars.notification_contacts, in'
+                . ' case the former one does not exist.'
+                . ' Only Array type DirectorObject Fields for User objects are eligible for this feature.'
             )
-        );
+        ]);
 
         return $this;
     }
@@ -146,24 +159,59 @@ class IcingaNotificationForm extends DirectorObjectForm
     {
         $groups = $this->enumUsergroups();
         if (empty($groups)) {
-            return $this;
-        }
-
-        $this->addElement(
-            'extensibleSet',
-            'user_groups',
-            array(
+            $this->addElement('select', 'user_groups', [
+                'label' => $this->translate('Users'),
+                'description' => $this->translate('No UserGroup object has been created yet'),
+                'multiOptions' => $this->optionalEnum([]),
+            ]);
+        } else {
+            $this->addElement('extensibleSet', 'user_groups', [
                 'label'       => $this->translate('User groups'),
                 'description' => $this->translate(
                     'User groups that should be notified by this notifications'
                 ),
                 'multiOptions' => $this->optionalEnum($groups)
+            ]);
+        }
+
+        $this->addElement('select', 'user_groups_var', [
+            'label' => $this->translate('User Groups Custom Variable'),
+            'multiOptions' => $this->enumDirectorObjectFields('usergroup'),
+            'description' => $this->translate(
+                'If defined, User Groups from this Custom Variable will be combined with single Groups chosen below. '
+                . ' e.g.: when set to notification_groups, this notification will pick User Groups from the Array'
+                . ' service.vars.notification_groups and fall back to host.vars.notification_groups, in'
+                . ' case the former one does not exist.'
+                . ' Only Array type DirectorObject Fields for User objects are eligible for this feature.'
             )
-        );
+        ]);
 
         return $this;
     }
 
+    protected function enumDirectorObjectFields($objectType, $dataType = 'array')
+    {
+        $db = $this->db->getDbAdapter();
+        $query = $db->select()
+            ->from(['df' => 'director_datafield'], ['k' => 'df.varname', 'v' => 'df.varname'])
+            ->join(
+                ['dfs' => 'director_datafield_setting'],
+                $db->quoteInto('df.id = dfs.datafield_id AND dfs.setting_name = ?', 'icinga_object_type'),
+                []
+            )
+            ->join(
+                ['dft' => 'director_datafield_setting'],
+                $db->quoteInto('df.id = dft.datafield_id AND dft.setting_name = ?', 'data_type'),
+                []
+            )
+            ->where('df.datatype = ?', DataTypeDirectorObject::class)
+            ->where('dfs.setting_value = ?', $objectType)
+            ->where('dft.setting_value = ?', $dataType)
+            ->order('df.varname');
+
+        return $this->optionalEnum($db->fetchPairs($query));
+    }
+
     /**
      * @return self
      */
@@ -196,7 +244,7 @@ class IcingaNotificationForm extends DirectorObjectForm
             array(
                 'label' => $this->translate('First notification delay'),
                 'description' => $this->translate(
-                    'Delay unless the first notification should be sent'
+                    'Delay until the first notification should be sent'
                 ) . '. ' . $this->getTimeValueInfo()
             )
         );
diff --git a/application/forms/IcingaObjectFieldForm.php b/application/forms/IcingaObjectFieldForm.php
index 537c95e..3b503fc 100644
--- a/application/forms/IcingaObjectFieldForm.php
+++ b/application/forms/IcingaObjectFieldForm.php
@@ -2,6 +2,9 @@
 
 namespace Icinga\Module\Director\Forms;
 
+use Icinga\Module\Director\DataType\DataTypeBoolean;
+use Icinga\Module\Director\DataType\DataTypeString;
+use Icinga\Module\Director\Field\FormFieldSuggestion;
 use Icinga\Module\Director\Objects\IcingaCommand;
 use Icinga\Module\Director\Objects\IcingaHost;
 use Icinga\Module\Director\Objects\IcingaObject;
@@ -15,6 +18,9 @@ class IcingaObjectFieldForm extends DirectorObjectForm
     /** @var IcingaObject Please note that $object would conflict with logic in parent class */
     protected $icingaObject;
 
+    /** @var FormFieldSuggestion */
+    protected $fieldSuggestion;
+
     public function setIcingaObject($object)
     {
         $this->icingaObject = $object;
@@ -36,22 +42,9 @@ class IcingaObjectFieldForm extends DirectorObjectForm
             . ' a specific set, shown as a dropdown.'
         );
 
-        // TODO: remove assigned ones!
-        $existingFields = $this->db->enumDatafields();
-        $blacklistedVars = array();
-        $suggestedFields = array();
-
-        foreach ($existingFields as $id => $field) {
-            if (preg_match('/ \(([^\)]+)\)$/', $field, $m)) {
-                $blacklistedVars['$' . $m[1] . '$'] = $id;
-            }
-        }
-
         // TODO: think about imported existing vars without fields
         // TODO: extract vars from command line (-> dummy)
         // TODO: do not suggest chosen ones
-        $argumentVars = array();
-        $argumentVarDescriptions = array();
         if ($object instanceof IcingaCommand) {
             $command = $object;
         } elseif ($object->hasProperty('check_command_id')) {
@@ -60,56 +53,16 @@ class IcingaObjectFieldForm extends DirectorObjectForm
             $command = null;
         }
 
-        if ($command) {
-            foreach ($command->arguments() as $arg) {
-                if ($arg->argument_format === 'string') {
-                    $val = $arg->argument_value;
-                    // TODO: create var::extractMacros or so
-
-                    if (preg_match_all('/(\$[a-z0-9_]+\$)/i', $val, $m, PREG_PATTERN_ORDER)) {
-                        foreach ($m[1] as $val) {
-                            if (array_key_exists($val, $blacklistedVars)) {
-                                $id = $blacklistedVars[$val];
-
-                                // Hint: if not set it might already have been
-                                //       removed in this loop
-                                if (array_key_exists($id, $existingFields)) {
-                                    $suggestedFields[$id] = $existingFields[$id];
-                                    unset($existingFields[$id]);
-                                }
-                            } else {
-                                $argumentVars[$val] = $val;
-                                $argumentVarDescriptions[$val] = $arg->description;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        // Prepare combined fields array
-        $fields = array();
-        if (! empty($suggestedFields)) {
-            asort($existingFields);
-            $fields[$this->translate('Suggested fields')] = $suggestedFields;
-        }
-
-        if (! empty($argumentVars)) {
-            ksort($argumentVars);
-            $fields[$this->translate('Argument macros')] = $argumentVars;
-        }
-
-        if (! empty($existingFields)) {
-            $fields[$this->translate('Other available fields')] = $existingFields;
-        }
+        $suggestions = $this->fieldSuggestion = new FormFieldSuggestion($command, $this->db->enumDatafields());
+        $fields = $suggestions->getCommandFields();
 
-        $this->addElement('select', 'datafield_id', array(
+        $this->addElement('select', 'datafield_id', [
             'label'        => 'Field',
             'required'     => true,
             'description'  => 'Field to assign',
             'class'        => 'autosubmit',
             'multiOptions' => $this->optionalEnum($fields)
-        ));
+        ]);
 
         if (empty($fields)) {
             // TODO: show message depending on permissions
@@ -121,67 +74,58 @@ class IcingaObjectFieldForm extends DirectorObjectForm
         }
 
         if (($id = $this->getSentValue('datafield_id')) && ! ctype_digit($id)) {
-            $this->addElement('text', 'caption', array(
+            $this->addElement('text', 'caption', [
                 'label'       => $this->translate('Caption'),
                 'required'    => true,
                 'ignore'      => true,
                 'value'       => trim($id, '$'),
-                'description' => $this->translate('The caption which should be displayed')
-            ));
+                'description' => $this->translate(
+                    'The caption which should be displayed to your users when this field'
+                    . ' is shown'
+                )
+            ]);
 
-            $this->addElement('textarea', 'description', array(
+            $this->addElement('textarea', 'description', [
                 'label'       => $this->translate('Description'),
-                'description' => $this->translate('A description about the field'),
+                'description' => $this->translate(
+                    'An extended description for this field. Will be shown as soon as a'
+                    . ' user puts the focus on this field'
+                ),
                 'ignore'      => true,
-                'value'       => array_key_exists($id, $argumentVarDescriptions) ? $argumentVarDescriptions[$id] : null,
+                'value'       => $command ? $suggestions->getDescription($id) : null,
                 'rows'        => '3',
-            ));
+            ]);
         }
 
-        $this->addElement('select', 'is_required', array(
+        $this->addElement('select', 'is_required', [
             'label'        => $this->translate('Mandatory'),
             'description'  => $this->translate('Whether this field should be mandatory'),
             'required'     => true,
-            'multiOptions' => array(
+            'multiOptions' => [
                 'n' => $this->translate('Optional'),
                 'y' => $this->translate('Mandatory'),
-            )
-        ));
-
-        $filterFields = array();
-        $prefix = null;
-        if ($object instanceof IcingaHost) {
-            $prefix = 'host.vars.';
-        } elseif ($object instanceof IcingaService) {
-            $prefix = 'service.vars.';
-        }
+            ]
+        ]);
 
-        if ($prefix) {
-            $loader = new IcingaObjectFieldLoader($object);
-            $fields = $loader->getFields();
-
-            foreach ($fields as $varName => $field) {
-                $filterFields[$prefix . $field->varname] = $field->caption;
-            }
-
-            $this->addFilterElement('var_filter', array(
+        if ($filterFields = $this->getFilterFields($object)) {
+            $this->addFilterElement('var_filter', [
                 'description' => $this->translate(
                     'You might want to show this field only when certain conditions are met.'
                     . ' Otherwise it will not be available and values eventually set before'
                     . ' will be cleared once stored'
                 ),
                 'columns' => $filterFields,
-            ));
+            ]);
 
-            $this->addDisplayGroup(array($this->getElement('var_filter')), 'field_filter', array(
-                'decorators' => array(
+            $this->addDisplayGroup([$this->getElement('var_filter')], 'field_filter', [
+                'decorators' => [
                     'FormElements',
-                    array('HtmlTag', array('tag' => 'dl')),
+                    ['HtmlTag', ['tag' => 'dl']],
                     'Fieldset',
-                ),
+                ],
                 'order'  => 30,
                 'legend' => $this->translate('Show based on filter')
-            ));
+            ]);
         }
 
         $this->setButtons();
@@ -202,18 +146,42 @@ class IcingaObjectFieldForm extends DirectorObjectForm
         $fieldId = $this->getValue('datafield_id');
 
         if (! ctype_digit($fieldId)) {
-            $field = DirectorDatafield::create(array(
+            $field = DirectorDatafield::create([
                 'varname'     => trim($fieldId, '$'),
                 'caption'     => $this->getValue('caption'),
                 'description' => $this->getValue('description'),
-                'datatype'    => 'Icinga\Module\Director\DataType\DataTypeString',
-            ));
+                'datatype'    => $this->fieldSuggestion && $this->fieldSuggestion->isBoolean($fieldId)
+                    ? DataTypeBoolean::class
+                    : DataTypeString::class
+            ]);
             $field->store($this->getDb());
             $this->setElementValue('datafield_id', $field->get('id'));
             $this->object()->set('datafield_id', $field->get('id'));
         }
 
         $this->object()->set('var_filter', $this->getValue('var_filter'));
-        return parent::onSuccess();
+        parent::onSuccess();
+    }
+
+    protected static function getFilterFields(IcingaObject $object): array
+    {
+        $filterFields = [];
+        $prefix = null;
+        if ($object instanceof IcingaHost) {
+            $prefix = 'host.vars.';
+        } elseif ($object instanceof IcingaService) {
+            $prefix = 'service.vars.';
+        }
+
+        if ($prefix) {
+            $loader = new IcingaObjectFieldLoader($object);
+            $fields = $loader->getFields();
+
+            foreach ($fields as $varName => $field) {
+                $filterFields[$prefix . $field->get('varname')] = $field->get('caption');
+            }
+        }
+
+        return $filterFields;
     }
 }
diff --git a/application/forms/IcingaServiceForm.php b/application/forms/IcingaServiceForm.php
index f22f9e6..5744d8d 100644
--- a/application/forms/IcingaServiceForm.php
+++ b/application/forms/IcingaServiceForm.php
@@ -6,8 +6,10 @@ use gipfl\Web\Widget\Hint;
 use Icinga\Data\Filter\Filter;
 use Icinga\Exception\IcingaException;
 use Icinga\Exception\ProgrammingError;
+use Icinga\Module\Director\Auth\Permission;
 use Icinga\Module\Director\Data\PropertiesFilter\ArrayCustomVariablesFilter;
 use Icinga\Module\Director\Exception\NestingError;
+use Icinga\Module\Director\Objects\IcingaObject;
 use Icinga\Module\Director\Web\Form\DirectorObjectForm;
 use Icinga\Module\Director\Objects\IcingaHost;
 use Icinga\Module\Director\Objects\IcingaService;
@@ -196,14 +198,16 @@ class IcingaServiceForm extends DirectorObjectForm
     }
 
     /**
-     * @param IcingaService $service
-     * @return IcingaService
+     * Hint: could be moved elsewhere
+     *
+     * @param IcingaService $object
+     * @return IcingaObject|IcingaService|IcingaServiceSet
      * @throws \Icinga\Exception\NotFoundError
      */
-    protected function getFirstParent(IcingaService $service)
+    protected static function getFirstParent(IcingaObject $object)
     {
-        /** @var IcingaService[] $objects */
-        $objects = $service->imports()->getObjects();
+        /** @var IcingaObject[] $objects */
+        $objects = $object->imports()->getObjects();
         if (empty($objects)) {
             throw new RuntimeException('Something went wrong, got no parent');
         }
@@ -300,7 +304,7 @@ class IcingaServiceForm extends DirectorObjectForm
         if ($this->set) {
             return $this->object;
         } else {
-            return $this->getFirstParent($this->object);
+            return self::getFirstParent($this->object);
         }
     }
 
@@ -355,7 +359,7 @@ class IcingaServiceForm extends DirectorObjectForm
             $objectType = 'template';
         }
         $this->addHidden('object_type', $objectType);
-        $forceCommandElements = $this->hasPermission('director/admin');
+        $forceCommandElements = $this->hasPermission(Permission::ADMIN);
 
         $this->addNameElement()
              ->addHostObjectElement()
@@ -550,7 +554,7 @@ class IcingaServiceForm extends DirectorObjectForm
              ->addGroupsElement()
              ->groupMainProperties();
 
-        if ($this->hasPermission('director/admin')) {
+        if ($this->hasPermission(Permission::ADMIN)) {
             $this->addCheckCommandElements(true)
                 ->addCheckExecutionElements(true)
                 ->addExtraInfoElements();
@@ -721,8 +725,7 @@ class IcingaServiceForm extends DirectorObjectForm
     protected function enumHosts()
     {
         $db = $this->db->getDbAdapter();
-        $table = new ObjectsTableHost($this->db);
-        $table->setAuth($this->getAuth());
+        $table = new ObjectsTableHost($this->db, $this->getAuth());
         if ($this->branch && $this->branch->isBranch()) {
             $table->setBranchUuid($this->branch->getUuid());
         }
diff --git a/application/forms/IcingaServiceSetForm.php b/application/forms/IcingaServiceSetForm.php
index 21508d5..38b848a 100644
--- a/application/forms/IcingaServiceSetForm.php
+++ b/application/forms/IcingaServiceSetForm.php
@@ -2,6 +2,7 @@
 
 namespace Icinga\Module\Director\Forms;
 
+use Icinga\Module\Director\Auth\Permission;
 use Icinga\Module\Director\Objects\IcingaHost;
 use Icinga\Module\Director\Web\Form\DirectorObjectForm;
 
@@ -113,7 +114,7 @@ class IcingaServiceSetForm extends DirectorObjectForm
 
     protected function addAssignmentElements()
     {
-        if (! $this->hasPermission('director/service_set/apply')) {
+        if (! $this->hasPermission(Permission::SERVICE_SET_APPLY)) {
             return $this;
         }
 
diff --git a/application/forms/IcingaTemplateChoiceForm.php b/application/forms/IcingaTemplateChoiceForm.php
index 31fe610..27af5d2 100644
--- a/application/forms/IcingaTemplateChoiceForm.php
+++ b/application/forms/IcingaTemplateChoiceForm.php
@@ -19,7 +19,7 @@ class IcingaTemplateChoiceForm extends DirectorObjectForm
     {
         if ($name !== null) {
             /** @var IcingaTemplateChoice $class - cheating IDE */
-            $class = $this->getObjectClassName();
+            $class = $this->getObjectClassname();
             $this->setObject($class::load($name, $this->getDb()));
         }
 
@@ -133,7 +133,7 @@ class IcingaTemplateChoiceForm extends DirectorObjectForm
         /** @var IcingaTemplateChoice $object */
         $object = $this->object();
         $this->setSuccessUrl(
-            'director/templatechoice/' . $object->getObjectshortTableName(),
+            'director/templatechoice/' . $object->getObjectShortTableName(),
             $object->getUrlParams()
         );
     }
diff --git a/application/forms/ImportRowModifierForm.php b/application/forms/ImportRowModifierForm.php
index 9e53bd9..7033f4c 100644
--- a/application/forms/ImportRowModifierForm.php
+++ b/application/forms/ImportRowModifierForm.php
@@ -64,6 +64,41 @@ class ImportRowModifierForm extends DirectorObjectForm
             $error = $e->getMessage();
             $mods = $this->optionalEnum([]);
         }
+        $this->addElement('YesNo', 'use_filter', [
+            'label'        => $this->translate('Set based on filter'),
+            'ignore'       => true,
+            'class'        => 'autosubmit',
+            'required'     => true,
+        ]);
+
+        if ($this->hasBeenSent()) {
+            $useFilter = $this->getSentValue('use_filter');
+            if ($useFilter === null) {
+                $this->setElementValue('use_filter', $useFilter = 'n');
+            }
+        } elseif ($object = $this->getObject()) {
+            $expression = $object->get('filter_expression');
+            $useFilter = ($expression === null || strlen($expression) === 0) ? 'n' : 'y';
+            $this->setElementValue('use_filter', $useFilter);
+        } else {
+            $this->setElementValue('use_filter', $useFilter = 'n');
+        }
+
+        if ($useFilter === 'y') {
+            $this->addElement('text', 'filter_expression', [
+                'label'       => $this->translate('Filter Expression'),
+                'description' => $this->translate(
+                    'This allows to filter for specific parts within the given source expression.'
+                    . ' You are allowed to refer all imported columns. Examples: host=www* would'
+                    . ' set this property only for rows imported with a host property starting'
+                    . ' with "www". Complex example: host=www*&!(address=127.*|address6=::1).'
+                    . ' Please note, that CIDR notation based matches are also supported: '
+                    . ' address=192.0.2.128/25| address=2001:db8::/32| address=::ffff:192.0.2.0/96'
+                ),
+                'required'    => true,
+                // TODO: validate filter
+            ]);
+        }
 
         $this->addElement('select', 'provider_class', [
             'label'        => $this->translate('Modifier'),
diff --git a/application/forms/RemoveLinkForm.php b/application/forms/RemoveLinkForm.php
index 6f0c7cc..fb43db0 100644
--- a/application/forms/RemoveLinkForm.php
+++ b/application/forms/RemoveLinkForm.php
@@ -17,10 +17,7 @@ class RemoveLinkForm extends DirectorForm
     {
         // Required to detect the right instance
         $this->formName = 'RemoveSet' . sha1(json_encode($params));
-        parent::__construct([
-            'style' => 'float: right',
-            'data-base-target' => '_self'
-        ]);
+        parent::__construct(['data-base-target' => '_self']);
         $this->label = $label;
         $this->title = $title;
         foreach ($params as $name => $value) {
@@ -38,7 +35,7 @@ class RemoveLinkForm extends DirectorForm
 
     public function setup()
     {
-        $this->setAttrib('class', 'inline');
+        $this->addAttribs(['class' => ['inline', 'remove-link-form']]);
         $this->addHtml(Icon::create('cancel'));
         $this->addSubmitButton($this->label, [
             'class' => 'link-button',
diff --git a/application/forms/SyncCheckForm.php b/application/forms/SyncCheckForm.php
index 8fb3bd0..b180d3d 100644
--- a/application/forms/SyncCheckForm.php
+++ b/application/forms/SyncCheckForm.php
@@ -55,7 +55,7 @@ class SyncCheckForm extends DirectorForm
             } elseif ($sum['modify'] > 1) {
             }
             */
-            $html = '<pre>' . print_r($sum, 1) . '</pre>';
+            $html = '<pre>' . print_r($sum, true) . '</pre>';
 
             $this->addHtml($html);
         } elseif ($this->rule->get('sync_state') === 'in-sync') {
diff --git a/application/locale/de_DE/LC_MESSAGES/director.mo b/application/locale/de_DE/LC_MESSAGES/director.mo
index 3cf12af..fb9e2fd 100644
--- a/application/locale/de_DE/LC_MESSAGES/director.mo
+++ b/application/locale/de_DE/LC_MESSAGES/director.mo
diff --git a/application/locale/de_DE/LC_MESSAGES/director.po b/application/locale/de_DE/LC_MESSAGES/director.po
index ec2fb2a..0ee94ed 100644
--- a/application/locale/de_DE/LC_MESSAGES/director.po
+++ b/application/locale/de_DE/LC_MESSAGES/director.po
@@ -1,378 +1,379 @@
 # Director - Config tool for Icinga 2.
-# Copyright (C) 2022 TEAM NAME
+# Copyright (C) 2023 Icinga
 # This file is distributed under the same license as Director Module.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# 
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: Director Module (master)\n"
-"Report-Msgid-Bugs-To: https://github.com/Icinga/icingaweb2-module-director/issues\n"
-"POT-Creation-Date: 2022-09-21 07:17+0000\n"
-"PO-Revision-Date: 2022-09-21 09:21+0200\n"
+"Report-Msgid-Bugs-To: ISSUE TRACKER\n"
+"POT-Creation-Date: 2023-09-21 08:58+0000\n"
+"PO-Revision-Date: 2023-09-21 10:53+0200\n"
 "Last-Translator: Thomas Gelf <thomas@gelf.net>\n"
-"Language-Team: \n"
 "Language: de_DE\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-Basepath: .\n"
-"X-Generator: Poedit 3.0.1\n"
 "X-Poedit-SearchPath-0: .\n"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:615
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:618
 #, php-format
 msgid " (inherited from \"%s\")"
 msgstr " (geerbt von \"%s\")"
 
-#: library/Director/Web/Table/TemplatesTable.php:64
+#: ../../../../library/Director/Web/Table/TemplatesTable.php:64
 msgid " - not in use -"
 msgstr " - unbenutzt -"
 
-#: library/Director/Web/Table/DatafieldCategoryTable.php:48
-#: library/Director/Web/Table/DatafieldTable.php:52
+#: ../../../../library/Director/Web/Table/DatafieldTable.php:54
+#: ../../../../library/Director/Web/Table/DatafieldCategoryTable.php:48
 msgid "# Used"
 msgstr "# Benutzt"
 
-#: library/Director/Web/Table/DatafieldTable.php:53
+#: ../../../../library/Director/Web/Table/DatafieldTable.php:55
 msgid "# Vars"
 msgstr "# Vars"
 
-#: library/Director/Web/Table/CustomvarTable.php:29
+#: ../../../../library/Director/Web/Table/CustomvarTable.php:29
 #, php-format
 msgid "%d / %d"
 msgstr "%d / %d"
 
-#: library/Director/Resolver/CommandUsage.php:51
+#: ../../../../library/Director/Resolver/CommandUsage.php:51
 #, php-format
 msgid "%d Host Template(s)"
 msgstr "%d Host-Vorlagen"
 
-#: library/Director/Resolver/CommandUsage.php:50
+#: ../../../../library/Director/Resolver/CommandUsage.php:50
 #, php-format
 msgid "%d Host(s)"
 msgstr "%d Host(s)"
 
-#: library/Director/Resolver/CommandUsage.php:61
+#: ../../../../library/Director/Resolver/CommandUsage.php:61
 #, php-format
 msgid "%d Notification Apply Rule(s)"
 msgstr "%d Benachrichtigungs-Apply-Regeln"
 
-#: library/Director/Resolver/CommandUsage.php:60
+#: ../../../../library/Director/Resolver/CommandUsage.php:60
 #, php-format
 msgid "%d Notification Template(s)"
 msgstr "%d Benachrichtigungsvorlagen"
 
-#: library/Director/Resolver/CommandUsage.php:59
+#: ../../../../library/Director/Resolver/CommandUsage.php:59
 #, php-format
 msgid "%d Notification(s)"
 msgstr "%d Benachrichtigung(en)"
 
-#: library/Director/Resolver/CommandUsage.php:56
+#: ../../../../library/Director/Resolver/CommandUsage.php:56
 #, php-format
 msgid "%d Service Apply Rule(s)"
 msgstr "%d Service Apply-Regel(n)"
 
-#: library/Director/Resolver/CommandUsage.php:55
+#: ../../../../library/Director/Resolver/CommandUsage.php:55
 #, php-format
 msgid "%d Service Template(s)"
 msgstr "%d Service-Vorlage(n)"
 
-#: library/Director/Resolver/CommandUsage.php:54
+#: ../../../../library/Director/Resolver/CommandUsage.php:54
 #, php-format
 msgid "%d Service(s)"
 msgstr "%d Service(s)"
 
-#: library/Director/Dashboard/Dashlet/Dashlet.php:170
+#: ../../../../library/Director/Dashboard/Dashlet/Dashlet.php:170
 #, php-format
 msgid "%d apply rules have been defined"
 msgstr "%d Apply-Regeln wurden definiert"
 
-#: library/Director/Db/Branch/BranchModificationInspection.php:68
-#: library/Director/Web/Table/SyncRunTable.php:49
-#: library/Director/Web/Widget/SyncRunDetails.php:77
+#: ../../../../library/Director/Db/Branch/BranchModificationInspection.php:68
+#: ../../../../library/Director/Web/Table/SyncRunTable.php:49
+#: ../../../../library/Director/Web/Widget/SyncRunDetails.php:77
 #, php-format
 msgid "%d created"
 msgstr "%d erstellt"
 
-#: library/Director/Db/Branch/BranchModificationInspection.php:71
-#: library/Director/Web/Table/SyncRunTable.php:61
-#: library/Director/Web/Widget/SyncRunDetails.php:89
+#: ../../../../library/Director/Db/Branch/BranchModificationInspection.php:71
+#: ../../../../library/Director/Web/Table/SyncRunTable.php:61
+#: ../../../../library/Director/Web/Widget/SyncRunDetails.php:89
 #, php-format
 msgid "%d deleted"
 msgstr "%d gelöscht"
 
-#: library/Director/Web/Widget/DeploymentInfo.php:110
+#: ../../../../library/Director/Web/Widget/DeploymentInfo.php:111
 #, php-format
 msgid "%d files"
 msgstr "%d Dateien"
 
-#: library/Director/Web/Widget/DeployedConfigInfoHeader.php:93
+#: ../../../../library/Director/Web/Widget/DeployedConfigInfoHeader.php:93
 #, php-format
 msgid "%d files rendered in %0.2fs"
 msgstr "%d Dateien in %0.2fs erstellt"
 
-#: library/Director/Dashboard/Dashlet/Dashlet.php:212
+#: ../../../../library/Director/Dashboard/Dashlet/Dashlet.php:212
 #, php-format
 msgid "%d have been externally defined and will not be deployed"
 msgstr "%d wurden extern definiert und werden nicht ausgerollt"
 
-#: library/Director/Db/Branch/BranchModificationInspection.php:74
-#: library/Director/Web/Table/SyncRunTable.php:55
-#: library/Director/Web/Widget/SyncRunDetails.php:83
+#: ../../../../library/Director/Db/Branch/BranchModificationInspection.php:74
+#: ../../../../library/Director/Web/Table/SyncRunTable.php:55
+#: ../../../../library/Director/Web/Widget/SyncRunDetails.php:83
 #, php-format
 msgid "%d modified"
 msgstr "%d geändert"
 
-#: application/controllers/SyncruleController.php:353
+#: ../../../../application/controllers/SyncruleController.php:353
 #, php-format
 msgid "%d object(s) will be created"
 msgstr "%d Objekt(e) werden erstellt"
 
-#: application/controllers/SyncruleController.php:334
+#: ../../../../application/controllers/SyncruleController.php:334
 #, php-format
 msgid "%d object(s) will be deleted"
 msgstr "%d Objekt(e) werden gelöscht"
 
-#: application/controllers/SyncruleController.php:343
+#: ../../../../application/controllers/SyncruleController.php:343
 #, php-format
 msgid "%d object(s) will be modified"
 msgstr "%d Objekt(e) werden verändert"
 
-#: application/controllers/InspectController.php:76
+#: ../../../../application/controllers/InspectController.php:76
 #, php-format
 msgid "%d objects found"
 msgstr "%d Objekte gefunden"
 
-#: library/Director/Dashboard/Dashlet/Dashlet.php:195
+#: ../../../../library/Director/Dashboard/Dashlet/Dashlet.php:195
 #, php-format
 msgid "%d objects have been defined"
 msgstr "%d Objekte wurden definiert"
 
-#: application/forms/IcingaMultiEditForm.php:93
+#: ../../../../application/forms/IcingaMultiEditForm.php:93
 #, php-format
 msgid "%d objects have been modified"
 msgstr "%d Objekte wurden verändert"
 
-#: library/Director/Web/Widget/DeploymentInfo.php:119
+#: ../../../../library/Director/Web/Widget/DeploymentInfo.php:120
 #, php-format
 msgid "%d objects, %d templates, %d apply rules"
 msgstr "%d Objekte, %d Vorlagen, %d Apply-Regeln"
 
-#: library/Director/Dashboard/Dashlet/Dashlet.php:204
+#: ../../../../library/Director/Dashboard/Dashlet/Dashlet.php:204
 #, php-format
 msgid "%d of them are templates"
 msgstr "%d davon sind Vorlagen"
 
-#: library/Director/Dashboard/Dashlet/Dashlet.php:152
+#: ../../../../library/Director/Dashboard/Dashlet/Dashlet.php:152
 #, php-format
 msgid "%d templates have been defined"
 msgstr "%d Vorlagen wurden definiert"
 
-#: library/Director/Web/Widget/ActivityLogInfo.php:581
+#: ../../../../library/Director/Web/Widget/ActivityLogInfo.php:581
 #, php-format
 msgid "%s \"%s\" has been created"
 msgstr "%s \"%s\" wurde erstellt"
 
-#: library/Director/Web/Widget/ActivityLogInfo.php:584
+#: ../../../../library/Director/Web/Widget/ActivityLogInfo.php:584
 #, php-format
 msgid "%s \"%s\" has been deleted"
 msgstr "%s \"%s\" wurde gelöscht"
 
-#: application/forms/IcingaImportObjectForm.php:36
+#: ../../../../application/forms/IcingaImportObjectForm.php:36
 #, php-format
 msgid "%s \"%s\" has been imported\""
 msgstr "%s \"%s\" wurde importiert\""
 
-#: library/Director/Web/Widget/ActivityLogInfo.php:587
+#: ../../../../library/Director/Web/Widget/ActivityLogInfo.php:587
 #, php-format
 msgid "%s \"%s\" has been modified"
 msgstr "%s \"%s\" wurde geändert"
 
-#: library/Director/Web/Table/IcingaHostAppliedServicesTable.php:107
+#: ../../../../library/Director/Web/Table/IcingaHostAppliedServicesTable.php:107
 #, php-format
 msgid "%s %s(%s)"
 msgstr "%s %s(%s)"
 
-#: library/Director/Web/Table/ObjectSetTable.php:61
+#: ../../../../library/Director/Web/Table/ObjectSetTable.php:66
 #, php-format
 msgid "%s (%d members)"
 msgstr "%s (%d Mitglieder)"
 
-#: application/controllers/HostController.php:248
-#: application/controllers/HostController.php:328
+#: ../../../../application/controllers/HostController.php:235
+#: ../../../../application/controllers/HostController.php:315
 #, php-format
 msgid "%s (Applied Service set)"
 msgstr "%s (zugewiesenes Service-Set)"
 
-#: application/controllers/HostController.php:384
+#: ../../../../application/controllers/HostController.php:369
 #, php-format
 msgid "%s (Service set)"
 msgstr "%s (Service-Set)"
 
-#: application/forms/SettingsForm.php:189
-#: application/forms/SelfServiceSettingsForm.php:256
+#: ../../../../application/forms/SettingsForm.php:189
+#: ../../../../application/forms/SelfServiceSettingsForm.php:256
 #, php-format
 msgid "%s (default)"
 msgstr "%s (default)"
 
-#: library/Director/Web/Form/IplElement/ExtensibleSetElement.php:312
+#: ../../../../library/Director/Web/Form/IplElement/ExtensibleSetElement.php:312
 #, php-format
 msgid "%s (inherited from %s)"
 msgstr "%s (geerbt von %s)"
 
-#: library/Director/Web/Form/IplElement/ExtensibleSetElement.php:307
+#: ../../../../library/Director/Web/Form/IplElement/ExtensibleSetElement.php:307
 #, php-format
 msgid "%s (inherited)"
 msgstr "%s (geerbt)"
 
-#: library/Director/Web/Form/IplElement/ExtensibleSetElement.php:325
+#: ../../../../library/Director/Web/Form/IplElement/ExtensibleSetElement.php:325
 #, php-format
 msgid "%s (not an Array!)"
 msgstr "%s (kein Array)"
 
-#: library/Director/Web/Controller/TemplateController.php:72
+#: ../../../../library/Director/Web/Controller/TemplateController.php:73
 #, php-format
 msgid "%s Templates"
 msgstr "%s Vorlagen"
 
-#: application/forms/IcingaCommandArgumentForm.php:137
+#: ../../../../application/forms/IcingaCommandArgumentForm.php:137
 #, php-format
 msgid "%s argument \"%s\" has been removed"
 msgstr "Das %s-Argument \"%s\" wurde entfernt"
 
-#: library/Director/Web/Controller/TemplateController.php:37
+#: ../../../../library/Director/Web/Controller/TemplateController.php:38
 #, php-format
 msgid "%s based on %s"
 msgstr "%s basierend auf %s"
 
-#: library/Director/Web/Navigation/Renderer/ConfigHealthItemRenderer.php:114
+#: ../../../../library/Director/Web/Navigation/Renderer/ConfigHealthItemRenderer.php:114
 #, php-format
 msgid "%s config changes are available in your configuration branch"
 msgstr ""
 "%s Konfigurationsänderungen sind in diesem Konfigurationszweig verfügbar"
 
-#: library/Director/Web/Navigation/Renderer/ConfigHealthItemRenderer.php:129
+#: ../../../../library/Director/Web/Navigation/Renderer/ConfigHealthItemRenderer.php:129
 #, php-format
 msgid "%s config changes happend since the last deployed configuration"
 msgstr ""
 "%s Konfigurationsänderungen seit der letzten ausgerollten Konfiguration"
 
-#: application/forms/IcingaServiceForm.php:286
+#: ../../../../application/forms/IcingaServiceForm.php:290
 #, php-format
 msgid "%s has been deactivated on %s"
 msgstr "%s wurde auf %s deaktiviert"
 
-#: application/controllers/DataController.php:354
+#: ../../../../application/controllers/DataController.php:354
 #, php-format
 msgid "%s instances"
 msgstr "%s Instanzen"
 
-#: application/forms/IcingaServiceForm.php:322
+#: ../../../../application/forms/IcingaServiceForm.php:326
 #, php-format
 msgid "%s is no longer deactivated on %s"
 msgstr "%s ist auf %s nicht mehr deaktiviert"
 
-#: library/Director/Web/Widget/NotInBranchedHint.php:18
+#: ../../../../library/Director/Web/Widget/NotInBranchedHint.php:18
 #, php-format
 msgid "%s is not available while being in a Configuration Branch: %s"
 msgstr "%s ist beim Arbeiten in einem Konfigurationszweig nicht verfügbar: %s"
 
-#: library/Director/Web/Widget/SyncRunDetails.php:49
+#: ../../../../library/Director/Web/Widget/SyncRunDetails.php:49
 #, php-format
 msgid "%s objects have been modified"
 msgstr "%s Objekte wurden verändert"
 
-#: application/controllers/DataController.php:359
+#: ../../../../application/controllers/DataController.php:359
 #, php-format
 msgid "%s on %s"
 msgstr "%s auf %s"
 
-#: application/controllers/HostController.php:542
+#: ../../../../application/controllers/HostController.php:520
 #, php-format
 msgid "%s on %s (from set: %s)"
 msgstr "%s auf %s (aus dem Set \"%s\")"
 
-#: library/Director/Dashboard/Dashlet/Dashlet.php:227
+#: ../../../../library/Director/Dashboard/Dashlet/Dashlet.php:227
 #, php-format
 msgid "%s related group objects have been created"
 msgstr "%s verwandte Gruppenobjekte wurden erstellt"
 
-#: library/Director/Web/Controller/TemplateController.php:75
+#: ../../../../library/Director/Web/Controller/TemplateController.php:76
 #, php-format
 msgid "%s templates based on %s"
 msgstr "%s Vorlagen basierend auf %s"
 
-#: library/Director/Web/Widget/HealthCheckPluginOutput.php:46
+#: ../../../../library/Director/Web/Widget/HealthCheckPluginOutput.php:46
 #, php-format
 msgid "%s: %d"
 msgstr "%s: %d"
 
-#: application/controllers/BasketController.php:195
+#: ../../../../application/controllers/BasketController.php:219
 #, php-format
 msgid "%s: %s (Snapshot)"
 msgstr "%s: %s (Snapshot)"
 
-#: application/controllers/ImportsourceController.php:310
+#: ../../../../application/controllers/ImportsourceController.php:310
 #, php-format
 msgid "%s: Property Modifier"
 msgstr "%s: Eigenschaftsmodifikatoren"
 
-#: application/controllers/BasketController.php:146
+#: ../../../../application/controllers/BasketController.php:164
 #, php-format
 msgid "%s: Snapshots"
 msgstr "%s: Snapshots"
 
-#: application/controllers/ImportsourceController.php:280
+#: ../../../../application/controllers/ImportsourceController.php:280
 #, php-format
 msgid "%s: add Property Modifier"
 msgstr "%s: Eigenschaftsmodifikator hinzufügen"
 
-#: library/Director/Db/Housekeeping.php:54
+#: ../../../../library/Director/Db/Housekeeping.php:54
 msgid "(Host) group resolve cache"
 msgstr "Gruppenmitgliedschaftscache (Hosts)"
 
-#: application/controllers/ServiceController.php:187
+#: ../../../../application/controllers/ServiceController.php:187
 #, php-format
 msgid "(on %s)"
 msgstr "(auf %s)"
 
-#: library/Director/Web/Form/IplElement/ExtensibleSetElement.php:243
+#: ../../../../library/Director/Web/Form/IplElement/ExtensibleSetElement.php:243
 msgid "- add more -"
 msgstr "- mehr hinzuzufügen -"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1090
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1093
 msgid "- click to add more -"
 msgstr "- Hier klicken um mehr hinzuzufügen -"
 
-#: application/forms/SelfServiceSettingsForm.php:79
+#: ../../../../application/forms/SelfServiceSettingsForm.php:79
 msgid "- no automatic installation -"
 msgstr "- keine automatische Installation -"
 
-#: library/Director/DataType/DataTypeDirectorObject.php:45
-#: library/Director/DataType/DataTypeSqlQuery.php:37
-#: library/Director/Job/ImportJob.php:118
-#: library/Director/Job/SyncJob.php:124
-#: library/Director/Web/Form/QuickBaseForm.php:119
-#: application/views/helpers/FormDataFilter.php:465
-#: application/forms/SettingsForm.php:193
-#: application/forms/SelfServiceSettingsForm.php:252
-#: application/controllers/ConfigController.php:383
-#: application/controllers/ConfigController.php:394
+#: ../../../../library/Director/DataType/DataTypeDirectorObject.php:45
+#: ../../../../library/Director/DataType/DataTypeSqlQuery.php:37
+#: ../../../../library/Director/Job/ImportJob.php:118
+#: ../../../../library/Director/Job/SyncJob.php:124
+#: ../../../../library/Director/Web/Form/QuickBaseForm.php:119
+#: ../../../../application/views/helpers/FormDataFilter.php:465
+#: ../../../../application/forms/SettingsForm.php:193
+#: ../../../../application/forms/SelfServiceSettingsForm.php:252
+#: ../../../../application/forms/DirectorDatafieldForm.php:284
+#: ../../../../application/controllers/ConfigController.php:384
+#: ../../../../application/controllers/ConfigController.php:395
 msgid "- please choose -"
 msgstr "- bitte wählen -"
 
-#: application/controllers/SyncruleController.php:455
+#: ../../../../application/controllers/SyncruleController.php:455
 #, php-format
 msgid "...and %d more"
 msgstr "...und %d weitere"
 
-#: library/Director/Web/Controller/ObjectController.php:730
-#: application/controllers/ConfigController.php:452
+#: ../../../../library/Director/Web/Controller/ObjectController.php:741
+#: ../../../../application/controllers/ConfigController.php:453
 msgid "...and the modifications below are already in the main branch:"
 msgstr "...und folgende Änderungen befinden sich bereits im Hauptzweig:"
 
-#: application/controllers/BasketsController.php:34
+#: ../../../../application/controllers/BasketsController.php:34
 msgid ""
 "A Configuration Basket references specific Configuration Objects or all "
 "objects of a specific type. It has been designed to share Templates, Import/"
@@ -385,7 +386,7 @@ msgstr ""
 "teilen. Dies ist kein Werkzeug welches sich um einzelne Hosts oder Services "
 "kümmert."
 
-#: library/Director/Import/ImportSourceLdap.php:64
+#: ../../../../library/Director/Import/ImportSourceLdap.php:64
 msgid ""
 "A custom LDAP filter to use in addition to the object class. This allows for "
 "a lot of flexibility but requires LDAP filter skills. Simple filters might "
@@ -396,7 +397,7 @@ msgstr ""
 "Kenntnisse über LDAP Filter. Einfache Filter können wie folgt aussehen: "
 "operatingsystem=*server*"
 
-#: application/forms/SyncPropertyForm.php:215
+#: ../../../../application/forms/SyncPropertyForm.php:215
 msgid ""
 "A custom string. Might contain source columns, please use placeholders of "
 "the form ${columnName} in such case.  Structured data sources can be "
@@ -406,15 +407,11 @@ msgstr ""
 "Platzhalter in der Form ${columnName} genutzt werden. Strukturierte Daten "
 "können mittels ${columnName.sub.key} addressiert werden"
 
-#: application/forms/IcingaObjectFieldForm.php:134
-msgid "A description about the field"
-msgstr "Eine Beschreibung des Feldes"
-
-#: application/forms/IcingaTemplateChoiceForm.php:59
+#: ../../../../application/forms/IcingaTemplateChoiceForm.php:59
 msgid "A detailled description explaining what this choice is all about"
 msgstr "Eine detaillierte Beschreibung zum Sinn und Zweck dieser Auswahl"
 
-#: application/forms/IcingaServiceSetForm.php:104
+#: ../../../../application/forms/IcingaServiceSetForm.php:105
 msgid ""
 "A meaningful description explaining your users what to expect when assigning "
 "this set of services"
@@ -423,26 +420,26 @@ msgstr ""
 "wenn dieses Service-Set zugewiesen wird"
 
 # Geschlecht kann hier leider nicht bestimmt werden -ThW
-#: library/Director/Web/Form/DirectorObjectForm.php:662
-#: application/forms/IcingaTimePeriodRangeForm.php:85
-#: application/forms/IcingaScheduledDowntimeRangeForm.php:90
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:665
+#: ../../../../application/forms/IcingaTimePeriodRangeForm.php:85
+#: ../../../../application/forms/IcingaScheduledDowntimeRangeForm.php:90
 #, php-format
 msgid "A new %s has successfully been created"
 msgstr "Ein neuer %s wurde erfolgreich erstellt"
 
-#: application/forms/IcingaGenerateApiKeyForm.php:39
+#: ../../../../application/forms/IcingaGenerateApiKeyForm.php:39
 #, php-format
 msgid "A new Self Service API key for %s has been generated"
 msgstr "Ein neuer Selbstbedienungs-API-Schlüssel für %s wurde erstellt"
 
-#: application/forms/ImportRowModifierForm.php:72
+#: ../../../../application/forms/ImportRowModifierForm.php:107
 msgid ""
 "A property modifier allows you to modify a specific property at import time"
 msgstr ""
 "Ein Eigenschaftsmodifikator erlaubt das Verändern bestimmter Eigenschaften "
 "während des Imports"
 
-#: application/forms/ImportSourceForm.php:17
+#: ../../../../application/forms/ImportSourceForm.php:17
 msgid ""
 "A short name identifying this import source. Use something meaningful, like "
 "\"Hosts from Puppet\", \"Users from Active Directory\" or similar"
@@ -451,7 +448,7 @@ msgstr ""
 "Bezeichnungen wie \"Hosts aus Puppet\" oder \"Benutzer aus LDAP\" bieten "
 "sich an"
 
-#: application/forms/DirectorJobForm.php:74
+#: ../../../../application/forms/DirectorJobForm.php:74
 msgid ""
 "A short name identifying this job. Use something meaningful, like \"Import "
 "Puppet Hosts\""
@@ -459,11 +456,11 @@ msgstr ""
 "Eine kurzer Name um diesen Auftrag zu bezeichnen. Sprechende Bezeichnungen "
 "wie \"Puppet Hosts importieren\" bieten sich an"
 
-#: application/forms/IcingaServiceSetForm.php:30
+#: ../../../../application/forms/IcingaServiceSetForm.php:31
 msgid "A short name identifying this set of services"
 msgstr "Eine kurzer Name um dieses Service-Set zu bezeichnen"
 
-#: library/Director/Web/SelfService.php:234
+#: ../../../../library/Director/Web/SelfService.php:221
 #, php-format
 msgid ""
 "A ticket for this agent could not have been requested from your deployment "
@@ -472,7 +469,7 @@ msgstr ""
 "Für diesen Agenten konnte kein Ticket vom Deployment-Endpoint angefordert "
 "werden: %s"
 
-#: library/Director/Dashboard/Dashlet/DeploymentDashlet.php:95
+#: ../../../../library/Director/Dashboard/Dashlet/DeploymentDashlet.php:96
 #, php-format
 msgid ""
 "A total of %d config changes happened since your last deployed config has "
@@ -480,293 +477,293 @@ msgid ""
 msgstr ""
 "Insgesamt wurde die Konfiguration %d mal seit dem letzten Ausrollen geändert"
 
-#: application/forms/IcingaHostSelfServiceForm.php:49
+#: ../../../../application/forms/IcingaHostSelfServiceForm.php:49
 msgid "API Key"
 msgstr "API-Schlüssel"
 
-#: library/Director/Db/Branch/BranchModificationInspection.php:34
+#: ../../../../library/Director/Db/Branch/BranchModificationInspection.php:34
 msgid "API Users"
 msgstr "API Benutzer"
 
-#: application/forms/IcingaEndpointForm.php:46
-#: application/forms/KickstartForm.php:155
+#: ../../../../application/forms/IcingaEndpointForm.php:46
+#: ../../../../application/forms/KickstartForm.php:155
 msgid "API user"
 msgstr "API Benutzer"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1434
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1437
 msgid "Accept passive checks"
 msgstr "Passive Checkergebnisse akzeptieren"
 
-#: application/forms/IcingaHostForm.php:93
+#: ../../../../application/forms/IcingaHostForm.php:95
 msgid "Accepts config"
 msgstr "Akzeptiert Konfiguration"
 
 # Aktuell wird es so in anderen Modulen übersetzt. -ThW
-#: library/Director/IcingaConfig/TypeFilterSet.php:28
+#: ../../../../library/Director/IcingaConfig/TypeFilterSet.php:28
 msgid "Acknowledgement"
 msgstr "Bestätigung"
 
-#: library/Director/Web/Table/ConfigFileDiffTable.php:81
-#: library/Director/Web/Widget/ActivityLogInfo.php:514
-#: library/Director/Web/Widget/ActivityLogInfo.php:525
-#: application/controllers/BranchController.php:62
+#: ../../../../library/Director/Web/Table/ConfigFileDiffTable.php:81
+#: ../../../../library/Director/Web/Widget/ActivityLogInfo.php:514
+#: ../../../../library/Director/Web/Widget/ActivityLogInfo.php:525
+#: ../../../../application/controllers/BranchController.php:61
 msgid "Action"
 msgstr "Aktion"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1547
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1550
 msgid "Action URL"
 msgstr "Aktions-URL"
 
-#: library/Director/Web/Table/QuickTable.php:281
-#: library/Director/Web/Widget/DeployedConfigInfoHeader.php:72
-#: library/Director/Web/Widget/ActivityLogInfo.php:555
+#: ../../../../library/Director/Web/Table/QuickTable.php:281
+#: ../../../../library/Director/Web/Widget/DeployedConfigInfoHeader.php:72
+#: ../../../../library/Director/Web/Widget/ActivityLogInfo.php:555
 msgid "Actions"
 msgstr "Aktionen"
 
-#: application/forms/SettingsForm.php:175
+#: ../../../../application/forms/SettingsForm.php:175
 msgid "Activation Tool"
 msgstr "Aktivierungswerkzeug"
 
-#: application/forms/SettingsForm.php:154
+#: ../../../../application/forms/SettingsForm.php:154
 msgid "Active-Passive"
 msgstr "Aktiv-Passiv"
 
-#: library/Director/Web/Widget/SyncRunDetails.php:30
-#: application/controllers/BranchController.php:48
+#: ../../../../library/Director/Web/Widget/SyncRunDetails.php:30
+#: ../../../../application/controllers/BranchController.php:47
 msgid "Activity"
 msgstr "Aktivität"
 
-#: library/Director/Dashboard/Dashlet/ActivityLogDashlet.php:11
-#: library/Director/Web/Tabs/InfraTabs.php:29
-#: application/controllers/ConfigController.php:160
+#: ../../../../library/Director/Dashboard/Dashlet/ActivityLogDashlet.php:13
+#: ../../../../library/Director/Web/Tabs/InfraTabs.php:30
+#: ../../../../application/controllers/ConfigController.php:161
 msgid "Activity Log"
 msgstr "Aktivitätslog"
 
-#: library/Director/Web/Controller/ObjectController.php:304
+#: ../../../../library/Director/Web/Controller/ObjectController.php:307
 #, php-format
 msgid "Activity Log: %s"
 msgstr "Aktivitätslog: %s"
 
-#: configuration.php:173
+#: ../../../../configuration.php:141
 msgid "Activity log"
 msgstr "Aktivitätslog"
 
-#: library/Director/Web/ActionBar/TemplateActionBar.php:19
-#: library/Director/Web/ActionBar/ChoicesActionBar.php:16
-#: library/Director/Web/ActionBar/ObjectsActionBar.php:16
-#: library/Director/Web/Form/DirectorObjectForm.php:504
-#: library/Director/Web/Controller/ActionController.php:166
-#: library/Director/Web/Controller/ObjectsController.php:315
-#: library/Director/Web/Controller/ObjectsController.php:356
-#: application/forms/AddToBasketForm.php:73
-#: application/controllers/DataController.php:34
-#: application/controllers/DataController.php:77
-#: application/controllers/DataController.php:95
-#: application/controllers/DataController.php:171
+#: ../../../../library/Director/Web/ActionBar/TemplateActionBar.php:19
+#: ../../../../library/Director/Web/ActionBar/ChoicesActionBar.php:16
+#: ../../../../library/Director/Web/ActionBar/ObjectsActionBar.php:16
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:505
+#: ../../../../library/Director/Web/Controller/ActionController.php:166
+#: ../../../../library/Director/Web/Controller/ObjectsController.php:315
+#: ../../../../library/Director/Web/Controller/ObjectsController.php:356
+#: ../../../../application/forms/AddToBasketForm.php:73
+#: ../../../../application/controllers/DataController.php:34
+#: ../../../../application/controllers/DataController.php:77
+#: ../../../../application/controllers/DataController.php:95
+#: ../../../../application/controllers/DataController.php:171
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: library/Director/Web/Tabs/ObjectTabs.php:51
-#: library/Director/Web/Controller/ObjectController.php:104
+#: ../../../../library/Director/Web/Tabs/ObjectTabs.php:52
+#: ../../../../library/Director/Web/Controller/ObjectController.php:106
 #, php-format
 msgid "Add %s"
 msgstr "%s hinzufügen"
 
-#: application/forms/AddToBasketForm.php:69
+#: ../../../../application/forms/AddToBasketForm.php:69
 #, php-format
 msgid "Add %s objects"
 msgstr "%s Objekte hinzufügen"
 
-#: library/Director/Web/Controller/ObjectController.php:446
+#: ../../../../library/Director/Web/Controller/ObjectController.php:449
 #, php-format
 msgid "Add %s: %s"
 msgstr "%s hinzufügen: %s"
 
-#: application/controllers/HostsController.php:40
-#: application/controllers/HostsController.php:79
+#: ../../../../application/controllers/HostsController.php:40
+#: ../../../../application/controllers/HostsController.php:79
 msgid "Add Service"
 msgstr "Service hinzufügen"
 
-#: application/controllers/HostsController.php:45
-#: application/controllers/HostsController.php:110
+#: ../../../../application/controllers/HostsController.php:45
+#: ../../../../application/controllers/HostsController.php:110
 msgid "Add Service Set"
 msgstr "Service-Set hinzufügen"
 
-#: application/controllers/HostsController.php:127
+#: ../../../../application/controllers/HostsController.php:127
 #, php-format
 msgid "Add Service Set to %d hosts"
 msgstr "Füge Service-Set zu %d Hosts hinzu"
 
-#: application/controllers/HostController.php:121
+#: ../../../../application/controllers/HostController.php:105
 #, php-format
 msgid "Add Service Set to %s"
 msgstr "Service-Set zu %s hinzufügen"
 
-#: application/controllers/HostController.php:107
+#: ../../../../application/controllers/HostController.php:91
 #, php-format
 msgid "Add Service to %s"
 msgstr "Service zu %s hinzufügen"
 
-#: application/controllers/DatafieldController.php:33
+#: ../../../../application/controllers/DatafieldController.php:33
 msgid "Add a new Data Field"
 msgstr "Einen neues Datenfeld hinzufügen"
 
-#: application/controllers/DatafieldcategoryController.php:39
+#: ../../../../application/controllers/DatafieldcategoryController.php:39
 msgid "Add a new Data Field Category"
 msgstr "Eine neue Datenfeldkategorie hinzufügen"
 
-#: application/controllers/DataController.php:64
+#: ../../../../application/controllers/DataController.php:64
 msgid "Add a new Data List"
 msgstr "Datenliste hinzufügen"
 
-#: application/controllers/ImportsourcesController.php:35
+#: ../../../../application/controllers/ImportsourcesController.php:35
 msgid "Add a new Import Source"
 msgstr "Importquelle hinzufügen"
 
-#: application/controllers/JobsController.php:15
-#: application/controllers/JobController.php:35
+#: ../../../../application/controllers/JobsController.php:15
+#: ../../../../application/controllers/JobController.php:35
 msgid "Add a new Job"
 msgstr "Job hinzufügen"
 
-#: application/controllers/SyncrulesController.php:28
+#: ../../../../application/controllers/SyncrulesController.php:28
 msgid "Add a new Sync Rule"
 msgstr "Synchronisationsregel hinzufügen"
 
-#: library/Director/Web/Form/IplElement/ExtensibleSetElement.php:514
+#: ../../../../library/Director/Web/Form/IplElement/ExtensibleSetElement.php:514
 msgid "Add a new entry"
 msgstr "Einen neuen Eintrag hinzufügen"
 
-#: application/controllers/DataController.php:216
+#: ../../../../application/controllers/DataController.php:216
 msgid "Add a new instance"
 msgstr "Neue Instanz hinzufügen"
 
-#: library/Director/Web/Form/IplElement/ExtensibleSetElement.php:271
+#: ../../../../library/Director/Web/Form/IplElement/ExtensibleSetElement.php:271
 msgid "Add a new one..."
 msgstr "Einen Neuen hinzufügen..."
 
-#: application/controllers/ServicesetController.php:51
+#: ../../../../application/controllers/ServicesetController.php:51
 #, php-format
 msgid "Add a service set to \"%s\""
 msgstr "Füge ein Service-Set zu \"%s\" hinzu"
 
-#: application/controllers/ServiceController.php:118
+#: ../../../../application/controllers/ServiceController.php:118
 #, php-format
 msgid "Add a service to \"%s\""
 msgstr "Füge einen Service zu \"%s\" hinzu"
 
-#: application/views/helpers/FormDataFilter.php:516
+#: ../../../../application/views/helpers/FormDataFilter.php:516
 msgid "Add another filter"
 msgstr "Weiteren Filter hinzufügen"
 
-#: application/controllers/BasketController.php:85
+#: ../../../../application/controllers/BasketController.php:83
 msgid "Add chosen objects to a Configuration Basket"
 msgstr "Gewählte Objekte zu einem Konfigurationsbasket hinzufügen"
 
-#: application/forms/DirectorDatalistEntryForm.php:60
+#: ../../../../application/forms/DirectorDatalistEntryForm.php:60
 msgid "Add data list entry"
 msgstr "Datenlisteneintrag hinzufügen"
 
-#: application/controllers/ImportsourceController.php:108
+#: ../../../../application/controllers/ImportsourceController.php:108
 msgid "Add import source"
 msgstr "Importquelle hinzufügen"
 
-#: library/Director/Web/Controller/ObjectController.php:452
+#: ../../../../library/Director/Web/Controller/ObjectController.php:455
 #, php-format
 msgid "Add new Icinga %s"
 msgstr "Neuen Icinga %s hinzufügen"
 
-#: library/Director/Web/Controller/ObjectController.php:435
+#: ../../../../library/Director/Web/Controller/ObjectController.php:438
 #, php-format
 msgid "Add new Icinga %s template"
 msgstr "Neue Icinga %s Vorlage hinzufügen"
 
-#: application/controllers/ImportsourceController.php:253
+#: ../../../../application/controllers/ImportsourceController.php:253
 msgid "Add property modifier"
 msgstr "Eigenschaftsmodifikator hinzufügen"
 
-#: application/controllers/HostController.php:139
-#: application/controllers/ServicesetController.php:68
+#: ../../../../application/controllers/HostController.php:123
+#: ../../../../application/controllers/ServicesetController.php:68
 msgid "Add service"
 msgstr "Service hinzufügen"
 
-#: application/controllers/HostController.php:144
+#: ../../../../application/controllers/HostController.php:128
 msgid "Add service set"
 msgstr "Service-Set hinzufügen"
 
-#: application/controllers/HostsController.php:96
+#: ../../../../application/controllers/HostsController.php:96
 #, php-format
 msgid "Add service to %d hosts"
 msgstr "Füge einen Service zu %d Hosts hinzu"
 
-#: application/controllers/SyncruleController.php:580
+#: ../../../../application/controllers/SyncruleController.php:579
 msgid "Add sync property rule"
 msgstr "Regel für Synchronisationseigenschaft hinzufügen"
 
-#: application/controllers/SyncruleController.php:630
+#: ../../../../application/controllers/SyncruleController.php:628
 #, php-format
 msgid "Add sync property: %s"
 msgstr "Synchronisationseigenschaft hinzufügen: %s"
 
-#: application/controllers/SyncruleController.php:522
+#: ../../../../application/controllers/SyncruleController.php:521
 msgid "Add sync rule"
 msgstr "Synchronisationsregel hinzufügen"
 
-#: library/Director/Web/Controller/ObjectController.php:417
-#: library/Director/Web/Controller/TemplateController.php:129
-#: application/controllers/HostsController.php:70
-#: application/controllers/ServicesController.php:36
-#: application/controllers/BasketController.php:84
-#: application/controllers/ImportsourceController.php:67
-#: application/controllers/JobController.php:89
-#: application/controllers/SyncruleController.php:673
-#: application/controllers/DataController.php:370
+#: ../../../../library/Director/Web/Controller/TemplateController.php:130
+#: ../../../../library/Director/Web/Controller/ObjectController.php:420
+#: ../../../../application/controllers/HostsController.php:70
+#: ../../../../application/controllers/ServicesController.php:36
+#: ../../../../application/controllers/BasketController.php:82
+#: ../../../../application/controllers/ImportsourceController.php:67
+#: ../../../../application/controllers/JobController.php:89
+#: ../../../../application/controllers/SyncruleController.php:671
+#: ../../../../application/controllers/DataController.php:370
 msgid "Add to Basket"
 msgstr "Zu Basket hinzufügen"
 
-#: configuration.php:61
+#: ../../../../configuration.php:54
 msgid ""
 "Additional (monitoring module) object filter to further restrict write access"
 msgstr ""
 "Zusätzliche (Monitoring-Modul-spezifische) Objekt-Filter, um den "
 "Schreibzugriff weiter einzuschränken"
 
-#: library/Director/Import/ImportSourceRestApi.php:151
+#: ../../../../library/Director/Import/ImportSourceRestApi.php:151
 msgid "Additional headers for the HTTP request."
 msgstr "Zusätzliche HTTP-Header für diesen Request"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1533
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1536
 msgid "Additional notes for this object"
 msgstr "Weitere Notizen zu diesem Objekt"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1586
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1589
 msgid "Additional properties"
 msgstr "Weitere Eigenschaften"
 
-#: library/Director/Web/Tabs/ObjectTabs.php:145
+#: ../../../../library/Director/Web/Tabs/ObjectTabs.php:142
 msgid "Agent"
 msgstr "Agent"
 
-#: application/forms/SelfServiceSettingsForm.php:154
+#: ../../../../application/forms/SelfServiceSettingsForm.php:154
 msgid "Agent Version"
 msgstr "Agenten-Version"
 
-#: library/Director/PropertyModifier/PropertyModifierSimpleGroupBy.php:60
+#: ../../../../library/Director/PropertyModifier/PropertyModifierSimpleGroupBy.php:60
 msgid "Aggregation Columns"
 msgstr "Aggregationsspalten"
 
-#: application/forms/IcingaHostSelfServiceForm.php:31
+#: ../../../../application/forms/IcingaHostSelfServiceForm.php:31
 msgid "Alias"
 msgstr "Alias"
 
-#: library/Director/Import/ImportSourceDirectorObject.php:80
+#: ../../../../library/Director/Import/ImportSourceDirectorObject.php:80
 msgid "All Object Types"
 msgstr "Alle Objekttypen"
 
-#: application/controllers/ConfigController.php:173
+#: ../../../../application/controllers/ConfigController.php:174
 msgid "All changes"
 msgstr "Alle Änderungen"
 
-#: application/forms/SettingsForm.php:78
+#: ../../../../application/forms/SettingsForm.php:78
 msgid ""
 "All changes are tracked in the Director database. In addition you might also "
 "want to send an audit log through the Icinga Web 2 logging mechanism. That "
@@ -780,78 +777,79 @@ msgstr ""
 "entweder an Syslog oder die konfigurierte Logdatei geschickt. Dafür muss "
 "Icinga Web 2 mindestens mit dem \"Info\" Level loggen."
 
-#: application/forms/SyncPropertyForm.php:309
+#: ../../../../application/forms/SyncPropertyForm.php:309
 msgid "All custom variables (vars)"
 msgstr "Alle benutzerdefinierten Variablen (vars)"
 
-#: application/forms/BasketForm.php:56
+#: ../../../../application/forms/BasketForm.php:56
 msgid "All of them"
 msgstr "All diese"
 
-#: application/forms/IcingaServiceForm.php:766
+#: ../../../../application/forms/IcingaServiceForm.php:770
 #, php-format
 msgid "All overrides have been removed from \"%s\""
 msgstr "Alle überschriebenen Eigenschaften wurden von \"%s\" entfernt"
 
-#: library/Director/Web/Controller/ObjectsController.php:307
+#: ../../../../library/Director/Web/Controller/ObjectsController.php:307
 #, php-format
 msgid "All your %s Apply Rules"
 msgstr "Alle %s Apply Regeln"
 
-#: library/Director/Web/Controller/ObjectsController.php:252
+#: ../../../../library/Director/Web/Controller/ObjectsController.php:252
 #, php-format
 msgid "All your %s Templates"
 msgstr "Alle %s Templates"
 
-#: application/forms/SelfServiceSettingsForm.php:187
+#: ../../../../application/forms/SelfServiceSettingsForm.php:187
 msgid "Allow Updates"
 msgstr "Updates erlauben"
 
-#: library/Director/DataType/DataTypeDatalist.php:153
+#: ../../../../library/Director/DataType/DataTypeDatalist.php:153
 msgid "Allow for values not on the list"
 msgstr "Erlaube Werte die nicht au f der Liste stehen"
 
-#: configuration.php:39
+#: ../../../../configuration.php:47
 msgid "Allow readonly users to see where a Service came from"
 msgstr "Erlaube Nur-Lesen-Benutzern zu sehen woher ein Service kommt"
 
-#: configuration.php:10
+#: ../../../../configuration.php:14
 msgid "Allow to access the director API"
 msgstr "Zugriff auf die Director API erlauben"
 
-#: configuration.php:11
+#: ../../../../configuration.php:15
 msgid "Allow to access the full audit log"
 msgstr "Zugriff auf das volle Audit-Log erlauben"
 
-#: configuration.php:21
+#: ../../../../configuration.php:29
 msgid "Allow to configure hosts"
 msgstr "Erlauben, Hosts zu konfigurieren"
 
-#: configuration.php:26 configuration.php:29
+#: ../../../../configuration.php:31
+#: ../../../../configuration.php:38
 msgid "Allow to configure notifications (unrestricted)"
 msgstr "Erlaube (unbeschränkt) Benachrichtigungen zu konfigurieren"
 
-#: configuration.php:23
+#: ../../../../configuration.php:34
 msgid "Allow to configure service sets"
 msgstr "Erlauben, Service-Sets zu konfigurieren"
 
-#: configuration.php:22
+#: ../../../../configuration.php:33
 msgid "Allow to configure services"
 msgstr "Erlauben, Services zu konfigurieren"
 
-#: configuration.php:25
+#: ../../../../configuration.php:36
 msgid "Allow to configure users"
 msgstr "Erlauben, Benutzer zu konfigurieren"
 
-#: configuration.php:24
+#: ../../../../configuration.php:35
 msgid "Allow to define Service Set Apply Rules"
 msgstr "Erlaube  Definieren von Service-Set Apply-Regeln"
 
-#: configuration.php:20
+#: ../../../../configuration.php:16
 msgid "Allow to deploy configuration"
 msgstr "Das Ausrollen von Konfigurationen erlauben"
 
-#: configuration.php:34
+#: ../../../../configuration.php:18
 msgid ""
 "Allow to inspect objects through the Icinga 2 API (could contain sensitive "
 "information)"
@@ -859,35 +857,35 @@ msgstr ""
 "Untersuchen von Objekten über die API von Icinga 2 erlauben (könnte sensible "
 "Daten enthalten)"
 
-#: configuration.php:14
+#: ../../../../configuration.php:21
 msgid "Allow to show configuration (could contain sensitive information)"
 msgstr "Anzeigen der Konfiguration erlauben (könnte sensible Daten enthalten)"
 
-#: configuration.php:18
+#: ../../../../configuration.php:24
 msgid "Allow to show the full executed SQL queries in some places"
 msgstr ""
 "Erlaube das Anzeigen der vollständigen ausgeführten SQL-Statements an "
 "einigen Stellen"
 
-#: application/forms/DirectorDatalistEntryForm.php:48
+#: ../../../../application/forms/DirectorDatalistEntryForm.php:48
 msgid ""
 "Allow to use this entry only to users with one of these Icinga Web 2 roles"
 msgstr ""
 "Erlaube es ausschließlich Benutzern mit einer dieser Icinga Web 2 Rollen, "
 "diesen Eintrag zu nutzen"
 
-#: configuration.php:49
+#: ../../../../configuration.php:13
 msgid "Allow unrestricted access to Icinga Director"
 msgstr "Unbeschränkten Zugriff auf die Director API erlauben"
 
-#: configuration.php:43
+#: ../../../../configuration.php:41
 msgid ""
 "Allow users to modify Hosts they are allowed to see in the monitoring module"
 msgstr ""
 "Erlaube Benutzern, Hosts zu bearbeiten, welche sie im Monitoring-Modul sehen "
 "dürfen"
 
-#: configuration.php:47
+#: ../../../../configuration.php:44
 msgid ""
 "Allow users to modify Service they are allowed to see in the monitoring "
 "module"
@@ -895,37 +893,37 @@ msgstr ""
 "Erlaube Benutzern, Services zu bearbeiten, welche sie im Monitoring-Modul "
 "sehen dürfen"
 
-#: configuration.php:67
+#: ../../../../configuration.php:27
 msgid "Allow users with Hostgroup restrictions to access the Groups field"
 msgstr ""
 "Mache Benutzern mit Hostgruppenbeschränkung das Feld \"Gruppen\" zugänglich"
 
-#: application/forms/IcingaTemplateChoiceForm.php:85
+#: ../../../../application/forms/IcingaTemplateChoiceForm.php:85
 msgid "Allowed maximum"
 msgstr "Erlaubtes Maximum"
 
-#: application/forms/DirectorDatalistEntryForm.php:44
+#: ../../../../application/forms/DirectorDatalistEntryForm.php:44
 msgid "Allowed roles"
 msgstr "Erlaubte Rollen"
 
-#: application/forms/IcingaCloneObjectForm.php:102
+#: ../../../../application/forms/IcingaCloneObjectForm.php:106
 msgid "Also clone fields provided by this Template"
 msgstr "Klone auch Felder welche durch diese Vorlage bereitgestellt werden"
 
-#: application/forms/IcingaCloneObjectForm.php:70
+#: ../../../../application/forms/IcingaCloneObjectForm.php:72
 msgid "Also clone single Service Sets defined for this Host"
 msgstr "Klone auch Service-Sets welche für diesen Host definiert wurden"
 
-#: application/forms/IcingaCloneObjectForm.php:61
+#: ../../../../application/forms/IcingaCloneObjectForm.php:63
 msgid "Also clone single Services defined for this Host"
 msgstr "Klone auch Einzelservices welche für diesen Host definiert wurden"
 
-#: library/Director/Import/ImportSourceRestApi.php:211
+#: ../../../../library/Director/Import/ImportSourceRestApi.php:211
 msgid "Also deeper keys can be specific by a dot-notation:"
 msgstr ""
 "Auch tieferliegende Schlüssel können via Punkt-Notation erreicht werden:"
 
-#: application/forms/SelfServiceSettingsForm.php:204
+#: ../../../../application/forms/SelfServiceSettingsForm.php:204
 msgid ""
 "Also install NSClient++. It can be used through the Icinga Agent and comes "
 "with a bunch of additional Check Plugins"
@@ -933,20 +931,20 @@ msgstr ""
 "Installiere auch NSClient++. Dieser kann über den installierten Icinga Agent "
 "genutzt werden und bringt eine Reihe zusätzlicher Check-Plugins"
 
-#: application/forms/DirectorDatafieldForm.php:109
+#: ../../../../application/forms/DirectorDatafieldForm.php:109
 #, php-format
 msgid "Also rename all \"%s\" custom variables to \"%s\" on %d objects?"
 msgstr ""
 "Auch alle benutzerdefinierten \"%s\" Variablen nach \"%s\" auf %d Objekten "
 "umbenennen?"
 
-#: application/forms/DirectorDatafieldForm.php:66
+#: ../../../../application/forms/DirectorDatafieldForm.php:66
 #, php-format
 msgid "Also wipe all \"%s\" custom variables from %d objects?"
 msgstr ""
 "Außerdem alle \"%s\" benutzerdefinierten Variablen von %d Objekten entfernen?"
 
-#: application/forms/IcingaHostForm.php:355
+#: ../../../../application/forms/IcingaHostForm.php:357
 msgid ""
 "Alternative name for this host. Might be a host alias or and kind of string "
 "helping your users to identify this host"
@@ -954,7 +952,7 @@ msgstr ""
 "Alternativer Name für diesen Host. Kann ein Alias oder jede Zeichenkette "
 "sein, die Benutzern hilft, diesen Host zu identifizieren"
 
-#: application/forms/IcingaUserForm.php:135
+#: ../../../../application/forms/IcingaUserForm.php:135
 msgid ""
 "Alternative name for this user. In case your object name is a username, this "
 "could be the full name of the corresponding person"
@@ -963,11 +961,11 @@ msgstr ""
 "Benutzername ist, könnte hier der vollständige Name der betreffenden Person "
 "hinterlegt werden"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1567
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1570
 msgid "Alternative text to be shown in case above icon is missing"
 msgstr "Alternativer Text der angezeigt werden soll, falls obiges Icon fehlt"
 
-#: application/forms/IcingaCommandArgumentForm.php:91
+#: ../../../../application/forms/IcingaCommandArgumentForm.php:91
 msgid ""
 "An Icinga DSL expression that returns a boolean value, e.g.: var cmd = "
 "bool(macro(\"$cmd$\")); return cmd ..."
@@ -975,7 +973,7 @@ msgstr ""
 "Ein Icinga DSL Ausdruck welcher einen booleschen Wert liefert, z.B.: var cmd "
 "= bool(macro(\"$cmd$\")); return cmd ..."
 
-#: application/forms/IcingaCommandArgumentForm.php:52
+#: ../../../../application/forms/IcingaCommandArgumentForm.php:52
 msgid ""
 "An Icinga DSL expression, e.g.: var cmd = macro(\"$cmd$\"); return "
 "typeof(command) == String ..."
@@ -983,7 +981,7 @@ msgstr ""
 "Ein Icinga DSL Ausdruck, z.B.: var cmd = macro(\"$cmd$\"); return "
 "typeof(command) == String ..."
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1549
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1552
 msgid ""
 "An URL leading to additional actions for this object. Often used with Icinga "
 "Classic, rarely with Icinga Web 2 as it provides far better possibilities to "
@@ -993,11 +991,11 @@ msgstr ""
 "Classic, jedoch selten mit Icinga Web 2 genutzt, da dieses viel bessere "
 "Möglichkeiten zur Integration von Addons bietet"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1542
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1545
 msgid "An URL pointing to additional notes for this object"
 msgstr "Eine URL zu Notizen für dieses Objekt"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1558
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1561
 msgid ""
 "An URL pointing to an icon for this object. Try \"tux.png\" for icons "
 "relative to public/img/icons or \"cloud\" (no extension) for items from the "
@@ -1007,14 +1005,14 @@ msgstr ""
 "public/img/icons oder \"cloud\" (ohne Erweiterung) für Objekte aus dem "
 "Icinga Icon-Fundus"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1314
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1317
 msgid ""
 "An alternative display name for this group. If you wonder how this could be "
 "helpful just leave it blank"
 msgstr ""
 "Ein alternativer Anzeigename für diese Gruppe. Kann leer gelassen werden"
 
-#: application/forms/ImportRowModifierForm.php:54
+#: ../../../../application/forms/ImportRowModifierForm.php:54
 msgid ""
 "An extended description for this Import Row Modifier. This should explain "
 "it's purpose and why it has been put in place at all."
@@ -1022,7 +1020,7 @@ msgstr ""
 "Eine erweiterte Beschreibung für diesen Eigenschaftsmodifikator. Diese soll "
 "seine Aufgabe sowie seinen Sinn und Zweck beschreiben."
 
-#: application/forms/ImportSourceForm.php:26
+#: ../../../../application/forms/ImportSourceForm.php:26
 msgid ""
 "An extended description for this Import Source. This should explain what "
 "kind of data you're going to import from this source."
@@ -1030,7 +1028,7 @@ msgstr ""
 "Eine erweiterte Beschreibung für diese Import-Quelle. Diese sollte "
 "erläutern, welche Art von Daten von dieser Quelle bereitgestellt werden."
 
-#: application/forms/SyncRuleForm.php:38
+#: ../../../../application/forms/SyncRuleForm.php:38
 msgid ""
 "An extended description for this Sync Rule. This should explain what this "
 "Rule is going to accomplish."
@@ -1038,7 +1036,8 @@ msgstr ""
 "Eine erweiterte Beschreibung für diese Synchronisationsregel. Sollte "
 "erläutern was diese Regel bezwecken will."
 
-#: application/forms/DirectorDatafieldForm.php:161
+#: ../../../../application/forms/DirectorDatafieldForm.php:160
+#: ../../../../application/forms/IcingaObjectFieldForm.php:96
 msgid ""
 "An extended description for this field. Will be shown as soon as a user puts "
 "the focus on this field"
@@ -1046,7 +1045,7 @@ msgstr ""
 "Eine ausführliche Beschreibung dieses Felds. Wird angezeigt, sobald ein "
 "Benutzer den Fokus auf dieses Feld legt"
 
-#: library/Director/Import/ImportSourceLdap.php:58
+#: ../../../../library/Director/Import/ImportSourceLdap.php:58
 msgid ""
 "An object class to search for. Might be \"user\", \"group\", \"computer\" or "
 "similar"
@@ -1054,7 +1053,7 @@ msgstr ""
 "Die Objektklasse, nach der gesucht werden soll. z.B. \"user\", \"group\", "
 "\"computer\" oder Ähnliches"
 
-#: library/Director/PropertyModifier/PropertyModifierGetPropertyFromOtherImportSource.php:35
+#: ../../../../library/Director/PropertyModifier/PropertyModifierGetPropertyFromOtherImportSource.php:35
 msgid ""
 "Another Import Source. We're going to look up the row with the key matching "
 "the value in the chosen column"
@@ -1062,192 +1061,192 @@ msgstr ""
 "Eine andere Import-Quelle.  Wir suchen dort eine Zeile mit einem Schlüssel, "
 "der dem Wert in der gewählten Spalte entspricht"
 
-#: library/Director/PropertyModifier/PropertyModifierExtractFromDN.php:20
+#: ../../../../library/Director/PropertyModifier/PropertyModifierExtractFromDN.php:20
 msgid "Any first (leftmost) component"
 msgstr "Beliebige erste (linkeste) Komponente"
 
-#: library/Director/Web/SelfService.php:70
-#: library/Director/Web/SelfService.php:111
+#: ../../../../library/Director/Web/SelfService.php:70
+#: ../../../../library/Director/Web/SelfService.php:111
 msgid "Api Key:"
 msgstr "API-Schlüssel:"
 
-#: library/Director/Web/Controller/TemplateController.php:54
+#: ../../../../library/Director/Web/Controller/TemplateController.php:55
 #, php-format
 msgid "Applied %s"
 msgstr "Angewendete(r) %s"
 
-#: application/forms/IcingaHostForm.php:231
+#: ../../../../application/forms/IcingaHostForm.php:233
 msgid "Applied groups"
 msgstr "Angewendete Gruppen"
 
-#: application/controllers/HostController.php:417
+#: ../../../../application/controllers/HostController.php:402
 #, php-format
 msgid "Applied service: %s"
 msgstr "Zugewiesener Service: %s"
 
-#: application/controllers/HostController.php:261
-#: application/controllers/HostController.php:345
+#: ../../../../application/controllers/HostController.php:248
+#: ../../../../application/controllers/HostController.php:331
 msgid "Applied services"
 msgstr "Zugewiesene Services"
 
-#: library/Director/Web/Tabs/ObjectsTabs.php:49
+#: ../../../../library/Director/Web/Tabs/ObjectsTabs.php:51
 msgid "Apply"
 msgstr "Anwenden"
 
-#: application/controllers/ServiceController.php:123
+#: ../../../../application/controllers/ServiceController.php:123
 #, php-format
 msgid "Apply \"%s\""
 msgstr "Apply \"%s\""
 
-#: application/forms/ApplyMigrationsForm.php:25
+#: ../../../../application/forms/ApplyMigrationsForm.php:25
 #, php-format
 msgid "Apply %d pending schema migrations"
 msgstr "%d Schema-Migrations-Scripte anwenden"
 
-#: application/forms/IcingaServiceForm.php:623
+#: ../../../../application/forms/IcingaServiceForm.php:627
 msgid "Apply For"
 msgstr "Anwenden auf"
 
-#: library/Director/Web/Controller/TemplateController.php:169
+#: ../../../../library/Director/Web/Controller/TemplateController.php:170
 msgid "Apply Rule"
 msgstr "Apply-Regel"
 
-#: library/Director/Web/Table/ApplyRulesTable.php:165
+#: ../../../../library/Director/Web/Table/ApplyRulesTable.php:165
 msgid "Apply Rule rendering preview"
 msgstr "Rendering-Vorschau für diese Apply-Regel"
 
-#: library/Director/Import/ImportSourceDirectorObject.php:84
-#: library/Director/Web/Table/DependencyTemplateUsageTable.php:11
-#: library/Director/Web/Table/NotificationTemplateUsageTable.php:11
-#: library/Director/Web/Table/ServiceTemplateUsageTable.php:12
+#: ../../../../library/Director/Import/ImportSourceDirectorObject.php:84
+#: ../../../../library/Director/Web/Table/DependencyTemplateUsageTable.php:11
+#: ../../../../library/Director/Web/Table/NotificationTemplateUsageTable.php:11
+#: ../../../../library/Director/Web/Table/ServiceTemplateUsageTable.php:12
 msgid "Apply Rules"
 msgstr "Apply-Regeln"
 
-#: application/forms/ApplyMigrationsForm.php:20
+#: ../../../../application/forms/ApplyMigrationsForm.php:20
 msgid "Apply a pending schema migration"
 msgstr "Ein ausstehende Schema-Migration durchführen"
 
-#: library/Director/Job/SyncJob.php:92
+#: ../../../../library/Director/Job/SyncJob.php:92
 msgid "Apply changes"
 msgstr "Änderungen anwenden"
 
-#: library/Director/Dashboard/Dashlet/NotificationApplyDashlet.php:19
+#: ../../../../library/Director/Dashboard/Dashlet/NotificationApplyDashlet.php:21
 msgid "Apply notifications with specific properties according to given rules."
 msgstr ""
 "Benachrichtigungen mit bestimmten Eigenschaften anhand von gegebenen Regeln "
 "anwenden"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1123
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1126
 msgid "Apply rule"
 msgstr "Apply Regel"
 
-#: library/Director/Web/Table/ApplyRulesTable.php:172
+#: ../../../../library/Director/Web/Table/ApplyRulesTable.php:172
 msgid "Apply rule history"
 msgstr "Apply-Regel Historie"
 
-#: application/forms/KickstartForm.php:38
+#: ../../../../application/forms/KickstartForm.php:38
 msgid "Apply schema migrations"
 msgstr "Schema-Migrations-Scripte anwenden"
 
-#: application/forms/IcingaNotificationForm.php:81
-#: application/forms/IcingaDependencyForm.php:93
-#: application/forms/IcingaScheduledDowntimeForm.php:82
+#: ../../../../application/forms/IcingaNotificationForm.php:82
+#: ../../../../application/forms/IcingaDependencyForm.php:93
+#: ../../../../application/forms/IcingaScheduledDowntimeForm.php:82
 msgid "Apply to"
 msgstr "Anwenden auf"
 
-#: application/controllers/ServiceController.php:224
+#: ../../../../application/controllers/ServiceController.php:224
 #, php-format
 msgid "Apply: %s"
 msgstr "Apply: %s"
 
-#: library/Director/Web/Table/BranchedIcingaCommandArgumentTable.php:46
-#: library/Director/Web/Table/IcingaCommandArgumentTable.php:49
+#: ../../../../library/Director/Web/Table/BranchedIcingaCommandArgumentTable.php:46
+#: ../../../../library/Director/Web/Table/IcingaCommandArgumentTable.php:49
 msgid "Argument"
 msgstr "Argument"
 
-#: application/forms/IcingaObjectFieldForm.php:99
+#: ../../../../library/Director/Field/FormFieldSuggestion.php:82
 msgid "Argument macros"
 msgstr "Argument Makros"
 
-#: application/forms/IcingaCommandArgumentForm.php:25
+#: ../../../../application/forms/IcingaCommandArgumentForm.php:25
 msgid "Argument name"
 msgstr "Argumentname"
 
-#: application/forms/SyncPropertyForm.php:315
+#: ../../../../application/forms/SyncPropertyForm.php:315
 msgid "Arguments"
 msgstr "Argumente"
 
-#: library/Director/DataType/DataTypeDirectorObject.php:80
-#: library/Director/DataType/DataTypeSqlQuery.php:77
-#: library/Director/DataType/DataTypeDatalist.php:133
+#: ../../../../library/Director/DataType/DataTypeDirectorObject.php:80
+#: ../../../../library/Director/DataType/DataTypeSqlQuery.php:77
+#: ../../../../library/Director/DataType/DataTypeDatalist.php:133
 msgid "Array"
 msgstr "Array"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1619
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1622
 msgid "Assign where"
 msgstr "Zuweisen wo"
 
-#: application/forms/IcingaTemplateChoiceForm.php:95
+#: ../../../../application/forms/IcingaTemplateChoiceForm.php:95
 msgid "Associated Template"
 msgstr "Zugehörige Vorlage"
 
-#: library/Director/Web/Widget/ActivityLogInfo.php:506
-#: application/forms/IcingaScheduledDowntimeForm.php:31
-#: application/controllers/BranchController.php:60
+#: ../../../../library/Director/Web/Widget/ActivityLogInfo.php:506
+#: ../../../../application/forms/IcingaScheduledDowntimeForm.php:31
+#: ../../../../application/controllers/BranchController.php:59
 msgid "Author"
 msgstr "Autor"
 
-#: library/Director/DataType/DataTypeDatalist.php:151
+#: ../../../../library/Director/DataType/DataTypeDatalist.php:151
 msgid "Autocomplete"
 msgstr "Automatische Vervollständigung"
 
-#: library/Director/Dashboard/AutomationDashboard.php:15
+#: ../../../../library/Director/Dashboard/AutomationDashboard.php:15
 msgid "Automate all tasks"
 msgstr "Automatisiere alle Aufgaben"
 
-#: configuration.php:169
+#: ../../../../configuration.php:137
 msgid "Automation"
 msgstr "Automatisierung"
 
-#: application/forms/IcingaTemplateChoiceForm.php:64
+#: ../../../../application/forms/IcingaTemplateChoiceForm.php:64
 msgid "Available choices"
 msgstr "Verfügbare Auswahlmöglichkeiten"
 
-#: library/Director/Web/Controller/TemplateController.php:95
-#: application/controllers/BasketController.php:54
-#: application/controllers/DataController.php:165
+#: ../../../../library/Director/Web/Controller/TemplateController.php:96
+#: ../../../../application/controllers/BasketController.php:52
+#: ../../../../application/controllers/DataController.php:165
 msgid "Back"
 msgstr "Zurück"
 
-#: library/Director/Web/Table/BasketTable.php:31
-#: application/forms/AddToBasketForm.php:61
-#: application/controllers/BasketController.php:36
+#: ../../../../library/Director/Web/Table/BasketTable.php:31
+#: ../../../../application/forms/AddToBasketForm.php:61
+#: ../../../../application/controllers/BasketController.php:34
 msgid "Basket"
 msgstr "Basket"
 
-#: application/forms/BasketForm.php:38
+#: ../../../../application/forms/BasketForm.php:38
 msgid "Basket Definitions"
 msgstr "Basket-Definitionen"
 
-#: application/forms/BasketUploadForm.php:29
-#: application/forms/BasketForm.php:48
+#: ../../../../application/forms/BasketForm.php:48
+#: ../../../../application/forms/BasketUploadForm.php:30
 msgid "Basket Name"
 msgstr "Basket-Name"
 
-#: application/controllers/BasketController.php:142
+#: ../../../../application/controllers/BasketController.php:160
 msgid "Basket Snapshots"
 msgstr "Basket-Snapshots"
 
-#: application/forms/BasketUploadForm.php:145
+#: ../../../../application/forms/BasketUploadForm.php:141
 msgid "Basket has been uploaded"
 msgstr "Basket wurde hochgeladen"
 
-#: application/controllers/BasketsController.php:17
-#: application/controllers/BasketController.php:78
+#: ../../../../application/controllers/BasketsController.php:17
+#: ../../../../application/controllers/BasketController.php:76
 msgid "Baskets"
 msgstr "Baskets"
 
-#: application/forms/SyncRuleForm.php:103
+#: ../../../../application/forms/SyncRuleForm.php:103
 msgid ""
 "Be careful: this is usually NOT what you want, as it makes Sync \"blind\" "
 "for objects matching this filter. This means that \"Purge\" will not work as "
@@ -1260,86 +1259,86 @@ msgstr ""
 "Whitelist\"-Eigenschaftsmodifikator ist für gewöhnlich was man stattdessen "
 "nutzen möchte."
 
-#: library/Director/PropertyModifier/PropertyModifierTrim.php:20
+#: ../../../../library/Director/PropertyModifier/PropertyModifierTrim.php:20
 msgid "Beginning and Ending"
 msgstr "Anfang und Ende"
 
-#: library/Director/PropertyModifier/PropertyModifierTrim.php:21
+#: ../../../../library/Director/PropertyModifier/PropertyModifierTrim.php:21
 msgid "Beginning only"
 msgstr "Nur den Anfang"
 
-#: library/Director/Web/Widget/BackgroundDaemonDetails.php:79
+#: ../../../../library/Director/Web/Widget/BackgroundDaemonDetails.php:79
 msgid "Binary"
 msgstr "Binary"
 
-#: application/controllers/BranchController.php:49
+#: ../../../../application/controllers/BranchController.php:48
 msgid "Branch Activity"
 msgstr "Aktivität in diesem Zweig"
 
-#: library/Director/DataType/DataTypeDictionary.php:36
+#: ../../../../library/Director/DataType/DataTypeDictionary.php:36
 msgid "Can be managed once this object has been created"
 msgstr "Kann verwaltet werden, sobald dieses Objekt erstellt wurde"
 
-#: library/Director/Db/Branch/MergeErrorModificationForMissingObject.php:10
+#: ../../../../library/Director/Db/Branch/MergeErrorModificationForMissingObject.php:10
 #, php-format
 msgid "Cannot apply modification for %s %s, object does not exist"
 msgstr ""
 "Änderung für %s %s kann nicht angewandt werden, das Objekt existiert nicht"
 
-#: library/Director/Db/Branch/MergeErrorDeleteMissingObject.php:10
+#: ../../../../library/Director/Db/Branch/MergeErrorDeleteMissingObject.php:10
 #, php-format
 msgid "Cannot delete %s %s, it does not exist"
 msgstr "%s %s kann nicht gelöscht werden, es existiert nicht"
 
-#: library/Director/Db/Branch/MergeErrorRecreateOnMerge.php:10
+#: ../../../../library/Director/Db/Branch/MergeErrorRecreateOnMerge.php:10
 #, php-format
 msgid "Cannot recreate %s %s"
 msgstr "%s %s kann nicht erneut erstellt werden"
 
-#: application/forms/DirectorDatafieldForm.php:150
-#: application/forms/IcingaObjectFieldForm.php:125
+#: ../../../../application/forms/DirectorDatafieldForm.php:149
+#: ../../../../application/forms/IcingaObjectFieldForm.php:83
 msgid "Caption"
 msgstr "Beschriftung"
 
-#: library/Director/Dashboard/Dashlet/DatafieldCategoryDashlet.php:17
+#: ../../../../library/Director/Dashboard/Dashlet/DatafieldCategoryDashlet.php:19
 msgid "Categories bring structure to your Data Fields"
 msgstr "Kategorien bringen Struktur in konfigurierte Datenfelder"
 
-#: library/Director/Web/Table/DatafieldTable.php:51
+#: ../../../../library/Director/Web/Table/DatafieldTable.php:53
 msgid "Category"
 msgstr "Kategorie"
 
-#: library/Director/Web/Table/DatafieldCategoryTable.php:47
+#: ../../../../library/Director/Web/Table/DatafieldCategoryTable.php:47
 msgid "Category Name"
 msgstr "Kategoriename"
 
-#: application/forms/DirectorDatafieldCategoryForm.php:23
+#: ../../../../application/forms/DirectorDatafieldCategoryForm.php:23
 msgid "Category name"
 msgstr "Kategoriename"
 
-#: application/forms/IcingaMultiEditForm.php:270
+#: ../../../../application/forms/IcingaMultiEditForm.php:270
 #, php-format
 msgid "Changing this value affects %d object(s): %s"
 msgstr "Diesen Wert zu ändern beeinflusst %d Objekt(e): %s"
 
-#: library/Director/PropertyModifier/PropertyModifierTrim.php:28
+#: ../../../../library/Director/PropertyModifier/PropertyModifierTrim.php:28
 msgid "Character Mask"
 msgstr "Zeichenmaske"
 
-#: library/Director/Import/ImportSourceCoreApi.php:57
+#: ../../../../library/Director/Import/ImportSourceCoreApi.php:57
 msgid "Check Commands"
 msgstr "Check-Kommando"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1335
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1338
 msgid "Check command"
 msgstr "Check-Kommando"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1336
-#: application/forms/IcingaNotificationForm.php:263
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1339
+#: ../../../../application/forms/IcingaNotificationForm.php:311
 msgid "Check command definition"
 msgstr "Check-Kommandodefinition"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1404
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1407
 msgid ""
 "Check command timeout in seconds. Overrides the CheckCommand's timeout "
 "attribute"
@@ -1347,57 +1346,57 @@ msgstr ""
 "Timeout für das Check-Kommando in Sekunden. Überschreibt die Timeout-"
 "Konfiguration des Kommandos"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:336
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:337
 msgid "Check execution"
 msgstr "Check-Ausführung"
 
-#: application/forms/ImportCheckForm.php:23
-#: application/forms/SyncCheckForm.php:24
+#: ../../../../application/forms/ImportCheckForm.php:23
+#: ../../../../application/forms/SyncCheckForm.php:24
 msgid "Check for changes"
 msgstr "Auf Änderungen prüfen"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1371
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1374
 msgid "Check interval"
 msgstr "Check-Intervall"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1416
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1419
 msgid "Check period"
 msgstr "Checkzeitraum"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1402
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1405
 msgid "Check timeout"
 msgstr "Check-Timeout"
 
-#: application/forms/ImportCheckForm.php:45
+#: ../../../../application/forms/ImportCheckForm.php:45
 msgid "Checking this Import Source failed"
 msgstr "Überprüfen dieser Importquelle fehlgeschlagen"
 
-#: application/forms/SyncCheckForm.php:66
+#: ../../../../application/forms/SyncCheckForm.php:66
 msgid "Checking this sync rule failed"
 msgstr "Überprüfen dieser Synchronisationsregel fehlgeschlagen"
 
-#: library/Director/Web/Widget/ActivityLogInfo.php:550
+#: ../../../../library/Director/Web/Widget/ActivityLogInfo.php:550
 msgid "Checksum"
 msgstr "Prüfsumme"
 
-#: application/forms/IcingaDependencyForm.php:233
+#: ../../../../application/forms/IcingaDependencyForm.php:233
 msgid "Child Host"
 msgstr "Kind-Host"
 
-#: application/forms/IcingaDependencyForm.php:246
+#: ../../../../application/forms/IcingaDependencyForm.php:246
 msgid "Child Service"
 msgstr "Kind-Service"
 
-#: application/forms/IcingaTemplateChoiceForm.php:48
+#: ../../../../application/forms/IcingaTemplateChoiceForm.php:48
 msgid "Choice name"
 msgstr "Auswahlname"
 
-#: library/Director/Dashboard/Dashlet/ChoicesDashlet.php:11
-#: library/Director/Web/Tabs/ObjectsTabs.php:74
+#: ../../../../library/Director/Dashboard/Dashlet/ChoicesDashlet.php:13
+#: ../../../../library/Director/Web/Tabs/ObjectsTabs.php:76
 msgid "Choices"
 msgstr "Auswahl"
 
-#: application/forms/BasketForm.php:82
+#: ../../../../application/forms/BasketForm.php:82
 msgid ""
 "Choose \"All\" to always add all of them, \"Ignore\" to not care about a "
 "specific Type at all and opt for \"Custom Selection\" in case you want to "
@@ -1408,35 +1407,35 @@ msgstr ""
 "\"Benutzerdefinierte Auswahl\" wenn nur bestimmte Objekte manuell gewählt "
 "werden sollen."
 
-#: application/forms/IcingaTemplateChoiceForm.php:97
+#: ../../../../application/forms/IcingaTemplateChoiceForm.php:97
 msgid "Choose Choice Associated Template"
 msgstr "Wähle eine der Auswahl zugehörige Vorlage"
 
-#: application/controllers/IndexController.php:53
+#: ../../../../application/controllers/IndexController.php:53
 msgid "Choose DB Resource"
 msgstr "Datenbankressource wählen"
 
-#: application/forms/IcingaHostForm.php:188
+#: ../../../../application/forms/IcingaHostForm.php:190
 msgid "Choose a Host Template"
 msgstr "Wähle eine Service-Vorlage"
 
-#: application/forms/IcingaAddServiceForm.php:105
+#: ../../../../application/forms/IcingaAddServiceForm.php:106
 msgid "Choose a service template"
 msgstr "Wähle eine Service-Vorlage"
 
-#: application/forms/SyncRuleForm.php:46
+#: ../../../../application/forms/SyncRuleForm.php:46
 msgid "Choose an object type"
 msgstr "Einen Objekttyp auswählen"
 
-#: application/forms/BasketUploadForm.php:35
+#: ../../../../application/forms/BasketUploadForm.php:37
 msgid "Choose file"
 msgstr "Datei wählen"
 
-#: application/forms/IcingaServiceForm.php:601
+#: ../../../../application/forms/IcingaServiceForm.php:605
 msgid "Choose the host this single service should be assigned to"
 msgstr "Host wählen, dem dieser einzelne Service zugewiesen werden soll"
 
-#: application/forms/IcingaTemplateChoiceForm.php:75
+#: ../../../../application/forms/IcingaTemplateChoiceForm.php:75
 msgid ""
 "Choosing this many options will be mandatory for this Choice. Setting this "
 "to zero will leave this Choice optional, setting it to one results in a "
@@ -1449,79 +1448,79 @@ msgstr ""
 "man mehrere Optionen erzwingen, die Auswahl wandelt sich dann in ein "
 "Mehrfach-Auswahlfeld."
 
-#: application/forms/IcingaZoneForm.php:37
+#: ../../../../application/forms/IcingaZoneForm.php:37
 msgid "Chose an (optional) parent zone"
 msgstr "Eine (optionale) Elternzone auswählen"
 
-#: library/Director/Web/Widget/Documentation.php:38
+#: ../../../../library/Director/Web/Widget/Documentation.php:38
 #, php-format
 msgid "Click to read our documentation: %s"
 msgstr "Anklicken um unsere Dokumentation zu lesen: %s"
 
-#: library/Director/Web/ActionBar/AutomationObjectActionBar.php:44
-#: library/Director/Web/Form/CloneImportSourceForm.php:35
-#: library/Director/Web/Form/CloneSyncRuleForm.php:35
-#: library/Director/Web/Controller/ObjectController.php:381
-#: application/controllers/ImportsourceController.php:148
-#: application/controllers/SyncruleController.php:548
+#: ../../../../library/Director/Web/ActionBar/AutomationObjectActionBar.php:44
+#: ../../../../library/Director/Web/Form/CloneImportSourceForm.php:37
+#: ../../../../library/Director/Web/Form/CloneSyncRuleForm.php:37
+#: ../../../../library/Director/Web/Controller/ObjectController.php:384
+#: ../../../../application/controllers/ImportsourceController.php:148
+#: ../../../../application/controllers/SyncruleController.php:547
 msgid "Clone"
 msgstr "Klonen"
 
-#: application/forms/IcingaCloneObjectForm.php:108
+#: ../../../../application/forms/IcingaCloneObjectForm.php:112
 #, php-format
 msgid "Clone \"%s\""
 msgstr "Klone \"%s\""
 
-#: application/forms/IcingaCloneObjectForm.php:68
+#: ../../../../application/forms/IcingaCloneObjectForm.php:70
 msgid "Clone Service Sets"
 msgstr "Klone Service-Set"
 
-#: application/forms/IcingaCloneObjectForm.php:59
+#: ../../../../application/forms/IcingaCloneObjectForm.php:61
 msgid "Clone Services"
 msgstr "Klone Services"
 
-#: application/forms/IcingaCloneObjectForm.php:100
+#: ../../../../application/forms/IcingaCloneObjectForm.php:104
 msgid "Clone Template Fields"
 msgstr "Vorlagen-Felder klonen"
 
-#: application/forms/IcingaCloneObjectForm.php:49
+#: ../../../../application/forms/IcingaCloneObjectForm.php:51
 msgid "Clone the object as is, preserving imports"
 msgstr "Objekt vollständig unter Erhalt der Vererbung klonen"
 
-#: application/forms/IcingaCloneObjectForm.php:89
+#: ../../../../application/forms/IcingaCloneObjectForm.php:91
 msgid "Clone this service to the very same or to another Host"
 msgstr "Klone diesen Service zum selben oder einem anderen Host"
 
-#: application/forms/IcingaCloneObjectForm.php:80
+#: ../../../../application/forms/IcingaCloneObjectForm.php:82
 msgid "Clone this service to the very same or to another Service Set"
 msgstr "Klone diesen Service"
 
-#: library/Director/Web/Controller/ObjectController.php:214
+#: ../../../../library/Director/Web/Controller/ObjectController.php:217
 #, php-format
 msgid "Clone: %s"
 msgstr "Klone %s"
 
-#: library/Director/Web/Controller/ObjectController.php:221
+#: ../../../../library/Director/Web/Controller/ObjectController.php:224
 msgid "Cloning Apply Rules"
 msgstr "Apply-Regeln klonen"
 
-#: application/controllers/ImportsourceController.php:149
+#: ../../../../application/controllers/ImportsourceController.php:149
 msgid "Cloning Import Sources"
 msgstr "Importquellen klonen"
 
-#: application/controllers/SyncruleController.php:559
+#: ../../../../application/controllers/SyncruleController.php:558
 msgid "Cloning Sync Rules"
 msgstr "Synchronisationsregeln klonen"
 
-#: library/Director/Web/Controller/ObjectController.php:217
+#: ../../../../library/Director/Web/Controller/ObjectController.php:220
 msgid "Cloning Templates"
 msgstr "Vorlagen Klonen"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1162
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1165
 msgid "Cluster Zone"
 msgstr "Cluster Zone"
 
-#: library/Director/Dashboard/Dashlet/ChoicesDashlet.php:17
+#: ../../../../library/Director/Dashboard/Dashlet/ChoicesDashlet.php:19
 msgid ""
 "Combine multiple templates into meaningful Choices, making life easier for "
 "your users"
@@ -1529,7 +1528,7 @@ msgstr ""
 "Kombiniere mehrere Vorlagen zu sprechenden Wahlmöglichkeiten, um die "
 "Benutzung zu vereinfachen"
 
-#: library/Director/PropertyModifier/PropertyModifierSimpleGroupBy.php:62
+#: ../../../../library/Director/PropertyModifier/PropertyModifierSimpleGroupBy.php:62
 msgid ""
 "Comma-separated list of columns that should be aggregated (transformed into "
 "an Array). For all other columns only the first value will be kept."
@@ -1538,373 +1537,373 @@ msgstr ""
 "verwandelt) werden sollen. Für alle anderen Spalten wird lediglich der erste "
 "Wert beibehalten."
 
-#: library/Director/TranslationDummy.php:16
-#: application/forms/IcingaCommandForm.php:58
-#: application/forms/SyncRuleForm.php:20
+#: ../../../../library/Director/TranslationDummy.php:16
+#: ../../../../application/forms/IcingaCommandForm.php:58
+#: ../../../../application/forms/SyncRuleForm.php:20
 msgid "Command"
 msgstr "Kommando"
 
-#: application/forms/BasketForm.php:17
+#: ../../../../application/forms/BasketForm.php:17
 msgid "Command Definitions"
 msgstr "Kommandodefinitionen"
 
-#: application/forms/BasketForm.php:19
+#: ../../../../application/forms/BasketForm.php:19
 msgid "Command Template"
 msgstr "Kommando-Vorlage"
 
-#: library/Director/Dashboard/Dashlet/CommandTemplatesDashlet.php:19
+#: ../../../../library/Director/Dashboard/Dashlet/CommandTemplatesDashlet.php:19
 msgid "Command Templates"
 msgstr "Kommando-Vorlagen"
 
-#: application/controllers/CommandController.php:92
+#: ../../../../application/controllers/CommandController.php:92
 #, php-format
 msgid "Command arguments: %s"
 msgstr "Kommandoargumente: %s"
 
-#: application/forms/IcingaHostForm.php:114
+#: ../../../../application/forms/IcingaHostForm.php:116
 msgid "Command endpoint"
 msgstr "Kommandoendpunkt"
 
-#: application/forms/IcingaCommandForm.php:47
+#: ../../../../application/forms/IcingaCommandForm.php:47
 msgid "Command name"
 msgstr "Kommandoname"
 
-#: application/forms/IcingaCommandForm.php:17
+#: ../../../../application/forms/IcingaCommandForm.php:17
 msgid "Command type"
 msgstr "Kommandotyp"
 
-#: configuration.php:161
-#: library/Director/Dashboard/Dashlet/CommandObjectDashlet.php:13
-#: library/Director/Dashboard/Dashlet/CheckCommandsDashlet.php:19
-#: library/Director/Db/Branch/BranchModificationInspection.php:37
-#: library/Director/Web/Table/CustomvarVariantsTable.php:57
+#: ../../../../configuration.php:129
+#: ../../../../library/Director/Dashboard/Dashlet/CheckCommandsDashlet.php:21
+#: ../../../../library/Director/Dashboard/Dashlet/CommandObjectDashlet.php:15
+#: ../../../../library/Director/Db/Branch/BranchModificationInspection.php:37
+#: ../../../../library/Director/Web/Table/CustomvarVariantsTable.php:57
 msgid "Commands"
 msgstr "Kommandos"
 
-#: application/forms/IcingaScheduledDowntimeForm.php:39
+#: ../../../../application/forms/IcingaScheduledDowntimeForm.php:39
 msgid "Comment"
 msgstr "Kommentar"
 
-#: application/controllers/BasketController.php:345
+#: ../../../../application/controllers/BasketController.php:356
 #, php-format
 msgid "Comparing %s \"%s\" from Snapshot \"%s\" to current config"
 msgstr ""
 "Vergleiche %s \"%s\" aus dem Snapshot \"%s\" mit der aktuellen Konfiguration"
 
-#: application/forms/IcingaCommandArgumentForm.php:89
-#: application/forms/IcingaCommandArgumentForm.php:98
+#: ../../../../application/forms/IcingaCommandArgumentForm.php:89
+#: ../../../../application/forms/IcingaCommandArgumentForm.php:98
 msgid "Condition (set_if)"
 msgstr "Bedingung (set_if)"
 
-#: application/forms/IcingaCommandArgumentForm.php:75
+#: ../../../../application/forms/IcingaCommandArgumentForm.php:75
 msgid "Condition format"
 msgstr "Bedingungsformat"
 
-#: library/Director/Web/Table/CoreApiFieldsTable.php:85
-#: library/Director/Web/Widget/DeploymentInfo.php:60
-#: application/controllers/JobController.php:112
-#: application/controllers/ConfigController.php:277
-#: application/controllers/ConfigController.php:515
+#: ../../../../library/Director/Web/Table/CoreApiFieldsTable.php:85
+#: ../../../../library/Director/Web/Widget/DeploymentInfo.php:61
+#: ../../../../application/controllers/JobController.php:112
+#: ../../../../application/controllers/ConfigController.php:278
+#: ../../../../application/controllers/ConfigController.php:516
 msgid "Config"
 msgstr "Konfiguration"
 
-#: library/Director/Dashboard/Dashlet/DeploymentDashlet.php:18
+#: ../../../../library/Director/Dashboard/Dashlet/DeploymentDashlet.php:19
 msgid "Config Deployment"
 msgstr "Ausrollen der Konfiguration"
 
-#: application/forms/DeployConfigForm.php:100
-#: application/forms/DeploymentLinkForm.php:165
-#: application/controllers/ConfigController.php:490
+#: ../../../../application/forms/DeployConfigForm.php:100
+#: ../../../../application/forms/DeploymentLinkForm.php:166
+#: ../../../../application/controllers/ConfigController.php:491
 msgid "Config deployment failed"
 msgstr "Ausrollen der Konfiguration fehlgeschlagen"
 
-#: application/controllers/ConfigController.php:364
-#: application/controllers/ConfigController.php:365
+#: ../../../../application/controllers/ConfigController.php:365
+#: ../../../../application/controllers/ConfigController.php:366
 msgid "Config diff"
 msgstr "Konfigurationsunterschied"
 
-#: application/controllers/ConfigController.php:323
-#: application/controllers/ConfigController.php:425
+#: ../../../../application/controllers/ConfigController.php:324
+#: ../../../../application/controllers/ConfigController.php:426
 #, php-format
 msgid "Config file \"%s\""
 msgstr "Konfigurationsdatei \"%s\""
 
-#: application/forms/DeployConfigForm.php:76
-#: application/forms/DeployConfigForm.php:95
-#: application/forms/DeploymentLinkForm.php:152
-#: application/controllers/ConfigController.php:470
+#: ../../../../application/forms/DeployConfigForm.php:76
+#: ../../../../application/forms/DeployConfigForm.php:95
+#: ../../../../application/forms/DeploymentLinkForm.php:153
+#: ../../../../application/controllers/ConfigController.php:471
 msgid "Config has been submitted, validation is going on"
 msgstr "Konfiguration wurde übergeben, Überprüfung ist im Gange"
 
-#: application/forms/DeployFormsBug7530.php:87
+#: ../../../../application/forms/DeployFormsBug7530.php:87
 msgid "Config has not been deployed"
 msgstr "Konfiguration wurde nicht ausgerollt"
 
-#: library/Director/Web/ObjectPreview.php:41
+#: ../../../../library/Director/Web/ObjectPreview.php:41
 #, php-format
 msgid "Config preview: %s"
 msgstr "Konfigurationsvorschau: %s"
 
-#: library/Director/ProvidedHook/Monitoring/ServiceActions.php:65
-#: library/Director/Web/Widget/DeploymentInfo.php:82
+#: ../../../../library/Director/ProvidedHook/Monitoring/ServiceActions.php:63
+#: ../../../../library/Director/Web/Widget/DeploymentInfo.php:83
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: application/controllers/HostController.php:285
+#: ../../../../application/controllers/HostController.php:272
 msgid "Configuration (read-only)"
 msgstr "Konfiguration (nur lesen)"
 
-#: library/Director/Dashboard/Dashlet/BasketDashlet.php:11
-#: application/controllers/BasketsController.php:32
+#: ../../../../library/Director/Dashboard/Dashlet/BasketDashlet.php:13
+#: ../../../../application/controllers/BasketsController.php:32
 msgid "Configuration Baskets"
 msgstr "Konfigurationsbaskets"
 
-#: application/forms/SettingsForm.php:121
+#: ../../../../application/forms/SettingsForm.php:121
 msgid "Configuration format"
 msgstr "Konfigurationsformat"
 
-#: application/forms/KickstartForm.php:309
+#: ../../../../application/forms/KickstartForm.php:309
 msgid "Configuration has been stored"
 msgstr "Konfiguration wurde gespeichert"
 
-#: application/forms/AddToBasketForm.php:112
+#: ../../../../application/forms/AddToBasketForm.php:112
 #, php-format
 msgid "Configuration objects have been added to the chosen basket \"%s\""
 msgstr "Konfigurationsobjekte wurden zum gewählten Basket \"%s\" hinzugefügt"
 
-#: library/Director/Web/SelfService.php:192
+#: ../../../../library/Director/Web/SelfService.php:179
 msgid "Configure this Agent via Self Service API"
 msgstr "Konfiguriere diesen Agent über die Selbstbedienungs-API"
 
-#: application/controllers/BasketController.php:231
+#: ../../../../application/controllers/BasketController.php:255
 msgid "Content Checksum"
 msgstr "Prüfsumme (Inhalt)"
 
-#: application/controllers/BasketsController.php:20
+#: ../../../../application/controllers/BasketsController.php:20
 msgid "Create"
 msgstr "Erstellen"
 
-#: application/controllers/BasketController.php:104
+#: ../../../../application/controllers/BasketController.php:102
 msgid "Create Basket"
 msgstr "Basket erstellen"
 
-#: application/controllers/IndexController.php:46
+#: ../../../../application/controllers/IndexController.php:46
 msgid "Create Schema"
 msgstr "Schema erstellen"
 
-#: application/forms/BasketCreateSnapshotForm.php:23
+#: ../../../../application/forms/BasketCreateSnapshotForm.php:23
 msgid "Create Snapshot"
 msgstr "Snapshot erstellen"
 
-#: library/Director/Web/Controller/ObjectsController.php:320
+#: ../../../../library/Director/Web/Controller/ObjectsController.php:320
 #, php-format
 msgid "Create a new %s Apply Rule"
 msgstr "Erstelle eine neue %s Apply-Regel"
 
-#: library/Director/Web/Controller/ObjectsController.php:361
+#: ../../../../library/Director/Web/Controller/ObjectsController.php:361
 #, php-format
 msgid "Create a new %s Set"
 msgstr "Erstelle ein neues %s-Set"
 
-#: library/Director/Web/Controller/TemplateController.php:157
+#: ../../../../library/Director/Web/Controller/TemplateController.php:158
 #, php-format
 msgid "Create a new %s inheriting from this one"
 msgstr "Neuen und von diesem erbenden %s erstellen"
 
-#: library/Director/Web/Controller/TemplateController.php:147
-#: library/Director/Web/Controller/TemplateController.php:167
+#: ../../../../library/Director/Web/Controller/TemplateController.php:148
+#: ../../../../library/Director/Web/Controller/TemplateController.php:168
 #, php-format
 msgid "Create a new %s inheriting from this template"
 msgstr "Einen neuen von dieser Vorlage erbenden %s erstellen"
 
-#: application/controllers/BasketController.php:105
+#: ../../../../application/controllers/BasketController.php:103
 msgid "Create a new Configuration Basket"
 msgstr "Erstelle einen neuen Konfigurationsbasket"
 
-#: library/Director/Web/ActionBar/TemplateActionBar.php:23
-#: library/Director/Web/Controller/ObjectController.php:147
+#: ../../../../library/Director/Web/ActionBar/TemplateActionBar.php:23
+#: ../../../../library/Director/Web/Controller/ObjectController.php:148
 msgid "Create a new Template"
 msgstr "Neue Vorlage erstellen"
 
-#: library/Director/Web/ActionBar/ObjectsActionBar.php:20
+#: ../../../../library/Director/Web/ActionBar/ObjectsActionBar.php:20
 msgid "Create a new object"
 msgstr "Neues Objekt erstellen"
 
-#: library/Director/Web/ActionBar/ChoicesActionBar.php:20
+#: ../../../../library/Director/Web/ActionBar/ChoicesActionBar.php:20
 msgid "Create a new template choice"
 msgstr "Neue Template-Auswahl erstellen"
 
-#: application/forms/KickstartForm.php:37
+#: ../../../../application/forms/KickstartForm.php:37
 msgid "Create database schema"
 msgstr "Datenbankschema erstellen"
 
-#: application/forms/ApplyMigrationsForm.php:31
+#: ../../../../application/forms/ApplyMigrationsForm.php:31
 msgid "Create schema"
 msgstr "Datenbankschema erstellen"
 
-#: application/controllers/BasketController.php:230
+#: ../../../../application/controllers/BasketController.php:254
 msgid "Created"
 msgstr "Erstellt"
 
-#: application/controllers/ImportsourceController.php:109
+#: ../../../../application/controllers/ImportsourceController.php:109
 msgid "Creating Import Sources"
 msgstr "Importquellen erstellen"
 
-#: application/controllers/JobController.php:36
+#: ../../../../application/controllers/JobController.php:36
 msgid "Creating Jobs"
 msgstr "Aufträge erstellen"
 
-#: application/controllers/SyncruleController.php:524
+#: ../../../../application/controllers/SyncruleController.php:523
 msgid "Creating Sync Rules"
 msgstr "Synchronisationsregeln erstellen"
 
-#: library/Director/Web/Controller/ObjectController.php:146
+#: ../../../../library/Director/Web/Controller/ObjectController.php:147
 msgid "Creating Templates"
 msgstr "Vorlagen erstellen"
 
-#: library/Director/IcingaConfig/StateFilterSet.php:26
+#: ../../../../library/Director/IcingaConfig/StateFilterSet.php:26
 msgid "Critical"
 msgstr "Kritisch"
 
-#: library/Director/Web/Controller/TemplateController.php:186
+#: ../../../../library/Director/Web/Controller/TemplateController.php:187
 msgid "Current Template Usage"
 msgstr "Aktuelle Nutzung dieser Vorlage"
 
-#: application/forms/IcingaHostForm.php:104
+#: ../../../../application/forms/IcingaHostForm.php:106
 msgid "Custom Endpoint Name"
 msgstr "Individueller Endpunktname"
 
-#: application/forms/BasketForm.php:57
+#: ../../../../application/forms/BasketForm.php:57
 msgid "Custom Selection"
 msgstr "Benutzerdefinierte Auswahl"
 
-#: application/controllers/CustomvarController.php:13
+#: ../../../../application/controllers/CustomvarController.php:13
 msgid "Custom Variable"
 msgstr "Benutzerdefinierte Variable"
 
-#: application/controllers/CustomvarController.php:14
+#: ../../../../application/controllers/CustomvarController.php:14
 #, php-format
 msgid "Custom Variable variants: %s"
 msgstr "Varianten der benutzerdefinierten Variable: %s"
 
-#: library/Director/Web/Tabs/DataTabs.php:30
+#: ../../../../library/Director/Web/Tabs/DataTabs.php:30
 msgid "Custom Variables"
 msgstr "Benutzerdefinierte Variablen"
 
-#: application/controllers/DataController.php:110
+#: ../../../../application/controllers/DataController.php:110
 msgid "Custom Vars - Overview"
 msgstr "Benutzerdefinierte Variablen - Übersicht"
 
-#: application/forms/SyncPropertyForm.php:180
+#: ../../../../application/forms/SyncPropertyForm.php:180
 msgid "Custom expression"
 msgstr "Benutzerdefinierter Ausdruck"
 
-#: library/Director/Web/Controller/ObjectController.php:250
+#: ../../../../library/Director/Web/Controller/ObjectController.php:253
 #, php-format
 msgid "Custom fields: %s"
 msgstr "Benutzerdefinierte Felder: \"%s\""
 
-#: library/Director/IcingaConfig/TypeFilterSet.php:25
+#: ../../../../library/Director/IcingaConfig/TypeFilterSet.php:25
 msgid "Custom notification"
 msgstr "Benutzerdefinierte Benachrichtigung"
 
-#: library/Director/Web/Form/IcingaObjectFieldLoader.php:266
-#: application/forms/IcingaServiceForm.php:464
+#: ../../../../library/Director/Web/Form/IcingaObjectFieldLoader.php:266
+#: ../../../../application/forms/IcingaServiceForm.php:468
 msgid "Custom properties"
 msgstr "Benutzerdefinierte Eigenschaften"
 
-#: application/forms/SyncPropertyForm.php:67
+#: ../../../../application/forms/SyncPropertyForm.php:67
 msgid "Custom variable"
 msgstr "Benutzerdefinierte Variable"
 
-#: application/forms/SyncPropertyForm.php:308
+#: ../../../../application/forms/SyncPropertyForm.php:308
 msgid "Custom variable (vars.)"
 msgstr "Benutzerdefinierte Variable (vars.)"
 
-#: library/Director/Objects/IcingaService.php:756
-#: library/Director/Objects/IcingaHost.php:164
-#: application/controllers/SuggestController.php:253
-#: application/controllers/SuggestController.php:263
+#: ../../../../library/Director/Objects/IcingaHost.php:163
+#: ../../../../library/Director/Objects/IcingaService.php:669
+#: ../../../../application/controllers/SuggestController.php:253
+#: ../../../../application/controllers/SuggestController.php:263
 msgid "Custom variables"
 msgstr "Benutzerdefinierte Variablen"
 
-#: library/Director/Dashboard/Dashlet/CustomvarDashlet.php:11
+#: ../../../../library/Director/Dashboard/Dashlet/CustomvarDashlet.php:13
 msgid "CustomVar Overview"
 msgstr "Benutzerdefinierte Variable - Übersicht"
 
-#: library/Director/Import/ImportSourceSql.php:41
+#: ../../../../library/Director/Import/ImportSourceSql.php:41
 msgid "DB Query"
 msgstr "Datenbank-Abfrage"
 
-#: application/forms/KickstartForm.php:222
+#: ../../../../application/forms/KickstartForm.php:222
 msgid "DB Resource"
 msgstr "Datenbankressource"
 
-#: library/Director/PropertyModifier/PropertyModifierExtractFromDN.php:15
+#: ../../../../library/Director/PropertyModifier/PropertyModifierExtractFromDN.php:15
 msgid "DN component"
 msgstr "DN Komponente"
 
-#: library/Director/PropertyModifier/PropertyModifierDnsRecords.php:25
+#: ../../../../library/Director/PropertyModifier/PropertyModifierDnsRecords.php:25
 msgid "DNS record type"
 msgstr "DNS-Record-Typ"
 
-#: library/Director/Web/Tabs/MainTabs.php:34
+#: ../../../../library/Director/Web/Tabs/MainTabs.php:35
 msgid "Daemon"
 msgstr "Dienst"
 
-#: library/Director/Web/Widget/BackgroundDaemonDetails.php:40
+#: ../../../../library/Director/Web/Widget/BackgroundDaemonDetails.php:40
 #, php-format
 msgid "Daemon has been stopped %s, was running with PID %s as %s@%s"
 msgstr "Dienst wurde %s gestoppt, lief zuvor mit PID %s als %s@%s"
 
-#: library/Director/Web/Widget/BackgroundDaemonDetails.php:62
+#: ../../../../library/Director/Web/Widget/BackgroundDaemonDetails.php:62
 #, php-format
 msgid "Daemon is running with PID %s as %s@%s, last refresh happened %s"
 msgstr ""
 "Dienst läuft mit PID %s als %s@%s, die letzte Aktualisierung fand %s statt"
 
-#: library/Director/Web/Widget/BackgroundDaemonDetails.php:51
+#: ../../../../library/Director/Web/Widget/BackgroundDaemonDetails.php:51
 #, php-format
 msgid ""
 "Daemon keep-alive is outdated, was last seen running with PID %s as %s@%s %s"
 msgstr ""
 "Daemon keep-alive is outdated, was last seen running with PID %s as %s@%s %s"
 
-#: library/Director/Dashboard/Dashlet/DatafieldCategoryDashlet.php:11
-#: application/controllers/DataController.php:93
+#: ../../../../library/Director/Dashboard/Dashlet/DatafieldCategoryDashlet.php:13
+#: ../../../../application/controllers/DataController.php:93
 msgid "Data Field Categories"
 msgstr "Datenfeldkategorien"
 
-#: application/forms/DirectorDatafieldForm.php:168
+#: ../../../../application/forms/DirectorDatafieldForm.php:167
 msgid "Data Field Category"
 msgstr "Datenfeldkategorie"
 
-#: application/controllers/DataController.php:75
+#: ../../../../application/controllers/DataController.php:75
 msgid "Data Fields"
 msgstr "Datenfelder"
 
-#: application/controllers/DataController.php:65
+#: ../../../../application/controllers/DataController.php:65
 msgid "Data List"
 msgstr "Datenliste"
 
-#: application/forms/SyncRuleForm.php:19
+#: ../../../../application/forms/SyncRuleForm.php:19
 msgid "Data List Entry"
 msgstr "Datenlisteneintrag"
 
-#: application/controllers/DataController.php:59
+#: ../../../../application/controllers/DataController.php:59
 #, php-format
 msgid "Data List: %s"
 msgstr "Datenliste: %s"
 
-#: application/forms/BasketForm.php:34
+#: ../../../../application/forms/BasketForm.php:34
 msgid "Data Lists"
 msgstr "Datenlisten"
 
-#: library/Director/Web/Tabs/DataTabs.php:24
+#: ../../../../library/Director/Web/Tabs/DataTabs.php:24
 msgid "Data field categories"
 msgstr "Datenfeldkategorien"
 
-#: application/forms/DirectorDatafieldCategoryForm.php:17
+#: ../../../../application/forms/DirectorDatafieldCategoryForm.php:17
 msgid ""
 "Data field categories allow to structure Data Fields. Fields with a category "
 "will be shown grouped by category."
@@ -1912,11 +1911,11 @@ msgstr ""
 "Datenfeldkategorien erlauben es, Datenfelder zu strukturieren. Felder mit "
 "einer Kategorie werden nach Kategorie gruppiert angezeigt."
 
-#: library/Director/Web/Tabs/DataTabs.php:21
+#: ../../../../library/Director/Web/Tabs/DataTabs.php:21
 msgid "Data fields"
 msgstr "Datenfelder"
 
-#: application/forms/DirectorDatafieldForm.php:133
+#: ../../../../application/forms/DirectorDatafieldForm.php:133
 msgid ""
 "Data fields allow you to customize input controls for Icinga custom "
 "variables. Once you defined them here, you can provide them through your "
@@ -1929,21 +1928,21 @@ msgstr ""
 "granuläre Kontrolle darüber, welche Eigenschaften in welche Weise "
 "konfigurierbar sein sollen."
 
-#: library/Director/Dashboard/Dashlet/DatafieldDashlet.php:17
+#: ../../../../library/Director/Dashboard/Dashlet/DatafieldDashlet.php:19
 msgid "Data fields make sure that configuration fits your rules"
 msgstr ""
 "Datenfelder sorgen dafür, dass die Konfiguration in vorgegebene Regeln passt"
 
-#: application/forms/DirectorDatalistForm.php:24
+#: ../../../../application/forms/DirectorDatalistForm.php:24
 msgid "Data list"
 msgstr "Datenliste"
 
-#: library/Director/Web/Tabs/DataTabs.php:27
-#: application/controllers/DataController.php:32
+#: ../../../../library/Director/Web/Tabs/DataTabs.php:27
+#: ../../../../application/controllers/DataController.php:32
 msgid "Data lists"
 msgstr "Datenlisten"
 
-#: application/forms/DirectorDatalistForm.php:15
+#: ../../../../application/forms/DirectorDatalistForm.php:15
 msgid ""
 "Data lists are mainly used as data providers for custom variables presented "
 "as dropdown boxes boxes. You can manually manage their entries here in "
@@ -1958,31 +1957,31 @@ msgstr ""
 "Letzteres erlaubt das Synchronisieren der verfügbaren Auswahlmöglichkeiten "
 "mit externen Datenquellen"
 
-#: application/forms/DirectorDatafieldForm.php:181
+#: ../../../../application/forms/DirectorDatafieldForm.php:180
 msgid "Data type"
 msgstr "Datentyp"
 
-#: application/forms/KickstartForm.php:272
+#: ../../../../application/forms/KickstartForm.php:272
 msgid "Database backend"
 msgstr "Datenbankbackend"
 
-#: library/Director/Web/Widget/ActivityLogInfo.php:507
-#: application/controllers/BranchController.php:61
+#: ../../../../library/Director/Web/Widget/ActivityLogInfo.php:507
+#: ../../../../application/controllers/BranchController.php:60
 msgid "Date"
 msgstr "Datum"
 
-#: library/Director/Web/Table/IcingaTimePeriodRangeTable.php:45
-#: library/Director/Web/Table/IcingaScheduledDowntimeRangeTable.php:51
-#: application/forms/IcingaTimePeriodRangeForm.php:21
-#: application/forms/IcingaScheduledDowntimeRangeForm.php:22
+#: ../../../../library/Director/Web/Table/IcingaTimePeriodRangeTable.php:45
+#: ../../../../library/Director/Web/Table/IcingaScheduledDowntimeRangeTable.php:51
+#: ../../../../application/forms/IcingaTimePeriodRangeForm.php:21
+#: ../../../../application/forms/IcingaScheduledDowntimeRangeForm.php:22
 msgid "Day(s)"
 msgstr "Tag(e)"
 
-#: application/forms/IcingaServiceForm.php:173
+#: ../../../../application/forms/IcingaServiceForm.php:175
 msgid "Deactivate"
 msgstr "Deaktivieren"
 
-#: application/forms/SettingsForm.php:130
+#: ../../../../application/forms/SettingsForm.php:130
 msgid ""
 "Default configuration format. Please note that v1.x is for special "
 "transitional projects only and completely unsupported. There are no plans to "
@@ -1993,11 +1992,15 @@ msgstr ""
 "unterstützt wird. Es gibt keine Pläne aus dem Director ein "
 "Konfigurationswerkzeug für Icinga 1.x zu machen"
 
-#: application/forms/SettingsForm.php:32
+#: ../../../../application/forms/SettingsForm.php:32
 msgid "Default global zone"
 msgstr "Globale Standard-Zone"
 
-#: library/Director/Dashboard/CommandsDashboard.php:23
+#: ../../../../library/Director/PropertyModifier/PropertyModifierMap.php:45
+msgid "Default value"
+msgstr "Standardwert"
+
+#: ../../../../library/Director/Dashboard/CommandsDashboard.php:23
 msgid ""
 "Define Check-, Notification- or Event-Commands. Command definitions are the "
 "glue between your Host- and Service-Checks and the Check plugins on your "
@@ -2008,11 +2011,11 @@ msgstr ""
 "Checks und den Check-Plugins auf dem Monitoring- (oder dem überwachten) "
 "System"
 
-#: library/Director/Dashboard/Dashlet/DatafieldDashlet.php:11
+#: ../../../../library/Director/Dashboard/Dashlet/DatafieldDashlet.php:13
 msgid "Define Data Fields"
 msgstr "Datenfelder definieren"
 
-#: library/Director/Dashboard/Dashlet/HostGroupsDashlet.php:17
+#: ../../../../library/Director/Dashboard/Dashlet/HostGroupsDashlet.php:19
 msgid ""
 "Define Host Groups to give your configuration more structure. They are "
 "useful for Dashboards, Notifications or Restrictions"
@@ -2021,7 +2024,7 @@ msgstr ""
 "Nützlich sind diese auch für Dashboards, Benachrichtigungen oder "
 "Berechtigungen"
 
-#: application/forms/SelfServiceSettingsForm.php:116
+#: ../../../../application/forms/SelfServiceSettingsForm.php:116
 msgid ""
 "Define a download Url or local directory from which the a specific Icinga 2 "
 "Agent MSI Installer package should be fetched. Please ensure to only define "
@@ -2039,20 +2042,20 @@ msgstr ""
 "MSI-Installer-Name wie folgt erstellt: Icinga2-v[InstallAgentVersion]-"
 "[OSArchitecture].msi (volles Beispiel: Icinga2-v2.6.3-x86_64.msi)"
 
-#: library/Director/Dashboard/Dashlet/ImportSourceDashlet.php:29
+#: ../../../../library/Director/Dashboard/Dashlet/ImportSourceDashlet.php:30
 msgid "Define and manage imports from various data sources"
 msgstr "Definiert und verwaltet Importe von diversen Datenquellen"
 
-#: library/Director/Dashboard/TimeperiodsDashboard.php:14
+#: ../../../../library/Director/Dashboard/TimeperiodsDashboard.php:14
 msgid "Define custom Time Periods"
 msgstr "Benutzerdefinierte Zeiträume festlegen"
 
-#: library/Director/Dashboard/Dashlet/SyncDashlet.php:29
+#: ../../../../library/Director/Dashboard/Dashlet/SyncDashlet.php:30
 msgid "Define how imported data should be synchronized with Icinga"
 msgstr ""
 "Definieren, wie importierte Daten mit Icinga synchronisiert werden sollen"
 
-#: application/forms/SyncRuleForm.php:54
+#: ../../../../application/forms/SyncRuleForm.php:54
 msgid ""
 "Define what should happen when an object with a matching key already exists. "
 "You could merge its properties (import source wins), replace it completely "
@@ -2065,16 +2068,16 @@ msgstr ""
 "durch das importierte Objekt ersetzt oder ignoriert (hilfreich für einmalige "
 "Importe) werden."
 
-#: library/Director/Dashboard/ObjectsDashboard.php:15
+#: ../../../../library/Director/Dashboard/ObjectsDashboard.php:15
 msgid "Define whatever you want to be monitored"
 msgstr "Angeben, was überwacht werden soll"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1393
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1396
 msgid "Defines after how many check attempts a new hard state is reached"
 msgstr ""
 "Legt fest, nach wie vielen Versuchen ein neuer Hard State erreicht wird"
 
-#: library/Director/Dashboard/Dashlet/UserGroupsDashlet.php:17
+#: ../../../../library/Director/Dashboard/Dashlet/UserGroupsDashlet.php:19
 msgid ""
 "Defining Notifications for User Groups instead of single Users gives more "
 "flexibility"
@@ -2082,7 +2085,7 @@ msgstr ""
 "Für Benutzergruppen anstelle einzelner Benutzer definierte "
 "Benachrichtigungen geben mehr Flexibilität"
 
-#: library/Director/Dashboard/Dashlet/ServiceGroupsDashlet.php:17
+#: ../../../../library/Director/Dashboard/Dashlet/ServiceGroupsDashlet.php:19
 msgid ""
 "Defining Service Groups get more structure. Great for Dashboards. "
 "Notifications and Permissions might be based on groups."
@@ -2090,108 +2093,108 @@ msgstr ""
 "Definiere Service-Gruppen für mehr Struktur. Nützlich für Dashboards. "
 "Benachrichtigungen und Berechtigungen können auf Gruppen basieren."
 
-#: application/forms/IcingaNotificationForm.php:199
-msgid "Delay unless the first notification should be sent"
+#: ../../../../application/forms/IcingaNotificationForm.php:247
+msgid "Delay until the first notification should be sent"
 msgstr "Verzögerung bis die erste Benachrichtigung verschickt werden soll"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:925
-#: application/forms/IcingaObjectFieldForm.php:193
-#: application/forms/SyncRuleForm.php:87
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:928
+#: ../../../../application/forms/SyncRuleForm.php:87
+#: ../../../../application/forms/IcingaObjectFieldForm.php:142
 msgid "Delete"
 msgstr "Löschen"
 
-#: library/Director/PropertyModifier/PropertyModifierSplit.php:13
+#: ../../../../library/Director/PropertyModifier/PropertyModifierSplit.php:13
 msgid "Delimiter"
 msgstr "Trenner"
 
-#: library/Director/Dashboard/Dashlet/DependencyObjectDashlet.php:13
-#: library/Director/Db/Branch/BranchModificationInspection.php:47
-#: application/forms/BasketForm.php:33
+#: ../../../../library/Director/Dashboard/Dashlet/DependencyObjectDashlet.php:13
+#: ../../../../library/Director/Db/Branch/BranchModificationInspection.php:47
+#: ../../../../application/forms/BasketForm.php:33
 msgid "Dependencies"
 msgstr "Abhängigkeiten"
 
-#: application/forms/SyncRuleForm.php:24
+#: ../../../../application/forms/SyncRuleForm.php:24
 msgid "Dependency"
 msgstr "Abhängigkeit"
 
-#: application/forms/DeploymentLinkForm.php:94
+#: ../../../../application/forms/DeploymentLinkForm.php:95
 msgid "Deploy"
 msgstr "Ausrollen"
 
-#: application/forms/DeployConfigForm.php:37
+#: ../../../../application/forms/DeployConfigForm.php:37
 #, php-format
 msgid "Deploy %d pending changes"
 msgstr "%d ausstehende Änderungen ausrollen"
 
-#: library/Director/Dashboard/DeploymentDashboard.php:15
+#: ../../../../library/Director/Dashboard/DeploymentDashboard.php:15
 msgid "Deploy configuration to your Icinga nodes"
 msgstr "Konfiguration auf Icinga Knoten ausrollen"
 
-#: library/Director/Job/ConfigJob.php:45
+#: ../../../../library/Director/Job/ConfigJob.php:45
 msgid "Deploy modified config"
 msgstr "Veränderte Konfiguration ausrollen"
 
-#: library/Director/Web/Widget/DeploymentInfo.php:54
-#: application/controllers/ConfigController.php:270
-#: application/controllers/ConfigController.php:507
+#: ../../../../library/Director/Web/Widget/DeploymentInfo.php:55
+#: ../../../../application/controllers/ConfigController.php:271
+#: ../../../../application/controllers/ConfigController.php:508
 msgid "Deployment"
 msgstr "Deployment"
 
-#: application/forms/SettingsForm.php:165
+#: ../../../../application/forms/SettingsForm.php:165
 msgid "Deployment Path"
 msgstr "Deployment-Pfad"
 
-#: application/controllers/DeploymentController.php:22
+#: ../../../../application/controllers/DeploymentController.php:22
 msgid "Deployment details"
 msgstr "Deployment-Details"
 
-#: application/forms/SettingsForm.php:150
+#: ../../../../application/forms/SettingsForm.php:150
 msgid "Deployment mode"
 msgstr "Ausrollmodus"
 
-#: application/forms/SettingsForm.php:159
+#: ../../../../application/forms/SettingsForm.php:159
 msgid "Deployment mode for Icinga 1 configuration"
 msgstr "Ausrollmodus für Icinga 1 Konfiguration"
 
-#: library/Director/Web/Widget/DeploymentInfo.php:77
+#: ../../../../library/Director/Web/Widget/DeploymentInfo.php:78
 msgid "Deployment time"
 msgstr "Deployment-Zeit"
 
-#: configuration.php:178
-#: library/Director/Web/Tabs/InfraTabs.php:36
-#: application/controllers/ConfigController.php:57
+#: ../../../../configuration.php:146
+#: ../../../../library/Director/Web/Tabs/InfraTabs.php:37
+#: ../../../../application/controllers/ConfigController.php:58
 msgid "Deployments"
 msgstr "Deployments"
 
-#: library/Director/Web/Table/CoreApiFieldsTable.php:87
+#: ../../../../library/Director/Web/Table/CoreApiFieldsTable.php:87
 msgid "Deprecated"
 msgstr "Abgekündigt"
 
-#: application/forms/IcingaCommandArgumentForm.php:31
-#: application/forms/ImportSourceForm.php:24
-#: application/forms/DirectorDatafieldCategoryForm.php:31
-#: application/forms/DirectorDatafieldForm.php:159
-#: application/forms/IcingaServiceSetForm.php:102
-#: application/forms/IcingaObjectFieldForm.php:133
-#: application/forms/SyncRuleForm.php:36
-#: application/forms/ImportRowModifierForm.php:52
-#: application/forms/IcingaTemplateChoiceForm.php:56
+#: ../../../../application/forms/IcingaCommandArgumentForm.php:31
+#: ../../../../application/forms/ImportSourceForm.php:24
+#: ../../../../application/forms/DirectorDatafieldCategoryForm.php:31
+#: ../../../../application/forms/IcingaServiceSetForm.php:103
+#: ../../../../application/forms/ImportRowModifierForm.php:52
+#: ../../../../application/forms/DirectorDatafieldForm.php:158
+#: ../../../../application/forms/SyncRuleForm.php:36
+#: ../../../../application/forms/IcingaObjectFieldForm.php:94
+#: ../../../../application/forms/IcingaTemplateChoiceForm.php:56
 msgid "Description"
 msgstr "Beschreibung"
 
-#: application/forms/IcingaCommandArgumentForm.php:32
+#: ../../../../application/forms/IcingaCommandArgumentForm.php:32
 msgid "Description of the argument"
 msgstr "Beschreibung des Arguments"
 
-#: library/Director/Web/Table/SyncpropertyTable.php:63
+#: ../../../../library/Director/Web/Table/SyncpropertyTable.php:63
 msgid "Destination"
 msgstr "Ziel"
 
-#: application/forms/SyncPropertyForm.php:48
+#: ../../../../application/forms/SyncPropertyForm.php:48
 msgid "Destination Field"
 msgstr "Zielfeld"
 
-#: application/controllers/HealthController.php:25
+#: ../../../../application/controllers/HealthController.php:25
 msgid ""
 "Did you know that you can run this entire Health Check (or just some "
 "sections) as an Icinga Check on a regular base?"
@@ -2199,167 +2202,167 @@ msgstr ""
 "Wussten Sie, dass sich dieser Health-Check (oder auch nur Abschnitte daraus) "
 "als regelmäßiger Icinga-Check ausführen lässt?"
 
-#: library/Director/Web/Widget/ActivityLogInfo.php:367
-#: application/controllers/ConfigController.php:426
+#: ../../../../library/Director/Web/Widget/ActivityLogInfo.php:367
+#: ../../../../application/controllers/ConfigController.php:427
 msgid "Diff"
 msgstr "Diff"
 
-#: library/Director/Web/Widget/DeployedConfigInfoHeader.php:84
+#: ../../../../library/Director/Web/Widget/DeployedConfigInfoHeader.php:84
 msgid "Diff with other config"
 msgstr "Mit anderer Konfiguration vergleichen"
 
-#: library/Director/Web/Table/TemplateUsageTable.php:55
+#: ../../../../library/Director/Web/Table/TemplateUsageTable.php:55
 msgid "Direct"
 msgstr "Direkt"
 
-#: application/controllers/DaemonController.php:20
-#: application/controllers/DaemonController.php:22
+#: ../../../../application/controllers/DaemonController.php:20
+#: ../../../../application/controllers/DaemonController.php:22
 msgid "Director Background Daemon"
 msgstr "Director Hintergrunddienst"
 
-#: application/controllers/HealthController.php:17
+#: ../../../../application/controllers/HealthController.php:17
 msgid "Director Health"
 msgstr "Director-Health"
 
-#: application/controllers/KickstartController.php:16
+#: ../../../../application/controllers/KickstartController.php:16
 msgid "Director Kickstart Wizard"
 msgstr "Director Kickstart-Assistent"
 
-#: library/Director/Import/ImportSourceDirectorObject.php:69
+#: ../../../../library/Director/Import/ImportSourceDirectorObject.php:69
 msgid "Director Object"
 msgstr "Director-Objekt"
 
-#: library/Director/Dashboard/Dashlet/SettingsDashlet.php:11
+#: ../../../../library/Director/Dashboard/Dashlet/SettingsDashlet.php:13
 msgid "Director Settings"
 msgstr "Director-Einstellungen"
 
-#: library/Director/Web/Navigation/Renderer/ConfigHealthItemRenderer.php:81
+#: ../../../../library/Director/Web/Navigation/Renderer/ConfigHealthItemRenderer.php:81
 msgid "Director database schema has not been created yet"
 msgstr "Datenbankschema für Director wurde noch nicht erstellt"
 
-#: application/forms/SyncRuleForm.php:88
+#: ../../../../application/forms/SyncRuleForm.php:88
 msgid "Disable"
 msgstr "Deaktivien"
 
-#: application/forms/IcingaDependencyForm.php:159
+#: ../../../../application/forms/IcingaDependencyForm.php:159
 msgid "Disable Checks"
 msgstr "Checks deaktivieren"
 
-#: application/forms/IcingaDependencyForm.php:167
-msgid "Disable Notificiations"
+#: ../../../../application/forms/IcingaDependencyForm.php:167
+msgid "Disable Notifications"
 msgstr "Benachrichtigungen deaktivieren"
 
-#: application/forms/SettingsForm.php:54
+#: ../../../../application/forms/SettingsForm.php:54
 msgid "Disable all Jobs"
 msgstr "Alle Aufträge deaktivieren"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1296
-#: application/forms/DirectorJobForm.php:37
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1299
+#: ../../../../application/forms/DirectorJobForm.php:37
 msgid "Disabled"
 msgstr "Deaktiviert"
 
-#: application/forms/IcingaCommandForm.php:79
+#: ../../../../application/forms/IcingaCommandForm.php:79
 msgid "Disabled by default, and should only be used in rare cases."
 msgstr ""
 "Standardmäßig deaktiviert, sollte nur in seltenen Fällen benutzt werden."
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1297
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1300
 msgid "Disabled objects will not be deployed"
 msgstr "Deaktivierte Objekte werden nicht ausgerollt"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1312
-#: application/forms/IcingaTimePeriodForm.php:20
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1315
+#: ../../../../application/forms/IcingaTimePeriodForm.php:20
 msgid "Display Name"
 msgstr "Anzeigename"
 
-#: application/forms/IcingaUserForm.php:133
-#: application/forms/IcingaHostForm.php:352
+#: ../../../../application/forms/IcingaUserForm.php:133
+#: ../../../../application/forms/IcingaHostForm.php:354
 msgid "Display name"
 msgstr "Anzeigename"
 
-#: library/Director/Web/Table/CustomvarTable.php:42
+#: ../../../../library/Director/Web/Table/CustomvarTable.php:42
 msgid "Distinct Commands"
 msgstr "Unterschiedliche Kommandos"
 
-#: library/Director/Dashboard/DataDashboard.php:16
+#: ../../../../library/Director/Dashboard/DataDashboard.php:16
 msgid "Do more with custom data"
 msgstr "Mehr mit benutzerdefinierten Daten anfangen"
 
-#: application/forms/SelfServiceSettingsForm.php:36
+#: ../../../../application/forms/SelfServiceSettingsForm.php:36
 msgid "Do not transform at all"
 msgstr "Überhaupt nicht umwandeln"
 
-#: library/Director/Web/SelfService.php:177
+#: ../../../../library/Director/Web/SelfService.php:164
 msgid "Documentation"
 msgstr "Dokumentation"
 
-#: application/forms/SelfServiceSettingsForm.php:50
+#: ../../../../application/forms/SelfServiceSettingsForm.php:50
 msgid "Don't care, my host settings are fine"
 msgstr "Keine Sorge, meine Host-Einstellungen sind in Ordnung"
 
-#: library/Director/IcingaConfig/StateFilterSet.php:21
+#: ../../../../library/Director/IcingaConfig/StateFilterSet.php:21
 msgid "Down"
 msgstr "Down"
 
-#: library/Director/Web/SelfService.php:249
-#: library/Director/Web/SelfService.php:262
-#: application/controllers/SchemaController.php:80
-#: application/controllers/BasketController.php:214
+#: ../../../../library/Director/Web/SelfService.php:236
+#: ../../../../library/Director/Web/SelfService.php:249
+#: ../../../../application/controllers/SchemaController.php:80
+#: ../../../../application/controllers/BasketController.php:238
 msgid "Download"
 msgstr "Download"
 
-#: application/controllers/ImportsourceController.php:176
+#: ../../../../application/controllers/ImportsourceController.php:176
 msgid "Download JSON"
 msgstr "JSON herunterladen"
 
-#: library/Director/Web/Widget/AdditionalTableActions.php:59
+#: ../../../../library/Director/Web/Widget/AdditionalTableActions.php:60
 msgid "Download as JSON"
 msgstr "Als JSON herunterladen"
 
-#: application/forms/SelfServiceSettingsForm.php:83
+#: ../../../../application/forms/SelfServiceSettingsForm.php:83
 msgid "Download from a custom url"
 msgstr "Von einer benutzerdefinierten URL laden"
 
-#: application/forms/SelfServiceSettingsForm.php:82
+#: ../../../../application/forms/SelfServiceSettingsForm.php:82
 msgid "Download from packages.icinga.com"
 msgstr "Von packages.icinga.com herunterladen"
 
-#: library/Director/IcingaConfig/TypeFilterSet.php:30
+#: ../../../../library/Director/IcingaConfig/TypeFilterSet.php:30
 msgid "Downtime ends"
 msgstr "Downtime endet"
 
-#: application/forms/IcingaScheduledDowntimeForm.php:21
+#: ../../../../application/forms/IcingaScheduledDowntimeForm.php:21
 msgid "Downtime name"
 msgstr "Downtime-Name"
 
-#: library/Director/IcingaConfig/TypeFilterSet.php:31
+#: ../../../../library/Director/IcingaConfig/TypeFilterSet.php:31
 msgid "Downtime removed"
 msgstr "Downtime entfernt"
 
-#: library/Director/IcingaConfig/TypeFilterSet.php:29
+#: ../../../../library/Director/IcingaConfig/TypeFilterSet.php:29
 msgid "Downtime starts"
 msgstr "Downtime startet"
 
-#: application/forms/IcingaForgetApiKeyForm.php:22
+#: ../../../../application/forms/IcingaForgetApiKeyForm.php:22
 msgid "Drop Self Service API key"
 msgstr "Selbstbedienungs-API-Schlüssel verwerfen"
 
-#: library/Director/PropertyModifier/PropertyModifierArrayToRow.php:23
-#: library/Director/PropertyModifier/PropertyModifierDictionaryToRow.php:30
+#: ../../../../library/Director/PropertyModifier/PropertyModifierDictionaryToRow.php:30
+#: ../../../../library/Director/PropertyModifier/PropertyModifierArrayToRow.php:23
 msgid "Drop the current row"
 msgstr "Die aktuelle Zeile verwerfen"
 
-#: library/Director/DataType/DataTypeDatalist.php:150
+#: ../../../../library/Director/DataType/DataTypeDatalist.php:150
 msgid "Dropdown (list values only)"
 msgstr "Aufklappmenü (nur Listeneinträge)"
 
-#: library/Director/Web/Widget/DeploymentInfo.php:83
-#: library/Director/Web/Widget/SyncRunDetails.php:29
-#: application/forms/IcingaScheduledDowntimeForm.php:56
+#: ../../../../library/Director/Web/Widget/DeploymentInfo.php:84
+#: ../../../../library/Director/Web/Widget/SyncRunDetails.php:29
+#: ../../../../application/forms/IcingaScheduledDowntimeForm.php:56
 msgid "Duration"
 msgstr "Dauer"
 
-#: library/Director/PropertyModifier/PropertyModifierListToObject.php:18
+#: ../../../../library/Director/PropertyModifier/PropertyModifierListToObject.php:18
 msgid ""
 "Each Array in the list must contain this property. It's value will be used "
 "as the key/object property name for the row."
@@ -2367,39 +2370,39 @@ msgstr ""
 "Jedes Array in der Liste enthält diese Eigenschaft. Dessen Wert wird als "
 "Schlüssel/Objektbezeichner für die Zeile benutzt."
 
-#: application/controllers/DatafieldcategoryController.php:37
+#: ../../../../application/controllers/DatafieldcategoryController.php:37
 msgid "Edit a Category"
 msgstr "Kategorie bearbeiten"
 
-#: application/controllers/DatafieldController.php:31
+#: ../../../../application/controllers/DatafieldController.php:31
 msgid "Edit a Field"
 msgstr "Ein Feld bearbeiten"
 
-#: application/controllers/DataController.php:397
+#: ../../../../application/controllers/DataController.php:397
 msgid "Edit list"
 msgstr "Liste bearbeiten"
 
-#: library/Director/DataType/DataTypeDatalist.php:144
+#: ../../../../library/Director/DataType/DataTypeDatalist.php:144
 msgid "Element behavior"
 msgstr "Verhalten des Elements"
 
-#: application/forms/IcingaUserForm.php:36
+#: ../../../../application/forms/IcingaUserForm.php:36
 msgid "Email"
 msgstr "E-Mail"
 
-#: application/forms/SettingsForm.php:69
+#: ../../../../application/forms/SettingsForm.php:69
 msgid "Enable audit log"
 msgstr "Revisionslog aktivieren"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1446
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1449
 msgid "Enable event handler"
 msgstr "Eventhandler aktivieren"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1458
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1461
 msgid "Enable flap detection"
 msgstr "Flap-Erkennung aktivieren"
 
-#: application/forms/SettingsForm.php:111
+#: ../../../../application/forms/SettingsForm.php:111
 msgid ""
 "Enabled the feature for custom endpoint names, where you can choose a "
 "different name for the generated endpoint object. This uses some Icinga "
@@ -2412,49 +2415,49 @@ msgstr ""
 "benutzerdefinierte Variable eingesetzt. Bitte NICHT aktivieren, wenn "
 "abweichende Endpunktnamen nicht wirklich erforderlich sind!"
 
-#: library/Director/PropertyModifier/PropertyModifierTrim.php:22
+#: ../../../../library/Director/PropertyModifier/PropertyModifierTrim.php:22
 msgid "Ending only"
 msgstr "Nur das Ende"
 
-#: library/Director/Import/ImportSourceDirectorObject.php:72
-#: library/Director/Web/Table/ObjectsTableEndpoint.php:19
-#: application/forms/IcingaEndpointForm.php:24
-#: application/forms/SyncRuleForm.php:25
+#: ../../../../library/Director/Import/ImportSourceDirectorObject.php:72
+#: ../../../../library/Director/Web/Table/ObjectsTableEndpoint.php:19
+#: ../../../../application/forms/IcingaEndpointForm.php:24
+#: ../../../../application/forms/SyncRuleForm.php:25
 msgid "Endpoint"
 msgstr "Endpunkt"
 
-#: application/forms/KickstartForm.php:121
+#: ../../../../application/forms/KickstartForm.php:121
 msgid "Endpoint Name"
 msgstr "Name des Endpunkts"
 
-#: application/forms/IcingaEndpointForm.php:31
+#: ../../../../application/forms/IcingaEndpointForm.php:31
 msgid "Endpoint address"
 msgstr "Adresse des Endpunkts"
 
-#: library/Director/Web/Widget/InspectPackages.php:46
+#: ../../../../library/Director/Web/Widget/InspectPackages.php:46
 msgid "Endpoint in your Root Zone"
 msgstr "Endpunkte in Rootzone"
 
-#: application/forms/IcingaEndpointForm.php:18
+#: ../../../../application/forms/IcingaEndpointForm.php:18
 msgid "Endpoint template name"
 msgstr "Name der Endpunktsvorlage"
 
-#: library/Director/Dashboard/Dashlet/EndpointObjectDashlet.php:17
-#: library/Director/Db/Branch/BranchModificationInspection.php:35
-#: library/Director/Import/ImportSourceCoreApi.php:59
+#: ../../../../library/Director/Dashboard/Dashlet/EndpointObjectDashlet.php:18
+#: ../../../../library/Director/Db/Branch/BranchModificationInspection.php:35
+#: ../../../../library/Director/Import/ImportSourceCoreApi.php:59
 msgid "Endpoints"
 msgstr "Endpunkte"
 
-#: application/controllers/PhperrorController.php:15
-#: application/controllers/PhperrorController.php:34
+#: ../../../../application/controllers/PhperrorController.php:15
+#: ../../../../application/controllers/PhperrorController.php:34
 msgid "Error"
 msgstr "Fehler"
 
-#: application/forms/IcingaHostForm.php:86
+#: ../../../../application/forms/IcingaHostForm.php:88
 msgid "Establish connection"
 msgstr "Verbindung herstellen"
 
-#: application/forms/IcingaServiceForm.php:627
+#: ../../../../application/forms/IcingaServiceForm.php:631
 msgid ""
 "Evaluates the apply for rule for all objects with the custom attribute "
 "specified. E.g selecting \"host.vars.custom_attr\" will generate \"for "
@@ -2468,83 +2471,85 @@ msgstr ""
 "Dabei ist \"config\" dann als \"$config$\" zugänglich. HINWEIS: nur "
 "benutzerdefinierte Eigenschaften vom Typ \"Array\" sind wählbar."
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1350
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1353
 msgid "Event command"
 msgstr "Event-Kommando"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1351
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1354
 msgid "Event command definition"
 msgstr "Event-Kommandodefinition"
 
-#: library/Director/PropertyModifier/PropertyModifierDictionaryToRow.php:23
+#: ../../../../library/Director/PropertyModifier/PropertyModifierDictionaryToRow.php:23
 msgid ""
 "Every Dictionary entry has a key, its value will be provided in this column"
 msgstr ""
+"Jeder Dictionary-Eintrag hat einen Schlüssel, sein Wert wird in dieser "
+"Spalte bereitgestellt"
 
-#: application/forms/IcingaScheduledDowntimeForm.php:41
+#: ../../../../application/forms/IcingaScheduledDowntimeForm.php:41
 msgid "Every related downtime will show this comment"
 msgstr "Jede zugehörige Downtime wird diesen Kommentar anzeigen"
 
-#: application/forms/IcingaTimePeriodForm.php:70
+#: ../../../../application/forms/IcingaTimePeriodForm.php:70
 msgid "Exclude other time periods from this."
 msgstr "Andere Zeiträume von diesem ausschließen."
 
-#: application/forms/IcingaTimePeriodForm.php:67
+#: ../../../../application/forms/IcingaTimePeriodForm.php:67
 msgid "Exclude period"
 msgstr "Zeitraum ausschließen"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1428
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1431
 msgid "Execute active checks"
 msgstr "Aktive Checks ausführen"
 
-#: application/forms/DirectorJobForm.php:48
+#: ../../../../application/forms/DirectorJobForm.php:48
 msgid "Execution interval for this job, in seconds"
 msgstr "Ausführungsintervall dieses Auftrags, in Sekunden"
 
-#: application/forms/SyncPropertyForm.php:251
+#: ../../../../application/forms/SyncPropertyForm.php:251
 msgid "Existing Data Lists"
 msgstr "Vorhandene Datenlisten"
 
-#: application/forms/SyncPropertyForm.php:236
+#: ../../../../application/forms/SyncPropertyForm.php:236
 msgid "Existing templates"
 msgstr "Vorhandene Vorlagen"
 
-#: application/controllers/BranchController.php:46
+#: ../../../../application/controllers/BranchController.php:45
 msgid "Expected Modification"
 msgstr "Erwartete Änderungen"
 
-#: application/forms/SyncPropertyForm.php:179
+#: ../../../../application/forms/SyncPropertyForm.php:179
 msgid "Expert mode"
 msgstr "Expertenmodus"
 
-#: library/Director/DataType/DataTypeDatalist.php:154
+#: ../../../../library/Director/DataType/DataTypeDatalist.php:154
 msgid "Extend the list with new values"
 msgstr "Erweitere die Liste mit neuen Werten"
 
-#: library/Director/Web/Tabs/ObjectsTabs.php:35
+#: ../../../../library/Director/Web/Tabs/ObjectsTabs.php:36
 msgid "External"
 msgstr "Extern"
 
-#: application/forms/BasketForm.php:18
+#: ../../../../application/forms/BasketForm.php:18
 msgid "External Command Definitions"
 msgstr "Externe Kommandodefinitionen"
 
-#: library/Director/Dashboard/Dashlet/ExternalCheckCommandsDashlet.php:19
+#: ../../../../library/Director/Dashboard/Dashlet/ExternalCheckCommandsDashlet.php:19
 msgid "External Commands"
 msgstr "Externe Kommandos"
 
-#: library/Director/Dashboard/Dashlet/ExternalCheckCommandsDashlet.php:12
+#: ../../../../library/Director/Dashboard/Dashlet/ExternalCheckCommandsDashlet.php:12
 msgid ""
 "External Commands have been defined in your local Icinga 2 Configuration."
 msgstr ""
 "Externe Kommandos wurden in der lokalen Icinga-2-Konfiguration definiert."
 
-#: library/Director/Dashboard/Dashlet/ExternalNotificationCommandsDashlet.php:19
+#: ../../../../library/Director/Dashboard/Dashlet/ExternalNotificationCommandsDashlet.php:19
 msgid "External Notification Commands"
 msgstr "Externe Benachrichtigungskommandos"
 
-#: library/Director/Dashboard/Dashlet/CommandTemplatesDashlet.php:12
-#: library/Director/Dashboard/Dashlet/ExternalNotificationCommandsDashlet.php:12
+#: ../../../../library/Director/Dashboard/Dashlet/CommandTemplatesDashlet.php:12
+#: ../../../../library/Director/Dashboard/Dashlet/ExternalNotificationCommandsDashlet.php:12
 msgid ""
 "External Notification Commands have been defined in your local Icinga 2 "
 "Configuration."
@@ -2552,83 +2557,84 @@ msgstr ""
 "Externe Benachrichtigungskommandos wurden in der lokalen Icinga-2-"
 "Konfiguration definiert."
 
-#: library/Director/Import/ImportSourceDirectorObject.php:83
+#: ../../../../library/Director/Import/ImportSourceDirectorObject.php:83
 msgid "External Objects"
 msgstr "Externe Objekte"
 
-#: library/Director/Web/Widget/BackgroundDaemonDetails.php:75
+#: ../../../../library/Director/Web/Widget/BackgroundDaemonDetails.php:75
 msgid "FQDN"
 msgstr "FQDN"
 
-#: library/Director/Web/Widget/DeploymentInfo.php:141
+#: ../../../../library/Director/Web/Widget/DeploymentInfo.php:142
 msgid "Failed"
 msgstr "Fehlgeschlagen"
 
-#: application/forms/IcingaImportObjectForm.php:42
+#: ../../../../application/forms/IcingaImportObjectForm.php:42
 #, php-format
 msgid "Failed to import %s \"%s\""
 msgstr "Import von %s fehlgeschlagen \"%s\""
 
-#: application/forms/SettingsForm.php:109
+#: ../../../../application/forms/SettingsForm.php:109
 msgid "Feature: Custom Endpoint Name"
 msgstr "Feature: Individueller Endpunktname"
 
-#: application/forms/IcingaObjectFieldForm.php:196
+#: ../../../../application/forms/IcingaObjectFieldForm.php:145
 msgid "Field has been removed"
 msgstr "Feld wurde entfernt"
 
-#: library/Director/Web/Table/IcingaObjectDatafieldTable.php:50
-#: library/Director/Web/Table/DatafieldTable.php:50
-#: application/forms/DirectorDatafieldForm.php:141
+#: ../../../../library/Director/Web/Table/IcingaObjectDatafieldTable.php:50
+#: ../../../../library/Director/Web/Table/DatafieldTable.php:52
+#: ../../../../application/forms/DirectorDatafieldForm.php:141
 msgid "Field name"
 msgstr "Feldname"
 
-#: application/forms/DirectorDatafieldForm.php:182
+#: ../../../../application/forms/DirectorDatafieldForm.php:181
 msgid "Field type"
 msgstr "Feldtyp"
 
-#: library/Director/Web/Tabs/ObjectTabs.php:103
+#: ../../../../library/Director/Web/Tabs/ObjectTabs.php:100
 msgid "Fields"
 msgstr "Felder"
 
-#: library/Director/Web/Table/GeneratedConfigFileTable.php:84
-#: library/Director/Web/Table/ConfigFileDiffTable.php:82
+#: ../../../../library/Director/Web/Table/GeneratedConfigFileTable.php:84
+#: ../../../../library/Director/Web/Table/ConfigFileDiffTable.php:82
 msgid "File"
 msgstr "Datei"
 
-#: library/Director/Web/Widget/InspectPackages.php:54
+#: ../../../../library/Director/Web/Widget/InspectPackages.php:54
 #, php-format
 msgid "File Content: %s"
 msgstr "Dateiinhalt: %s"
 
-#: library/Director/Web/Widget/InspectPackages.php:52
+#: ../../../../library/Director/Web/Widget/InspectPackages.php:52
 #, php-format
 msgid "Files in Stage: %s"
 msgstr "Dateien im Stage: %s"
 
-#: library/Director/PropertyModifier/PropertyModifierRejectOrSelect.php:44
-#: library/Director/PropertyModifier/PropertyModifierRejectOrSelect.php:54
+#: ../../../../library/Director/PropertyModifier/PropertyModifierRejectOrSelect.php:44
+#: ../../../../library/Director/PropertyModifier/PropertyModifierRejectOrSelect.php:54
 msgid "Filter"
 msgstr "Filter"
 
-#: application/forms/SyncPropertyForm.php:103
-#: application/forms/SyncRuleForm.php:95
+#: ../../../../application/forms/ImportRowModifierForm.php:89
+#: ../../../../application/forms/SyncPropertyForm.php:103
+#: ../../../../application/forms/SyncRuleForm.php:95
 msgid "Filter Expression"
 msgstr "Filterausdruck"
 
-#: configuration.php:80
+#: ../../../../configuration.php:57
 msgid "Filter available notification apply rules"
 msgstr "Verfügbare Benachrichtigungs-Apply-Regeln filtern"
 
-#: configuration.php:87
+#: ../../../../configuration.php:60
 msgid "Filter available scheduled downtime rules"
 msgstr "Verfügbare Geplante-Downtime-Regeln filtern"
 
-#: configuration.php:73
+#: ../../../../configuration.php:63
 msgid "Filter available service apply rules"
 msgstr "Verfügbare Service-Apply-Regeln filtern"
 
-#: configuration.php:94
+#: ../../../../configuration.php:66
 msgid ""
 "Filter available service set templates. Use asterisks (*) as wildcards, like "
 "in DB* or *net*"
@@ -2636,103 +2642,103 @@ msgstr ""
 "Verfügbare Service-Set-Vorlagen filtern. Benutze Sternchen (*) als "
 "Platzhalter, wie in DB* oder *net*"
 
-#: library/Director/PropertyModifier/PropertyModifierArrayFilter.php:29
-#: library/Director/PropertyModifier/PropertyModifierRejectOrSelect.php:27
+#: ../../../../library/Director/PropertyModifier/PropertyModifierArrayFilter.php:29
+#: ../../../../library/Director/PropertyModifier/PropertyModifierRejectOrSelect.php:27
 msgid "Filter method"
 msgstr "Filter-Methode"
 
-#: library/Director/PropertyModifier/PropertyModifierArrayElementByPosition.php:33
+#: ../../../../library/Director/PropertyModifier/PropertyModifierArrayElementByPosition.php:33
 msgid "First Element"
 msgstr "Erstes Element"
 
-#: application/forms/IcingaNotificationForm.php:197
+#: ../../../../application/forms/IcingaNotificationForm.php:245
 msgid "First notification delay"
 msgstr "Verzögerung der ersten Benachrichtigung"
 
-#: application/forms/IcingaScheduledDowntimeForm.php:47
+#: ../../../../application/forms/IcingaScheduledDowntimeForm.php:47
 msgid "Fixed"
 msgstr "Fix"
 
-#: library/Director/IcingaConfig/TypeFilterSet.php:33
+#: ../../../../library/Director/IcingaConfig/TypeFilterSet.php:33
 msgid "Flapping"
 msgstr "Flapping"
 
-#: library/Director/IcingaConfig/TypeFilterSet.php:35
+#: ../../../../library/Director/IcingaConfig/TypeFilterSet.php:35
 msgid "Flapping ends"
 msgstr "Flapping endet"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1479
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1482
 msgid ""
 "Flapping lower bound in percent for a service to be considered not flapping"
 msgstr ""
 "Untere Flapping-Grenze in Prozent um einen Service nicht als Flapping "
 "einzuordnen"
 
-#: library/Director/IcingaConfig/TypeFilterSet.php:34
+#: ../../../../library/Director/IcingaConfig/TypeFilterSet.php:34
 msgid "Flapping starts"
 msgstr "Flapping beginnt"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1466
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1469
 msgid "Flapping threshold (high)"
 msgstr "Flapping Schwellewert (hoch)"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1477
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1480
 msgid "Flapping threshold (low)"
 msgstr "Flapping Schwellwert (niedrig)"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1468
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1471
 msgid "Flapping upper bound in percent for a service to be considered flapping"
 msgstr ""
 "Obere Flapping-Grenze in Prozent um einen Service als Flapping einzuordnen"
 
-#: application/forms/IcingaCloneObjectForm.php:50
+#: ../../../../application/forms/IcingaCloneObjectForm.php:52
 msgid "Flatten all inherited properties, strip imports"
 msgstr "Alle vererbten Eigenschaften flach machen, Importierte entfernen"
 
-#: application/forms/SelfServiceSettingsForm.php:100
+#: ../../../../application/forms/SelfServiceSettingsForm.php:100
 msgid "Flush API directory"
 msgstr "API-Verzeichnis leeren"
 
-#: library/Director/Web/SelfService.php:245
+#: ../../../../library/Director/Web/SelfService.php:232
 msgid "For manual configuration"
 msgstr "Manuelle Konfiguration"
 
-#: library/Director/Job/ConfigJob.php:31
+#: ../../../../library/Director/Job/ConfigJob.php:31
 msgid "Force rendering"
 msgstr "Erstellen erzwingen"
 
-#: library/Director/Objects/DirectorDatafield.php:237
+#: ../../../../library/Director/Objects/DirectorDatafield.php:204
 #, php-format
 msgid "Form element could not be created, %s is missing"
 msgstr "Formularelement konnte nicht erstellt werden, %s ist nicht vorhanden"
 
-#: library/Director/Web/Form/QuickForm.php:524
-#: library/Director/Web/Form/QuickForm.php:551
+#: ../../../../library/Director/Web/Form/QuickForm.php:524
+#: ../../../../library/Director/Web/Form/QuickForm.php:551
 msgid "Form has successfully been sent"
 msgstr "Formular wurde erfolgreich abgeschickt"
 
-#: application/forms/IcingaServiceVarForm.php:32
-#: application/forms/IcingaHostVarForm.php:32
+#: ../../../../application/forms/IcingaServiceVarForm.php:32
+#: ../../../../application/forms/IcingaHostVarForm.php:32
 msgid "Format"
 msgstr "Format"
 
-#: library/Director/Web/Widget/ActivityLogInfo.php:393
+#: ../../../../library/Director/Web/Widget/ActivityLogInfo.php:393
 msgid "Former object"
 msgstr "Vorheriges Objekt"
 
-#: application/forms/SelfServiceSettingsForm.php:24
+#: ../../../../application/forms/SelfServiceSettingsForm.php:24
 msgid "Fully qualified domain name (FQDN)"
 msgstr "Voll qualifizierter Domain-Name (FQDN)"
 
-#: application/forms/IcingaGenerateApiKeyForm.php:24
+#: ../../../../application/forms/IcingaGenerateApiKeyForm.php:24
 msgid "Generate Self Service API key"
 msgstr "Selbstservice-API-Schlüssel generieren"
 
-#: library/Director/Web/SelfService.php:114
+#: ../../../../library/Director/Web/SelfService.php:114
 msgid "Generate a new key"
 msgstr "Neuen Schlüssel generieren"
 
-#: library/Director/Web/SelfService.php:132
+#: ../../../../library/Director/Web/SelfService.php:132
 msgid ""
 "Generated Host keys will continue to work, but you'll no longer be able to "
 "register new Hosts with this key"
@@ -2740,79 +2746,79 @@ msgstr ""
 "Generierte Host-Schlüssel werden weiterhin funktionieren, aber es wird nicht "
 "mehr möglich sein neue Hosts mit diesem Schlüssel zu registrieren"
 
-#: application/controllers/ConfigController.php:281
+#: ../../../../application/controllers/ConfigController.php:282
 msgid "Generated config"
 msgstr "Erzeugte Konfiguration"
 
-#: library/Director/Dashboard/AlertsDashboard.php:17
+#: ../../../../library/Director/Dashboard/AlertsDashboard.php:17
 msgid "Get alerts when something goes wrong"
 msgstr "Werde alarmiert, wenn etwas schief läuft"
 
-#: library/Director/Dashboard/Dashlet/CustomvarDashlet.php:17
+#: ../../../../library/Director/Dashboard/Dashlet/CustomvarDashlet.php:19
 msgid "Get an overview of used CustomVars and their variants"
 msgstr "Eine Übersicht über benutzerdefinierte Variablen und deren Varianten"
 
-#: library/Director/PropertyModifier/PropertyModifierGetHostByAddr.php:27
+#: ../../../../library/Director/PropertyModifier/PropertyModifierGetHostByAddr.php:27
 msgid "Get host by address (Reverse DNS lookup)"
 msgstr "Host über Adresse ermitteln (Reverse DNS Lookup)"
 
-#: library/Director/PropertyModifier/PropertyModifierGetHostByName.php:27
+#: ../../../../library/Director/PropertyModifier/PropertyModifierGetHostByName.php:27
 msgid "Get host by name (DNS lookup)"
 msgstr "Adresse für Hostname ermitteln (DNS Lookup)"
 
-#: application/controllers/ConfigController.php:241
+#: ../../../../application/controllers/ConfigController.php:242
 msgid "Global Director Settings"
 msgstr "Globale Director-Einstellungen"
 
-#: library/Director/Web/SelfService.php:101
+#: ../../../../library/Director/Web/SelfService.php:101
 msgid "Global Self Service Setting"
 msgstr "Globale Selbstbedienungs-Einstellungen"
 
-#: application/forms/SelfServiceSettingsForm.php:57
+#: ../../../../application/forms/SelfServiceSettingsForm.php:57
 msgid "Global Zones"
 msgstr "Globale Zonen"
 
-#: application/forms/IcingaZoneForm.php:22
+#: ../../../../application/forms/IcingaZoneForm.php:22
 msgid "Global zone"
 msgstr "Globale Zone"
 
-#: library/Director/PropertyModifier/PropertyModifierJoin.php:13
+#: ../../../../library/Director/PropertyModifier/PropertyModifierJoin.php:13
 msgid "Glue"
 msgstr "Kleben"
 
-#: library/Director/Web/ActionBar/DirectorBaseActionBar.php:40
+#: ../../../../library/Director/Web/ActionBar/DirectorBaseActionBar.php:40
 #, php-format
 msgid "Go back to \"%s\" Dashboard"
 msgstr "Zurück zum \"%s\" Dashboard"
 
-#: library/Director/Job/ConfigJob.php:57
+#: ../../../../library/Director/Job/ConfigJob.php:57
 msgid "Grace period"
 msgstr "Gnadenfrist"
 
-#: library/Director/Web/Table/GroupMemberTable.php:72
+#: ../../../../library/Director/Web/Table/GroupMemberTable.php:72
 msgid "Group"
 msgstr "Gruppe"
 
-#: library/Director/PropertyModifier/PropertyModifierSimpleGroupBy.php:14
+#: ../../../../library/Director/PropertyModifier/PropertyModifierSimpleGroupBy.php:14
 msgid "Group by a column, aggregate others"
 msgstr "Gruppiere nach einer Spalte, aggregiere andere"
 
-#: application/forms/IcingaHostForm.php:248
+#: ../../../../application/forms/IcingaHostForm.php:250
 msgid ""
 "Group has been inherited, but will be overridden by locally assigned group(s)"
 msgstr ""
 "Die Gruppe wurde geerbt, wird aber von lokal gesetzten Gruppen überschrieben"
 
-#: application/forms/SyncPropertyForm.php:318
+#: ../../../../application/forms/SyncPropertyForm.php:318
 msgid "Group membership"
 msgstr "Gruppenmitgliedschaft"
 
-#: library/Director/Web/Controller/ObjectController.php:329
+#: ../../../../library/Director/Web/Controller/ObjectController.php:332
 #, php-format
 msgid "Group membership: %s"
 msgstr "Gruppenmitgliedschaft: %s"
 
-#: library/Director/Dashboard/Dashlet/ServiceSetsDashlet.php:17
+#: ../../../../library/Director/Dashboard/Dashlet/ServiceSetsDashlet.php:19
 msgid ""
 "Grouping your Services into Sets allow you to quickly assign services often "
 "used together in a single operation all at once"
@@ -2820,112 +2826,112 @@ msgstr ""
 "Das Bündel von Services in Sets erlaubt es, Services welche häufig gemeinsam "
 "benutzt werden in einem Einzelschritt zuzuweisen"
 
-#: library/Director/Web/Tabs/ObjectsTabs.php:65
-#: application/forms/IcingaUserForm.php:109
-#: application/forms/IcingaHostForm.php:217
-#: application/forms/IcingaServiceForm.php:649
+#: ../../../../library/Director/Web/Tabs/ObjectsTabs.php:67
+#: ../../../../application/forms/IcingaUserForm.php:109
+#: ../../../../application/forms/IcingaServiceForm.php:653
+#: ../../../../application/forms/IcingaHostForm.php:219
 msgid "Groups"
 msgstr "Gruppen"
 
-#: library/Director/Import/ImportSourceRestApi.php:134
+#: ../../../../library/Director/Import/ImportSourceRestApi.php:134
 msgid "HTTP (this is plaintext!)"
 msgstr "HTTP (das ist Klartext)"
 
-#: library/Director/Import/ImportSourceRestApi.php:149
+#: ../../../../library/Director/Import/ImportSourceRestApi.php:149
 msgid "HTTP Header"
 msgstr "HTTP-Header"
 
-#: library/Director/Import/ImportSourceRestApi.php:250
+#: ../../../../library/Director/Import/ImportSourceRestApi.php:250
 msgid "HTTP proxy"
 msgstr "HTTP-Proxy"
 
-#: library/Director/Import/ImportSourceRestApi.php:133
+#: ../../../../library/Director/Import/ImportSourceRestApi.php:133
 msgid "HTTPS (strongly recommended)"
 msgstr "HTTPS (dringend empfohlen)"
 
-#: library/Director/Web/Tabs/MainTabs.php:31
+#: ../../../../library/Director/Web/Tabs/MainTabs.php:32
 msgid "Health"
 msgstr "Health"
 
-#: library/Director/Dashboard/Dashlet/SingleServicesDashlet.php:17
+#: ../../../../library/Director/Dashboard/Dashlet/SingleServicesDashlet.php:19
 msgid "Here you can find all single services directly attached to single hosts"
 msgstr ""
 "Hier finden sich alle Einzel-Services welche einzelnen Hosts zugewiesen "
 "wurden"
 
-#: library/Director/DataType/DataTypeString.php:27
-#: library/Director/Web/Table/CoreApiFieldsTable.php:89
+#: ../../../../library/Director/DataType/DataTypeString.php:27
+#: ../../../../library/Director/Web/Table/CoreApiFieldsTable.php:89
 msgid "Hidden"
 msgstr "Versteckt"
 
-#: library/Director/Web/Widget/AdditionalTableActions.php:70
+#: ../../../../library/Director/Web/Widget/AdditionalTableActions.php:71
 msgid "Hide SQL"
 msgstr "SQL verbergeb"
 
-#: application/controllers/HealthController.php:23
+#: ../../../../application/controllers/HealthController.php:23
 msgid "Hint: Check Plugin"
 msgstr "Hinweis: Check-Plugin"
 
-#: application/forms/IcingaServiceForm.php:166
+#: ../../../../application/forms/IcingaServiceForm.php:168
 msgid "Hints regarding this service"
 msgstr "Hinweise zu diesem Service"
 
-#: library/Director/Web/Tabs/ImportsourceTabs.php:45
-#: library/Director/Web/Tabs/SyncRuleTabs.php:43
-#: library/Director/Web/Tabs/ObjectTabs.php:95
+#: ../../../../library/Director/Web/Tabs/ImportsourceTabs.php:45
+#: ../../../../library/Director/Web/Tabs/SyncRuleTabs.php:43
+#: ../../../../library/Director/Web/Tabs/ObjectTabs.php:92
 msgid "History"
 msgstr "Historie"
 
-#: library/Director/TranslationDummy.php:13
-#: library/Director/Import/ImportSourceDirectorObject.php:71
-#: library/Director/Web/Table/ObjectsTableService.php:106
-#: library/Director/Web/Table/ObjectsTableEndpoint.php:20
-#: application/forms/IcingaHostVarForm.php:15
-#: application/forms/IcingaServiceForm.php:597
-#: application/forms/SyncRuleForm.php:12
-#: application/controllers/ServiceController.php:280
+#: ../../../../library/Director/TranslationDummy.php:13
+#: ../../../../library/Director/Import/ImportSourceDirectorObject.php:71
+#: ../../../../library/Director/Web/Table/ObjectsTableService.php:106
+#: ../../../../library/Director/Web/Table/ObjectsTableEndpoint.php:20
+#: ../../../../application/forms/IcingaHostVarForm.php:15
+#: ../../../../application/forms/IcingaServiceForm.php:601
+#: ../../../../application/forms/SyncRuleForm.php:12
+#: ../../../../application/controllers/ServiceController.php:280
 msgid "Host"
 msgstr "Host"
 
-#: library/Director/Objects/IcingaService.php:769
-#: application/controllers/SuggestController.php:262
+#: ../../../../library/Director/Objects/IcingaService.php:682
+#: ../../../../application/controllers/SuggestController.php:262
 msgid "Host Custom variables"
 msgstr "Benutzerdefinierte Host-Variablen"
 
-#: application/forms/SyncRuleForm.php:13
-#: application/forms/BasketForm.php:20
+#: ../../../../application/forms/BasketForm.php:20
+#: ../../../../application/forms/SyncRuleForm.php:13
 msgid "Host Group"
 msgstr "Hostgruppe"
 
-#: library/Director/Dashboard/Dashlet/HostGroupsDashlet.php:11
+#: ../../../../library/Director/Dashboard/Dashlet/HostGroupsDashlet.php:13
 msgid "Host Groups"
 msgstr "Hostgruppen"
 
-#: application/forms/SelfServiceSettingsForm.php:19
+#: ../../../../application/forms/SelfServiceSettingsForm.php:19
 msgid "Host Name"
 msgstr "Hostname"
 
-#: application/forms/IcingaHostForm.php:169
-#: application/forms/IcingaHostForm.php:186
+#: ../../../../application/forms/IcingaHostForm.php:171
+#: ../../../../application/forms/IcingaHostForm.php:188
 msgid "Host Template"
 msgstr "Host-Vorlage"
 
-#: application/forms/BasketForm.php:21
+#: ../../../../application/forms/BasketForm.php:21
 msgid "Host Template Choice"
 msgstr "Auswahlmöglichkeit für Hostvorlagen"
 
-#: library/Director/Dashboard/Dashlet/HostTemplatesDashlet.php:11
-#: application/forms/BasketForm.php:22
+#: ../../../../library/Director/Dashboard/Dashlet/HostTemplatesDashlet.php:13
+#: ../../../../application/forms/BasketForm.php:22
 msgid "Host Templates"
 msgstr "Host-Vorlagen"
 
-#: application/forms/IcingaHostForm.php:327
-#: application/forms/IcingaHostSelfServiceForm.php:35
+#: ../../../../application/forms/IcingaHostSelfServiceForm.php:35
+#: ../../../../application/forms/IcingaHostForm.php:329
 msgid "Host address"
 msgstr "Hostadresse"
 
-#: application/forms/IcingaHostForm.php:329
-#: application/forms/IcingaHostSelfServiceForm.php:37
+#: ../../../../application/forms/IcingaHostSelfServiceForm.php:37
+#: ../../../../application/forms/IcingaHostForm.php:331
 msgid ""
 "Host address. Usually an IPv4 address, but may be any kind of address your "
 "check plugin is able to deal with"
@@ -2933,51 +2939,51 @@ msgstr ""
 "Hostadresse. Üblicherweise eine IPv4 Adresse, kann jedoch jede Art von "
 "Adresse sein, mit der das Plugin umgehen kann"
 
-#: configuration.php:99
+#: ../../../../configuration.php:70
 msgid "Host configs"
 msgstr "Host-Konfigurationen"
 
-#: library/Director/DataType/DataTypeDirectorObject.php:57
+#: ../../../../library/Director/DataType/DataTypeDirectorObject.php:57
 msgid "Host groups"
 msgstr "Hostgruppen"
 
-#: application/forms/IcingaHostSelfServiceForm.php:25
+#: ../../../../application/forms/IcingaHostSelfServiceForm.php:25
 msgid "Host name"
 msgstr "Hostname"
 
-#: application/forms/SelfServiceSettingsForm.php:25
+#: ../../../../application/forms/SelfServiceSettingsForm.php:25
 msgid "Host name (local part, without domain)"
 msgstr "Hostname (lokaler Teil, ohne Domain)"
 
-#: library/Director/Dashboard/Dashlet/HostObjectDashlet.php:13
+#: ../../../../library/Director/Dashboard/Dashlet/HostObjectDashlet.php:15
 msgid "Host objects"
 msgstr "Hostobjekte"
 
-#: library/Director/Objects/IcingaService.php:768
-#: library/Director/Objects/IcingaHost.php:163
-#: application/controllers/SuggestController.php:252
-#: application/controllers/SuggestController.php:261
+#: ../../../../library/Director/Objects/IcingaHost.php:162
+#: ../../../../library/Director/Objects/IcingaService.php:681
+#: ../../../../application/controllers/SuggestController.php:252
+#: ../../../../application/controllers/SuggestController.php:261
 msgid "Host properties"
 msgstr "Hosteigenschaften"
 
-#: application/controllers/TemplatechoiceController.php:20
+#: ../../../../application/controllers/TemplatechoiceController.php:20
 msgid "Host template choice"
 msgstr "Auswahlmöglichkeit für Hostvorlagen"
 
-#: application/controllers/TemplatechoicesController.php:19
+#: ../../../../application/controllers/TemplatechoicesController.php:19
 msgid "Host template choices"
 msgstr "Auswahlmöglichkeiten für Hostvorlagen"
 
-#: application/forms/IcingaHostGroupForm.php:14
+#: ../../../../application/forms/IcingaHostGroupForm.php:14
 msgid "Hostgroup"
 msgstr "Hostgruppe"
 
-#: library/Director/Db/Branch/BranchModificationInspection.php:39
-#: library/Director/Import/ImportSourceCoreApi.php:61
+#: ../../../../library/Director/Db/Branch/BranchModificationInspection.php:39
+#: ../../../../library/Director/Import/ImportSourceCoreApi.php:61
 msgid "Hostgroups"
 msgstr "Hostgruppen"
 
-#: application/forms/IcingaHostForm.php:220
+#: ../../../../application/forms/IcingaHostForm.php:222
 msgid ""
 "Hostgroups that should be directly assigned to this node. Hostgroups can be "
 "useful for various reasons. You might assign service checks based on "
@@ -2993,38 +2999,38 @@ msgstr ""
 "direkt einzelnen Hosts oder Hostvorlagen zugeordnet werden. Auch über Apply "
 "Regeln können Hostgruppen zugewiesen werden"
 
-#: library/Director/Web/Table/IcingaServiceSetHostTable.php:38
-#: library/Director/Web/Table/IcingaHostsMatchingFilterTable.php:48
-#: application/forms/IcingaHostForm.php:39
+#: ../../../../library/Director/Web/Table/IcingaServiceSetHostTable.php:38
+#: ../../../../library/Director/Web/Table/IcingaHostsMatchingFilterTable.php:48
+#: ../../../../application/forms/IcingaHostForm.php:41
 msgid "Hostname"
 msgstr "Hostname"
 
-#: library/Director/Import/ImportSourceRestApi.php:262
+#: ../../../../library/Director/Import/ImportSourceRestApi.php:262
 msgid "Hostname, IP or <host>:<port>"
 msgstr "Hostname, IP oder <host>:<port>"
 
-#: configuration.php:153
-#: library/Director/Dashboard/Dashlet/HostsDashlet.php:11
-#: library/Director/IcingaConfig/StateFilterSet.php:19
-#: library/Director/DataType/DataTypeDirectorObject.php:56
-#: library/Director/DataType/DataTypeDictionary.php:59
-#: library/Director/Db/Branch/BranchModificationInspection.php:38
-#: library/Director/Import/ImportSourceCoreApi.php:60
-#: library/Director/Web/Table/CustomvarVariantsTable.php:58
-#: library/Director/Web/Table/CustomvarTable.php:43
-#: application/forms/IcingaNotificationForm.php:89
-#: application/forms/IcingaServiceForm.php:711
-#: application/forms/IcingaDependencyForm.php:100
-#: application/forms/IcingaScheduledDowntimeForm.php:89
+#: ../../../../configuration.php:121
+#: ../../../../library/Director/Dashboard/Dashlet/HostsDashlet.php:13
+#: ../../../../library/Director/IcingaConfig/StateFilterSet.php:19
+#: ../../../../library/Director/DataType/DataTypeDirectorObject.php:56
+#: ../../../../library/Director/DataType/DataTypeDictionary.php:59
+#: ../../../../library/Director/Db/Branch/BranchModificationInspection.php:38
+#: ../../../../library/Director/Import/ImportSourceCoreApi.php:60
+#: ../../../../library/Director/Web/Table/CustomvarVariantsTable.php:58
+#: ../../../../library/Director/Web/Table/CustomvarTable.php:43
+#: ../../../../application/forms/IcingaNotificationForm.php:90
+#: ../../../../application/forms/IcingaServiceForm.php:715
+#: ../../../../application/forms/IcingaDependencyForm.php:100
+#: ../../../../application/forms/IcingaScheduledDowntimeForm.php:89
 msgid "Hosts"
 msgstr "Hosts"
 
-#: application/controllers/ServicesetController.php:85
+#: ../../../../application/controllers/ServicesetController.php:85
 #, php-format
 msgid "Hosts using this set: %s"
 msgstr "Hosts welche dieses Set benutzen: %s"
 
-#: application/forms/IcingaScheduledDowntimeForm.php:58
+#: ../../../../application/forms/IcingaScheduledDowntimeForm.php:58
 msgid ""
 "How long the downtime lasts. Only has an effect for flexible (non-fixed) "
 "downtimes. Time in seconds, supported suffixes include ms (milliseconds), s "
@@ -3036,19 +3042,19 @@ msgstr ""
 "(Millisekunden), s (Sekunden), m (Minuten), h (Stunden) and d (Tage). Um "
 "\"90 Minuten\" auszudrücken könnte man 1h 30m schreiben"
 
-#: application/forms/DeployFormsBug7530.php:114
+#: ../../../../application/forms/DeployFormsBug7530.php:114
 msgid "I know what I'm doing, deploy anyway"
 msgstr "Ich weiß was ich tue, bitte dennoch ausrollen"
 
-#: application/forms/DeployFormsBug7530.php:115
+#: ../../../../application/forms/DeployFormsBug7530.php:115
 msgid "I know, please don't bother me again"
 msgstr "Ich weiß, und möchte damit nicht mehr belästigt werden"
 
-#: application/forms/IcingaEndpointForm.php:32
+#: ../../../../application/forms/IcingaEndpointForm.php:32
 msgid "IP address / hostname of remote node"
 msgstr "IP Adresse / Hostname des entfernten Knoten"
 
-#: application/forms/KickstartForm.php:133
+#: ../../../../application/forms/KickstartForm.php:133
 msgid ""
 "IP address / hostname of your Icinga node. Please note that this information "
 "will only be used for the very first connection to your Icinga instance. The "
@@ -3064,71 +3070,66 @@ msgstr ""
 "host-Eigenschaft entweder eine IP Adresse oder einen auflösbaren Hostname "
 "enthält. Der Director muss diesen Endpunkt erreichen können"
 
-#: application/forms/IcingaHostForm.php:335
-#: application/forms/IcingaHostSelfServiceForm.php:43
+#: ../../../../application/forms/IcingaHostSelfServiceForm.php:43
+#: ../../../../application/forms/IcingaHostForm.php:337
 msgid "IPv6 address"
 msgstr "IPv6 Adresse"
 
-#: library/Director/Web/Controller/ObjectsController.php:350
+#: ../../../../library/Director/Web/Controller/ObjectsController.php:350
 #, php-format
 msgid "Icinga %s Sets"
 msgstr "Icinga %s-Sets"
 
-#: application/controllers/InspectController.php:38
+#: ../../../../application/controllers/InspectController.php:38
 #, php-format
 msgid "Icinga 2 - Objects: %s"
 msgstr "Icinga-2-Objekte: %s"
 
-#: application/controllers/InspectController.php:144
+#: ../../../../application/controllers/InspectController.php:144
 msgid "Icinga 2 API - Status"
 msgstr "Icinga 2  API - Status"
 
-#: library/Director/Web/SelfService.php:216
+#: ../../../../library/Director/Web/SelfService.php:203
 msgid "Icinga 2 Client documentation"
 msgstr "Icinga 2 Client-Dokumentation"
 
-#: library/Director/Web/SelfService.php:158
-#: library/Director/Web/SelfService.php:164
-msgid "Icinga 2 Powershell Module"
-msgstr "Icinga 2 Powershell Modul"
-
-#: application/forms/IcingaHostForm.php:147
-#: application/forms/IcingaServiceForm.php:697
+#: ../../../../application/forms/IcingaServiceForm.php:701
+#: ../../../../application/forms/IcingaHostForm.php:149
 msgid "Icinga Agent and zone settings"
 msgstr "Icinga Agenten- und Zoneneinstellungen"
 
-#: library/Director/Dashboard/Dashlet/ApiUserObjectDashlet.php:13
+#: ../../../../library/Director/Dashboard/Dashlet/ApiUserObjectDashlet.php:15
 msgid "Icinga Api users"
 msgstr "Icinga API Benutzer"
 
-#: application/forms/IcingaCommandArgumentForm.php:39
-#: application/forms/IcingaCommandArgumentForm.php:78
+#: ../../../../application/forms/IcingaCommandArgumentForm.php:39
+#: ../../../../application/forms/IcingaCommandArgumentForm.php:78
 msgid "Icinga DSL"
 msgstr "Icinga-DSL"
 
-#: configuration.php:118
+#: ../../../../configuration.php:89
 msgid "Icinga Director"
 msgstr "Icinga-Director"
 
-#: application/controllers/DashboardController.php:45
+#: ../../../../application/controllers/DashboardController.php:45
 msgid "Icinga Director - Main Dashboard"
 msgstr "Icinga Director - Übersichtsdashboard"
 
-#: application/controllers/DaemonController.php:46
+#: ../../../../application/controllers/DaemonController.php:46
 msgid "Icinga Director Background Daemon"
 msgstr "Icinga Director Hintergrunddienst"
 
-#: library/Director/Dashboard/DirectorDashboard.php:15
+#: ../../../../library/Director/Dashboard/DirectorDashboard.php:15
 msgid "Icinga Director Configuration"
 msgstr "Icinga Director Konfiguration"
 
-#: application/controllers/IndexController.php:45
-#: application/controllers/IndexController.php:52
+#: ../../../../application/controllers/IndexController.php:45
+#: ../../../../application/controllers/IndexController.php:52
 #, php-format
 msgid "Icinga Director Setup: %s"
 msgstr "Icinga Director Setup: %s"
 
-#: application/forms/SettingsForm.php:35
+#: ../../../../application/forms/SettingsForm.php:35
 msgid ""
 "Icinga Director decides to deploy objects like CheckCommands to a global "
 "zone. This defaults to \"director-global\" but might be adjusted to a custom "
@@ -3138,7 +3139,7 @@ msgstr ""
 "auszubringen. Der Standard dafür ist \"director-global\", es kann aber auch "
 "eine benutzerdefinierte Zone verwendet werden"
 
-#: application/controllers/PhperrorController.php:40
+#: ../../../../application/controllers/PhperrorController.php:40
 msgid ""
 "Icinga Director depends on the following modules, please install/upgrade as "
 "required"
@@ -3146,7 +3147,7 @@ msgstr ""
 "Der Icinga Director benötigt folgende Module, bitte wie angegeben "
 "installieren und/oder aktualisieren"
 
-#: library/Director/Dashboard/Dashlet/SelfServiceDashlet.php:17
+#: ../../../../library/Director/Dashboard/Dashlet/SelfServiceDashlet.php:19
 msgid ""
 "Icinga Director offers a Self Service API, allowing new Icinga nodes to "
 "register themselves"
@@ -3154,19 +3155,19 @@ msgstr ""
 "Der Icinga Director stellt eine Selbstbedienungs-API bereit, über welche "
 "sich neue Icinga-Knoten selbst registrieren können"
 
-#: application/forms/KickstartForm.php:131
+#: ../../../../application/forms/KickstartForm.php:131
 msgid "Icinga Host"
 msgstr "Icinga-Host"
 
-#: library/Director/Dashboard/Dashlet/InfrastructureDashlet.php:11
+#: ../../../../library/Director/Dashboard/Dashlet/InfrastructureDashlet.php:13
 msgid "Icinga Infrastructure"
 msgstr "Icinga-Infrastruktur"
 
-#: application/forms/SettingsForm.php:43
+#: ../../../../application/forms/SettingsForm.php:43
 msgid "Icinga Package Name"
 msgstr "Icinga Package Name"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1164
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1167
 msgid ""
 "Icinga cluster zone. Allows to manually override Directors decisions of "
 "where to deploy your config to. You should consider not doing so unless you "
@@ -3176,16 +3177,16 @@ msgstr ""
 "wohin der Director die Konfiguration ausrollt. Sollte nicht ohne "
 "ausreichendes Wissen um den Icinga-Cluster-Stack verändert werden"
 
-#: library/Director/Web/SelfService.php:145
-#: library/Director/Web/SelfService.php:151
+#: ../../../../library/Director/Web/SelfService.php:145
+#: ../../../../library/Director/Web/SelfService.php:151
 msgid "Icinga for Windows"
 msgstr "Icinga für Windows"
 
-#: application/forms/IcingaHostGroupForm.php:16
+#: ../../../../application/forms/IcingaHostGroupForm.php:16
 msgid "Icinga object name for this host group"
 msgstr "Icinga-Objektname für diese Hostgruppe"
 
-#: application/forms/IcingaHostForm.php:46
+#: ../../../../application/forms/IcingaHostForm.php:48
 msgid ""
 "Icinga object name for this host. This is usually a fully qualified host "
 "name but it could basically be any kind of string. To make things easier for "
@@ -3197,19 +3198,19 @@ msgstr ""
 "sprechende Namen für Vorlagen verwendet werden. z.B. ist \"Standard Linux "
 "Server\" leichter verständlich als \"generic-host\""
 
-#: application/forms/IcingaServiceGroupForm.php:16
+#: ../../../../application/forms/IcingaServiceGroupForm.php:16
 msgid "Icinga object name for this service group"
 msgstr "Icinga-Objektname für diese Servicegruppe"
 
-#: application/forms/IcingaUserGroupForm.php:19
+#: ../../../../application/forms/IcingaUserGroupForm.php:19
 msgid "Icinga object name for this user group"
 msgstr "Icinga-Objektname für diese Benutzergruppe"
 
-#: application/forms/SettingsForm.php:126
+#: ../../../../application/forms/SettingsForm.php:126
 msgid "Icinga v1.x"
 msgstr "Icinga v1.x"
 
-#: application/forms/SettingsForm.php:100
+#: ../../../../application/forms/SettingsForm.php:100
 msgid ""
 "Icinga v2.11.0 breaks some configurations, the Director will warn you before "
 "every deployment in case your config is affected. This setting allows to "
@@ -3219,97 +3220,131 @@ msgstr ""
 "warnt vor jedem Deployment falls die auszurollende Konfiguration betroffen "
 "ist. Diese Einstellung erlaubt es diese Warnung zu verbergen."
 
-#: application/forms/SettingsForm.php:125
+#: ../../../../application/forms/SettingsForm.php:125
 msgid "Icinga v2.x"
 msgstr "Icinga v2.x"
 
-#: application/forms/IcingaHostForm.php:77
+#: ../../../../application/forms/IcingaHostForm.php:79
 msgid "Icinga2 Agent"
 msgstr "Icinga-2-Agent"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1556
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1559
 msgid "Icon image"
 msgstr "Icon Bild"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1565
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1568
 msgid "Icon image alt"
 msgstr "Icon Bild alternativ"
 
-#: library/Director/Web/Table/CoreApiFieldsTable.php:81
+#: ../../../../library/Director/Web/Table/CoreApiFieldsTable.php:81
 msgid "Id"
 msgstr "ID"
 
-#: application/forms/IcingaCommandForm.php:52
+#: ../../../../application/forms/IcingaCommandForm.php:52
 msgid "Identifier for the Icinga command you are going to create"
 msgstr "Bezeichner für das Icinga-Kommando, das erstellt werden soll"
 
-#: application/forms/IcingaCommandForm.php:78
+#: ../../../../application/forms/IcingaNotificationForm.php:181
+msgid ""
+"If defined, User Groups from this Custom Variable will be combined with "
+"single Groups chosen below.  e.g.: when set to notification_groups, this "
+"notification will pick User Groups from the Array service.vars."
+"notification_groups and fall back to host.vars.notification_groups, in case "
+"the former one does not exist. Only Array type DirectorObject Fields for "
+"User objects are eligible for this feature."
+msgstr ""
+"Wenn diese benutzerdefinierte Variable vorhanden ist, werden Benutzergruppen "
+"aus selbiger mit nachfolgend ausgewählten Einzelgruppen kombiniert. "
+"Beispiel: wird hier notification_groups gewählt, wird diese Benachrichtigung "
+"Benutzergruppen aus dem Array service. vars.notification_groups verwenden, "
+"und auf host.vars.notification_groups zurückfallen, falls ersteres nicht "
+"existiert. Lediglich Felder vom Array-Typ DirectorObject sind für dieses "
+"Feature auswählbar."
+
+#: ../../../../application/forms/IcingaNotificationForm.php:144
+msgid ""
+"If defined, Users from this Custom Variable will be combined with single "
+"users chosen below.  e.g.: when set to notification_contacts, this "
+"notification will pick Users from the Array service.vars."
+"notification_contacts and fall back to host.vars.notification_contacts, in "
+"case the former one does not exist. Only Array type DirectorObject Fields "
+"for User objects are eligible for this feature."
+msgstr ""
+"Wenn diese benutzerdefinierte Variable vorhanden ist, werden Benutzer aus "
+"selbiger mit nachfolgend ausgewählten Einzelbenutzern kombiniert. Beispiel: "
+"wird hier notification_contacts gewählt, wird diese Benachrichtigung "
+"Benutzergruppen aus dem Array service. vars.notification_contacts verwenden, "
+"und auf host.vars.notification_contacts zurückfallen, falls ersteres nicht "
+"existiert. Lediglich Felder vom Array-Typ DirectorObject sind für dieses "
+"Feature auswählbar."
+
+#: ../../../../application/forms/IcingaCommandForm.php:78
 msgid "If enabled you can not define arguments."
 msgstr "Wenn aktiviert können keine Argumente definiert werden."
 
-#: application/forms/SyncRuleForm.php:64
-#: application/forms/BasketForm.php:55
+#: ../../../../application/forms/BasketForm.php:55
+#: ../../../../application/forms/SyncRuleForm.php:64
 msgid "Ignore"
 msgstr "Ignorieren"
 
-#: application/forms/SettingsForm.php:91
+#: ../../../../application/forms/SettingsForm.php:91
 msgid "Ignore Bug #7530"
 msgstr "Bug #7530 ignorieren"
 
-#: application/forms/IcingaDependencyForm.php:175
+#: ../../../../application/forms/IcingaDependencyForm.php:175
 msgid "Ignore Soft States"
 msgstr "Soft-States ignorieren"
 
-#: library/Director/PropertyModifier/PropertyModifierGetPropertyFromOtherImportSource.php:33
+#: ../../../../library/Director/PropertyModifier/PropertyModifierGetPropertyFromOtherImportSource.php:33
 msgid "Import Source"
 msgstr "Importquelle"
 
-#: application/forms/BasketForm.php:35
+#: ../../../../application/forms/BasketForm.php:35
 msgid "Import Sources"
 msgstr "Importquellen"
 
-#: library/Director/Dashboard/Dashlet/ImportSourceDashlet.php:14
+#: ../../../../library/Director/Dashboard/Dashlet/ImportSourceDashlet.php:15
 msgid "Import data sources"
 msgstr "Import-Datenquellen"
 
-#: application/forms/IcingaImportObjectForm.php:26
+#: ../../../../application/forms/IcingaImportObjectForm.php:26
 #, php-format
 msgid "Import external \"%s\""
 msgstr "Externe \"%s\" importieren"
 
-#: application/controllers/ImportrunController.php:14
-#: application/controllers/ImportrunController.php:15
+#: ../../../../application/controllers/ImportrunController.php:14
+#: ../../../../application/controllers/ImportrunController.php:15
 msgid "Import run"
 msgstr "Importlauf"
 
-#: application/controllers/ImportsourceController.php:266
+#: ../../../../application/controllers/ImportsourceController.php:266
 #, php-format
 msgid "Import run history: %s"
 msgstr "Importlaufhistorie: %s"
 
-#: library/Director/Job/ImportJob.php:80
-#: library/Director/Web/Tabs/ImportsourceTabs.php:37
-#: library/Director/Web/Tabs/ImportTabs.php:20
-#: application/controllers/ImportsourcesController.php:32
+#: ../../../../library/Director/Job/ImportJob.php:80
+#: ../../../../library/Director/Web/Tabs/ImportsourceTabs.php:37
+#: ../../../../library/Director/Web/Tabs/ImportTabs.php:20
+#: ../../../../application/controllers/ImportsourcesController.php:32
 msgid "Import source"
 msgstr "Importquelle"
 
-#: application/forms/ImportSourceForm.php:15
+#: ../../../../application/forms/ImportSourceForm.php:15
 msgid "Import source name"
 msgstr "Name der Importquelle"
 
-#: application/controllers/ImportsourceController.php:170
+#: ../../../../application/controllers/ImportsourceController.php:170
 #, php-format
 msgid "Import source preview: %s"
 msgstr "Vorschau der Importquelle: %s"
 
-#: application/controllers/ImportsourceController.php:92
-#: application/controllers/ImportsourceController.php:135
+#: ../../../../application/controllers/ImportsourceController.php:92
+#: ../../../../application/controllers/ImportsourceController.php:135
 #, php-format
 msgid "Import source: %s"
 msgstr "Importquelle: %s"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1270
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1273
 msgid ""
 "Importable templates, add as many as you want. Please note that order "
 "matters when importing properties from multiple templates: last one wins"
@@ -3318,15 +3353,15 @@ msgstr ""
 "Reihenfolge wichtig ist, wenn Eigenschaften von mehreren Vorlagen geerbt "
 "werden: Der letzte Eintrag gewinnt"
 
-#: application/forms/ImportRunForm.php:33
+#: ../../../../application/forms/ImportRunForm.php:33
 msgid "Imported new data from this Import Source"
 msgstr "Neue Daten von dieser Import-Datenquelle importiert"
 
-#: library/Director/Web/Table/ImportrunTable.php:32
+#: ../../../../library/Director/Web/Table/ImportrunTable.php:32
 msgid "Imported rows"
 msgstr "Importierte Reihen"
 
-#: application/forms/IcingaImportObjectForm.php:16
+#: ../../../../application/forms/IcingaImportObjectForm.php:16
 msgid ""
 "Importing an object means that its type will change from \"external\" to "
 "\"object\". That way it will make part of the next deployment. So in case "
@@ -3341,11 +3376,11 @@ msgstr ""
 "Konfiguration entfernt werden. Sollte ein Konflikt auftreten, geschieht "
 "nichts weiter, als dass die Konfiguration nicht ausgerollt werden kann."
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1268
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1271
 msgid "Imports"
 msgstr "Importe"
 
-#: application/controllers/SelfServiceController.php:110
+#: ../../../../application/controllers/SelfServiceController.php:110
 msgid ""
 "In case an Icinga Admin provided you with a self service API token, this is "
 "where you can register new hosts"
@@ -3353,7 +3388,7 @@ msgstr ""
 "Wenn ein Icinga-Administrator einen Selbstbedienungs-API-"
 "Schlüsselbereitstellt, können hier neue Hosts registriert werden"
 
-#: application/forms/SelfServiceSettingsForm.php:189
+#: ../../../../application/forms/SelfServiceSettingsForm.php:189
 msgid ""
 "In case the Icinga 2 Agent is already installed on the system, this "
 "parameter will allow you to configure if you wish to upgrade / downgrade to "
@@ -3363,7 +3398,7 @@ msgstr ""
 "dieser Parameter festzulegen, ob auch Up- und Downgrades zu der spezifierten "
 "Icinga 2 Version gewünscht sind."
 
-#: application/forms/SelfServiceSettingsForm.php:156
+#: ../../../../application/forms/SelfServiceSettingsForm.php:156
 msgid ""
 "In case the Icinga 2 Agent should be automatically installed, this has to be "
 "a string value like: 2.6.3"
@@ -3371,7 +3406,7 @@ msgstr ""
 "Falls der Icinga-2-Agent automatisch installiert werden soll, muss dies in "
 "String der Form 2.6.3 sein"
 
-#: application/forms/SelfServiceSettingsForm.php:102
+#: ../../../../application/forms/SelfServiceSettingsForm.php:102
 msgid ""
 "In case the Icinga Agent will accept configuration from the parent Icinga 2 "
 "system, it will possibly write data to /var/lib/icinga2/api/*. By setting "
@@ -3383,17 +3418,12 @@ msgstr ""
 "schreiben. Wird dieser Schalter auf Ja gesetzt, wird jeglicher Inhalt dieses "
 "Verzeichnisses vor einem eventuellen Restart des Icinga-2-Agenten geleert"
 
-#: library/Director/Web/SelfService.php:147
+#: ../../../../library/Director/Web/SelfService.php:147
 #, php-format
 msgid "In case you're using %s, please run this Script:"
 msgstr "Falls %s benutzt wird, bitte dieses Script ausführen:"
 
-#: library/Director/Web/SelfService.php:160
-#, php-format
-msgid "In case you're using the legacy %s, please run:"
-msgstr "Falls das vorherige  %s benutzt wird, bitte dieses Script ausführen:"
-
-#: library/Director/Import/ImportSourceRestApi.php:246
+#: ../../../../library/Director/Import/ImportSourceRestApi.php:246
 msgid ""
 "In case your API is only reachable through a proxy, please choose it's "
 "protocol right here"
@@ -3401,100 +3431,100 @@ msgstr ""
 "Wenn die API nur über einen Proxy zugänglich ist, bitte hier dessen "
 "Protokoll auswählen"
 
-#: library/Director/Import/ImportSourceRestApi.php:270
+#: ../../../../library/Director/Import/ImportSourceRestApi.php:270
 msgid "In case your proxy requires authentication, please configure this here"
 msgstr ""
 "Falls der Proxy eine Authentifizierung verlangt, kann diese hier "
 "konfiguriert werden"
 
-#: application/forms/IcingaTimePeriodForm.php:62
+#: ../../../../application/forms/IcingaTimePeriodForm.php:62
 msgid "Include other time periods into this."
 msgstr "Andere Zeiträume in diesen einbinden."
 
-#: application/forms/IcingaTimePeriodForm.php:59
+#: ../../../../application/forms/IcingaTimePeriodForm.php:59
 msgid "Include period"
 msgstr "Zeitraum einbinden"
 
-#: library/Director/Web/Table/TemplateUsageTable.php:56
+#: ../../../../library/Director/Web/Table/TemplateUsageTable.php:56
 msgid "Indirect"
 msgstr "Indirekt"
 
-#: application/controllers/HostController.php:214
-#: application/controllers/HostController.php:295
+#: ../../../../application/controllers/HostController.php:198
+#: ../../../../application/controllers/HostController.php:282
 msgid "Individual Service objects"
 msgstr "Individuelle Service-Objekte"
 
-#: library/Director/Web/Tabs/InfraTabs.php:43
+#: ../../../../library/Director/Web/Tabs/InfraTabs.php:44
 msgid "Infrastructure"
 msgstr "Infrastruktur"
 
-#: application/forms/SyncPropertyForm.php:312
+#: ../../../../application/forms/SyncPropertyForm.php:312
 msgid "Inheritance (import)"
 msgstr "Vererbung (Import)"
 
-#: library/Director/Web/SelfService.php:195
+#: ../../../../library/Director/Web/SelfService.php:182
 msgid "Inherited Template Api Key:"
 msgstr "Vom Template geerbter API-Schlüssel:"
 
-#: application/controllers/HostController.php:232
+#: ../../../../application/controllers/HostController.php:219
 #, php-format
 msgid "Inherited from %s"
 msgstr "Geerbt von %s"
 
-#: application/forms/IcingaHostForm.php:256
+#: ../../../../application/forms/IcingaHostForm.php:258
 msgid "Inherited groups"
 msgstr "Geerbte Gruppen"
 
-#: application/controllers/HostController.php:461
+#: ../../../../application/controllers/HostController.php:446
 #, php-format
 msgid "Inherited service: %s"
 msgstr "Geerbter Service: %s"
 
-#: library/Director/ProvidedHook/Monitoring/HostActions.php:36
-#: library/Director/ProvidedHook/Monitoring/ServiceActions.php:43
-#: library/Director/Web/Tabs/ObjectTabs.php:132
-#: application/controllers/HostController.php:621
+#: ../../../../library/Director/ProvidedHook/Monitoring/HostActions.php:37
+#: ../../../../library/Director/ProvidedHook/Monitoring/ServiceActions.php:44
+#: ../../../../library/Director/Web/Tabs/ObjectTabs.php:129
+#: ../../../../application/controllers/HostController.php:592
 msgid "Inspect"
 msgstr "Inspizieren"
 
-#: application/controllers/InspectController.php:63
+#: ../../../../application/controllers/InspectController.php:63
 msgid "Inspect - object list"
 msgstr "Inspizieren - Objektliste"
 
-#: application/controllers/InspectController.php:170
+#: ../../../../application/controllers/InspectController.php:170
 msgid "Inspect File Content"
 msgstr "Dateiinhalt inspizieren"
 
-#: application/controllers/InspectController.php:168
+#: ../../../../application/controllers/InspectController.php:168
 msgid "Inspect Packages"
 msgstr "Pakete Inspizieren"
 
-#: application/forms/SelfServiceSettingsForm.php:202
+#: ../../../../application/forms/SelfServiceSettingsForm.php:202
 msgid "Install NSClient++"
 msgstr "NSClient++ installieren"
 
-#: application/forms/SelfServiceSettingsForm.php:72
+#: ../../../../application/forms/SelfServiceSettingsForm.php:72
 msgid "Installation Source"
 msgstr "Installationsquelle"
 
-#: library/Director/Web/Table/Dependency/DependencyInfoTable.php:39
+#: ../../../../library/Director/Web/Table/Dependency/DependencyInfoTable.php:39
 msgid "Installed"
 msgstr "Installiert"
 
-#: application/forms/SelfServiceSettingsForm.php:165
+#: ../../../../application/forms/SelfServiceSettingsForm.php:165
 msgid "Installer Hashes"
 msgstr "Prüfsummen für den Installer"
 
-#: application/forms/IcingaCommandForm.php:25
+#: ../../../../application/forms/IcingaCommandForm.php:25
 msgid "Internal commands"
 msgstr "Interne Kommandos"
 
-#: application/controllers/SyncruleController.php:140
+#: ../../../../application/controllers/SyncruleController.php:140
 #, php-format
 msgid "It has been renamed since then, its former name was %s"
 msgstr "Es wurde seither umbenannt. Sein bisheriger Name war %s"
 
-#: library/Director/Web/SelfService.php:72
+#: ../../../../library/Director/Web/SelfService.php:72
 msgid ""
 "It is not a good idea to do so as long as your Agent still has a valid Self "
 "Service API key!"
@@ -3502,7 +3532,7 @@ msgstr ""
 "Dies ist keine gute Idee solange der Agent noch über einen gültigen "
 "Selbstbedienungs-API-Schlüssel verfügt!"
 
-#: application/forms/IcingaTemplateChoiceForm.php:87
+#: ../../../../application/forms/IcingaTemplateChoiceForm.php:87
 msgid ""
 "It will not be allowed to choose more than this many options. Setting it to "
 "one (1) will result in a drop-down box, a higher number will turn this into "
@@ -3512,7 +3542,7 @@ msgstr ""
 "vorgegeben wird. Setzt man sie auf Eins (1) erhält man ein Dropdown-Feld, "
 "eine höhere Nummer verwandelt diese in ein Mehrfach-Auswahlfeld."
 
-#: library/Director/Web/Widget/ImportSourceDetails.php:35
+#: ../../../../library/Director/Web/Widget/ImportSourceDetails.php:35
 msgid ""
 "It's currently unknown whether we are in sync with this Import Source. You "
 "should either check for changes or trigger a new Import Run."
@@ -3521,7 +3551,7 @@ msgstr ""
 "ist. Es sollte auf Änderungen geprüft oder ein neuer Importlauf angestoßen "
 "werden."
 
-#: application/controllers/SyncruleController.php:91
+#: ../../../../application/controllers/SyncruleController.php:91
 msgid ""
 "It's currently unknown whether we are in sync with this rule. You should "
 "either check for changes or trigger a new Sync Run."
@@ -3529,153 +3559,157 @@ msgstr ""
 "Aktuell ist unbekannt, ob die Konfiguration mit dieser Regel synchron ist. "
 "Es sollte auf Änderungen geprüft oder ein neuer Importlauf angestoßen werden."
 
-#: application/forms/BasketUploadForm.php:130
-#: application/forms/BasketForm.php:126
+#: ../../../../application/forms/BasketForm.php:126
+#: ../../../../application/forms/BasketUploadForm.php:122
 msgid "It's not allowed to store an empty basket"
 msgstr "Das Speichern eines leeren Baskets ist nicht erlaubt"
 
-#: application/controllers/JobController.php:108
+#: ../../../../application/controllers/JobController.php:108
 msgid "Job"
 msgstr "Auftrag"
 
-#: application/forms/BasketForm.php:37
+#: ../../../../application/forms/BasketForm.php:37
 msgid "Job Definitions"
 msgstr "Job-Definitionen"
 
-#: application/forms/DirectorJobForm.php:17
+#: ../../../../application/forms/DirectorJobForm.php:17
 msgid "Job Type"
 msgstr "Auftragstyp"
 
-#: library/Director/Web/Table/JobTable.php:60
-#: application/forms/DirectorJobForm.php:72
+#: ../../../../library/Director/Web/Table/JobTable.php:60
+#: ../../../../application/forms/DirectorJobForm.php:72
 msgid "Job name"
 msgstr "Auftragsname"
 
-#: application/controllers/JobController.php:26
-#: application/controllers/JobController.php:57
+#: ../../../../application/controllers/JobController.php:26
+#: ../../../../application/controllers/JobController.php:57
 #, php-format
 msgid "Job: %s"
 msgstr "Auftrag: %s"
 
-#: library/Director/Dashboard/Dashlet/JobDashlet.php:14
-#: library/Director/Web/Tabs/ImportTabs.php:26
-#: application/controllers/JobsController.php:13
+#: ../../../../library/Director/Dashboard/Dashlet/JobDashlet.php:15
+#: ../../../../library/Director/Web/Tabs/ImportTabs.php:26
+#: ../../../../application/controllers/JobsController.php:13
 msgid "Jobs"
 msgstr "Aufträge"
 
-#: library/Director/Web/Table/BranchActivityTable.php:70
-#: library/Director/Web/Table/ActivityLogTable.php:220
+#: ../../../../library/Director/Web/Table/ActivityLogTable.php:221
+#: ../../../../library/Director/Web/Table/BranchActivityTable.php:71
 msgid "Jump to this object"
 msgstr "Zu diesem Objekt springen"
 
-#: library/Director/Web/SelfService.php:267
+#: ../../../../library/Director/Web/SelfService.php:255
 msgid "Just download and run this script on your Linux Client Machine:"
 msgstr ""
 "Einfach dieses Skript herunterladen und auf dem Linux Client-Rechner "
 "ausführen:"
 
-#: library/Director/PropertyModifier/PropertyModifierArrayFilter.php:57
+#: ../../../../library/Director/PropertyModifier/PropertyModifierArrayFilter.php:57
 msgid "Keep matching elements"
 msgstr "Übereinstimmende Elemente behalten"
 
-#: library/Director/PropertyModifier/PropertyModifierRejectOrSelect.php:73
+#: ../../../../library/Director/PropertyModifier/PropertyModifierRejectOrSelect.php:73
 msgid "Keep only matching rows"
 msgstr "Behalte nur passende Zeilen"
 
-#: library/Director/PropertyModifier/PropertyModifierExtractFromDN.php:31
+#: ../../../../library/Director/PropertyModifier/PropertyModifierExtractFromDN.php:31
 msgid "Keep the DN as is"
 msgstr "DN unverändert behalten"
 
-#: library/Director/PropertyModifier/PropertyModifierJsonDecode.php:26
+#: ../../../../library/Director/PropertyModifier/PropertyModifierJsonDecode.php:26
 msgid "Keep the JSON string as is"
 msgstr "JSON-String beibehalten"
 
-#: library/Director/PropertyModifier/PropertyModifierListToObject.php:27
+#: ../../../../library/Director/PropertyModifier/PropertyModifierListToObject.php:27
 msgid "Keep the first row with that key"
 msgstr "Behalte die erste Zeile mit diesem Schlüssel"
 
-#: library/Director/PropertyModifier/PropertyModifierListToObject.php:28
+#: ../../../../library/Director/PropertyModifier/PropertyModifierRegexReplace.php:33
+msgid "Keep the given string"
+msgstr "Bestehenden String behalten"
+
+#: ../../../../library/Director/PropertyModifier/PropertyModifierListToObject.php:28
 msgid "Keep the last row with that key"
 msgstr "Behalte die letzte Zeile mit diesem Schlüssel"
 
-#: library/Director/PropertyModifier/PropertyModifierGetHostByAddr.php:18
-#: library/Director/PropertyModifier/PropertyModifierGetHostByName.php:18
+#: ../../../../library/Director/PropertyModifier/PropertyModifierGetHostByAddr.php:18
+#: ../../../../library/Director/PropertyModifier/PropertyModifierGetHostByName.php:18
 msgid "Keep the property (hostname) as is"
 msgstr "Die Eigenschaft (hostname) behalten, wie sie ist"
 
-#: library/Director/PropertyModifier/PropertyModifierParseURL.php:40
-#: library/Director/PropertyModifier/PropertyModifierDnsRecords.php:35
+#: ../../../../library/Director/PropertyModifier/PropertyModifierParseURL.php:40
+#: ../../../../library/Director/PropertyModifier/PropertyModifierDnsRecords.php:35
 msgid "Keep the property as is"
 msgstr "Die Eigenschaft beibehalten"
 
-#: library/Director/PropertyModifier/PropertyModifierArrayToRow.php:25
-#: library/Director/PropertyModifier/PropertyModifierDictionaryToRow.php:32
+#: ../../../../library/Director/PropertyModifier/PropertyModifierDictionaryToRow.php:32
+#: ../../../../library/Director/PropertyModifier/PropertyModifierArrayToRow.php:25
 msgid "Keep the row, set the column value to null"
 msgstr "Behalte die Zeile so wie sie ist, setze den Spaltenwert auf null"
 
-#: library/Director/Web/Table/DatalistEntryTable.php:54
-#: application/forms/DirectorDatalistEntryForm.php:21
+#: ../../../../library/Director/Web/Table/DatalistEntryTable.php:54
+#: ../../../../application/forms/DirectorDatalistEntryForm.php:21
 msgid "Key"
 msgstr "Schlüssel"
 
-#: application/controllers/DataController.php:327
+#: ../../../../application/controllers/DataController.php:327
 msgid "Key / Instance"
 msgstr "Schlüssel / Instanz"
 
-#: library/Director/PropertyModifier/PropertyModifierListToObject.php:15
+#: ../../../../library/Director/PropertyModifier/PropertyModifierListToObject.php:15
 msgid "Key Property"
 msgstr "Schlüsseleigenschaft"
 
-#: library/Director/PropertyModifier/PropertyModifierDictionaryToRow.php:21
+#: ../../../../library/Director/PropertyModifier/PropertyModifierDictionaryToRow.php:21
 msgid "Key Property Name"
 msgstr "Schlüsseleigenschaft"
 
-#: application/forms/ImportSourceForm.php:87
+#: ../../../../application/forms/ImportSourceForm.php:87
 msgid "Key column name"
 msgstr "Schlüsselspaltenname"
 
-#: application/controllers/KickstartController.php:15
-#: application/controllers/KickstartController.php:17
+#: ../../../../application/controllers/KickstartController.php:15
+#: ../../../../application/controllers/KickstartController.php:17
 msgid "Kickstart"
 msgstr "Kickstart"
 
-#: library/Director/Dashboard/Dashlet/KickstartDashlet.php:11
-#: application/forms/KickstartForm.php:292
+#: ../../../../library/Director/Dashboard/Dashlet/KickstartDashlet.php:13
+#: ../../../../application/forms/KickstartForm.php:292
 msgid "Kickstart Wizard"
 msgstr "Kickstart Assistent"
 
-#: library/Director/Import/ImportSourceLdap.php:50
+#: ../../../../library/Director/Import/ImportSourceLdap.php:50
 msgid "LDAP Search Base"
 msgstr "LDAP Suchbasis"
 
-#: library/Director/Web/Table/DatalistEntryTable.php:55
-#: library/Director/Web/Table/IcingaObjectDatafieldTable.php:49
-#: library/Director/Web/Table/DatafieldTable.php:49
-#: application/forms/DirectorDatalistEntryForm.php:30
+#: ../../../../library/Director/Web/Table/DatalistEntryTable.php:55
+#: ../../../../library/Director/Web/Table/IcingaObjectDatafieldTable.php:49
+#: ../../../../library/Director/Web/Table/DatafieldTable.php:51
+#: ../../../../application/forms/DirectorDatalistEntryForm.php:30
 msgid "Label"
 msgstr "Bezeichnung"
 
-#: library/Director/Web/Widget/IcingaObjectInspection.php:58
+#: ../../../../library/Director/Web/Widget/IcingaObjectInspection.php:58
 msgid "Last Check Result"
 msgstr "Letztes Check-Ergebnis"
 
-#: library/Director/PropertyModifier/PropertyModifierArrayElementByPosition.php:34
+#: ../../../../library/Director/PropertyModifier/PropertyModifierArrayElementByPosition.php:34
 msgid "Last Element"
 msgstr "Letztes Element"
 
-#: application/forms/IcingaNotificationForm.php:208
+#: ../../../../application/forms/IcingaNotificationForm.php:256
 msgid "Last notification"
 msgstr "Letzte Benachrichtigung"
 
-#: library/Director/Web/Widget/DeployedConfigInfoHeader.php:77
+#: ../../../../library/Director/Web/Widget/DeployedConfigInfoHeader.php:77
 msgid "Last related activity"
 msgstr "Zuletzt verwendete Konfiguration"
 
-#: application/controllers/SyncruleController.php:136
+#: ../../../../application/controllers/SyncruleController.php:136
 msgid "Last sync run details"
 msgstr "Details des letzten Imports"
 
-#: application/forms/IcingaCommandArgumentForm.php:69
+#: ../../../../application/forms/IcingaCommandArgumentForm.php:69
 msgid ""
 "Leave empty for non-positional arguments. Can be a positive or negative "
 "number and influences argument ordering"
@@ -3683,7 +3717,7 @@ msgstr ""
 "Leer lassen für Argumente, deren Position egal ist. Kann eine positive oder "
 "negative Zahl sein und beeinflusst die Reihenfolge der Argumente"
 
-#: application/forms/DirectorDatafieldForm.php:44
+#: ../../../../application/forms/DirectorDatafieldForm.php:44
 msgid ""
 "Leaving custom variables in place while removing the related field is "
 "perfectly legal and might be a desired operation. This way you can no longer "
@@ -3700,7 +3734,7 @@ msgstr ""
 "demselben Namen zu einem späteren Zeitpunkt wieder hinzufügt, wird alles "
 "wieder funktionieren wie zuvor"
 
-#: application/forms/DirectorDatafieldForm.php:87
+#: ../../../../application/forms/DirectorDatafieldForm.php:87
 msgid ""
 "Leaving custom variables in place while renaming the related field is "
 "perfectly legal and might be a desired operation. This way you can no longer "
@@ -3717,54 +3751,55 @@ msgstr ""
 "demselben Namen zu einem späteren Zeitpunkt wieder hinzufügt, wird alles "
 "wieder funktionieren wie zuvor"
 
-#: library/Director/PropertyModifier/PropertyModifierMap.php:35
-#: library/Director/PropertyModifier/PropertyModifierMakeBoolean.php:45
+#: ../../../../library/Director/PropertyModifier/PropertyModifierMap.php:37
+#: ../../../../library/Director/PropertyModifier/PropertyModifierMakeBoolean.php:45
+#: ../../../../library/Director/PropertyModifier/PropertyModifierSetValue.php:34
 msgid "Let the import fail"
 msgstr "Import fehlschlagen lassen"
 
-#: library/Director/PropertyModifier/PropertyModifierArrayElementByPosition.php:55
+#: ../../../../library/Director/PropertyModifier/PropertyModifierArrayElementByPosition.php:55
 msgid "Let the whole Import Run fail"
 msgstr "Den ganzen Importlauf fehlschlagen lassen"
 
-#: library/Director/PropertyModifier/PropertyModifierExtractFromDN.php:32
-#: library/Director/PropertyModifier/PropertyModifierGetHostByAddr.php:19
-#: library/Director/PropertyModifier/PropertyModifierListToObject.php:26
-#: library/Director/PropertyModifier/PropertyModifierParseURL.php:41
-#: library/Director/PropertyModifier/PropertyModifierJsonDecode.php:27
-#: library/Director/PropertyModifier/PropertyModifierArrayToRow.php:24
-#: library/Director/PropertyModifier/PropertyModifierDnsRecords.php:36
-#: library/Director/PropertyModifier/PropertyModifierGetHostByName.php:19
-#: library/Director/PropertyModifier/PropertyModifierDictionaryToRow.php:31
+#: ../../../../library/Director/PropertyModifier/PropertyModifierExtractFromDN.php:32
+#: ../../../../library/Director/PropertyModifier/PropertyModifierDictionaryToRow.php:31
+#: ../../../../library/Director/PropertyModifier/PropertyModifierGetHostByAddr.php:19
+#: ../../../../library/Director/PropertyModifier/PropertyModifierListToObject.php:26
+#: ../../../../library/Director/PropertyModifier/PropertyModifierParseURL.php:41
+#: ../../../../library/Director/PropertyModifier/PropertyModifierJsonDecode.php:27
+#: ../../../../library/Director/PropertyModifier/PropertyModifierArrayToRow.php:24
+#: ../../../../library/Director/PropertyModifier/PropertyModifierDnsRecords.php:36
+#: ../../../../library/Director/PropertyModifier/PropertyModifierGetHostByName.php:19
 msgid "Let the whole import run fail"
 msgstr "Den ganzen Importlauf fehlschlagen lassen"
 
-#: configuration.php:54
+#: ../../../../configuration.php:51
 msgid "Limit access to the given comma-separated list of hostgroups"
 msgstr ""
 "Den Zugriff auf diese Kommagetrennte Liste von Host-Gruppen beschränken"
 
-#: library/Director/Web/SelfService.php:260
+#: ../../../../library/Director/Web/SelfService.php:247
 msgid "Linux commandline"
 msgstr "Linux Kommandozeile"
 
-#: application/controllers/DataController.php:125
+#: ../../../../application/controllers/DataController.php:125
 msgid "List Entries"
 msgstr "Listeneinträge"
 
-#: application/controllers/DataController.php:401
+#: ../../../../application/controllers/DataController.php:401
 msgid "List entries"
 msgstr "Listeneinträge"
 
-#: library/Director/Web/Table/DatalistTable.php:31
-#: application/forms/DirectorDatalistForm.php:13
+#: ../../../../library/Director/Web/Table/DatalistTable.php:31
+#: ../../../../application/forms/DirectorDatalistForm.php:13
 msgid "List name"
 msgstr "Listenname"
 
-#: library/Director/Import/ImportSourceRestApi.php:213
+#: ../../../../library/Director/Import/ImportSourceRestApi.php:213
 msgid "Literal dots in a key name can be written in the escape notation:"
 msgstr "Punkte im Schlüsselbezeichner können bei Bedarf verschont werden:"
 
-#: application/forms/SettingsForm.php:167
+#: ../../../../application/forms/SettingsForm.php:167
 msgid ""
 "Local directory to deploy Icinga 1.x configuration. Must be writable by "
 "icingaweb2. (e.g. /etc/icinga/director)"
@@ -3773,16 +3808,16 @@ msgstr ""
 "werden soll. Muss von icingaweb2 beschreibbar sein (z.B. /etc/icinga/"
 "director)"
 
-#: application/forms/IcingaEndpointForm.php:41
+#: ../../../../application/forms/IcingaEndpointForm.php:41
 msgid "Log Duration"
 msgstr "Behaltefrist des Logs"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:576
-#: application/forms/IcingaAddServiceForm.php:67
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:579
+#: ../../../../application/forms/IcingaAddServiceForm.php:68
 msgid "Main properties"
 msgstr "Haupteigenschaften"
 
-#: library/Director/Dashboard/Dashlet/CheckCommandsDashlet.php:12
+#: ../../../../library/Director/Dashboard/Dashlet/CheckCommandsDashlet.php:14
 msgid ""
 "Manage definitions for your Commands that should be executed as Check "
 "Plugins, Notifications or based on Events"
@@ -3790,7 +3825,7 @@ msgstr ""
 "Definitionen für Kommandos verwalten, welche als Check-Plugins "
 "Benachrichtigungen oder Event-basiert ausgeführt werden sollen"
 
-#: library/Director/Dashboard/Dashlet/HostTemplatesDashlet.php:17
+#: ../../../../library/Director/Dashboard/Dashlet/HostTemplatesDashlet.php:19
 msgid ""
 "Manage your Host Templates. Use Fields to make it easy for your users to get "
 "them customized."
@@ -3798,28 +3833,28 @@ msgstr ""
 "Host-Vorlagen verwalten. Verwende Felder um Benutzern deren Anpassung zu "
 "erleichtern."
 
-#: library/Director/Dashboard/Dashlet/InfrastructureDashlet.php:17
+#: ../../../../library/Director/Dashboard/Dashlet/InfrastructureDashlet.php:19
 msgid ""
 "Manage your Icinga 2 infrastructure: Masters, Zones, Satellites and more"
 msgstr "Icinga 2 Infrastruktur verwalten: Master, Zonen, Satelliten und mehr"
 
-#: library/Director/Dashboard/CommandsDashboard.php:17
+#: ../../../../library/Director/Dashboard/CommandsDashboard.php:17
 msgid "Manage your Icinga Commands"
 msgstr "Icinga Kommandos verwalten"
 
-#: library/Director/Dashboard/HostsDashboard.php:16
+#: ../../../../library/Director/Dashboard/HostsDashboard.php:16
 msgid "Manage your Icinga Hosts"
 msgstr "Icinga Hosts verwalten"
 
-#: library/Director/Dashboard/InfrastructureDashboard.php:24
+#: ../../../../library/Director/Dashboard/InfrastructureDashboard.php:24
 msgid "Manage your Icinga Infrastructure"
 msgstr "Icinga 2 Infrastruktur verwalten"
 
-#: library/Director/Dashboard/ServicesDashboard.php:18
+#: ../../../../library/Director/Dashboard/ServicesDashboard.php:18
 msgid "Manage your Icinga Service Checks"
 msgstr "Icinga Service Checks verwalten"
 
-#: library/Director/Dashboard/Dashlet/ServiceTemplatesDashlet.php:17
+#: ../../../../library/Director/Dashboard/Dashlet/ServiceTemplatesDashlet.php:19
 msgid ""
 "Manage your Service Templates. Use Fields to make it easy for your users to "
 "get them customized."
@@ -3827,56 +3862,56 @@ msgstr ""
 "Service-Vorlagen verwalten. Verwende Felder um Benutzern deren Anpassung zu "
 "erleichtern."
 
-#: library/Director/Web/Controller/ObjectController.php:254
+#: ../../../../library/Director/Web/Controller/ObjectController.php:257
 msgid "Managing Fields"
 msgstr "Datenfelder verwalten"
 
-#: library/Director/Web/Table/IcingaObjectDatafieldTable.php:51
-#: application/forms/IcingaObjectFieldForm.php:142
-#: application/forms/IcingaObjectFieldForm.php:147
+#: ../../../../library/Director/Web/Table/IcingaObjectDatafieldTable.php:51
+#: ../../../../application/forms/IcingaObjectFieldForm.php:106
+#: ../../../../application/forms/IcingaObjectFieldForm.php:111
 msgid "Mandatory"
 msgstr "Pflicht"
 
-#: application/forms/SettingsForm.php:155
+#: ../../../../application/forms/SettingsForm.php:155
 msgid "Master-less"
 msgstr "Masterlos"
 
-#: library/Director/PropertyModifier/PropertyModifierRejectOrSelect.php:35
+#: ../../../../library/Director/PropertyModifier/PropertyModifierRejectOrSelect.php:35
 msgid "Match NULL value columns"
 msgstr "Triff auf Spalten NULL-Werten zu"
 
-#: library/Director/PropertyModifier/PropertyModifierRejectOrSelect.php:34
+#: ../../../../library/Director/PropertyModifier/PropertyModifierRejectOrSelect.php:34
 msgid "Match boolean FALSE"
 msgstr "Triff auf boolesches FALSE zu"
 
-#: library/Director/PropertyModifier/PropertyModifierRejectOrSelect.php:33
+#: ../../../../library/Director/PropertyModifier/PropertyModifierRejectOrSelect.php:33
 msgid "Match boolean TRUE"
 msgstr "Triff auf boolesches TRUE zu"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1391
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1394
 msgid "Max check attempts"
 msgstr "Maximale Checkwiederholungen"
 
-#: library/Director/Web/Table/GroupMemberTable.php:73
-#: library/Director/Web/Table/GroupMemberTable.php:78
+#: ../../../../library/Director/Web/Table/GroupMemberTable.php:73
+#: ../../../../library/Director/Web/Table/GroupMemberTable.php:78
 msgid "Member"
 msgstr "Mitglied"
 
-#: library/Director/Web/Tabs/ObjectTabs.php:114
+#: ../../../../library/Director/Web/Tabs/ObjectTabs.php:111
 msgid "Members"
 msgstr "Mitglieder"
 
-#: library/Director/Web/Controller/ObjectController.php:615
-#: application/forms/SyncRuleForm.php:62
+#: ../../../../library/Director/Web/Controller/ObjectController.php:626
+#: ../../../../application/forms/SyncRuleForm.php:62
 msgid "Merge"
 msgstr "Zusammenführen"
 
-#: application/forms/SyncPropertyForm.php:117
+#: ../../../../application/forms/SyncPropertyForm.php:117
 msgid "Merge Policy"
 msgstr "Zusammenführungsrichtlinie"
 
-#: application/forms/IcingaTimePeriodRangeForm.php:23
-#: application/forms/IcingaScheduledDowntimeRangeForm.php:24
+#: ../../../../application/forms/IcingaTimePeriodRangeForm.php:23
+#: ../../../../application/forms/IcingaScheduledDowntimeRangeForm.php:24
 msgid ""
 "Might be monday, tuesday or 2016-01-28 - have a look at the documentation "
 "for more examples"
@@ -3884,294 +3919,302 @@ msgstr ""
 "Mögliche Werte sind z.B. monday, tuesday oder 2016-01-28 - Mehr Beispiele "
 "finden sich in der Dokumentation"
 
-#: application/forms/IcingaTemplateChoiceForm.php:73
+#: ../../../../application/forms/IcingaTemplateChoiceForm.php:73
 msgid "Minimum required"
 msgstr "Erforderliches Minimum"
 
-#: application/controllers/BranchController.php:112
+#: ../../../../application/controllers/BranchController.php:125
 msgid "Modification"
 msgstr "Änderung"
 
-#: application/forms/ImportRowModifierForm.php:69
+#: ../../../../application/forms/ImportRowModifierForm.php:104
 msgid "Modifier"
 msgstr "Modifikator"
 
-#: library/Director/Web/Tabs/ImportsourceTabs.php:41
+#: ../../../../library/Director/Web/Tabs/ImportsourceTabs.php:41
 msgid "Modifiers"
 msgstr "Modifikatoren"
 
-#: library/Director/ProvidedHook/Monitoring/HostActions.php:55
-#: library/Director/ProvidedHook/Monitoring/ServiceActions.php:56
-#: library/Director/ProvidedHook/Monitoring/ServiceActions.php:62
-#: library/Director/Web/ActionBar/AutomationObjectActionBar.php:38
-#: library/Director/Web/Tabs/SyncRuleTabs.php:37
-#: library/Director/Web/Controller/TemplateController.php:121
-#: application/controllers/ImportsourceController.php:126
-#: application/controllers/SyncruleController.php:553
+#: ../../../../library/Director/ProvidedHook/Monitoring/HostActions.php:54
+#: ../../../../library/Director/ProvidedHook/Monitoring/ServiceActions.php:57
+#: ../../../../library/Director/ProvidedHook/Monitoring/ServiceActions.php:60
+#: ../../../../library/Director/Web/ActionBar/AutomationObjectActionBar.php:38
+#: ../../../../library/Director/Web/Tabs/SyncRuleTabs.php:37
+#: ../../../../library/Director/Web/Controller/TemplateController.php:122
+#: ../../../../application/controllers/ImportsourceController.php:126
+#: ../../../../application/controllers/SyncruleController.php:552
 msgid "Modify"
 msgstr "Ändere"
 
-#: library/Director/ProvidedHook/CubeLinks.php:52
-#: library/Director/ProvidedHook/IcingaDbCubeLinks.php:53
+#: ../../../../library/Director/ProvidedHook/CubeLinks.php:52
+#: ../../../../library/Director/ProvidedHook/IcingaDbCubeLinks.php:53
 #, php-format
 msgid "Modify %d hosts"
 msgstr "%d Hosts verändern"
 
-#: library/Director/Web/Controller/ObjectsController.php:215
+#: ../../../../library/Director/Web/Controller/ObjectsController.php:215
 #, php-format
 msgid "Modify %d objects"
 msgstr "%d Objekte bearbeiten"
 
-#: application/controllers/DatafieldController.php:28
-#: application/controllers/DatafieldcategoryController.php:34
+#: ../../../../application/controllers/DatafieldController.php:28
+#: ../../../../application/controllers/DatafieldcategoryController.php:34
 #, php-format
 msgid "Modify %s"
 msgstr "Ändere %s"
 
-#: library/Director/ProvidedHook/CubeLinks.php:35
-#: library/Director/ProvidedHook/IcingaDbCubeLinks.php:30
+#: ../../../../library/Director/ProvidedHook/CubeLinks.php:35
+#: ../../../../library/Director/ProvidedHook/IcingaDbCubeLinks.php:30
 msgid "Modify a host"
 msgstr "Ändere einen Host"
 
-#: application/forms/DirectorDatalistEntryForm.php:61
+#: ../../../../application/forms/DirectorDatalistEntryForm.php:61
 msgid "Modify data list entry"
 msgstr "Datenlisteneintrag verändern"
 
-#: application/controllers/DataController.php:214
+#: ../../../../application/controllers/DataController.php:214
 #, php-format
 msgid "Modify instance: %s"
 msgstr "Instanz ändern: %s"
 
-#: library/Director/Web/Table/ApplyRulesTable.php:158
+#: ../../../../library/Director/Web/Table/ApplyRulesTable.php:158
 msgid "Modify this Apply Rule"
 msgstr "Diese Apply-Regeln ändern"
 
-#: library/Director/Web/Controller/ObjectController.php:180
+#: ../../../../library/Director/Web/Controller/ObjectController.php:183
 msgid "Modifying Apply Rules"
 msgstr "Apply-Regeln ändern"
 
-#: application/controllers/ImportsourceController.php:127
-#: application/controllers/ImportsourceController.php:285
-#: application/controllers/ImportsourceController.php:315
+#: ../../../../application/controllers/ImportsourceController.php:127
+#: ../../../../application/controllers/ImportsourceController.php:285
+#: ../../../../application/controllers/ImportsourceController.php:315
 msgid "Modifying Import Sources"
 msgstr "Importquellen ändern"
 
-#: application/controllers/JobController.php:59
+#: ../../../../application/controllers/JobController.php:59
 msgid "Modifying Jobs"
 msgstr "Aufträge ändern"
 
-#: application/controllers/SyncruleController.php:517
-#: application/controllers/SyncruleController.php:625
-#: application/controllers/SyncruleController.php:633
+#: ../../../../application/controllers/SyncruleController.php:517
+#: ../../../../application/controllers/SyncruleController.php:623
+#: ../../../../application/controllers/SyncruleController.php:631
 msgid "Modifying Sync Rules"
 msgstr "Synchronisationsregeln ändern"
 
-#: application/controllers/TemplatechoiceController.php:36
+#: ../../../../application/controllers/TemplatechoiceController.php:36
 msgid "Modifying Template Choices"
 msgstr "Auswahlmöglichkeit für Vorlagen abändern"
 
-#: library/Director/Web/Controller/ObjectController.php:176
-#: application/controllers/ServiceController.php:147
+#: ../../../../library/Director/Web/Controller/ObjectController.php:179
+#: ../../../../application/controllers/ServiceController.php:147
 msgid "Modifying Templates"
 msgstr "Vorlagen ändern"
 
-#: library/Director/Web/Table/Dependency/DependencyInfoTable.php:37
+#: ../../../../library/Director/Web/Table/Dependency/DependencyInfoTable.php:37
 msgid "Module name"
 msgstr "Modulname"
 
-#: library/Director/Dashboard/Dashlet/ServiceObjectDashlet.php:15
+#: ../../../../library/Director/Dashboard/Dashlet/ServiceObjectDashlet.php:17
 msgid "Monitored Services"
 msgstr "Überwachte Services"
 
-#: library/Director/Web/Form/IplElement/ExtensibleSetElement.php:544
+#: ../../../../library/Director/Web/Form/IplElement/ExtensibleSetElement.php:544
 msgid "Move down"
 msgstr "Nach unten bewegen"
 
-#: library/Director/Web/Form/IplElement/ExtensibleSetElement.php:534
+#: ../../../../library/Director/Web/Form/IplElement/ExtensibleSetElement.php:534
 msgid "Move up"
 msgstr "Nach oben bewegen"
 
-#: library/Director/Web/Controller/ObjectsController.php:213
+#: ../../../../library/Director/Web/Controller/ObjectsController.php:213
 msgid "Multiple objects"
 msgstr "Mehrere Objekte"
 
-#: application/forms/SelfServiceSettingsForm.php:51
+#: ../../../../application/forms/SelfServiceSettingsForm.php:51
 msgid "My Agents should use DNS to look up Endpoint names"
 msgstr "Meine Agents sollen DNS benutzen, um Endpoint-Namen nachzuschlagen"
 
-#: application/controllers/ConfigController.php:181
+#: ../../../../application/controllers/ConfigController.php:182
 msgid "My changes"
 msgstr "Meine Änderungen"
 
-#: application/controllers/SchemaController.php:16
+#: ../../../../application/controllers/SchemaController.php:16
 msgid "MySQL schema"
 msgstr "MySQL Schema"
 
-#: library/Director/Web/Table/ChoicesTable.php:41
-#: library/Director/Web/Table/CoreApiObjectsTable.php:57
-#: library/Director/Web/Table/CoreApiPrototypesTable.php:40
-#: library/Director/Web/Table/CoreApiFieldsTable.php:79
-#: library/Director/Web/Table/ObjectSetTable.php:45
-#: application/forms/IcingaServiceVarForm.php:22
-#: application/forms/IcingaHostForm.php:38
-#: application/forms/IcingaHostVarForm.php:22
-#: application/forms/IcingaTimePeriodForm.php:15
-#: application/forms/IcingaCommandForm.php:46
-#: application/forms/IcingaServiceForm.php:575
-#: application/forms/IcingaDependencyForm.php:74
-#: application/forms/IcingaApiUserForm.php:14
-#: application/forms/IcingaAddServiceForm.php:143
-#: application/forms/IcingaServiceDictionaryMemberForm.php:22
+#: ../../../../library/Director/Web/Table/CoreApiObjectsTable.php:57
+#: ../../../../library/Director/Web/Table/CoreApiPrototypesTable.php:40
+#: ../../../../library/Director/Web/Table/CoreApiFieldsTable.php:79
+#: ../../../../library/Director/Web/Table/ChoicesTable.php:41
+#: ../../../../library/Director/Web/Table/ObjectSetTable.php:50
+#: ../../../../application/forms/IcingaServiceVarForm.php:22
+#: ../../../../application/forms/IcingaHostVarForm.php:22
+#: ../../../../application/forms/IcingaTimePeriodForm.php:15
+#: ../../../../application/forms/IcingaCommandForm.php:46
+#: ../../../../application/forms/IcingaServiceForm.php:579
+#: ../../../../application/forms/IcingaHostForm.php:40
+#: ../../../../application/forms/IcingaApiUserForm.php:14
+#: ../../../../application/forms/IcingaServiceDictionaryMemberForm.php:22
+#: ../../../../application/forms/IcingaAddServiceForm.php:144
+#: ../../../../application/forms/IcingaDependencyForm.php:74
 msgid "Name"
 msgstr "Name"
 
-#: application/forms/IcingaDependencyForm.php:76
+#: ../../../../application/forms/IcingaDependencyForm.php:76
 msgid "Name for the Icinga dependency you are going to create"
 msgstr "Name der Icinga-Abhängigkeit, die erstellt werden soll"
 
-#: application/forms/IcingaEndpointForm.php:20
+#: ../../../../application/forms/IcingaEndpointForm.php:20
 msgid "Name for the Icinga endpoint template you are going to create"
 msgstr "Name der Icinga-Endpunkt-Vorlage, die erstellt werden soll"
 
-#: application/forms/IcingaEndpointForm.php:26
+#: ../../../../application/forms/IcingaEndpointForm.php:26
 msgid "Name for the Icinga endpoint you are going to create"
 msgstr "Name des Icinga-Endpunkt, der erstellt werden soll"
 
-#: application/forms/IcingaNotificationForm.php:21
+#: ../../../../application/forms/IcingaNotificationForm.php:22
 msgid "Name for the Icinga notification template you are going to create"
 msgstr "Name der Icinga-Benachrichtigungs-Vorlage, die erstellt werden soll"
 
-#: application/forms/IcingaNotificationForm.php:27
+#: ../../../../application/forms/IcingaNotificationForm.php:28
 msgid "Name for the Icinga notification you are going to create"
 msgstr "Name der Icinga-Benachrichtigung, die erstellt werden soll"
 
-#: application/forms/IcingaServiceForm.php:578
-#: application/forms/IcingaAddServiceForm.php:146
+#: ../../../../application/forms/IcingaServiceForm.php:582
+#: ../../../../application/forms/IcingaAddServiceForm.php:147
 msgid "Name for the Icinga service you are going to create"
 msgstr "Name des Icinga-Service, der erstellt werden soll"
 
-#: application/forms/IcingaUserForm.php:30
+#: ../../../../application/forms/IcingaUserForm.php:30
 msgid "Name for the Icinga user object you are going to create"
 msgstr "Name für das Icinga-Benutzerobjekt, das Sie erstellen möchten"
 
-#: application/forms/IcingaUserForm.php:24
+#: ../../../../application/forms/IcingaUserForm.php:24
 msgid "Name for the Icinga user template you are going to create"
 msgstr "Name für die Icinga-Benutzervorlage, die Sie erstellen möchten"
 
-#: application/forms/IcingaZoneForm.php:17
+#: ../../../../application/forms/IcingaZoneForm.php:17
 msgid "Name for the Icinga zone you are going to create"
 msgstr "Name der Icinga-Zone, die erstellt werden soll"
 
-#: application/forms/IcingaServiceDictionaryMemberForm.php:25
+#: ../../../../application/forms/IcingaServiceDictionaryMemberForm.php:25
 msgid "Name for the instance you are going to create"
 msgstr "Name der Instanz, die erstellt werden soll"
 
-#: application/forms/IcingaCloneObjectForm.php:151
+#: ../../../../application/forms/IcingaCloneObjectForm.php:155
 msgid "Name needs to be changed when cloning a Template"
 msgstr "Beim Klonen einer Vorlage muss der Name geändert werden"
 
-#: library/Director/Web/Table/CoreApiFieldsTable.php:90
+#: ../../../../library/Director/Web/Table/CoreApiFieldsTable.php:90
 msgid "Nav"
 msgstr "Nav"
 
-#: application/controllers/DatafieldcategoryController.php:40
+#: ../../../../application/controllers/DatafieldcategoryController.php:40
 msgid "New Category"
 msgstr "Neue Kategorie"
 
-#: application/controllers/DatafieldController.php:34
+#: ../../../../application/controllers/DatafieldController.php:34
 msgid "New Field"
 msgstr "Neues Feld"
 
-#: application/controllers/JobController.php:34
+#: ../../../../application/controllers/JobController.php:34
 msgid "New Job"
 msgstr "Neuer Job"
 
-#: library/Director/Web/Tabs/ImportsourceTabs.php:54
+#: ../../../../library/Director/Web/Tabs/ImportsourceTabs.php:54
 msgid "New import source"
 msgstr "Neue Importquelle"
 
-#: library/Director/Web/Form/CloneImportSourceForm.php:31
-#: library/Director/Web/Form/CloneSyncRuleForm.php:31
-#: application/forms/IcingaCloneObjectForm.php:39
+#: ../../../../library/Director/Web/Form/CloneImportSourceForm.php:33
+#: ../../../../library/Director/Web/Form/CloneSyncRuleForm.php:33
+#: ../../../../application/forms/IcingaCloneObjectForm.php:41
 msgid "New name"
 msgstr "Neuer Name"
 
-#: library/Director/Web/Widget/ActivityLogInfo.php:379
+#: ../../../../library/Director/Web/Widget/ActivityLogInfo.php:379
 msgid "New object"
 msgstr "Neues Objekt"
 
-#: application/forms/IcingaHostForm.php:31
-#: application/forms/IcingaAddServiceForm.php:35
+#: ../../../../application/forms/IcingaHostForm.php:33
+#: ../../../../application/forms/IcingaAddServiceForm.php:36
 msgid "Next"
 msgstr "Weiter"
 
-#: library/Director/Job/ImportJob.php:102
-#: library/Director/Job/ConfigJob.php:40
-#: library/Director/Job/ConfigJob.php:52
-#: library/Director/Job/SyncJob.php:102
-#: library/Director/PropertyModifier/PropertyModifierUpperCaseFirst.php:26
-#: application/forms/IcingaZoneForm.php:29
-#: application/forms/SettingsForm.php:58
-#: application/forms/SettingsForm.php:73
-#: application/forms/SettingsForm.php:95
-#: application/forms/SelfServiceSettingsForm.php:240
+#: ../../../../library/Director/Job/ImportJob.php:102
+#: ../../../../library/Director/Job/ConfigJob.php:40
+#: ../../../../library/Director/Job/ConfigJob.php:52
+#: ../../../../library/Director/Job/SyncJob.php:102
+#: ../../../../library/Director/PropertyModifier/PropertyModifierUpperCaseFirst.php:26
+#: ../../../../application/forms/IcingaZoneForm.php:29
+#: ../../../../application/forms/SettingsForm.php:58
+#: ../../../../application/forms/SettingsForm.php:73
+#: ../../../../application/forms/SettingsForm.php:95
+#: ../../../../application/forms/SelfServiceSettingsForm.php:240
 msgid "No"
 msgstr "Nein"
 
-#: application/controllers/DataController.php:184
+#: ../../../../application/controllers/DataController.php:184
 #, php-format
 msgid "No %s have been created yet"
 msgstr "Bisher wurden keine %s erstellt"
 
-#: library/Director/Util.php:167
+#: ../../../../library/Director/Util.php:167
 #, php-format
 msgid "No %s resource available"
 msgstr "Keine %s Ressource verfügbar"
 
-#: library/Director/Web/Navigation/Renderer/ConfigHealthItemRenderer.php:101
+#: ../../../../library/Director/Web/Navigation/Renderer/ConfigHealthItemRenderer.php:101
 msgid "No API user configured, you might run the kickstart helper"
 msgstr ""
 "Kein API Benutzer konfiguriert. Der kickstart helper sollte ausgeführt werden"
 
-#: application/forms/IcingaHostForm.php:175
+#: ../../../../application/forms/IcingaHostForm.php:177
 msgid "No Host Template has been provided yet"
 msgstr "Es wurde noch keine passende Host-Vorlage bereitgestellt"
 
-#: application/forms/IcingaHostForm.php:163
+#: ../../../../application/forms/IcingaHostForm.php:165
 msgid "No Host template has been chosen"
 msgstr "Keine Host-Vorlage wurde ausgewählt"
 
-#: application/forms/IcingaAddServiceForm.php:95
+#: ../../../../application/forms/IcingaAddServiceForm.php:96
 msgid "No Service Templates have been provided yet"
 msgstr "Es wurde noch keine passende Vorlage bereitgestellt"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:670
-#: application/forms/IcingaCommandArgumentForm.php:181
-#: application/forms/IcingaTimePeriodRangeForm.php:94
-#: application/forms/IcingaServiceForm.php:777
-#: application/forms/IcingaScheduledDowntimeRangeForm.php:99
+#: ../../../../application/forms/IcingaNotificationForm.php:127
+msgid "No User object has been created yet"
+msgstr "Kein Benutzer-Objekt wurde bisher definiert"
+
+#: ../../../../application/forms/IcingaNotificationForm.php:164
+msgid "No UserGroup object has been created yet"
+msgstr "Keine Benutzergruppe wurde bisher definiert"
+
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:673
+#: ../../../../application/forms/IcingaCommandArgumentForm.php:181
+#: ../../../../application/forms/IcingaTimePeriodRangeForm.php:94
+#: ../../../../application/forms/IcingaServiceForm.php:781
+#: ../../../../application/forms/IcingaScheduledDowntimeRangeForm.php:99
 msgid "No action taken, object has not been modified"
 msgstr "Keine Aktion durchgeführt, das Objekt wurde nicht verändert"
 
-#: library/Director/Dashboard/Dashlet/Dashlet.php:162
+#: ../../../../library/Director/Dashboard/Dashlet/Dashlet.php:162
 msgid "No apply rule has been defined yet"
 msgstr "Bisher wurde kein Apply-Regel definiert"
 
-#: library/Director/Web/Widget/SyncRunDetails.php:43
+#: ../../../../library/Director/Web/Widget/SyncRunDetails.php:43
 msgid "No changes have been made"
 msgstr "Keine Änderungen wurden gemacht"
 
-#: application/controllers/DashboardController.php:73
+#: ../../../../application/controllers/DashboardController.php:73
 msgid "No dashboard available, you might have not enough permissions"
 msgstr ""
 "Kein Dashboard verfügbar, eventuell wurden nicht genügend Zugriffsrechte "
 "gewährt"
 
-#: library/Director/Web/Navigation/Renderer/ConfigHealthItemRenderer.php:70
+#: ../../../../library/Director/Web/Navigation/Renderer/ConfigHealthItemRenderer.php:70
 msgid "No database has been configured for Icinga Director"
 msgstr "Keine Datenbank für den Icinga-Director wurde konfiguriert"
 
-#: application/forms/KickstartForm.php:215
+#: ../../../../application/forms/KickstartForm.php:215
 msgid ""
 "No database resource has been configured yet. Please choose a resource to "
 "complete your config"
@@ -4179,65 +4222,65 @@ msgstr ""
 "Es wurde bisher keine Datenbankressource konfiguriert. Bitte eine Ressource "
 "auswählen, um die Konfiguration zu vervollständigen"
 
-#: application/forms/KickstartForm.php:56
+#: ../../../../application/forms/KickstartForm.php:56
 msgid "No database schema has been created yet"
 msgstr "Kein Datenbankschema wurde bisher erstellt"
 
-#: application/forms/AddToBasketForm.php:105
+#: ../../../../application/forms/AddToBasketForm.php:105
 msgid "No object has been chosen"
 msgstr "Keine Objekt wurde ausgewählt"
 
-#: library/Director/Dashboard/Dashlet/Dashlet.php:180
+#: ../../../../library/Director/Dashboard/Dashlet/Dashlet.php:180
 msgid "No object has been defined yet"
 msgstr "Kein Objekt wurde bisher definiert"
 
-#: application/forms/IcingaMultiEditForm.php:88
+#: ../../../../application/forms/IcingaMultiEditForm.php:88
 msgid "No object has been modified"
 msgstr "Kein Objekt wurde verändert"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1245
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1248
 msgid "No related template has been provided yet"
 msgstr "Es wurde noch keine passende Vorlage bereitgestellt"
 
-#: application/forms/IcingaAddServiceForm.php:83
+#: ../../../../application/forms/IcingaAddServiceForm.php:84
 msgid "No service has been chosen"
 msgstr "Keine Service wurde ausgewählt"
 
-#: application/controllers/HostController.php:167
+#: ../../../../application/controllers/HostController.php:151
 #, php-format
 msgid "No such service: %s"
 msgstr "Kein solcher Service: %s"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1240
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1243
 msgid "No template has been chosen"
 msgstr "Keine Vorlage wurde ausgewählt"
 
-#: library/Director/Dashboard/Dashlet/Dashlet.php:144
+#: ../../../../library/Director/Dashboard/Dashlet/Dashlet.php:144
 msgid "No template has been defined yet"
 msgstr "Es wurde noch keine Vorlage definiert"
 
-#: application/forms/IcingaServiceForm.php:625
+#: ../../../../application/forms/IcingaServiceForm.php:629
 msgid "None"
 msgstr "Keine"
 
-#: library/Director/Dashboard/Dashlet/EndpointObjectDashlet.php:57
+#: ../../../../library/Director/Dashboard/Dashlet/EndpointObjectDashlet.php:58
 msgid "None could be used for deployments right now"
 msgstr "Keines kann momentan zum Ausrollen verwendet werden"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1531
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1534
 msgid "Notes"
 msgstr "Notizen"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1540
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1543
 msgid "Notes URL"
 msgstr "Notizen-URL"
 
-#: application/forms/SyncRunForm.php:60
+#: ../../../../application/forms/SyncRunForm.php:60
 msgid "Nothing changed, rule is in sync"
 msgstr "Keine Änderung, Regel ist synchron"
 
-#: application/forms/ImportCheckForm.php:38
-#: application/forms/ImportRunForm.php:38
+#: ../../../../application/forms/ImportCheckForm.php:38
+#: ../../../../application/forms/ImportRunForm.php:38
 msgid ""
 "Nothing to do, data provided by this Import Source didn't change since the "
 "last import run"
@@ -4245,40 +4288,40 @@ msgstr ""
 "Keine Aktion nötig. Die Daten von dieser Importquelle haben sich seit dem "
 "letzten Lauf nicht geändert"
 
-#: application/forms/RestoreObjectForm.php:76
+#: ../../../../application/forms/RestoreObjectForm.php:76
 msgid "Nothing to do, restore would not modify the current object"
 msgstr ""
 "Nichts zu tun, eine Wiederherstellung würde das aktuelle Objekt nicht ändern"
 
-#: application/forms/SyncRunForm.php:64
+#: ../../../../application/forms/SyncRunForm.php:64
 msgid "Nothing to do, rule is in sync"
 msgstr "Nichts zu tun, Regel ist synchron"
 
-#: application/forms/SyncCheckForm.php:63
+#: ../../../../application/forms/SyncCheckForm.php:63
 msgid "Nothing would change, this rule is still in sync"
 msgstr "Es würde sich nichts ändern, diese Regel ist noch synchron"
 
-#: library/Director/TranslationDummy.php:18
-#: application/forms/IcingaNotificationForm.php:25
-#: application/forms/SyncRuleForm.php:22
+#: ../../../../library/Director/TranslationDummy.php:18
+#: ../../../../application/forms/IcingaNotificationForm.php:26
+#: ../../../../application/forms/SyncRuleForm.php:22
 msgid "Notification"
 msgstr "Benachrichtigung"
 
-#: library/Director/DataType/DataTypeDirectorObject.php:58
+#: ../../../../library/Director/DataType/DataTypeDirectorObject.php:58
 msgid "Notification Apply Rules"
 msgstr "Benachrichtigungs-Apply-Regeln"
 
-#: library/Director/Web/Controller/TemplateController.php:57
+#: ../../../../library/Director/Web/Controller/TemplateController.php:58
 #, php-format
 msgid "Notification Apply Rules based on %s"
 msgstr "Benachrichtigungs-Apply-Regeln basierend auf %s"
 
-#: library/Director/Dashboard/Dashlet/NotificationCommandsDashlet.php:19
-#: library/Director/Import/ImportSourceCoreApi.php:58
+#: ../../../../library/Director/Dashboard/Dashlet/NotificationCommandsDashlet.php:19
+#: ../../../../library/Director/Import/ImportSourceCoreApi.php:58
 msgid "Notification Commands"
 msgstr "Benachrichtigungskommandos"
 
-#: library/Director/Dashboard/Dashlet/NotificationCommandsDashlet.php:12
+#: ../../../../library/Director/Dashboard/Dashlet/NotificationCommandsDashlet.php:12
 msgid ""
 "Notification Commands allow you to trigger any action you want when a "
 "notification takes place"
@@ -4286,41 +4329,41 @@ msgstr ""
 "Benachrichtigungs-Kommandos erlauben das Ausführen beliebiger Aktionen wenn "
 "eine Benachrichtigung stattfinden soll"
 
-#: application/forms/IcingaNotificationForm.php:19
+#: ../../../../application/forms/IcingaNotificationForm.php:20
 msgid "Notification Template"
 msgstr "Benachrichtigungsvorlage"
 
-#: application/forms/BasketForm.php:30
+#: ../../../../application/forms/BasketForm.php:30
 msgid "Notification Templates"
 msgstr "Benachrichtigungsvorlagen"
 
-#: application/forms/IcingaNotificationForm.php:262
+#: ../../../../application/forms/IcingaNotificationForm.php:310
 msgid "Notification command"
 msgstr "Benachrichtigungskommando"
 
-#: application/forms/IcingaNotificationForm.php:176
+#: ../../../../application/forms/IcingaNotificationForm.php:224
 msgid "Notification interval"
 msgstr "Benachrichtigungsintervall"
 
-#: application/controllers/TemplatechoicesController.php:29
+#: ../../../../application/controllers/TemplatechoicesController.php:29
 msgid "Notification template choices"
 msgstr "Auswahlmöglichkeiten für Benachrichtigungsvorlagen"
 
-#: library/Director/Dashboard/Dashlet/NotificationTemplateDashlet.php:13
+#: ../../../../library/Director/Dashboard/Dashlet/NotificationTemplateDashlet.php:15
 msgid "Notification templates"
 msgstr "Benachrichtigungsvorlagen"
 
-#: configuration.php:165
-#: library/Director/Dashboard/Dashlet/NotificationApplyDashlet.php:13
-#: library/Director/Dashboard/Dashlet/NotificationsDashlet.php:13
-#: library/Director/Db/Branch/BranchModificationInspection.php:46
-#: library/Director/Web/Table/CustomvarVariantsTable.php:61
-#: library/Director/Web/Table/CustomvarTable.php:46
-#: application/forms/BasketForm.php:31
+#: ../../../../configuration.php:133
+#: ../../../../library/Director/Dashboard/Dashlet/NotificationApplyDashlet.php:15
+#: ../../../../library/Director/Dashboard/Dashlet/NotificationsDashlet.php:15
+#: ../../../../library/Director/Db/Branch/BranchModificationInspection.php:46
+#: ../../../../library/Director/Web/Table/CustomvarVariantsTable.php:61
+#: ../../../../library/Director/Web/Table/CustomvarTable.php:46
+#: ../../../../application/forms/BasketForm.php:31
 msgid "Notifications"
 msgstr "Benachrichtigungen"
 
-#: library/Director/Dashboard/NotificationsDashboard.php:20
+#: ../../../../library/Director/Dashboard/NotificationsDashboard.php:20
 msgid ""
 "Notifications are sent when a host or service reaches a non-ok hard state or "
 "recovers from such. One might also want to send them for special events like "
@@ -4354,72 +4397,72 @@ msgstr ""
 "sich natürlich auch an externe Serviceanbieter auslagern. Die Möglichkeiten "
 "sind endlos, nachdem man beliebig viele eigene Kommandos anbinden kann"
 
-#: library/Director/PropertyModifier/PropertyModifierArrayElementByPosition.php:43
+#: ../../../../library/Director/PropertyModifier/PropertyModifierArrayElementByPosition.php:43
 msgid "Numeric position or key name"
 msgstr "Numerische Position oder Schlüsselbezeichner"
 
-#: library/Director/IcingaConfig/StateFilterSet.php:24
+#: ../../../../library/Director/IcingaConfig/StateFilterSet.php:24
 msgid "OK"
 msgstr "Ok"
 
-#: library/Director/DataType/DataTypeDirectorObject.php:67
-#: library/Director/Web/Form/DirectorObjectForm.php:1114
-#: library/Director/Web/Form/DirectorObjectForm.php:1119
-#: library/Director/Web/Controller/TemplateController.php:149
+#: ../../../../library/Director/DataType/DataTypeDirectorObject.php:67
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1117
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1122
+#: ../../../../library/Director/Web/Controller/TemplateController.php:150
 msgid "Object"
 msgstr "Objekt"
 
-#: application/controllers/InspectController.php:102
+#: ../../../../application/controllers/InspectController.php:102
 msgid "Object Inspection"
 msgstr "Objekt-Inspektion"
 
-#: library/Director/Import/ImportSourceDirectorObject.php:78
-#: application/forms/SyncRuleForm.php:45
+#: ../../../../library/Director/Import/ImportSourceDirectorObject.php:78
+#: ../../../../application/forms/SyncRuleForm.php:45
 msgid "Object Type"
 msgstr "Objekttyp"
 
-#: library/Director/Import/ImportSourceLdap.php:56
+#: ../../../../library/Director/Import/ImportSourceLdap.php:56
 msgid "Object class"
 msgstr "Objektklasse"
 
-#: library/Director/Dashboard/Dashlet/DependencyObjectDashlet.php:18
+#: ../../../../library/Director/Dashboard/Dashlet/DependencyObjectDashlet.php:18
 msgid "Object dependency relationships."
 msgstr "Objekt-Abhängigkeiten."
 
-#: application/forms/RestoreObjectForm.php:80
+#: ../../../../application/forms/RestoreObjectForm.php:80
 msgid "Object has been re-created"
 msgstr "Objekt wurde wiederhergestellt"
 
-#: application/forms/RestoreObjectForm.php:72
+#: ../../../../application/forms/RestoreObjectForm.php:72
 msgid "Object has been restored"
 msgstr "Objekt wurde wiederhergestellt"
 
-#: application/forms/SyncPropertyForm.php:359
+#: ../../../../application/forms/SyncPropertyForm.php:359
 msgid "Object properties"
 msgstr "Objekteigenschaften"
 
-#: library/Director/Web/Table/SyncruleTable.php:46
-#: library/Director/Web/Form/DirectorObjectForm.php:1127
+#: ../../../../library/Director/Web/Table/SyncruleTable.php:46
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1130
 msgid "Object type"
 msgstr "Objekttyp"
 
-#: application/controllers/InspectController.php:65
+#: ../../../../application/controllers/InspectController.php:65
 #, php-format
 msgid "Object type \"%s\""
 msgstr "Objekttyp \"%s\""
 
-#: library/Director/Web/Table/GeneratedConfigFileTable.php:85
+#: ../../../../library/Director/Web/Table/GeneratedConfigFileTable.php:85
 msgid "Object/Tpl/Apply"
 msgstr "Objekt/Vorlage/Apply"
 
-#: library/Director/Import/ImportSourceDirectorObject.php:81
-#: library/Director/Web/Table/HostTemplateUsageTable.php:11
-#: library/Director/Web/Table/TemplateUsageTable.php:24
-#: library/Director/Web/Table/ServiceTemplateUsageTable.php:11
+#: ../../../../library/Director/Import/ImportSourceDirectorObject.php:81
+#: ../../../../library/Director/Web/Table/TemplateUsageTable.php:24
+#: ../../../../library/Director/Web/Table/HostTemplateUsageTable.php:11
+#: ../../../../library/Director/Web/Table/ServiceTemplateUsageTable.php:11
 msgid "Objects"
 msgstr "Objekte"
 
-#: library/Director/Import/ImportSourceRestApi.php:209
+#: ../../../../library/Director/Import/ImportSourceRestApi.php:209
 msgid ""
 "Often the expected result is provided in a property like \"objects\". Please "
 "specify this if required."
@@ -4427,35 +4470,35 @@ msgstr ""
 "Häufig wird das zu erwartende Ergebnis in einer Eigenschaft wie \"objects\" "
 "zurückgeliefert. Bitte angeben falls erforderlich."
 
-#: library/Director/PropertyModifier/PropertyModifierExtractFromDN.php:27
-#: library/Director/PropertyModifier/PropertyModifierParseURL.php:34
+#: ../../../../library/Director/PropertyModifier/PropertyModifierExtractFromDN.php:27
+#: ../../../../library/Director/PropertyModifier/PropertyModifierParseURL.php:34
 msgid "On failure"
 msgstr "Bei Fehler"
 
-#: library/Director/Dashboard/Dashlet/Dashlet.php:166
+#: ../../../../library/Director/Dashboard/Dashlet/Dashlet.php:166
 msgid "One apply rule has been defined"
 msgstr "Eine Apply-Regel wurde definiert"
 
-#: library/Director/Dashboard/Dashlet/Dashlet.php:188
+#: ../../../../library/Director/Dashboard/Dashlet/Dashlet.php:188
 msgid "One external object has been defined, it will not be deployed"
 msgstr "Ein externes Objekt wurde erstellt, es wird nicht ausgerollt"
 
-#: library/Director/Dashboard/Dashlet/Dashlet.php:191
+#: ../../../../library/Director/Dashboard/Dashlet/Dashlet.php:191
 msgid "One object has been defined"
 msgstr "Ein Objekt wurde definiert"
 
-#: library/Director/Web/Widget/SyncRunDetails.php:46
-#: application/forms/IcingaMultiEditForm.php:90
+#: ../../../../library/Director/Web/Widget/SyncRunDetails.php:46
+#: ../../../../application/forms/IcingaMultiEditForm.php:90
 msgid "One object has been modified"
 msgstr "Ein Objekt wurde verändert"
 
-#: library/Director/PropertyModifier/PropertyModifierSplit.php:16
+#: ../../../../library/Director/PropertyModifier/PropertyModifierSplit.php:16
 msgid "One or more characters that should be used to split this string"
 msgstr ""
 "Ein oder mehrere Zeichen, die zum Trennen der Zeichenkette genutzt werden "
 "sollen"
 
-#: library/Director/PropertyModifier/PropertyModifierJoin.php:16
+#: ../../../../library/Director/PropertyModifier/PropertyModifierJoin.php:16
 msgid ""
 "One or more characters that will be used to glue an input array to a string. "
 "Can be left empty"
@@ -4463,18 +4506,18 @@ msgstr ""
 "Ein oder mehrere Zeichen, die verwendet werden, um einen Eingabearray an "
 "eine Zeichenkette zu heften. Kann leer bleiben"
 
-#: application/forms/IcingaTimePeriodRangeForm.php:30
-#: application/forms/IcingaScheduledDowntimeRangeForm.php:31
+#: ../../../../application/forms/IcingaTimePeriodRangeForm.php:30
+#: ../../../../application/forms/IcingaScheduledDowntimeRangeForm.php:31
 msgid "One or more time periods, e.g. 00:00-24:00 or 00:00-09:00,17:00-24:00"
 msgstr ""
 "Einer oder mehrere Zeiträume, z.B. 00:00-24:00  oder 00:00-09:00,17:00-24:00"
 
-#: library/Director/Dashboard/Dashlet/Dashlet.php:148
-#: library/Director/Dashboard/Dashlet/Dashlet.php:185
+#: ../../../../library/Director/Dashboard/Dashlet/Dashlet.php:148
+#: ../../../../library/Director/Dashboard/Dashlet/Dashlet.php:185
 msgid "One template has been defined"
 msgstr "Eine Vorlage wurde definiert"
 
-#: application/forms/IcingaCommandArgumentForm.php:100
+#: ../../../../application/forms/IcingaCommandArgumentForm.php:100
 msgid ""
 "Only set this parameter if the argument value resolves to a numeric value. "
 "String values are not supported"
@@ -4482,11 +4525,11 @@ msgstr ""
 "Nur setzen, wenn der Wert des Arguments numereisch ist. Zeichenketten als "
 "Wert werden nicht unterstützt"
 
-#: application/forms/IcingaObjectFieldForm.php:146
+#: ../../../../application/forms/IcingaObjectFieldForm.php:110
 msgid "Optional"
 msgstr "Optional"
 
-#: application/forms/IcingaCommandForm.php:71
+#: ../../../../application/forms/IcingaCommandForm.php:71
 msgid ""
 "Optional command timeout. Allowed values are seconds or durations postfixed "
 "with a specific unit (e.g. 1m or also 3m 30s)."
@@ -4494,7 +4537,7 @@ msgstr ""
 "Optionaler Kommando-Timeout. Erlaubt sind Werte in Sekunden oder Werte mit "
 "nachgestellter Zeiteinheit. z.B. 1m oder auch 3m 30s."
 
-#: application/forms/IcingaDependencyForm.php:248
+#: ../../../../application/forms/IcingaDependencyForm.php:248
 msgid ""
 "Optional. The child service. If omitted this dependency object is treated as "
 "host dependency."
@@ -4502,7 +4545,7 @@ msgstr ""
 "Optional. Der Kind-Service. Falls leer wird dieses Objekt als Host-"
 "Abhängigkeit behandelt."
 
-#: application/forms/IcingaDependencyForm.php:218
+#: ../../../../application/forms/IcingaDependencyForm.php:218
 msgid ""
 "Optional. The parent service. If omitted this dependency object is treated "
 "as host dependency."
@@ -4510,38 +4553,38 @@ msgstr ""
 "Optional. Der Eltern-Service. Falls leer wird dieses Objekt als Host-"
 "Abhängigkeit behandelt."
 
-#: application/forms/IcingaObjectFieldForm.php:103
+#: ../../../../library/Director/Field/FormFieldSuggestion.php:90
 msgid "Other available fields"
 msgstr "Andere verfügbare Felder"
 
-#: application/forms/SyncPropertyForm.php:274
+#: ../../../../application/forms/SyncPropertyForm.php:274
 msgid "Other sources"
 msgstr "Andere Quellen"
 
-#: application/forms/IcingaServiceForm.php:160
-#: application/forms/IcingaServiceForm.php:435
-#: application/forms/IcingaServiceForm.php:467
+#: ../../../../application/forms/IcingaServiceForm.php:162
+#: ../../../../application/forms/IcingaServiceForm.php:439
+#: ../../../../application/forms/IcingaServiceForm.php:471
 msgid "Override vars"
 msgstr "Variablen überschreiben"
 
-#: library/Director/Web/ActionBar/AutomationObjectActionBar.php:32
-#: library/Director/Web/Tabs/MainTabs.php:26
+#: ../../../../library/Director/Web/ActionBar/AutomationObjectActionBar.php:32
+#: ../../../../library/Director/Web/Tabs/MainTabs.php:27
 msgid "Overview"
 msgstr "Überblick"
 
-#: library/Director/Web/Widget/BackgroundDaemonDetails.php:81
+#: ../../../../library/Director/Web/Widget/BackgroundDaemonDetails.php:81
 msgid "PHP Binary"
 msgstr "PHP Binary"
 
-#: library/Director/Web/Widget/BackgroundDaemonDetails.php:84
+#: ../../../../library/Director/Web/Widget/BackgroundDaemonDetails.php:84
 msgid "PHP Integer"
 msgstr "PHP Integer"
 
-#: library/Director/Web/Widget/BackgroundDaemonDetails.php:83
+#: ../../../../library/Director/Web/Widget/BackgroundDaemonDetails.php:83
 msgid "PHP Version"
 msgstr "PHP-Version"
 
-#: application/controllers/PhperrorController.php:19
+#: ../../../../application/controllers/PhperrorController.php:19
 #, php-format
 msgid ""
 "PHP version 5.4.x is required for Director >= 1.4.0, you're running %s. "
@@ -4550,56 +4593,56 @@ msgstr ""
 "PHP Version 5.4.x ist für den Director >= 1.4.0 erforderlich, hier läuft %s. "
 "Bitte entweder PHP upgraden oder den Icinga Director downgraden"
 
-#: library/Director/Web/Widget/BackgroundDaemonDetails.php:73
+#: ../../../../library/Director/Web/Widget/BackgroundDaemonDetails.php:73
 msgid "PID"
 msgstr "PID"
 
-#: library/Director/Web/Tabs/ObjectTabs.php:137
+#: ../../../../library/Director/Web/Tabs/ObjectTabs.php:134
 msgid "Packages"
 msgstr "Pakete"
 
-#: library/Director/Web/Widget/InspectPackages.php:48
+#: ../../../../library/Director/Web/Widget/InspectPackages.php:48
 #, php-format
 msgid "Packages on Endpoint: %s"
 msgstr "Pakete auf Endpunkt: %s"
 
-#: application/forms/IcingaUserForm.php:41
+#: ../../../../application/forms/IcingaUserForm.php:41
 msgid "Pager"
 msgstr "Pager"
 
-#: application/forms/IcingaDependencyForm.php:200
+#: ../../../../application/forms/IcingaDependencyForm.php:200
 msgid "Parent Host"
 msgstr "Eltern-Host"
 
-#: application/forms/IcingaDependencyForm.php:216
+#: ../../../../application/forms/IcingaDependencyForm.php:216
 msgid "Parent Service"
 msgstr "Eltern-Service"
 
-#: application/forms/IcingaZoneForm.php:36
+#: ../../../../application/forms/IcingaZoneForm.php:36
 msgid "Parent Zone"
 msgstr "Übergeordnete Zone"
 
-#: library/Director/Import/ImportSourceRestApi.php:233
-#: application/forms/IcingaApiUserForm.php:19
-#: application/forms/KickstartForm.php:163
+#: ../../../../library/Director/Import/ImportSourceRestApi.php:233
+#: ../../../../application/forms/IcingaApiUserForm.php:19
+#: ../../../../application/forms/KickstartForm.php:163
 msgid "Password"
 msgstr "Passwort"
 
-#: library/Director/PropertyModifier/PropertyModifierRegexSplit.php:13
-#: library/Director/PropertyModifier/PropertyModifierCombine.php:14
+#: ../../../../library/Director/PropertyModifier/PropertyModifierRegexSplit.php:13
+#: ../../../../library/Director/PropertyModifier/PropertyModifierCombine.php:14
 msgid "Pattern"
 msgstr "Muster"
 
-#: application/forms/ApplyMigrationsForm.php:39
+#: ../../../../application/forms/ApplyMigrationsForm.php:39
 msgid "Pending database schema migrations have successfully been applied"
 msgstr ""
 "Ausstehende Datenbankschemamigrationsskripte wurden erfolgreich angewandt"
 
-#: library/Director/Util.php:169
+#: ../../../../library/Director/Util.php:169
 msgid "Please ask an administrator to grant you access to resources"
 msgstr "Zugriff auf Ressourcen kann durch Administrator gewährt werden"
 
-#: application/forms/AddToBasketForm.php:117
+#: ../../../../application/forms/AddToBasketForm.php:117
 #, php-format
 msgid ""
 "Please check your Basket configuration, %s does not support single \"%s\" "
@@ -4608,16 +4651,16 @@ msgstr ""
 "Bitte Basketkonfiguration überprüfen, %s unterstützt keine einzelnen "
 "Konfigurationsobjekte vom Typ \"%s\""
 
-#: library/Director/PropertyModifier/PropertyModifierMap.php:19
+#: ../../../../library/Director/PropertyModifier/PropertyModifierMap.php:20
 msgid "Please choose a data list that can be used for map lookups"
 msgstr "Eine Datenliste auswählen, die für Map lookups verwendet wird"
 
-#: library/Director/DataType/DataTypeDirectorObject.php:69
-#: library/Director/DataType/DataTypeDictionary.php:66
+#: ../../../../library/Director/DataType/DataTypeDirectorObject.php:69
+#: ../../../../library/Director/DataType/DataTypeDictionary.php:66
 msgid "Please choose a specific Icinga object type"
 msgstr "Bitte einen bestimmten Icinga-Objekttyp auswählen"
 
-#: library/Director/Job/ImportJob.php:82
+#: ../../../../library/Director/Job/ImportJob.php:82
 msgid ""
 "Please choose your import source that should be executed. You could create "
 "different schedules for different sources or also opt for running all of "
@@ -4627,7 +4670,7 @@ msgstr ""
 "verschiedene Zeitpläne für verschiedene Quellen erstellt oder alle "
 "gleichzeitig ausgeführt werden."
 
-#: library/Director/Job/SyncJob.php:82
+#: ../../../../library/Director/Job/SyncJob.php:82
 msgid ""
 "Please choose your synchronization rule that should be executed. You could "
 "create different schedules for different rules or also opt for running all "
@@ -4637,33 +4680,33 @@ msgstr ""
 "verschiedene Zeitpläne für verschiedene Regeln erstellt oder alle "
 "gleichzeitig ausgeführt werden."
 
-#: library/Director/Import/ImportSourceSql.php:55
+#: ../../../../library/Director/Import/ImportSourceSql.php:55
 msgid "Please click \"Store\" once again to determine query columns"
 msgstr ""
 "Bitte klicke \"Speicher\" erneut um die von der Abfrage bereitgestellten "
 "Spalten zu ermitteln"
 
-#: application/forms/KickstartForm.php:234
+#: ../../../../application/forms/KickstartForm.php:234
 #, php-format
 msgid "Please click %s to create new DB resources"
 msgstr "%s klicken, um neue Datenbankressourcen zu erstellen"
 
-#: library/Director/Util.php:159
+#: ../../../../library/Director/Util.php:159
 #, php-format
 msgid "Please click %s to create new resources"
 msgstr "%s klicken, um neue Ressourcen zu erstellen"
 
-#: application/forms/IcingaHostForm.php:167
-#: application/forms/IcingaAddServiceForm.php:87
+#: ../../../../application/forms/IcingaHostForm.php:169
+#: ../../../../application/forms/IcingaAddServiceForm.php:88
 #, php-format
 msgid "Please define a %s first"
 msgstr "Bitte zuerst eine %s definieren"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1243
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1246
 msgid "Please define a related template first"
 msgstr "Bitte zuerst eine entsprechende Vorlage definieren"
 
-#: application/forms/KickstartForm.php:472
+#: ../../../../application/forms/KickstartForm.php:472
 msgid ""
 "Please make sure that your database exists and your user has been granted "
 "enough permissions"
@@ -4671,7 +4714,7 @@ msgstr ""
 "Überprüfen, ob die Datenbank existiert und der Benutzer ausreichende "
 "Berechtigungen hat"
 
-#: application/controllers/ImportsourceController.php:98
+#: ../../../../application/controllers/ImportsourceController.php:98
 #, php-format
 msgid ""
 "Please note that importing data will take place in your main Branch. "
@@ -4683,7 +4726,7 @@ msgstr ""
 "anderen Konfigurationszweig befindet. Für die volle Funktionalität bitte %s "
 "deaktivieren"
 
-#: application/forms/SettingsForm.php:23
+#: ../../../../application/forms/SettingsForm.php:23
 msgid ""
 "Please only change those settings in case you are really sure that you are "
 "required to do so. Usually the defaults chosen by the Icinga Director should "
@@ -4693,18 +4736,18 @@ msgstr ""
 "nötig erachtet wird. Für gewöhnlich sollten die vom Icinga Director "
 "gewählten Standardwerte für Umgebungen jeglicher Art passend sein."
 
-#: application/forms/SyncRuleForm.php:31
+#: ../../../../application/forms/SyncRuleForm.php:31
 msgid "Please provide a rule name"
 msgstr "Bitte einen Regelnamen angeben"
 
-#: library/Director/PropertyModifier/PropertyModifierSubstring.php:17
-#: library/Director/PropertyModifier/PropertyModifierSubstring.php:27
+#: ../../../../library/Director/PropertyModifier/PropertyModifierSubstring.php:17
+#: ../../../../library/Director/PropertyModifier/PropertyModifierSubstring.php:27
 #, php-format
 msgid "Please see %s for detailled instructions of how start and end work"
 msgstr ""
 "Siehe %s für eine detaillierte Anleitung, wie Beginn und Ende funktionieren"
 
-#: application/forms/ImportRowModifierForm.php:32
+#: ../../../../application/forms/ImportRowModifierForm.php:32
 msgid ""
 "Please start typing for a list of suggestions. Dots allow you to access "
 "nested properties: column.some.key. Such nested properties cannot be "
@@ -4717,7 +4760,7 @@ msgstr ""
 "verändert werden, dafür lässt sich der modifizierte Wert aber in eine neue "
 "\"Zieleigenschaft\" schreiben"
 
-#: application/forms/IcingaCommandForm.php:35
+#: ../../../../application/forms/IcingaCommandForm.php:35
 msgid ""
 "Plugin Check commands are what you need when running checks agains your "
 "infrastructure. Notification commands will be used when it comes to notify "
@@ -4731,284 +4774,300 @@ msgstr ""
 "für Selbstheilungsmechanismen verwendet, wie das Neustarten von Services "
 "oder das Neustarten von Systemen beim Überschreiten bestimmter Schwellwerte"
 
-#: application/forms/IcingaCommandForm.php:20
+#: ../../../../application/forms/IcingaCommandForm.php:20
 msgid "Plugin commands"
 msgstr "Plugin-Kommandos"
 
-#: library/Director/PropertyModifier/PropertyModifierArrayFilter.php:50
-#: library/Director/PropertyModifier/PropertyModifierRejectOrSelect.php:65
+#: ../../../../library/Director/PropertyModifier/PropertyModifierArrayFilter.php:50
+#: ../../../../library/Director/PropertyModifier/PropertyModifierRejectOrSelect.php:65
 msgid "Policy"
 msgstr "Richtlinie"
 
-#: application/forms/IcingaEndpointForm.php:36
-#: application/forms/KickstartForm.php:145
+#: ../../../../application/forms/IcingaEndpointForm.php:36
+#: ../../../../application/forms/KickstartForm.php:145
 msgid "Port"
 msgstr "Port"
 
-#: library/Director/PropertyModifier/PropertyModifierArrayElementByPosition.php:41
-#: application/forms/IcingaCommandArgumentForm.php:67
+#: ../../../../library/Director/PropertyModifier/PropertyModifierArrayElementByPosition.php:41
+#: ../../../../application/forms/IcingaCommandArgumentForm.php:67
 msgid "Position"
 msgstr "Position"
 
-#: library/Director/PropertyModifier/PropertyModifierArrayElementByPosition.php:30
+#: ../../../../library/Director/PropertyModifier/PropertyModifierArrayElementByPosition.php:30
 msgid "Position Type"
 msgstr "Positionstyp"
 
-#: application/controllers/SchemaController.php:17
+#: ../../../../application/controllers/SchemaController.php:17
 msgid "PostgreSQL schema"
 msgstr "PostgreSQL Schema"
 
-#: application/forms/IcingaTimePeriodForm.php:76
+#: ../../../../application/forms/IcingaTimePeriodForm.php:76
 msgid "Prefer includes"
 msgstr "Includes bevorzugen"
 
-#: library/Director/Dashboard/BranchesDashboard.php:24
+#: ../../../../library/Director/Dashboard/BranchesDashboard.php:34
 msgid "Prepare your configuration in a safe Environment"
 msgstr "Bereite Konfiguration in einer geschützten Umgebung vor"
 
-#: library/Director/Dashboard/Dashlet/BasketDashlet.php:17
+#: ../../../../library/Director/Dashboard/Dashlet/BasketDashlet.php:19
 msgid "Preserve specific configuration objects in a specific state"
 msgstr ""
 "Bestimmte Konfigurationsobjekte in einem bestimmten Zustand aufbewahren"
 
-#: library/Director/Web/Tabs/ImportsourceTabs.php:49
-#: library/Director/Web/Tabs/SyncRuleTabs.php:33
-#: library/Director/Web/Tabs/ObjectTabs.php:86
+#: ../../../../library/Director/Web/Tabs/ImportsourceTabs.php:49
+#: ../../../../library/Director/Web/Tabs/SyncRuleTabs.php:33
+#: ../../../../library/Director/Web/Tabs/ObjectTabs.php:83
 msgid "Preview"
 msgstr "Vorschau"
 
-#: library/Director/IcingaConfig/TypeFilterSet.php:23
+#: ../../../../library/Director/IcingaConfig/TypeFilterSet.php:23
 msgid "Problem"
 msgstr "Problem"
 
-#: library/Director/IcingaConfig/TypeFilterSet.php:27
+#: ../../../../library/Director/IcingaConfig/TypeFilterSet.php:27
 msgid "Problem handling"
 msgstr "Problembehandlung"
 
-#: library/Director/Web/Widget/BackgroundDaemonDetails.php:94
+#: ../../../../library/Director/Web/Widget/BackgroundDaemonDetails.php:94
 msgid "Process List"
 msgstr "Prozessliste"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1452
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1455
 msgid "Process performance data"
 msgstr "Performancedaten verarbeiten"
 
-#: library/Director/Import/ImportSourceLdap.php:70
-#: library/Director/Web/Tabs/SyncRuleTabs.php:39
-#: application/controllers/DataController.php:328
+#: ../../../../library/Director/Import/ImportSourceLdap.php:70
+#: ../../../../library/Director/Web/Tabs/SyncRuleTabs.php:39
+#: ../../../../application/controllers/DataController.php:328
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: library/Director/PropertyModifier/PropertyModifierGetPropertyFromOtherImportSource.php:61
-#: library/Director/Web/Table/PropertymodifierTable.php:129
-#: library/Director/Web/Table/PropertymodifierTable.php:132
-#: application/forms/ImportRowModifierForm.php:30
+#: ../../../../library/Director/PropertyModifier/PropertyModifierGetPropertyFromOtherImportSource.php:61
+#: ../../../../library/Director/Web/Table/PropertymodifierTable.php:129
+#: ../../../../library/Director/Web/Table/PropertymodifierTable.php:132
+#: ../../../../application/forms/ImportRowModifierForm.php:30
 msgid "Property"
 msgstr "Eigenschaft"
 
-#: application/controllers/ImportsourceController.php:251
+#: ../../../../application/controllers/ImportsourceController.php:251
 #, php-format
 msgid "Property modifiers: %s"
 msgstr "Eigenschaftsmodifikatoren: %s"
 
-#: library/Director/Web/Table/CoreApiFieldsTable.php:88
+#: ../../../../library/Director/Web/Table/CoreApiFieldsTable.php:88
 msgid "Protected"
 msgstr "Geschützt"
 
-#: library/Director/Import/ImportSourceRestApi.php:128
+#: ../../../../library/Director/Import/ImportSourceRestApi.php:128
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: application/controllers/InspectController.php:89
+#: ../../../../application/controllers/InspectController.php:89
 msgid "Prototypes (methods)"
 msgstr "Prototypen (Methoden)"
 
-#: library/Director/Dashboard/Dashlet/DatalistDashlet.php:11
+#: ../../../../library/Director/Dashboard/Dashlet/DatalistDashlet.php:13
 msgid "Provide Data Lists"
 msgstr "Datenlisten bereitstellen"
 
-#: library/Director/Dashboard/Dashlet/DatalistDashlet.php:17
+#: ../../../../library/Director/Dashboard/Dashlet/DatalistDashlet.php:19
 msgid "Provide data lists to make life easier for your users"
 msgstr "Datenlisten erleichtern Anwendern die Arbeit"
 
-#: library/Director/Dashboard/Dashlet/TimeperiodTemplateDashlet.php:18
+#: ../../../../library/Director/Dashboard/Dashlet/TimeperiodTemplateDashlet.php:20
 msgid "Provide templates for your TimePeriod objects."
 msgstr "Vorlagen für Benachrichtigungen bereitstellen."
 
-#: library/Director/Dashboard/Dashlet/UserTemplateDashlet.php:18
+#: ../../../../library/Director/Dashboard/Dashlet/UserTemplateDashlet.php:20
 msgid "Provide templates for your User objects."
 msgstr "Vorlagen für Benutzer-Objekte bereitstellen."
 
-#: library/Director/Dashboard/Dashlet/NotificationTemplateDashlet.php:18
+#: ../../../../library/Director/Dashboard/Dashlet/NotificationTemplateDashlet.php:20
 msgid "Provide templates for your notifications."
 msgstr "Vorlagen für Benachrichtigungen bereitstellen."
 
-#: library/Director/Import/ImportSourceRestApi.php:244
+#: ../../../../library/Director/Import/ImportSourceRestApi.php:244
 msgid "Proxy"
 msgstr "Proxy"
 
-#: library/Director/Import/ImportSourceRestApi.php:260
+#: ../../../../library/Director/Import/ImportSourceRestApi.php:260
 msgid "Proxy Address"
 msgstr "Proxyadresse"
 
-#: library/Director/Import/ImportSourceRestApi.php:278
+#: ../../../../library/Director/Import/ImportSourceRestApi.php:278
 msgid "Proxy Password"
 msgstr "Proxykennwort"
 
-#: library/Director/Import/ImportSourceRestApi.php:268
+#: ../../../../library/Director/Import/ImportSourceRestApi.php:268
 msgid "Proxy Username"
 msgstr "Proxybenutzer"
 
-#: application/forms/SyncRuleForm.php:70
+#: ../../../../application/forms/SyncRuleForm.php:70
 msgid "Purge"
 msgstr "Bereinigen"
 
-#: application/forms/SyncRuleForm.php:82
+#: ../../../../application/forms/SyncRuleForm.php:82
 msgid "Purge Action"
 msgstr "Aktion beim Bereinigen"
 
-#: library/Director/Web/Tabs/ObjectTabs.php:122
+#: ../../../../library/Director/Import/ImportSourceLab.php:44
+msgid "RAW JSON data"
+msgstr "Rohe JSON-Daten"
+
+#: ../../../../library/Director/Web/Tabs/ObjectTabs.php:119
 msgid "Ranges"
 msgstr "Bereiche"
 
-#: application/forms/DeployConfigForm.php:32
+#: ../../../../application/forms/DeployConfigForm.php:32
 msgid "Re-deploy now"
 msgstr "Jetzt erneut ausrollen"
 
-#: application/forms/IcingaServiceForm.php:141
+#: ../../../../application/forms/IcingaServiceForm.php:143
 msgid "Reactivate"
 msgstr "Reaktivieren"
 
-#: library/Director/IcingaConfig/TypeFilterSet.php:24
+#: ../../../../library/Director/IcingaConfig/TypeFilterSet.php:24
 msgid "Recovery"
 msgstr "Erholung"
 
-#: application/forms/IcingaGenerateApiKeyForm.php:22
+#: ../../../../application/forms/IcingaGenerateApiKeyForm.php:22
 msgid "Regenerate Self Service API key"
 msgstr "Selbstbedienungs-API-Schlüssel neu generieren"
 
-#: application/forms/IcingaHostSelfServiceForm.php:56
+#: ../../../../library/Director/PropertyModifier/PropertyModifierRegexReplace.php:13
+msgid "Regex pattern"
+msgstr "Regex-Muster"
+
+#: ../../../../application/forms/IcingaHostSelfServiceForm.php:56
 msgid "Register"
 msgstr "Registrieren"
 
-#: library/Director/Web/SelfService.php:62
+#: ../../../../library/Director/Web/SelfService.php:62
 msgid "Registered Agent"
 msgstr "Registrierter Agent"
 
-#: library/Director/PropertyModifier/PropertyModifierArrayFilter.php:34
-#: library/Director/PropertyModifier/PropertyModifierRejectOrSelect.php:32
+#: ../../../../library/Director/PropertyModifier/PropertyModifierArrayFilter.php:34
+#: ../../../../library/Director/PropertyModifier/PropertyModifierRejectOrSelect.php:32
 msgid "Regular Expression"
 msgstr "Regulärer Ausdruck"
 
-#: library/Director/PropertyModifier/PropertyModifierRegexSplit.php:16
+#: ../../../../library/Director/PropertyModifier/PropertyModifierRegexReplace.php:41
+msgid "Regular expression based replacement"
+msgstr "Ersatz, basierend auf dem regulären Ausdruck"
+
+#: ../../../../library/Director/PropertyModifier/PropertyModifierRegexSplit.php:16
 msgid "Regular expression pattern to split the string (e.g. /\\s+/ or /[,;]/)"
 msgstr ""
 "Regulärer Ausdruck anhand dessen eine String aufgeteilt werden soll (z.B. /"
 "\\s+/ oder /[,;]/)"
 
-#: library/Director/PropertyModifier/PropertyModifierArrayFilter.php:58
+#: ../../../../library/Director/PropertyModifier/PropertyModifierArrayFilter.php:58
 msgid "Reject matching elements"
 msgstr "Übereinstimmende Elemente ablehnen"
 
-#: library/Director/PropertyModifier/PropertyModifierRejectOrSelect.php:17
+#: ../../../../library/Director/PropertyModifier/PropertyModifierRejectOrSelect.php:17
 msgid "Reject or keep rows based on property value"
 msgstr "Die ganze Zeile abhängig vom Eigenschaftswert abweisen"
 
-#: library/Director/PropertyModifier/PropertyModifierRejectOrSelect.php:72
+#: ../../../../library/Director/PropertyModifier/PropertyModifierRejectOrSelect.php:72
 msgid "Reject the whole row"
 msgstr "Verwerfe die ganze Zeile"
 
-#: application/forms/IcingaDependencyForm.php:268
+#: ../../../../application/forms/IcingaDependencyForm.php:268
 msgid "Related Objects"
 msgstr "Verwandte Objekte"
 
-#: library/Director/Web/Widget/ActivityLogInfo.php:532
+#: ../../../../library/Director/Web/Widget/ActivityLogInfo.php:532
 msgid "Remark"
 msgstr "Anmerkung"
 
-#: library/Director/Web/Table/IcingaServiceSetServiceTable.php:225
+#: ../../../../library/Director/Web/Table/IcingaServiceSetServiceTable.php:238
 msgid "Remove"
 msgstr "Entfernen"
 
-#: library/Director/Web/Table/IcingaServiceSetServiceTable.php:227
+#: ../../../../library/Director/Web/Table/IcingaServiceSetServiceTable.php:240
 #, php-format
 msgid "Remove \"%s\" from this host"
 msgstr "\"%s\" von diesem Host entfernen"
 
-#: library/Director/Web/Form/IplElement/ExtensibleSetElement.php:524
+#: ../../../../library/Director/Web/Form/IplElement/ExtensibleSetElement.php:524
 msgid "Remove this entry"
 msgstr "Diesen Eintrag entfernen"
 
-#: application/views/helpers/FormDataFilter.php:507
+#: ../../../../application/views/helpers/FormDataFilter.php:507
 msgid "Remove this part of your filter"
 msgstr "Diesen Teil des Filters entfernen"
 
-#: application/forms/DirectorDatafieldForm.php:96
+#: ../../../../application/forms/DirectorDatafieldForm.php:96
 msgid "Rename related vars"
 msgstr "Zugehörige Variablen umbenennen"
 
-#: application/forms/IcingaCommandForm.php:86
+#: ../../../../application/forms/IcingaCommandForm.php:86
 msgid "Render as string"
 msgstr "Als String rendern"
 
-#: application/controllers/ConfigController.php:72
+#: ../../../../application/controllers/ConfigController.php:73
 msgid "Render config"
 msgstr "Konfiguration erstellen"
 
-#: application/forms/IcingaCommandForm.php:77
+#: ../../../../application/forms/IcingaCommandForm.php:77
 msgid "Render the command as a plain string instead of an array."
 msgstr "Rendere das Kommando als reinen String und nicht als Array."
 
-#: application/controllers/ConfigController.php:310
+#: ../../../../application/controllers/ConfigController.php:311
 msgid "Rendered file"
 msgstr "Erzeugte Datei"
 
-#: library/Director/Web/Widget/DeploymentInfo.php:97
+#: ../../../../library/Director/Web/Widget/DeploymentInfo.php:98
 #, php-format
 msgid "Rendered in %0.2fs, deployed in %0.2fs"
 msgstr "Erstellt in %0.2fs, ausgerollt in %0.2fs"
 
-#: library/Director/Web/Widget/ActivityLogInfo.php:539
-#: library/Director/Web/Widget/ActivityLogInfo.php:544
+#: ../../../../library/Director/Web/Widget/ActivityLogInfo.php:539
+#: ../../../../library/Director/Web/Widget/ActivityLogInfo.php:544
 msgid "Rendering"
 msgstr "Erstellen"
 
-#: application/forms/IcingaCommandArgumentForm.php:107
+#: ../../../../application/forms/IcingaCommandArgumentForm.php:107
 msgid "Repeat key"
 msgstr "Schlüssel wiederholen"
 
-#: application/forms/SyncRuleForm.php:63
+#: ../../../../application/forms/SyncRuleForm.php:63
 msgid "Replace"
 msgstr "Ersetzen"
 
-#: library/Director/Web/Table/CoreApiFieldsTable.php:86
-#: library/Director/Web/Table/Dependency/DependencyInfoTable.php:38
-#: application/forms/IcingaCommandArgumentForm.php:124
+#: ../../../../library/Director/PropertyModifier/PropertyModifierRegexReplace.php:21
+msgid "Replacement"
+msgstr "Ersatz"
+
+#: ../../../../library/Director/Web/Table/CoreApiFieldsTable.php:86
+#: ../../../../library/Director/Web/Table/Dependency/DependencyInfoTable.php:38
+#: ../../../../application/forms/IcingaCommandArgumentForm.php:124
 msgid "Required"
 msgstr "Benötigt"
 
-#: library/Director/Import/ImportSourceDirectorObject.php:90
+#: ../../../../library/Director/Import/ImportSourceDirectorObject.php:90
 msgid "Resolved"
 msgstr "Aufgelöst"
 
-#: application/forms/RestoreBasketForm.php:58
-#: application/controllers/BasketController.php:208
+#: ../../../../application/forms/RestoreBasketForm.php:58
+#: ../../../../application/controllers/BasketController.php:232
 msgid "Restore"
 msgstr "Wiederherstellen"
 
-#: application/forms/RestoreObjectForm.php:17
+#: ../../../../application/forms/RestoreObjectForm.php:17
 msgid "Restore former object"
 msgstr "Vorheriges Objekt wiederherstellen"
 
-#: application/forms/RestoreBasketForm.php:52
+#: ../../../../application/forms/RestoreBasketForm.php:52
 msgid "Restore to this target Director DB"
 msgstr "In dieser Director-Ziel-DB wiederherstellen"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1380
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1383
 msgid "Retry interval"
 msgstr "Wiederholungsintervall"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1382
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1385
 msgid ""
 "Retry interval, will be applied after a state change unless the next hard "
 "state is reached"
@@ -5016,49 +5075,53 @@ msgstr ""
 "Wiederholungsintervall, wird nach einem Statuswechsel verwendet, bis der "
 "nächste Hard Status erreicht wurde"
 
-#: library/Director/PropertyModifier/PropertyModifierMap.php:34
+#: ../../../../library/Director/PropertyModifier/PropertyModifierMap.php:36
+msgid "Return custom default value"
+msgstr "Benutzerdefinierten Wert zurückgeben"
+
+#: ../../../../library/Director/PropertyModifier/PropertyModifierMap.php:35
 msgid "Return lookup key unmodified"
 msgstr "Suchschlüssel unverändert zurück geben"
 
-#: library/Director/Web/Widget/InspectPackages.php:69
+#: ../../../../library/Director/Web/Widget/InspectPackages.php:69
 msgid "Root Zone"
 msgstr "Rootzone"
 
-#: library/Director/Web/Table/SyncruleTable.php:45
-#: application/forms/SyncRuleForm.php:30
+#: ../../../../library/Director/Web/Table/SyncruleTable.php:45
+#: ../../../../application/forms/SyncRuleForm.php:30
 msgid "Rule name"
 msgstr "Regelname"
 
-#: library/Director/Job/ImportJob.php:119
+#: ../../../../library/Director/Job/ImportJob.php:119
 msgid "Run all imports at once"
 msgstr "Alle Importe gleichzeitig ausführen"
 
-#: library/Director/Job/SyncJob.php:125
+#: ../../../../library/Director/Job/SyncJob.php:125
 msgid "Run all rules at once"
 msgstr "Alle Regeln gleichzeitig ausführen"
 
-#: library/Director/Job/ImportJob.php:92
-#: application/forms/KickstartForm.php:189
+#: ../../../../library/Director/Job/ImportJob.php:92
+#: ../../../../application/forms/KickstartForm.php:189
 msgid "Run import"
 msgstr "Import ausführen"
 
-#: application/forms/DirectorJobForm.php:46
+#: ../../../../application/forms/DirectorJobForm.php:46
 msgid "Run interval"
 msgstr "Laufintervall"
 
-#: application/forms/IcingaServiceForm.php:678
+#: ../../../../application/forms/IcingaServiceForm.php:682
 msgid "Run on agent"
 msgstr "Auf Agent ausführen"
 
-#: library/Director/Web/Widget/BackgroundDaemonDetails.php:76
+#: ../../../../library/Director/Web/Widget/BackgroundDaemonDetails.php:76
 msgid "Running with systemd"
 msgstr "Läuft mit systemd"
 
-#: library/Director/Import/ImportSourceRestApi.php:251
+#: ../../../../library/Director/Import/ImportSourceRestApi.php:251
 msgid "SOCKS5 proxy"
 msgstr "SOCKS5 Proxy"
 
-#: library/Director/Dashboard/Dashlet/JobDashlet.php:29
+#: ../../../../library/Director/Dashboard/Dashlet/JobDashlet.php:30
 msgid ""
 "Schedule and automate Import, Syncronization, Config Deployment, "
 "Housekeeping and more"
@@ -5066,12 +5129,12 @@ msgstr ""
 "Import, Synchronisation, Ausrollen der Konfiguration, Bereinigung und mehr "
 "planen und automatisieren"
 
-#: library/Director/Dashboard/NotificationsDashboard.php:14
-#: library/Director/Dashboard/UsersDashboard.php:15
+#: ../../../../library/Director/Dashboard/NotificationsDashboard.php:14
+#: ../../../../library/Director/Dashboard/UsersDashboard.php:15
 msgid "Schedule your notifications"
 msgstr "Benachrichtigungen planen"
 
-#: library/Director/Dashboard/Dashlet/NotificationsDashlet.php:19
+#: ../../../../library/Director/Dashboard/Dashlet/NotificationsDashlet.php:21
 msgid ""
 "Schedule your notifications. Define who should be notified, when, and for "
 "which kind of problem"
@@ -5079,16 +5142,16 @@ msgstr ""
 "Benachrichtigungen planen. Wer soll wann benachrichtigt werden, wofür, und "
 "für welche Art von Problemen"
 
-#: application/forms/SyncRuleForm.php:23
+#: ../../../../application/forms/SyncRuleForm.php:23
 msgid "Scheduled Downtime"
 msgstr "Geplante Downtime"
 
-#: library/Director/Dashboard/Dashlet/ScheduledDowntimeApplyDashlet.php:13
-#: library/Director/Db/Branch/BranchModificationInspection.php:48
+#: ../../../../library/Director/Dashboard/Dashlet/ScheduledDowntimeApplyDashlet.php:15
+#: ../../../../library/Director/Db/Branch/BranchModificationInspection.php:48
 msgid "Scheduled Downtimes"
 msgstr "Geplante Downtimes"
 
-#: application/forms/SettingsForm.php:177
+#: ../../../../application/forms/SettingsForm.php:177
 msgid ""
 "Script or tool to call when activating a new configuration stage. (e.g. "
 "sudo /usr/local/bin/icinga-director-activate) (name of the stage will be the "
@@ -5098,99 +5161,99 @@ msgstr ""
 "ausgeführt werden soll. (z.B. sudo /usr/local/bin/icinga-director-activate) "
 "(der Name der Konfiguration wird dem Skript als Argument mitgegeben)"
 
-#: application/controllers/SettingsController.php:43
-#: application/controllers/SelfServiceController.php:107
+#: ../../../../application/controllers/SettingsController.php:43
+#: ../../../../application/controllers/SelfServiceController.php:107
 msgid "Self Service"
 msgstr "Selbstbedienung"
 
-#: application/controllers/SelfServiceController.php:108
+#: ../../../../application/controllers/SelfServiceController.php:108
 msgid "Self Service - Host Registration"
 msgstr "Selbstbedienung - Host-Registrierung"
 
-#: library/Director/Dashboard/Dashlet/SelfServiceDashlet.php:11
-#: library/Director/Web/SelfService.php:180
+#: ../../../../library/Director/Dashboard/Dashlet/SelfServiceDashlet.php:13
+#: ../../../../library/Director/Web/SelfService.php:167
 msgid "Self Service API"
 msgstr "Selbstbedienungs-API"
 
-#: application/controllers/SettingsController.php:44
+#: ../../../../application/controllers/SettingsController.php:44
 msgid "Self Service API - Global Settings"
 msgstr "Selbstbedienungs-API - Globale Einstellungen"
 
-#: application/forms/SelfServiceSettingsForm.php:298
+#: ../../../../application/forms/SelfServiceSettingsForm.php:298
 msgid "Self Service Settings have been stored"
 msgstr "Selbstbedienungseinstellungen wurden gespeichert"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1440
-#: application/forms/IcingaUserForm.php:89
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1443
+#: ../../../../application/forms/IcingaUserForm.php:89
 msgid "Send notifications"
 msgstr "Benachrichtigungen senden"
 
-#: library/Director/Web/Widget/DeploymentInfo.php:78
+#: ../../../../library/Director/Web/Widget/DeploymentInfo.php:79
 msgid "Sent to"
 msgstr "Senden an"
 
-#: library/Director/TranslationDummy.php:14
-#: application/forms/IcingaServiceVarForm.php:15
-#: application/forms/IcingaAddServiceForm.php:104
-#: application/forms/SyncRuleForm.php:14
+#: ../../../../library/Director/TranslationDummy.php:14
+#: ../../../../application/forms/IcingaServiceVarForm.php:15
+#: ../../../../application/forms/SyncRuleForm.php:14
+#: ../../../../application/forms/IcingaAddServiceForm.php:105
 msgid "Service"
 msgstr "Service"
 
-#: library/Director/Dashboard/Dashlet/ServiceApplyRulesDashlet.php:11
+#: ../../../../library/Director/Dashboard/Dashlet/ServiceApplyRulesDashlet.php:13
 msgid "Service Apply Rules"
 msgstr "Service Apply-Regeln"
 
-#: application/forms/SyncRuleForm.php:15
+#: ../../../../application/forms/SyncRuleForm.php:15
 msgid "Service Group"
 msgstr "Servicegruppe"
 
-#: library/Director/Dashboard/Dashlet/ServiceGroupsDashlet.php:11
-#: application/forms/BasketForm.php:23
+#: ../../../../library/Director/Dashboard/Dashlet/ServiceGroupsDashlet.php:13
+#: ../../../../application/forms/BasketForm.php:23
 msgid "Service Groups"
 msgstr "Servicegruppen"
 
-#: library/Director/Web/Table/ObjectsTableService.php:107
+#: ../../../../library/Director/Web/Table/ObjectsTableService.php:107
 msgid "Service Name"
 msgstr "Servicename"
 
-#: library/Director/DataType/DataTypeDirectorObject.php:61
-#: application/forms/SyncRuleForm.php:16
+#: ../../../../library/Director/DataType/DataTypeDirectorObject.php:61
+#: ../../../../application/forms/SyncRuleForm.php:16
 msgid "Service Set"
 msgstr "Service-Set"
 
-#: application/forms/RemoveLinkForm.php:55
+#: ../../../../application/forms/RemoveLinkForm.php:55
 msgid "Service Set has been removed"
 msgstr "Service-Set wurde entfernt"
 
-#: library/Director/Dashboard/Dashlet/ServiceSetsDashlet.php:11
-#: library/Director/Web/Table/CustomvarVariantsTable.php:60
-#: library/Director/Web/Table/CustomvarTable.php:45
-#: application/forms/BasketForm.php:26
+#: ../../../../library/Director/Dashboard/Dashlet/ServiceSetsDashlet.php:13
+#: ../../../../library/Director/Web/Table/CustomvarVariantsTable.php:60
+#: ../../../../library/Director/Web/Table/CustomvarTable.php:45
+#: ../../../../application/forms/BasketForm.php:26
 msgid "Service Sets"
 msgstr "Service-Sets"
 
-#: application/forms/IcingaAddServiceForm.php:89
+#: ../../../../application/forms/IcingaAddServiceForm.php:90
 msgid "Service Template"
 msgstr "Service-Vorlage"
 
-#: application/forms/BasketForm.php:24
+#: ../../../../application/forms/BasketForm.php:24
 msgid "Service Template Choice"
 msgstr "Auswahlmöglichkeit für Service-Vorlagen"
 
-#: library/Director/Dashboard/Dashlet/ServiceTemplatesDashlet.php:11
-#: application/forms/BasketForm.php:25
+#: ../../../../library/Director/Dashboard/Dashlet/ServiceTemplatesDashlet.php:13
+#: ../../../../application/forms/BasketForm.php:25
 msgid "Service Templates"
 msgstr "Service-Vorlagen"
 
-#: application/forms/SelfServiceSettingsForm.php:179
+#: ../../../../application/forms/SelfServiceSettingsForm.php:179
 msgid "Service User"
 msgstr "Dienst-Benutzeraccount"
 
-#: library/Director/DataType/DataTypeDirectorObject.php:60
+#: ../../../../library/Director/DataType/DataTypeDirectorObject.php:60
 msgid "Service groups"
 msgstr "Servicegruppen"
 
-#: application/forms/IcingaServiceForm.php:653
+#: ../../../../application/forms/IcingaServiceForm.php:657
 msgid ""
 "Service groups that should be directly assigned to this service. "
 "Servicegroups can be useful for various reasons. They are helpful to "
@@ -5204,116 +5267,128 @@ msgstr ""
 "Dashboards oder zum Umsetzen von Einschränkungen. Servicegruppen können "
 "direkt einem einzelnen Service zugeordnet werden oder Service-Vorlagen."
 
-#: library/Director/Web/Table/IcingaHostAppliedForServiceTable.php:102
+#: ../../../../library/Director/Web/Table/IcingaHostAppliedForServiceTable.php:102
 msgid "Service name"
 msgstr "Servicename"
 
-#: library/Director/Objects/IcingaService.php:755
-#: application/controllers/SuggestController.php:260
+#: ../../../../library/Director/Objects/IcingaService.php:668
+#: ../../../../application/controllers/SuggestController.php:260
 msgid "Service properties"
 msgstr "Service-Eigenschaften"
 
-#: application/forms/IcingaServiceSetForm.php:87
-#: application/forms/IcingaAddServiceSetForm.php:86
+#: ../../../../application/forms/IcingaServiceSetForm.php:88
+#: ../../../../application/forms/IcingaAddServiceSetForm.php:86
 msgid "Service set"
 msgstr "Service-Set"
 
-#: application/forms/IcingaServiceSetForm.php:28
+#: ../../../../application/forms/IcingaServiceSetForm.php:29
 msgid "Service set name"
 msgstr "Service-Set Name"
 
-#: application/controllers/TemplatechoiceController.php:25
+#: ../../../../application/controllers/TemplatechoiceController.php:25
 msgid "Service template choice"
 msgstr "Auswahlmöglichkeite für Service-Vorlagen"
 
-#: application/controllers/TemplatechoicesController.php:24
+#: ../../../../application/controllers/TemplatechoicesController.php:24
 msgid "Service template choices"
 msgstr "Auswahlmöglichkeiten für Service-Vorlagen"
 
-#: application/controllers/ServiceController.php:301
+#: ../../../../application/controllers/ServiceController.php:301
 msgid "ServiceSet"
 msgstr "Service-Set"
 
-#: application/forms/IcingaServiceGroupForm.php:14
+#: ../../../../application/forms/IcingaServiceGroupForm.php:14
 msgid "Servicegroup"
 msgstr "Servicegruppe"
 
-#: library/Director/Db/Branch/BranchModificationInspection.php:41
+#: ../../../../library/Director/Db/Branch/BranchModificationInspection.php:41
 msgid "Servicegroups"
 msgstr "Servicegruppen"
 
-#: library/Director/Web/Table/IcingaAppliedServiceTable.php:32
-#: library/Director/Web/Table/ObjectsTableService.php:103
-#: library/Director/Web/Table/IcingaServiceSetServiceTable.php:168
+#: ../../../../library/Director/Web/Table/IcingaServiceSetServiceTable.php:168
+#: ../../../../library/Director/Web/Table/IcingaAppliedServiceTable.php:32
+#: ../../../../library/Director/Web/Table/ObjectsTableService.php:103
 msgid "Servicename"
 msgstr "Servicename"
 
-#: configuration.php:157
-#: library/Director/IcingaConfig/StateFilterSet.php:23
-#: library/Director/DataType/DataTypeDirectorObject.php:59
-#: library/Director/DataType/DataTypeDictionary.php:60
-#: library/Director/Db/Branch/BranchModificationInspection.php:40
-#: library/Director/Web/Table/CustomvarVariantsTable.php:59
-#: library/Director/Web/Table/CustomvarTable.php:44
-#: library/Director/Web/Tabs/ObjectTabs.php:75
-#: application/forms/IcingaNotificationForm.php:90
-#: application/forms/IcingaDependencyForm.php:101
-#: application/forms/IcingaScheduledDowntimeForm.php:90
-#: application/controllers/ServiceController.php:284
-#: application/controllers/ServiceController.php:305
+#: ../../../../configuration.php:125
+#: ../../../../library/Director/IcingaConfig/StateFilterSet.php:23
+#: ../../../../library/Director/DataType/DataTypeDirectorObject.php:59
+#: ../../../../library/Director/DataType/DataTypeDictionary.php:60
+#: ../../../../library/Director/Db/Branch/BranchModificationInspection.php:40
+#: ../../../../library/Director/Web/Table/CustomvarVariantsTable.php:59
+#: ../../../../library/Director/Web/Table/CustomvarTable.php:44
+#: ../../../../library/Director/Web/Tabs/ObjectTabs.php:74
+#: ../../../../application/forms/IcingaNotificationForm.php:91
+#: ../../../../application/forms/IcingaDependencyForm.php:101
+#: ../../../../application/forms/IcingaScheduledDowntimeForm.php:90
+#: ../../../../application/controllers/ServiceController.php:284
+#: ../../../../application/controllers/ServiceController.php:305
 msgid "Services"
 msgstr "Services"
 
-#: application/controllers/ServicesetController.php:64
+#: ../../../../application/controllers/ServicesetController.php:64
 #, php-format
 msgid "Services in this set: %s"
 msgstr "Services in diesem Set: %s"
 
-#: application/controllers/HostController.php:286
+#: ../../../../application/controllers/HostController.php:273
 #, php-format
 msgid "Services on %s"
 msgstr "Services auf %s"
 
-#: application/controllers/HostController.php:206
+#: ../../../../application/controllers/HostController.php:190
 #, php-format
 msgid "Services: %s"
 msgstr "Services: %s"
 
-#: library/Director/Db/Branch/BranchModificationInspection.php:42
+#: ../../../../library/Director/Db/Branch/BranchModificationInspection.php:42
 msgid "Servicesets"
 msgstr "Service-Sets"
 
-#: application/forms/SyncPropertyForm.php:84
+#: ../../../../library/Director/PropertyModifier/PropertyModifierSetValue.php:13
+msgid "Set a specific value"
+msgstr "Spezifischen Wert setzen"
+
+#: ../../../../application/forms/ImportRowModifierForm.php:68
+#: ../../../../application/forms/SyncPropertyForm.php:84
 msgid "Set based on filter"
 msgstr "Basierend auf Filter setzen"
 
-#: library/Director/PropertyModifier/PropertyModifierMakeBoolean.php:44
+#: ../../../../library/Director/PropertyModifier/PropertyModifierMakeBoolean.php:44
+#: ../../../../library/Director/PropertyModifier/PropertyModifierSetValue.php:33
 msgid "Set false"
 msgstr "Auf \"false\" setzen"
 
-#: library/Director/PropertyModifier/PropertyModifierExtractFromDN.php:30
-#: library/Director/PropertyModifier/PropertyModifierGetHostByAddr.php:17
-#: library/Director/PropertyModifier/PropertyModifierParseURL.php:39
-#: library/Director/PropertyModifier/PropertyModifierJsonDecode.php:25
-#: library/Director/PropertyModifier/PropertyModifierDnsRecords.php:34
-#: library/Director/PropertyModifier/PropertyModifierGetHostByName.php:17
+#: ../../../../library/Director/PropertyModifier/PropertyModifierExtractFromDN.php:30
+#: ../../../../library/Director/PropertyModifier/PropertyModifierGetHostByAddr.php:17
+#: ../../../../library/Director/PropertyModifier/PropertyModifierParseURL.php:39
+#: ../../../../library/Director/PropertyModifier/PropertyModifierJsonDecode.php:25
+#: ../../../../library/Director/PropertyModifier/PropertyModifierDnsRecords.php:34
+#: ../../../../library/Director/PropertyModifier/PropertyModifierGetHostByName.php:17
 msgid "Set no value (null)"
 msgstr "Keinen Wert setzen (null)"
 
-#: library/Director/PropertyModifier/PropertyModifierMap.php:33
-#: library/Director/PropertyModifier/PropertyModifierMakeBoolean.php:42
+#: ../../../../library/Director/PropertyModifier/PropertyModifierMap.php:34
+#: ../../../../library/Director/PropertyModifier/PropertyModifierMakeBoolean.php:42
+#: ../../../../library/Director/PropertyModifier/PropertyModifierSetValue.php:31
 msgid "Set null"
 msgstr "Auf \"null\" setzen"
 
-#: library/Director/PropertyModifier/PropertyModifierMakeBoolean.php:43
+#: ../../../../library/Director/PropertyModifier/PropertyModifierRegexReplace.php:34
+msgid "Set the value to NULL"
+msgstr "Setze den Wert auf NULL"
+
+#: ../../../../library/Director/PropertyModifier/PropertyModifierMakeBoolean.php:43
+#: ../../../../library/Director/PropertyModifier/PropertyModifierSetValue.php:32
 msgid "Set true"
 msgstr "Auf \"true\" setzen"
 
-#: library/Director/Web/Tabs/ObjectsTabs.php:81
+#: ../../../../library/Director/Web/Tabs/ObjectsTabs.php:83
 msgid "Sets"
 msgstr "Sets"
 
-#: application/forms/IcingaHostForm.php:116
+#: ../../../../application/forms/IcingaHostForm.php:118
 msgid ""
 "Setting a command endpoint allows you to force host checks to be executed by "
 "a specific endpoint. Please carefully study the related Icinga documentation "
@@ -5323,75 +5398,75 @@ msgstr ""
 "einem bestimmten Endpoint. Bitte nicht verwenden, ohne die entsprechende "
 "Icinga-Dokumentation gelesen zu haben"
 
-#: library/Director/Web/SelfService.php:97
-#: application/controllers/ConfigController.php:240
+#: ../../../../library/Director/Web/SelfService.php:97
+#: ../../../../application/controllers/ConfigController.php:241
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: application/forms/SettingsForm.php:230
+#: ../../../../application/forms/SettingsForm.php:230
 msgid "Settings have been stored"
 msgstr "Einstellungen wurden gespeichert"
 
-#: library/Director/Web/SelfService.php:90
+#: ../../../../library/Director/Web/SelfService.php:90
 msgid "Share this Template for Self Service API"
 msgstr "Für die Selbstbedienungs-API freigeben"
 
-#: library/Director/Web/SelfService.php:88
+#: ../../../../library/Director/Web/SelfService.php:88
 msgid "Shared for Self Service API"
 msgstr "Für die Selbstbedienungs-API freigegeben"
 
-#: library/Director/PropertyModifier/PropertyModifierUpperCaseFirst.php:21
+#: ../../../../library/Director/PropertyModifier/PropertyModifierUpperCaseFirst.php:21
 msgid "Should all the other characters be lowercased first?"
 msgstr ""
 "Sollen alle anderen Zeichen zuvor in Kleinbuchstaben umgewandelt werden?"
 
-#: application/controllers/HostController.php:597
+#: ../../../../application/controllers/HostController.php:570
 msgid "Show"
 msgstr "Zeigen"
 
-#: application/controllers/BasketController.php:202
+#: ../../../../application/controllers/BasketController.php:226
 msgid "Show Basket"
 msgstr "Basket anzeigen"
 
-#: application/forms/DeployFormsBug7530.php:101
+#: ../../../../application/forms/DeployFormsBug7530.php:101
 #, php-format
 msgid "Show Issue %s on GitHub"
 msgstr "Issue %s auf GitHub anzeigen"
 
-#: library/Director/Web/Widget/AdditionalTableActions.php:75
+#: ../../../../library/Director/Web/Widget/AdditionalTableActions.php:76
 msgid "Show SQL"
 msgstr "SQL anzeigen"
 
-#: library/Director/Web/Table/ApplyRulesTable.php:151
+#: ../../../../library/Director/Web/Table/ApplyRulesTable.php:151
 msgid "Show affected Objects"
 msgstr "Betroffene Objekte zeigen"
 
-#: library/Director/Web/Widget/SyncRunDetails.php:97
+#: ../../../../library/Director/Web/Widget/SyncRunDetails.php:97
 msgid "Show all actions"
 msgstr "Alle Aktionen anzeigen"
 
-#: library/Director/Web/Form/IplElement/ExtensibleSetElement.php:501
+#: ../../../../library/Director/Web/Form/IplElement/ExtensibleSetElement.php:501
 msgid "Show available options"
 msgstr "Verfügbare Optionen anzeigen"
 
-#: application/forms/IcingaObjectFieldForm.php:183
+#: ../../../../application/forms/IcingaObjectFieldForm.php:132
 msgid "Show based on filter"
 msgstr "Basierend auf Filter zeigen"
 
-#: library/Director/Web/Table/BranchActivityTable.php:86
-#: library/Director/Web/Table/ActivityLogTable.php:230
+#: ../../../../library/Director/Web/Table/ActivityLogTable.php:231
+#: ../../../../library/Director/Web/Table/BranchActivityTable.php:87
 msgid "Show details related to this change"
 msgstr "Details zu dieser Änderung zeigen"
 
-#: library/Director/Web/ObjectPreview.php:52
+#: ../../../../library/Director/Web/ObjectPreview.php:52
 msgid "Show normal"
 msgstr "Normal anzeigen"
 
-#: library/Director/Web/ObjectPreview.php:61
+#: ../../../../library/Director/Web/ObjectPreview.php:61
 msgid "Show resolved"
 msgstr "Aufgelöst anzeigen"
 
-#: library/Director/Web/Widget/BranchedObjectsHint.php:23
+#: ../../../../library/Director/Web/Widget/BranchedObjectsHint.php:28
 #, php-format
 msgid ""
 "Showing a branched view, with potential changes being visible only in this %s"
@@ -5399,228 +5474,228 @@ msgstr ""
 "Zeige eine abgezweigte Ansicht, mit potentiell nur in diesem %s sichtbaren "
 "Änderungen"
 
-#: library/Director/PropertyModifier/PropertyModifierArrayFilter.php:33
-#: library/Director/PropertyModifier/PropertyModifierRejectOrSelect.php:31
+#: ../../../../library/Director/PropertyModifier/PropertyModifierArrayFilter.php:33
+#: ../../../../library/Director/PropertyModifier/PropertyModifierRejectOrSelect.php:31
 msgid "Simple match with wildcards (*)"
 msgstr "Einfache Suche mit Platzhaltern (*)"
 
-#: application/controllers/BasketController.php:343
+#: ../../../../application/controllers/BasketController.php:354
 msgid "Single Object Diff"
 msgstr "Einfacher Objekt-Diff"
 
-#: library/Director/Dashboard/Dashlet/SingleServicesDashlet.php:11
+#: ../../../../library/Director/Dashboard/Dashlet/SingleServicesDashlet.php:13
 msgid "Single Services"
 msgstr "Einzelne Services"
 
-#: library/Director/Web/Table/GeneratedConfigFileTable.php:86
+#: ../../../../library/Director/Web/Table/GeneratedConfigFileTable.php:86
 msgid "Size"
 msgstr "Größe"
 
-#: application/forms/IcingaCommandArgumentForm.php:115
+#: ../../../../application/forms/IcingaCommandArgumentForm.php:115
 msgid "Skip key"
 msgstr "Schlüssel überspringen"
 
-#: library/Director/PropertyModifier/PropertyModifierSkipDuplicates.php:13
+#: ../../../../library/Director/PropertyModifier/PropertyModifierSkipDuplicates.php:13
 msgid "Skip row if this value appears more than once"
 msgstr "Zeile überspringen wenn dieser Wert mehr als einmal vorkommt"
 
-#: application/controllers/BasketController.php:249
-#: application/controllers/BasketController.php:373
+#: ../../../../application/controllers/BasketController.php:272
+#: ../../../../application/controllers/BasketController.php:383
 msgid "Snapshot"
 msgstr "Snapshot"
 
-#: library/Director/Web/Table/BasketTable.php:32
-#: application/controllers/BasketController.php:40
-#: application/controllers/BasketController.php:143
+#: ../../../../library/Director/Web/Table/BasketTable.php:32
+#: ../../../../application/controllers/BasketController.php:38
+#: ../../../../application/controllers/BasketController.php:161
 msgid "Snapshots"
 msgstr "Snapshots"
 
-#: library/Director/Import/ImportSourceRestApi.php:194
+#: ../../../../library/Director/Import/ImportSourceRestApi.php:194
 msgid "Something like https://api.example.com/rest/v2/objects"
 msgstr "So etwas wie https://api.example.com/rest/v2/objects"
 
-#: application/forms/SyncPropertyForm.php:183
+#: ../../../../application/forms/SyncPropertyForm.php:183
 msgid "Source Column"
 msgstr "Quellspalte"
 
-#: application/forms/SyncPropertyForm.php:213
+#: ../../../../application/forms/SyncPropertyForm.php:213
 msgid "Source Expression"
 msgstr "Quellausdruck"
 
-#: application/forms/SyncPropertyForm.php:38
+#: ../../../../application/forms/SyncPropertyForm.php:38
 msgid "Source Name"
 msgstr "Quellenname"
 
-#: application/forms/SelfServiceSettingsForm.php:114
+#: ../../../../application/forms/SelfServiceSettingsForm.php:114
 msgid "Source Path"
 msgstr "Quellpfad"
 
-#: application/forms/ImportSourceForm.php:33
+#: ../../../../application/forms/ImportSourceForm.php:33
 msgid "Source Type"
 msgstr "Quellentyp"
 
-#: application/forms/SyncPropertyForm.php:160
+#: ../../../../application/forms/SyncPropertyForm.php:160
 msgid "Source columns"
 msgstr "Quellspalten"
 
-#: library/Director/Web/Table/SyncpropertyTable.php:62
+#: ../../../../library/Director/Web/Table/SyncpropertyTable.php:62
 msgid "Source field"
 msgstr "Quellenfeld"
 
-#: library/Director/Web/Table/ImportrunTable.php:30
-#: library/Director/Web/Table/ImportsourceTable.php:18
-#: library/Director/Web/Table/SyncpropertyTable.php:61
+#: ../../../../library/Director/Web/Table/ImportrunTable.php:30
+#: ../../../../library/Director/Web/Table/ImportsourceTable.php:18
+#: ../../../../library/Director/Web/Table/SyncpropertyTable.php:61
 msgid "Source name"
 msgstr "Quellenname"
 
-#: application/forms/SyncPropertyForm.php:356
+#: ../../../../application/forms/SyncPropertyForm.php:356
 msgid "Special properties"
 msgstr "Spezielle Eigenschaften"
 
-#: library/Director/PropertyModifier/PropertyModifierArrayElementByPosition.php:36
+#: ../../../../library/Director/PropertyModifier/PropertyModifierArrayElementByPosition.php:36
 msgid "Specific Element (by key name)"
 msgstr "Spezifisches Element (nach Schlüsselname)"
 
-#: library/Director/PropertyModifier/PropertyModifierArrayElementByPosition.php:35
+#: ../../../../library/Director/PropertyModifier/PropertyModifierArrayElementByPosition.php:35
 msgid "Specific Element (by position)"
 msgstr "Spezifisches Element (nach Position)"
 
-#: library/Director/Import/ImportSourceRestApi.php:152
+#: ../../../../library/Director/Import/ImportSourceRestApi.php:152
 msgid ""
 "Specify headers in text format \"Header: Value\", each header on a new line."
 msgstr ""
 "Header im Textformat angeben \"Header: Wert\", jeden Header auf einer Zeile."
 
-#: library/Director/PropertyModifier/PropertyModifierTrim.php:30
+#: ../../../../library/Director/PropertyModifier/PropertyModifierTrim.php:30
 msgid ""
-"Specify the characters that trim should remove.Default is: \" "
-"\\t\\n\\r\\0\\x0B\""
+"Specify the characters that trim should remove.Default is: \" \\t\\n\\r"
+"\\0\\x0B\""
 msgstr ""
-"Zeichen welche von Trim entfernt werden sollen. Standard: \" "
-"\\t\\n\\r\\0\\x0B\""
+"Zeichen welche von Trim entfernt werden sollen. Standard: \" \\t\\n\\r"
+"\\0\\x0B\""
 
-#: library/Director/Web/Widget/DeploymentInfo.php:87
+#: ../../../../library/Director/Web/Widget/DeploymentInfo.php:88
 msgid "Stage name"
 msgstr "Phasenname"
 
-#: library/Director/Web/Widget/InspectPackages.php:50
+#: ../../../../library/Director/Web/Widget/InspectPackages.php:50
 #, php-format
 msgid "Stages in Package: %s"
 msgstr "Phasen in Paket: %s"
 
-#: library/Director/Web/Widget/SyncRunDetails.php:28
+#: ../../../../library/Director/Web/Widget/SyncRunDetails.php:28
 msgid "Start time"
 msgstr "Startzeit"
 
-#: library/Director/Web/Widget/DeploymentInfo.php:88
+#: ../../../../library/Director/Web/Widget/DeploymentInfo.php:89
 msgid "Startup"
 msgstr "Start"
 
-#: library/Director/Web/Widget/DeploymentInfo.php:162
+#: ../../../../library/Director/Web/Widget/DeploymentInfo.php:163
 msgid "Startup Log"
 msgstr "Start-Log"
 
-#: library/Director/Web/Widget/BackgroundDaemonDetails.php:72
+#: ../../../../library/Director/Web/Widget/BackgroundDaemonDetails.php:72
 msgid "Startup Time"
 msgstr "Startzeit"
 
-#: library/Director/Web/Table/CoreApiFieldsTable.php:84
+#: ../../../../library/Director/Web/Table/CoreApiFieldsTable.php:84
 msgid "State"
 msgstr "Zustand"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1688
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1691
 msgid "State and transition type filters"
 msgstr "Status- und Übergangstypen-Filter"
 
-#: library/Director/IcingaConfig/TypeFilterSet.php:22
+#: ../../../../library/Director/IcingaConfig/TypeFilterSet.php:22
 msgid "State changes"
 msgstr "Zustandsänderungen"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1663
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1666
 msgid "States"
 msgstr "Zustände"
 
-#: library/Director/Web/Widget/DeployedConfigInfoHeader.php:91
+#: ../../../../library/Director/Web/Widget/DeployedConfigInfoHeader.php:91
 msgid "Statistics"
 msgstr "Statistiken"
 
-#: application/controllers/InspectController.php:42
-#: application/controllers/InspectController.php:143
+#: ../../../../application/controllers/InspectController.php:42
+#: ../../../../application/controllers/InspectController.php:143
 msgid "Status"
 msgstr "Zustand"
 
-#: library/Director/Web/SelfService.php:127
+#: ../../../../library/Director/Web/SelfService.php:127
 msgid "Stop sharing this Template"
 msgstr "Diese Vorlage nicht mehr bereitstellen"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:508
-#: application/forms/SettingsForm.php:139
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:509
+#: ../../../../application/forms/SettingsForm.php:139
 msgid "Store"
 msgstr "Speichern"
 
-#: application/forms/KickstartForm.php:36
+#: ../../../../application/forms/KickstartForm.php:36
 msgid "Store configuration"
 msgstr "Konfiguration speichern"
 
-#: library/Director/DataType/DataTypeDatalist.php:152
+#: ../../../../library/Director/DataType/DataTypeDatalist.php:152
 msgid "Strict, list values only"
 msgstr "Strikt, nur Listeneinträge"
 
-#: library/Director/DataType/DataTypeDirectorObject.php:79
-#: library/Director/DataType/DataTypeSqlQuery.php:76
-#: library/Director/DataType/DataTypeDatalist.php:132
-#: application/forms/IcingaCommandArgumentForm.php:38
-#: application/forms/IcingaCommandArgumentForm.php:77
+#: ../../../../library/Director/DataType/DataTypeDirectorObject.php:79
+#: ../../../../library/Director/DataType/DataTypeSqlQuery.php:76
+#: ../../../../library/Director/DataType/DataTypeDatalist.php:132
+#: ../../../../application/forms/IcingaCommandArgumentForm.php:38
+#: ../../../../application/forms/IcingaCommandArgumentForm.php:77
 msgid "String"
 msgstr "Zeichenkette"
 
-#: application/views/helpers/FormDataFilter.php:534
+#: ../../../../application/views/helpers/FormDataFilter.php:534
 msgid "Strip this operator, preserve child nodes"
 msgstr "Diesen Operator entfernen, Kind-Knoten beibehalten"
 
-#: library/Director/Web/Form/QuickForm.php:221
+#: ../../../../library/Director/Web/Form/QuickForm.php:221
 msgid "Submit"
 msgstr "Absenden"
 
-#: library/Director/Web/Widget/DeploymentInfo.php:139
+#: ../../../../library/Director/Web/Widget/DeploymentInfo.php:140
 msgid "Succeeded"
 msgstr "Gelungen"
 
-#: application/forms/IcingaObjectFieldForm.php:94
+#: ../../../../library/Director/Field/FormFieldSuggestion.php:78
 msgid "Suggested fields"
 msgstr "Vorgeschlagene Felder"
 
-#: library/Director/Web/ActionBar/TemplateActionBar.php:37
+#: ../../../../library/Director/Web/ActionBar/TemplateActionBar.php:37
 msgid "Switch to Table view"
 msgstr "Zur Tabellenansicht wechseln"
 
-#: library/Director/Web/ActionBar/TemplateActionBar.php:36
+#: ../../../../library/Director/Web/ActionBar/TemplateActionBar.php:36
 msgid "Switch to Tree view"
 msgstr "Zur Baumansicht wechseln"
 
-#: application/controllers/SyncruleController.php:621
+#: ../../../../application/controllers/SyncruleController.php:619
 #, php-format
 msgid "Sync \"%s\": %s"
 msgstr "\"%s\": \"%s\" synchronisieren"
 
-#: application/controllers/BranchController.php:45
-#: application/controllers/SyncruleController.php:203
+#: ../../../../application/controllers/BranchController.php:44
+#: ../../../../application/controllers/SyncruleController.php:203
 msgid "Sync Preview"
 msgstr "Synchronisationsvorschau"
 
-#: application/controllers/SyncruleController.php:155
+#: ../../../../application/controllers/SyncruleController.php:155
 msgid "Sync Properties"
 msgstr "Synchronisationseigenschaften"
 
-#: application/forms/BasketForm.php:36
+#: ../../../../application/forms/BasketForm.php:36
 msgid "Sync Rules"
 msgstr "Synchronisationsregeln"
 
-#: application/controllers/SyncruleController.php:653
+#: ../../../../application/controllers/SyncruleController.php:651
 msgid "Sync history"
 msgstr "Synchronisationshistorie"
 
-#: application/forms/SyncRuleForm.php:98
+#: ../../../../application/forms/SyncRuleForm.php:98
 #, php-format
 msgid ""
 "Sync only part of your imported objects with this rule. Icinga Web 2 filter "
@@ -5629,139 +5704,139 @@ msgstr ""
 "Nur einen Teil der importierten Objekte mit dieser Regel synchronisieren. "
 "Die Icinga Web 2 Filter Syntax kann verwendet werden. z.B: %s"
 
-#: application/controllers/SyncruleController.php:585
+#: ../../../../application/controllers/SyncruleController.php:584
 msgid "Sync properties"
 msgstr "Synchronisationseigenschaften"
 
-#: library/Director/Web/Tabs/SyncRuleTabs.php:29
-#: library/Director/Web/Tabs/SyncRuleTabs.php:50
-#: library/Director/Web/Tabs/ImportTabs.php:23
-#: application/controllers/SyncrulesController.php:25
-#: application/controllers/SyncruleController.php:544
+#: ../../../../library/Director/Web/Tabs/SyncRuleTabs.php:29
+#: ../../../../library/Director/Web/Tabs/SyncRuleTabs.php:50
+#: ../../../../library/Director/Web/Tabs/ImportTabs.php:23
+#: ../../../../application/controllers/SyncrulesController.php:25
+#: ../../../../application/controllers/SyncruleController.php:543
 msgid "Sync rule"
 msgstr "Synchronisationsregel"
 
-#: application/controllers/SyncruleController.php:55
-#: application/controllers/SyncruleController.php:509
+#: ../../../../application/controllers/SyncruleController.php:55
+#: ../../../../application/controllers/SyncruleController.php:509
 #, php-format
 msgid "Sync rule: %s"
 msgstr "Synchronisationsregel: %s"
 
-#: application/forms/SyncRunForm.php:35
+#: ../../../../application/forms/SyncRunForm.php:35
 #, php-format
 msgid "Sync to Branch: %s"
 msgstr ""
 "In Branch s\n"
 "ynchronisieren: %s"
 
-#: application/controllers/SyncruleController.php:63
+#: ../../../../application/controllers/SyncruleController.php:63
 msgid "Synchronization failed"
 msgstr "Synchronisation fehlgeschlagen"
 
-#: library/Director/Job/SyncJob.php:80
+#: ../../../../library/Director/Job/SyncJob.php:80
 msgid "Synchronization rule"
 msgstr "Synchronisationsregel"
 
-#: library/Director/Dashboard/Dashlet/SyncDashlet.php:14
+#: ../../../../library/Director/Dashboard/Dashlet/SyncDashlet.php:15
 msgid "Synchronize"
 msgstr "Synchronisieren"
 
-#: application/controllers/SyncruleController.php:128
+#: ../../../../application/controllers/SyncruleController.php:128
 #, php-format
 msgid "Synchronizing '%s'"
 msgstr "'%s' synchronisieren"
 
-#: library/Director/Web/ActionBar/TemplateActionBar.php:30
+#: ../../../../library/Director/Web/ActionBar/TemplateActionBar.php:30
 msgid "Table"
 msgstr "Tabelle"
 
-#: application/forms/RestoreBasketForm.php:51
+#: ../../../../application/forms/RestoreBasketForm.php:51
 msgid "Target DB"
 msgstr "Ziel-DB"
 
-#: application/forms/IcingaCloneObjectForm.php:87
+#: ../../../../application/forms/IcingaCloneObjectForm.php:89
 msgid "Target Host"
 msgstr "Zielhost"
 
-#: application/forms/IcingaCloneObjectForm.php:78
+#: ../../../../application/forms/IcingaCloneObjectForm.php:80
 msgid "Target Service Set"
 msgstr "Ziel-Service-Set"
 
-#: library/Director/DataType/DataTypeDirectorObject.php:77
-#: library/Director/DataType/DataTypeSqlQuery.php:74
-#: library/Director/DataType/DataTypeDatalist.php:130
+#: ../../../../library/Director/DataType/DataTypeDirectorObject.php:77
+#: ../../../../library/Director/DataType/DataTypeSqlQuery.php:74
+#: ../../../../library/Director/DataType/DataTypeDatalist.php:130
 msgid "Target data type"
 msgstr "Zieldatentyp"
 
-#: application/forms/ImportRowModifierForm.php:42
+#: ../../../../application/forms/ImportRowModifierForm.php:42
 msgid "Target property"
 msgstr "Zieleigenschaft"
 
-#: library/Director/DataType/DataTypeDictionary.php:86
-#: library/Director/Web/Form/DirectorObjectForm.php:1111
-#: library/Director/Web/Form/DirectorObjectForm.php:1115
-#: library/Director/Web/Controller/TemplateController.php:159
+#: ../../../../library/Director/DataType/DataTypeDictionary.php:86
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1114
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1118
+#: ../../../../library/Director/Web/Controller/TemplateController.php:160
 msgid "Template"
 msgstr "Vorlage"
 
-#: library/Director/DataType/DataTypeDictionary.php:64
+#: ../../../../library/Director/DataType/DataTypeDictionary.php:64
 msgid "Template (Object) Type"
 msgstr "Vorlagentyp (Objekt)"
 
-#: library/Director/Web/Table/TemplatesTable.php:52
+#: ../../../../library/Director/Web/Table/TemplatesTable.php:52
 msgid "Template Name"
 msgstr "Vorlagenname"
 
-#: application/forms/IcingaScheduledDowntimeForm.php:16
+#: ../../../../application/forms/IcingaScheduledDowntimeForm.php:16
 msgid "Template name"
 msgstr "Vorlagenname"
 
-#: library/Director/Web/Controller/ObjectController.php:348
-#: library/Director/Web/Controller/TemplateController.php:116
+#: ../../../../library/Director/Web/Controller/TemplateController.php:117
+#: ../../../../library/Director/Web/Controller/ObjectController.php:351
 #, php-format
 msgid "Template: %s"
 msgstr "Vorlage: %s"
 
-#: library/Director/Import/ImportSourceDirectorObject.php:82
-#: library/Director/Web/Tree/TemplateTreeRenderer.php:43
-#: library/Director/Web/Table/DependencyTemplateUsageTable.php:10
-#: library/Director/Web/Table/NotificationTemplateUsageTable.php:10
-#: library/Director/Web/Table/HostTemplateUsageTable.php:10
-#: library/Director/Web/Table/TemplateUsageTable.php:23
-#: library/Director/Web/Table/ServiceTemplateUsageTable.php:10
-#: library/Director/Web/Tabs/ObjectsTabs.php:58
-#: application/forms/IcingaServiceForm.php:710
+#: ../../../../library/Director/Import/ImportSourceDirectorObject.php:82
+#: ../../../../library/Director/Web/Tree/TemplateTreeRenderer.php:43
+#: ../../../../library/Director/Web/Table/DependencyTemplateUsageTable.php:10
+#: ../../../../library/Director/Web/Table/TemplateUsageTable.php:23
+#: ../../../../library/Director/Web/Table/NotificationTemplateUsageTable.php:10
+#: ../../../../library/Director/Web/Table/HostTemplateUsageTable.php:10
+#: ../../../../library/Director/Web/Table/ServiceTemplateUsageTable.php:10
+#: ../../../../library/Director/Web/Tabs/ObjectsTabs.php:60
+#: ../../../../application/forms/IcingaServiceForm.php:714
 msgid "Templates"
 msgstr "Vorlagen"
 
-#: application/forms/IcingaCloneObjectForm.php:32
+#: ../../../../application/forms/IcingaCloneObjectForm.php:34
 msgid "Templates cannot be cloned in Configuration Branches"
 msgstr "Vorlagen können in Konfigurationszweigen nicht geklont werden"
 
-#: application/forms/DeployFormsBug7530.php:116
+#: ../../../../application/forms/DeployFormsBug7530.php:116
 msgid "Thanks, I'll verify this and come back later"
 msgstr "Danke, ich überprüfe das und komme wieder"
 
-#: library/Director/Job/ImportJob.php:67
+#: ../../../../library/Director/Job/ImportJob.php:67
 msgid "The \"Import\" job allows to run import actions at regular intervals"
 msgstr ""
 "Der \"Import\" Auftrag erlaubt das Ausführen von Importen in regelmäßigen "
 "Abständen"
 
-#: library/Director/Job/SyncJob.php:65
+#: ../../../../library/Director/Job/SyncJob.php:65
 msgid "The \"Sync\" job allows to run sync actions at regular intervals"
 msgstr ""
 "Der \"Sync\" Auftrag erlaubt das Ausführen von Synchronisationen in "
 "regelmäßigen Abständen"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:661
-#: application/forms/IcingaTimePeriodRangeForm.php:84
-#: application/forms/IcingaScheduledDowntimeRangeForm.php:89
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:664
+#: ../../../../application/forms/IcingaTimePeriodRangeForm.php:84
+#: ../../../../application/forms/IcingaScheduledDowntimeRangeForm.php:89
 #, php-format
 msgid "The %s has successfully been stored"
 msgstr "%s wurde erfolgreich gespeichert"
 
-#: library/Director/Job/ConfigJob.php:71
+#: ../../../../library/Director/Job/ConfigJob.php:71
 msgid ""
 "The Config job allows you to generate and eventually deploy your Icinga 2 "
 "configuration"
@@ -5769,11 +5844,11 @@ msgstr ""
 "Der Auftrag \"Konfiguration\" erlaubt das Erstellen und eventuelle Ausrollen "
 "der Icinga 2 Konfiguration"
 
-#: application/forms/IcingaUserForm.php:37
+#: ../../../../application/forms/IcingaUserForm.php:37
 msgid "The Email address of the user."
 msgstr "Die E-Mail-Adresse des Benutzers."
 
-#: library/Director/Job/HousekeepingJob.php:21
+#: ../../../../library/Director/Job/HousekeepingJob.php:21
 msgid ""
 "The Housekeeping job provides various task that keep your Director database "
 "fast and clean"
@@ -5781,7 +5856,7 @@ msgstr ""
 "Der \"Bereinigen\" Auftrag bietet verschiedene Aktionen, die die Director-"
 "Datenbank schnell und sauber halten"
 
-#: application/controllers/DaemonController.php:39
+#: ../../../../application/controllers/DaemonController.php:39
 #, php-format
 msgid ""
 "The Icinga Director Background Daemon is not running. Please check our %s in "
@@ -5790,7 +5865,7 @@ msgstr ""
 "Der Icinga Director Hintergrunddienst läuft nicht. Um eine Schritt-für-"
 "Schritt-Anleitung hierzu anzuzeigen bitte unsere %s zu Rate ziehen."
 
-#: application/controllers/SettingsController.php:38
+#: ../../../../application/controllers/SettingsController.php:38
 msgid ""
 "The Icinga Director Self Service API allows your Hosts to register "
 "themselves. This allows them to get their Icinga Agent configured, installed "
@@ -5800,7 +5875,7 @@ msgstr ""
 "registrieren. Auf diese Weise wird deren Icinga-Agent konfiguriert, "
 "installiert und automatisch aktualisiert."
 
-#: application/forms/SettingsForm.php:45
+#: ../../../../application/forms/SettingsForm.php:45
 msgid ""
 "The Icinga Package name Director uses to deploy it's configuration. This "
 "defaults to \"director\" and should not be changed unless you really know "
@@ -5810,7 +5885,7 @@ msgstr ""
 "Konfiguration benutzt. Für gewöhnlich ist das \"director\" und sollte nur "
 "geändert werden, wenn die Auswirkung dieser Anpassung bewusst ist"
 
-#: library/Director/Import/ImportSourceLdap.php:72
+#: ../../../../library/Director/Import/ImportSourceLdap.php:72
 msgid ""
 "The LDAP properties that should be fetched. This is required to be a comma-"
 "separated list like: \"cn, dnshostname, operatingsystem, sAMAccountName\""
@@ -5818,35 +5893,32 @@ msgstr ""
 "Die LDAP Eigenschaften, die geholt werden sollen. Muss eine Komma-separierte "
 "Liste sein, wie \"cn, dnshostname, operatingsystem, sAMAccountName\""
 
-#: application/forms/IcingaForgetApiKeyForm.php:31
+#: ../../../../application/forms/IcingaForgetApiKeyForm.php:31
 #, php-format
 msgid "The Self Service API key for %s has been dropped"
 msgstr "Der Selbstbedienungs-API-Schlüssel für %s wurde verworfen"
 
-#: application/forms/IcingaAddServiceSetForm.php:116
+#: ../../../../application/forms/IcingaAddServiceSetForm.php:116
 #, php-format
 msgid "The Service Set \"%s\" has been added to %d hosts"
 msgstr "Das Service-Set \"%s\" wurde zu %d Hosts hinzugefügt"
 
-#: application/forms/IcingaCommandArgumentForm.php:173
+#: ../../../../application/forms/IcingaCommandArgumentForm.php:173
 #, php-format
 msgid "The argument %s has successfully been stored"
 msgstr "Das Argument %s wurde erfolgreich gespeichert"
 
-#: application/forms/IcingaObjectFieldForm.php:129
-msgid "The caption which should be displayed"
-msgstr "Die Beschriftung, die angezeigt werden soll"
-
-#: application/forms/DirectorDatafieldForm.php:153
+#: ../../../../application/forms/DirectorDatafieldForm.php:152
+#: ../../../../application/forms/IcingaObjectFieldForm.php:88
 msgid ""
 "The caption which should be displayed to your users when this field is shown"
 msgstr "Die Beschriftung welche Benutzern zu diesem Feld angezeigt werden soll"
 
-#: application/forms/IcingaDependencyForm.php:234
+#: ../../../../application/forms/IcingaDependencyForm.php:234
 msgid "The child host."
 msgstr "Der Kind-Host."
 
-#: application/forms/IcingaCommandForm.php:61
+#: ../../../../application/forms/IcingaCommandForm.php:61
 msgid ""
 "The command Icinga should run. Absolute paths are accepted as provided, "
 "relative paths are prefixed with \"PluginDir + \", similar Constant prefixes "
@@ -5861,65 +5933,65 @@ msgstr ""
 "bedeutet, das aktuell keine Leerzeichen in Plugin-Namen und Pfaden "
 "unterstützt werden."
 
-#: application/forms/KickstartForm.php:165
+#: ../../../../application/forms/KickstartForm.php:165
 msgid "The corresponding password"
 msgstr "Das entsprechende Passwort"
 
-#: library/Director/PropertyModifier/PropertyModifierStripDomain.php:14
+#: ../../../../library/Director/PropertyModifier/PropertyModifierStripDomain.php:14
 msgid "The domain name you want to be stripped"
 msgstr "Der Domänenname, der entfernt werden soll"
 
-#: library/Director/PropertyModifier/PropertyModifierExtractFromDN.php:18
+#: ../../../../library/Director/PropertyModifier/PropertyModifierExtractFromDN.php:18
 msgid "The first (leftmost) CN"
 msgstr "Der erste (linkeste) CN"
 
-#: library/Director/PropertyModifier/PropertyModifierExtractFromDN.php:19
+#: ../../../../library/Director/PropertyModifier/PropertyModifierExtractFromDN.php:19
 msgid "The first (leftmost) OU"
 msgstr "Die erste (linkeste) OU"
 
-#: library/Director/Web/Controller/ObjectController.php:718
-#: application/controllers/ConfigController.php:443
+#: ../../../../library/Director/Web/Controller/ObjectController.php:729
+#: ../../../../application/controllers/ConfigController.php:444
 #, php-format
 msgid "The following modifications are visible in this %s only..."
 msgstr "Die folgenden Änderungen sind nur in diesem %s sichtbar..."
 
-#: application/forms/IcingaServiceForm.php:767
+#: ../../../../application/forms/IcingaServiceForm.php:771
 #, php-format
 msgid "The given properties have been stored for \"%s\""
 msgstr "Die übergebenen Eigenschaften wurden für \"%s\" gespeichert"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1666
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1669
 msgid "The host/service states you want to get notifications for"
 msgstr ""
 "Die Host/Service Status, für die Benachrichtigungen versandt werden sollen"
 
-#: library/Director/PropertyModifier/PropertyModifierExtractFromDN.php:21
+#: ../../../../library/Director/PropertyModifier/PropertyModifierExtractFromDN.php:21
 msgid "The last (rightmost) OU"
 msgstr "Die letzte (rechteste) OU"
 
-#: library/Director/Web/Widget/JobDetails.php:60
+#: ../../../../library/Director/Web/Widget/JobDetails.php:60
 #, php-format
 msgid "The last attempt failed %s: %s"
 msgstr "Der letzte Versuch schlug %s fehl: %s"
 
-#: library/Director/Web/Widget/JobDetails.php:55
+#: ../../../../library/Director/Web/Widget/JobDetails.php:55
 #, php-format
 msgid "The last attempt succeeded %s"
 msgstr "Der letzte Versuch war %s erfolgreich"
 
-#: library/Director/Dashboard/Dashlet/DeploymentDashlet.php:83
+#: ../../../../library/Director/Dashboard/Dashlet/DeploymentDashlet.php:84
 msgid "The last deployment did not succeed"
 msgstr "Das letzte Ausrollen war nicht erfolgreich"
 
-#: library/Director/Dashboard/Dashlet/DeploymentDashlet.php:85
+#: ../../../../library/Director/Dashboard/Dashlet/DeploymentDashlet.php:86
 msgid "The last deployment is currently pending"
 msgstr "Das Ausrollen der Konfiguration ist im Gange"
 
-#: application/forms/IcingaEndpointForm.php:42
+#: ../../../../application/forms/IcingaEndpointForm.php:42
 msgid "The log duration time."
 msgstr "Die Dauer der Aufzeichnungen."
 
-#: application/forms/IcingaUserForm.php:160
+#: ../../../../application/forms/IcingaUserForm.php:160
 msgid ""
 "The name of a time period which determines when notifications to this User "
 "should be triggered. Not set by default."
@@ -5927,8 +5999,8 @@ msgstr ""
 "Der Name des Zeitraumes, der angibt, wann Benachrichtigungen für diesen "
 "Benutzer ausgelöst werden sollen. Kein Default-Wert."
 
-#: application/forms/IcingaNotificationForm.php:242
-#: application/forms/IcingaDependencyForm.php:143
+#: ../../../../application/forms/IcingaNotificationForm.php:290
+#: ../../../../application/forms/IcingaDependencyForm.php:143
 msgid ""
 "The name of a time period which determines when this notification should be "
 "triggered. Not set by default."
@@ -5936,7 +6008,7 @@ msgstr ""
 "Der Name des Zeitraumes, der angibt, wann diese Benachrichtigung ausgelöst "
 "werden soll. Kein Default-Wert."
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1418
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1421
 msgid ""
 "The name of a time period which determines when this object should be "
 "monitored. Not limited by default."
@@ -5944,7 +6016,7 @@ msgstr ""
 "Der Name des Zeitraumes, der angibt, wann dieses Objekt überwacht wird. "
 "Standardmäßig nicht eingeschränkt."
 
-#: application/forms/DirectorJobForm.php:62
+#: ../../../../application/forms/DirectorJobForm.php:62
 msgid ""
 "The name of a time period within this job should be active. Supports only "
 "simple time periods (weekday and multiple time definitions)"
@@ -5952,15 +6024,15 @@ msgstr ""
 "Der Name des Zeitraums innerhalb derer dieser Auftrag aktiv sein soll. "
 "Erlaubt nur einfache Zeiträume (Wochentag und mehrere Zeitangaben)"
 
-#: application/forms/IcingaHostVarForm.php:16
+#: ../../../../application/forms/IcingaHostVarForm.php:16
 msgid "The name of the host"
 msgstr "Der Name des Hosts"
 
-#: application/forms/IcingaServiceVarForm.php:16
+#: ../../../../application/forms/IcingaServiceVarForm.php:16
 msgid "The name of the service"
 msgstr "Der Name des Service"
 
-#: application/forms/IcingaNotificationForm.php:178
+#: ../../../../application/forms/IcingaNotificationForm.php:226
 msgid ""
 "The notification interval (in seconds). This interval is used for active "
 "notifications. Defaults to 30 minutes. If set to 0, re-notifications are "
@@ -5970,7 +6042,7 @@ msgstr ""
 "aktive Benachrichtigungen verwendet. Default-Wert ist 30 Minuten. Wird er "
 "auf 0 gesetzt, sind Benachrichtungswiederholungen deaktiviert."
 
-#: library/Director/PropertyModifier/PropertyModifierBitmask.php:16
+#: ../../../../library/Director/PropertyModifier/PropertyModifierBitmask.php:16
 msgid ""
 "The numeric bitmask you want to apply. In case you have a hexadecimal or "
 "binary mask please transform it to a decimal number first. The result of "
@@ -5982,11 +6054,11 @@ msgstr ""
 "Ergebnis ist ein boolescher Wert welcher angibt, ob die Maske auf den "
 "numerischen Wert in der Quellspalte zutrifft"
 
-#: application/forms/IcingaUserForm.php:42
+#: ../../../../application/forms/IcingaUserForm.php:42
 msgid "The pager address of the user."
 msgstr "Die Pageradresse des Benutzers."
 
-#: application/forms/IcingaDependencyForm.php:202
+#: ../../../../application/forms/IcingaDependencyForm.php:202
 msgid ""
 "The parent host. You might want to refer Host Custom Variables via $host."
 "vars.varname$"
@@ -5994,7 +6066,7 @@ msgstr ""
 "Der Elternhost. Benutzerdefinierte Hosteigenschaften lassen sich via  $host."
 "vars.varname$ referenzieren"
 
-#: library/Director/PropertyModifier/PropertyModifierRegexReplace.php:15
+#: ../../../../library/Director/PropertyModifier/PropertyModifierRegexReplace.php:15
 msgid ""
 "The pattern you want to search for. This can be a regular expression like /"
 "^www\\d+\\./"
@@ -6002,11 +6074,11 @@ msgstr ""
 "Das Muster, nach dem gesucht werden soll. Kann ein regulärer Ausdruck wie /"
 "^www\\d+\\./ sein"
 
-#: application/forms/IcingaEndpointForm.php:37
+#: ../../../../application/forms/IcingaEndpointForm.php:37
 msgid "The port of the endpoint."
 msgstr "Der Port des Endpunkts."
 
-#: application/forms/KickstartForm.php:148
+#: ../../../../application/forms/KickstartForm.php:148
 msgid ""
 "The port you are going to use. The default port 5665 will be used if none is "
 "set"
@@ -6014,48 +6086,48 @@ msgstr ""
 "Der Port, der genutzt werden soll. Wird kein Wert gesetzt, gilt der Default-"
 "Wert 5665"
 
-#: library/Director/PropertyModifier/PropertyModifierGetPropertyFromOtherImportSource.php:64
+#: ../../../../library/Director/PropertyModifier/PropertyModifierGetPropertyFromOtherImportSource.php:64
 msgid "The property to get from the row we found in the chosen Import Source"
 msgstr ""
 "Die Eigenschaft welche wir aus der Zeile die wir in der gewählten "
 "Importquelle gefunden haben extrahieren wollen"
 
-#: application/forms/IcingaAddServiceForm.php:176
+#: ../../../../application/forms/IcingaAddServiceForm.php:177
 #, php-format
 msgid "The service \"%s\" has been added to %d hosts"
 msgstr "Der Service \"%s\" wurde zu %d Hosts hinzugefügt"
 
-#: application/forms/IcingaAddServiceSetForm.php:88
+#: ../../../../application/forms/IcingaAddServiceSetForm.php:88
 msgid "The service Set that should be assigned"
 msgstr "Das Service-Set welches zugewiesen werden soll"
 
-#: application/forms/IcingaServiceSetForm.php:89
+#: ../../../../application/forms/IcingaServiceSetForm.php:90
 msgid "The service set that should be assigned to this host"
 msgstr "Das Service-Set welches diesem Host zugewiesen werden soll"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1676
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1679
 msgid "The state transition types you want to get notifications for"
 msgstr ""
 "Die Arten von Statusänderungen, für die Benachrichtigungen verschickt werden "
 "sollen"
 
-#: library/Director/PropertyModifier/PropertyModifierRegexReplace.php:23
-msgid "The string that should be used as a preplacement"
+#: ../../../../library/Director/PropertyModifier/PropertyModifierRegexReplace.php:23
+msgid "The string that should be used as a replacement"
 msgstr "Die Zeichenkette, die als Ersatz genutzt werden soll"
 
-#: library/Director/PropertyModifier/PropertyModifierReplace.php:14
+#: ../../../../library/Director/PropertyModifier/PropertyModifierReplace.php:14
 msgid "The string you want to search for"
 msgstr "Die Zeichenkette, nach der gesucht werden soll"
 
-#: library/Director/PropertyModifier/PropertyModifierRejectOrSelect.php:56
+#: ../../../../library/Director/PropertyModifier/PropertyModifierRejectOrSelect.php:56
 msgid ""
-"The string/pattern you want to search for, use regular expression like /"
-"^www\\d+\\./"
+"The string/pattern you want to search for, use regular expression like /^www"
+"\\d+\\./"
 msgstr ""
 "Das Muster, nach dem gesucht werden soll. Kann ein regulärer Ausdruck wie /"
 "^www\\d+\\./ sein"
 
-#: library/Director/PropertyModifier/PropertyModifierRejectOrSelect.php:46
+#: ../../../../library/Director/PropertyModifier/PropertyModifierRejectOrSelect.php:46
 msgid ""
 "The string/pattern you want to search for, use wildcard matches like www.* "
 "or *linux*"
@@ -6063,7 +6135,7 @@ msgstr ""
 "Das Muster, nach dem gesucht werden soll, Platzhalter wie www.* oder *linux* "
 "sind möglich"
 
-#: library/Director/PropertyModifier/PropertyModifierArrayFilter.php:41
+#: ../../../../library/Director/PropertyModifier/PropertyModifierArrayFilter.php:41
 msgid ""
 "The string/pattern you want to search for. Depends on the chosen method, use "
 "www.* or *linux* for wildcard matches and expression like /^www\\d+\\./ in "
@@ -6074,79 +6146,70 @@ msgstr ""
 "Suchen und Ausdrücken wie /^www\\d+\\./ falls Reguläre Ausdrücke bevorzugt "
 "wurden"
 
-#: application/forms/DirectorDatafieldCategoryForm.php:25
+#: ../../../../application/forms/DirectorDatafieldCategoryForm.php:25
 msgid ""
 "The unique name of the category used for grouping your custom Data Fields."
 msgstr ""
 "Der eindeutige Kategoriebezeichner welcher zum Gruppieren der "
 "benutzerdefinierten Felder benutzt werden soll."
 
-#: application/forms/DirectorDatafieldForm.php:143
-msgid ""
-"The unique name of the field. This will be the name of the custom variable "
-"in the rendered Icinga configuration."
-msgstr ""
-"Der eindeutige Bezeichner dieses Feldes. Dieser wird als Name der "
-"benutzerdefinierten Eigenschaft in der gerenderten Icinga-Konfiguration "
-"benutzt."
-
-#: application/forms/SelfServiceSettingsForm.php:181
+#: ../../../../application/forms/SelfServiceSettingsForm.php:181
 msgid "The user that should run the Icinga 2 service on Windows."
 msgstr ""
 "Der Benutzeraccount unter welchem der Icinga-2-Dienst unter Windows laufen "
 "soll."
 
-#: application/forms/DirectorDatafieldForm.php:74
+#: ../../../../application/forms/DirectorDatafieldForm.php:74
 #, php-format
 msgid ""
-"There are %d objects with a related property. Should I also remove the "
-"\"%s\" property from them?"
+"There are %d objects with a related property. Should I also remove the \"%s"
+"\" property from them?"
 msgstr ""
 "Es gibt %d Objekte mit einer entsprechenden Eigenschaft. Soll der Wert für "
 "\"%s\" von all diesen entfernt werden?"
 
-#: application/forms/DirectorDatafieldForm.php:118
+#: ../../../../application/forms/DirectorDatafieldForm.php:118
 #, php-format
 msgid ""
-"There are %d objects with a related property. Should I also rename the "
-"\"%s\" property to \"%s\" on them?"
+"There are %d objects with a related property. Should I also rename the \"%s"
+"\" property to \"%s\" on them?"
 msgstr ""
 "Es gibt %d Objekte mit einer entsprechenden Eigenschaft. Soll auf all diesen "
 "die Variable \"%s\" nach \"%s\" umbenannt werden?"
 
-#: application/forms/DeploymentLinkForm.php:66
+#: ../../../../application/forms/DeploymentLinkForm.php:67
 #, php-format
 msgid "There are %d pending changes"
 msgstr "Es gibt %d noch nicht ausgerollte Änderungen"
 
-#: application/forms/DeploymentLinkForm.php:79
+#: ../../../../application/forms/DeploymentLinkForm.php:80
 #, php-format
 msgid "There are %d pending changes, %d of them applied to this object"
 msgstr ""
 "Es sind %d Änderungen ausständig, wovon %d auf dieses Objekt angewendet "
 "werden"
 
-#: library/Director/Web/Navigation/Renderer/ConfigHealthItemRenderer.php:90
+#: ../../../../library/Director/Web/Navigation/Renderer/ConfigHealthItemRenderer.php:90
 #, php-format
 msgid "There are %d pending database migrations"
 msgstr "Es sind %d Datenbankmigrationen ausständig"
 
-#: application/forms/IcingaObjectFieldForm.php:117
+#: ../../../../application/forms/IcingaObjectFieldForm.php:75
 msgid ""
 "There are no data fields available. Please ask an administrator to create "
 "such"
 msgstr ""
 "Es sind keine Datenfelder verfügbar. Ein Administrator kann welche anlegen"
 
-#: library/Director/Dashboard/Dashlet/DeploymentDashlet.php:91
+#: ../../../../library/Director/Dashboard/Dashlet/DeploymentDashlet.php:92
 msgid "There are no pending changes"
 msgstr "Es gibt keine anstehenden Änderungen"
 
-#: application/forms/DeployConfigForm.php:34
+#: ../../../../application/forms/DeployConfigForm.php:34
 msgid "There are no pending changes. Deploy anyway"
 msgstr "Es gibt keine anstehenden Änderungen. Dennoch ausrollen"
 
-#: library/Director/Web/Widget/ImportSourceDetails.php:52
+#: ../../../../library/Director/Web/Widget/ImportSourceDetails.php:52
 msgid ""
 "There are pending changes for this Import Source. You should trigger a new "
 "Import Run."
@@ -6154,7 +6217,7 @@ msgstr ""
 "Es gibt ausstehende Änderungen für diese Importquelle. Ein neuer Importlauf "
 "sollte angestoßen werden."
 
-#: application/controllers/SyncruleController.php:108
+#: ../../../../application/controllers/SyncruleController.php:108
 msgid ""
 "There are pending changes for this Sync Rule. You should trigger a new Sync "
 "Run."
@@ -6162,18 +6225,18 @@ msgstr ""
 "Es gibt ausstehende Änderungen für diese Synchronisationsregel. Ein neuer "
 "Synchronisationslauf sollte angestoßen werden."
 
-#: application/forms/KickstartForm.php:66
+#: ../../../../application/forms/KickstartForm.php:66
 msgid "There are pending database migrations"
 msgstr "Es sind Datenbankmigrationen ausständig"
 
-#: application/forms/DeploymentLinkForm.php:71
+#: ../../../../application/forms/DeploymentLinkForm.php:72
 msgid ""
 "There has been a single change to this object, nothing else has been modified"
 msgstr ""
 "An diesem Objekt wurde eine einzelne Änderung vorgenommen. Nichts Anderes "
 "wurde verändert"
 
-#: application/forms/DeploymentLinkForm.php:74
+#: ../../../../application/forms/DeploymentLinkForm.php:75
 #, php-format
 msgid ""
 "There have been %d changes to this object, nothing else has been modified"
@@ -6181,15 +6244,15 @@ msgstr ""
 "An diesem Objekt wurden %d Änderungen vorgenommen, nichts anderes wurde "
 "verändert"
 
-#: application/forms/DeploymentLinkForm.php:63
+#: ../../../../application/forms/DeploymentLinkForm.php:64
 msgid "There is a single pending change"
 msgstr "Es gibt eine einzelne ausstehende Änderung"
 
-#: application/forms/DirectorJobForm.php:21
+#: ../../../../application/forms/DirectorJobForm.php:21
 msgid "These are different available job types"
 msgstr "Verschiedene verfügbare Auftragstypen"
 
-#: application/forms/ImportSourceForm.php:37
+#: ../../../../application/forms/ImportSourceForm.php:37
 msgid ""
 "These are different data providers fetching data from various sources. You "
 "didn't find what you're looking for? Import sources are implemented as a "
@@ -6201,69 +6264,69 @@ msgstr ""
 "geschriebenes) Icinga Web 2 Modul diese Funktionalität nachrüsten, da "
 "Importquellen als Hook in Director realisiert werden"
 
-#: application/controllers/CommandController.php:76
+#: ../../../../application/controllers/CommandController.php:76
 #, php-format
 msgid "This Command is currently being used by %s"
 msgstr "Dieses Kommando wird gegenwärtig von %s benutzt"
 
-#: application/controllers/CommandController.php:82
+#: ../../../../application/controllers/CommandController.php:82
 msgid "This Command is currently not in use"
 msgstr "Dieses Kommando wird gegenwärtig nicht benutzt"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:951
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:954
 #, php-format
 msgid "This Command is still in use by %d other objects"
 msgstr "Dieses Kommando wird von %d anderen Objekten benutzt"
 
-#: library/Director/Web/Widget/ImportSourceDetails.php:59
+#: ../../../../library/Director/Web/Widget/ImportSourceDetails.php:59
 #, php-format
 msgid "This Import Source failed when last checked at %s: %s"
 msgstr "Diese Importquelle schlug bei der letzten Prüfung um %s fehl: %s"
 
-#: library/Director/Web/Widget/ImportSourceDetails.php:67
+#: ../../../../library/Director/Web/Widget/ImportSourceDetails.php:67
 #, php-format
 msgid "This Import Source has an invalid state: %s"
 msgstr "Diese Importquelle hat einen ungültigen Zustand: %s"
 
-#: application/forms/ImportCheckForm.php:33
+#: ../../../../application/forms/ImportCheckForm.php:33
 msgid "This Import Source provides modified data"
 msgstr "Diese Importquelle stellt veränderte Daten zur Verfügung"
 
-#: library/Director/Web/Widget/ImportSourceDetails.php:42
+#: ../../../../library/Director/Web/Widget/ImportSourceDetails.php:42
 #, php-format
 msgid "This Import Source was last found to be in sync at %s."
 msgstr "Diese Importquelle war zuletzt um %s syncron."
 
-#: application/forms/IcingaServiceForm.php:136
+#: ../../../../application/forms/IcingaServiceForm.php:138
 msgid "This Service has been deactivated on this host"
 msgstr "Dieser Service wurde auf diesem Host deaktiviert"
 
-#: application/controllers/SyncruleController.php:115
+#: ../../../../application/controllers/SyncruleController.php:115
 #, php-format
 msgid "This Sync Rule failed when last checked at %s: %s"
 msgstr ""
 "Diese Synchronisationsregel schlug bei der letzten Prüfung um %s fehl: %s"
 
-#: application/controllers/SyncruleController.php:85
+#: ../../../../application/controllers/SyncruleController.php:85
 msgid "This Sync Rule has never been run before."
 msgstr "Diese Synchronisationsregel wurde noch nie ausgeführt."
 
-#: application/controllers/SyncruleController.php:258
+#: ../../../../application/controllers/SyncruleController.php:258
 msgid "This Sync Rule is in sync and would currently not apply any changes"
 msgstr ""
 "Diese Sync-Regel ist synchron und würde aktuell keine Änderungen verursachen"
 
-#: application/controllers/SyncruleController.php:97
+#: ../../../../application/controllers/SyncruleController.php:97
 #, php-format
-msgid "This Sync Rule was last found to by in Sync at %s."
+msgid "This Sync Rule was last found to be in Sync at %s."
 msgstr "Diese Synchronisationsregel war zuletzt synchron um %s."
 
-#: application/forms/SyncPropertyForm.php:105
+#: ../../../../application/forms/SyncPropertyForm.php:105
 msgid ""
 "This allows to filter for specific parts within the given source expression. "
 "You are allowed to refer all imported columns. Examples: host=www* would set "
-"this property only for rows imported with a host property starting with "
-"\"www\". Complex example: host=www*&!(address=127.*|address6=::1)"
+"this property only for rows imported with a host property starting with \"www"
+"\". Complex example: host=www*&!(address=127.*|address6=::1)"
 msgstr ""
 "Erlaubt das Filtern nach bestimmten Teilen innerhalb des angegebenen "
 "Quellausdrucks. Alle importierten Spalten können angegeben werden. "
@@ -6271,22 +6334,39 @@ msgstr ""
 "setzen, bei denen die Host Eigenschaft mit \"www\" beginnt. Komplexes "
 "Beispiel: host=www*&!(address=127.*|address6=::1)"
 
-#: library/Director/DataType/DataTypeDatalist.php:147
+#: ../../../../application/forms/ImportRowModifierForm.php:91
+msgid ""
+"This allows to filter for specific parts within the given source expression. "
+"You are allowed to refer all imported columns. Examples: host=www* would set "
+"this property only for rows imported with a host property starting with \"www"
+"\". Complex example: host=www*&!(address=127.*|address6=::1). Please note, "
+"that CIDR notation based matches are also supported:  "
+"address=192.0.2.128/25| address=2001:db8::/32| address=::ffff:192.0.2.0/96"
+msgstr ""
+"Erlaubt das Filtern nach bestimmten Teilen innerhalb des angegebenen "
+"Quellausdrucks. Alle importierten Spalten können angegeben werden. "
+"Beispiele: host=www* würde diese Eigenschaft nur für importierte Zeilen "
+"setzen, bei denen die Host Eigenschaft mit \"www\" beginnt. Komplexes "
+"Beispiel: host=www*&!(address=127.*|address6=::1). Bitte beachten, dass auch "
+"Muster in CIDR-Notation unterstützt werden:  address=192.0.2.128/25| "
+"address=2001:db8::/32| address=::ffff:192.0.2.0/96"
+
+#: ../../../../library/Director/DataType/DataTypeDatalist.php:147
 msgid "This allows to show either a drop-down list or an auto-completion"
 msgstr ""
 "Dies erlaubt es, entweder eine Ausklappmenü oder ein Feld mit automatischer "
 "Vervollständigung anzuzeigen"
 
-#: application/forms/DirectorJobForm.php:39
+#: ../../../../application/forms/DirectorJobForm.php:39
 msgid "This allows to temporarily disable this job"
 msgstr "Erlaubt das vorübergehende Deaktivieren dieses Auftrags"
 
-#: application/forms/IcingaHostGroupForm.php:30
-#: application/forms/IcingaNotificationForm.php:106
-#: application/forms/IcingaServiceGroupForm.php:30
-#: application/forms/IcingaServiceForm.php:476
-#: application/forms/IcingaDependencyForm.php:115
-#: application/forms/IcingaScheduledDowntimeForm.php:115
+#: ../../../../application/forms/IcingaNotificationForm.php:107
+#: ../../../../application/forms/IcingaHostGroupForm.php:30
+#: ../../../../application/forms/IcingaServiceGroupForm.php:30
+#: ../../../../application/forms/IcingaServiceForm.php:480
+#: ../../../../application/forms/IcingaDependencyForm.php:115
+#: ../../../../application/forms/IcingaScheduledDowntimeForm.php:115
 msgid ""
 "This allows you to configure an assignment filter. Please feel free to "
 "combine as many nested operators as you want. The \"contains\" operator is "
@@ -6299,7 +6379,7 @@ msgstr ""
 "Teilstrings zu vergleichen bitte Jokerzeichen (wildcards) benutzen, wie in *."
 "example.com"
 
-#: application/forms/IcingaServiceSetForm.php:123
+#: ../../../../application/forms/IcingaServiceSetForm.php:124
 msgid ""
 "This allows you to configure an assignment filter. Please feel free to "
 "combine as many nested operators as you want. You might also want to skip "
@@ -6316,31 +6396,31 @@ msgstr ""
 "Arrays zulässig. Um Teilstrings zu vergleichen bitte Jokerzeichen "
 "(wildcards) benutzen, wie in *.example.com"
 
-#: library/Director/Job/ConfigJob.php:47
+#: ../../../../library/Director/Job/ConfigJob.php:47
 msgid "This allows you to immediately deploy a modified configuration"
 msgstr "Dies erlaubt das sofortige Ausrollen einer veränderten Konfiguration"
 
-#: library/Director/ProvidedHook/CubeLinks.php:37
-#: library/Director/ProvidedHook/IcingaDbCubeLinks.php:32
+#: ../../../../library/Director/ProvidedHook/CubeLinks.php:37
+#: ../../../../library/Director/ProvidedHook/IcingaDbCubeLinks.php:32
 #, php-format
 msgid "This allows you to modify properties for \"%s\""
 msgstr "Erlaubt das Ändern der Eigenschaften von \"%s\""
 
-#: library/Director/ProvidedHook/CubeLinks.php:54
-#: library/Director/ProvidedHook/IcingaDbCubeLinks.php:55
+#: ../../../../library/Director/ProvidedHook/CubeLinks.php:54
+#: ../../../../library/Director/ProvidedHook/IcingaDbCubeLinks.php:55
 msgid "This allows you to modify properties for all chosen hosts at once"
 msgstr ""
 "Hiermit lassen sich Eigenschaften für alle gewählten Hosts auf einmal ändern"
 
-#: application/controllers/BasketController.php:64
+#: ../../../../application/controllers/BasketController.php:62
 msgid "This basket is empty"
 msgstr "Dieser Basket ist leer"
 
-#: application/forms/KickstartForm.php:230
+#: ../../../../application/forms/KickstartForm.php:230
 msgid "This has to be a MySQL or PostgreSQL database"
 msgstr "Muss eine MySQL oder PostgeSQL Datenbank sein"
 
-#: library/Director/Web/SelfService.php:65
+#: ../../../../library/Director/Web/SelfService.php:65
 msgid ""
 "This host has been registered via the Icinga Director Self Service API. In "
 "case you re-installed the host or somehow lost it's secret key, you might "
@@ -6352,11 +6432,11 @@ msgstr ""
 "ging, kann es erwünscht sein, den aktuellen Schlüssel zu verwerfen. Das "
 "würde es erlauben, denselben Host neu zu registrieren."
 
-#: application/controllers/InspectController.php:71
+#: ../../../../application/controllers/InspectController.php:71
 msgid "This is an abstract object type."
 msgstr "Das ist ein abstrakter Objekttyp."
 
-#: application/forms/SelfServiceSettingsForm.php:45
+#: ../../../../application/forms/SelfServiceSettingsForm.php:45
 msgid ""
 "This is only important in case your master/satellite nodes do not have IP "
 "addresses as their \"host\" property. The Agent can be told to issue related "
@@ -6366,12 +6446,12 @@ msgstr ""
 "Eigenschaft gesetzt haben. Dem Agent kann angewiesen werden, eigenständig "
 "entsprechende DNS-Lookups eigenständig vorzunehmen"
 
-#: library/Director/Web/Controller/TemplateController.php:179
+#: ../../../../library/Director/Web/Controller/TemplateController.php:180
 #, php-format
 msgid "This is the \"%s\" %s Template. Based on this, you might want to:"
 msgstr "Das ist die \"%s\" %s Vorlage. Basierend auf diese, kann man:"
 
-#: application/forms/KickstartForm.php:123
+#: ../../../../application/forms/KickstartForm.php:123
 msgid ""
 "This is the name of the Endpoint object (and certificate name) you created "
 "for your ApiListener object. In case you are unsure what this means please "
@@ -6381,7 +6461,7 @@ msgstr ""
 "Objekt erstellt wurde. Bei Unklarheit, was damit gemeint ist, sollte die "
 "Dokumentation erneut zu Rate gezogen werden"
 
-#: library/Director/Dashboard/Dashlet/HostsDashlet.php:17
+#: ../../../../library/Director/Dashboard/Dashlet/HostsDashlet.php:19
 msgid ""
 "This is where you add all your servers, containers, network or sensor "
 "devices - and much more. Every subject worth to be monitored"
@@ -6389,7 +6469,7 @@ msgstr ""
 "Hier werden alle Server, Container, Netzwerk- oder Sensor-Geräte und vieles "
 "mehr hinzugefügt. Jede Komponente die es wert ist, überwacht zu werden"
 
-#: library/Director/Dashboard/HostsDashboard.php:22
+#: ../../../../library/Director/Dashboard/HostsDashboard.php:22
 msgid ""
 "This is where you manage your Icinga 2 Host Checks. Host templates are your "
 "main building blocks. You can bundle them to \"choices\", allowing (or "
@@ -6400,7 +6480,7 @@ msgstr ""
 "werden, um es eigenen Benutzern zu erlauben, aus einem definierten Set von "
 "Vorlagen zu wählen - oder dies gar zu erzwingen."
 
-#: library/Director/Dashboard/ServicesDashboard.php:24
+#: ../../../../library/Director/Dashboard/ServicesDashboard.php:24
 msgid ""
 "This is where you manage your Icinga 2 Service Checks. Service Templates are "
 "your base building blocks, Service Sets allow you to assign multiple "
@@ -6414,7 +6494,7 @@ msgstr ""
 "Eigenschaften zuzuweisen. Und die Liste aller Einzel-Services erlaubt es, "
 "einzelne oder mehrere zugleich zu bearbeiten oder zu löschen."
 
-#: library/Director/Dashboard/UsersDashboard.php:21
+#: ../../../../library/Director/Dashboard/UsersDashboard.php:21
 msgid ""
 "This is where you manage your Icinga 2 User (Contact) objects. Try to keep "
 "your User objects simply by movin complexity to your templates. Bundle your "
@@ -6432,7 +6512,7 @@ msgstr ""
 "Import-Funktion und entsprechende Synchronisationsregeln lässt sich nahezu "
 "alles automatisieren!"
 
-#: library/Director/Dashboard/InfrastructureDashboard.php:39
+#: ../../../../library/Director/Dashboard/InfrastructureDashboard.php:39
 msgid ""
 "This is where you manage your Icinga 2 infrastructure. When adding a new "
 "Icinga Master or Satellite please re-run the Kickstart Helper once."
@@ -6440,27 +6520,27 @@ msgstr ""
 "Hier wird die Icinga 2 Infrastruktur verwaltet. Den Kickstart-Helper beim "
 "Hinzufügen von neuen Icinga Mastern oder Satelliten bitte erneut ausführen."
 
-#: library/Director/Web/Table/ObjectsTableEndpoint.php:47
+#: ../../../../library/Director/Web/Table/ObjectsTableEndpoint.php:47
 msgid "This is your Config master and will receive our Deployments"
 msgstr ""
 "Dies ist der Konfigurations-Master zu welchem sämtliche Konfiguration "
 "ausgerollt wird"
 
-#: library/Director/Web/Widget/JobDetails.php:66
+#: ../../../../library/Director/Web/Widget/JobDetails.php:66
 msgid "This job has not been executed yet"
 msgstr "Dieser Auftrag wurde bisher nicht ausgeführt"
 
-#: library/Director/Web/Widget/JobDetails.php:36
+#: ../../../../library/Director/Web/Widget/JobDetails.php:36
 #, php-format
 msgid "This job runs every %ds and is currently pending"
-msgstr "Dieser Auftrag läuft alle %d und ist aktuell ausständig"
+msgstr "Dieser Auftrag läuft alle %ds und ist aktuell ausständig"
 
-#: library/Director/Web/Widget/JobDetails.php:40
+#: ../../../../library/Director/Web/Widget/JobDetails.php:40
 #, php-format
 msgid "This job runs every %ds."
-msgstr "Dieser Auftrag läuft alle %d."
+msgstr "Dieser Auftrag läuft alle %ds."
 
-#: library/Director/Web/Widget/JobDetails.php:27
+#: ../../../../library/Director/Web/Widget/JobDetails.php:27
 #, php-format
 msgid ""
 "This job would run every %ds. It has been disabled and will therefore not be "
@@ -6469,7 +6549,8 @@ msgstr ""
 "Dieser Auftrag würde alle %d ausgeführt. Er ist deaktiviert und wird deshalb "
 "nicht wie geplant ausgeführt"
 
-#: library/Director/PropertyModifier/PropertyModifierMakeBoolean.php:33
+#: ../../../../library/Director/PropertyModifier/PropertyModifierMakeBoolean.php:33
+#: ../../../../library/Director/PropertyModifier/PropertyModifierSetValue.php:22
 msgid ""
 "This modifier transforms 0/\"0\"/false/\"false\"/\"n\"/\"no\" to false and "
 "1, \"1\", true, \"true\", \"y\" and \"yes\" to true, both in a case "
@@ -6484,7 +6565,7 @@ msgstr ""
 "aber true oder false als Fallback nutzen. Alternativ kann man auch den "
 "komplette Importvorgang aufgrund ungültiger Daten fehlschlagen lassen"
 
-#: application/forms/ImportSourceForm.php:89
+#: ../../../../application/forms/ImportSourceForm.php:89
 msgid ""
 "This must be a column containing unique values like hostnames. Unless "
 "otherwise specified this will then be used as the object_name for the "
@@ -6507,44 +6588,40 @@ msgstr ""
 "\"Kombinieren\", falls die gegebenen Datenquelle keine solche Spalte "
 "bereitstellen kann"
 
-#: application/forms/IcingaScheduledDowntimeForm.php:33
+#: ../../../../application/forms/IcingaScheduledDowntimeForm.php:33
 msgid "This name will show up as the author for ever related downtime comment"
 msgstr ""
 "Der Name wird als Autor für sämtliche zugehörigen Downtime-Kommentare "
 "aufscheinen"
 
-#: library/Director/Web/Widget/BranchedObjectHint.php:57
+#: ../../../../library/Director/Web/Widget/BranchedObjectHint.php:69
 #, php-format
 msgid "This object has been created in %s"
 msgstr "Dieses Objekt wurde in %s erstellt"
 
-#: library/Director/Web/Widget/ActivityLogInfo.php:545
+#: ../../../../library/Director/Web/Widget/ActivityLogInfo.php:545
 msgid "This object has been disabled"
 msgstr "Dieses Objekt wurde deaktiviert"
 
-#: library/Director/Web/Widget/ActivityLogInfo.php:540
+#: ../../../../library/Director/Web/Widget/ActivityLogInfo.php:540
 msgid "This object has been enabled"
 msgstr "Dieses Objekt wurde aktiviert"
 
-#: library/Director/Web/Widget/BranchedObjectHint.php:62
+#: ../../../../library/Director/Web/Widget/BranchedObjectHint.php:74
 #, php-format
 msgid "This object has modifications visible only in %s"
 msgstr "Dieses Objekt hat Änderungen, welche nur in %s sichtbar sind"
 
-#: library/Director/Web/Widget/BranchedObjectHint.php:34
+#: ../../../../library/Director/Web/Widget/BranchedObjectHint.php:45
 #, php-format
-msgid ""
-"This object will be created in %s. It will not be part of any deployment "
-"unless being merged"
-msgstr ""
-"Das Objekt wird in %s erstellt. Es sind nicht Teil eines eventuellen "
-"Deployments, solange die Änderungen nicht zusammengeführt werden"
+msgid "This object will be created in %s."
+msgstr "Dieses Objekt wird in %s erstellt"
 
-#: library/Director/Web/ObjectPreview.php:75
+#: ../../../../library/Director/Web/ObjectPreview.php:75
 msgid "This object will not be deployed as it has been disabled"
 msgstr "Das Objekt wird nicht ausgerollt, da es deaktiviert wurde"
 
-#: library/Director/PropertyModifier/PropertyModifierCombine.php:17
+#: ../../../../library/Director/PropertyModifier/PropertyModifierCombine.php:17
 msgid ""
 "This pattern will be evaluated, and variables like ${some_column} will be "
 "filled accordingly. A typical use-case is generating unique service "
@@ -6558,13 +6635,13 @@ msgstr ""
 "einen solchen nicht bereitstellt. Die gewählte \"Eigenschaft\" hat hier "
 "keine Auswirkung und wird ignoriert."
 
-#: application/controllers/SyncruleController.php:219
+#: ../../../../application/controllers/SyncruleController.php:219
 #, php-format
 msgid "This preview has been generated %s, please click %s to regenerate it"
 msgstr ""
 "Dieser Vorschau wurde %s generiert, zwecks Aktualisierung bitte %s klicken"
 
-#: library/Director/Web/SelfService.php:256
+#: ../../../../library/Director/Web/SelfService.php:243
 msgid ""
 "This requires the Icinga Agent to be installed. It generates and signs it's "
 "certificate and it also generates a minimal icinga2.conf to get your agent "
@@ -6574,7 +6651,7 @@ msgstr ""
 "sein Zertifikat und erstellt eine minimale icinga2.conf mit welcher der "
 "Agent zu den ihm übergeordneten Systemen verbunden wird"
 
-#: application/forms/IcingaServiceForm.php:403
+#: ../../../../application/forms/IcingaServiceForm.php:407
 #, php-format
 msgid ""
 "This service belongs to the %s Service Set. Still, you might want to "
@@ -6583,7 +6660,7 @@ msgstr ""
 "Dieser Service gehört zum Service Set %s. Dennoch können die folgenden "
 "Eigenschaften nur für diesen speziellen Host geändert werden."
 
-#: application/forms/IcingaServiceForm.php:443
+#: ../../../../application/forms/IcingaServiceForm.php:447
 #, php-format
 msgid ""
 "This service belongs to the service set \"%s\". Still, you might want to "
@@ -6592,7 +6669,7 @@ msgstr ""
 "Dieser Service gehört zum Set \"%s\". Dennoch können die folgenden "
 "Eigenschaften nur für diesen speziellen Host geändert werden."
 
-#: application/forms/IcingaServiceForm.php:384
+#: ../../../../application/forms/IcingaServiceForm.php:388
 msgid ""
 "This service has been generated in an automated way, but still allows you to "
 "override the following properties in a safe way."
@@ -6600,7 +6677,7 @@ msgstr ""
 "Dieser Service wurde durch einen Automatismus erstellt, erlaubt es aber "
 "dennoch die folgenden Eigenschaften auf sichere Weise zu überschreiben."
 
-#: application/forms/IcingaServiceForm.php:390
+#: ../../../../application/forms/IcingaServiceForm.php:394
 #, php-format
 msgid ""
 "This service has been generated using the %s apply rule, assigned where %s"
@@ -6608,7 +6685,7 @@ msgstr ""
 "Dieser Service wurde durch die Apply-Regel %s erstellt, und wird zugewiesen "
 "wo %s"
 
-#: application/forms/IcingaServiceForm.php:415
+#: ../../../../application/forms/IcingaServiceForm.php:419
 #, php-format
 msgid ""
 "This service has been inherited from %s. Still, you might want to change the "
@@ -6617,12 +6694,12 @@ msgstr ""
 "Dieser Service wurde von %s geerbt. Dennoch können die folgenden "
 "Eigenschaften nur für diesen speziellen Host geändert werden."
 
-#: library/Director/Web/Table/IcingaServiceSetServiceTable.php:216
+#: ../../../../library/Director/Web/Table/IcingaServiceSetServiceTable.php:229
 #, php-format
 msgid "This set has been inherited from %s"
 msgstr "Dieses Set wurde von %s geerbt"
 
-#: library/Director/Dashboard/Dashlet/KickstartDashlet.php:17
+#: ../../../../library/Director/Dashboard/Dashlet/KickstartDashlet.php:19
 msgid ""
 "This synchronizes Icinga Director to your Icinga 2 infrastructure. A new run "
 "should be triggered on infrastructure changes"
@@ -6630,91 +6707,123 @@ msgstr ""
 "Synchronisiert den Icinga Director mit der Icinga 2 Infrastruktur. Bei "
 "Änderungen an derselben sollte ein neuer Lauf angestoßen werden"
 
-#: library/Director/Web/Table/TemplateUsageTable.php:103
+#: ../../../../library/Director/Web/Table/TemplateUsageTable.php:104
 msgid "This template is not in use"
 msgstr "Diese Vorlage ist nicht in Verwendung"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:941
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:944
 #, php-format
 msgid "This template is still in use by %d other objects"
 msgstr "Diese Vorlage ist noch in Verwendung durch %d andere Objekte"
 
-#: application/forms/IcingaTemplateChoiceForm.php:51
+#: ../../../../library/Director/PropertyModifier/PropertyModifierMap.php:48
+msgid ""
+"This value will be evaluated, and variables like ${some_column} will be "
+"filled accordingly. A typical use-case is generating unique service "
+"identifiers via ${host}!${service} in case your data source doesn't allow "
+"you to ship such. The chosen \"property\" has no effect here and will be "
+"ignored."
+msgstr ""
+"Dieses Muster wird ausgewertet, und Variablen wie ${eine_spalte} werden "
+"entsprechend befüllt. Ein typischer Anwendungsfall ist das Erstellen von "
+"eindeutigen Service-Bezeichnern via ${host}!${service} falls die Datenquelle "
+"einen solchen nicht bereitstellt. Die gewählte \"Eigenschaft\" hat hier "
+"keine Auswirkung und wird ignoriert."
+
+#: ../../../../library/Director/Web/Widget/BranchedObjectHint.php:25
+msgid "This will be part of the next deployment"
+msgstr "Das wird Teil des nächsten Deployments"
+
+#: ../../../../application/forms/IcingaTemplateChoiceForm.php:51
 msgid "This will be shown as a label for the given choice"
 msgstr "Dies wird als Bezeichner für diese Auswahlmöglichkeit angezeigt werden"
 
-#: application/forms/DirectorDatalistEntryForm.php:33
+#: ../../../../application/forms/DirectorDatafieldForm.php:143
+msgid ""
+"This will be the name of the custom variable in the rendered Icinga "
+"configuration."
+msgstr ""
+"Dies wird als Name der benutzerdefinierten Eigenschaft in der gerenderten "
+"Icinga-Konfiguration benutzt."
+
+#: ../../../../application/forms/DirectorDatalistEntryForm.php:33
 msgid "This will be the visible caption for this entry"
 msgstr "Die sichtbare Bezeichnung für diesen Eintrag"
 
-#: library/Director/Web/SelfService.php:116
+#: ../../../../library/Director/Web/SelfService.php:116
 msgid "This will invalidate the former key"
 msgstr "Das macht den vorherigen Schlüssel ungültig"
 
-#: library/Director/Web/SelfService.php:246
+#: ../../../../library/Director/Web/Widget/BranchedObjectHint.php:32
+msgid "This will not be part of any deployment, unless being merged"
+msgstr ""
+"Dies wird nicht Teil eines eventuellen Deployments, solange die Änderungen "
+"nicht zusammengeführt werden"
+
+#: ../../../../library/Director/Web/SelfService.php:233
 msgid "Ticket"
 msgstr "Ticket"
 
-#: application/forms/SyncRuleForm.php:21
+#: ../../../../application/forms/SyncRuleForm.php:21
 msgid "Time Period"
 msgstr "Zeitraum"
 
-#: application/forms/BasketForm.php:32
+#: ../../../../application/forms/BasketForm.php:32
 msgid "Time Periods"
 msgstr "Zeiträume"
 
-#: application/forms/IcingaUserForm.php:158
-#: application/forms/IcingaNotificationForm.php:240
-#: application/forms/DirectorJobForm.php:60
-#: application/forms/IcingaDependencyForm.php:141
+#: ../../../../application/forms/IcingaUserForm.php:158
+#: ../../../../application/forms/IcingaNotificationForm.php:288
+#: ../../../../application/forms/DirectorJobForm.php:60
+#: ../../../../application/forms/IcingaDependencyForm.php:141
 msgid "Time period"
 msgstr "Zeitraum"
 
-#: application/controllers/TimeperiodController.php:17
-#: application/controllers/ScheduledDowntimeController.php:24
+#: ../../../../application/controllers/TimeperiodController.php:17
+#: ../../../../application/controllers/ScheduledDowntimeController.php:24
 msgid "Time period ranges"
 msgstr "Zeiträume"
 
-#: application/forms/IcingaScheduledDowntimeRangeForm.php:56
+#: ../../../../application/forms/IcingaScheduledDowntimeRangeForm.php:56
 #, php-format
 msgid "Time range \"%s\" has been removed from %s"
 msgstr "Der Zeitraum \"%s\" wurden von \"%s\" entfernt"
 
-#: application/forms/SyncPropertyForm.php:321
+#: ../../../../application/forms/SyncPropertyForm.php:321
 msgid "Time ranges"
 msgstr "Zeiträume"
 
-#: application/forms/IcingaCommandForm.php:69
+#: ../../../../application/forms/IcingaCommandForm.php:69
 msgid "Timeout"
 msgstr "Timeout"
 
-#: library/Director/Dashboard/Dashlet/TimeperiodTemplateDashlet.php:13
+#: ../../../../library/Director/Dashboard/Dashlet/TimeperiodTemplateDashlet.php:15
 msgid "Timeperiod Templates"
 msgstr "Zeitraumvorlage"
 
-#: library/Director/Dashboard/Dashlet/TimeperiodObjectDashlet.php:16
-#: library/Director/Dashboard/Dashlet/TimeperiodsDashlet.php:13
-#: library/Director/Db/Branch/BranchModificationInspection.php:45
-#: library/Director/Web/Table/IcingaTimePeriodRangeTable.php:46
-#: library/Director/Web/Table/IcingaScheduledDowntimeRangeTable.php:52
-#: application/forms/IcingaScheduledDowntimeRangeForm.php:29
+#: ../../../../library/Director/Dashboard/Dashlet/TimeperiodObjectDashlet.php:17
+#: ../../../../library/Director/Dashboard/Dashlet/TimeperiodsDashlet.php:15
+#: ../../../../library/Director/Db/Branch/BranchModificationInspection.php:45
+#: ../../../../library/Director/Web/Table/IcingaTimePeriodRangeTable.php:46
+#: ../../../../library/Director/Web/Table/IcingaScheduledDowntimeRangeTable.php:52
+#: ../../../../application/forms/IcingaScheduledDowntimeRangeForm.php:29
 msgid "Timeperiods"
 msgstr "Zeiträume"
 
-#: application/forms/IcingaTimePeriodRangeForm.php:28
+#: ../../../../application/forms/IcingaTimePeriodRangeForm.php:28
 msgid "Timerperiods"
 msgstr "Zeiträume"
 
-#: library/Director/Web/Table/ImportrunTable.php:31
+#: ../../../../library/Director/Web/Table/ImportrunTable.php:31
 msgid "Timestamp"
 msgstr "Zeitstempel"
 
-#: library/Director/DataType/DataTypeDictionary.php:28
+#: ../../../../library/Director/DataType/DataTypeDictionary.php:28
 msgid "To be managed on objects only"
 msgstr "Kann nur auf Objekten verwaltet werden"
 
-#: application/forms/SelfServiceSettingsForm.php:59
-#: application/forms/SelfServiceSettingsForm.php:167
+#: ../../../../application/forms/SelfServiceSettingsForm.php:59
+#: ../../../../application/forms/SelfServiceSettingsForm.php:167
 msgid ""
 "To ensure downloaded packages are build by the Icinga Team and not "
 "compromised by third parties, you will be able to provide an array of SHA1 "
@@ -6730,87 +6839,91 @@ msgstr ""
 "keinem davon entspricht, wird das Powershell-Modul sich weigern mit Update "
 "oder Installation des Agenten fortzufahren"
 
-#: library/Director/Web/SelfService.php:221
+#: ../../../../library/Director/Field/FormFieldSuggestion.php:86
+msgid "Toggles (boolean arguments)"
+msgstr "Schalter (boolsche Argumente)"
+
+#: ../../../../library/Director/Web/SelfService.php:208
 msgid "Top Down"
 msgstr "Top Down"
 
-#: library/Director/Web/Table/TemplateUsageTable.php:57
+#: ../../../../library/Director/Web/Table/TemplateUsageTable.php:57
 msgid "Total"
 msgstr "Gesamt"
 
-#: application/forms/SelfServiceSettingsForm.php:31
+#: ../../../../application/forms/SelfServiceSettingsForm.php:31
 msgid "Transform Host Name"
 msgstr "Hostname transformieren"
 
-#: application/forms/SelfServiceSettingsForm.php:43
+#: ../../../../application/forms/SelfServiceSettingsForm.php:43
 msgid "Transform Parent Host to IP"
 msgstr "Elternhost in IP umwandeln"
 
-#: application/forms/SelfServiceSettingsForm.php:37
+#: ../../../../application/forms/SelfServiceSettingsForm.php:37
 msgid "Transform to lowercase"
 msgstr "In Kleinbuchstaben umwandeln"
 
-#: application/forms/SelfServiceSettingsForm.php:38
+#: ../../../../application/forms/SelfServiceSettingsForm.php:38
 msgid "Transform to uppercase"
 msgstr "In Großbuchstaben umwandeln"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1673
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1676
 msgid "Transition types"
 msgstr "Änderungsstypen"
 
-#: library/Director/Web/ActionBar/TemplateActionBar.php:30
+#: ../../../../library/Director/Web/ActionBar/TemplateActionBar.php:30
 msgid "Tree"
 msgstr "Baum"
 
-#: application/forms/ImportRunForm.php:23
+#: ../../../../application/forms/ImportRunForm.php:23
 msgid "Trigger Import Run"
 msgstr "Importlauf anstoßen"
 
-#: application/forms/SyncRunForm.php:37
+#: ../../../../application/forms/SyncRunForm.php:37
 msgid "Trigger this Sync"
 msgstr "Diese Synchronisation anstoßen"
 
-#: application/forms/ImportRunForm.php:45
+#: ../../../../application/forms/ImportRunForm.php:45
 msgid "Triggering this Import Source failed"
 msgstr "Anstoßen dieser Importquelle schlug fehl"
 
-#: library/Director/PropertyModifier/PropertyModifierTrim.php:16
+#: ../../../../library/Director/PropertyModifier/PropertyModifierTrim.php:16
 msgid "Trim Method"
 msgstr "Trim-Methode"
 
-#: library/Director/Dashboard/Dashlet/SettingsDashlet.php:17
+#: ../../../../library/Director/Dashboard/Dashlet/SettingsDashlet.php:19
 msgid "Tweak some global Director settings"
 msgstr "Einige globale Director-Einstellungen anpassen"
 
-#: library/Director/Web/Table/CoreApiFieldsTable.php:80
-#: library/Director/Web/Table/ObjectsTableEndpoint.php:22
+#: ../../../../library/Director/Web/Table/CoreApiFieldsTable.php:80
+#: ../../../../library/Director/Web/Table/ObjectsTableEndpoint.php:22
 msgid "Type"
 msgstr "Typ"
 
-#: application/controllers/InspectController.php:82
+#: ../../../../application/controllers/InspectController.php:82
 msgid "Type attributes"
 msgstr "Typ-Attribute"
 
-#: library/Director/PropertyModifier/PropertyModifierParseURL.php:27
-#: library/Director/PropertyModifier/PropertyModifierParseURL.php:28
+#: ../../../../library/Director/PropertyModifier/PropertyModifierParseURL.php:27
+#: ../../../../library/Director/PropertyModifier/PropertyModifierParseURL.php:28
 msgid "URL component"
 msgstr "URL- Komponente"
 
-#: library/Director/PropertyModifier/PropertyModifierUuidBinToHex.php:12
+#: ../../../../library/Director/PropertyModifier/PropertyModifierUuidBinToHex.php:12
 msgid "UUID: from binary to hex"
 msgstr "UUID: binär in hexadezimal umwandeln"
 
-#: application/forms/DeployFormsBug7530.php:72
+#: ../../../../application/forms/DeployFormsBug7530.php:72
 msgid "Unable to detect your Icinga 2 Core version"
 msgstr "Die Icinga 2 Core-Version konnte nicht ermittelt werden"
 
-#: library/Director/DataType/DataTypeSqlQuery.php:27
-#: application/forms/SyncPropertyForm.php:168
+#: ../../../../library/Director/DataType/DataTypeSqlQuery.php:27
+#: ../../../../application/forms/SyncPropertyForm.php:168
 #, php-format
 msgid "Unable to fetch data: %s"
 msgstr "Daten konnten nicht geholt werden: %s"
 
-#: application/forms/IcingaHostForm.php:383
+#: ../../../../application/forms/IcingaHostForm.php:385
 msgid ""
 "Unable to store a host with the given properties because of insufficient "
 "permissions"
@@ -6818,7 +6931,7 @@ msgstr ""
 "Ein Host konnte aufgrund unzureichender Berechtigungen nicht mit den "
 "gegebenen Eigenschaften abgespeichert werden"
 
-#: application/forms/KickstartForm.php:316
+#: ../../../../application/forms/KickstartForm.php:316
 #, php-format
 msgid ""
 "Unable to store the configuration to \"%s\". Please check file permissions "
@@ -6828,11 +6941,11 @@ msgstr ""
 "Dateisystemberechtigungen prüfen oder den unten angegebenen Inhalt manuell "
 "speichern"
 
-#: library/Director/Db/Housekeeping.php:49
+#: ../../../../library/Director/Db/Housekeeping.php:49
 msgid "Undeployed configurations"
 msgstr "Nicht ausgerollte Konfigurationen"
 
-#: application/forms/IcingaNotificationForm.php:221
+#: ../../../../application/forms/IcingaNotificationForm.php:269
 msgid ""
 "Unit is seconds unless a suffix is given. Supported suffixes include ms "
 "(milliseconds), s (seconds), m (minutes), h (hours) and d (days)."
@@ -6842,86 +6955,91 @@ msgstr ""
 "(Millisekunden), s (Sekunden), m (Minuten), h (Stunden) and d (Tage). Um "
 "\"90 Minuten\" auszudrücken könnte man 1h 30m schreiben."
 
-#: library/Director/IcingaConfig/StateFilterSet.php:27
+#: ../../../../library/Director/IcingaConfig/StateFilterSet.php:27
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: library/Director/Web/Widget/DeploymentInfo.php:136
+#: ../../../../library/Director/Web/Widget/DeploymentInfo.php:137
 msgid "Unknown, failed to collect related information"
 msgstr "Unbekannt, entsprechende Information konnte nicht gesammelt werden"
 
-#: library/Director/Web/Widget/DeploymentInfo.php:134
+#: ../../../../library/Director/Web/Widget/DeploymentInfo.php:135
 msgid "Unknown, still waiting for config check outcome"
 msgstr "Unbekannt, warte auf Ergebnis der Konfigurationsprüfung"
 
-#: library/Director/Db/Housekeeping.php:53
+#: ../../../../library/Director/Db/Housekeeping.php:53
 msgid "Unlinked imported properties"
 msgstr "Nicht-verknüpfte importierte Eigenschaften"
 
-#: library/Director/Db/Housekeeping.php:51
+#: ../../../../library/Director/Db/Housekeeping.php:51
 msgid "Unlinked imported row sets"
 msgstr "Nicht-verknüpfte importierte Zeilensets"
 
-#: library/Director/Db/Housekeeping.php:52
+#: ../../../../library/Director/Db/Housekeeping.php:52
 msgid "Unlinked imported rows"
 msgstr "Nicht-verknüpfte importierte Zeilen"
 
-#: application/controllers/PhperrorController.php:22
-#: application/controllers/PhperrorController.php:37
+#: ../../../../application/controllers/PhperrorController.php:22
+#: ../../../../application/controllers/PhperrorController.php:37
 msgid "Unsatisfied dependencies"
 msgstr "Unerfüllte Abhängigkeiten"
 
-#: library/Director/Db/Housekeeping.php:50
+#: ../../../../library/Director/Db/Housekeeping.php:50
 msgid "Unused rendered files"
 msgstr "Nicht verwendete, generierte Dateien"
 
-#: library/Director/IcingaConfig/StateFilterSet.php:20
+#: ../../../../library/Director/IcingaConfig/StateFilterSet.php:20
 msgid "Up"
 msgstr "Up"
 
-#: application/forms/IcingaTimePeriodForm.php:25
+#: ../../../../application/forms/IcingaTimePeriodForm.php:25
 msgid "Update Method"
 msgstr "Aktualisierungsmethode"
 
-#: application/forms/SyncRuleForm.php:52
+#: ../../../../application/forms/SyncRuleForm.php:52
 msgid "Update Policy"
 msgstr "Aktualisierungsrichtlinie"
 
-#: application/forms/SyncRuleForm.php:65
+#: ../../../../application/forms/SyncRuleForm.php:65
 msgid "Update only"
 msgstr "Nur aktualisieren"
 
-#: application/forms/DeployFormsBug7530.php:109
+#: ../../../../application/forms/DeployFormsBug7530.php:109
 msgid "Upgrading Icinga 2 - Confic Sync: Zones in Zones"
 msgstr "Upgrading Icinga 2 - Confic Sync: Zones in Zones"
 
-#: application/forms/DeployFormsBug7530.php:111
+#: ../../../../application/forms/DeployFormsBug7530.php:111
 msgid "Upgrading documentation"
 msgstr "Upgrading-Dokumentation"
 
-#: application/forms/BasketUploadForm.php:43
-#: application/controllers/BasketsController.php:26
+#: ../../../../application/forms/BasketUploadForm.php:45
+#: ../../../../application/controllers/BasketsController.php:26
+#: ../../../../application/controllers/BasketController.php:169
 msgid "Upload"
 msgstr "Hochladen"
 
-#: application/controllers/BasketController.php:122
+#: ../../../../application/controllers/BasketController.php:120
 msgid "Upload a Basket"
 msgstr "Basket hochladen"
 
-#: application/controllers/BasketController.php:123
+#: ../../../../application/controllers/BasketController.php:121
 msgid "Upload a Configuration Basket"
 msgstr "Konfigurationsbasket hochladen"
 
-#: library/Director/Web/Controller/ObjectController.php:367
+#: ../../../../application/controllers/BasketController.php:140
+msgid "Upload a Configuration Basket Snapshot"
+msgstr "Schnappschuss eines Konfigurationsbaskets hochladen"
+
+#: ../../../../library/Director/Web/Controller/ObjectController.php:370
 msgid "Usage"
 msgstr "Benutzung"
 
-#: library/Director/Web/Widget/AdditionalTableActions.php:101
+#: ../../../../library/Director/Web/Widget/AdditionalTableActions.php:102
 #, php-format
 msgid "Usage (%s)"
 msgstr "Benutzung (%s)"
 
-#: application/forms/IcingaHostForm.php:106
+#: ../../../../application/forms/IcingaHostForm.php:108
 msgid ""
 "Use a different name for the generated endpoint object than the host name "
 "and add a custom variable to allow services setting the correct command "
@@ -6931,43 +7049,47 @@ msgstr ""
 "Endpunktobjekt und füge eine benutzerdefinierte Variable hinzu, welche es "
 "Services erlaubt, den korrekten Commandendpunkt zu setzen."
 
-#: application/forms/SelfServiceSettingsForm.php:84
+#: ../../../../application/forms/SelfServiceSettingsForm.php:84
 msgid "Use a local file or network share"
 msgstr "Benutze eine lokales Verzeichnis oder eine Netzwerkfreigabe"
 
-#: library/Director/PropertyModifier/PropertyModifierUpperCaseFirst.php:18
+#: ../../../../library/Director/PropertyModifier/PropertyModifierUpperCaseFirst.php:18
 msgid "Use lowercase first"
 msgstr "Erst in Kleinbuchstaben umwandeln"
 
-#: application/forms/SyncPropertyForm.php:273
+#: ../../../../application/forms/SyncPropertyForm.php:273
 msgid "Used sources"
 msgstr "Verwendete Quellen"
 
-#: library/Director/TranslationDummy.php:17
-#: application/forms/SyncRuleForm.php:17
+#: ../../../../library/Director/TranslationDummy.php:17
+#: ../../../../application/forms/SyncRuleForm.php:17
 msgid "User"
 msgstr "Benutzer"
 
-#: application/forms/SyncRuleForm.php:18
+#: ../../../../application/forms/SyncRuleForm.php:18
 msgid "User Group"
 msgstr "Benutzergruppe"
 
-#: library/Director/Dashboard/Dashlet/UserGroupsDashlet.php:11
-#: application/forms/BasketForm.php:27
+#: ../../../../library/Director/Dashboard/Dashlet/UserGroupsDashlet.php:13
+#: ../../../../application/forms/BasketForm.php:27
 msgid "User Groups"
 msgstr "Benutzergruppen"
 
-#: library/Director/Dashboard/Dashlet/UserTemplateDashlet.php:13
-#: application/forms/BasketForm.php:28
+#: ../../../../application/forms/IcingaNotificationForm.php:178
+msgid "User Groups Custom Variable"
+msgstr "Variable für Benutzergruppen"
+
+#: ../../../../library/Director/Dashboard/Dashlet/UserTemplateDashlet.php:15
+#: ../../../../application/forms/BasketForm.php:28
 msgid "User Templates"
 msgstr "Benutzervorlagen"
 
-#: library/Director/DataType/DataTypeDirectorObject.php:63
-#: application/forms/IcingaNotificationForm.php:156
+#: ../../../../library/Director/DataType/DataTypeDirectorObject.php:63
+#: ../../../../application/forms/IcingaNotificationForm.php:169
 msgid "User groups"
 msgstr "Benutzergruppen"
 
-#: application/forms/IcingaUserForm.php:113
+#: ../../../../application/forms/IcingaUserForm.php:113
 msgid ""
 "User groups that should be directly assigned to this user. Groups can be "
 "useful for various reasons. You might prefer to send notifications to groups "
@@ -6977,54 +7099,60 @@ msgstr ""
 "Gruppen können für verschiedene Aufgaben verwendet werden. Eventuell ist es "
 "besser, Benachrichtigungen an Gruppen statt an einzelne Benutzer zu schicken"
 
-#: application/forms/IcingaNotificationForm.php:158
+#: ../../../../application/forms/IcingaNotificationForm.php:171
 msgid "User groups that should be notified by this notifications"
 msgstr ""
 "Benutzergruppen, die durch diese Benachrichtigungen verständigt werden sollen"
 
-#: application/forms/IcingaUserForm.php:194
+#: ../../../../application/forms/IcingaUserForm.php:194
 msgid "User properties"
 msgstr "Benutzereigenschaften"
 
-#: application/forms/IcingaUserForm.php:22
+#: ../../../../application/forms/IcingaUserForm.php:22
 msgid "User template name"
 msgstr "Benutzervorlagenname"
 
-#: application/forms/IcingaUserGroupForm.php:17
+#: ../../../../application/forms/IcingaUserGroupForm.php:17
 msgid "Usergroup"
 msgstr "Benutzergruppe"
 
-#: library/Director/Db/Branch/BranchModificationInspection.php:44
-#: library/Director/Import/ImportSourceCoreApi.php:63
+#: ../../../../library/Director/Db/Branch/BranchModificationInspection.php:44
+#: ../../../../library/Director/Import/ImportSourceCoreApi.php:63
 msgid "Usergroups"
 msgstr "Benutzergruppen"
 
-#: library/Director/Import/ImportSourceRestApi.php:226
-#: library/Director/Web/Widget/BackgroundDaemonDetails.php:74
-#: application/forms/IcingaUserForm.php:28
+#: ../../../../library/Director/Import/ImportSourceRestApi.php:226
+#: ../../../../library/Director/Web/Widget/BackgroundDaemonDetails.php:74
+#: ../../../../application/forms/IcingaUserForm.php:28
 msgid "Username"
 msgstr "Benutzername"
 
-#: library/Director/DataType/DataTypeDirectorObject.php:62
-#: library/Director/Db/Branch/BranchModificationInspection.php:43
-#: library/Director/Import/ImportSourceCoreApi.php:62
-#: library/Director/Web/Table/CustomvarVariantsTable.php:62
-#: library/Director/Web/Table/CustomvarTable.php:47
-#: application/forms/IcingaNotificationForm.php:131
-#: application/forms/BasketForm.php:29
+#: ../../../../library/Director/DataType/DataTypeDirectorObject.php:62
+#: ../../../../library/Director/Db/Branch/BranchModificationInspection.php:43
+#: ../../../../library/Director/Import/ImportSourceCoreApi.php:62
+#: ../../../../library/Director/Web/Table/CustomvarVariantsTable.php:62
+#: ../../../../library/Director/Web/Table/CustomvarTable.php:47
+#: ../../../../application/forms/IcingaNotificationForm.php:126
+#: ../../../../application/forms/IcingaNotificationForm.php:132
+#: ../../../../application/forms/IcingaNotificationForm.php:163
+#: ../../../../application/forms/BasketForm.php:29
 msgid "Users"
 msgstr "Benutzer"
 
-#: library/Director/Dashboard/Dashlet/UserObjectDashlet.php:16
-#: library/Director/Dashboard/Dashlet/UsersDashlet.php:13
+#: ../../../../library/Director/Dashboard/Dashlet/UserObjectDashlet.php:13
+#: ../../../../library/Director/Dashboard/Dashlet/UsersDashlet.php:15
 msgid "Users / Contacts"
 msgstr "Benutzer / Kontakte"
 
-#: application/forms/IcingaNotificationForm.php:133
+#: ../../../../application/forms/IcingaNotificationForm.php:141
+msgid "Users Custom Variable"
+msgstr "Variable für Benutzer"
+
+#: ../../../../application/forms/IcingaNotificationForm.php:134
 msgid "Users that should be notified by this notifications"
 msgstr "Benutzer, die durch diese Benachrichtigungen verständigt werden sollen"
 
-#: library/Director/Dashboard/Dashlet/ServiceApplyRulesDashlet.php:17
+#: ../../../../library/Director/Dashboard/Dashlet/ServiceApplyRulesDashlet.php:19
 msgid ""
 "Using Apply Rules a Service can be applied to multiple hosts at once, based "
 "on filters dealing with any combination of their properties"
@@ -7033,55 +7161,55 @@ msgstr ""
 "werden, und zwar basierend auf Filtern welche einzelne oder mehrere "
 "Eigenschaften derselben kombinieren"
 
-#: application/forms/IcingaHostForm.php:336
-#: application/forms/IcingaHostSelfServiceForm.php:44
+#: ../../../../application/forms/IcingaHostSelfServiceForm.php:44
+#: ../../../../application/forms/IcingaHostForm.php:338
 msgid "Usually your hosts main IPv6 address"
 msgstr "Üblicherweise die Haupt-IPv6-Adresse des Hosts"
 
-#: library/Director/Web/Table/BranchedIcingaCommandArgumentTable.php:47
-#: library/Director/Web/Table/IcingaCommandArgumentTable.php:50
-#: application/forms/IcingaServiceVarForm.php:27
-#: application/forms/IcingaCommandArgumentForm.php:50
-#: application/forms/IcingaCommandArgumentForm.php:59
-#: application/forms/CustomvarForm.php:21
-#: application/forms/IcingaHostVarForm.php:27
+#: ../../../../library/Director/Web/Table/BranchedIcingaCommandArgumentTable.php:47
+#: ../../../../library/Director/Web/Table/IcingaCommandArgumentTable.php:50
+#: ../../../../application/forms/IcingaServiceVarForm.php:27
+#: ../../../../application/forms/IcingaCommandArgumentForm.php:50
+#: ../../../../application/forms/IcingaCommandArgumentForm.php:59
+#: ../../../../application/forms/CustomvarForm.php:21
+#: ../../../../application/forms/IcingaHostVarForm.php:27
 msgid "Value"
 msgstr "Wert"
 
-#: application/forms/IcingaCommandArgumentForm.php:36
+#: ../../../../application/forms/IcingaCommandArgumentForm.php:36
 msgid "Value type"
 msgstr "Werttyp"
 
-#: library/Director/Web/Table/CustomvarVariantsTable.php:56
+#: ../../../../library/Director/Web/Table/CustomvarVariantsTable.php:56
 msgid "Variable Value"
 msgstr "Variablenwert"
 
-#: library/Director/Web/Table/CustomvarTable.php:41
-#: application/forms/CustomvarForm.php:16
+#: ../../../../library/Director/Web/Table/CustomvarTable.php:41
+#: ../../../../application/forms/CustomvarForm.php:16
 msgid "Variable name"
 msgstr "Variablenname"
 
-#: library/Director/Import/ImportSourceRestApi.php:176
+#: ../../../../library/Director/Import/ImportSourceRestApi.php:176
 msgid "Verify Host"
 msgstr "Host überprüfen"
 
-#: library/Director/Import/ImportSourceRestApi.php:169
+#: ../../../../library/Director/Import/ImportSourceRestApi.php:169
 msgid "Verify Peer"
 msgstr "Peer  überprüfen"
 
-#: library/Director/DataType/DataTypeString.php:24
+#: ../../../../library/Director/DataType/DataTypeString.php:24
 msgid "Visibility"
 msgstr "Sichtbarkeit"
 
-#: library/Director/DataType/DataTypeString.php:26
+#: ../../../../library/Director/DataType/DataTypeString.php:26
 msgid "Visible"
 msgstr "Sichtbar"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1486
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1489
 msgid "Volatile"
 msgstr "Sprunghaft (Volatile)"
 
-#: application/forms/IcingaCommandForm.php:80
+#: ../../../../application/forms/IcingaCommandForm.php:80
 msgid ""
 "WARNING, this can allow shell script injection via custom variables used in "
 "command."
@@ -7089,13 +7217,13 @@ msgstr ""
 "VORSICHT, hiermit schafft man die Möglichkeit über benutzerdefinierte "
 "Variablen Shell-Code in Kommandos zu injizieren."
 
-#: library/Director/Dashboard/InfrastructureDashboard.php:50
+#: ../../../../library/Director/Dashboard/InfrastructureDashboard.php:50
 #, php-format
 msgid "Want to connect to your Icinga Agents? Have a look at our %s!"
 msgstr ""
 "Sollen Icinga Agents verbunden werden? Riskieren einen Blick in unsere %s!"
 
-#: library/Director/Dashboard/TimeperiodsDashboard.php:20
+#: ../../../../library/Director/Dashboard/TimeperiodsDashboard.php:20
 msgid ""
 "Want to define to execute specific checks only withing specific time "
 "periods? Get mobile notifications only out of office hours, but mail "
@@ -7107,11 +7235,11 @@ msgstr ""
 "Alarmierung via E-Mail rund um die Uhr? Zeiträume erlauben es, diese und "
 "ähnliche Anforderungen zu erfüllen."
 
-#: library/Director/IcingaConfig/StateFilterSet.php:25
+#: ../../../../library/Director/IcingaConfig/StateFilterSet.php:25
 msgid "Warning"
 msgstr "Warnung"
 
-#: application/forms/DeployFormsBug7530.php:94
+#: ../../../../application/forms/DeployFormsBug7530.php:94
 #, php-format
 msgid ""
 "Warning: you're running Icinga v2.11.0 and our configuration looks like you "
@@ -7123,7 +7251,7 @@ msgstr ""
 "Lösung. Das GitHub-Issue und unsere %s enthalten weiterführende "
 "Informationen."
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1129
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1132
 msgid ""
 "What kind of object this should be. Templates allow full access to any "
 "property, they are your building blocks for \"real\" objects. External "
@@ -7140,7 +7268,7 @@ msgstr ""
 "erlauben das Zuweisen von Services, Benachrichtigungen und Gruppen an andere "
 "Objekte."
 
-#: library/Director/PropertyModifier/PropertyModifierMap.php:28
+#: ../../../../library/Director/PropertyModifier/PropertyModifierMap.php:29
 msgid ""
 "What should happen if the lookup key does not exist in the data list? You "
 "could return a null value, keep the unmodified imported value or interrupt "
@@ -7150,24 +7278,24 @@ msgstr ""
 "befindet? Es kann ein null Wert zurückgegeben werden, der importierte Wert "
 "unverändert übernommen oder der Importvorgang unterbrochen werden"
 
-#: library/Director/PropertyModifier/PropertyModifierSplit.php:24
-#: library/Director/PropertyModifier/PropertyModifierRegexSplit.php:24
+#: ../../../../library/Director/PropertyModifier/PropertyModifierRegexSplit.php:24
+#: ../../../../library/Director/PropertyModifier/PropertyModifierSplit.php:24
 msgid "What should happen when the given string is empty?"
 msgstr "Was soll passieren wenn der übergebene String leer ist?"
 
-#: library/Director/PropertyModifier/PropertyModifierArrayFilter.php:66
+#: ../../../../library/Director/PropertyModifier/PropertyModifierArrayFilter.php:66
 msgid "What should happen when the result array is empty?"
 msgstr "Was soll passieren wenn das resultierende Array leer ist?"
 
-#: library/Director/PropertyModifier/PropertyModifierArrayElementByPosition.php:51
+#: ../../../../library/Director/PropertyModifier/PropertyModifierArrayElementByPosition.php:51
 msgid "What should happen when the specified element is not available?"
 msgstr "Was soll passieren wenn das spezifizierte Element nicht verfügbar ist?"
 
-#: library/Director/PropertyModifier/PropertyModifierArrayFilter.php:53
+#: ../../../../library/Director/PropertyModifier/PropertyModifierArrayFilter.php:53
 msgid "What should happen with matching elements?"
 msgstr "Was soll mit passenden Elementen passieren?"
 
-#: library/Director/PropertyModifier/PropertyModifierRejectOrSelect.php:68
+#: ../../../../library/Director/PropertyModifier/PropertyModifierRejectOrSelect.php:68
 msgid ""
 "What should happen with the row, when this property matches the given "
 "expression?"
@@ -7175,54 +7303,58 @@ msgstr ""
 "Was soll mit der Zeile passieren, wenn der gegebene Ausdruck auf diese "
 "Eigenschaft zutrifft?"
 
-#: library/Director/PropertyModifier/PropertyModifierDnsRecords.php:32
+#: ../../../../library/Director/PropertyModifier/PropertyModifierRegexReplace.php:29
+msgid "What should happen, if the given pattern doesn't match"
+msgstr "Was soll passieren, wenn das Muster nicht zutrifft?"
+
+#: ../../../../library/Director/PropertyModifier/PropertyModifierDnsRecords.php:32
 msgid "What should we do if the DNS lookup fails?"
 msgstr "Was soll geschehen, wenn die (DNS) Auflösung fehlschlägt?"
 
-#: library/Director/PropertyModifier/PropertyModifierParseURL.php:36
+#: ../../../../library/Director/PropertyModifier/PropertyModifierParseURL.php:36
 msgid ""
 "What should we do if the URL could not get parsed or component not found?"
 msgstr ""
 "Was soll mit der URL geschehen, wenn sie nicht geparsed werden kann oder "
 "aber Komponenten davon nicht gefunden werden?"
 
-#: library/Director/PropertyModifier/PropertyModifierExtractFromDN.php:28
+#: ../../../../library/Director/PropertyModifier/PropertyModifierExtractFromDN.php:28
 msgid "What should we do if the desired part does not exist?"
 msgstr "Was soll geschehen, wenn der gewünschte Teil nicht existiert?"
 
-#: library/Director/PropertyModifier/PropertyModifierGetHostByAddr.php:15
-#: library/Director/PropertyModifier/PropertyModifierGetHostByName.php:15
+#: ../../../../library/Director/PropertyModifier/PropertyModifierGetHostByAddr.php:15
+#: ../../../../library/Director/PropertyModifier/PropertyModifierGetHostByName.php:15
 msgid "What should we do if the host (DNS) lookup fails?"
 msgstr "Was soll geschehen, wenn die (DNS) Auflösung fehlschlägt?"
 
-#: library/Director/PropertyModifier/PropertyModifierArrayToRow.php:21
-#: library/Director/PropertyModifier/PropertyModifierDictionaryToRow.php:28
+#: ../../../../library/Director/PropertyModifier/PropertyModifierDictionaryToRow.php:28
+#: ../../../../library/Director/PropertyModifier/PropertyModifierArrayToRow.php:21
 msgid "What should we do in case the given value is empty?"
 msgstr "Was soll passieren wenn der übergebene Wert leer ist?"
 
-#: library/Director/PropertyModifier/PropertyModifierJsonDecode.php:22
+#: ../../../../library/Director/PropertyModifier/PropertyModifierJsonDecode.php:22
 msgid "What should we do in case we are unable to decode the given string?"
 msgstr ""
 "Was soll geschehen, wenn sich der übergebene String nicht dekodieren lässt?"
 
-#: library/Director/PropertyModifier/PropertyModifierListToObject.php:24
+#: ../../../../library/Director/PropertyModifier/PropertyModifierListToObject.php:24
 msgid "What should we do, if the same key occurs twice?"
 msgstr "Was soll geschehen, wenn derselbe Schlüssel zweimal auftaucht?"
 
-#: library/Director/PropertyModifier/PropertyModifierExtractFromDN.php:16
+#: ../../../../library/Director/PropertyModifier/PropertyModifierExtractFromDN.php:16
 msgid "What should we extract from the DN?"
 msgstr "Was soll aus dem DN extrahiert werden?"
 
-#: application/forms/BasketForm.php:61
+#: ../../../../application/forms/BasketForm.php:61
 msgid ""
 "What should we place into this Basket every time we create new snapshot?"
 msgstr "Was sollen wir beim Erstellen eines Snapshots in diesen Basket geben?"
 
-#: application/forms/SelfServiceSettingsForm.php:21
+#: ../../../../application/forms/SelfServiceSettingsForm.php:21
 msgid "What to use as your Icinga 2 Agent's Host Name"
 msgstr "Was soll als Hostname für den Icinga-2-Agent genutzt werden?"
 
-#: library/Director/Job/ConfigJob.php:59
+#: ../../../../library/Director/Job/ConfigJob.php:59
 msgid ""
 "When deploying configuration, wait at least this amount of seconds unless "
 "the next deployment should take place"
@@ -7230,22 +7362,26 @@ msgstr ""
 "Beim Ausrollen einer Konfiguration mindestens diese Anzahl an Sekunden "
 "warten, bevor das nächste Ausrollen durchgeführt wird"
 
-#: library/Director/PropertyModifier/PropertyModifierArrayFilter.php:63
-#: library/Director/PropertyModifier/PropertyModifierSplit.php:21
-#: library/Director/PropertyModifier/PropertyModifierRegexSplit.php:21
-#: library/Director/PropertyModifier/PropertyModifierDictionaryToRow.php:27
+#: ../../../../library/Director/PropertyModifier/PropertyModifierArrayFilter.php:63
+#: ../../../../library/Director/PropertyModifier/PropertyModifierDictionaryToRow.php:27
+#: ../../../../library/Director/PropertyModifier/PropertyModifierRegexSplit.php:21
+#: ../../../../library/Director/PropertyModifier/PropertyModifierSplit.php:21
 msgid "When empty"
 msgstr "Falls leer"
 
-#: library/Director/PropertyModifier/PropertyModifierArrayElementByPosition.php:48
+#: ../../../../library/Director/PropertyModifier/PropertyModifierArrayElementByPosition.php:48
 msgid "When not available"
 msgstr "Wenn nicht verfügbar"
 
-#: application/forms/IcingaNotificationForm.php:210
+#: ../../../../library/Director/PropertyModifier/PropertyModifierRegexReplace.php:27
+msgid "When not matched"
+msgstr "Wenn nicht zugetroffen"
+
+#: ../../../../application/forms/IcingaNotificationForm.php:258
 msgid "When the last notification should be sent"
 msgstr "Wann die letzte Nachricht versenderwerden"
 
-#: library/Director/Dashboard/InfrastructureDashboard.php:44
+#: ../../../../library/Director/Dashboard/InfrastructureDashboard.php:44
 msgid ""
 "When you feel the desire to manually create Zone or Endpoint objects please "
 "rethink this twice. Doing so is mostly the wrong way, might lead to a dead "
@@ -7255,11 +7391,11 @@ msgstr ""
 "zweimal überdenken. Das ist meistens der falsche Weg, kann in Sackgassen "
 "führen und damit eine Menge Arbeit beim manuellen Aufräumen verursachen."
 
-#: library/Director/PropertyModifier/PropertyModifierTrim.php:17
+#: ../../../../library/Director/PropertyModifier/PropertyModifierTrim.php:17
 msgid "Where to trim the string(s)"
 msgstr "Wo String(s) gestutzt werden soll"
 
-#: application/forms/IcingaScheduledDowntimeForm.php:104
+#: ../../../../application/forms/IcingaScheduledDowntimeForm.php:104
 msgid ""
 "Whether Downtimes should also explicitly be scheduled for all Services "
 "belonging to affected Hosts"
@@ -7267,15 +7403,15 @@ msgstr ""
 "Ob Downtimes zudem explizit auch für alle zu den betroffenen Hosts gehörigen "
 "Services eingeplant werden sollen"
 
-#: application/forms/SettingsForm.php:63
+#: ../../../../application/forms/SettingsForm.php:63
 msgid "Whether all configured Jobs should be disabled"
 msgstr "Ob alle konfigurierten Jobs deaktiviert werden sollen"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1459
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1462
 msgid "Whether flap detection is enabled on this object"
 msgstr "Ob die Flapping-Erkennung für dieses Objekt aktiviert werden soll"
 
-#: library/Director/Job/ConfigJob.php:33
+#: ../../../../library/Director/Job/ConfigJob.php:33
 msgid ""
 "Whether rendering should be forced. If not enforced, this job re-renders the "
 "configuration only when there have been activities since the last rendered "
@@ -7285,12 +7421,12 @@ msgstr ""
 "Konfiguration nur erstellt, falls seit dem letzten Erstellen Aktivitäten "
 "durchgeführt wurden"
 
-#: application/forms/IcingaHostForm.php:94
+#: ../../../../application/forms/IcingaHostForm.php:96
 msgid "Whether the agent is configured to accept config"
 msgstr ""
 "Ja, falls der Agent so konfiguriert ist, dass er Konfiguration akzeptiert"
 
-#: application/forms/IcingaCommandArgumentForm.php:42
+#: ../../../../application/forms/IcingaCommandArgumentForm.php:42
 msgid ""
 "Whether the argument value is a string (allowing macros like $host$) or an "
 "Icinga DSL lambda function (will be enclosed with {{ ... }}"
@@ -7298,7 +7434,7 @@ msgstr ""
 "Ist der Wert des Arguments eine Zeichenkette (erlaubt Makros wie $host$) "
 "oder eine Icinga-DSL-Lambda-Funktion? (wird in {{ ... }} eingeschlossen"
 
-#: application/forms/IcingaServiceForm.php:680
+#: ../../../../application/forms/IcingaServiceForm.php:684
 msgid ""
 "Whether the check commmand for this service should be executed on the Icinga "
 "agent"
@@ -7306,7 +7442,7 @@ msgstr ""
 "Ob das Kommando für diesen Service auf dem Icinga-Agent ausgeführt werden "
 "soll"
 
-#: application/forms/IcingaCommandArgumentForm.php:117
+#: ../../../../application/forms/IcingaCommandArgumentForm.php:117
 msgid ""
 "Whether the parameter name should not be passed to the command. Per default, "
 "the parameter name (e.g. -H) will be appended, so no need to explicitly set "
@@ -7316,14 +7452,14 @@ msgstr ""
 "wird dieser (z.B. -H) hinzugefügt, es ist also nicht erforderlich dies "
 "explizit auf \"Nein\" zu setzen."
 
-#: application/forms/IcingaHostForm.php:88
+#: ../../../../application/forms/IcingaHostForm.php:90
 msgid ""
 "Whether the parent (master) node should actively try to connect to this agent"
 msgstr ""
 "Soll der (Master) Knoten aktiv versuchen, sich zu diesem Agenten zu "
 "verbinden?"
 
-#: application/forms/IcingaCommandArgumentForm.php:81
+#: ../../../../application/forms/IcingaCommandArgumentForm.php:81
 msgid ""
 "Whether the set_if parameter is a string (allowing macros like $host$) or an "
 "Icinga DSL lambda function (will be enclosed with {{ ... }}"
@@ -7331,20 +7467,20 @@ msgstr ""
 "Ist der set_if Parameter eine Zeichenkette (erlaubt Makros wie $host$) oder "
 "eine Icinga-DSL-Lambda-Funktion? (wird in {{ ... }} eingeschlossen"
 
-#: application/forms/IcingaCommandArgumentForm.php:126
+#: ../../../../application/forms/IcingaCommandArgumentForm.php:126
 msgid "Whether this argument should be required"
 msgstr "Soll dieses Argument erforderlich sein?"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1487
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1490
 msgid "Whether this check is volatile."
 msgstr "Ist dieser Check sprunghaft (volatile)?"
 
-#: application/forms/IcingaDependencyForm.php:95
-#: application/forms/IcingaScheduledDowntimeForm.php:84
+#: ../../../../application/forms/IcingaDependencyForm.php:95
+#: ../../../../application/forms/IcingaScheduledDowntimeForm.php:84
 msgid "Whether this dependency should affect hosts or services"
 msgstr "Soll diese Abhängigkeit Hosts oder Services betreffen"
 
-#: application/forms/IcingaScheduledDowntimeForm.php:49
+#: ../../../../application/forms/IcingaScheduledDowntimeForm.php:49
 msgid ""
 "Whether this downtime is fixed or flexible. If unsure please check the "
 "related documentation: https://icinga.com/docs/icinga2/latest/doc/08-"
@@ -7354,19 +7490,19 @@ msgstr ""
 "Dokumentation zu Rate ziehen: https://icinga.com/docs/icinga2/latest/doc/08-"
 "advanced-topics/#downtimes"
 
-#: application/forms/IcingaObjectFieldForm.php:143
+#: ../../../../application/forms/IcingaObjectFieldForm.php:107
 msgid "Whether this field should be mandatory"
 msgstr "Soll dieses Feld Pflicht sein?"
 
-#: application/forms/IcingaHostForm.php:79
+#: ../../../../application/forms/IcingaHostForm.php:81
 msgid "Whether this host has the Icinga 2 Agent installed"
 msgstr "Hat dieser Host den Icinga-2-Agent installiert?"
 
-#: application/forms/IcingaNotificationForm.php:83
+#: ../../../../application/forms/IcingaNotificationForm.php:84
 msgid "Whether this notification should affect hosts or services"
 msgstr "Soll diese Benachrichtigung Hosts oder Services betreffen"
 
-#: application/forms/IcingaCommandArgumentForm.php:109
+#: ../../../../application/forms/IcingaCommandArgumentForm.php:109
 msgid ""
 "Whether this parameter should be repeated when multiple values (read: array) "
 "are given"
@@ -7374,7 +7510,7 @@ msgstr ""
 "Soll dieser Parameter wiederholt werden, wenn mehrere Werte (in einem Array) "
 "angegeben werden"
 
-#: library/Director/DataType/DataTypeDatalist.php:136
+#: ../../../../library/Director/DataType/DataTypeDatalist.php:136
 msgid ""
 "Whether this should be a String or an Array in the generated Icinga "
 "configuration. In case you opt for Array, Director users will be able to "
@@ -7384,7 +7520,7 @@ msgstr ""
 "sein soll. Wird Array gewählt, können Director-Benutzer mehrere Elemente aus "
 "einer Liste wählen"
 
-#: application/forms/IcingaZoneForm.php:24
+#: ../../../../application/forms/IcingaZoneForm.php:24
 msgid ""
 "Whether this zone should be available everywhere. Please note that it rarely "
 "leads to the desired result when you try to distribute global zones in "
@@ -7393,30 +7529,30 @@ msgstr ""
 "Soll diese Zone überall verfügbar sein? Beachte, dass es selten zielführend "
 "ist, globale Zonen in verteilten Umgebungen zu verteilen"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1435
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1438
 msgid "Whether to accept passive check results for this object"
 msgstr "Sollen passive Checkergebnisse für dieses Objekt akzeptiert werden?"
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1429
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1432
 msgid "Whether to actively check this object"
 msgstr "Soll dieses Objekt aktiv geprüft werden?"
 
-#: application/forms/SelfServiceSettingsForm.php:33
+#: ../../../../application/forms/SelfServiceSettingsForm.php:33
 msgid "Whether to adjust your host name"
 msgstr "Ob der Hostname angepasst werden soll"
 
-#: application/forms/SyncRuleForm.php:84
+#: ../../../../application/forms/SyncRuleForm.php:84
 msgid "Whether to delete or to disable objects subject to purge"
 msgstr "Ob zu bereinigende Objekte deaktiviert oder gelöscht werden sollen"
 
-#: application/forms/IcingaDependencyForm.php:161
+#: ../../../../application/forms/IcingaDependencyForm.php:161
 msgid ""
 "Whether to disable checks when this dependency fails. Defaults to false."
 msgstr ""
 "Ob Checks deaktiviert werden sollen, wenn diese Abhängigkeit fehlschlägt. "
 "Standardmäßig ist dies nicht der Fall."
 
-#: application/forms/IcingaDependencyForm.php:169
+#: ../../../../application/forms/IcingaDependencyForm.php:169
 msgid ""
 "Whether to disable notifications when this dependency fails. Defaults to "
 "true."
@@ -7424,11 +7560,11 @@ msgstr ""
 "Sollen Benachrichtigungen deaktiviert werden, wenn diese Abhängigkeit "
 "fehlschlägt. Standard-Einstellung ist Ja."
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1447
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1450
 msgid "Whether to enable event handlers this object"
 msgstr "Sollen Event-Handler für dieses Objekt aktiviert werden?"
 
-#: application/forms/IcingaDependencyForm.php:177
+#: ../../../../application/forms/IcingaDependencyForm.php:177
 msgid ""
 "Whether to ignore soft states for the reachability calculation. Defaults to "
 "true."
@@ -7436,17 +7572,17 @@ msgstr ""
 "Ob Soft-States für die Berechnung der Erreichbarkeit berücksichtigt werden "
 "sollen. Dies ist standardmäßig der Fall."
 
-#: application/forms/IcingaTimePeriodForm.php:77
+#: ../../../../application/forms/IcingaTimePeriodForm.php:77
 msgid "Whether to prefer timeperiods includes or excludes. Default to true."
 msgstr ""
 "Ob das Einbinden oder Ausschließen von Zeiträumen bevorzugt werden soll. "
 "Standard-Einstellung ist Ja."
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1453
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1456
 msgid "Whether to process performance data provided by this object"
 msgstr "Sollen Performancedaten von diesem Objekt verarbeitet werden?"
 
-#: application/forms/SyncRuleForm.php:72
+#: ../../../../application/forms/SyncRuleForm.php:72
 msgid ""
 "Whether to purge existing objects. This means that objects of the same type "
 "will be removed from Director in case they no longer exist at your import "
@@ -7456,20 +7592,20 @@ msgstr ""
 "desselben Typs aus dem Director entfernt werden, falls sie in der "
 "Importquelle nicht mehr vorhanden sein sollten."
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1441
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1444
 msgid "Whether to send notifications for this object"
 msgstr "Sollen Benachrichtigungen für dieses Objekt verschickt werden?"
 
-#: application/forms/IcingaUserForm.php:90
+#: ../../../../application/forms/IcingaUserForm.php:90
 msgid "Whether to send notifications for this user"
 msgstr "Sollen Benachrichtigungen für diesen Benutzer verschickt werden?"
 
-#: library/Director/Import/ImportSourceRestApi.php:130
+#: ../../../../library/Director/Import/ImportSourceRestApi.php:130
 msgid "Whether to use encryption when talking to the REST API"
 msgstr ""
 "Ob für die Verbindung zu dieser REST-API Verschlüsselung benutzt werden soll"
 
-#: library/Director/Import/ImportSourceRestApi.php:171
+#: ../../../../library/Director/Import/ImportSourceRestApi.php:171
 msgid ""
 "Whether we should check that our peer's certificate has been signed by a "
 "trusted CA. This is strongly recommended."
@@ -7478,12 +7614,12 @@ msgstr ""
 "vertrauenswürdigen Zertifizierungsstelle signiert wurde. Das wird "
 "strengstens empfohlen."
 
-#: library/Director/Import/ImportSourceRestApi.php:178
+#: ../../../../library/Director/Import/ImportSourceRestApi.php:178
 msgid "Whether we should check that the certificate matches theconfigured host"
 msgstr ""
 "Ob geprüft werden soll, dass die Zertifikate zum konfigurierten Host passen"
 
-#: application/forms/SyncPropertyForm.php:119
+#: ../../../../application/forms/SyncPropertyForm.php:119
 msgid ""
 "Whether you want to merge or replace the destination field. Makes no "
 "difference for strings"
@@ -7491,7 +7627,7 @@ msgstr ""
 "Soll das Zielfeld zusammengeführt oder ersetzt werden? Macht keinen "
 "Unterschied für Zeichenketten"
 
-#: application/forms/DirectorDatalistEntryForm.php:24
+#: ../../../../application/forms/DirectorDatalistEntryForm.php:24
 msgid ""
 "Will be stored as a custom variable value when this entry is chosen from the "
 "list"
@@ -7499,53 +7635,53 @@ msgstr ""
 "Wird als benutzerdefinierte Variable gespeichert, wenn dieser Eintrag aus "
 "der Liste gewählt wird"
 
-#: library/Director/Import/ImportSourceRestApi.php:228
+#: ../../../../library/Director/Import/ImportSourceRestApi.php:228
 msgid "Will be used to authenticate against your REST API"
 msgstr "Wird für die Authentifizierung gegen die REST-API benutzt"
 
-#: library/Director/Web/SelfService.php:247
+#: ../../../../library/Director/Web/SelfService.php:234
 msgid "Windows Kickstart Script"
 msgstr "Kickstart-Skript für Windows"
 
-#: application/forms/DirectorDatafieldForm.php:53
+#: ../../../../application/forms/DirectorDatafieldForm.php:53
 msgid "Wipe related vars"
 msgstr "Zugehörige Eigenschaften leeren"
 
-#: application/forms/IcingaScheduledDowntimeForm.php:102
+#: ../../../../application/forms/IcingaScheduledDowntimeForm.php:102
 msgid "With Services"
 msgstr "Mit Services"
 
-#: library/Director/Dashboard/Dashlet/ActivityLogDashlet.php:17
+#: ../../../../library/Director/Dashboard/Dashlet/ActivityLogDashlet.php:19
 msgid "Wondering about what changed why? Track your changes!"
 msgstr "Hier kann nachvollzogen werden, was weshalb verändert wurde."
 
-#: library/Director/Dashboard/InfrastructureDashboard.php:35
+#: ../../../../library/Director/Dashboard/InfrastructureDashboard.php:35
 msgid "Working with Agents and Config Zones"
 msgstr "Mit Agenten und Konfigurationszonen arbeiten"
 
-#: application/views/helpers/FormDataFilter.php:525
+#: ../../../../application/views/helpers/FormDataFilter.php:525
 msgid "Wrap this expression into an operator"
 msgstr "Diesen Ausdruck in einen Operator packen"
 
-#: application/forms/IcingaDeleteObjectForm.php:17
+#: ../../../../application/forms/IcingaDeleteObjectForm.php:17
 #, php-format
 msgid "YES, please delete \"%s\""
 msgstr "JA, bitte \"%s\" löschen"
 
-#: library/Director/Job/ImportJob.php:101
-#: library/Director/Job/ConfigJob.php:39
-#: library/Director/Job/ConfigJob.php:51
-#: library/Director/Job/SyncJob.php:101
-#: library/Director/PropertyModifier/PropertyModifierUpperCaseFirst.php:25
-#: application/forms/IcingaZoneForm.php:30
-#: application/forms/SettingsForm.php:59
-#: application/forms/SettingsForm.php:74
-#: application/forms/SettingsForm.php:96
-#: application/forms/SelfServiceSettingsForm.php:239
+#: ../../../../library/Director/Job/ImportJob.php:101
+#: ../../../../library/Director/Job/ConfigJob.php:39
+#: ../../../../library/Director/Job/ConfigJob.php:51
+#: ../../../../library/Director/Job/SyncJob.php:101
+#: ../../../../library/Director/PropertyModifier/PropertyModifierUpperCaseFirst.php:25
+#: ../../../../application/forms/IcingaZoneForm.php:30
+#: ../../../../application/forms/SettingsForm.php:59
+#: ../../../../application/forms/SettingsForm.php:74
+#: ../../../../application/forms/SettingsForm.php:96
+#: ../../../../application/forms/SelfServiceSettingsForm.php:239
 msgid "Yes"
 msgstr "Ja"
 
-#: application/controllers/BasketsController.php:41
+#: ../../../../application/controllers/BasketsController.php:41
 msgid ""
 "You can create Basket snapshots at any time, this will persist a serialized "
 "representation of all involved objects at that moment in time. Snapshots can "
@@ -7557,7 +7693,7 @@ msgstr ""
 "persistiert. Snapshots können exportiert, importiert, geteilt und "
 "wiederhergestellt werden - zur selben oder einer anderen Director-Instanz."
 
-#: library/Director/Web/SelfService.php:129
+#: ../../../../library/Director/Web/SelfService.php:129
 msgid ""
 "You can stop sharing a Template at any time. This will immediately "
 "invalidate the former key."
@@ -7565,8 +7701,8 @@ msgstr ""
 "Die Freigabe einer Vorlage kann jederzeit widerrufen werden. Das macht den "
 "vorherigen Schlüssel sofort ungültig."
 
-#: library/Director/Job/ImportJob.php:94
-#: library/Director/Job/SyncJob.php:94
+#: ../../../../library/Director/Job/ImportJob.php:94
+#: ../../../../library/Director/Job/SyncJob.php:94
 msgid ""
 "You could immediately apply eventual changes or just learn about them. In "
 "case you do not want them to be applied immediately, defining a job still "
@@ -7577,7 +7713,7 @@ msgstr ""
 "nicht sofort angewandt werden, ist es immer noch sinnvoll, einen Auftrag zu "
 "erstellen. Verfügbare Änderungen werden in der Director-GUI angezeigt."
 
-#: application/forms/SelfServiceSettingsForm.php:74
+#: ../../../../application/forms/SelfServiceSettingsForm.php:74
 msgid ""
 "You might want to let the generated Powershell script install the Icinga 2 "
 "Agent in an automated way. If so, please choose where your Windows nodes "
@@ -7587,7 +7723,7 @@ msgstr ""
 "Agenten automatisch installiert. Falls das gewünscht ist gilt es hier zu "
 "wühlen, von wo sich die Windows-Knoten den Agenten-Installer besorgen sollen"
 
-#: application/forms/IcingaObjectFieldForm.php:169
+#: ../../../../application/forms/IcingaObjectFieldForm.php:118
 msgid ""
 "You might want to show this field only when certain conditions are met. "
 "Otherwise it will not be available and values eventually set before will be "
@@ -7597,7 +7733,7 @@ msgstr ""
 "anzuzeigen. Treffen diese nicht zu wird es nicht angezeigt, eventuell "
 "zugehörige Eigenschaften werden beim Speichern dann auch wieder entfernt."
 
-#: application/forms/ImportRowModifierForm.php:44
+#: ../../../../application/forms/ImportRowModifierForm.php:44
 msgid ""
 "You might want to write the modified value to another (new) property. This "
 "property name can be defined here, the original property would remain "
@@ -7610,19 +7746,31 @@ msgstr ""
 "lediglich der ursprüngliche Wert an Ort und Stelle geändert werden soll, "
 "dieses Feld bitte leer lassen"
 
-#: application/controllers/SyncruleController.php:153
+#: ../../../../application/controllers/SyncruleController.php:153
 #, php-format
 msgid "You must define some %s before you can run this Sync Rule"
 msgstr ""
 "Bevor dieses Synchronisationsregel ausgeführt werden kann, müssen %s "
 "definiert werden"
 
-#: library/Director/Dashboard/BranchesDashboard.php:19
+#: ../../../../library/Director/Web/Widget/BranchedObjectsHint.php:21
+msgid ""
+"You're currently in the master branch, your changes will make part of the "
+"next Deployment"
+msgstr ""
+"Befindet man sich im master-Branch, werden durchgeführte Änderungen Teil des "
+"nächsten Deployments"
+
+#: ../../../../library/Director/Dashboard/BranchesDashboard.php:21
 #, php-format
 msgid "You're currently working in a Configuration Branch: %s"
 msgstr "Gegenwärtig wird in einem Konfigurationszweig gearbeitet: %s"
 
-#: application/controllers/IndexController.php:35
+#: ../../../../library/Director/Dashboard/BranchesDashboard.php:28
+msgid "You're currently working in the main Configuration Branch"
+msgstr "Gegenwärtig wird im Hauptkonfigurationszweig gearbeitet"
+
+#: ../../../../application/controllers/IndexController.php:35
 #, php-format
 msgid ""
 "Your DB schema (migration #%d) is newer than your code base. Downgrading "
@@ -7632,27 +7780,23 @@ msgstr ""
 "Quellcode. Ein Downgrade des Icinga Directors wird nicht unterstützt und "
 "kann zu unerwarteten Problemen führen."
 
-#: application/forms/KickstartForm.php:157
+#: ../../../../application/forms/KickstartForm.php:157
 msgid "Your Icinga 2 API username"
 msgstr "Der Icinga-2-API Benutzername"
 
-#: library/Director/Import/ImportSourceLdap.php:52
+#: ../../../../library/Director/Import/ImportSourceLdap.php:52
 msgid ""
 "Your LDAP search base. Often something like OU=Users,OU=HQ,DC=your,"
 "DC=company,DC=tld"
 msgstr ""
 "Die LDAP Suchbasis. Meist etwas wie OU=Users,OU=HQ,DC=your,DC=company,DC=tld"
 
-#: library/Director/Web/Widget/BranchedObjectHint.php:42
+#: ../../../../library/Director/Web/Widget/BranchedObjectHint.php:52
 #, php-format
-msgid ""
-"Your changes will be stored in %s. The'll not be part of any deployment "
-"unless being merged"
-msgstr ""
-"Änderungen werden in %s gespeichert. Sie sind nicht Teil eines eventuellen "
-"Deployments, solange sie nicht zusammengeführt werden"
+msgid "Your changes are going to be stored in %s."
+msgstr "Die Änderungen werden in %s gespeichert werden."
 
-#: application/forms/KickstartForm.php:98
+#: ../../../../application/forms/KickstartForm.php:98
 msgid ""
 "Your configuration looks good. Still, you might want to re-run this "
 "kickstart wizard to (re-)import modified or new manually defined Command "
@@ -7663,13 +7807,13 @@ msgstr ""
 "Kommandodefinitionen oder neue ITL-Kommandos nach einem Icinga-2-Core-"
 "Upgrade (neu) zu importieren."
 
-#: application/forms/KickstartForm.php:76
+#: ../../../../application/forms/KickstartForm.php:76
 #, php-format
 msgid "Your database looks good, you are ready to %s"
 msgstr ""
 "Datenbank sieht gut aus. Icinga Director sollte jetzt fertig für %s sein."
 
-#: application/forms/KickstartForm.php:110
+#: ../../../../application/forms/KickstartForm.php:110
 msgid ""
 "Your installation of Icinga Director has not yet been prepared for "
 "deployments. This kickstart wizard will assist you with setting up the "
@@ -7679,240 +7823,267 @@ msgstr ""
 "Konfiguration vorbereitet. Dieser Kickstart-Assistent hilft bei der "
 "Einrichtung der Verbindung zum Icinga 2 Server."
 
-#: library/Director/Web/Form/DirectorObjectForm.php:1372
+#: ../../../../library/Director/Web/Form/DirectorObjectForm.php:1375
 msgid "Your regular check interval"
 msgstr "Der übliche Check-Intervall"
 
-#: library/Director/PropertyModifier/PropertyModifierReplace.php:20
-#: library/Director/PropertyModifier/PropertyModifierReplaceNull.php:20
+#: ../../../../library/Director/PropertyModifier/PropertyModifierReplaceNull.php:20
+#: ../../../../library/Director/PropertyModifier/PropertyModifierReplace.php:20
 msgid "Your replacement string"
 msgstr "Die Ersatzzeichenkette"
 
-#: application/forms/IcingaTemplateChoiceForm.php:67
+#: ../../../../application/forms/IcingaTemplateChoiceForm.php:67
 msgid "Your users will be allowed to choose among those templates"
 msgstr "Benutzern wird erlaubt, zwischen diesen Vorlagen zu wählen"
 
-#: library/Director/TranslationDummy.php:15
-#: library/Director/Import/ImportSourceDirectorObject.php:73
-#: library/Director/Web/Table/ObjectsTableEndpoint.php:21
-#: application/forms/SyncRuleForm.php:26
+#: ../../../../library/Director/TranslationDummy.php:15
+#: ../../../../library/Director/Import/ImportSourceDirectorObject.php:73
+#: ../../../../library/Director/Web/Table/ObjectsTableEndpoint.php:21
+#: ../../../../application/forms/SyncRuleForm.php:26
 msgid "Zone"
 msgstr "Zone"
 
-#: application/forms/IcingaZoneForm.php:14
+#: ../../../../application/forms/IcingaZoneForm.php:14
 msgid "Zone name"
 msgstr "Zonenname"
 
-#: application/forms/IcingaUserForm.php:76
-#: application/forms/IcingaNotificationForm.php:65
-#: application/forms/IcingaCommandForm.php:110
-#: application/forms/IcingaUserGroupForm.php:42
-#: application/forms/IcingaDependencyForm.php:61
+#: ../../../../application/forms/IcingaUserForm.php:76
+#: ../../../../application/forms/IcingaNotificationForm.php:66
+#: ../../../../application/forms/IcingaCommandForm.php:110
+#: ../../../../application/forms/IcingaUserGroupForm.php:42
+#: ../../../../application/forms/IcingaDependencyForm.php:61
 msgid "Zone settings"
 msgstr "Zoneneinstellungen"
 
-#: library/Director/Dashboard/Dashlet/ZoneObjectDashlet.php:13
-#: library/Director/Db/Branch/BranchModificationInspection.php:36
-#: library/Director/Import/ImportSourceCoreApi.php:64
+#: ../../../../library/Director/Dashboard/Dashlet/ZoneObjectDashlet.php:15
+#: ../../../../library/Director/Db/Branch/BranchModificationInspection.php:36
+#: ../../../../library/Director/Import/ImportSourceCoreApi.php:64
 msgid "Zones"
 msgstr "Zonen"
 
-#: application/forms/SyncPropertyForm.php:348
+#: ../../../../application/forms/SyncPropertyForm.php:348
 msgid "a list"
 msgstr "eine Liste"
 
-#: library/Director/Web/Widget/InspectPackages.php:122
+#: ../../../../library/Director/Web/Widget/InspectPackages.php:122
 msgid "active"
 msgstr "aktiv"
 
-#: library/Director/Web/Widget/AdditionalTableActions.php:87
+#: ../../../../library/Director/Web/Widget/AdditionalTableActions.php:88
 msgid "all"
 msgstr "alle"
 
-#: library/Director/Web/ActionBar/DirectorBaseActionBar.php:35
-#: library/Director/Web/Controller/ObjectController.php:278
-#: library/Director/Web/Controller/ObjectController.php:638
-#: library/Director/Web/Controller/ActionController.php:182
-#: application/controllers/ServiceController.php:156
-#: application/controllers/ServiceController.php:216
-#: application/controllers/HostController.php:564
-#: application/controllers/BasketController.php:98
-#: application/controllers/BasketController.php:116
-#: application/controllers/BasketController.php:357
-#: application/controllers/ImportsourceController.php:366
-#: application/controllers/SyncruleController.php:612
-#: application/controllers/DataController.php:138
+#: ../../../../library/Director/Web/ActionBar/DirectorBaseActionBar.php:35
+#: ../../../../library/Director/Web/Controller/ActionController.php:182
+#: ../../../../library/Director/Web/Controller/ObjectController.php:281
+#: ../../../../library/Director/Web/Controller/ObjectController.php:649
+#: ../../../../application/controllers/ServiceController.php:156
+#: ../../../../application/controllers/ServiceController.php:216
+#: ../../../../application/controllers/HostController.php:542
+#: ../../../../application/controllers/BasketController.php:96
+#: ../../../../application/controllers/BasketController.php:114
+#: ../../../../application/controllers/BasketController.php:133
+#: ../../../../application/controllers/BasketController.php:368
+#: ../../../../application/controllers/ImportsourceController.php:366
+#: ../../../../application/controllers/SyncruleController.php:611
+#: ../../../../application/controllers/DataController.php:138
 msgid "back"
 msgstr "Zurück"
 
-#: library/Director/Web/Widget/BranchedObjectsHint.php:24
-#: library/Director/Web/Controller/ObjectController.php:722
-#: application/controllers/ConfigController.php:447
+#: ../../../../library/Director/Web/Widget/BranchedObjectsHint.php:29
+#: ../../../../library/Director/Web/Controller/ObjectController.php:733
+#: ../../../../application/controllers/ConfigController.php:448
 msgid "configuration branch"
 msgstr "Konfigurationszweig"
 
-#: application/locale/translateMe.php:11
+#: ../../../../application/locale/translateMe.php:11
 msgid "critical"
 msgstr "Kritisch"
 
-#: library/Director/Web/Table/Dependency/DependencyInfoTable.php:57
+#: ../../../../library/Director/Web/Table/Dependency/DependencyInfoTable.php:57
 msgid "disabled"
 msgstr "deaktiviert"
 
-#: library/Director/Dashboard/InfrastructureDashboard.php:32
-#: application/controllers/DaemonController.php:43
+#: ../../../../library/Director/Dashboard/InfrastructureDashboard.php:32
+#: ../../../../application/controllers/DaemonController.php:43
 msgid "documentation"
 msgstr "Dokumentation"
 
-#: application/locale/translateMe.php:6
+#: ../../../../application/locale/translateMe.php:6
 msgid "down"
 msgstr "Down"
 
-#: application/forms/IcingaCommandArgumentForm.php:27
+#: ../../../../application/forms/IcingaCommandArgumentForm.php:27
 msgid "e.g. -H or --hostname, empty means \"skip_key\""
 msgstr "z.B. -H oder --hostname, leer bedeutet \"skip_key\""
 
-#: application/forms/IcingaCommandArgumentForm.php:61
+#: ../../../../application/forms/IcingaCommandArgumentForm.php:61
 msgid "e.g. 5%, $host.name$, $lower$%:$upper$%"
 msgstr "z.B. 5%, $host.name$, $lower$%:$upper$%"
 
-#: application/forms/SyncPropertyForm.php:165
+#: ../../../../application/forms/SyncPropertyForm.php:165
 msgid "failed to fetch"
 msgstr "Abholen fehlgeschlagen"
 
-#: library/Director/Util.php:161
-#: library/Director/Web/Form/ClickHereForm.php:17
-#: application/forms/KickstartForm.php:236
+#: ../../../../library/Director/Util.php:161
+#: ../../../../library/Director/Web/Form/ClickHereForm.php:17
+#: ../../../../application/forms/KickstartForm.php:236
 msgid "here"
 msgstr "hier"
 
-#: application/forms/IcingaHostVarForm.php:23
+#: ../../../../application/forms/IcingaHostVarForm.php:23
 msgid "host var name"
 msgstr "host var name"
 
-#: application/forms/IcingaHostVarForm.php:28
+#: ../../../../application/forms/IcingaHostVarForm.php:28
 msgid "host var value"
 msgstr "host var value"
 
-#: library/Director/Web/Table/Dependency/DependencyInfoTable.php:60
+#: ../../../../library/Director/Web/Table/Dependency/DependencyInfoTable.php:60
 msgid "missing"
 msgstr "fehlend"
 
-#: application/controllers/BasketController.php:304
+#: ../../../../application/controllers/BasketController.php:304
 msgid "modified"
 msgstr "geändert"
 
-#: library/Director/Web/Table/Dependency/DependencyInfoTable.php:65
+#: ../../../../library/Director/Web/Table/Dependency/DependencyInfoTable.php:65
 msgid "more"
 msgstr "mehr"
 
-#: application/controllers/BasketController.php:282
+#: ../../../../application/controllers/BasketController.php:314
 msgid "new"
 msgstr "neu"
 
-#: library/Director/Web/Widget/BackgroundDaemonDetails.php:78
+#: ../../../../library/Director/Web/Widget/BackgroundDaemonDetails.php:78
 msgid "no"
 msgstr "nein"
 
-#: library/Director/Dashboard/Dashlet/Dashlet.php:222
+#: ../../../../library/Director/Dashboard/Dashlet/Dashlet.php:222
 msgid "no related group exists"
 msgstr "keine verwandte Gruppe existiert"
 
-#: application/locale/translateMe.php:9
+#: ../../../../application/locale/translateMe.php:9
 msgid "ok"
 msgstr "ok"
 
-#: library/Director/Web/Widget/ActivityLogInfo.php:316
+#: ../../../../library/Director/Web/Widget/ActivityLogInfo.php:316
 msgid "on host"
 msgstr "auf dem Host"
 
-#: library/Director/Web/Widget/ActivityLogInfo.php:298
+#: ../../../../library/Director/Web/Widget/ActivityLogInfo.php:298
 msgid "on service set"
 msgstr "am Service-Set"
 
-#: library/Director/Dashboard/Dashlet/Dashlet.php:224
+#: ../../../../library/Director/Dashboard/Dashlet/Dashlet.php:224
 msgid "one related group exists"
 msgstr "eine verwandte Gruppe existiert"
 
-#: application/locale/translateMe.php:8
+#: ../../../../application/locale/translateMe.php:8
 msgid "pending"
 msgstr "ausstehend"
 
-#: library/Director/PropertyModifier/PropertyModifierArrayFilter.php:71
-#: library/Director/PropertyModifier/PropertyModifierSplit.php:29
-#: library/Director/PropertyModifier/PropertyModifierArrayElementByPosition.php:56
-#: library/Director/PropertyModifier/PropertyModifierRegexSplit.php:29
+#: ../../../../library/Director/PropertyModifier/PropertyModifierArrayFilter.php:71
+#: ../../../../library/Director/PropertyModifier/PropertyModifierArrayElementByPosition.php:56
+#: ../../../../library/Director/PropertyModifier/PropertyModifierRegexSplit.php:29
+#: ../../../../library/Director/PropertyModifier/PropertyModifierSplit.php:29
 msgid "return NULL"
 msgstr "NULL zurückgeben"
 
-#: library/Director/PropertyModifier/PropertyModifierArrayFilter.php:70
-#: library/Director/PropertyModifier/PropertyModifierSplit.php:28
-#: library/Director/PropertyModifier/PropertyModifierRegexSplit.php:28
+#: ../../../../library/Director/PropertyModifier/PropertyModifierArrayFilter.php:70
+#: ../../../../library/Director/PropertyModifier/PropertyModifierRegexSplit.php:28
+#: ../../../../library/Director/PropertyModifier/PropertyModifierSplit.php:28
 msgid "return an empty array"
 msgstr "ein leeres Array zurückliefern"
 
-#: application/forms/IcingaServiceVarForm.php:23
+#: ../../../../application/forms/IcingaServiceVarForm.php:23
 msgid "service var name"
 msgstr "service var name"
 
-#: application/forms/IcingaServiceVarForm.php:28
+#: ../../../../application/forms/IcingaServiceVarForm.php:28
 msgid "service var value"
 msgstr "service var value"
 
-#: application/forms/KickstartForm.php:78
+#: ../../../../application/forms/KickstartForm.php:78
 msgid "start working with the Icinga Director"
 msgstr "die Arbeit mit dem Icinga Director zu beginnen"
 
-#: library/Director/Web/Widget/BranchedObjectHint.php:27
+#: ../../../../library/Director/Web/Widget/BranchedObjectHint.php:24
+msgid "the main configuration branch"
+msgstr "der Hauptkonfigurationszweig"
+
+#: ../../../../library/Director/Web/Widget/BranchedObjectHint.php:36
 msgid "this configuration branch"
 msgstr "diesem Konfigurationszweig"
 
-#: application/controllers/BasketController.php:308
+#: ../../../../application/controllers/BasketController.php:310
 msgid "unchanged"
 msgstr "unverändert"
 
-#: application/locale/translateMe.php:12
+#: ../../../../application/locale/translateMe.php:12
 msgid "unknown"
 msgstr "Unbekannt"
 
-#: application/locale/translateMe.php:7
+#: ../../../../application/locale/translateMe.php:7
 msgid "unreachable"
 msgstr "unreachable"
 
-#: library/Director/Web/Widget/BackgroundDaemonDetails.php:89
+#: ../../../../library/Director/Web/Widget/BackgroundDaemonDetails.php:89
 msgid "unsupported"
 msgstr "nicht unterstützt"
 
-#: library/Director/Web/Widget/AdditionalTableActions.php:89
+#: ../../../../library/Director/Web/Widget/AdditionalTableActions.php:90
 msgid "unused"
 msgstr "unbenutzt"
 
-#: application/locale/translateMe.php:5
+#: ../../../../application/locale/translateMe.php:5
 msgid "up"
 msgstr "up"
 
-#: library/Director/Web/Widget/AdditionalTableActions.php:88
+#: ../../../../library/Director/Web/Widget/AdditionalTableActions.php:89
 msgid "used"
 msgstr "benutzt"
 
-#: application/forms/IcingaServiceVarForm.php:33
-#: application/forms/IcingaHostVarForm.php:33
+#: ../../../../application/forms/IcingaServiceVarForm.php:33
+#: ../../../../application/forms/IcingaHostVarForm.php:33
 msgid "value format"
 msgstr "Wertformat"
 
-#: library/Director/Web/Table/GroupMemberTable.php:74
-#: library/Director/Web/Table/GroupMemberTable.php:79
+#: ../../../../library/Director/Web/Table/GroupMemberTable.php:74
+#: ../../../../library/Director/Web/Table/GroupMemberTable.php:79
 msgid "via"
 msgstr "via"
 
-#: application/locale/translateMe.php:10
+#: ../../../../application/locale/translateMe.php:10
 msgid "warning"
 msgstr "warning"
 
-#: library/Director/Web/Widget/BackgroundDaemonDetails.php:77
+#: ../../../../library/Director/Web/Widget/BackgroundDaemonDetails.php:77
 msgid "yes"
 msgstr "ja"
 
+#~ msgid "A description about the field"
+#~ msgstr "Eine Beschreibung des Feldes"
+
+#~ msgid "Icinga 2 Powershell Module"
+#~ msgstr "Icinga 2 Powershell Modul"
+
+#, php-format
+#~ msgid "In case you're using the legacy %s, please run:"
+#~ msgstr ""
+#~ "Falls das vorherige  %s benutzt wird, bitte dieses Script ausführen:"
+
+#~ msgid "The caption which should be displayed"
+#~ msgstr "Die Beschriftung, die angezeigt werden soll"
+
+#, php-format
+#~ msgid ""
+#~ "Your changes will be stored in %s. The'll not be part of any deployment "
+#~ "unless being merged"
+#~ msgstr ""
+#~ "Änderungen werden in %s gespeichert. Sie sind nicht Teil eines "
+#~ "eventuellen Deployments, solange sie nicht zusammengeführt werden"
+
 #~ msgid "Create a new Service Set"
 #~ msgstr "Ein neues Service-Set erstellen"
 
diff --git a/application/locale/it_IT/LC_MESSAGES/director.po b/application/locale/it_IT/LC_MESSAGES/director.po
index c4f6d2d..2e97485 100644
--- a/application/locale/it_IT/LC_MESSAGES/director.po
+++ b/application/locale/it_IT/LC_MESSAGES/director.po
@@ -1839,7 +1839,7 @@ msgstr ""
 "essere basate sui gruppi."
 
 #: application/forms/IcingaNotificationForm.php:199
-msgid "Delay unless the first notification should be sent"
+msgid "Delay until the first notification should be sent"
 msgstr "Ritarda prima di spedire la prima notifica"
 
 #: application/forms/IcingaObjectFieldForm.php:193
@@ -1979,7 +1979,7 @@ msgid "Disable Checks"
 msgstr "Disattivare i Checks"
 
 #: application/forms/IcingaDependencyForm.php:167
-msgid "Disable Notificiations"
+msgid "Disable Notifications"
 msgstr "Disattivare le notifiche"
 
 #: application/forms/SettingsForm.php:54
diff --git a/application/locale/ja_JP/LC_MESSAGES/director.po b/application/locale/ja_JP/LC_MESSAGES/director.po
index d1bec38..63064d9 100644
--- a/application/locale/ja_JP/LC_MESSAGES/director.po
+++ b/application/locale/ja_JP/LC_MESSAGES/director.po
@@ -1665,7 +1665,7 @@ msgstr "サービスグループを定義すると、より構造がわかりま
 "最適です。 通知と許可はグループに基づいている場合があります。"
 
 #: ../../../../modules/director/application/forms/IcingaNotificationForm.php:196
-msgid "Delay unless the first notification should be sent"
+msgid "Delay until the first notification should be sent"
 msgstr "最初の通知時間"
 
 #: ../../../../modules/director/application/forms/IcingaObjectFieldForm.php:185
@@ -1791,7 +1791,7 @@ msgstr "監視を無効化"
 # smori
 
 #: ../../../../modules/director/application/forms/IcingaDependencyForm.php:164
-msgid "Disable Notificiations"
+msgid "Disable Notifications"
 msgstr "通知を無効化"
 
 #: ../../../../modules/director/application/forms/SettingsForm.php:54
diff --git a/application/views/helpers/FormDataFilter.php b/application/views/helpers/FormDataFilter.php
index d8bc508..a62b906 100644
--- a/application/views/helpers/FormDataFilter.php
+++ b/application/views/helpers/FormDataFilter.php
@@ -44,14 +44,16 @@ class Zend_View_Helper_FormDataFilter extends Zend_View_Helper_FormElement
     {
         $info = $this->_getInfo($name, $value, $attribs);
         extract($info); // id, name, value, attribs, options, listsep, disable
-        if (array_key_exists('columns', $attribs)) {
-            $this->setColumns($attribs['columns']);
-            unset($attribs['columns']);
-        }
+        if ($attribs) {
+            if (array_key_exists('columns', $attribs)) {
+                $this->setColumns($attribs['columns']);
+                unset($attribs['columns']);
+            }
 
-        if (array_key_exists('suggestionContext', $attribs)) {
-            $this->setSuggestionContext($attribs['suggestionContext']);
-            unset($attribs['suggestionContext']);
+            if (array_key_exists('suggestionContext', $attribs)) {
+                $this->setSuggestionContext($attribs['suggestionContext']);
+                unset($attribs['suggestionContext']);
+            }
         }
 
         // TODO: check for columns in attribs, preserve & remove them from the
@@ -217,7 +219,7 @@ class Zend_View_Helper_FormDataFilter extends Zend_View_Helper_FormElement
             } elseif (substr($col, $prefixLen, 5) === 'vars.') {
                 $var = substr($col, $prefixLen + 5);
 
-                return $this->text($filter, "DataListValues!${var}");
+                return $this->text($filter, "DataListValues!{$var}");
             }
         }
 
@@ -236,7 +238,7 @@ class Zend_View_Helper_FormDataFilter extends Zend_View_Helper_FormElement
             $filter->getExpression(),
             [
                 'class' => 'director-suggest',
-                'data-suggestion-context' => "${type}groupnames",
+                'data-suggestion-context' => "{$type}groupnames",
             ]
         );
     }
diff --git a/application/views/helpers/FormStoredPassword.php b/application/views/helpers/FormStoredPassword.php
index e25a1dc..b746ed4 100644
--- a/application/views/helpers/FormStoredPassword.php
+++ b/application/views/helpers/FormStoredPassword.php
@@ -8,8 +8,8 @@ use ipl\Html\HtmlDocument;
  *
  * We're rendering the following fields:
  *
- * - ${name}[_value]:
- * - ${name}[_sent]:
+ * - {$name}[_value]:
+ * - {$name}[_sent]:
  *
  * Avoid complaints about class names:
  * @codingStandardsIgnoreStart
@@ -26,14 +26,14 @@ class Zend_View_Helper_FormStoredPassword extends Zend_View_Helper_FormElement
         $res = new HtmlDocument();
         $el = Html::tag('input', [
             'type' => 'password',
-            'name' => "${name}[_value]",
+            'name' => "{$name}[_value]",
             'id'   => $id,
         ]);
         $res->add($el);
 
         $res->add(Html::tag('input', [
             'type'  => 'hidden',
-            'name'  => "${name}[_sent]",
+            'name'  => "{$name}[_sent]",
             'value' => 'y'
         ]));
author	Daniel Baumann <daniel.baumann@progress-linux.org>	2024-04-14 13:17:48 +0000
committer	Daniel Baumann <daniel.baumann@progress-linux.org>	2024-04-14 13:17:48 +0000
commit	e6d4dfc040bbe3cb80a2ce65b82493b557f751fc (patch)
tree	40bd6366b01b06f4d96fc8638f23a772263cb5e9 /application
parent	Releasing progress-linux version 1.10.2-2~progress7.99u1. (diff)
download	icingaweb2-module-director-e6d4dfc040bbe3cb80a2ce65b82493b557f751fc.tar.xz icingaweb2-module-director-e6d4dfc040bbe3cb80a2ce65b82493b557f751fc.zip