diff --git a/src/icingadb-web/messages.pot b/src/icingadb-web/messages.pot
index c8c2c9c1..db597b0f 100644
--- a/src/icingadb-web/messages.pot
+++ b/src/icingadb-web/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Icinga L10n 87c17af\n"
+"Project-Id-Version: Icinga L10n c7bf4be\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-03 13:45+0000\n"
+"POT-Creation-Date: 2023-04-04 15:33+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/icingaweb2-module-audit/messages.pot b/src/icingaweb2-module-audit/messages.pot
index a86aa9d7..84c9476b 100644
--- a/src/icingaweb2-module-audit/messages.pot
+++ b/src/icingaweb2-module-audit/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Icinga L10n 87c17af\n"
+"Project-Id-Version: Icinga L10n c7bf4be\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-03 13:45+0000\n"
+"POT-Creation-Date: 2023-04-04 15:33+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/icingaweb2-module-aws/messages.pot b/src/icingaweb2-module-aws/messages.pot
index abfe62c8..0e969f89 100644
--- a/src/icingaweb2-module-aws/messages.pot
+++ b/src/icingaweb2-module-aws/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Icinga L10n 87c17af\n"
+"Project-Id-Version: Icinga L10n c7bf4be\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-03 13:45+0000\n"
+"POT-Creation-Date: 2023-04-04 15:33+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/icingaweb2-module-businessprocess/messages.pot b/src/icingaweb2-module-businessprocess/messages.pot
index 133b0080..b185209d 100644
--- a/src/icingaweb2-module-businessprocess/messages.pot
+++ b/src/icingaweb2-module-businessprocess/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Icinga L10n 87c17af\n"
+"Project-Id-Version: Icinga L10n c7bf4be\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-03 13:45+0000\n"
+"POT-Creation-Date: 2023-04-04 15:33+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/icingaweb2-module-cube/messages.pot b/src/icingaweb2-module-cube/messages.pot
index a5117bef..1545620e 100644
--- a/src/icingaweb2-module-cube/messages.pot
+++ b/src/icingaweb2-module-cube/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Icinga L10n 87c17af\n"
+"Project-Id-Version: Icinga L10n c7bf4be\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-03 13:45+0000\n"
+"POT-Creation-Date: 2023-04-04 15:33+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/icingaweb2-module-director/messages.pot b/src/icingaweb2-module-director/messages.pot
index 72320448..ed2f964e 100644
--- a/src/icingaweb2-module-director/messages.pot
+++ b/src/icingaweb2-module-director/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Icinga L10n 87c17af\n"
+"Project-Id-Version: Icinga L10n c7bf4be\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-03 13:45+0000\n"
+"POT-Creation-Date: 2023-04-04 15:33+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/icingaweb2-module-elasticsearch/messages.pot b/src/icingaweb2-module-elasticsearch/messages.pot
index 8e8eecc9..0011e1ef 100644
--- a/src/icingaweb2-module-elasticsearch/messages.pot
+++ b/src/icingaweb2-module-elasticsearch/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Icinga L10n 87c17af\n"
+"Project-Id-Version: Icinga L10n c7bf4be\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-03 13:45+0000\n"
+"POT-Creation-Date: 2023-04-04 15:33+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/icingaweb2-module-graphite/messages.pot b/src/icingaweb2-module-graphite/messages.pot
index bbefd964..647b6876 100644
--- a/src/icingaweb2-module-graphite/messages.pot
+++ b/src/icingaweb2-module-graphite/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Icinga L10n 87c17af\n"
+"Project-Id-Version: Icinga L10n c7bf4be\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-03 13:45+0000\n"
+"POT-Creation-Date: 2023-04-04 15:33+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/icingaweb2-module-jira/messages.pot b/src/icingaweb2-module-jira/messages.pot
index b7482e81..a25e8add 100644
--- a/src/icingaweb2-module-jira/messages.pot
+++ b/src/icingaweb2-module-jira/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Icinga L10n 87c17af\n"
+"Project-Id-Version: Icinga L10n c7bf4be\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-03 13:45+0000\n"
+"POT-Creation-Date: 2023-04-04 15:33+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/icingaweb2-module-pdfexport/messages.pot b/src/icingaweb2-module-pdfexport/messages.pot
index fe2f085c..091d6162 100644
--- a/src/icingaweb2-module-pdfexport/messages.pot
+++ b/src/icingaweb2-module-pdfexport/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Icinga L10n 87c17af\n"
+"Project-Id-Version: Icinga L10n c7bf4be\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-03 13:45+0000\n"
+"POT-Creation-Date: 2023-04-04 15:33+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/icingaweb2-module-reporting/messages.pot b/src/icingaweb2-module-reporting/messages.pot
index c5e4beb9..4dc7b0e1 100644
--- a/src/icingaweb2-module-reporting/messages.pot
+++ b/src/icingaweb2-module-reporting/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Icinga L10n 87c17af\n"
+"Project-Id-Version: Icinga L10n c7bf4be\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-03 13:45+0000\n"
+"POT-Creation-Date: 2023-04-04 15:33+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/icingaweb2-module-vspheredb/messages.pot b/src/icingaweb2-module-vspheredb/messages.pot
index c7e011e1..c6f80f48 100644
--- a/src/icingaweb2-module-vspheredb/messages.pot
+++ b/src/icingaweb2-module-vspheredb/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Icinga L10n 87c17af\n"
+"Project-Id-Version: Icinga L10n c7bf4be\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-03 13:45+0000\n"
+"POT-Creation-Date: 2023-04-04 15:33+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/icingaweb2-module-x509/messages.pot b/src/icingaweb2-module-x509/messages.pot
index dad34cec..695e5290 100644
--- a/src/icingaweb2-module-x509/messages.pot
+++ b/src/icingaweb2-module-x509/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Icinga L10n 87c17af\n"
+"Project-Id-Version: Icinga L10n c7bf4be\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-03 13:45+0000\n"
+"POT-Creation-Date: 2023-04-04 15:33+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -181,16 +181,11 @@ msgstr ""
 msgid "Signature Algorithms"
 msgstr ""
 
