diff --git a/src/icingaweb2-module-director/ar_SA/LC_MESSAGES/icinga.po b/src/icingaweb2-module-director/ar_SA/LC_MESSAGES/icinga.po
index de9a6402..bb5d347d 100644
--- a/src/icingaweb2-module-director/ar_SA/LC_MESSAGES/icinga.po
+++ b/src/icingaweb2-module-director/ar_SA/LC_MESSAGES/icinga.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-21 16:06+0000\n"
+"POT-Creation-Date: 2023-09-12 12:59+0000\n"
 "PO-Revision-Date: 2020-04-27 14:37+0200\n"
 "Last-Translator: Munzir Taha <munzirtaha@gmail.com>\n"
 "Language-Team: English <trans-ar@lists.fedoraproject.org>\n"
@@ -131,8 +131,8 @@ msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/controllers/BasketController.php:238
 #: sources.d/icingaweb2-module-director/application/controllers/SchemaController.php:80
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:236
 #: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:249
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:262
 msgid "Download"
 msgstr ""
 
@@ -319,6 +319,7 @@ msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:384
 #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:395
+#: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:284
 #: sources.d/icingaweb2-module-director/application/forms/SelfServiceSettingsForm.php:252
 #: sources.d/icingaweb2-module-director/application/forms/SettingsForm.php:193
 #: sources.d/icingaweb2-module-director/application/views/helpers/FormDataFilter.php:465
@@ -952,7 +953,7 @@ msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/controllers/ServiceController.php:280
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostVarForm.php:15
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:598
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:601
 #: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:12
 #: sources.d/icingaweb2-module-director/library/Director/Import/ImportSourceDirectorObject.php:71
 #: sources.d/icingaweb2-module-director/library/Director/TranslationDummy.php:13
@@ -1053,7 +1054,7 @@ msgstr ""
 
 #: sources.d/icingaweb2-module-director/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 ""
 
 #: sources.d/icingaweb2-module-director/application/controllers/SyncruleController.php:108
@@ -1512,7 +1513,7 @@ msgstr ""
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldCategoryForm.php:31
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:158
 #: sources.d/icingaweb2-module-director/application/forms/IcingaCommandArgumentForm.php:31
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:134
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:94
 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceSetForm.php:103
 #: sources.d/icingaweb2-module-director/application/forms/IcingaTemplateChoiceForm.php:56
 #: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:52
@@ -1582,7 +1583,7 @@ msgid ""
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:141
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:50
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:52
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaObjectDatafieldTable.php:50
 msgid "Field name"
 msgstr ""
@@ -1594,16 +1595,18 @@ msgid ""
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:149
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:126
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:83
 msgid "Caption"
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:152
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:88
 msgid ""
 "The caption which should be displayed to your users when this field is shown"
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:160
+#: sources.d/icingaweb2-module-director/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"
@@ -1633,7 +1636,7 @@ msgid ""
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatalistEntryForm.php:30
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:49
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:51
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatalistEntryTable.php:55
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaObjectDatafieldTable.php:49
 msgid "Label"
@@ -1773,19 +1776,19 @@ msgstr ""
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostForm.php:40
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostVarForm.php:22
 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceDictionaryMemberForm.php:22
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:576
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:579
 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceVarForm.php:22
 #: sources.d/icingaweb2-module-director/application/forms/IcingaTimePeriodForm.php:15
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/ChoicesTable.php:41
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/CoreApiFieldsTable.php:79
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/CoreApiObjectsTable.php:57
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/CoreApiPrototypesTable.php:40
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/ObjectSetTable.php:46
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/ObjectSetTable.php:50
 msgid "Name"
 msgstr "اسم"
 
 #: sources.d/icingaweb2-module-director/application/forms/IcingaAddServiceForm.php:147
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:579
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:582
 msgid "Name for the Icinga service you are going to create"
 msgstr ""
 
@@ -2007,7 +2010,7 @@ msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/IcingaCommandArgumentForm.php:181
 #: sources.d/icingaweb2-module-director/application/forms/IcingaScheduledDowntimeRangeForm.php:99
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:778
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:781
 #: sources.d/icingaweb2-module-director/application/forms/IcingaTimePeriodRangeForm.php:94
 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/DirectorObjectForm.php:673
 msgid "No action taken, object has not been modified"
@@ -2120,7 +2123,7 @@ msgstr ""
 #: sources.d/icingaweb2-module-director/application/forms/IcingaDependencyForm.php:100
 #: sources.d/icingaweb2-module-director/application/forms/IcingaNotificationForm.php:90
 #: sources.d/icingaweb2-module-director/application/forms/IcingaScheduledDowntimeForm.php:89
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:712
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:715
 #: sources.d/icingaweb2-module-director/configuration.php:121
 #: sources.d/icingaweb2-module-director/library/Director/Dashboard/Dashlet/HostsDashlet.php:13
 #: sources.d/icingaweb2-module-director/library/Director/DataType/DataTypeDictionary.php:59
@@ -2137,7 +2140,7 @@ msgstr "المضيفون"
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostGroupForm.php:30
 #: sources.d/icingaweb2-module-director/application/forms/IcingaNotificationForm.php:107
 #: sources.d/icingaweb2-module-director/application/forms/IcingaScheduledDowntimeForm.php:115
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:477
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:480
 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceGroupForm.php:30
 msgid ""
 "This allows you to configure an assignment filter. Please feel free to "
@@ -2359,7 +2362,7 @@ msgid ""
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostForm.php:149
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:698
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:701
 msgid "Icinga Agent and zone settings"
 msgstr ""
 
@@ -2381,7 +2384,7 @@ msgid "Choose a Host Template"
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostForm.php:219
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:650
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:653
 #: sources.d/icingaweb2-module-director/application/forms/IcingaUserForm.php:109
 #: sources.d/icingaweb2-module-director/library/Director/Web/Tabs/ObjectsTabs.php:67
 msgid "Groups"
@@ -2655,64 +2658,44 @@ msgstr ""
 msgid "Check command definition"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:94
-msgid "Suggested fields"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:99
-msgid "Argument macros"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:104
-msgid "Other available fields"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:118
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:75
 msgid ""
 "There are no data fields available. Please ask an administrator to create "
 "such"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:130
-msgid "The caption which should be displayed"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:135
-msgid "A description about the field"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:143
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:148
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:106
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:111
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaObjectDatafieldTable.php:51
 msgid "Mandatory"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:144
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:107
 msgid "Whether this field should be mandatory"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:147
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:110
 msgid "Optional"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:170
+#: sources.d/icingaweb2-module-director/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 "
 "cleared once stored"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:184
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:132
 msgid "Show based on filter"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:194
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:142
 #: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:87
 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/DirectorObjectForm.php:928
 msgid "Delete"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:197
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:145
 msgid "Field has been removed"
 msgstr ""
 
@@ -2822,91 +2805,91 @@ msgstr ""
 msgid "Name for the instance you are going to create"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:137
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:138
 msgid "This Service has been deactivated on this host"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:142
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:143
 #, fuzzy
 msgid "Reactivate"
 msgstr "غير نشط"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:161
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:436
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:468
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:162
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:439
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:471
 msgid "Override vars"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:167
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:168
 msgid "Hints regarding this service"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:174
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:175
 #, fuzzy
 msgid "Deactivate"
 msgstr "غير نشط"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:287
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:290
 #, fuzzy, php-format
 msgid "%s has been deactivated on %s"
 msgstr "تم تحرير المستخدم \"%s\""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:323
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:326
 #, php-format
 msgid "%s is no longer deactivated on %s"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:385
+#: sources.d/icingaweb2-module-director/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."
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:391
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:394
 #, php-format
 msgid ""
 "This service has been generated using the %s apply rule, assigned where %s"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:404
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:407
 #, php-format
 msgid ""
 "This service belongs to the %s Service Set. Still, you might want to "
 "override the following properties for this host only."
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:416
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:419
 #, php-format
 msgid ""
 "This service has been inherited from %s. Still, you might want to change the "
 "following properties for this host only."
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:444
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:447
 #, php-format
 msgid ""
 "This service belongs to the service set \"%s\". Still, you might want to "
 "change the following properties for this host only."
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:465
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:468
 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/IcingaObjectFieldLoader.php:266
 msgid "Custom properties"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:602
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:605
 msgid "Choose the host this single service should be assigned to"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:624
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:627
 msgid "Apply For"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:626
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:629
 msgid "None"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:628
+#: sources.d/icingaweb2-module-director/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 "
@@ -2915,7 +2898,7 @@ msgid ""
 "eligible."
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:654
+#: sources.d/icingaweb2-module-director/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 "
@@ -2924,17 +2907,17 @@ msgid ""
 "be directly assigned to single services or to service templates."
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:679
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:682
 msgid "Run on agent"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:681
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:684
 msgid ""
 "Whether the check commmand for this service should be executed on the Icinga "
 "agent"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:711
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:714
 #: sources.d/icingaweb2-module-director/library/Director/Import/ImportSourceDirectorObject.php:82
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/DependencyTemplateUsageTable.php:10
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/HostTemplateUsageTable.php:10
@@ -2946,12 +2929,12 @@ msgstr ""
 msgid "Templates"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:767
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:770
 #, php-format
 msgid "All overrides have been removed from \"%s\""
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:768
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:771
 #, php-format
 msgid "The given properties have been stored for \"%s\""
 msgstr ""
@@ -3272,11 +3255,32 @@ msgid ""
 "it's purpose and why it has been put in place at all."
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:69
+#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:68
+#: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:84
+msgid "Set based on filter"
+msgstr ""
+
+#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:89
+#: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:103
+#: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:95
+msgid "Filter Expression"
+msgstr ""
+
+#: sources.d/icingaweb2-module-director/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 ""
+
+#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:104
 msgid "Modifier"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:72
+#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:107
 msgid ""
 "A property modifier allows you to modify a specific property at import time"
 msgstr ""
@@ -3840,15 +3844,6 @@ msgstr ""
 msgid "Custom variable"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:84
-msgid "Set based on filter"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:103
-#: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:95
-msgid "Filter Expression"
-msgstr ""
-
 #: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:105
 msgid ""
 "This allows to filter for specific parts within the given source expression. "
@@ -4585,7 +4580,7 @@ msgid "Scheduled Downtimes"
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/library/Director/Dashboard/Dashlet/SelfServiceDashlet.php:13
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:180
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:167
 msgid "Self Service API"
 msgstr ""
 
@@ -4980,6 +4975,22 @@ msgstr ""
 msgid "(Host) group resolve cache"
 msgstr ""
 
+#: sources.d/icingaweb2-module-director/library/Director/Field/FormFieldSuggestion.php:78
+msgid "Suggested fields"
+msgstr ""
+
+#: sources.d/icingaweb2-module-director/library/Director/Field/FormFieldSuggestion.php:82
+msgid "Argument macros"
+msgstr ""
+
+#: sources.d/icingaweb2-module-director/library/Director/Field/FormFieldSuggestion.php:86
+msgid "Flags (boolean) arguments"
+msgstr ""
+
+#: sources.d/icingaweb2-module-director/library/Director/Field/FormFieldSuggestion.php:90
+msgid "Other available fields"
+msgstr ""
+
 #: sources.d/icingaweb2-module-director/library/Director/IcingaConfig/StateFilterSet.php:20
 msgid "Up"
 msgstr "قيد التشغيل"
@@ -5325,7 +5336,7 @@ msgstr ""
 msgid "Run all rules at once"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Objects/DirectorDatafield.php:213
+#: sources.d/icingaweb2-module-director/library/Director/Objects/DirectorDatafield.php:204
 #, php-format
 msgid "Form element could not be created, %s is missing"
 msgstr ""
@@ -5629,7 +5640,7 @@ msgid ""
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMakeBoolean.php:42
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:35
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:34
 msgid "Set null"
 msgstr ""
 
@@ -5642,34 +5653,34 @@ msgid "Set false"
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMakeBoolean.php:45
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:38
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:37
 msgid "Let the import fail"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:21
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:20
 msgid "Please choose a data list that can be used for map lookups"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:30
+#: sources.d/icingaweb2-module-director/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 "
 "the import process"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:36
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:35
 msgid "Return lookup key unmodified"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:37
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:36
 msgid "Return custom default value"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:46
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:45
 msgid "Default value"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:49
+#: sources.d/icingaweb2-module-director/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 "
@@ -6599,67 +6610,57 @@ msgstr ""
 msgid "In case you're using %s, please run this Script:"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:158
 #: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:164
-msgid "Icinga 2 Powershell Module"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:160
-#, php-format
-msgid "In case you're using the legacy %s, please run:"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:177
 msgid "Documentation"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:192
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:179
 msgid "Configure this Agent via Self Service API"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:195
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:182
 msgid "Inherited Template Api Key:"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:216
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:203
 msgid "Icinga 2 Client documentation"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:221
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:208
 msgid "Top Down"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:234
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:221
 #, php-format
 msgid ""
 "A ticket for this agent could not have been requested from your deployment "
 "endpoint: %s"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:245
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:232
 msgid "For manual configuration"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:246
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:233
 msgid "Ticket"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:247
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:234
 msgid "Windows Kickstart Script"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:256
+#: sources.d/icingaweb2-module-director/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 "
 "connected to it's parents"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:260
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:247
 msgid "Linux commandline"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:267
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:255
 msgid "Just download and run this script on your Linux Client Machine:"
 msgstr ""
 
@@ -6743,15 +6744,15 @@ msgid "Category Name"
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldCategoryTable.php:48
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:52
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:54
 msgid "# Used"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:51
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:53
 msgid "Category"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:53
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:55
 msgid "# Vars"
 msgstr ""
 
@@ -6812,16 +6813,16 @@ msgstr ""
 msgid "%s %s(%s)"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:216
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:229
 #, php-format
 msgid "This set has been inherited from %s"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:225
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:238
 msgid "Remove"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:227
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:240
 #, php-format
 msgid "Remove \"%s\" from this host"
 msgstr ""
@@ -6840,7 +6841,7 @@ msgstr ""
 msgid "Imported rows"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/ObjectSetTable.php:62
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/ObjectSetTable.php:66
 #, php-format
 msgid "%s (%d members)"
 msgstr ""
@@ -6879,7 +6880,7 @@ msgstr ""
 msgid "Total"
 msgstr "الكلي"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/TemplateUsageTable.php:103
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/TemplateUsageTable.php:104
 msgid "This template is not in use"
 msgstr ""
 
diff --git a/src/icingaweb2-module-director/de_DE/LC_MESSAGES/icinga.po b/src/icingaweb2-module-director/de_DE/LC_MESSAGES/icinga.po
index e160d203..56523e35 100644
--- a/src/icingaweb2-module-director/de_DE/LC_MESSAGES/icinga.po
+++ b/src/icingaweb2-module-director/de_DE/LC_MESSAGES/icinga.po
@@ -25,7 +25,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-21 16:06+0000\n"
+"POT-Creation-Date: 2023-09-12 12:59+0000\n"
 "PO-Revision-Date: 2022-07-15 07:40+0000\n"
 "Last-Translator: Johannes Meyer <johannes.meyer@icinga.com>\n"
 "Language-Team: German <https://translate.icinga.com/projects/icinga/"
@@ -149,8 +149,8 @@ msgstr "Wiederherstellen"
 
 #: sources.d/icingaweb2-module-director/application/controllers/BasketController.php:238
 #: sources.d/icingaweb2-module-director/application/controllers/SchemaController.php:80
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:236
 #: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:249
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:262
 msgid "Download"
 msgstr "Download"
 
@@ -349,6 +349,7 @@ msgstr "Konfigurationsunterschied"
 
 #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:384
 #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:395
+#: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:284
 #: sources.d/icingaweb2-module-director/application/forms/SelfServiceSettingsForm.php:252
 #: sources.d/icingaweb2-module-director/application/forms/SettingsForm.php:193
 #: sources.d/icingaweb2-module-director/application/views/helpers/FormDataFilter.php:465
@@ -998,7 +999,7 @@ msgstr "Apply: %s"
 
 #: sources.d/icingaweb2-module-director/application/controllers/ServiceController.php:280
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostVarForm.php:15
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:598
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:601
 #: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:12
 #: sources.d/icingaweb2-module-director/library/Director/Import/ImportSourceDirectorObject.php:71
 #: sources.d/icingaweb2-module-director/library/Director/TranslationDummy.php:13
@@ -1103,8 +1104,8 @@ msgstr ""
 "Es sollte auf Änderungen geprüft oder ein neuer Importlauf angestoßen werden."
 
 #: sources.d/icingaweb2-module-director/application/controllers/SyncruleController.php:97
-#, php-format
-msgid "This Sync Rule was last found to by in Sync at %s."
+#, fuzzy, php-format
+msgid "This Sync Rule was last found to be in Sync at %s."
 msgstr "Diese Synchronisationsregel war zuletzt synchron um %s."
 
 #: sources.d/icingaweb2-module-director/application/controllers/SyncruleController.php:108
@@ -1593,7 +1594,7 @@ msgstr ""
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldCategoryForm.php:31
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:158
 #: sources.d/icingaweb2-module-director/application/forms/IcingaCommandArgumentForm.php:31
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:134
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:94
 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceSetForm.php:103
 #: sources.d/icingaweb2-module-director/application/forms/IcingaTemplateChoiceForm.php:56
 #: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:52
@@ -1689,7 +1690,7 @@ msgstr ""
 "konfigurierbar sein sollen."
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:141
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:50
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:52
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaObjectDatafieldTable.php:50
 msgid "Field name"
 msgstr "Feldname"
@@ -1705,16 +1706,18 @@ msgstr ""
 "benutzt."
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:149
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:126
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:83
 msgid "Caption"
 msgstr "Beschriftung"
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:152
+#: sources.d/icingaweb2-module-director/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"
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:160
+#: sources.d/icingaweb2-module-director/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"
@@ -1748,7 +1751,7 @@ msgstr ""
 "der Liste gewählt wird"
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatalistEntryForm.php:30
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:49
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:51
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatalistEntryTable.php:55
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaObjectDatafieldTable.php:49
 msgid "Label"
@@ -1900,19 +1903,19 @@ msgstr "Wähle eine Service-Vorlage"
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostForm.php:40
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostVarForm.php:22
 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceDictionaryMemberForm.php:22
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:576
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:579
 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceVarForm.php:22
 #: sources.d/icingaweb2-module-director/application/forms/IcingaTimePeriodForm.php:15
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/ChoicesTable.php:41
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/CoreApiFieldsTable.php:79
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/CoreApiObjectsTable.php:57
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/CoreApiPrototypesTable.php:40
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/ObjectSetTable.php:46
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/ObjectSetTable.php:50
 msgid "Name"
 msgstr "Name"
 
 #: sources.d/icingaweb2-module-director/application/forms/IcingaAddServiceForm.php:147
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:579
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:582
 msgid "Name for the Icinga service you are going to create"
 msgstr "Name des Icinga-Service, der erstellt werden soll"
 
@@ -2152,7 +2155,7 @@ msgstr "Das Argument %s wurde erfolgreich gespeichert"
 
 #: sources.d/icingaweb2-module-director/application/forms/IcingaCommandArgumentForm.php:181
 #: sources.d/icingaweb2-module-director/application/forms/IcingaScheduledDowntimeRangeForm.php:99
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:778
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:781
 #: sources.d/icingaweb2-module-director/application/forms/IcingaTimePeriodRangeForm.php:94
 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/DirectorObjectForm.php:673
 msgid "No action taken, object has not been modified"
@@ -2281,7 +2284,7 @@ msgstr "Soll diese Abhängigkeit Hosts oder Services betreffen"
 #: sources.d/icingaweb2-module-director/application/forms/IcingaDependencyForm.php:100
 #: sources.d/icingaweb2-module-director/application/forms/IcingaNotificationForm.php:90
 #: sources.d/icingaweb2-module-director/application/forms/IcingaScheduledDowntimeForm.php:89
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:712
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:715
 #: sources.d/icingaweb2-module-director/configuration.php:121
 #: sources.d/icingaweb2-module-director/library/Director/Dashboard/Dashlet/HostsDashlet.php:13
 #: sources.d/icingaweb2-module-director/library/Director/DataType/DataTypeDictionary.php:59
@@ -2298,7 +2301,7 @@ msgstr "Hosts"
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostGroupForm.php:30
 #: sources.d/icingaweb2-module-director/application/forms/IcingaNotificationForm.php:107
 #: sources.d/icingaweb2-module-director/application/forms/IcingaScheduledDowntimeForm.php:115
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:477
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:480
 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceGroupForm.php:30
 msgid ""
 "This allows you to configure an assignment filter. Please feel free to "
@@ -2549,7 +2552,7 @@ msgstr ""
 "Icinga-Dokumentation gelesen zu haben"
 
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostForm.php:149
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:698
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:701
 msgid "Icinga Agent and zone settings"
 msgstr "Icinga Agenten- und Zoneneinstellungen"
 
@@ -2571,7 +2574,7 @@ msgid "Choose a Host Template"
 msgstr "Wähle eine Service-Vorlage"
 
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostForm.php:219
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:650
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:653
 #: sources.d/icingaweb2-module-director/application/forms/IcingaUserForm.php:109
 #: sources.d/icingaweb2-module-director/library/Director/Web/Tabs/ObjectsTabs.php:67
 msgid "Groups"
@@ -2873,48 +2876,28 @@ msgstr "Benachrichtigungskommando"
 msgid "Check command definition"
 msgstr "Check-Kommandodefinition"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:94
-msgid "Suggested fields"
-msgstr "Vorgeschlagene Felder"
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:99
-msgid "Argument macros"
-msgstr "Argument Makros"
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:104
-msgid "Other available fields"
-msgstr "Andere verfügbare Felder"
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:118
+#: sources.d/icingaweb2-module-director/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"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:130
-msgid "The caption which should be displayed"
-msgstr "Die Beschriftung, die angezeigt werden soll"
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:135
-msgid "A description about the field"
-msgstr "Eine Beschreibung des Feldes"
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:143
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:148
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:106
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:111
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaObjectDatafieldTable.php:51
 msgid "Mandatory"
 msgstr "Pflicht"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:144
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:107
 msgid "Whether this field should be mandatory"
 msgstr "Soll dieses Feld Pflicht sein?"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:147
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:110
 msgid "Optional"
 msgstr "Optional"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:170
+#: sources.d/icingaweb2-module-director/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 "
@@ -2924,17 +2907,17 @@ msgstr ""
 "anzuzeigen. Treffen diese nicht zu wird es nicht angezeigt, eventuell "
 "zugehörige Eigenschaften werden beim Speichern dann auch wieder entfernt."
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:184
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:132
 msgid "Show based on filter"
 msgstr "Basierend auf Filter zeigen"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:194
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:142
 #: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:87
 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/DirectorObjectForm.php:928
 msgid "Delete"
 msgstr "Löschen"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:197
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:145
 msgid "Field has been removed"
 msgstr "Feld wurde entfernt"
 
@@ -3058,39 +3041,39 @@ msgstr "Ein neuer %s wurde erfolgreich erstellt"
 msgid "Name for the instance you are going to create"
 msgstr "Name der Icinga-Zone, die erstellt werden soll"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:137
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:138
 msgid "This Service has been deactivated on this host"
 msgstr "Dieser Service wurde auf diesem Host deaktiviert"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:142
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:143
 msgid "Reactivate"
 msgstr "Reaktivieren"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:161
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:436
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:468
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:162
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:439
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:471
 msgid "Override vars"
 msgstr "Variablen überschreiben"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:167
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:168
 msgid "Hints regarding this service"
 msgstr "Hinweise zu diesem Service"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:174
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:175
 msgid "Deactivate"
 msgstr "Deaktivieren"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:287
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:290
 #, php-format
 msgid "%s has been deactivated on %s"
 msgstr "%s wurde auf %s deaktiviert"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:323
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:326
 #, php-format
 msgid "%s is no longer deactivated on %s"
 msgstr "%s ist auf %s nicht mehr deaktiviert"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:385
+#: sources.d/icingaweb2-module-director/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."
@@ -3098,7 +3081,7 @@ msgstr ""
 "Dieser Service wurde durch einen Automatismus erstellt, erlaubt es aber "
 "dennoch die folgenden Eigenschaften auf sichere Weise zu überschreiben."
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:391
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:394
 #, php-format
 msgid ""
 "This service has been generated using the %s apply rule, assigned where %s"
@@ -3106,7 +3089,7 @@ msgstr ""
 "Dieser Service wurde durch die Apply-Regel %s erstellt, und wird zugewiesen "
 "wo %s"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:404
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:407
 #, php-format
 msgid ""
 "This service belongs to the %s Service Set. Still, you might want to "
@@ -3115,7 +3098,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."
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:416
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:419
 #, php-format
 msgid ""
 "This service has been inherited from %s. Still, you might want to change the "
@@ -3124,7 +3107,7 @@ msgstr ""
 "Dieser Service wurde von %s geerbt. Dennoch können die folgenden "
 "Eigenschaften nur für diesen speziellen Host geändert werden."
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:444
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:447
 #, php-format
 msgid ""
 "This service belongs to the service set \"%s\". Still, you might want to "
@@ -3133,24 +3116,24 @@ msgstr ""
 "Dieser Service gehört zum Set \"%s\". Dennoch können die folgenden "
 "Eigenschaften nur für diesen speziellen Host geändert werden."
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:465
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:468
 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/IcingaObjectFieldLoader.php:266
 msgid "Custom properties"
 msgstr "Benutzerdefinierte Eigenschaften"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:602
+#: sources.d/icingaweb2-module-director/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"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:624
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:627
 msgid "Apply For"
 msgstr "Anwenden auf"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:626
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:629
 msgid "None"
 msgstr "Keine"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:628
+#: sources.d/icingaweb2-module-director/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 "
@@ -3164,7 +3147,7 @@ msgstr ""
 "Dabei ist \"config\" dann als \"$config$\" zugänglich. HINWEIS: nur "
 "benutzerdefinierte Eigenschaften vom Typ \"Array\" sind wählbar."
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:654
+#: sources.d/icingaweb2-module-director/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 "
@@ -3178,11 +3161,11 @@ msgstr ""
 "Dashboards oder zum Umsetzen von Einschränkungen. Servicegruppen können "
 "direkt einem einzelnen Service zugeordnet werden oder Service-Vorlagen."
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:679
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:682
 msgid "Run on agent"
 msgstr "Auf Agent ausführen"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:681
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:684
 msgid ""
 "Whether the check commmand for this service should be executed on the Icinga "
 "agent"
@@ -3190,7 +3173,7 @@ msgstr ""
 "Ob das Kommando für diesen Service auf dem Icinga-Agent ausgeführt werden "
 "soll"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:711
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:714
 #: sources.d/icingaweb2-module-director/library/Director/Import/ImportSourceDirectorObject.php:82
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/DependencyTemplateUsageTable.php:10
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/HostTemplateUsageTable.php:10
@@ -3202,12 +3185,12 @@ msgstr ""
 msgid "Templates"
 msgstr "Vorlagen"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:767
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:770
 #, php-format
 msgid "All overrides have been removed from \"%s\""
 msgstr "Alle überschriebenen Eigenschaften wurden von \"%s\" entfernt"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:768
+#: sources.d/icingaweb2-module-director/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"
@@ -3573,11 +3556,38 @@ msgstr ""
 "Eine erweiterte Beschreibung für diesen Eigenschaftsmodifikator. Diese soll "
 "seine Aufgabe sowie seinen Sinn und Zweck beschreiben."
 
-#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:69
+#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:68
+#: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:84
+msgid "Set based on filter"
+msgstr "Basierend auf Filter setzen"
+
+#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:89
+#: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:103
+#: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:95
+msgid "Filter Expression"
+msgstr "Filterausdruck"
+
+#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:91
+#, fuzzy
+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)"
+
+#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:104
 msgid "Modifier"
 msgstr "Modifikator"
 
-#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:72
+#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:107
 msgid ""
 "A property modifier allows you to modify a specific property at import time"
 msgstr ""
@@ -4248,15 +4258,6 @@ msgstr "Zielfeld"
 msgid "Custom variable"
 msgstr "Benutzerdefinierte Variable"
 
-#: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:84
-msgid "Set based on filter"
-msgstr "Basierend auf Filter setzen"
-
-#: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:103
-#: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:95
-msgid "Filter Expression"
-msgstr "Filterausdruck"
-
 #: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:105
 msgid ""
 "This allows to filter for specific parts within the given source expression. "
@@ -5065,7 +5066,7 @@ msgid "Scheduled Downtimes"
 msgstr "Geplante Downtimes"
 
 #: sources.d/icingaweb2-module-director/library/Director/Dashboard/Dashlet/SelfServiceDashlet.php:13
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:180
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:167
 msgid "Self Service API"
 msgstr "Selbstbedienungs-API"
 
@@ -5525,6 +5526,22 @@ msgstr "Nicht-verknüpfte importierte Eigenschaften"
 msgid "(Host) group resolve cache"
 msgstr "Gruppenmitgliedschaftscache (Hosts)"
 
+#: sources.d/icingaweb2-module-director/library/Director/Field/FormFieldSuggestion.php:78
+msgid "Suggested fields"
+msgstr "Vorgeschlagene Felder"
+
+#: sources.d/icingaweb2-module-director/library/Director/Field/FormFieldSuggestion.php:82
+msgid "Argument macros"
+msgstr "Argument Makros"
+
+#: sources.d/icingaweb2-module-director/library/Director/Field/FormFieldSuggestion.php:86
+msgid "Flags (boolean) arguments"
+msgstr ""
+
+#: sources.d/icingaweb2-module-director/library/Director/Field/FormFieldSuggestion.php:90
+msgid "Other available fields"
+msgstr "Andere verfügbare Felder"
+
 #: sources.d/icingaweb2-module-director/library/Director/IcingaConfig/StateFilterSet.php:20
 msgid "Up"
 msgstr "Up"
@@ -5914,7 +5931,7 @@ msgstr "Änderungen anwenden"
 msgid "Run all rules at once"
 msgstr "Alle Regeln gleichzeitig ausführen"
 
-#: sources.d/icingaweb2-module-director/library/Director/Objects/DirectorDatafield.php:213
+#: sources.d/icingaweb2-module-director/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"
@@ -6246,7 +6263,7 @@ msgstr ""
 "komplette Importvorgang aufgrund ungültiger Daten fehlschlagen lassen"
 
 #: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMakeBoolean.php:42
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:35
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:34
 msgid "Set null"
 msgstr "Auf \"null\" setzen"
 
@@ -6259,15 +6276,15 @@ msgid "Set false"
 msgstr "Auf \"false\" setzen"
 
 #: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMakeBoolean.php:45
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:38
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:37
 msgid "Let the import fail"
 msgstr "Import fehlschlagen lassen"
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:21
+#: sources.d/icingaweb2-module-director/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"
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:30
+#: sources.d/icingaweb2-module-director/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 "
@@ -6277,20 +6294,20 @@ msgstr ""
 "befindet? Es kann ein null Wert zurückgegeben werden, der importierte Wert "
 "unverändert übernommen oder der Importvorgang unterbrochen werden"
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:36
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:35
 msgid "Return lookup key unmodified"
 msgstr "Suchschlüssel unverändert zurück geben"
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:37
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:36
 msgid "Return custom default value"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:46
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:45
 #, fuzzy
 msgid "Default value"
 msgstr "Globale Standard-Zone"
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:49
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:48
 #, fuzzy
 msgid ""
 "This value will be evaluated, and variables like ${some_column} will be "
@@ -7302,37 +7319,27 @@ msgstr "Icinga für Windows"
 msgid "In case you're using %s, please run this Script:"
 msgstr "Falls %s benutzt wird, bitte dieses Script ausführen:"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:158
 #: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:164
-msgid "Icinga 2 Powershell Module"
-msgstr "Icinga 2 Powershell Modul"
-
-#: sources.d/icingaweb2-module-director/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:"
-
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:177
 msgid "Documentation"
 msgstr "Dokumentation"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:192
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:179
 msgid "Configure this Agent via Self Service API"
 msgstr "Konfiguriere diesen Agent über die Selbstbedienungs-API"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:195
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:182
 msgid "Inherited Template Api Key:"
 msgstr "Vom Template geerbter API-Schlüssel:"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:216
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:203
 msgid "Icinga 2 Client documentation"
 msgstr "Icinga 2 Client-Dokumentation"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:221
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:208
 msgid "Top Down"
 msgstr "Top Down"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:234
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:221
 #, php-format
 msgid ""
 "A ticket for this agent could not have been requested from your deployment "
@@ -7341,19 +7348,19 @@ msgstr ""
 "Für diesen Agenten konnte kein Ticket vom Deployment-Endpoint angefordert "
 "werden: %s"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:245
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:232
 msgid "For manual configuration"
 msgstr "Manuelle Konfiguration"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:246
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:233
 msgid "Ticket"
 msgstr "Ticket"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:247
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:234
 msgid "Windows Kickstart Script"
 msgstr "Kickstart-Skript für Windows"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:256
+#: sources.d/icingaweb2-module-director/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 "
@@ -7363,11 +7370,11 @@ msgstr ""
 "sein Zertifikat und erstellt eine minimale icinga2.conf mit welcher der "
 "Agent zu den ihm übergeordneten Systemen verbunden wird"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:260
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:247
 msgid "Linux commandline"
 msgstr "Linux Kommandozeile"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:267
+#: sources.d/icingaweb2-module-director/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 "
@@ -7453,16 +7460,16 @@ msgid "Category Name"
 msgstr "Kategoriename"
 
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldCategoryTable.php:48
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:52
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:54
 msgid "# Used"
 msgstr "# Benutzt"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:51
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:53
 #, fuzzy
 msgid "Category"
 msgstr "Neue Kategorie"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:53
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:55
 msgid "# Vars"
 msgstr "# Vars"
 
@@ -7523,16 +7530,16 @@ msgstr "Servicename"
 msgid "%s %s(%s)"
 msgstr "%s %s(%s)"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:216
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:229
 #, php-format
 msgid "This set has been inherited from %s"
 msgstr "Dieses Set wurde von %s geerbt"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:225
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:238
 msgid "Remove"
 msgstr "Entfernen"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:227
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:240
 #, php-format
 msgid "Remove \"%s\" from this host"
 msgstr "\"%s\" von diesem Host entfernen"
@@ -7551,7 +7558,7 @@ msgstr "Zeitstempel"
 msgid "Imported rows"
 msgstr "Importierte Reihen"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/ObjectSetTable.php:62
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/ObjectSetTable.php:66
 #, php-format
 msgid "%s (%d members)"
 msgstr "%s (%d Mitglieder)"
@@ -7592,7 +7599,7 @@ msgstr "Indirekt"
 msgid "Total"
 msgstr "Gesamt"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/TemplateUsageTable.php:103
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/TemplateUsageTable.php:104
 msgid "This template is not in use"
 msgstr "Diese Vorlage ist nicht in Verwendung"
 
@@ -8081,6 +8088,20 @@ msgstr "%s Objekte wurden verändert"
 msgid "Show all actions"
 msgstr "Verfügbare Optionen anzeigen"
 
+#~ msgid "The caption which should be displayed"
+#~ msgstr "Die Beschriftung, die angezeigt werden soll"
+
+#~ 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:"
+
 #, fuzzy
 #~ msgid "Create a new Service Set"
 #~ msgstr "Erstelle ein neues %s-Set"
diff --git a/src/icingaweb2-module-director/es_AR/LC_MESSAGES/icinga.po b/src/icingaweb2-module-director/es_AR/LC_MESSAGES/icinga.po
index 5edd17ef..a33886ff 100644
--- a/src/icingaweb2-module-director/es_AR/LC_MESSAGES/icinga.po
+++ b/src/icingaweb2-module-director/es_AR/LC_MESSAGES/icinga.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-21 16:06+0000\n"
+"POT-Creation-Date: 2023-09-12 12:59+0000\n"
 "PO-Revision-Date: 2020-04-30 16:15+0200\n"
 "Last-Translator: Juan Cruz Fernandez <juancruz.f87@gmail.com>\n"
 "Language-Team: \n"
@@ -130,8 +130,8 @@ msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/controllers/BasketController.php:238
 #: sources.d/icingaweb2-module-director/application/controllers/SchemaController.php:80
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:236
 #: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:249
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:262
 msgid "Download"
 msgstr ""
 
@@ -318,6 +318,7 @@ msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:384
 #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:395
+#: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:284
 #: sources.d/icingaweb2-module-director/application/forms/SelfServiceSettingsForm.php:252
 #: sources.d/icingaweb2-module-director/application/forms/SettingsForm.php:193
 #: sources.d/icingaweb2-module-director/application/views/helpers/FormDataFilter.php:465
@@ -952,7 +953,7 @@ msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/controllers/ServiceController.php:280
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostVarForm.php:15
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:598
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:601
 #: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:12
 #: sources.d/icingaweb2-module-director/library/Director/Import/ImportSourceDirectorObject.php:71
 #: sources.d/icingaweb2-module-director/library/Director/TranslationDummy.php:13
@@ -1054,7 +1055,7 @@ msgstr ""
 
 #: sources.d/icingaweb2-module-director/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 ""
 
 #: sources.d/icingaweb2-module-director/application/controllers/SyncruleController.php:108
@@ -1513,7 +1514,7 @@ msgstr ""
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldCategoryForm.php:31
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:158
 #: sources.d/icingaweb2-module-director/application/forms/IcingaCommandArgumentForm.php:31
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:134
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:94
 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceSetForm.php:103
 #: sources.d/icingaweb2-module-director/application/forms/IcingaTemplateChoiceForm.php:56
 #: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:52
@@ -1583,7 +1584,7 @@ msgid ""
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:141
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:50
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:52
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaObjectDatafieldTable.php:50
 msgid "Field name"
 msgstr ""
@@ -1595,16 +1596,18 @@ msgid ""
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:149
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:126
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:83
 msgid "Caption"
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:152
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:88
 msgid ""
 "The caption which should be displayed to your users when this field is shown"
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:160
+#: sources.d/icingaweb2-module-director/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"
@@ -1634,7 +1637,7 @@ msgid ""
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatalistEntryForm.php:30
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:49
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:51
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatalistEntryTable.php:55
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaObjectDatafieldTable.php:49
 msgid "Label"
@@ -1775,19 +1778,19 @@ msgstr ""
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostForm.php:40
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostVarForm.php:22
 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceDictionaryMemberForm.php:22
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:576
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:579
 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceVarForm.php:22
 #: sources.d/icingaweb2-module-director/application/forms/IcingaTimePeriodForm.php:15
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/ChoicesTable.php:41
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/CoreApiFieldsTable.php:79
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/CoreApiObjectsTable.php:57
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/CoreApiPrototypesTable.php:40
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/ObjectSetTable.php:46
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/ObjectSetTable.php:50
 msgid "Name"
 msgstr "Nombre"
 
 #: sources.d/icingaweb2-module-director/application/forms/IcingaAddServiceForm.php:147
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:579
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:582
 msgid "Name for the Icinga service you are going to create"
 msgstr ""
 
@@ -2009,7 +2012,7 @@ msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/IcingaCommandArgumentForm.php:181
 #: sources.d/icingaweb2-module-director/application/forms/IcingaScheduledDowntimeRangeForm.php:99
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:778
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:781
 #: sources.d/icingaweb2-module-director/application/forms/IcingaTimePeriodRangeForm.php:94
 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/DirectorObjectForm.php:673
 msgid "No action taken, object has not been modified"
@@ -2122,7 +2125,7 @@ msgstr ""
 #: sources.d/icingaweb2-module-director/application/forms/IcingaDependencyForm.php:100
 #: sources.d/icingaweb2-module-director/application/forms/IcingaNotificationForm.php:90
 #: sources.d/icingaweb2-module-director/application/forms/IcingaScheduledDowntimeForm.php:89
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:712
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:715
 #: sources.d/icingaweb2-module-director/configuration.php:121
 #: sources.d/icingaweb2-module-director/library/Director/Dashboard/Dashlet/HostsDashlet.php:13
 #: sources.d/icingaweb2-module-director/library/Director/DataType/DataTypeDictionary.php:59
@@ -2139,7 +2142,7 @@ msgstr "Huéspedes"
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostGroupForm.php:30
 #: sources.d/icingaweb2-module-director/application/forms/IcingaNotificationForm.php:107
 #: sources.d/icingaweb2-module-director/application/forms/IcingaScheduledDowntimeForm.php:115
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:477
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:480
 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceGroupForm.php:30
 msgid ""
 "This allows you to configure an assignment filter. Please feel free to "
@@ -2361,7 +2364,7 @@ msgid ""
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostForm.php:149
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:698
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:701
 msgid "Icinga Agent and zone settings"
 msgstr ""
 
@@ -2383,7 +2386,7 @@ msgid "Choose a Host Template"
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostForm.php:219
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:650
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:653
 #: sources.d/icingaweb2-module-director/application/forms/IcingaUserForm.php:109
 #: sources.d/icingaweb2-module-director/library/Director/Web/Tabs/ObjectsTabs.php:67
 msgid "Groups"
@@ -2657,64 +2660,44 @@ msgstr ""
 msgid "Check command definition"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:94
-msgid "Suggested fields"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:99
-msgid "Argument macros"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:104
-msgid "Other available fields"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:118
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:75
 msgid ""
 "There are no data fields available. Please ask an administrator to create "
 "such"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:130
-msgid "The caption which should be displayed"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:135
-msgid "A description about the field"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:143
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:148
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:106
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:111
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaObjectDatafieldTable.php:51
 msgid "Mandatory"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:144
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:107
 msgid "Whether this field should be mandatory"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:147
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:110
 msgid "Optional"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:170
+#: sources.d/icingaweb2-module-director/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 "
 "cleared once stored"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:184
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:132
 msgid "Show based on filter"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:194
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:142
 #: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:87
 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/DirectorObjectForm.php:928
 msgid "Delete"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:197
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:145
 msgid "Field has been removed"
 msgstr ""
 
@@ -2824,91 +2807,91 @@ msgstr ""
 msgid "Name for the instance you are going to create"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:137
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:138
 msgid "This Service has been deactivated on this host"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:142
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:143
 #, fuzzy
 msgid "Reactivate"
 msgstr "Inactivo"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:161
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:436
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:468
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:162
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:439
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:471
 msgid "Override vars"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:167
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:168
 msgid "Hints regarding this service"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:174
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:175
 #, fuzzy
 msgid "Deactivate"
 msgstr "Inactivo"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:287
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:290
 #, fuzzy, php-format
 msgid "%s has been deactivated on %s"
 msgstr "Usuario \"%s\" fue editado"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:323
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:326
 #, php-format
 msgid "%s is no longer deactivated on %s"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:385
+#: sources.d/icingaweb2-module-director/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."
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:391
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:394
 #, php-format
 msgid ""
 "This service has been generated using the %s apply rule, assigned where %s"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:404
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:407
 #, php-format
 msgid ""
 "This service belongs to the %s Service Set. Still, you might want to "
 "override the following properties for this host only."
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:416
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:419
 #, php-format
 msgid ""
 "This service has been inherited from %s. Still, you might want to change the "
 "following properties for this host only."
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:444
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:447
 #, php-format
 msgid ""
 "This service belongs to the service set \"%s\". Still, you might want to "
 "change the following properties for this host only."
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:465
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:468
 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/IcingaObjectFieldLoader.php:266
 msgid "Custom properties"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:602
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:605
 msgid "Choose the host this single service should be assigned to"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:624
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:627
 msgid "Apply For"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:626
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:629
 msgid "None"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:628
+#: sources.d/icingaweb2-module-director/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 "
@@ -2917,7 +2900,7 @@ msgid ""
 "eligible."
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:654
+#: sources.d/icingaweb2-module-director/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 "
@@ -2926,17 +2909,17 @@ msgid ""
 "be directly assigned to single services or to service templates."
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:679
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:682
 msgid "Run on agent"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:681
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:684
 msgid ""
 "Whether the check commmand for this service should be executed on the Icinga "
 "agent"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:711
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:714
 #: sources.d/icingaweb2-module-director/library/Director/Import/ImportSourceDirectorObject.php:82
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/DependencyTemplateUsageTable.php:10
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/HostTemplateUsageTable.php:10
@@ -2948,12 +2931,12 @@ msgstr ""
 msgid "Templates"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:767
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:770
 #, php-format
 msgid "All overrides have been removed from \"%s\""
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:768
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:771
 #, php-format
 msgid "The given properties have been stored for \"%s\""
 msgstr ""
@@ -3274,11 +3257,32 @@ msgid ""
 "it's purpose and why it has been put in place at all."
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:69
+#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:68
+#: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:84
+msgid "Set based on filter"
+msgstr ""
+
+#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:89
+#: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:103
+#: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:95
+msgid "Filter Expression"
+msgstr ""
+
+#: sources.d/icingaweb2-module-director/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 ""
+
+#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:104
 msgid "Modifier"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:72
+#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:107
 msgid ""
 "A property modifier allows you to modify a specific property at import time"
 msgstr ""
@@ -3842,15 +3846,6 @@ msgstr ""
 msgid "Custom variable"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:84
-msgid "Set based on filter"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:103
-#: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:95
-msgid "Filter Expression"
-msgstr ""
-
 #: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:105
 msgid ""
 "This allows to filter for specific parts within the given source expression. "
@@ -4590,7 +4585,7 @@ msgid "Scheduled Downtimes"
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/library/Director/Dashboard/Dashlet/SelfServiceDashlet.php:13
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:180
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:167
 msgid "Self Service API"
 msgstr ""
 
@@ -4985,6 +4980,22 @@ msgstr ""
 msgid "(Host) group resolve cache"
 msgstr ""
 
+#: sources.d/icingaweb2-module-director/library/Director/Field/FormFieldSuggestion.php:78
+msgid "Suggested fields"
+msgstr ""
+
+#: sources.d/icingaweb2-module-director/library/Director/Field/FormFieldSuggestion.php:82
+msgid "Argument macros"
+msgstr ""
+
+#: sources.d/icingaweb2-module-director/library/Director/Field/FormFieldSuggestion.php:86
+msgid "Flags (boolean) arguments"
+msgstr ""
+
+#: sources.d/icingaweb2-module-director/library/Director/Field/FormFieldSuggestion.php:90
+msgid "Other available fields"
+msgstr ""
+
 #: sources.d/icingaweb2-module-director/library/Director/IcingaConfig/StateFilterSet.php:20
 msgid "Up"
 msgstr "Arriba"
@@ -5330,7 +5341,7 @@ msgstr ""
 msgid "Run all rules at once"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Objects/DirectorDatafield.php:213
+#: sources.d/icingaweb2-module-director/library/Director/Objects/DirectorDatafield.php:204
 #, php-format
 msgid "Form element could not be created, %s is missing"
 msgstr ""