-#: sources.d/icingaweb2-module-x509/application/controllers/JobsController.php:36
+#: sources.d/icingaweb2-module-x509/application/controllers/JobsController.php:43
 msgid "New Job"
 msgstr ""
 
-#: sources.d/icingaweb2-module-x509/application/controllers/JobsController.php:49
-#: sources.d/icingaweb2-module-x509/application/controllers/JobsController.php:65
-msgid "Job not found"
-msgstr ""
-
-#: sources.d/icingaweb2-module-x509/application/controllers/JobsController.php:52
+#: sources.d/icingaweb2-module-x509/application/controllers/JobsController.php:55
 msgid "Update Job"
 msgstr ""
 
@@ -198,6 +193,15 @@ msgstr ""
 msgid "Remove Job"
 msgstr ""
 
+#: sources.d/icingaweb2-module-x509/application/controllers/JobsController.php:70
+#, php-format
+msgid "Remove job %s"
+msgstr ""
+
+#: sources.d/icingaweb2-module-x509/application/controllers/JobsController.php:94
+msgid "Job not found"
+msgstr ""
+
 #: sources.d/icingaweb2-module-x509/application/controllers/SniController.php:36
 msgid "New SNI Map"
 msgstr ""
@@ -241,102 +245,77 @@ msgstr ""
 msgid "Database resource"
 msgstr ""
 
-#: sources.d/icingaweb2-module-x509/application/forms/Config/JobConfigForm.php:22
+#: sources.d/icingaweb2-module-x509/application/forms/Config/JobConfigForm.php:86
 msgid "Job name"
 msgstr ""
 
-#: sources.d/icingaweb2-module-x509/application/forms/Config/JobConfigForm.php:23
+#: sources.d/icingaweb2-module-x509/application/forms/Config/JobConfigForm.php:87
 #: sources.d/icingaweb2-module-x509/application/views/scripts/jobs/index.phtml:24
 msgid "Name"
 msgstr ""
 