@@ -5634,7 +5645,7 @@ msgid ""
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMakeBoolean.php:42
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:35
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:34
 msgid "Set null"
 msgstr ""
 
@@ -5647,34 +5658,34 @@ msgid "Set false"
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMakeBoolean.php:45
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:38
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:37
 msgid "Let the import fail"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:21
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:20
 msgid "Please choose a data list that can be used for map lookups"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:30
+#: sources.d/icingaweb2-module-director/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 "
 "the import process"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:36
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:35
 msgid "Return lookup key unmodified"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:37
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:36
 msgid "Return custom default value"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:46
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:45
 msgid "Default value"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:49
+#: sources.d/icingaweb2-module-director/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 "
@@ -6605,67 +6616,57 @@ msgstr ""
 msgid "In case you're using %s, please run this Script:"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:158
 #: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:164
-msgid "Icinga 2 Powershell Module"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:160
-#, php-format
-msgid "In case you're using the legacy %s, please run:"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:177
 msgid "Documentation"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:192
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:179
 msgid "Configure this Agent via Self Service API"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:195
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:182
 msgid "Inherited Template Api Key:"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:216
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:203
 msgid "Icinga 2 Client documentation"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:221
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:208
 msgid "Top Down"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:234
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:221
 #, php-format
 msgid ""
 "A ticket for this agent could not have been requested from your deployment "
 "endpoint: %s"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:245
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:232
 msgid "For manual configuration"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:246
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:233
 msgid "Ticket"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:247
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:234
 msgid "Windows Kickstart Script"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:256
+#: sources.d/icingaweb2-module-director/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 "
 "connected to it's parents"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:260
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:247
 msgid "Linux commandline"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:267
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:255
 msgid "Just download and run this script on your Linux Client Machine:"
 msgstr ""
 
@@ -6749,15 +6750,15 @@ msgid "Category Name"
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldCategoryTable.php:48
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:52
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:54
 msgid "# Used"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:51
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:53
 msgid "Category"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:53
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:55
 msgid "# Vars"
 msgstr ""
 
@@ -6818,17 +6819,17 @@ msgstr ""
 msgid "%s %s(%s)"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:216
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:229
 #, php-format
 msgid "This set has been inherited from %s"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:225
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:238
 #, fuzzy
 msgid "Remove"
 msgstr "Remover"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:227
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:240
 #, php-format
 msgid "Remove \"%s\" from this host"
 msgstr ""
@@ -6847,7 +6848,7 @@ msgstr ""
 msgid "Imported rows"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/ObjectSetTable.php:62
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/ObjectSetTable.php:66
 #, php-format
 msgid "%s (%d members)"
 msgstr ""
@@ -6886,7 +6887,7 @@ msgstr ""
 msgid "Total"
 msgstr "Total"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/TemplateUsageTable.php:103
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/TemplateUsageTable.php:104
 msgid "This template is not in use"
 msgstr ""
 
diff --git a/src/icingaweb2-module-director/fi_FI/LC_MESSAGES/icinga.po b/src/icingaweb2-module-director/fi_FI/LC_MESSAGES/icinga.po
index 95dc069d..ce216461 100644
--- a/src/icingaweb2-module-director/fi_FI/LC_MESSAGES/icinga.po
+++ b/src/icingaweb2-module-director/fi_FI/LC_MESSAGES/icinga.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-21 16:06+0000\n"
+"POT-Creation-Date: 2023-09-12 12:59+0000\n"
 "PO-Revision-Date: 2020-04-27 14:34+0200\n"
 "Last-Translator: Mikko Peltokangas <mikko@peltokangas.org>\n"
 "Language-Team: \n"
@@ -130,8 +130,8 @@ msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/controllers/BasketController.php:238
 #: sources.d/icingaweb2-module-director/application/controllers/SchemaController.php:80
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:236
 #: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:249
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:262
 msgid "Download"
 msgstr ""
 
@@ -318,6 +318,7 @@ msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:384
 #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:395
+#: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:284
 #: sources.d/icingaweb2-module-director/application/forms/SelfServiceSettingsForm.php:252
 #: sources.d/icingaweb2-module-director/application/forms/SettingsForm.php:193
 #: sources.d/icingaweb2-module-director/application/views/helpers/FormDataFilter.php:465
@@ -949,7 +950,7 @@ msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/controllers/ServiceController.php:280
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostVarForm.php:15
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:598
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:601
 #: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:12
 #: sources.d/icingaweb2-module-director/library/Director/Import/ImportSourceDirectorObject.php:71
 #: sources.d/icingaweb2-module-director/library/Director/TranslationDummy.php:13
@@ -1050,7 +1051,7 @@ msgstr ""
 
 #: sources.d/icingaweb2-module-director/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 ""
 
 #: sources.d/icingaweb2-module-director/application/controllers/SyncruleController.php:108
@@ -1506,7 +1507,7 @@ msgstr ""
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldCategoryForm.php:31
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:158
 #: sources.d/icingaweb2-module-director/application/forms/IcingaCommandArgumentForm.php:31
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:134
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:94
 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceSetForm.php:103
 #: sources.d/icingaweb2-module-director/application/forms/IcingaTemplateChoiceForm.php:56
 #: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:52
@@ -1576,7 +1577,7 @@ msgid ""
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:141
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:50
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:52
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaObjectDatafieldTable.php:50
 msgid "Field name"
 msgstr ""
@@ -1588,16 +1589,18 @@ msgid ""
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:149
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:126
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:83
 msgid "Caption"
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:152
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:88
 msgid ""
 "The caption which should be displayed to your users when this field is shown"
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:160
+#: sources.d/icingaweb2-module-director/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"
@@ -1627,7 +1630,7 @@ msgid ""
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatalistEntryForm.php:30
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:49
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:51
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatalistEntryTable.php:55
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaObjectDatafieldTable.php:49
 msgid "Label"
@@ -1767,19 +1770,19 @@ msgstr ""
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostForm.php:40
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostVarForm.php:22
 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceDictionaryMemberForm.php:22
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:576
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:579
 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceVarForm.php:22
 #: sources.d/icingaweb2-module-director/application/forms/IcingaTimePeriodForm.php:15
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/ChoicesTable.php:41
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/CoreApiFieldsTable.php:79
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/CoreApiObjectsTable.php:57
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/CoreApiPrototypesTable.php:40
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/ObjectSetTable.php:46
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/ObjectSetTable.php:50
 msgid "Name"
 msgstr "Nimi"
 
 #: sources.d/icingaweb2-module-director/application/forms/IcingaAddServiceForm.php:147
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:579
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:582
 msgid "Name for the Icinga service you are going to create"
 msgstr ""
 
@@ -2001,7 +2004,7 @@ msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/IcingaCommandArgumentForm.php:181
 #: sources.d/icingaweb2-module-director/application/forms/IcingaScheduledDowntimeRangeForm.php:99
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:778
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:781
 #: sources.d/icingaweb2-module-director/application/forms/IcingaTimePeriodRangeForm.php:94
 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/DirectorObjectForm.php:673
 msgid "No action taken, object has not been modified"
@@ -2114,7 +2117,7 @@ msgstr ""
 #: sources.d/icingaweb2-module-director/application/forms/IcingaDependencyForm.php:100
 #: sources.d/icingaweb2-module-director/application/forms/IcingaNotificationForm.php:90
 #: sources.d/icingaweb2-module-director/application/forms/IcingaScheduledDowntimeForm.php:89
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:712
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:715
 #: sources.d/icingaweb2-module-director/configuration.php:121
 #: sources.d/icingaweb2-module-director/library/Director/Dashboard/Dashlet/HostsDashlet.php:13
 #: sources.d/icingaweb2-module-director/library/Director/DataType/DataTypeDictionary.php:59
@@ -2131,7 +2134,7 @@ msgstr "Hostit"
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostGroupForm.php:30
 #: sources.d/icingaweb2-module-director/application/forms/IcingaNotificationForm.php:107
 #: sources.d/icingaweb2-module-director/application/forms/IcingaScheduledDowntimeForm.php:115
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:477
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:480
 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceGroupForm.php:30
 msgid ""
 "This allows you to configure an assignment filter. Please feel free to "
@@ -2353,7 +2356,7 @@ msgid ""
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostForm.php:149
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:698
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:701
 msgid "Icinga Agent and zone settings"
 msgstr ""
 
@@ -2375,7 +2378,7 @@ msgid "Choose a Host Template"
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostForm.php:219
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:650
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:653
 #: sources.d/icingaweb2-module-director/application/forms/IcingaUserForm.php:109
 #: sources.d/icingaweb2-module-director/library/Director/Web/Tabs/ObjectsTabs.php:67
 msgid "Groups"
@@ -2647,64 +2650,44 @@ msgstr ""
 msgid "Check command definition"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:94
-msgid "Suggested fields"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:99
-msgid "Argument macros"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:104
-msgid "Other available fields"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:118
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:75
 msgid ""
 "There are no data fields available. Please ask an administrator to create "
 "such"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:130
-msgid "The caption which should be displayed"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:135
-msgid "A description about the field"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:143
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:148
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:106
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:111
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaObjectDatafieldTable.php:51
 msgid "Mandatory"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:144
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:107
 msgid "Whether this field should be mandatory"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:147
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:110
 msgid "Optional"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:170
+#: sources.d/icingaweb2-module-director/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 "
 "cleared once stored"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:184
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:132
 msgid "Show based on filter"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:194
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:142
 #: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:87
 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/DirectorObjectForm.php:928
 msgid "Delete"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:197
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:145
 msgid "Field has been removed"
 msgstr ""
 
@@ -2814,89 +2797,89 @@ msgstr ""
 msgid "Name for the instance you are going to create"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:137
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:138
 msgid "This Service has been deactivated on this host"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:142
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:143
 msgid "Reactivate"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:161
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:436
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:468
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:162
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:439
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:471
 msgid "Override vars"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:167
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:168
 msgid "Hints regarding this service"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:174
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:175
 msgid "Deactivate"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:287
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:290
 #, php-format
 msgid "%s has been deactivated on %s"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:323
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:326
 #, php-format
 msgid "%s is no longer deactivated on %s"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:385
+#: sources.d/icingaweb2-module-director/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."
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:391
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:394
 #, php-format
 msgid ""
 "This service has been generated using the %s apply rule, assigned where %s"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:404
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:407
 #, php-format
 msgid ""
 "This service belongs to the %s Service Set. Still, you might want to "
 "override the following properties for this host only."
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:416
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:419
 #, php-format
 msgid ""
 "This service has been inherited from %s. Still, you might want to change the "
 "following properties for this host only."
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:444
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:447
 #, php-format
 msgid ""
 "This service belongs to the service set \"%s\". Still, you might want to "
 "change the following properties for this host only."
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:465
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:468
 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/IcingaObjectFieldLoader.php:266
 msgid "Custom properties"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:602
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:605
 msgid "Choose the host this single service should be assigned to"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:624
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:627
 msgid "Apply For"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:626
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:629
 msgid "None"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:628
+#: sources.d/icingaweb2-module-director/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 "
@@ -2905,7 +2888,7 @@ msgid ""
 "eligible."
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:654
+#: sources.d/icingaweb2-module-director/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 "
@@ -2914,17 +2897,17 @@ msgid ""
 "be directly assigned to single services or to service templates."
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:679
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:682
 msgid "Run on agent"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:681
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:684
 msgid ""
 "Whether the check commmand for this service should be executed on the Icinga "
 "agent"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:711
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:714
 #: sources.d/icingaweb2-module-director/library/Director/Import/ImportSourceDirectorObject.php:82
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/DependencyTemplateUsageTable.php:10
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/HostTemplateUsageTable.php:10
@@ -2936,12 +2919,12 @@ msgstr ""
 msgid "Templates"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:767
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:770
 #, php-format
 msgid "All overrides have been removed from \"%s\""
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:768
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:771
 #, php-format
 msgid "The given properties have been stored for \"%s\""
 msgstr ""
@@ -3262,11 +3245,32 @@ msgid ""
 "it's purpose and why it has been put in place at all."
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:69
+#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:68
+#: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:84
+msgid "Set based on filter"
+msgstr ""
+
+#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:89
+#: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:103
+#: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:95
+msgid "Filter Expression"
+msgstr ""
+
+#: sources.d/icingaweb2-module-director/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 ""
+
+#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:104
 msgid "Modifier"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:72
+#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:107
 msgid ""
 "A property modifier allows you to modify a specific property at import time"
 msgstr ""
@@ -3829,15 +3833,6 @@ msgstr ""
 msgid "Custom variable"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:84
-msgid "Set based on filter"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:103
-#: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:95
-msgid "Filter Expression"
-msgstr ""
-
 #: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:105
 msgid ""
 "This allows to filter for specific parts within the given source expression. "
@@ -4572,7 +4567,7 @@ msgid "Scheduled Downtimes"
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/library/Director/Dashboard/Dashlet/SelfServiceDashlet.php:13
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:180
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:167
 msgid "Self Service API"
 msgstr ""
 
@@ -4965,6 +4960,22 @@ msgstr ""
 msgid "(Host) group resolve cache"
 msgstr ""
 
+#: sources.d/icingaweb2-module-director/library/Director/Field/FormFieldSuggestion.php:78
+msgid "Suggested fields"
+msgstr ""
+
+#: sources.d/icingaweb2-module-director/library/Director/Field/FormFieldSuggestion.php:82
+msgid "Argument macros"
+msgstr ""
+
+#: sources.d/icingaweb2-module-director/library/Director/Field/FormFieldSuggestion.php:86
+msgid "Flags (boolean) arguments"
+msgstr ""
+
+#: sources.d/icingaweb2-module-director/library/Director/Field/FormFieldSuggestion.php:90
+msgid "Other available fields"
+msgstr ""
+
 #: sources.d/icingaweb2-module-director/library/Director/IcingaConfig/StateFilterSet.php:20
 msgid "Up"
 msgstr ""
@@ -5309,7 +5320,7 @@ msgstr ""
 msgid "Run all rules at once"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Objects/DirectorDatafield.php:213
+#: sources.d/icingaweb2-module-director/library/Director/Objects/DirectorDatafield.php:204
 #, php-format
 msgid "Form element could not be created, %s is missing"
 msgstr ""
@@ -5613,7 +5624,7 @@ msgid ""
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMakeBoolean.php:42
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:35
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:34
 msgid "Set null"
 msgstr ""
 
@@ -5626,34 +5637,34 @@ msgid "Set false"
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMakeBoolean.php:45
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:38
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:37
 msgid "Let the import fail"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:21
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:20
 msgid "Please choose a data list that can be used for map lookups"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:30
+#: sources.d/icingaweb2-module-director/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 "
 "the import process"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:36
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:35
 msgid "Return lookup key unmodified"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:37
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:36
 msgid "Return custom default value"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:46
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:45
 msgid "Default value"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:49
+#: sources.d/icingaweb2-module-director/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 "
@@ -6579,67 +6590,57 @@ msgstr ""
 msgid "In case you're using %s, please run this Script:"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:158
 #: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:164
-msgid "Icinga 2 Powershell Module"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:160
-#, php-format
-msgid "In case you're using the legacy %s, please run:"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:177
 msgid "Documentation"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:192
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:179
 msgid "Configure this Agent via Self Service API"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:195
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:182
 msgid "Inherited Template Api Key:"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:216
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:203
 msgid "Icinga 2 Client documentation"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:221
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:208
 msgid "Top Down"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:234
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:221
 #, php-format
 msgid ""
 "A ticket for this agent could not have been requested from your deployment "
 "endpoint: %s"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:245
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:232
 msgid "For manual configuration"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:246
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:233
 msgid "Ticket"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:247
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:234
 msgid "Windows Kickstart Script"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:256
+#: sources.d/icingaweb2-module-director/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 "
 "connected to it's parents"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:260
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:247
 msgid "Linux commandline"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:267
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:255
 msgid "Just download and run this script on your Linux Client Machine:"
 msgstr ""
 
@@ -6723,15 +6724,15 @@ msgid "Category Name"
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldCategoryTable.php:48
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:52
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:54
 msgid "# Used"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:51
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:53
 msgid "Category"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:53
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:55
 msgid "# Vars"
 msgstr ""
 
@@ -6792,16 +6793,16 @@ msgstr ""
 msgid "%s %s(%s)"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:216
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:229
 #, php-format
 msgid "This set has been inherited from %s"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:225
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:238
 msgid "Remove"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:227
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:240
 #, php-format
 msgid "Remove \"%s\" from this host"
 msgstr ""
@@ -6820,7 +6821,7 @@ msgstr ""
 msgid "Imported rows"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/ObjectSetTable.php:62
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/ObjectSetTable.php:66
 #, php-format
 msgid "%s (%d members)"
 msgstr ""
@@ -6859,7 +6860,7 @@ msgstr ""
 msgid "Total"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/TemplateUsageTable.php:103
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/TemplateUsageTable.php:104
 msgid "This template is not in use"
 msgstr ""
 
diff --git a/src/icingaweb2-module-director/fr_FR/LC_MESSAGES/icinga.po b/src/icingaweb2-module-director/fr_FR/LC_MESSAGES/icinga.po
index d02d9e1f..29539246 100644
--- a/src/icingaweb2-module-director/fr_FR/LC_MESSAGES/icinga.po
+++ b/src/icingaweb2-module-director/fr_FR/LC_MESSAGES/icinga.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-21 16:06+0000\n"
+"POT-Creation-Date: 2023-09-12 12:59+0000\n"
 "PO-Revision-Date: 2021-07-13 14:54-0400\n"
 "Last-Translator: Mathieu Lutfy <mathieu@symbiotic.coop>\n"
 "Language-Team: \n"
@@ -130,8 +130,8 @@ msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/controllers/BasketController.php:238
 #: sources.d/icingaweb2-module-director/application/controllers/SchemaController.php:80
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:236
 #: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:249
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:262
 msgid "Download"
 msgstr ""
 
@@ -318,6 +318,7 @@ msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:384
 #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:395
+#: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:284
 #: sources.d/icingaweb2-module-director/application/forms/SelfServiceSettingsForm.php:252
 #: sources.d/icingaweb2-module-director/application/forms/SettingsForm.php:193
 #: sources.d/icingaweb2-module-director/application/views/helpers/FormDataFilter.php:465
@@ -948,7 +949,7 @@ msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/controllers/ServiceController.php:280
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostVarForm.php:15
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:598
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:601
 #: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:12
 #: sources.d/icingaweb2-module-director/library/Director/Import/ImportSourceDirectorObject.php:71
 #: sources.d/icingaweb2-module-director/library/Director/TranslationDummy.php:13
@@ -1049,7 +1050,7 @@ msgstr ""
 
 #: sources.d/icingaweb2-module-director/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 ""
 
 #: sources.d/icingaweb2-module-director/application/controllers/SyncruleController.php:108
@@ -1507,7 +1508,7 @@ msgstr ""
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldCategoryForm.php:31
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:158
 #: sources.d/icingaweb2-module-director/application/forms/IcingaCommandArgumentForm.php:31
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:134
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:94
 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceSetForm.php:103
 #: sources.d/icingaweb2-module-director/application/forms/IcingaTemplateChoiceForm.php:56
 #: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:52
@@ -1577,7 +1578,7 @@ msgid ""
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:141
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:50
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:52
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaObjectDatafieldTable.php:50
 msgid "Field name"
 msgstr ""
@@ -1589,16 +1590,18 @@ msgid ""
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:149
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:126
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:83
 msgid "Caption"
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:152
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:88
 msgid ""
 "The caption which should be displayed to your users when this field is shown"
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:160
+#: sources.d/icingaweb2-module-director/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"
@@ -1628,7 +1631,7 @@ msgid ""
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatalistEntryForm.php:30
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:49
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:51
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatalistEntryTable.php:55
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaObjectDatafieldTable.php:49
 msgid "Label"
@@ -1768,19 +1771,19 @@ msgstr ""
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostForm.php:40
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostVarForm.php:22
 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceDictionaryMemberForm.php:22
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:576
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:579
 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceVarForm.php:22
 #: sources.d/icingaweb2-module-director/application/forms/IcingaTimePeriodForm.php:15
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/ChoicesTable.php:41
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/CoreApiFieldsTable.php:79
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/CoreApiObjectsTable.php:57
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/CoreApiPrototypesTable.php:40
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/ObjectSetTable.php:46
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/ObjectSetTable.php:50
 msgid "Name"
 msgstr "Nom"
 
 #: sources.d/icingaweb2-module-director/application/forms/IcingaAddServiceForm.php:147
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:579
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:582
 msgid "Name for the Icinga service you are going to create"
 msgstr ""
 
@@ -2002,7 +2005,7 @@ msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/IcingaCommandArgumentForm.php:181
 #: sources.d/icingaweb2-module-director/application/forms/IcingaScheduledDowntimeRangeForm.php:99
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:778
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:781
 #: sources.d/icingaweb2-module-director/application/forms/IcingaTimePeriodRangeForm.php:94
 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/DirectorObjectForm.php:673
 msgid "No action taken, object has not been modified"
@@ -2115,7 +2118,7 @@ msgstr ""
 #: sources.d/icingaweb2-module-director/application/forms/IcingaDependencyForm.php:100
 #: sources.d/icingaweb2-module-director/application/forms/IcingaNotificationForm.php:90
 #: sources.d/icingaweb2-module-director/application/forms/IcingaScheduledDowntimeForm.php:89
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:712
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:715
 #: sources.d/icingaweb2-module-director/configuration.php:121
 #: sources.d/icingaweb2-module-director/library/Director/Dashboard/Dashlet/HostsDashlet.php:13
 #: sources.d/icingaweb2-module-director/library/Director/DataType/DataTypeDictionary.php:59
@@ -2132,7 +2135,7 @@ msgstr "Hôtes"
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostGroupForm.php:30
 #: sources.d/icingaweb2-module-director/application/forms/IcingaNotificationForm.php:107
 #: sources.d/icingaweb2-module-director/application/forms/IcingaScheduledDowntimeForm.php:115
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:477
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:480
 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceGroupForm.php:30
 msgid ""
 "This allows you to configure an assignment filter. Please feel free to "
@@ -2353,7 +2356,7 @@ msgid ""
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostForm.php:149
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:698
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:701
 msgid "Icinga Agent and zone settings"
 msgstr ""
 
@@ -2375,7 +2378,7 @@ msgid "Choose a Host Template"
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostForm.php:219
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:650
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:653
 #: sources.d/icingaweb2-module-director/application/forms/IcingaUserForm.php:109
 #: sources.d/icingaweb2-module-director/library/Director/Web/Tabs/ObjectsTabs.php:67
 msgid "Groups"
@@ -2645,64 +2648,44 @@ msgstr ""
 msgid "Check command definition"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:94
-msgid "Suggested fields"
-msgstr "Champs suggérés"
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:99
-msgid "Argument macros"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:104
-msgid "Other available fields"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:118
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:75
 msgid ""
 "There are no data fields available. Please ask an administrator to create "
 "such"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:130
-msgid "The caption which should be displayed"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:135
-msgid "A description about the field"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:143
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:148
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:106
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:111
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaObjectDatafieldTable.php:51
 msgid "Mandatory"
 msgstr "Obligatoire"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:144
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:107
 msgid "Whether this field should be mandatory"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:147
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:110
 msgid "Optional"
 msgstr "Optionnel"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:170
+#: sources.d/icingaweb2-module-director/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 "
 "cleared once stored"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:184
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:132
 msgid "Show based on filter"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:194
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:142
 #: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:87
 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/DirectorObjectForm.php:928
 msgid "Delete"
 msgstr "Supprimer"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:197
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:145
 msgid "Field has been removed"
 msgstr ""
 
@@ -2812,89 +2795,89 @@ msgstr ""
 msgid "Name for the instance you are going to create"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:137
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:138
 msgid "This Service has been deactivated on this host"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:142
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:143
 msgid "Reactivate"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:161
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:436
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:468
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:162
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:439
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:471
 msgid "Override vars"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:167
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:168
 msgid "Hints regarding this service"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:174
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:175
 msgid "Deactivate"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:287
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:290
 #, php-format
 msgid "%s has been deactivated on %s"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:323
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:326
 #, php-format
 msgid "%s is no longer deactivated on %s"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:385
+#: sources.d/icingaweb2-module-director/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."
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:391
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:394
 #, php-format
 msgid ""
 "This service has been generated using the %s apply rule, assigned where %s"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:404
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:407
 #, php-format
 msgid ""
 "This service belongs to the %s Service Set. Still, you might want to "
 "override the following properties for this host only."
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:416
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:419
 #, php-format
 msgid ""
 "This service has been inherited from %s. Still, you might want to change the "
 "following properties for this host only."
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:444
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:447
 #, php-format
 msgid ""
 "This service belongs to the service set \"%s\". Still, you might want to "
 "change the following properties for this host only."
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:465
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:468
 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/IcingaObjectFieldLoader.php:266
 msgid "Custom properties"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:602
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:605
 msgid "Choose the host this single service should be assigned to"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:624
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:627
 msgid "Apply For"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:626
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:629
 msgid "None"
 msgstr "Aucun"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:628
+#: sources.d/icingaweb2-module-director/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 "
@@ -2903,7 +2886,7 @@ msgid ""
 "eligible."
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:654
+#: sources.d/icingaweb2-module-director/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 "
@@ -2912,17 +2895,17 @@ msgid ""
 "be directly assigned to single services or to service templates."
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:679
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:682
 msgid "Run on agent"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:681
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:684
 msgid ""
 "Whether the check commmand for this service should be executed on the Icinga "
 "agent"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:711
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:714
 #: sources.d/icingaweb2-module-director/library/Director/Import/ImportSourceDirectorObject.php:82
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/DependencyTemplateUsageTable.php:10
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/HostTemplateUsageTable.php:10
@@ -2934,12 +2917,12 @@ msgstr ""
 msgid "Templates"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:767
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:770
 #, php-format
 msgid "All overrides have been removed from \"%s\""
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:768
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:771
 #, php-format
 msgid "The given properties have been stored for \"%s\""
 msgstr ""
@@ -3260,11 +3243,32 @@ msgid ""
 "it's purpose and why it has been put in place at all."
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:69
+#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:68
+#: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:84
+msgid "Set based on filter"
+msgstr ""
+
+#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:89
+#: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:103
+#: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:95
+msgid "Filter Expression"
+msgstr ""
+
+#: sources.d/icingaweb2-module-director/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 ""
+
+#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:104
 msgid "Modifier"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:72
+#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:107
 msgid ""
 "A property modifier allows you to modify a specific property at import time"
 msgstr ""
@@ -3827,15 +3831,6 @@ msgstr ""
 msgid "Custom variable"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:84
-msgid "Set based on filter"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:103
-#: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:95
-msgid "Filter Expression"
-msgstr ""
-
 #: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:105
 msgid ""
 "This allows to filter for specific parts within the given source expression. "
@@ -4569,7 +4564,7 @@ msgid "Scheduled Downtimes"
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/library/Director/Dashboard/Dashlet/SelfServiceDashlet.php:13
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:180
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:167
 msgid "Self Service API"
 msgstr ""
 
@@ -4962,6 +4957,22 @@ msgstr ""
 msgid "(Host) group resolve cache"
 msgstr ""
 
+#: sources.d/icingaweb2-module-director/library/Director/Field/FormFieldSuggestion.php:78
+msgid "Suggested fields"
+msgstr "Champs suggérés"
+
+#: sources.d/icingaweb2-module-director/library/Director/Field/FormFieldSuggestion.php:82
+msgid "Argument macros"
+msgstr ""
+
+#: sources.d/icingaweb2-module-director/library/Director/Field/FormFieldSuggestion.php:86
+msgid "Flags (boolean) arguments"
+msgstr ""
+
+#: sources.d/icingaweb2-module-director/library/Director/Field/FormFieldSuggestion.php:90
+msgid "Other available fields"
+msgstr ""
+
 #: sources.d/icingaweb2-module-director/library/Director/IcingaConfig/StateFilterSet.php:20
 msgid "Up"
 msgstr ""
@@ -5304,7 +5315,7 @@ msgstr ""
 msgid "Run all rules at once"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Objects/DirectorDatafield.php:213
+#: sources.d/icingaweb2-module-director/library/Director/Objects/DirectorDatafield.php:204
 #, php-format
 msgid "Form element could not be created, %s is missing"
 msgstr ""
@@ -5607,7 +5618,7 @@ msgid ""
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMakeBoolean.php:42
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:35
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:34
 msgid "Set null"
 msgstr ""
 
@@ -5620,34 +5631,34 @@ msgid "Set false"
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMakeBoolean.php:45
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:38
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:37
 msgid "Let the import fail"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:21
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:20
 msgid "Please choose a data list that can be used for map lookups"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:30
+#: sources.d/icingaweb2-module-director/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 "
 "the import process"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:36
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:35
 msgid "Return lookup key unmodified"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:37
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:36
 msgid "Return custom default value"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:46
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:45
 msgid "Default value"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:49
+#: sources.d/icingaweb2-module-director/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 "
@@ -6573,67 +6584,57 @@ msgstr ""
 msgid "In case you're using %s, please run this Script:"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:158
 #: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:164
-msgid "Icinga 2 Powershell Module"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:160
-#, php-format
-msgid "In case you're using the legacy %s, please run:"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:177
 msgid "Documentation"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:192
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:179
 msgid "Configure this Agent via Self Service API"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:195
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:182
 msgid "Inherited Template Api Key:"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:216
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:203
 msgid "Icinga 2 Client documentation"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:221
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:208
 msgid "Top Down"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:234
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:221
 #, php-format
 msgid ""
 "A ticket for this agent could not have been requested from your deployment "
 "endpoint: %s"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:245
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:232
 msgid "For manual configuration"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:246
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:233
 msgid "Ticket"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:247
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:234
 msgid "Windows Kickstart Script"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:256
+#: sources.d/icingaweb2-module-director/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 "
 "connected to it's parents"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:260
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:247
 msgid "Linux commandline"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:267
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:255
 msgid "Just download and run this script on your Linux Client Machine:"
 msgstr ""
 
@@ -6716,15 +6717,15 @@ msgid "Category Name"
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldCategoryTable.php:48
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:52
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:54
 msgid "# Used"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:51
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:53
 msgid "Category"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:53
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:55
 msgid "# Vars"
 msgstr ""
 
@@ -6785,16 +6786,16 @@ msgstr ""
 msgid "%s %s(%s)"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:216
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:229
 #, php-format
 msgid "This set has been inherited from %s"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:225
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:238
 msgid "Remove"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:227
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:240
 #, php-format
 msgid "Remove \"%s\" from this host"
 msgstr ""
@@ -6813,7 +6814,7 @@ msgstr ""
 msgid "Imported rows"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/ObjectSetTable.php:62
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/ObjectSetTable.php:66
 #, php-format
 msgid "%s (%d members)"
 msgstr ""
@@ -6852,7 +6853,7 @@ msgstr ""
 msgid "Total"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/TemplateUsageTable.php:103
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/TemplateUsageTable.php:104
 msgid "This template is not in use"
 msgstr ""
 
diff --git a/src/icingaweb2-module-director/it_IT/LC_MESSAGES/icinga.po b/src/icingaweb2-module-director/it_IT/LC_MESSAGES/icinga.po
index 651a5e94..5237ad9d 100644
--- a/src/icingaweb2-module-director/it_IT/LC_MESSAGES/icinga.po
+++ b/src/icingaweb2-module-director/it_IT/LC_MESSAGES/icinga.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-21 16:06+0000\n"
+"POT-Creation-Date: 2023-09-12 12:59+0000\n"
 "PO-Revision-Date: 2020-04-27 14:45+0200\n"
 "Last-Translator: Francesco Mazzi <fmazzi@comune.genova.it>\n"
 "Language-Team: \n"
@@ -133,8 +133,8 @@ msgstr "Ripristina"
 
 #: sources.d/icingaweb2-module-director/application/controllers/BasketController.php:238
 #: sources.d/icingaweb2-module-director/application/controllers/SchemaController.php:80
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:236
 #: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:249
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:262
 msgid "Download"
 msgstr "Scarica"
 
@@ -334,6 +334,7 @@ msgstr "Differenze configurazione"
 
 #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:384
 #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:395
+#: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:284
 #: sources.d/icingaweb2-module-director/application/forms/SelfServiceSettingsForm.php:252
 #: sources.d/icingaweb2-module-director/application/forms/SettingsForm.php:193
 #: sources.d/icingaweb2-module-director/application/views/helpers/FormDataFilter.php:465
@@ -988,7 +989,7 @@ msgstr "Applica: %s"
 
 #: sources.d/icingaweb2-module-director/application/controllers/ServiceController.php:280
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostVarForm.php:15
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:598
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:601
 #: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:12
 #: sources.d/icingaweb2-module-director/library/Director/Import/ImportSourceDirectorObject.php:71
 #: sources.d/icingaweb2-module-director/library/Director/TranslationDummy.php:13
@@ -1094,8 +1095,8 @@ msgstr ""
 "verificare la presenza di modifiche o eseguire una nuova sincronizzazione."
 
 #: sources.d/icingaweb2-module-director/application/controllers/SyncruleController.php:97
-#, php-format
-msgid "This Sync Rule was last found to by in Sync at %s."
+#, fuzzy, php-format
+msgid "This Sync Rule was last found to be in Sync at %s."
 msgstr ""
 "Questa regola di sincronizzazione è stata sincronizzata l'ultima volta il %s."
 
@@ -1586,7 +1587,7 @@ msgstr ""
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldCategoryForm.php:31
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:158
 #: sources.d/icingaweb2-module-director/application/forms/IcingaCommandArgumentForm.php:31
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:134
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:94
 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceSetForm.php:103
 #: sources.d/icingaweb2-module-director/application/forms/IcingaTemplateChoiceForm.php:56
 #: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:52
@@ -1681,7 +1682,7 @@ msgstr ""
 "modo."
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:141
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:50
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:52
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaObjectDatafieldTable.php:50
 msgid "Field name"
 msgstr "Nome del campo"
@@ -1696,11 +1697,12 @@ msgstr ""
 "proprietà personalizzata nella configurazione resa da Icinga."
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:149
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:126
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:83
 msgid "Caption"
 msgstr "Didascalia"
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:152
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:88
 msgid ""
 "The caption which should be displayed to your users when this field is shown"
 msgstr ""
@@ -1708,6 +1710,7 @@ msgstr ""
 "mostrato questo campo"
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:160
+#: sources.d/icingaweb2-module-director/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"
@@ -1741,7 +1744,7 @@ msgstr ""
 "viene scelta dalla lista"
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatalistEntryForm.php:30
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:49
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:51
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatalistEntryTable.php:55
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaObjectDatafieldTable.php:49
 msgid "Label"
@@ -1898,20 +1901,20 @@ msgstr "Scegli un Service template"
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostForm.php:40
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostVarForm.php:22
 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceDictionaryMemberForm.php:22
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:576
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:579
 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceVarForm.php:22
 #: sources.d/icingaweb2-module-director/application/forms/IcingaTimePeriodForm.php:15
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/ChoicesTable.php:41
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/CoreApiFieldsTable.php:79
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/CoreApiObjectsTable.php:57
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/CoreApiPrototypesTable.php:40
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/ObjectSetTable.php:46
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/ObjectSetTable.php:50
 #, fuzzy
 msgid "Name"
 msgstr "Nome"
 
 #: sources.d/icingaweb2-module-director/application/forms/IcingaAddServiceForm.php:147
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:579
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:582
 #, fuzzy
 msgid "Name for the Icinga service you are going to create"
 msgstr "Nome del servizio Icinga che stai creando"
@@ -2155,7 +2158,7 @@ msgstr "L'argomento %s è stato memorizzato con successo"
 
 #: sources.d/icingaweb2-module-director/application/forms/IcingaCommandArgumentForm.php:181
 #: sources.d/icingaweb2-module-director/application/forms/IcingaScheduledDowntimeRangeForm.php:99
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:778
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:781
 #: sources.d/icingaweb2-module-director/application/forms/IcingaTimePeriodRangeForm.php:94
 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/DirectorObjectForm.php:673
 #, fuzzy
@@ -2289,7 +2292,7 @@ msgstr "Se questa dipendenza deve interessare gli host o i servizi"
 #: sources.d/icingaweb2-module-director/application/forms/IcingaDependencyForm.php:100
 #: sources.d/icingaweb2-module-director/application/forms/IcingaNotificationForm.php:90
 #: sources.d/icingaweb2-module-director/application/forms/IcingaScheduledDowntimeForm.php:89
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:712
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:715
 #: sources.d/icingaweb2-module-director/configuration.php:121
 #: sources.d/icingaweb2-module-director/library/Director/Dashboard/Dashlet/HostsDashlet.php:13
 #: sources.d/icingaweb2-module-director/library/Director/DataType/DataTypeDictionary.php:59
@@ -2306,7 +2309,7 @@ msgstr "Hosts"
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostGroupForm.php:30
 #: sources.d/icingaweb2-module-director/application/forms/IcingaNotificationForm.php:107
 #: sources.d/icingaweb2-module-director/application/forms/IcingaScheduledDowntimeForm.php:115
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:477
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:480
 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceGroupForm.php:30
 msgid ""
 "This allows you to configure an assignment filter. Please feel free to "
@@ -2563,7 +2566,7 @@ msgstr ""
 "utilizzare questa funzione"
 
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostForm.php:149
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:698
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:701
 msgid "Icinga Agent and zone settings"
 msgstr "Icinga Agent e proprietá della zona"
 
@@ -2587,7 +2590,7 @@ msgid "Choose a Host Template"
 msgstr "Scegli un Host template"
 
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostForm.php:219
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:650
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:653
 #: sources.d/icingaweb2-module-director/application/forms/IcingaUserForm.php:109
 #: sources.d/icingaweb2-module-director/library/Director/Web/Tabs/ObjectsTabs.php:67
 msgid "Groups"
@@ -2890,49 +2893,29 @@ msgstr "Comandi di notifica"
 msgid "Check command definition"
 msgstr "Definizione Check command"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:94
-msgid "Suggested fields"
-msgstr "Campi suggeriti"
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:99
-msgid "Argument macros"
-msgstr "Argomento macro"
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:104
-msgid "Other available fields"
-msgstr "Altri campi disponibili"
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:118
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:75
 msgid ""
 "There are no data fields available. Please ask an administrator to create "
 "such"
 msgstr "Non sono disponibili campi dati. Un amministratore può crearne alcuni"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:130
-msgid "The caption which should be displayed"
-msgstr "L'etichetta da visualizzare"
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:135
-msgid "A description about the field"
-msgstr "Una descrizione del campo"
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:143
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:148
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:106
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:111
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaObjectDatafieldTable.php:51
 #, fuzzy
 msgid "Mandatory"
 msgstr "Obbligatorio"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:144
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:107
 #, fuzzy
 msgid "Whether this field should be mandatory"
 msgstr "Questo Campo deve essere obbligatorio?"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:147
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:110
 msgid "Optional"
 msgstr "Opzionale"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:170
+#: sources.d/icingaweb2-module-director/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 "
@@ -2943,17 +2926,17 @@ msgstr ""
 "non verrà visualizzato e le proprietà associate verranno rimosse quando il "
 "campo verrà salvato"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:184
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:132
 msgid "Show based on filter"
 msgstr "Mostra in base al filtro"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:194
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:142
 #: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:87
 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/DirectorObjectForm.php:928
 msgid "Delete"
 msgstr "Elimina"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:197
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:145
 msgid "Field has been removed"
 msgstr "Il campo è stato rimosso"
 
@@ -3076,41 +3059,41 @@ msgstr "Un nuovo %s é stato creato con successo"
 msgid "Name for the instance you are going to create"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:137
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:138
 msgid "This Service has been deactivated on this host"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:142
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:143
 #, fuzzy
 msgid "Reactivate"
 msgstr "Disattivato"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:161
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:436
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:468
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:162
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:439
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:471
 msgid "Override vars"
 msgstr "Sovrascrivi variabili"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:167
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:168
 msgid "Hints regarding this service"
 msgstr "Suggerimenti riguardanti questo servizio"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:174
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:175
 #, fuzzy
 msgid "Deactivate"
 msgstr "Disattivato"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:287
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:290
 #, fuzzy, php-format
 msgid "%s has been deactivated on %s"
 msgstr "Utente \"%s\" è stato modificato"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:323
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:326
 #, php-format
 msgid "%s is no longer deactivated on %s"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:385
+#: sources.d/icingaweb2-module-director/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."
@@ -3118,14 +3101,14 @@ msgstr ""
 "Questo servizio è stato creato da un automatismo, ma permette comunque di "
 "sovrascrivere le seguenti proprietà in modo sicuro."
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:391
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:394
 #, php-format
 msgid ""
 "This service has been generated using the %s apply rule, assigned where %s"
 msgstr ""
 "Questo servizio è stato creato dalla apply rule %s, e viene assegnato dove %s"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:404
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:407
 #, php-format
 msgid ""
 "This service belongs to the %s Service Set. Still, you might want to "
@@ -3134,7 +3117,7 @@ msgstr ""
 "Questo servizio appartiene al set di servizi %s. Tuttavia, potreste voler "
 "sovrascrivere le seguenti proprietà solo per questo host."
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:416
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:419
 #, php-format
 msgid ""
 "This service has been inherited from %s. Still, you might want to change the "
@@ -3143,7 +3126,7 @@ msgstr ""
 "Questo servizio è stato ereditato da %s. Tuttavia, potreste voler cambiare "
 "le seguenti proprietà solo per questo host."
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:444
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:447
 #, php-format
 msgid ""
 "This service belongs to the service set \"%s\". Still, you might want to "
@@ -3152,24 +3135,24 @@ msgstr ""
 "Questo servizio appartiene al set \"%s\". Tuttavia, le seguenti proprietà "
 "possono essere modificate solo per questo specifico host."
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:465
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:468
 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/IcingaObjectFieldLoader.php:266
 msgid "Custom properties"
 msgstr "Proprietà personalizzate"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:602
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:605
 msgid "Choose the host this single service should be assigned to"
 msgstr "Scegli l'Host a cui assegnare questo singolo servizio"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:624
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:627
 msgid "Apply For"
 msgstr "Applica a"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:626
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:629
 msgid "None"
 msgstr "Nessuno"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:628
+#: sources.d/icingaweb2-module-director/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 "
@@ -3183,7 +3166,7 @@ msgstr ""
 "tramite \"$config$\". NOTA: sono ammesse solo le variabili personalizzate di "
 "tipo \"Array\". "
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:654
+#: sources.d/icingaweb2-module-director/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 "
@@ -3198,18 +3181,18 @@ msgstr ""
 "restrizioni. I gruppi di servizi possono essere assegnati direttamente a "
 "singoli servizi o a template di servizio"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:679
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:682
 msgid "Run on agent"
 msgstr "Esegui su agent"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:681
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:684
 #, fuzzy
 msgid ""
 "Whether the check commmand for this service should be executed on the Icinga "
 "agent"
 msgstr "Il comando per questo servizio deve essere eseguito sull'Icinga-Agent?"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:711
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:714
 #: sources.d/icingaweb2-module-director/library/Director/Import/ImportSourceDirectorObject.php:82
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/DependencyTemplateUsageTable.php:10
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/HostTemplateUsageTable.php:10
@@ -3222,12 +3205,12 @@ msgstr "Il comando per questo servizio deve essere eseguito sull'Icinga-Agent?"
 msgid "Templates"
 msgstr "Templates"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:767
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:770
 #, php-format
 msgid "All overrides have been removed from \"%s\""
 msgstr "Tutte le sovrascritture sono state rimosse da \"%s\""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:768
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:771
 #, php-format
 msgid "The given properties have been stored for \"%s\""
 msgstr "Le proprietà trasferite sono state salvate per \"%s\""
@@ -3594,12 +3577,39 @@ msgstr ""
 "Una descrizione estesa per questo modificatore di riga di importazione. "
 "Questo dovrebbe indicare il suo scopo e perché è stato messo in atto."
 
-#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:69
+#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:68
+#: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:84
+msgid "Set based on filter"
+msgstr "Impostazione basata sul filtro"
+
+#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:89
+#: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:103
+#: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:95
+msgid "Filter Expression"
+msgstr "Espressione filtro"
+
+#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:91
+#, fuzzy
+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 ""
+"Permette il filtraggio di parti specifiche all'interno dell'espressione "
+"della sorgente specificata. Tutte le colonne importate possono essere "
+"specificate. Esempi: host=wwww* imposterebbe questa proprietà solo per le "
+"linee importate dove la proprietà host inizia con \"www\". Esempio "
+"complesso: host=wwwww*&!(indirizzo=127.*|indirizzo6=::1)"
+
+#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:104
 #, fuzzy
 msgid "Modifier"
 msgstr "Modificatore"
 
-#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:72
+#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:107
 msgid ""
 "A property modifier allows you to modify a specific property at import time"
 msgstr ""
@@ -4271,15 +4281,6 @@ msgstr "Campo di destinazione"
 msgid "Custom variable"
 msgstr "Variabile personalizzata"
 
-#: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:84
-msgid "Set based on filter"
-msgstr "Impostazione basata sul filtro"
-
-#: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:103
-#: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:95
-msgid "Filter Expression"
-msgstr "Espressione filtro"
-
 #: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:105
 msgid ""
 "This allows to filter for specific parts within the given source expression. "
@@ -5090,7 +5091,7 @@ msgid "Scheduled Downtimes"
 msgstr "Downtime programmati"
 
 #: sources.d/icingaweb2-module-director/library/Director/Dashboard/Dashlet/SelfServiceDashlet.php:13
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:180
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:167
 msgid "Self Service API"
 msgstr "Self Service API"
 
@@ -5548,6 +5549,22 @@ msgstr "Proprietà importate non collegate"
 msgid "(Host) group resolve cache"
 msgstr "cache di risoluzione gruppo (Hosts)"
 
+#: sources.d/icingaweb2-module-director/library/Director/Field/FormFieldSuggestion.php:78
+msgid "Suggested fields"
+msgstr "Campi suggeriti"
+
+#: sources.d/icingaweb2-module-director/library/Director/Field/FormFieldSuggestion.php:82
+msgid "Argument macros"
+msgstr "Argomento macro"
+
+#: sources.d/icingaweb2-module-director/library/Director/Field/FormFieldSuggestion.php:86
+msgid "Flags (boolean) arguments"
+msgstr ""
+
+#: sources.d/icingaweb2-module-director/library/Director/Field/FormFieldSuggestion.php:90
+msgid "Other available fields"
+msgstr "Altri campi disponibili"
+
 #: sources.d/icingaweb2-module-director/library/Director/IcingaConfig/StateFilterSet.php:20
 msgid "Up"
 msgstr "Su"
@@ -5940,7 +5957,7 @@ msgstr "Applica le modifiche"
 msgid "Run all rules at once"
 msgstr "Eseguire tutte le regole in una volta"
 