-#: sources.d/icingaweb2-module-x509/application/forms/Config/JobConfigForm.php:31
+#: sources.d/icingaweb2-module-x509/application/forms/Config/JobConfigForm.php:90
 msgid "Comma-separated list of CIDR addresses to scan"
 msgstr ""
 
-#: sources.d/icingaweb2-module-x509/application/forms/Config/JobConfigForm.php:32
+#: sources.d/icingaweb2-module-x509/application/forms/Config/JobConfigForm.php:91
 msgid "CIDRs"
 msgstr ""
 
-#: sources.d/icingaweb2-module-x509/application/forms/Config/JobConfigForm.php:40
+#: sources.d/icingaweb2-module-x509/application/forms/Config/JobConfigForm.php:112
 msgid "Comma-separated list of ports to scan"
 msgstr ""
 
-#: sources.d/icingaweb2-module-x509/application/forms/Config/JobConfigForm.php:41
+#: sources.d/icingaweb2-module-x509/application/forms/Config/JobConfigForm.php:113
 msgid "Ports"
 msgstr ""
 
-#: sources.d/icingaweb2-module-x509/application/forms/Config/JobConfigForm.php:49
+#: sources.d/icingaweb2-module-x509/application/forms/Config/JobConfigForm.php:117
 msgid "Comma-separated list of addresses/hostnames to exclude"
 msgstr ""
 
-#: sources.d/icingaweb2-module-x509/application/forms/Config/JobConfigForm.php:50
+#: sources.d/icingaweb2-module-x509/application/forms/Config/JobConfigForm.php:118
 msgid "Exclude Targets"
 msgstr ""
 
-#: sources.d/icingaweb2-module-x509/application/forms/Config/JobConfigForm.php:58
-msgid "Job cron Schedule"
-msgstr ""
-
-#: sources.d/icingaweb2-module-x509/application/forms/Config/JobConfigForm.php:59
-msgid "Schedule"
-msgstr ""
-
-#: sources.d/icingaweb2-module-x509/application/forms/Config/JobConfigForm.php:64
-#: sources.d/icingaweb2-module-x509/application/views/scripts/jobs/index.phtml:7
-#: sources.d/icingaweb2-module-x509/application/views/scripts/jobs/index.phtml:14
-msgid "Create a New Job"
-msgstr ""
-
-#: sources.d/icingaweb2-module-x509/application/forms/Config/JobConfigForm.php:65
+#: sources.d/icingaweb2-module-x509/application/forms/Config/JobConfigForm.php:127
 #: sources.d/icingaweb2-module-x509/application/forms/Config/SniConfigForm.php:39
 msgid "Create"
 msgstr ""
 
-#: sources.d/icingaweb2-module-x509/application/forms/Config/JobConfigForm.php:71
-#, php-format
-msgid "Edit job %s"
+#: sources.d/icingaweb2-module-x509/application/forms/Config/JobConfigForm.php:127
+msgid "Update"
 msgstr ""
 
-#: sources.d/icingaweb2-module-x509/application/forms/Config/JobConfigForm.php:72
-#: sources.d/icingaweb2-module-x509/application/forms/Config/SniConfigForm.php:46
-msgid "Save"
-msgstr ""
-
-#: sources.d/icingaweb2-module-x509/application/forms/Config/JobConfigForm.php:77
-#, php-format
-msgid "Remove job %s?"
-msgstr ""
-
-#: sources.d/icingaweb2-module-x509/application/forms/Config/JobConfigForm.php:78
+#: sources.d/icingaweb2-module-x509/application/forms/Config/JobConfigForm.php:127
 #: sources.d/icingaweb2-module-x509/application/forms/Config/SniConfigForm.php:52
 msgid "Yes"
 msgstr ""
 