-#: sources.d/icingaweb2-module-director/library/Director/Objects/DirectorDatafield.php:213
+#: sources.d/icingaweb2-module-director/library/Director/Objects/DirectorDatafield.php:204
 #, php-format
 msgid "Form element could not be created, %s is missing"
 msgstr "Impossibile creare l'elemento del modulo,%s mancante"
@@ -6274,7 +6291,7 @@ msgstr ""
 "validi"
 
 #: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMakeBoolean.php:42
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:35
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:34
 msgid "Set null"
 msgstr "Imposta null"
 
@@ -6287,17 +6304,17 @@ msgid "Set false"
 msgstr "Imposta falso"
 
 #: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMakeBoolean.php:45
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:38
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:37
 msgid "Let the import fail"
 msgstr "Lascia che l'importazione fallisca"
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:21
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:20
 msgid "Please choose a data list that can be used for map lookups"
 msgstr ""
 "Si prega di scegliere una lista dati che puo' essere utilizzata per la map "
 "lookups"
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:30
+#: sources.d/icingaweb2-module-director/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 "
@@ -6307,20 +6324,20 @@ msgstr ""
 "data? Si potrebbe restituire un valore nullo, mantenere il valore importato "
 "non modificato o interrompere il processo di importazione"
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:36
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:35
 msgid "Return lookup key unmodified"
 msgstr "La chiave di ricerca per la restituzione rimane invariata"
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:37
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:36
 msgid "Return custom default value"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:46
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:45
 #, fuzzy
 msgid "Default value"
 msgstr "Zona globale predefinita"
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:49
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:48
 #, fuzzy
 msgid ""
 "This value will be evaluated, and variables like ${some_column} will be "
@@ -7342,37 +7359,27 @@ msgstr ""
 msgid "In case you're using %s, please run this Script:"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:158
 #: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:164
-msgid "Icinga 2 Powershell Module"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:160
-#, php-format
-msgid "In case you're using the legacy %s, please run:"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:177
 msgid "Documentation"
 msgstr "Documentazione"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:192
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:179
 msgid "Configure this Agent via Self Service API"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:195
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:182
 msgid "Inherited Template Api Key:"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:216
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:203
 msgid "Icinga 2 Client documentation"
 msgstr "Icinga 2 documentazione client"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:221
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:208
 msgid "Top Down"
 msgstr "Top Down"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:234
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:221
 #, php-format
 msgid ""
 "A ticket for this agent could not have been requested from your deployment "
@@ -7381,19 +7388,19 @@ msgstr ""
 "Non è stato possibile richiedere un ticket per questo agent da questo "
 "endpoint: %s "
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:245
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:232
 msgid "For manual configuration"
 msgstr "Per la configurazione manuale"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:246
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:233
 msgid "Ticket"
 msgstr "Ticket"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:247
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:234
 msgid "Windows Kickstart Script"
 msgstr "Windows Kickstart Script"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:256
+#: sources.d/icingaweb2-module-director/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 "
@@ -7403,11 +7410,11 @@ msgstr ""
 "suo certificato e crea una configurazione minimale icinga2.conf per far sì "
 "che l'agente sia collegato al suo corrispondente elemento padre."
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:260
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:247
 msgid "Linux commandline"
 msgstr "Riga di comando di Linux"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:267
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:255
 msgid "Just download and run this script on your Linux Client Machine:"
 msgstr "Scarica ed esegui questo script sul tuo computer client Linux:"
 
@@ -7493,15 +7500,15 @@ msgid "Category Name"
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldCategoryTable.php:48
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:52
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:54
 msgid "# Used"
 msgstr "# in uso"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:51
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:53
 msgid "Category"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:53
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:55
 msgid "# Vars"
 msgstr "# Vars"
 
@@ -7564,17 +7571,17 @@ msgstr "Nome del servizio"
 msgid "%s %s(%s)"
 msgstr "%s %s(%s)"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:216
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:229
 #, php-format
 msgid "This set has been inherited from %s"
 msgstr "Questo set è stato ereditato da %s"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:225
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:238
 #, fuzzy
 msgid "Remove"
 msgstr "Rimuovi"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:227
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:240
 #, php-format
 msgid "Remove \"%s\" from this host"
 msgstr "Rimuovere \"%s\" da questo host"
@@ -7593,7 +7600,7 @@ msgstr "Data e ora"
 msgid "Imported rows"
 msgstr "Righe importate"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/ObjectSetTable.php:62
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/ObjectSetTable.php:66
 #, php-format
 msgid "%s (%d members)"
 msgstr "%s (%d membri)"
@@ -7632,7 +7639,7 @@ msgstr "Indiretto"
 msgid "Total"
 msgstr "Totale"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/TemplateUsageTable.php:103
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/TemplateUsageTable.php:104
 msgid "This template is not in use"
 msgstr "Questo template non è in uso"
 
@@ -8133,6 +8140,12 @@ msgstr "%s oggetti sono stati cambiati"
 msgid "Show all actions"
 msgstr "Mostra le opzioni disponibili"
 
+#~ msgid "The caption which should be displayed"
+#~ msgstr "L'etichetta da visualizzare"
+
+#~ msgid "A description about the field"
+#~ msgstr "Una descrizione del campo"
+
 #, fuzzy
 #~ msgid "Create a new Service Set"
 #~ msgstr "Crea un nuovo %s Set"
diff --git a/src/icingaweb2-module-director/ja_JP/LC_MESSAGES/icinga.po b/src/icingaweb2-module-director/ja_JP/LC_MESSAGES/icinga.po
index 3c1fbbd9..16c4985c 100644
--- a/src/icingaweb2-module-director/ja_JP/LC_MESSAGES/icinga.po
+++ b/src/icingaweb2-module-director/ja_JP/LC_MESSAGES/icinga.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-21 16:06+0000\n"
+"POT-Creation-Date: 2023-09-12 12:59+0000\n"
 "PO-Revision-Date: 2020-04-27 14:54+0200\n"
 "Last-Translator: papillon326 <udagawa@www2178ue.sakura.ne.jp>\n"
 "Language-Team: \n"
@@ -132,8 +132,8 @@ msgstr "リストア"
 
 #: sources.d/icingaweb2-module-director/application/controllers/BasketController.php:238
 #: sources.d/icingaweb2-module-director/application/controllers/SchemaController.php:80
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:236
 #: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:249
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:262
 msgid "Download"
 msgstr "ダウンロード"
 
@@ -331,6 +331,7 @@ msgstr "設定差分"
 
 #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:384
 #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:395
+#: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:284
 #: sources.d/icingaweb2-module-director/application/forms/SelfServiceSettingsForm.php:252
 #: sources.d/icingaweb2-module-director/application/forms/SettingsForm.php:193
 #: sources.d/icingaweb2-module-director/application/views/helpers/FormDataFilter.php:465
@@ -972,7 +973,7 @@ msgstr "適用: %s"
 
 #: sources.d/icingaweb2-module-director/application/controllers/ServiceController.php:280
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostVarForm.php:15
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:598
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:601
 #: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:12
 #: sources.d/icingaweb2-module-director/library/Director/Import/ImportSourceDirectorObject.php:71
 #: sources.d/icingaweb2-module-director/library/Director/TranslationDummy.php:13
@@ -1077,8 +1078,8 @@ msgstr ""
 "実行をトリガする必要があります。"
 
 #: sources.d/icingaweb2-module-director/application/controllers/SyncruleController.php:97
-#, php-format
-msgid "This Sync Rule was last found to by in Sync at %s."
+#, fuzzy, php-format
+msgid "This Sync Rule was last found to be in Sync at %s."
 msgstr "この同期ルールは、%sの同期で最後に見つかったものです。"
 
 #: sources.d/icingaweb2-module-director/application/controllers/SyncruleController.php:108
@@ -1549,7 +1550,7 @@ msgstr ""
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldCategoryForm.php:31
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:158
 #: sources.d/icingaweb2-module-director/application/forms/IcingaCommandArgumentForm.php:31
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:134
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:94
 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceSetForm.php:103
 #: sources.d/icingaweb2-module-director/application/forms/IcingaTemplateChoiceForm.php:56
 #: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:52
@@ -1637,7 +1638,7 @@ msgstr ""
 "をユーザに強制することができるようになります。"
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:141
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:50
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:52
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaObjectDatafieldTable.php:50
 msgid "Field name"
 msgstr "フィールド名"
@@ -1652,16 +1653,18 @@ msgstr ""
 "icingaの設定で定義するカスタム変数の名前になります。"
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:149
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:126
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:83
 msgid "Caption"
 msgstr "キャプション"
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:152
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:88
 msgid ""
 "The caption which should be displayed to your users when this field is shown"
 msgstr "このフィールドが表示されたときにユーザーに表示されるキャプション"
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:160
+#: sources.d/icingaweb2-module-director/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"
@@ -1694,7 +1697,7 @@ msgstr ""
 "カスタム変数の値の入力時に、このキーが選択されると、変数の値になります。"
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatalistEntryForm.php:30
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:49
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:51
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatalistEntryTable.php:55
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaObjectDatafieldTable.php:49
 msgid "Label"
@@ -1843,19 +1846,19 @@ msgstr "サービステンプレートを選択"
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostForm.php:40
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostVarForm.php:22
 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceDictionaryMemberForm.php:22
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:576
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:579
 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceVarForm.php:22
 #: sources.d/icingaweb2-module-director/application/forms/IcingaTimePeriodForm.php:15
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/ChoicesTable.php:41
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/CoreApiFieldsTable.php:79
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/CoreApiObjectsTable.php:57
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/CoreApiPrototypesTable.php:40
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/ObjectSetTable.php:46
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/ObjectSetTable.php:50
 msgid "Name"
 msgstr "名前"
 
 #: sources.d/icingaweb2-module-director/application/forms/IcingaAddServiceForm.php:147
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:579
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:582
 msgid "Name for the Icinga service you are going to create"
 msgstr "Icingaサービスの名前"
 
@@ -2095,7 +2098,7 @@ msgstr "引数%sは正常に保存されました"
 
 #: sources.d/icingaweb2-module-director/application/forms/IcingaCommandArgumentForm.php:181
 #: sources.d/icingaweb2-module-director/application/forms/IcingaScheduledDowntimeRangeForm.php:99
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:778
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:781
 #: sources.d/icingaweb2-module-director/application/forms/IcingaTimePeriodRangeForm.php:94
 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/DirectorObjectForm.php:673
 msgid "No action taken, object has not been modified"
@@ -2220,7 +2223,7 @@ msgstr ""
 #: sources.d/icingaweb2-module-director/application/forms/IcingaDependencyForm.php:100
 #: sources.d/icingaweb2-module-director/application/forms/IcingaNotificationForm.php:90
 #: sources.d/icingaweb2-module-director/application/forms/IcingaScheduledDowntimeForm.php:89
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:712
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:715
 #: sources.d/icingaweb2-module-director/configuration.php:121
 #: sources.d/icingaweb2-module-director/library/Director/Dashboard/Dashlet/HostsDashlet.php:13
 #: sources.d/icingaweb2-module-director/library/Director/DataType/DataTypeDictionary.php:59
@@ -2237,7 +2240,7 @@ msgstr "ホスト"
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostGroupForm.php:30
 #: sources.d/icingaweb2-module-director/application/forms/IcingaNotificationForm.php:107
 #: sources.d/icingaweb2-module-director/application/forms/IcingaScheduledDowntimeForm.php:115
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:477
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:480
 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceGroupForm.php:30
 msgid ""
 "This allows you to configure an assignment filter. Please feel free to "
@@ -2484,7 +2487,7 @@ msgstr ""
 "べてください。"
 
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostForm.php:149
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:698
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:701
 msgid "Icinga Agent and zone settings"
 msgstr "Icingaエージェントとゾーンの設定"
 
@@ -2506,7 +2509,7 @@ msgid "Choose a Host Template"
 msgstr "ホストテンプレートを選択"
 
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostForm.php:219
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:650
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:653
 #: sources.d/icingaweb2-module-director/application/forms/IcingaUserForm.php:109
 #: sources.d/icingaweb2-module-director/library/Director/Web/Tabs/ObjectsTabs.php:67
 msgid "Groups"
@@ -2800,19 +2803,7 @@ msgstr "通知コマンド"
 msgid "Check command definition"
 msgstr "監視コマンドの定義"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:94
-msgid "Suggested fields"
-msgstr "サジェストされたフィールド"
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:99
-msgid "Argument macros"
-msgstr "引数マクロ"
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:104
-msgid "Other available fields"
-msgstr "ほかの利用可能なフィールド"
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:118
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:75
 msgid ""
 "There are no data fields available. Please ask an administrator to create "
 "such"
@@ -2820,29 +2811,21 @@ msgstr ""
 "利用可能なデータフィールドがありません。作成するように管理者に依頼してくださ"
 "い。"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:130
-msgid "The caption which should be displayed"
-msgstr "表示されるキャプション"
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:135
-msgid "A description about the field"
-msgstr "フィールドについての説明"
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:143
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:148
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:106
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:111
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaObjectDatafieldTable.php:51
 msgid "Mandatory"
 msgstr "必須"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:144
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:107
 msgid "Whether this field should be mandatory"
 msgstr "このフィールドが必須か選択します。"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:147
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:110
 msgid "Optional"
 msgstr "オプション"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:170
+#: sources.d/icingaweb2-module-director/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 "
@@ -2852,17 +2835,17 @@ msgstr ""
 "そうしなければ利用できないでしょう。また、以前に設定された値はいったん格納さ"
 "れると消去されます"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:184
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:132
 msgid "Show based on filter"
 msgstr "フィルタに基づいて表示"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:194
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:142
 #: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:87
 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/DirectorObjectForm.php:928
 msgid "Delete"
 msgstr "削除"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:197
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:145
 msgid "Field has been removed"
 msgstr "フィールドが削除されました"
 
@@ -2974,42 +2957,42 @@ msgstr "新しい %s が正常に作成されました"
 msgid "Name for the instance you are going to create"
 msgstr "作成しようとしているIcingaゾーンの名前"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:137
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:138
 #, fuzzy
 msgid "This Service has been deactivated on this host"
 msgstr "このサービスはこのホストでブラックリストに登録されています"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:142
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:143
 #, fuzzy
 msgid "Reactivate"
 msgstr "無効"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:161
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:436
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:468
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:162
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:439
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:471
 msgid "Override vars"
 msgstr "変数のオーバーライド"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:167
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:168
 msgid "Hints regarding this service"
 msgstr "このサービスに関するヒント"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:174
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:175
 #, fuzzy
 msgid "Deactivate"
 msgstr "無効"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:287
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:290
 #, fuzzy, php-format
 msgid "%s has been deactivated on %s"
 msgstr "%s は %s のブラックリストに登録されました。"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:323
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:326
 #, fuzzy, php-format
 msgid "%s is no longer deactivated on %s"
 msgstr "%s は %s のブラックリストから除外されました。"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:385
+#: sources.d/icingaweb2-module-director/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."
@@ -3017,13 +3000,13 @@ msgstr ""
 "このサービスは自動化された方法で生成されていますが、それでも次のプロパティを"
 "安全な方法に上書きすることができます。"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:391
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:394
 #, php-format
 msgid ""
 "This service has been generated using the %s apply rule, assigned where %s"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:404
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:407
 #, php-format
 msgid ""
 "This service belongs to the %s Service Set. Still, you might want to "
@@ -3032,7 +3015,7 @@ msgstr ""
 "このサービスは %s サービスセットに属しています。それでも、このホストに対して"
 "のみ次のプロパティを上書きすることをお勧めします。"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:416
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:419
 #, php-format
 msgid ""
 "This service has been inherited from %s. Still, you might want to change the "
@@ -3041,7 +3024,7 @@ msgstr ""
 "このサービスは%sから継承されました。 それでも、このホストに対してのみ次のプロ"
 "パティを変更することをお勧めします。"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:444
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:447
 #, php-format
 msgid ""
 "This service belongs to the service set \"%s\". Still, you might want to "
@@ -3050,24 +3033,24 @@ msgstr ""
 "このサービスはサービスセット \"%s\" に属しています。 それでも、このホストに対"
 "してのみ次のプロパティを変更することをお勧めします。"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:465
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:468
 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/IcingaObjectFieldLoader.php:266
 msgid "Custom properties"
 msgstr "カスタムプロパティ"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:602
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:605
 msgid "Choose the host this single service should be assigned to"
 msgstr "この単一サービスが割り当てられるべきホストを選択"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:624
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:627
 msgid "Apply For"
 msgstr "適用対象"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:626
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:629
 msgid "None"
 msgstr "なし"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:628
+#: sources.d/icingaweb2-module-director/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 "
@@ -3080,7 +3063,7 @@ msgstr ""
 "array_var）\"が生成されます。ここで \"config\"は \"$config$\"を通してアクセス"
 "可能です。 注：タイプ \"配列\"のカスタム変数のみが対象です。"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:654
+#: sources.d/icingaweb2-module-director/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 "
@@ -3094,18 +3077,18 @@ msgstr ""
 "ビスグループは、単一のサービスまたはサービステンプレートに直接割り当てること"
 "ができます。"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:679
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:682
 msgid "Run on agent"
 msgstr "エージェント側で実行"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:681
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:684
 msgid ""
 "Whether the check commmand for this service should be executed on the Icinga "
 "agent"
 msgstr ""
 "このサービスのcheckコマンドをIcingaエージェントで実行するか選択します。"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:711
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:714
 #: sources.d/icingaweb2-module-director/library/Director/Import/ImportSourceDirectorObject.php:82
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/DependencyTemplateUsageTable.php:10
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/HostTemplateUsageTable.php:10
@@ -3117,12 +3100,12 @@ msgstr ""
 msgid "Templates"
 msgstr "テンプレート"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:767
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:770
 #, php-format
 msgid "All overrides have been removed from \"%s\""
 msgstr "すべてのオーバーライドは\"%s\"から削除されました"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:768
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:771
 #, php-format
 msgid "The given properties have been stored for \"%s\""
 msgstr "プロパティが\"%s\" に保存されました。"
@@ -3469,11 +3452,37 @@ msgstr ""
 "このインポート行プロパティ変換ルールの詳細な説明。 目的と、なぜ必要なのかの説"
 "明を書きます。"
 
-#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:69
+#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:68
+#: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:84
+msgid "Set based on filter"
+msgstr "フィルタに基づいて設定"
+
+#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:89
+#: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:103
+#: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:95
+msgid "Filter Expression"
+msgstr "フィルタ表現"
+
+#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:91
+#, fuzzy
+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 ""
+"指定された元の表現内の特定の部分をフィルタリングできます。 インポートされたす"
+"べてのカラムを参照することが許可されています。 例）「host=www*」 は、\"www"
+"\"で始まるホストプロパティでインポートされた行に対してのみこのプロパティを設"
+"定します。 複雑な例：host=www*&!(address=127.*|address6=::1)"
+
+#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:104
 msgid "Modifier"
 msgstr "プロパティ変換ルール"
 
-#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:72
+#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:107
 msgid ""
 "A property modifier allows you to modify a specific property at import time"
 msgstr ""
@@ -4125,15 +4134,6 @@ msgstr "宛先フィールド"
 msgid "Custom variable"
 msgstr "カスタム変数"
 
-#: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:84
-msgid "Set based on filter"
-msgstr "フィルタに基づいて設定"
-
-#: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:103
-#: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:95
-msgid "Filter Expression"
-msgstr "フィルタ表現"
-
 #: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:105
 msgid ""
 "This allows to filter for specific parts within the given source expression. "
@@ -4912,7 +4912,7 @@ msgid "Scheduled Downtimes"
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/library/Director/Dashboard/Dashlet/SelfServiceDashlet.php:13
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:180
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:167
 msgid "Self Service API"
 msgstr "セルフサービス API"
 
@@ -5355,6 +5355,22 @@ msgstr "インポートされたプロパティをリンク解除しました"
 msgid "(Host) group resolve cache"
 msgstr "(ホスト) グループがキャッシュを解決"
 
+#: sources.d/icingaweb2-module-director/library/Director/Field/FormFieldSuggestion.php:78
+msgid "Suggested fields"
+msgstr "サジェストされたフィールド"
+
+#: sources.d/icingaweb2-module-director/library/Director/Field/FormFieldSuggestion.php:82
+msgid "Argument macros"
+msgstr "引数マクロ"
+
+#: sources.d/icingaweb2-module-director/library/Director/Field/FormFieldSuggestion.php:86
+msgid "Flags (boolean) arguments"
+msgstr ""
+
+#: sources.d/icingaweb2-module-director/library/Director/Field/FormFieldSuggestion.php:90
+msgid "Other available fields"
+msgstr "ほかの利用可能なフィールド"
+
 #: sources.d/icingaweb2-module-director/library/Director/IcingaConfig/StateFilterSet.php:20
 msgid "Up"
 msgstr "Up (起動)"
@@ -5729,7 +5745,7 @@ msgstr "変更を適用する"
 msgid "Run all rules at once"
 msgstr "すべてのルールをまとめて実行"
 
-#: sources.d/icingaweb2-module-director/library/Director/Objects/DirectorDatafield.php:213
+#: sources.d/icingaweb2-module-director/library/Director/Objects/DirectorDatafield.php:204
 #, php-format
 msgid "Form element could not be created, %s is missing"
 msgstr "フォーム要素が作成できません。%s がありません"
@@ -6051,7 +6067,7 @@ msgstr ""
 "ンポートプロセス全体を中断することもできます。"
 
 #: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMakeBoolean.php:42
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:35
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:34
 msgid "Set null"
 msgstr "NULLを設定"
 
@@ -6064,15 +6080,15 @@ msgid "Set false"
 msgstr "FALSEを設定する"
 
 #: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMakeBoolean.php:45
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:38
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:37
 msgid "Let the import fail"
 msgstr "インポートを失敗にする"
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:21
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:20
 msgid "Please choose a data list that can be used for map lookups"
 msgstr "地図検索に使用できるデータリストを選択してください"
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:30
+#: sources.d/icingaweb2-module-director/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 "
@@ -6082,20 +6098,20 @@ msgstr ""
 "されていないインポート値を保持する、またはインポートプロセスを中断することが"
 "できます。"
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:36
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:35
 msgid "Return lookup key unmodified"
 msgstr "変更されていない参照キーを返す"
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:37
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:36
 msgid "Return custom default value"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:46
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:45
 #, fuzzy
 msgid "Default value"
 msgstr "デフォルトのグローバルゾーン"
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:49
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:48
 #, fuzzy
 msgid ""
 "This value will be evaluated, and variables like ${some_column} will be "
@@ -7074,39 +7090,29 @@ msgstr "Icinga ホスト"
 msgid "In case you're using %s, please run this Script:"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:158
 #: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:164
-msgid "Icinga 2 Powershell Module"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:160
-#, php-format
-msgid "In case you're using the legacy %s, please run:"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:177
 msgid "Documentation"
 msgstr "ドキュメント"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:192
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:179
 #, fuzzy
 msgid "Configure this Agent via Self Service API"
 msgstr "このエージェントをセルフサービスAPIで設定。"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:195
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:182
 #, fuzzy
 msgid "Inherited Template Api Key:"
 msgstr "サービステンプレートチョイス"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:216
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:203
 msgid "Icinga 2 Client documentation"
 msgstr "Icinga 2 Client のドキュメント"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:221
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:208
 msgid "Top Down"
 msgstr "トップダウン"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:234
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:221
 #, php-format
 msgid ""
 "A ticket for this agent could not have been requested from your deployment "