-#: sources.d/icingaweb2-module-x509/application/forms/Config/JobConfigForm.php:89
-msgid "Job created"
-msgstr ""
-
-#: sources.d/icingaweb2-module-x509/application/forms/Config/JobConfigForm.php:90
-msgid "Failed to create job"
-msgstr ""
-
-#: sources.d/icingaweb2-module-x509/application/forms/Config/JobConfigForm.php:96
-msgid "Job updated"
-msgstr ""
-
-#: sources.d/icingaweb2-module-x509/application/forms/Config/JobConfigForm.php:97
-msgid "Failed to update job"
-msgstr ""
-
-#: sources.d/icingaweb2-module-x509/application/forms/Config/JobConfigForm.php:103
+#: sources.d/icingaweb2-module-x509/application/forms/Config/JobConfigForm.php:137
 msgid "Job removed"
 msgstr ""
 
-#: sources.d/icingaweb2-module-x509/application/forms/Config/JobConfigForm.php:104
+#: sources.d/icingaweb2-module-x509/application/forms/Config/JobConfigForm.php:139
 msgid "Failed to remove job"
 msgstr ""
 
+#: sources.d/icingaweb2-module-x509/application/forms/Config/JobConfigForm.php:159
+msgid "Job updated"
+msgstr ""
+
+#: sources.d/icingaweb2-module-x509/application/forms/Config/JobConfigForm.php:162
+msgid "Job created"
+msgstr ""
+
+#: sources.d/icingaweb2-module-x509/application/forms/Config/JobConfigForm.php:168
+msgid "Failed to create job"
+msgstr ""
+
+#: sources.d/icingaweb2-module-x509/application/forms/Config/JobConfigForm.php:168
+msgid "Failed to update job"
+msgstr ""
+
 #: sources.d/icingaweb2-module-x509/application/forms/Config/SniConfigForm.php:31
 msgid "Comma-separated list of hostnames"
 msgstr ""
@@ -356,6 +335,10 @@ msgstr ""
 msgid "Edit map for %s"
 msgstr ""
 
+#: sources.d/icingaweb2-module-x509/application/forms/Config/SniConfigForm.php:46
+msgid "Save"
+msgstr ""
+
 #: sources.d/icingaweb2-module-x509/application/forms/Config/SniConfigForm.php:51
 #, php-format
 msgid "Remove map for %s?"
@@ -385,6 +368,11 @@ msgstr ""
 msgid "Failed to remove map"
 msgstr ""
 
+#: sources.d/icingaweb2-module-x509/application/views/scripts/jobs/index.phtml:7
+#: sources.d/icingaweb2-module-x509/application/views/scripts/jobs/index.phtml:14
+msgid "Create a New Job"
+msgstr ""
+
 #: sources.d/icingaweb2-module-x509/application/views/scripts/jobs/index.phtml:19
 msgid "No jobs configured yet."
 msgstr ""
@@ -501,6 +489,7 @@ msgid "Expiration"
 msgstr ""
 
 #: sources.d/icingaweb2-module-x509/library/X509/ChainDetails.php:39
+msgctxt "x509.certificate"
 msgid "Subject"
 msgstr ""
 
diff --git a/src/icingaweb2/messages.pot b/src/icingaweb2/messages.pot
index 85b4996b..a9234558 100644
--- a/src/icingaweb2/messages.pot
+++ b/src/icingaweb2/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Icinga L10n 87c17af\n"
+"Project-Id-Version: Icinga L10n c7bf4be\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-03 13:45+0000\n"
+"POT-Creation-Date: 2023-04-04 15:33+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/ipl-validator/messages.pot b/src/ipl-validator/messages.pot
index e9f884ee..22074235 100644
--- a/src/ipl-validator/messages.pot
+++ b/src/ipl-validator/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Icinga L10n 87c17af\n"
+"Project-Id-Version: Icinga L10n c7bf4be\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-03 13:45+0000\n"
+"POT-Creation-Date: 2023-04-04 15:33+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/ipl-web/messages.pot b/src/ipl-web/messages.pot
index 908d834d..8de9035d 100644
--- a/src/ipl-web/messages.pot
+++ b/src/ipl-web/messages.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Icinga L10n 87c17af\n"
+"Project-Id-Version: Icinga L10n c7bf4be\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-03 13:45+0000\n"
+"POT-Creation-Date: 2023-04-04 15:33+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"