@@ -7115,19 +7121,19 @@ msgstr ""
 "このエージェントのチケットは、デプロイメントエンドポイントから要求されていな"
 "い可能性があります：%s"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:245
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:232
 msgid "For manual configuration"
 msgstr "手動設定用"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:246
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:233
 msgid "Ticket"
 msgstr "チケット"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:247
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:234
 msgid "Windows Kickstart Script"
 msgstr "Windowsキックスタートスクリプト"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:256
+#: sources.d/icingaweb2-module-director/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 "
@@ -7136,11 +7142,11 @@ msgstr ""
 "これには、Icinga Agentをインストールする必要があります。 証明書を生成して署名"
 "し、エージェントをその親に接続するための最小限のicinga2.confも生成します。"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:260
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:247
 msgid "Linux commandline"
 msgstr "Linux コマンドライン"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:267
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:255
 msgid "Just download and run this script on your Linux Client Machine:"
 msgstr ""
 "このスクリプトをLinuxクライアントマシンにダウンロードして実行するだけです。"
@@ -7225,15 +7231,15 @@ msgid "Category Name"
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldCategoryTable.php:48
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:52
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:54
 msgid "# Used"
 msgstr "# 使用済み"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:51
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:53
 msgid "Category"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:53
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:55
 msgid "# Vars"
 msgstr "# 変数"
 
@@ -7294,16 +7300,16 @@ msgstr "サービス名"
 msgid "%s %s(%s)"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:216
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:229
 #, php-format
 msgid "This set has been inherited from %s"
 msgstr "このセットは%sから継承されました"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:225
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:238
 msgid "Remove"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:227
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:240
 #, php-format
 msgid "Remove \"%s\" from this host"
 msgstr "このホストから「%s」を削除"
@@ -7322,7 +7328,7 @@ msgstr "タイムスタンプ"
 msgid "Imported rows"
 msgstr "インポートされた行"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/ObjectSetTable.php:62
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/ObjectSetTable.php:66
 #, php-format
 msgid "%s (%d members)"
 msgstr "%s (%d 人のメンバー)"
@@ -7361,7 +7367,7 @@ msgstr "間接"
 msgid "Total"
 msgstr "合計"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/TemplateUsageTable.php:103
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/TemplateUsageTable.php:104
 msgid "This template is not in use"
 msgstr "このテンプレートは使用されていません"
 
@@ -7847,6 +7853,12 @@ msgstr "%s オブジェクトが編集されました。"
 msgid "Show all actions"
 msgstr "利用可能なオプションを表示"
 
+#~ msgid "The caption which should be displayed"
+#~ msgstr "表示されるキャプション"
+
+#~ msgid "A description about the field"
+#~ msgstr "フィールドについての説明"
+
 #, fuzzy
 #~ msgid "Create a new Service Set"
 #~ msgstr "新しい %s セットを作成"
diff --git a/src/icingaweb2-module-director/pl/LC_MESSAGES/icinga.po b/src/icingaweb2-module-director/pl/LC_MESSAGES/icinga.po
index d7a298a8..722583e4 100644
--- a/src/icingaweb2-module-director/pl/LC_MESSAGES/icinga.po
+++ b/src/icingaweb2-module-director/pl/LC_MESSAGES/icinga.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Icinga L10n 1e71984\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-21 16:06+0000\n"
+"POT-Creation-Date: 2023-09-12 12:59+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -126,8 +126,8 @@ msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/controllers/BasketController.php:238
 #: sources.d/icingaweb2-module-director/application/controllers/SchemaController.php:80
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:236
 #: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:249
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:262
 msgid "Download"
 msgstr ""
 
@@ -312,6 +312,7 @@ msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:384
 #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:395
+#: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:284
 #: sources.d/icingaweb2-module-director/application/forms/SelfServiceSettingsForm.php:252
 #: sources.d/icingaweb2-module-director/application/forms/SettingsForm.php:193
 #: sources.d/icingaweb2-module-director/application/views/helpers/FormDataFilter.php:465
@@ -940,7 +941,7 @@ msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/controllers/ServiceController.php:280
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostVarForm.php:15
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:598
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:601
 #: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:12
 #: sources.d/icingaweb2-module-director/library/Director/Import/ImportSourceDirectorObject.php:71
 #: sources.d/icingaweb2-module-director/library/Director/TranslationDummy.php:13
@@ -1041,7 +1042,7 @@ msgstr ""
 
 #: sources.d/icingaweb2-module-director/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 ""
 
 #: sources.d/icingaweb2-module-director/application/controllers/SyncruleController.php:108
@@ -1497,7 +1498,7 @@ msgstr ""
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldCategoryForm.php:31
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:158
 #: sources.d/icingaweb2-module-director/application/forms/IcingaCommandArgumentForm.php:31
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:134
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:94
 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceSetForm.php:103
 #: sources.d/icingaweb2-module-director/application/forms/IcingaTemplateChoiceForm.php:56
 #: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:52
@@ -1567,7 +1568,7 @@ msgid ""
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:141
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:50
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:52
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaObjectDatafieldTable.php:50
 msgid "Field name"
 msgstr ""
@@ -1579,16 +1580,18 @@ msgid ""
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:149
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:126
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:83
 msgid "Caption"
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:152
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:88
 msgid ""
 "The caption which should be displayed to your users when this field is shown"
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:160
+#: sources.d/icingaweb2-module-director/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"
@@ -1618,7 +1621,7 @@ msgid ""
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatalistEntryForm.php:30
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:49
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:51
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatalistEntryTable.php:55
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaObjectDatafieldTable.php:49
 msgid "Label"
@@ -1758,19 +1761,19 @@ msgstr ""
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostForm.php:40
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostVarForm.php:22
 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceDictionaryMemberForm.php:22
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:576
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:579
 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceVarForm.php:22
 #: sources.d/icingaweb2-module-director/application/forms/IcingaTimePeriodForm.php:15
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/ChoicesTable.php:41
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/CoreApiFieldsTable.php:79
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/CoreApiObjectsTable.php:57
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/CoreApiPrototypesTable.php:40
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/ObjectSetTable.php:46
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/ObjectSetTable.php:50
 msgid "Name"
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/IcingaAddServiceForm.php:147
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:579
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:582
 msgid "Name for the Icinga service you are going to create"
 msgstr ""
 
@@ -1992,7 +1995,7 @@ msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/IcingaCommandArgumentForm.php:181
 #: sources.d/icingaweb2-module-director/application/forms/IcingaScheduledDowntimeRangeForm.php:99
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:778
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:781
 #: sources.d/icingaweb2-module-director/application/forms/IcingaTimePeriodRangeForm.php:94
 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/DirectorObjectForm.php:673
 msgid "No action taken, object has not been modified"
@@ -2105,7 +2108,7 @@ msgstr ""
 #: sources.d/icingaweb2-module-director/application/forms/IcingaDependencyForm.php:100
 #: sources.d/icingaweb2-module-director/application/forms/IcingaNotificationForm.php:90
 #: sources.d/icingaweb2-module-director/application/forms/IcingaScheduledDowntimeForm.php:89
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:712
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:715
 #: sources.d/icingaweb2-module-director/configuration.php:121
 #: sources.d/icingaweb2-module-director/library/Director/Dashboard/Dashlet/HostsDashlet.php:13
 #: sources.d/icingaweb2-module-director/library/Director/DataType/DataTypeDictionary.php:59
@@ -2122,7 +2125,7 @@ msgstr ""
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostGroupForm.php:30
 #: sources.d/icingaweb2-module-director/application/forms/IcingaNotificationForm.php:107
 #: sources.d/icingaweb2-module-director/application/forms/IcingaScheduledDowntimeForm.php:115
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:477
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:480
 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceGroupForm.php:30
 msgid ""
 "This allows you to configure an assignment filter. Please feel free to "
@@ -2342,7 +2345,7 @@ msgid ""
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostForm.php:149
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:698
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:701
 msgid "Icinga Agent and zone settings"
 msgstr ""
 
@@ -2364,7 +2367,7 @@ msgid "Choose a Host Template"
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostForm.php:219
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:650
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:653
 #: sources.d/icingaweb2-module-director/application/forms/IcingaUserForm.php:109
 #: sources.d/icingaweb2-module-director/library/Director/Web/Tabs/ObjectsTabs.php:67
 msgid "Groups"
@@ -2634,64 +2637,44 @@ msgstr ""
 msgid "Check command definition"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:94
-msgid "Suggested fields"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:99
-msgid "Argument macros"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:104
-msgid "Other available fields"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:118
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:75
 msgid ""
 "There are no data fields available. Please ask an administrator to create "
 "such"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:130
-msgid "The caption which should be displayed"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:135
-msgid "A description about the field"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:143
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:148
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:106
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:111
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaObjectDatafieldTable.php:51
 msgid "Mandatory"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:144
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:107
 msgid "Whether this field should be mandatory"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:147
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:110
 msgid "Optional"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:170
+#: sources.d/icingaweb2-module-director/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 "
 "cleared once stored"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:184
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:132
 msgid "Show based on filter"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:194
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:142
 #: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:87
 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/DirectorObjectForm.php:928
 msgid "Delete"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:197
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:145
 msgid "Field has been removed"
 msgstr ""
 
@@ -2801,89 +2784,89 @@ msgstr ""
 msgid "Name for the instance you are going to create"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:137
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:138
 msgid "This Service has been deactivated on this host"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:142
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:143
 msgid "Reactivate"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:161
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:436
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:468
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:162
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:439
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:471
 msgid "Override vars"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:167
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:168
 msgid "Hints regarding this service"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:174
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:175
 msgid "Deactivate"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:287
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:290
 #, php-format
 msgid "%s has been deactivated on %s"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:323
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:326
 #, php-format
 msgid "%s is no longer deactivated on %s"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:385
+#: sources.d/icingaweb2-module-director/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."
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:391
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:394
 #, php-format
 msgid ""
 "This service has been generated using the %s apply rule, assigned where %s"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:404
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:407
 #, php-format
 msgid ""
 "This service belongs to the %s Service Set. Still, you might want to "
 "override the following properties for this host only."
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:416
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:419
 #, php-format
 msgid ""
 "This service has been inherited from %s. Still, you might want to change the "
 "following properties for this host only."
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:444
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:447
 #, php-format
 msgid ""
 "This service belongs to the service set \"%s\". Still, you might want to "
 "change the following properties for this host only."
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:465
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:468
 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/IcingaObjectFieldLoader.php:266
 msgid "Custom properties"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:602
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:605
 msgid "Choose the host this single service should be assigned to"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:624
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:627
 msgid "Apply For"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:626
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:629
 msgid "None"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:628
+#: sources.d/icingaweb2-module-director/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 "
@@ -2892,7 +2875,7 @@ msgid ""
 "eligible."
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:654
+#: sources.d/icingaweb2-module-director/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 "
@@ -2901,17 +2884,17 @@ msgid ""
 "be directly assigned to single services or to service templates."
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:679
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:682
 msgid "Run on agent"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:681
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:684
 msgid ""
 "Whether the check commmand for this service should be executed on the Icinga "
 "agent"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:711
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:714
 #: sources.d/icingaweb2-module-director/library/Director/Import/ImportSourceDirectorObject.php:82
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/DependencyTemplateUsageTable.php:10
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/HostTemplateUsageTable.php:10
@@ -2923,12 +2906,12 @@ msgstr ""
 msgid "Templates"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:767
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:770
 #, php-format
 msgid "All overrides have been removed from \"%s\""
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:768
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:771
 #, php-format
 msgid "The given properties have been stored for \"%s\""
 msgstr ""
@@ -3249,11 +3232,32 @@ msgid ""
 "it's purpose and why it has been put in place at all."
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:69
+#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:68
+#: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:84
+msgid "Set based on filter"
+msgstr ""
+
+#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:89
+#: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:103
+#: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:95
+msgid "Filter Expression"
+msgstr ""
+
+#: sources.d/icingaweb2-module-director/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 ""
+
+#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:104
 msgid "Modifier"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:72
+#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:107
 msgid ""
 "A property modifier allows you to modify a specific property at import time"
 msgstr ""
@@ -3816,15 +3820,6 @@ msgstr ""
 msgid "Custom variable"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:84
-msgid "Set based on filter"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:103
-#: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:95
-msgid "Filter Expression"
-msgstr ""
-
 #: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:105
 msgid ""
 "This allows to filter for specific parts within the given source expression. "
@@ -4558,7 +4553,7 @@ msgid "Scheduled Downtimes"
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/library/Director/Dashboard/Dashlet/SelfServiceDashlet.php:13
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:180
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:167
 msgid "Self Service API"
 msgstr ""
 
@@ -4949,6 +4944,22 @@ msgstr ""
 msgid "(Host) group resolve cache"
 msgstr ""
 
+#: sources.d/icingaweb2-module-director/library/Director/Field/FormFieldSuggestion.php:78
+msgid "Suggested fields"
+msgstr ""
+
+#: sources.d/icingaweb2-module-director/library/Director/Field/FormFieldSuggestion.php:82
+msgid "Argument macros"
+msgstr ""
+
+#: sources.d/icingaweb2-module-director/library/Director/Field/FormFieldSuggestion.php:86
+msgid "Flags (boolean) arguments"
+msgstr ""
+
+#: sources.d/icingaweb2-module-director/library/Director/Field/FormFieldSuggestion.php:90
+msgid "Other available fields"
+msgstr ""
+
 #: sources.d/icingaweb2-module-director/library/Director/IcingaConfig/StateFilterSet.php:20
 msgid "Up"
 msgstr ""
@@ -5291,7 +5302,7 @@ msgstr ""
 msgid "Run all rules at once"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Objects/DirectorDatafield.php:213
+#: sources.d/icingaweb2-module-director/library/Director/Objects/DirectorDatafield.php:204
 #, php-format
 msgid "Form element could not be created, %s is missing"
 msgstr ""
@@ -5594,7 +5605,7 @@ msgid ""
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMakeBoolean.php:42
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:35
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:34
 msgid "Set null"
 msgstr ""
 
@@ -5607,34 +5618,34 @@ msgid "Set false"
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMakeBoolean.php:45
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:38
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:37
 msgid "Let the import fail"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:21
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:20
 msgid "Please choose a data list that can be used for map lookups"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:30
+#: sources.d/icingaweb2-module-director/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 "
 "the import process"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:36
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:35
 msgid "Return lookup key unmodified"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:37
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:36
 msgid "Return custom default value"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:46
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:45
 msgid "Default value"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:49
+#: sources.d/icingaweb2-module-director/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 "
@@ -6559,67 +6570,57 @@ msgstr ""
 msgid "In case you're using %s, please run this Script:"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:158
 #: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:164
-msgid "Icinga 2 Powershell Module"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:160
-#, php-format
-msgid "In case you're using the legacy %s, please run:"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:177
 msgid "Documentation"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:192
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:179
 msgid "Configure this Agent via Self Service API"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:195
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:182
 msgid "Inherited Template Api Key:"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:216
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:203
 msgid "Icinga 2 Client documentation"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:221
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:208
 msgid "Top Down"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:234
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:221
 #, php-format
 msgid ""
 "A ticket for this agent could not have been requested from your deployment "
 "endpoint: %s"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:245
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:232
 msgid "For manual configuration"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:246
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:233
 msgid "Ticket"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:247
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:234
 msgid "Windows Kickstart Script"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:256
+#: sources.d/icingaweb2-module-director/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 "
 "connected to it's parents"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:260
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:247
 msgid "Linux commandline"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:267
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:255
 msgid "Just download and run this script on your Linux Client Machine:"
 msgstr ""
 
@@ -6702,15 +6703,15 @@ msgid "Category Name"
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldCategoryTable.php:48
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:52
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:54
 msgid "# Used"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:51
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:53
 msgid "Category"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:53
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:55
 msgid "# Vars"
 msgstr ""
 
@@ -6771,16 +6772,16 @@ msgstr ""
 msgid "%s %s(%s)"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:216
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:229
 #, php-format
 msgid "This set has been inherited from %s"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:225
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:238
 msgid "Remove"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:227
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:240
 #, php-format
 msgid "Remove \"%s\" from this host"
 msgstr ""
@@ -6799,7 +6800,7 @@ msgstr ""
 msgid "Imported rows"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/ObjectSetTable.php:62
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/ObjectSetTable.php:66
 #, php-format
 msgid "%s (%d members)"
 msgstr ""
@@ -6838,7 +6839,7 @@ msgstr ""
 msgid "Total"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/TemplateUsageTable.php:103
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/TemplateUsageTable.php:104
 msgid "This template is not in use"
 msgstr ""
 
diff --git a/src/icingaweb2-module-director/pt_BR/LC_MESSAGES/icinga.po b/src/icingaweb2-module-director/pt_BR/LC_MESSAGES/icinga.po
index 1324c5b1..e432b52a 100644
--- a/src/icingaweb2-module-director/pt_BR/LC_MESSAGES/icinga.po
+++ b/src/icingaweb2-module-director/pt_BR/LC_MESSAGES/icinga.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-21 16:06+0000\n"
+"POT-Creation-Date: 2023-09-12 12:59+0000\n"
 "PO-Revision-Date: 2020-04-27 14:55+0200\n"
 "Last-Translator: Carlos Cesario <carloscesario@gmail.com>\n"
 "Language-Team: \n"
@@ -131,8 +131,8 @@ msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/controllers/BasketController.php:238
 #: sources.d/icingaweb2-module-director/application/controllers/SchemaController.php:80
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:236
 #: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:249
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:262
 msgid "Download"
 msgstr ""
 
@@ -319,6 +319,7 @@ msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:384
 #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:395
+#: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:284
 #: sources.d/icingaweb2-module-director/application/forms/SelfServiceSettingsForm.php:252
 #: sources.d/icingaweb2-module-director/application/forms/SettingsForm.php:193
 #: sources.d/icingaweb2-module-director/application/views/helpers/FormDataFilter.php:465
@@ -951,7 +952,7 @@ msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/controllers/ServiceController.php:280
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostVarForm.php:15
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:598
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:601
 #: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:12
 #: sources.d/icingaweb2-module-director/library/Director/Import/ImportSourceDirectorObject.php:71
 #: sources.d/icingaweb2-module-director/library/Director/TranslationDummy.php:13
@@ -1052,7 +1053,7 @@ msgstr ""
 
 #: sources.d/icingaweb2-module-director/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 ""
 
 #: sources.d/icingaweb2-module-director/application/controllers/SyncruleController.php:108
@@ -1511,7 +1512,7 @@ msgstr ""
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldCategoryForm.php:31
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:158
 #: sources.d/icingaweb2-module-director/application/forms/IcingaCommandArgumentForm.php:31
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:134
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:94
 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceSetForm.php:103
 #: sources.d/icingaweb2-module-director/application/forms/IcingaTemplateChoiceForm.php:56
 #: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:52
@@ -1581,7 +1582,7 @@ msgid ""
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:141
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:50
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:52
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaObjectDatafieldTable.php:50
 msgid "Field name"
 msgstr ""
@@ -1593,16 +1594,18 @@ msgid ""
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:149
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:126
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:83
 msgid "Caption"
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:152
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:88
 msgid ""
 "The caption which should be displayed to your users when this field is shown"
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:160
+#: sources.d/icingaweb2-module-director/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"
@@ -1632,7 +1635,7 @@ msgid ""
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatalistEntryForm.php:30
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:49
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:51
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatalistEntryTable.php:55
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaObjectDatafieldTable.php:49
 msgid "Label"
@@ -1772,19 +1775,19 @@ msgstr ""
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostForm.php:40
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostVarForm.php:22
 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceDictionaryMemberForm.php:22
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:576
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:579
 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceVarForm.php:22
 #: sources.d/icingaweb2-module-director/application/forms/IcingaTimePeriodForm.php:15
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/ChoicesTable.php:41
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/CoreApiFieldsTable.php:79
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/CoreApiObjectsTable.php:57
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/CoreApiPrototypesTable.php:40
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/ObjectSetTable.php:46
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/ObjectSetTable.php:50
 msgid "Name"
 msgstr "Nome"
 
 #: sources.d/icingaweb2-module-director/application/forms/IcingaAddServiceForm.php:147
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:579
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:582
 msgid "Name for the Icinga service you are going to create"
 msgstr ""
 
@@ -2006,7 +2009,7 @@ msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/IcingaCommandArgumentForm.php:181
 #: sources.d/icingaweb2-module-director/application/forms/IcingaScheduledDowntimeRangeForm.php:99
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:778
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:781
 #: sources.d/icingaweb2-module-director/application/forms/IcingaTimePeriodRangeForm.php:94
 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/DirectorObjectForm.php:673
 msgid "No action taken, object has not been modified"
@@ -2119,7 +2122,7 @@ msgstr ""
 #: sources.d/icingaweb2-module-director/application/forms/IcingaDependencyForm.php:100
 #: sources.d/icingaweb2-module-director/application/forms/IcingaNotificationForm.php:90
 #: sources.d/icingaweb2-module-director/application/forms/IcingaScheduledDowntimeForm.php:89
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:712
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:715
 #: sources.d/icingaweb2-module-director/configuration.php:121
 #: sources.d/icingaweb2-module-director/library/Director/Dashboard/Dashlet/HostsDashlet.php:13
 #: sources.d/icingaweb2-module-director/library/Director/DataType/DataTypeDictionary.php:59
@@ -2136,7 +2139,7 @@ msgstr "Hosts"
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostGroupForm.php:30
 #: sources.d/icingaweb2-module-director/application/forms/IcingaNotificationForm.php:107
 #: sources.d/icingaweb2-module-director/application/forms/IcingaScheduledDowntimeForm.php:115
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:477
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:480
 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceGroupForm.php:30
 msgid ""
 "This allows you to configure an assignment filter. Please feel free to "
@@ -2358,7 +2361,7 @@ msgid ""
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostForm.php:149
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:698
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:701
 msgid "Icinga Agent and zone settings"
 msgstr ""
 
@@ -2380,7 +2383,7 @@ msgid "Choose a Host Template"
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostForm.php:219
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:650
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:653
 #: sources.d/icingaweb2-module-director/application/forms/IcingaUserForm.php:109
 #: sources.d/icingaweb2-module-director/library/Director/Web/Tabs/ObjectsTabs.php:67
 msgid "Groups"
@@ -2652,64 +2655,44 @@ msgstr ""
 msgid "Check command definition"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:94
-msgid "Suggested fields"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:99
-msgid "Argument macros"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:104
-msgid "Other available fields"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:118
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:75
 msgid ""
 "There are no data fields available. Please ask an administrator to create "
 "such"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:130
-msgid "The caption which should be displayed"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:135
-msgid "A description about the field"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:143
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:148
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:106
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:111
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaObjectDatafieldTable.php:51
 msgid "Mandatory"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:144
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:107
 msgid "Whether this field should be mandatory"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:147
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:110
 msgid "Optional"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:170
+#: sources.d/icingaweb2-module-director/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 "
 "cleared once stored"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:184
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:132
 msgid "Show based on filter"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:194
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:142
 #: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:87
 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/DirectorObjectForm.php:928
 msgid "Delete"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:197
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:145
 msgid "Field has been removed"
 msgstr ""
 
@@ -2819,89 +2802,89 @@ msgstr ""
 msgid "Name for the instance you are going to create"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:137
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:138
 msgid "This Service has been deactivated on this host"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:142
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:143
 msgid "Reactivate"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:161
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:436
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:468
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:162
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:439
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:471
 msgid "Override vars"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:167
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:168
 msgid "Hints regarding this service"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:174
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:175
 msgid "Deactivate"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:287
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:290
 #, php-format
 msgid "%s has been deactivated on %s"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:323
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:326
 #, php-format
 msgid "%s is no longer deactivated on %s"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:385
+#: sources.d/icingaweb2-module-director/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."
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:391
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:394
 #, php-format
 msgid ""
 "This service has been generated using the %s apply rule, assigned where %s"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:404
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:407
 #, php-format
 msgid ""
 "This service belongs to the %s Service Set. Still, you might want to "
 "override the following properties for this host only."
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:416
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:419
 #, php-format
 msgid ""
 "This service has been inherited from %s. Still, you might want to change the "
 "following properties for this host only."
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:444
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:447
 #, php-format
 msgid ""
 "This service belongs to the service set \"%s\". Still, you might want to "
 "change the following properties for this host only."
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:465
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:468
 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/IcingaObjectFieldLoader.php:266
 msgid "Custom properties"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:602
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:605
 msgid "Choose the host this single service should be assigned to"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:624
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:627
 msgid "Apply For"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:626
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:629
 msgid "None"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:628
+#: sources.d/icingaweb2-module-director/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 "
@@ -2910,7 +2893,7 @@ msgid ""
 "eligible."
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:654
+#: sources.d/icingaweb2-module-director/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 "
@@ -2919,17 +2902,17 @@ msgid ""
 "be directly assigned to single services or to service templates."
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:679
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:682
 msgid "Run on agent"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:681
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:684
 msgid ""
 "Whether the check commmand for this service should be executed on the Icinga "
 "agent"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:711
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:714
 #: sources.d/icingaweb2-module-director/library/Director/Import/ImportSourceDirectorObject.php:82
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/DependencyTemplateUsageTable.php:10
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/HostTemplateUsageTable.php:10
@@ -2941,12 +2924,12 @@ msgstr ""
 msgid "Templates"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:767
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:770
 #, php-format
 msgid "All overrides have been removed from \"%s\""
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:768
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:771
 #, php-format
 msgid "The given properties have been stored for \"%s\""
 msgstr ""
@@ -3267,11 +3250,32 @@ msgid ""
 "it's purpose and why it has been put in place at all."
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:69
+#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:68
+#: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:84
+msgid "Set based on filter"
+msgstr ""
+
+#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:89
+#: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:103
+#: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:95
+msgid "Filter Expression"
+msgstr ""
+
+#: sources.d/icingaweb2-module-director/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 ""
+
+#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:104
 msgid "Modifier"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:72
+#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:107
 msgid ""
 "A property modifier allows you to modify a specific property at import time"
 msgstr ""
@@ -3835,15 +3839,6 @@ msgstr ""
 msgid "Custom variable"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:84
-msgid "Set based on filter"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:103
-#: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:95
-msgid "Filter Expression"
-msgstr ""
-
 #: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:105
 msgid ""
 "This allows to filter for specific parts within the given source expression. "
@@ -4580,7 +4575,7 @@ msgid "Scheduled Downtimes"
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/library/Director/Dashboard/Dashlet/SelfServiceDashlet.php:13
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:180
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:167
 msgid "Self Service API"
 msgstr ""
 
@@ -4975,6 +4970,22 @@ msgstr ""
 msgid "(Host) group resolve cache"
 msgstr ""
 
+#: sources.d/icingaweb2-module-director/library/Director/Field/FormFieldSuggestion.php:78
+msgid "Suggested fields"
+msgstr ""
+
+#: sources.d/icingaweb2-module-director/library/Director/Field/FormFieldSuggestion.php:82
+msgid "Argument macros"
+msgstr ""
+
+#: sources.d/icingaweb2-module-director/library/Director/Field/FormFieldSuggestion.php:86
+msgid "Flags (boolean) arguments"
+msgstr ""
+
+#: sources.d/icingaweb2-module-director/library/Director/Field/FormFieldSuggestion.php:90
+msgid "Other available fields"
+msgstr ""
+
 #: sources.d/icingaweb2-module-director/library/Director/IcingaConfig/StateFilterSet.php:20
 msgid "Up"
 msgstr "Up"
@@ -5319,7 +5330,7 @@ msgstr ""
 msgid "Run all rules at once"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Objects/DirectorDatafield.php:213
+#: sources.d/icingaweb2-module-director/library/Director/Objects/DirectorDatafield.php:204
 #, php-format
 msgid "Form element could not be created, %s is missing"
 msgstr ""
@@ -5623,7 +5634,7 @@ msgid ""
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMakeBoolean.php:42
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:35
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:34
 msgid "Set null"
 msgstr ""
 
@@ -5636,34 +5647,34 @@ msgid "Set false"
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMakeBoolean.php:45
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:38
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:37
 msgid "Let the import fail"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:21
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:20
 msgid "Please choose a data list that can be used for map lookups"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:30
+#: sources.d/icingaweb2-module-director/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 "
 "the import process"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:36
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:35
 msgid "Return lookup key unmodified"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:37
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:36
 msgid "Return custom default value"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:46
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:45
 msgid "Default value"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:49
+#: sources.d/icingaweb2-module-director/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 "
@@ -6591,67 +6602,57 @@ msgstr ""
 msgid "In case you're using %s, please run this Script:"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:158
 #: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:164
-msgid "Icinga 2 Powershell Module"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:160
-#, php-format
-msgid "In case you're using the legacy %s, please run:"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:177
 msgid "Documentation"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:192
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:179
 msgid "Configure this Agent via Self Service API"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:195
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:182
 msgid "Inherited Template Api Key:"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:216
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:203
 msgid "Icinga 2 Client documentation"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:221
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:208
 msgid "Top Down"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:234
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:221
 #, php-format
 msgid ""
 "A ticket for this agent could not have been requested from your deployment "
 "endpoint: %s"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:245
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:232
 msgid "For manual configuration"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:246
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:233
 msgid "Ticket"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:247
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:234
 msgid "Windows Kickstart Script"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:256
+#: sources.d/icingaweb2-module-director/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 "
 "connected to it's parents"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:260
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:247
 msgid "Linux commandline"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:267
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:255
 msgid "Just download and run this script on your Linux Client Machine:"
 msgstr ""
 
@@ -6735,15 +6736,15 @@ msgid "Category Name"
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldCategoryTable.php:48
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:52
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:54
 msgid "# Used"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:51
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:53
 msgid "Category"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:53
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:55
 msgid "# Vars"
 msgstr ""
 
@@ -6804,16 +6805,16 @@ msgstr ""
 msgid "%s %s(%s)"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:216
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:229
 #, php-format
 msgid "This set has been inherited from %s"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:225
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:238
 msgid "Remove"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:227
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:240
 #, php-format
 msgid "Remove \"%s\" from this host"
 msgstr ""
@@ -6832,7 +6833,7 @@ msgstr ""
 msgid "Imported rows"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/ObjectSetTable.php:62
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/ObjectSetTable.php:66
 #, php-format
 msgid "%s (%d members)"
 msgstr ""
@@ -6871,7 +6872,7 @@ msgstr ""
 msgid "Total"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/TemplateUsageTable.php:103
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/TemplateUsageTable.php:104
 msgid "This template is not in use"
 msgstr ""
 
diff --git a/src/icingaweb2-module-director/ru_RU/LC_MESSAGES/icinga.po b/src/icingaweb2-module-director/ru_RU/LC_MESSAGES/icinga.po
index 2ac2e67a..345e9219 100644
--- a/src/icingaweb2-module-director/ru_RU/LC_MESSAGES/icinga.po
+++ b/src/icingaweb2-module-director/ru_RU/LC_MESSAGES/icinga.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-21 16:06+0000\n"
+"POT-Creation-Date: 2023-09-12 12:59+0000\n"
 "PO-Revision-Date: 2021-11-03 12:23+0500\n"
 "Last-Translator: Dmitriy Q <dmitry@atsip.ru>\n"
 "Language-Team: TranslAster <https://github.com/translaster>\n"
@@ -133,8 +133,8 @@ msgstr "Восстановление"
 
 #: sources.d/icingaweb2-module-director/application/controllers/BasketController.php:238
 #: sources.d/icingaweb2-module-director/application/controllers/SchemaController.php:80
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:236
 #: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:249
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:262
 msgid "Download"
 msgstr "Загрузить"
 
@@ -330,6 +330,7 @@ msgstr "Разница в конфигурации"
 
 #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:384
 #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:395
+#: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:284
 #: sources.d/icingaweb2-module-director/application/forms/SelfServiceSettingsForm.php:252
 #: sources.d/icingaweb2-module-director/application/forms/SettingsForm.php:193
 #: sources.d/icingaweb2-module-director/application/views/helpers/FormDataFilter.php:465
@@ -968,7 +969,7 @@ msgstr "Применить: %s"
 
 #: sources.d/icingaweb2-module-director/application/controllers/ServiceController.php:280
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostVarForm.php:15
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:598
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:601
 #: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:12
 #: sources.d/icingaweb2-module-director/library/Director/Import/ImportSourceDirectorObject.php:71
 #: sources.d/icingaweb2-module-director/library/Director/TranslationDummy.php:13
@@ -1070,7 +1071,7 @@ msgstr ""
 
 #: sources.d/icingaweb2-module-director/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 ""
 
 #: sources.d/icingaweb2-module-director/application/controllers/SyncruleController.php:108
@@ -1540,7 +1541,7 @@ msgstr ""
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldCategoryForm.php:31
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:158
 #: sources.d/icingaweb2-module-director/application/forms/IcingaCommandArgumentForm.php:31
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:134
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:94
 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceSetForm.php:103
 #: sources.d/icingaweb2-module-director/application/forms/IcingaTemplateChoiceForm.php:56
 #: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:52
@@ -1616,7 +1617,7 @@ msgstr ""
 "настраивать таким образом."
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:141
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:50
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:52
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaObjectDatafieldTable.php:50
 msgid "Field name"
 msgstr "Имя поля"
@@ -1628,16 +1629,18 @@ msgid ""
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:149
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:126
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:83
 msgid "Caption"
 msgstr "Подпись"
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:152
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:88
 msgid ""
 "The caption which should be displayed to your users when this field is shown"
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:160
+#: sources.d/icingaweb2-module-director/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"
@@ -1669,7 +1672,7 @@ msgid ""
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatalistEntryForm.php:30
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:49
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:51
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatalistEntryTable.php:55
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaObjectDatafieldTable.php:49
 msgid "Label"
@@ -1814,19 +1817,19 @@ msgstr "Выбрать шаблон службы"
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostForm.php:40
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostVarForm.php:22
 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceDictionaryMemberForm.php:22
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:576
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:579
 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceVarForm.php:22
 #: sources.d/icingaweb2-module-director/application/forms/IcingaTimePeriodForm.php:15
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/ChoicesTable.php:41
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/CoreApiFieldsTable.php:79
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/CoreApiObjectsTable.php:57
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/CoreApiPrototypesTable.php:40
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/ObjectSetTable.php:46
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/ObjectSetTable.php:50
 msgid "Name"
 msgstr "Название"
 
 #: sources.d/icingaweb2-module-director/application/forms/IcingaAddServiceForm.php:147
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:579
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:582
 msgid "Name for the Icinga service you are going to create"
 msgstr ""
 
@@ -2053,7 +2056,7 @@ msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/IcingaCommandArgumentForm.php:181
 #: sources.d/icingaweb2-module-director/application/forms/IcingaScheduledDowntimeRangeForm.php:99
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:778
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:781
 #: sources.d/icingaweb2-module-director/application/forms/IcingaTimePeriodRangeForm.php:94
 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/DirectorObjectForm.php:673
 msgid "No action taken, object has not been modified"
@@ -2166,7 +2169,7 @@ msgstr ""
 #: sources.d/icingaweb2-module-director/application/forms/IcingaDependencyForm.php:100
 #: sources.d/icingaweb2-module-director/application/forms/IcingaNotificationForm.php:90
 #: sources.d/icingaweb2-module-director/application/forms/IcingaScheduledDowntimeForm.php:89
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:712
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:715
 #: sources.d/icingaweb2-module-director/configuration.php:121
 #: sources.d/icingaweb2-module-director/library/Director/Dashboard/Dashlet/HostsDashlet.php:13
 #: sources.d/icingaweb2-module-director/library/Director/DataType/DataTypeDictionary.php:59
@@ -2183,7 +2186,7 @@ msgstr "Узлы"
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostGroupForm.php:30
 #: sources.d/icingaweb2-module-director/application/forms/IcingaNotificationForm.php:107
 #: sources.d/icingaweb2-module-director/application/forms/IcingaScheduledDowntimeForm.php:115
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:477
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:480
 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceGroupForm.php:30
 msgid ""
 "This allows you to configure an assignment filter. Please feel free to "
@@ -2409,7 +2412,7 @@ msgid ""
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostForm.php:149
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:698
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:701
 msgid "Icinga Agent and zone settings"
 msgstr "Icinga Агент и настройки зоны"
 
@@ -2431,7 +2434,7 @@ msgid "Choose a Host Template"
 msgstr "Выбрать шаблон узла"
 
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostForm.php:219
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:650
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:653
 #: sources.d/icingaweb2-module-director/application/forms/IcingaUserForm.php:109
 #: sources.d/icingaweb2-module-director/library/Director/Web/Tabs/ObjectsTabs.php:67
 msgid "Groups"
@@ -2709,47 +2712,27 @@ msgstr ""
 msgid "Check command definition"
 msgstr "Определение команды проверки"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:94
-msgid "Suggested fields"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:99
-msgid "Argument macros"
-msgstr "Макрос аргумента"
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:104
-msgid "Other available fields"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:118
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:75
 msgid ""
 "There are no data fields available. Please ask an administrator to create "
 "such"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:130
-msgid "The caption which should be displayed"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:135
-msgid "A description about the field"
-msgstr "Описание этого поля"
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:143
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:148
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:106
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:111
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaObjectDatafieldTable.php:51
 msgid "Mandatory"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:144
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:107
 msgid "Whether this field should be mandatory"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:147
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:110
 msgid "Optional"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:170
+#: sources.d/icingaweb2-module-director/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 "
@@ -2759,17 +2742,17 @@ msgstr ""
 "условий. В противном случае оно не будет доступно и значения заданные ранее "
 "в конечном итоге будут очищены после сохранения"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:184
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:132
 msgid "Show based on filter"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:194
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:142
 #: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:87
 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/DirectorObjectForm.php:928
 msgid "Delete"
 msgstr "Удалить"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:197
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:145
 msgid "Field has been removed"
 msgstr "Поле было удалено"
 
@@ -2879,89 +2862,89 @@ msgstr "Новый %s успешно создан"
 msgid "Name for the instance you are going to create"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:137
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:138
 msgid "This Service has been deactivated on this host"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:142
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:143
 msgid "Reactivate"
 msgstr "Повторно активирован"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:161
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:436
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:468
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:162
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:439
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:471
 msgid "Override vars"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:167
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:168
 msgid "Hints regarding this service"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:174
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:175
 msgid "Deactivate"
 msgstr "Деактивирован"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:287
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:290
 #, php-format
 msgid "%s has been deactivated on %s"
 msgstr "%s был деактивирован на %s"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:323
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:326
 #, php-format
 msgid "%s is no longer deactivated on %s"
 msgstr "%s больше не деактивирован на %s"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:385
+#: sources.d/icingaweb2-module-director/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."
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:391
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:394
 #, php-format
 msgid ""
 "This service has been generated using the %s apply rule, assigned where %s"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:404
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:407
 #, php-format
 msgid ""
 "This service belongs to the %s Service Set. Still, you might want to "
 "override the following properties for this host only."
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:416
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:419
 #, php-format
 msgid ""
 "This service has been inherited from %s. Still, you might want to change the "
 "following properties for this host only."
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:444
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:447
 #, php-format
 msgid ""
 "This service belongs to the service set \"%s\". Still, you might want to "
 "change the following properties for this host only."
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:465
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:468
 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/IcingaObjectFieldLoader.php:266
 msgid "Custom properties"
 msgstr "Пользовательские свойства"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:602
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:605
 msgid "Choose the host this single service should be assigned to"
 msgstr "Выберите хост, которому должна быть назначена эта единственная служба"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:624
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:627
 msgid "Apply For"
 msgstr "Применить для"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:626
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:629
 msgid "None"
 msgstr "Отсутствует"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:628
+#: sources.d/icingaweb2-module-director/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 "
@@ -2970,7 +2953,7 @@ msgid ""
 "eligible."
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:654
+#: sources.d/icingaweb2-module-director/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 "
@@ -2979,17 +2962,17 @@ msgid ""
 "be directly assigned to single services or to service templates."
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:679
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:682
 msgid "Run on agent"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:681
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:684
 msgid ""
 "Whether the check commmand for this service should be executed on the Icinga "
 "agent"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:711
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:714
 #: sources.d/icingaweb2-module-director/library/Director/Import/ImportSourceDirectorObject.php:82
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/DependencyTemplateUsageTable.php:10
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/HostTemplateUsageTable.php:10
@@ -3001,12 +2984,12 @@ msgstr ""
 msgid "Templates"
 msgstr "Шаблоны"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:767
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:770
 #, php-format
 msgid "All overrides have been removed from \"%s\""
 msgstr "Все переопределения были удалены из \"%s\""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:768
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:771
 #, php-format
 msgid "The given properties have been stored for \"%s\""
 msgstr ""
@@ -3344,11 +3327,32 @@ msgstr ""
 "Расширенное описание для этого модификатора строки импорта. Оно должно "
 "объяснить его назначение и то, почему оно вообще было введено в действие."
 
-#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:69
+#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:68
+#: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:84
+msgid "Set based on filter"
+msgstr ""
+
+#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:89
+#: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:103
+#: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:95
+msgid "Filter Expression"
+msgstr "Фильтр выражения"
+
+#: sources.d/icingaweb2-module-director/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 ""
+
+#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:104
 msgid "Modifier"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:72
+#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:107
 msgid ""
 "A property modifier allows you to modify a specific property at import time"
 msgstr ""
@@ -3950,15 +3954,6 @@ msgstr "Поле назначения"
 msgid "Custom variable"
 msgstr "Пользовательская переменная"
 
-#: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:84
-msgid "Set based on filter"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:103
-#: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:95
-msgid "Filter Expression"
-msgstr "Фильтр выражения"
-
 #: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:105
 msgid ""
 "This allows to filter for specific parts within the given source expression. "
@@ -4713,7 +4708,7 @@ msgid "Scheduled Downtimes"
 msgstr "Расписание времен простоя"
 
 #: sources.d/icingaweb2-module-director/library/Director/Dashboard/Dashlet/SelfServiceDashlet.php:13
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:180
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:167
 msgid "Self Service API"
 msgstr ""
 
@@ -5108,6 +5103,22 @@ msgstr ""
 msgid "(Host) group resolve cache"
 msgstr "(Узел) кэш группового разрешения"
 
+#: sources.d/icingaweb2-module-director/library/Director/Field/FormFieldSuggestion.php:78
+msgid "Suggested fields"
+msgstr ""
+
+#: sources.d/icingaweb2-module-director/library/Director/Field/FormFieldSuggestion.php:82
+msgid "Argument macros"
+msgstr "Макрос аргумента"
+
+#: sources.d/icingaweb2-module-director/library/Director/Field/FormFieldSuggestion.php:86
+msgid "Flags (boolean) arguments"
+msgstr ""
+
+#: sources.d/icingaweb2-module-director/library/Director/Field/FormFieldSuggestion.php:90
+msgid "Other available fields"
+msgstr ""
+
 #: sources.d/icingaweb2-module-director/library/Director/IcingaConfig/StateFilterSet.php:20
 msgid "Up"
 msgstr "Вверх"
@@ -5462,7 +5473,7 @@ msgstr "Применить изменения"
 msgid "Run all rules at once"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Objects/DirectorDatafield.php:213
+#: sources.d/icingaweb2-module-director/library/Director/Objects/DirectorDatafield.php:204
 #, php-format
 msgid "Form element could not be created, %s is missing"
 msgstr ""
@@ -5768,7 +5779,7 @@ msgid ""
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMakeBoolean.php:42
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:35
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:34
 msgid "Set null"
 msgstr ""
 
@@ -5781,35 +5792,35 @@ msgid "Set false"
 msgstr ""
 
 #: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMakeBoolean.php:45
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:38
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:37
 msgid "Let the import fail"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:21
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:20
 msgid "Please choose a data list that can be used for map lookups"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:30
+#: sources.d/icingaweb2-module-director/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 "
 "the import process"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:36
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:35
 msgid "Return lookup key unmodified"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:37
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:36
 msgid "Return custom default value"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:46
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:45
 #, fuzzy
 msgid "Default value"
 msgstr "Глобальная зона по умолчанию"
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:49
+#: sources.d/icingaweb2-module-director/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 "
@@ -6759,37 +6770,27 @@ msgstr "Icinga для Windows"
 msgid "In case you're using %s, please run this Script:"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:158
 #: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:164
-msgid "Icinga 2 Powershell Module"
-msgstr "Icinga 2 Модуль Powershell"
-
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:160
-#, php-format
-msgid "In case you're using the legacy %s, please run:"
-msgstr ""
-
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:177
 msgid "Documentation"
 msgstr "Документация"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:192
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:179
 msgid "Configure this Agent via Self Service API"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:195
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:182
 msgid "Inherited Template Api Key:"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:216
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:203
 msgid "Icinga 2 Client documentation"
 msgstr "Icinga 2 Клиентская документация"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:221
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:208
 msgid "Top Down"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:234
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:221
 #, php-format
 msgid ""
 "A ticket for this agent could not have been requested from your deployment "
@@ -6798,30 +6799,30 @@ msgstr ""
 "Ярлык для этого агента не мог быть запрошен из конечной точки развертывания: "
 "%s"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:245
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:232
 msgid "For manual configuration"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:246
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:233
 msgid "Ticket"
 msgstr "Задача"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:247
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:234
 msgid "Windows Kickstart Script"
 msgstr "Скрипт быстрого запуска Windows"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:256
+#: sources.d/icingaweb2-module-director/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 "
 "connected to it's parents"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:260
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:247
 msgid "Linux commandline"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:267
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:255
 msgid "Just download and run this script on your Linux Client Machine:"
 msgstr ""
 
@@ -6905,15 +6906,15 @@ msgid "Category Name"
 msgstr "Название категории"
 
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldCategoryTable.php:48
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:52
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:54
 msgid "# Used"
 msgstr "# Использовано"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:51
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:53
 msgid "Category"
 msgstr "Категория"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:53
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:55
 msgid "# Vars"
 msgstr "# Переменные"
 
@@ -6974,17 +6975,17 @@ msgstr ""
 msgid "%s %s(%s)"
 msgstr "%s %s(%s)"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:216
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:229
 #, php-format
 msgid "This set has been inherited from %s"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:225
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:238
 #, fuzzy
 msgid "Remove"
 msgstr "Удалить"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:227
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:240
 #, php-format
 msgid "Remove \"%s\" from this host"
 msgstr ""
@@ -7003,7 +7004,7 @@ msgstr "Метка времени"
 msgid "Imported rows"
 msgstr ""
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/ObjectSetTable.php:62
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/ObjectSetTable.php:66
 #, php-format
 msgid "%s (%d members)"
 msgstr "%s (%d участников)"
@@ -7042,7 +7043,7 @@ msgstr ""
 msgid "Total"
 msgstr "Суммарно"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/TemplateUsageTable.php:103
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/TemplateUsageTable.php:104
 msgid "This template is not in use"
 msgstr "Этот шаблон не используется"
 
@@ -7518,6 +7519,12 @@ msgstr "объекты %s были изменены"
 msgid "Show all actions"
 msgstr ""
 
+#~ msgid "A description about the field"
+#~ msgstr "Описание этого поля"
+
+#~ msgid "Icinga 2 Powershell Module"
+#~ msgstr "Icinga 2 Модуль Powershell"
+
 #, fuzzy
 #~ msgid "Create a new Service Set"
 #~ msgstr "Создание нового набора %s"
diff --git a/src/icingaweb2-module-director/uk_UA/LC_MESSAGES/icinga.po b/src/icingaweb2-module-director/uk_UA/LC_MESSAGES/icinga.po
index 3c6e3281..e5e100c7 100644
--- a/src/icingaweb2-module-director/uk_UA/LC_MESSAGES/icinga.po
+++ b/src/icingaweb2-module-director/uk_UA/LC_MESSAGES/icinga.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-21 16:06+0000\n"
+"POT-Creation-Date: 2023-09-12 12:59+0000\n"
 "PO-Revision-Date: 2023-05-06 17:23+0000\n"
 "Last-Translator: p4k8 <pkuznetsunit@gmail.com>\n"
 "Language-Team: Ukrainian <https://translate.icinga.com/projects/icinga/"
@@ -18,8 +18,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 4.16.4\n"
 
 #: sources.d/icingaweb2-module-director/application/controllers/BasketController.php:34
@@ -133,8 +133,8 @@ msgstr "Відновити"
 
 #: sources.d/icingaweb2-module-director/application/controllers/BasketController.php:238
 #: sources.d/icingaweb2-module-director/application/controllers/SchemaController.php:80
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:236
 #: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:249
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:262
 msgid "Download"
 msgstr "Завантажити"
 
@@ -327,6 +327,7 @@ msgstr "Різниця конфігурації"
 
 #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:384
 #: sources.d/icingaweb2-module-director/application/controllers/ConfigController.php:395
+#: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:284
 #: sources.d/icingaweb2-module-director/application/forms/SelfServiceSettingsForm.php:252
 #: sources.d/icingaweb2-module-director/application/forms/SettingsForm.php:193
 #: sources.d/icingaweb2-module-director/application/views/helpers/FormDataFilter.php:465
@@ -971,7 +972,7 @@ msgstr "Застосувати: %s"
 
 #: sources.d/icingaweb2-module-director/application/controllers/ServiceController.php:280
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostVarForm.php:15
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:598
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:601
 #: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:12
 #: sources.d/icingaweb2-module-director/library/Director/Import/ImportSourceDirectorObject.php:71
 #: sources.d/icingaweb2-module-director/library/Director/TranslationDummy.php:13
@@ -1076,8 +1077,8 @@ msgstr ""
 "наявність змін або здійснити новий запуск синхронізації."
 
 #: sources.d/icingaweb2-module-director/application/controllers/SyncruleController.php:97
-#, php-format
-msgid "This Sync Rule was last found to by in Sync at %s."
+#, fuzzy, php-format
+msgid "This Sync Rule was last found to be in Sync at %s."
 msgstr "Це правило синхронізації було в останній раз синхронізовано о %s."
 
 #: sources.d/icingaweb2-module-director/application/controllers/SyncruleController.php:108
@@ -1550,7 +1551,7 @@ msgstr ""
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldCategoryForm.php:31
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:158
 #: sources.d/icingaweb2-module-director/application/forms/IcingaCommandArgumentForm.php:31
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:134
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:94
 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceSetForm.php:103
 #: sources.d/icingaweb2-module-director/application/forms/IcingaTemplateChoiceForm.php:56
 #: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:52
@@ -1641,7 +1642,7 @@ msgstr ""
 "способами якими користувачі зможуть їх задавати."
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:141
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:50
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:52
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaObjectDatafieldTable.php:50
 msgid "Field name"
 msgstr "Назва поля"
@@ -1654,16 +1655,18 @@ msgstr ""
 "Буде ім'ям користувацької змінної у конфігурації Icinga після розгортання."
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:149
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:126
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:83
 msgid "Caption"
 msgstr "Напис"
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:152
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:88
 msgid ""
 "The caption which should be displayed to your users when this field is shown"
 msgstr "Напис який будуть бачити користувачі при відображенні цього поля даних"
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatafieldForm.php:160
+#: sources.d/icingaweb2-module-director/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"
@@ -1696,7 +1699,7 @@ msgstr ""
 "зі списку"
 
 #: sources.d/icingaweb2-module-director/application/forms/DirectorDatalistEntryForm.php:30
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:49
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:51
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatalistEntryTable.php:55
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaObjectDatafieldTable.php:49
 msgid "Label"
@@ -1847,19 +1850,19 @@ msgstr "Обрати шаблон сервісів"
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostForm.php:40
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostVarForm.php:22
 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceDictionaryMemberForm.php:22
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:576
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:579
 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceVarForm.php:22
 #: sources.d/icingaweb2-module-director/application/forms/IcingaTimePeriodForm.php:15
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/ChoicesTable.php:41
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/CoreApiFieldsTable.php:79
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/CoreApiObjectsTable.php:57
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/CoreApiPrototypesTable.php:40
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/ObjectSetTable.php:46
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/ObjectSetTable.php:50
 msgid "Name"
 msgstr "Ім'я"
 
 #: sources.d/icingaweb2-module-director/application/forms/IcingaAddServiceForm.php:147
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:579
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:582
 msgid "Name for the Icinga service you are going to create"
 msgstr "Назва сервіса Icinga який ви бажаєте створити"
 
@@ -2096,7 +2099,7 @@ msgstr "Аргумент %s було успішно збережено"
 
 #: sources.d/icingaweb2-module-director/application/forms/IcingaCommandArgumentForm.php:181
 #: sources.d/icingaweb2-module-director/application/forms/IcingaScheduledDowntimeRangeForm.php:99
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:778
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:781
 #: sources.d/icingaweb2-module-director/application/forms/IcingaTimePeriodRangeForm.php:94
 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/DirectorObjectForm.php:673
 msgid "No action taken, object has not been modified"
@@ -2224,7 +2227,7 @@ msgstr "Чи повинна ця залежність впливати на хо
 #: sources.d/icingaweb2-module-director/application/forms/IcingaDependencyForm.php:100
 #: sources.d/icingaweb2-module-director/application/forms/IcingaNotificationForm.php:90
 #: sources.d/icingaweb2-module-director/application/forms/IcingaScheduledDowntimeForm.php:89
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:712
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:715
 #: sources.d/icingaweb2-module-director/configuration.php:121
 #: sources.d/icingaweb2-module-director/library/Director/Dashboard/Dashlet/HostsDashlet.php:13
 #: sources.d/icingaweb2-module-director/library/Director/DataType/DataTypeDictionary.php:59
@@ -2241,7 +2244,7 @@ msgstr "Хости"
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostGroupForm.php:30
 #: sources.d/icingaweb2-module-director/application/forms/IcingaNotificationForm.php:107
 #: sources.d/icingaweb2-module-director/application/forms/IcingaScheduledDowntimeForm.php:115
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:477
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:480
 #: sources.d/icingaweb2-module-director/application/forms/IcingaServiceGroupForm.php:30
 msgid ""
 "This allows you to configure an assignment filter. Please feel free to "
@@ -2486,7 +2489,7 @@ msgstr ""
 "документацію Icinga перед використанням цієї можливості"
 
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostForm.php:149
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:698
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:701
 msgid "Icinga Agent and zone settings"
 msgstr "Налаштування агенту Icinga та зони"
 
@@ -2508,7 +2511,7 @@ msgid "Choose a Host Template"
 msgstr "Обрати шаблон хоста"
 
 #: sources.d/icingaweb2-module-director/application/forms/IcingaHostForm.php:219
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:650
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:653
 #: sources.d/icingaweb2-module-director/application/forms/IcingaUserForm.php:109
 #: sources.d/icingaweb2-module-director/library/Director/Web/Tabs/ObjectsTabs.php:67
 msgid "Groups"
@@ -2815,47 +2818,27 @@ msgstr "Команда сповіщення"
 msgid "Check command definition"
 msgstr "Визначення команди сповіщення"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:94
-msgid "Suggested fields"
-msgstr "Запропоновані поля"
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:99
-msgid "Argument macros"
-msgstr "Макроси аргументів"
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:104
-msgid "Other available fields"
-msgstr "Інші доступні поля"
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:118
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:75
 msgid ""
 "There are no data fields available. Please ask an administrator to create "
 "such"
 msgstr "Відсутні поля даних. Будь ласка, попросіть адміністратора їх створити"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:130
-msgid "The caption which should be displayed"
-msgstr "Напис який буде показано"
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:135
-msgid "A description about the field"
-msgstr "Опис поля"
-
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:143
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:148
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:106
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:111
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaObjectDatafieldTable.php:51
 msgid "Mandatory"
 msgstr "Обов'язково"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:144
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:107
 msgid "Whether this field should be mandatory"
 msgstr "Чи повинне це поле бути обов'язковим"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:147
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:110
 msgid "Optional"
 msgstr "Опціонально"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:170
+#: sources.d/icingaweb2-module-director/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 "
@@ -2864,17 +2847,17 @@ msgstr ""
 "Ви можете показувати це поле лише коли виконуються певні умови. Інакше поле "
 "не буде доступним та значення задані раніше будуть очищені при збереженні"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:184
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:132
 msgid "Show based on filter"
 msgstr "Показати в залежності від фільтру"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:194
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:142
 #: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:87
 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/DirectorObjectForm.php:928
 msgid "Delete"
 msgstr "Видалити"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:197
+#: sources.d/icingaweb2-module-director/application/forms/IcingaObjectFieldForm.php:145
 msgid "Field has been removed"
 msgstr "Поле було видалено"
 
@@ -2996,39 +2979,39 @@ msgstr "Новий %s було успішно створено"
 msgid "Name for the instance you are going to create"
 msgstr "Назва екземпляру який буде створено"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:137
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:138
 msgid "This Service has been deactivated on this host"
 msgstr "Цей сервіс було деактивовано на цьому хості"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:142
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:143
 msgid "Reactivate"
 msgstr "Реактивувати"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:161
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:436
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:468
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:162
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:439
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:471
 msgid "Override vars"
 msgstr "Перезаписати змінні"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:167
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:168
 msgid "Hints regarding this service"
 msgstr "Підказки для цього сервіса"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:174
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:175
 msgid "Deactivate"
 msgstr "Деактивувати"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:287
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:290
 #, php-format
 msgid "%s has been deactivated on %s"
 msgstr "%s було деактивовано на %s"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:323
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:326
 #, php-format
 msgid "%s is no longer deactivated on %s"
 msgstr "%s більше не деактивовано на %s"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:385
+#: sources.d/icingaweb2-module-director/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."
@@ -3036,7 +3019,7 @@ msgstr ""
 "Цей сервіс було згенеровано автоматично, але наступні властивості можливо "
 "безпечно перезаписати."
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:391
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:394
 #, php-format
 msgid ""
 "This service has been generated using the %s apply rule, assigned where %s"
@@ -3044,7 +3027,7 @@ msgstr ""
 "Цей сервіс було згенеровано за допомогою правила призначення %s, "
 "застосованого до %s"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:404
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:407
 #, php-format
 msgid ""
 "This service belongs to the %s Service Set. Still, you might want to "
@@ -3053,7 +3036,7 @@ msgstr ""
 "Цей сервіс належить до набору сервісів %s. Але ви можете перезаписати "
 "наступні властивості лише для цього хоста."
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:416
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:419
 #, php-format
 msgid ""
 "This service has been inherited from %s. Still, you might want to change the "
@@ -3062,7 +3045,7 @@ msgstr ""
 "Цей сервіс було успадковано з %s. Але ви можете перезаписати наступні "
 "властивості лише для цього хоста."
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:444
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:447
 #, php-format
 msgid ""
 "This service belongs to the service set \"%s\". Still, you might want to "
@@ -3071,24 +3054,24 @@ msgstr ""
 "Цей сервіс належить до набору сервісів \"%s\". Але ви можете перезаписати "
 "наступні властивості лише для цього хоста."
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:465
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:468
 #: sources.d/icingaweb2-module-director/library/Director/Web/Form/IcingaObjectFieldLoader.php:266
 msgid "Custom properties"
 msgstr "Користувацькі властивості"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:602
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:605
 msgid "Choose the host this single service should be assigned to"
 msgstr "Оберіть хост до якого буде призначений цей окремий сервіс"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:624
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:627
 msgid "Apply For"
 msgstr "Застосувати до"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:626
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:629
 msgid "None"
 msgstr "Ніяк"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:628
+#: sources.d/icingaweb2-module-director/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 "
@@ -3101,7 +3084,7 @@ msgstr ""
 "(config in host.vars.array_var)\" де \"config\" буде доступним через "
 "\"$config$\". ПРИМІТКА: доступні лише користувацькі змінні типу \"Array\"."
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:654
+#: sources.d/icingaweb2-module-director/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 "
@@ -3115,18 +3098,18 @@ msgstr ""
 "або для користувацьких дашбордів. Групи сервісів можуть бути безпосередньо "
 "призначені окремим сервісам або шаблонам сервісів."
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:679
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:682
 msgid "Run on agent"
 msgstr "Запустити на агенті"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:681
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:684
 msgid ""
 "Whether the check commmand for this service should be executed on the Icinga "
 "agent"
 msgstr ""
 "Чи команда перевірки для цього сервіса має бути виконана на агенті Icinga"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:711
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:714
 #: sources.d/icingaweb2-module-director/library/Director/Import/ImportSourceDirectorObject.php:82
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/DependencyTemplateUsageTable.php:10
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/HostTemplateUsageTable.php:10
@@ -3138,12 +3121,12 @@ msgstr ""
 msgid "Templates"
 msgstr "Шаблони"
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:767
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:770
 #, php-format
 msgid "All overrides have been removed from \"%s\""
 msgstr "Всі перезаписи були видалені з \"%s\""
 
-#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:768
+#: sources.d/icingaweb2-module-director/application/forms/IcingaServiceForm.php:771
 #, php-format
 msgid "The given properties have been stored for \"%s\""
 msgstr "Надані властивості були збережені для \"%s\""
@@ -3499,11 +3482,37 @@ msgstr ""
 "Розширений опис цього модифікатору імпорту рядку. Містить пояснення його "
 "призначення."
 
-#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:69
+#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:68
+#: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:84
+msgid "Set based on filter"
+msgstr "Набір оснований на фільтрі"
+
+#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:89
+#: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:103
+#: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:95
+msgid "Filter Expression"
+msgstr "Вираз фільтру"
+
+#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:91
+#, fuzzy
+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 ""
+"Дозволяє фільтрувати окремі частини наданого виразу. Дозволено звертатися до "
+"всіх імпортованих колонок. Приклади: host=www* задасть цю властивість лише "
+"для рядків імпортованих з властивістю host що починається з www. Більш "
+"складний приклад: host=www*&!(address=127.*|address6=::1)"
+
+#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:104
 msgid "Modifier"
 msgstr "Модифікатор"
 
-#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:72
+#: sources.d/icingaweb2-module-director/application/forms/ImportRowModifierForm.php:107
 msgid ""
 "A property modifier allows you to modify a specific property at import time"
 msgstr ""
@@ -4158,15 +4167,6 @@ msgstr "Поле призначення"
 msgid "Custom variable"
 msgstr "Користувацька змінна"
 
-#: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:84
-msgid "Set based on filter"
-msgstr "Набір оснований на фільтрі"
-
-#: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:103
-#: sources.d/icingaweb2-module-director/application/forms/SyncRuleForm.php:95
-msgid "Filter Expression"
-msgstr "Вираз фільтру"
-
 #: sources.d/icingaweb2-module-director/application/forms/SyncPropertyForm.php:105
 msgid ""
 "This allows to filter for specific parts within the given source expression. "
@@ -4961,7 +4961,7 @@ msgid "Scheduled Downtimes"
 msgstr "Заплановані простої"
 
 #: sources.d/icingaweb2-module-director/library/Director/Dashboard/Dashlet/SelfServiceDashlet.php:13
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:180
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:167
 msgid "Self Service API"
 msgstr "API самостійного обслуговування"
 
@@ -5407,6 +5407,22 @@ msgstr "Незв'язані імпортовані властивості"
 msgid "(Host) group resolve cache"
 msgstr "Кеш груп (хостів)"
 
+#: sources.d/icingaweb2-module-director/library/Director/Field/FormFieldSuggestion.php:78
+msgid "Suggested fields"
+msgstr "Запропоновані поля"
+
+#: sources.d/icingaweb2-module-director/library/Director/Field/FormFieldSuggestion.php:82
+msgid "Argument macros"
+msgstr "Макроси аргументів"
+
+#: sources.d/icingaweb2-module-director/library/Director/Field/FormFieldSuggestion.php:86
+msgid "Flags (boolean) arguments"
+msgstr ""
+
+#: sources.d/icingaweb2-module-director/library/Director/Field/FormFieldSuggestion.php:90
+msgid "Other available fields"
+msgstr "Інші доступні поля"
+
 #: sources.d/icingaweb2-module-director/library/Director/IcingaConfig/StateFilterSet.php:20
 msgid "Up"
 msgstr "Доступно"
@@ -5785,7 +5801,7 @@ msgstr "Застосувати зміни"
 msgid "Run all rules at once"
 msgstr "Запустити всі правила одночасно"
 
-#: sources.d/icingaweb2-module-director/library/Director/Objects/DirectorDatafield.php:213
+#: sources.d/icingaweb2-module-director/library/Director/Objects/DirectorDatafield.php:204
 #, php-format
 msgid "Form element could not be created, %s is missing"
 msgstr "Елемент форми не може бути створений, %s відсутній"
@@ -6115,7 +6131,7 @@ msgstr ""
 "вхідні дані"
 
 #: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMakeBoolean.php:42
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:35
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:34
 msgid "Set null"
 msgstr "Задати null"
 
@@ -6128,16 +6144,16 @@ msgid "Set false"
 msgstr "Задати false"
 
 #: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMakeBoolean.php:45
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:38
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:37
 msgid "Let the import fail"
 msgstr "Невдача завдання імпорту"
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:21
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:20
 msgid "Please choose a data list that can be used for map lookups"
 msgstr ""
 "Будь ласка, оберіть список даних що може бути використаний для пошуку ключа"
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:30
+#: sources.d/icingaweb2-module-director/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 "
@@ -6147,19 +6163,19 @@ msgstr ""
 "повернути пусте значення, залишити імпортоване значення або перервати процес "
 "імпорту"
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:36
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:35
 msgid "Return lookup key unmodified"
 msgstr "Повернути ключ пошуку без змін"
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:37
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:36
 msgid "Return custom default value"
 msgstr "Повернути користувацьке значення за замовчуванням"
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:46
+#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:45
 msgid "Default value"
 msgstr "Значення за замовчуванням"
 
-#: sources.d/icingaweb2-module-director/library/Director/PropertyModifier/PropertyModifierMap.php:49
+#: sources.d/icingaweb2-module-director/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 "
@@ -7141,37 +7157,27 @@ msgstr "Icinga для Windows"
 msgid "In case you're using %s, please run this Script:"
 msgstr "Якщо використовується %s, запустіть цей скрипт:"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:158
 #: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:164
-msgid "Icinga 2 Powershell Module"
-msgstr "Модуль Powershell Icinga 2"
-
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:160
-#, php-format
-msgid "In case you're using the legacy %s, please run:"
-msgstr "Якщо використовується старий %s, виконайте:"
-
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:177
 msgid "Documentation"
 msgstr "Документація"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:192
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:179
 msgid "Configure this Agent via Self Service API"
 msgstr "Сконфігурувати цей агент через API самостійного обслуговування"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:195
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:182
 msgid "Inherited Template Api Key:"
 msgstr "Успадкований ключ шаблону API:"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:216
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:203
 msgid "Icinga 2 Client documentation"
 msgstr "Документація клієнту Icinga 2"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:221
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:208
 msgid "Top Down"
 msgstr "Зверху вниз"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:234
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:221
 #, php-format
 msgid ""
 "A ticket for this agent could not have been requested from your deployment "
@@ -7180,19 +7186,19 @@ msgstr ""
 "Запит квитка для цього агенту не зміг виконатися з вашої кінцевої точки "
 "розгортання: %s"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:245
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:232
 msgid "For manual configuration"
 msgstr "Для ручної конфігурації"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:246
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:233
 msgid "Ticket"
 msgstr "Квиток"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:247
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:234
 msgid "Windows Kickstart Script"
 msgstr "Швидкий старт для Windows"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:256
+#: sources.d/icingaweb2-module-director/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 "
@@ -7201,11 +7207,11 @@ msgstr ""
 "Потребує встановленого агенту Icinga. Генерує та підписує власний сертифікат "
 "та також генерує мінісмальний icinga2.conf для під'єднання агенту до батьків"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:260
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:247
 msgid "Linux commandline"
 msgstr "Командна стрічка Linux"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:267
+#: sources.d/icingaweb2-module-director/library/Director/Web/SelfService.php:255
 msgid "Just download and run this script on your Linux Client Machine:"
 msgstr "Завантажте та запустіть цей скрипт на вашій клієнтській машині Linux:"
 
@@ -7288,15 +7294,15 @@ msgid "Category Name"
 msgstr "Назва категорії"
 
 #: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldCategoryTable.php:48
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:52
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:54
 msgid "# Used"
 msgstr "# використаних"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:51
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:53
 msgid "Category"
 msgstr "Категорія"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:53
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/DatafieldTable.php:55
 msgid "# Vars"
 msgstr "# змінних"
 
@@ -7357,16 +7363,16 @@ msgstr "Назва сервіса"
 msgid "%s %s(%s)"
 msgstr "%s %s(%s)"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:216
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:229
 #, php-format
 msgid "This set has been inherited from %s"
 msgstr "Цей набір було успадковано від %s"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:225
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:238
 msgid "Remove"
 msgstr "Видалити"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:227
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/IcingaServiceSetServiceTable.php:240
 #, php-format
 msgid "Remove \"%s\" from this host"
 msgstr "Видалити \"%s\" з цього хоста"
@@ -7385,7 +7391,7 @@ msgstr "Часова мітка"
 msgid "Imported rows"
 msgstr "Імпортовані рядки"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/ObjectSetTable.php:62
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/ObjectSetTable.php:66
 #, php-format
 msgid "%s (%d members)"
 msgstr "%s (учасники %d)"
@@ -7424,7 +7430,7 @@ msgstr "Не напряму"
 msgid "Total"
 msgstr "Загалом"
 
-#: sources.d/icingaweb2-module-director/library/Director/Web/Table/TemplateUsageTable.php:103
+#: sources.d/icingaweb2-module-director/library/Director/Web/Table/TemplateUsageTable.php:104
 msgid "This template is not in use"
 msgstr "Цей шаблон не використовується"
 
@@ -7908,6 +7914,19 @@ msgstr "Було змінено %s об'єктів"
 msgid "Show all actions"
 msgstr "Показати всі дії"
 
+#~ msgid "The caption which should be displayed"
+#~ msgstr "Напис який буде показано"
+
+#~ msgid "A description about the field"
+#~ msgstr "Опис поля"
+
+#~ msgid "Icinga 2 Powershell Module"
+#~ msgstr "Модуль Powershell Icinga 2"
+
+#, php-format
+#~ msgid "In case you're using the legacy %s, please run:"
+#~ msgstr "Якщо використовується старий %s, виконайте:"
+
 #, php-format
 #~ msgid ""
 #~ "Your changes will be stored in %s. The'll not be part of any deployment "