diff --git a/application/locale/de_DE/LC_MESSAGES/icinga.mo b/application/locale/de_DE/LC_MESSAGES/icinga.mo
index d6f05c01e..0b3c86f3a 100644
Binary files a/application/locale/de_DE/LC_MESSAGES/icinga.mo and b/application/locale/de_DE/LC_MESSAGES/icinga.mo differ
diff --git a/application/locale/de_DE/LC_MESSAGES/icinga.po b/application/locale/de_DE/LC_MESSAGES/icinga.po
index f99ff565c..d72394b11 100644
--- a/application/locale/de_DE/LC_MESSAGES/icinga.po
+++ b/application/locale/de_DE/LC_MESSAGES/icinga.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Icinga Web 2 (None)\n"
 "Report-Msgid-Bugs-To: dev@icinga.org\n"
-"POT-Creation-Date: 2016-09-27 09:09+0000\n"
-"PO-Revision-Date: 2016-09-27 11:15+0200\n"
+"POT-Creation-Date: 2016-12-08 17:23+0000\n"
+"PO-Revision-Date: 2016-12-08 18:36+0100\n"
 "Last-Translator: Eric Lippmann <eric.lippmann@netways.de>\n"
 "Language: de_DE\n"
 "MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Language-Team: \n"
-"X-Generator: Poedit 1.8.9\n"
+"X-Generator: Poedit 1.8.11\n"
 
 #: /vagrant/library/Icinga/Web/Form/Validator/InArray.php:16
 #, php-format
@@ -128,17 +128,30 @@ msgstr "Über Icinga Web 2"
 msgid "Accessibility Skip Links"
 msgstr "Barrierefreiheit Links überspringen"
 
+#: /vagrant/application/views/scripts/account/index.phtml:6
+msgid "Account"
+msgstr ""
+
+#: /vagrant/application/forms/Account/ChangePasswordForm.php:77
+#, fuzzy
+msgid "Account updated"
+msgstr "Rolle aktualisiert"
+
+#: /vagrant/application/forms/Announcement/AcknowledgeAnnouncementForm.php:38
+msgid "Acknowledge this announcement"
+msgstr ""
+
+#: /vagrant/application/views/scripts/user/show.phtml:33
 #: /vagrant/application/controllers/UserController.php:70
 #: /vagrant/application/forms/Config/User/UserForm.php:24
-#: /vagrant/application/views/scripts/user/show.phtml:33
-#: /vagrant/library/Icinga/Authentication/User/DbUserBackend.php:119
 #: /vagrant/library/Icinga/Authentication/User/LdapUserBackend.php:256
+#: /vagrant/library/Icinga/Authentication/User/DbUserBackend.php:119
 msgid "Active"
 msgstr "Aktiv"
 
 #: /vagrant/application/forms/Config/User/UserForm.php:46
-#: /vagrant/application/forms/Config/UserGroup/AddMemberForm.php:126
 #: /vagrant/application/forms/Config/UserGroup/UserGroupForm.php:29
+#: /vagrant/application/forms/Config/UserGroup/AddMemberForm.php:126
 msgid "Add"
 msgstr "Hinzufügen"
 
@@ -154,7 +167,7 @@ msgstr "Zum Dashboard hinzufügem"
 msgid "Add New Member"
 msgstr "Mitglied hinzufügen"
 
-#: /vagrant/application/forms/Dashboard/DashletForm.php:29
+#: /vagrant/application/forms/Dashboard/DashletForm.php:30
 #: /vagrant/library/Icinga/Web/Widget/Tabextension/DashboardAction.php:27
 msgid "Add To Dashboard"
 msgstr "Zum Dashboard hinzufügen"
@@ -192,16 +205,11 @@ msgstr "Filter hinzufügen"
 msgid "Add members for group %s"
 msgstr "Mitglied der Gruppe %s hinzufügen"
 
-#: /vagrant/application/controllers/ConfigController.php:37
+#: /vagrant/application/controllers/ConfigController.php:38
 msgid "Adjust the general configuration of Icinga Web 2"
 msgstr "Allgemeine Einstellungen von Icinga Web 2"
 
-#: /vagrant/application/controllers/NavigationController.php:133
-#: /vagrant/application/controllers/PreferenceController.php:32
-msgid "Adjust the preferences of Icinga Web 2 according to your needs"
-msgstr "Anpassung von Icinga Web 2 an individuelle Bedürfnisse"
-
-#: /vagrant/application/forms/Authentication/LoginForm.php:105
+#: /vagrant/application/forms/Authentication/LoginForm.php:106
 msgid ""
 "All configured authentication methods failed. Please check the system log or "
 "Icinga Web 2 log for more information."
@@ -209,12 +217,12 @@ msgstr ""
 "Alle konfigurierten Authentifizierungsmethoden sind fehlgeschlagen. Mehr "
 "Details dazu stehen im Systemlog oder im Log von Icinga Web 2."
 
-#: /vagrant/application/forms/Security/RoleForm.php:68
+#: /vagrant/application/forms/Security/RoleForm.php:73
 #, php-format
 msgid "Allow access to module %s"
 msgstr "Zugriff auf das Modul %s erlauben"
 
-#: /vagrant/application/forms/Security/RoleForm.php:45
+#: /vagrant/application/forms/Security/RoleForm.php:50
 msgid "Allow config access"
 msgstr "Zugriff auf die Konfiguration erlauben"
 
@@ -234,7 +242,7 @@ msgstr "Erlaubt das Teilen von Navigationselemten"
 msgid "Allow to view the application log"
 msgstr "Erlaubt das Einsehen des Anwendungslogs"
 
-#: /vagrant/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php:135
+#: /vagrant/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php:137
 msgid ""
 "An additional filter to use when looking up groups using the specified "
 "connection. Leave empty to not to use any additional filter rules."
@@ -242,8 +250,8 @@ msgstr ""
 "Ein zusätzlicher Filter für die Suche nach Gruppen für die angegebene "
 "Verbindung. Leer lassen, um keine Filter zu verwenden."
 
+#: /vagrant/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php:230
 #: /vagrant/application/forms/Config/UserBackend/LdapBackendForm.php:153
-#: /vagrant/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php:228
 msgid ""
 "An additional filter to use when looking up users using the specified "
 "connection. Leave empty to not to use any additional filter rules."
@@ -251,17 +259,43 @@ msgstr ""
 "Ein zusätzlicher Filter für die Suche nach Benutzern für die angegebene "
 "Verbindung. Leer lassen, um keine Filter zu verwenden."
 
-#: /vagrant/library/Icinga/Application/Web.php:318
+#: /vagrant/application/forms/Announcement/AnnouncementForm.php:94
+#, fuzzy
+msgid "Announcement created"
+msgstr "Rolle angelegt"
+
+#: /vagrant/application/controllers/AnnouncementsController.php:59
+#: /vagrant/application/controllers/AnnouncementsController.php:75
+#, fuzzy
+msgid "Announcement not found"
+msgstr "Seite nicht gefunden."
+
+#: /vagrant/application/forms/Announcement/AnnouncementForm.php:114
+#, fuzzy
+msgid "Announcement removed"
+msgstr "Rolle entfernt"
+
+#: /vagrant/application/forms/Announcement/AnnouncementForm.php:104
+#, fuzzy
+msgid "Announcement updated"
+msgstr "Rolle aktualisiert"
+
+#: /vagrant/application/controllers/AnnouncementsController.php:24
+#: /vagrant/library/Icinga/Application/Web.php:310
+msgid "Announcements"
+msgstr ""
+
+#: /vagrant/library/Icinga/Application/Web.php:323
 #: /vagrant/library/Icinga/Web/Menu.php:274
 msgid "Application"
 msgstr "Anwendung"
 
-#: /vagrant/library/Icinga/Application/Web.php:366
+#: /vagrant/library/Icinga/Application/Web.php:371
 #: /vagrant/library/Icinga/Web/Menu.php:262
 msgid "Application Log"
 msgstr "Anwendungslog"
 
-#: /vagrant/application/forms/Config/General/LoggingConfigForm.php:71
+#: /vagrant/application/forms/Config/General/LoggingConfigForm.php:73
 msgid "Application Prefix"
 msgstr "Anwendungspräfix"
 
@@ -269,8 +303,8 @@ msgstr "Anwendungspräfix"
 msgid "Apply"
 msgstr "Anwenden"
 
-#: /vagrant/application/controllers/ConfigController.php:50
-#: /vagrant/library/Icinga/Application/Web.php:324
+#: /vagrant/application/controllers/ConfigController.php:51
+#: /vagrant/library/Icinga/Application/Web.php:329
 #: /vagrant/library/Icinga/Web/Menu.php:279
 msgid "Authentication"
 msgstr "Authentifizierung"
@@ -289,6 +323,11 @@ msgstr "Authentifizierungsbackend “%s” wurde nicht gefunden"
 msgid "Authentication order updated"
 msgstr "Authentifizierungsreihenfolge wurde aktualisiert"
 
+#: /vagrant/application/views/scripts/announcements/index.phtml:27
+#, fuzzy
+msgid "Author"
+msgstr "Autorisierung"
+
 #: /vagrant/application/forms/AutoRefreshForm.php:44
 msgid "Auto refresh successfully disabled"
 msgstr "Automatische Aktualisierung erfolgreich deaktiviert"
@@ -302,21 +341,21 @@ msgstr "Automatische Aktualisierung erfolgreich aktiviert"
 msgid "Back"
 msgstr "Zurück"
 
-#: /vagrant/application/views/scripts/config/userbackend/reorder.phtml:35
 #: /vagrant/application/views/scripts/form/reorder-authbackend.phtml:4
+#: /vagrant/application/views/scripts/config/userbackend/reorder.phtml:35
 msgid "Backend"
 msgstr "Backend-Name"
 
-#: /vagrant/application/forms/Config/UserBackend/DbBackendForm.php:53
-#: /vagrant/application/forms/Config/UserBackend/ExternalBackendForm.php:32
-#: /vagrant/application/forms/Config/UserBackend/LdapBackendForm.php:57
 #: /vagrant/application/forms/Config/UserGroup/DbUserGroupBackendForm.php:34
 #: /vagrant/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php:39
+#: /vagrant/application/forms/Config/UserBackend/DbBackendForm.php:53
+#: /vagrant/application/forms/Config/UserBackend/LdapBackendForm.php:57
+#: /vagrant/application/forms/Config/UserBackend/ExternalBackendForm.php:32
 msgid "Backend Name"
 msgstr "Backend-Name"
 
-#: /vagrant/application/forms/Config/UserBackendConfigForm.php:295
-#: /vagrant/application/forms/Config/UserGroup/UserGroupBackendForm.php:180
+#: /vagrant/application/forms/Config/UserBackendConfigForm.php:289
+#: /vagrant/application/forms/Config/UserGroup/UserGroupBackendForm.php:173
 msgid "Backend Type"
 msgstr "Backend-Typ"
 
@@ -332,29 +371,29 @@ msgstr "Bind DN"
 msgid "Bind Password"
 msgstr "Bind Kennwort"
 
-#: /vagrant/application/forms/PreferenceForm.php:181
-#: /vagrant/application/forms/PreferenceForm.php:187
+#: /vagrant/application/forms/PreferenceForm.php:191
+#: /vagrant/application/forms/PreferenceForm.php:197
 #, php-format
 msgctxt "preferences.form"
 msgid "Browser (%s)"
 msgstr "Browser (%s)"
 
-#: /vagrant/application/forms/Security/RoleForm.php:214
+#: /vagrant/application/forms/Security/RoleForm.php:219
 #, php-format
 msgid "Can't add role '%s'. Role already exists"
 msgstr "Kann Rolle ‘%s’ nicht hinzufügen. Die Rolle existiert bereits"
 
-#: /vagrant/application/forms/Security/RoleForm.php:173
+#: /vagrant/application/forms/Security/RoleForm.php:178
 #, php-format
 msgid "Can't load role '%s'. Role does not exist"
 msgstr "Kann Rolle ‘%s’ nicht laden. Die Rolle existiert nicht"
 
-#: /vagrant/application/forms/Security/RoleForm.php:240
+#: /vagrant/application/forms/Security/RoleForm.php:245
 #, php-format
 msgid "Can't remove role '%s'. Role does not exist"
 msgstr "Kann Rolle ‘%s’ nicht löschen. Die Rolle existiert nicht"
 
-#: /vagrant/application/forms/Security/RoleForm.php:273
+#: /vagrant/application/forms/Security/RoleForm.php:278
 #, php-format
 msgid "Can't update role '%s'. Role does not exist"
 msgstr "Kann Rolle ‘%s’ nicht akualisieren. Die Rolle existiert nicht"
@@ -372,7 +411,7 @@ msgstr "Diese Mitgliedschaft beenden"
 msgid "Cancel this operation"
 msgstr "Diese Operation abbrechen"
 
-#: /vagrant/library/Icinga/Repository/IniRepository.php:64
+#: /vagrant/library/Icinga/Repository/IniRepository.php:253
 #, php-format
 msgid "Cannot insert. Section \"%s\" does already exist"
 msgstr "Einfügen nicht möglich. Die Sektion “%s” existiert bereits"
@@ -386,8 +425,8 @@ msgstr "Kann Konfigurationsdatei “%s” nicht lesen"
 msgid "Cannot search here"
 msgstr "Suche ist hier nicht möglich"
 
-#: /vagrant/library/Icinga/Repository/IniRepository.php:91
-#: /vagrant/library/Icinga/Repository/IniRepository.php:108
+#: /vagrant/library/Icinga/Repository/IniRepository.php:282
+#: /vagrant/library/Icinga/Repository/IniRepository.php:297
 #, php-format
 msgid ""
 "Cannot update. Column \"%s\" holds a section's name which must be unique"
@@ -395,7 +434,7 @@ msgstr ""
 "Aktualisierung nicht möglich. Die Spalte “%s” enthält einen Sektionsnamen, "
 "der eindeutig sein muss"
 
-#: /vagrant/library/Icinga/Repository/IniRepository.php:123
+#: /vagrant/library/Icinga/Repository/IniRepository.php:316
 #, php-format
 msgid "Cannot update. Section \"%s\" does already exist"
 msgstr "Aktualisierung nicht möglich. Sektion “%s” existiert bereits"
@@ -404,7 +443,7 @@ msgstr "Aktualisierung nicht möglich. Sektion “%s” existiert bereits"
 msgid "Change sort direction"
 msgstr "Sortierreihenfolge"
 
-#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:146
+#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:145
 msgid "Character Set"
 msgstr "Zeichensatz"
 
@@ -417,7 +456,7 @@ msgstr ""
 "Checkbox auswählen um Benutzeranpassung zu verbieten. Die Standardtheme wird "
 "für alle Benutzer angezeigt."
 
-#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:154
+#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:153
 msgid ""
 "Check this box for persistent database connections. Persistent connections "
 "are not closed at the end of a request, but are cached and re-used. This is "
@@ -427,17 +466,17 @@ msgstr ""
 "Verbindungen werden am Ende einer Anfrage nicht geschlossen, sondern "
 "gecached wiederverwendet"
 
-#: /vagrant/application/forms/Dashboard/DashletForm.php:101
+#: /vagrant/application/forms/Dashboard/DashletForm.php:102
 msgid "Check this box if you want to add the dashlet to a new dashboard"
 msgstr "Häkchen setzen, um dieses Dashlet einem neuen Dashboard hinzuzufügen"
 
-#: /vagrant/application/forms/Config/ResourceConfigForm.php:222
+#: /vagrant/application/forms/Config/ResourceConfigForm.php:240
 msgid "Check this box to enforce changes without connectivity validation"
 msgstr ""
 "Häkchen setzen, um die Änderungen ohne Validierung der Verbindung zu "
 "speichern"
 
-#: /vagrant/application/forms/Config/UserBackendConfigForm.php:383
+#: /vagrant/application/forms/Config/UserBackendConfigForm.php:377
 msgid ""
 "Check this box to enforce changes without validating that authentication is "
 "possible."
@@ -449,32 +488,32 @@ msgstr ""
 msgid "Click to remove this part of your filter"
 msgstr "Klicken, um diesen Teil des Filters zu löschen"
 
-#: /vagrant/library/Icinga/Repository/Repository.php:1023
+#: /vagrant/library/Icinga/Repository/Repository.php:1150
 #, php-format
 msgid "Column \"%s\" cannot be queried"
 msgstr "Spalte “%s” kann nicht abgefragt werden"
 
-#: /vagrant/application/forms/Navigation/NavigationConfigForm.php:625
+#: /vagrant/application/forms/Navigation/NavigationConfigForm.php:620
 msgid "Comma separated list of group names to share this item with"
 msgstr ""
 "Kommaseparierte Liste von Gruppennamen, mit denen dieses Element geteilt "
 "werden soll"
 
-#: /vagrant/application/forms/Navigation/NavigationConfigForm.php:615
+#: /vagrant/application/forms/Navigation/NavigationConfigForm.php:610
 msgid "Comma separated list of usernames to share this item with"
 msgstr ""
 "Kommaseparierte Liste von Nutzernamen, mit denen dieses Element geteilt "
 "werden soll"
 
-#: /vagrant/application/forms/Security/RoleForm.php:126
+#: /vagrant/application/forms/Security/RoleForm.php:131
 msgid "Comma-separated list of groups that are assigned to the role"
 msgstr "Kommaseparierte Liste von Gruppen, die dieser Rolle zugewiesen werden"
 
-#: /vagrant/application/forms/Security/RoleForm.php:118
+#: /vagrant/application/forms/Security/RoleForm.php:123
 msgid "Comma-separated list of users that are assigned to the role"
 msgstr "Kommaseparierte Liste von Nutzern, die dieser Rolle zugewiesen werden"
 
-#: /vagrant/library/Icinga/Application/Web.php:312
+#: /vagrant/library/Icinga/Application/Web.php:317
 #: /vagrant/library/Icinga/Web/Menu.php:269
 msgid "Configuration"
 msgstr "Konfiguration"
@@ -488,14 +527,19 @@ msgstr ""
 "Konfiguration der Zugangsberechtigungen für Nutzer und Gruppen in Icinga Web "
 "2"
 
-#: /vagrant/application/controllers/ConfigController.php:49
+#: /vagrant/application/controllers/ConfigController.php:50
 msgid "Configure the user and group backends"
 msgstr "Konfiguration der Benutzer- und Gruppen-Backends"
 
-#: /vagrant/application/controllers/ConfigController.php:43
+#: /vagrant/application/controllers/ConfigController.php:44
 msgid "Configure which resources are being utilized by Icinga Web 2"
 msgstr "Konfiguration der Ressourcen für Icinga Web 2"
 
+#: /vagrant/application/forms/Account/ChangePasswordForm.php:57
+#, fuzzy
+msgid "Confirm New Password"
+msgstr "Bind Kennwort"
+
 #: /vagrant/application/forms/ConfirmRemovalForm.php:19
 msgid "Confirm Removal"
 msgstr "Entfernen bestätigen"
@@ -524,11 +568,11 @@ msgid ""
 "modules."
 msgstr ""
 "Enthält die Verzeichnisse, die nach verfügbaren Modulen durchsucht werden "
-"(getrennt durch Doppelpunkte). Module, die nicht in diesen Verzeichnissen vorhanden sind, "
-"können trotzdem in den Modulordner gesymlinkt werden. Diese werden "
-"allerdings nicht in der der deaktivierten Module angezeigt."
+"(getrennt durch Doppelpunkte). Module, die nicht in diesen Verzeichnissen "
+"vorhanden sind, können trotzdem in den Modulordner gesymlinkt werden. Diese "
+"werden allerdings nicht in der der deaktivierten Module angezeigt."
 
-#: /vagrant/application/views/scripts/about/index.phtml:25
+#: /vagrant/application/views/scripts/about/index.phtml:19
 msgid "Copyright"
 msgstr "Copyright"
 
@@ -544,6 +588,7 @@ msgstr ""
 msgid "Could not persist dashboard"
 msgstr "Konnte Dashboard nicht speichern"
 
+#: /vagrant/application/forms/Announcement/AnnouncementForm.php:58
 #: /vagrant/application/forms/Config/User/CreateMembershipForm.php:89
 msgid "Create"
 msgstr "Erstellen"
@@ -556,6 +601,11 @@ msgstr "Neue Gruppenmitgliedschaft"
 msgid "Create Role"
 msgstr "Rolle erstellen"
 
+#: /vagrant/application/views/scripts/announcements/index.phtml:9
+#, fuzzy
+msgid "Create a New Announcement"
+msgstr "Neue Ressource erstellen"
+
 #: /vagrant/application/views/scripts/navigation/index.phtml:12
 msgid "Create a New Navigation Item"
 msgstr "Neues Navigationselement erstellen"
@@ -576,7 +626,13 @@ msgstr "Neues Backend für Benutzer erstellen"
 msgid "Create a New User Group Backend"
 msgstr "Neues Backend für Benutzergruppen erstellen"
 
-#: /vagrant/application/controllers/ConfigController.php:198
+#: /vagrant/application/views/scripts/announcements/index.phtml:16
+#: /vagrant/application/forms/Announcement/AnnouncementForm.php:57
+#, fuzzy
+msgid "Create a new announcement"
+msgstr "Neue Ressource erstellen"
+
+#: /vagrant/application/controllers/ConfigController.php:200
 msgid ""
 "Create a new backend for authenticating your users. This backend will be "
 "added at the end of your authentication order."
@@ -619,18 +675,18 @@ msgstr "Neues Backend für Benutzergruppen erstellen"
 msgid "Create memberships for %s"
 msgstr "Mitgliedschaften für %s erstellen"
 
-#: /vagrant/library/Icinga/Authentication/User/DbUserBackend.php:120
 #: /vagrant/library/Icinga/Authentication/User/LdapUserBackend.php:257
-#: /vagrant/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php:122
+#: /vagrant/library/Icinga/Authentication/User/DbUserBackend.php:120
 #: /vagrant/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php:466
+#: /vagrant/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php:122
 msgid "Created At"
 msgstr "Erstellt am"
 
+#: /vagrant/application/views/scripts/user/show.phtml:36
+#: /vagrant/application/views/scripts/group/show.phtml:33
 #: /vagrant/application/controllers/GroupController.php:70
 #: /vagrant/application/controllers/GroupController.php:106
 #: /vagrant/application/controllers/UserController.php:71
-#: /vagrant/application/views/scripts/group/show.phtml:33
-#: /vagrant/application/views/scripts/user/show.phtml:36
 msgid "Created at"
 msgstr "Erstellt am"
 
@@ -655,7 +711,7 @@ msgstr ""
 "einigen der verfügbaren %s behoben werden."
 
 #: /vagrant/application/controllers/DashboardController.php:257
-#: /vagrant/application/forms/Dashboard/DashletForm.php:120
+#: /vagrant/application/forms/Dashboard/DashletForm.php:121
 #: /vagrant/library/Icinga/Application/Web.php:290
 #: /vagrant/library/Icinga/Web/Menu.php:243
 msgid "Dashboard"
@@ -673,7 +729,7 @@ msgstr "Das Dashboard wurde entfernt"
 msgid "Dashlet Name"
 msgstr "Name des Dashlets"
 
-#: /vagrant/application/forms/Dashboard/DashletForm.php:81
+#: /vagrant/application/forms/Dashboard/DashletForm.php:82
 msgid "Dashlet Title"
 msgstr "Titel des Dashlets"
 
@@ -689,27 +745,27 @@ msgstr "Das Dashlet wurde entfernt von"
 msgid "Dashlet updated"
 msgstr "Dashlet aktualisiert"
 
-#: /vagrant/application/forms/Config/UserBackendConfigForm.php:267
+#: /vagrant/application/forms/Config/UserBackendConfigForm.php:261
 #: /vagrant/application/forms/Config/General/ApplicationConfigForm.php:70
-#: /vagrant/application/forms/Config/UserGroup/UserGroupBackendForm.php:163
+#: /vagrant/application/forms/Config/UserGroup/UserGroupBackendForm.php:156
 msgid "Database"
 msgstr "SQL Datenbank"
 
 #: /vagrant/application/forms/Config/General/ApplicationConfigForm.php:90
-#: /vagrant/application/forms/Config/UserBackend/DbBackendForm.php:64
 #: /vagrant/application/forms/Config/UserGroup/DbUserGroupBackendForm.php:47
+#: /vagrant/application/forms/Config/UserBackend/DbBackendForm.php:64
 msgid "Database Connection"
 msgstr "Datenbankverbindung"
 
-#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:118
+#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:117
 msgid "Database Name"
 msgstr "Datenbankname"
 
-#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:86
+#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:85
 msgid "Database Type"
 msgstr "Datenbanktyp"
 
-#: /vagrant/application/forms/Config/General/LoggingConfigForm.php:59
+#: /vagrant/application/forms/Config/General/LoggingConfigForm.php:61
 msgctxt "app.config.logging.level"
 msgid "Debug"
 msgstr "Debug"
@@ -719,11 +775,11 @@ msgctxt "Form element label"
 msgid "Default Theme"
 msgstr "Standard-Theme"
 
-#: /vagrant/application/views/scripts/config/module.phtml:46
+#: /vagrant/application/views/scripts/config/module.phtml:56
 msgid "Dependencies"
 msgstr "Abhängigkeiten"
 
-#: /vagrant/application/views/scripts/config/module.phtml:42
+#: /vagrant/application/views/scripts/config/module.phtml:49
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -744,14 +800,6 @@ msgstr "Automatische Aktualisierung deaktivieren"
 msgid "Disable the %s module"
 msgstr "Modul %s deaktivieren"
 
-#: /vagrant/application/forms/Dashboard/PaneForm.php:42
-msgid "Disable the dashboard"
-msgstr "Dashboard deaktivieren"
-
-#: /vagrant/application/forms/Dashboard/PaneForm.php:43
-msgid "Disabled"
-msgstr "Deaktiviert"
-
 #: /vagrant/application/forms/Config/UserBackend/LdapBackendForm.php:88
 msgctxt "A button to discover LDAP capabilities"
 msgid "Discover"
@@ -769,13 +817,18 @@ msgstr "Dashlet bearbeiten"
 msgid "Edit User"
 msgstr "Nutzer bearbeiten"
 
+#: /vagrant/application/forms/Announcement/AnnouncementForm.php:67
+#, fuzzy, php-format
+msgid "Edit announcement %s"
+msgstr "Ressource %s bearbeiten"
+
 #: /vagrant/application/views/scripts/dashboard/settings.phtml:54
 #, php-format
 msgid "Edit dashlet %s"
 msgstr "Dashlet %s bearbeiten"
 
-#: /vagrant/application/forms/Config/UserGroup/UserGroupForm.php:31
 #: /vagrant/application/views/scripts/group/show.phtml:18
+#: /vagrant/application/forms/Config/UserGroup/UserGroupForm.php:31
 #, php-format
 msgid "Edit group %s"
 msgstr "Gruppe %s bearbeiten"
@@ -800,8 +853,8 @@ msgstr "Rolle %s bearbeiten"
 msgid "Edit shared navigation item %s"
 msgstr "Geteiltes Navigationselement %s bearbeiten"
 
-#: /vagrant/application/forms/Config/User/UserForm.php:67
 #: /vagrant/application/views/scripts/user/show.phtml:25
+#: /vagrant/application/forms/Config/User/UserForm.php:67
 #, php-format
 msgid "Edit user %s"
 msgstr "Nutzer %s bearbeiten"
@@ -817,7 +870,7 @@ msgid "Edit user group backend %s"
 msgstr "Nutzgruppenbackend %s bearbeiten"
 
 #: /vagrant/application/forms/AutoRefreshForm.php:63
-#: /vagrant/application/forms/PreferenceForm.php:243
+#: /vagrant/application/forms/PreferenceForm.php:253
 msgid "Enable auto refresh"
 msgstr "Automatische Aktualisierung aktivieren"
 
@@ -826,7 +879,7 @@ msgstr "Automatische Aktualisierung aktivieren"
 msgid "Enable the %s module"
 msgstr "Modul \"%s\" aktivieren"
 
-#: /vagrant/application/controllers/ErrorController.php:55
+#: /vagrant/application/controllers/ErrorController.php:53
 #, php-format
 msgid "Enabling the \"%s\" module might help!"
 msgstr "Die Aktivierung des Moduls \"%s\" könnte helfen!"
@@ -835,15 +888,20 @@ msgstr "Die Aktivierung des Moduls \"%s\" könnte helfen!"
 msgid "Encryption"
 msgstr "Verschlüsselung"
 
-#: /vagrant/application/forms/Dashboard/DashletForm.php:82
+#: /vagrant/application/views/scripts/announcements/index.phtml:30
+#: /vagrant/application/forms/Announcement/AnnouncementForm.php:52
+msgid "End"
+msgstr ""
+
+#: /vagrant/application/forms/Dashboard/DashletForm.php:83
 msgid "Enter a title for the dashlet."
 msgstr "Titel für das Dashlet eingeben"
 
-#: /vagrant/application/forms/Dashboard/DashletForm.php:111
+#: /vagrant/application/forms/Dashboard/DashletForm.php:112
 msgid "Enter a title for the new dashboard"
 msgstr "Titel für das Dashboard eingeben"
 
-#: /vagrant/application/forms/Dashboard/DashletForm.php:71
+#: /vagrant/application/forms/Dashboard/DashletForm.php:72
 msgid ""
 "Enter url being loaded in the dashlet. You can paste the full URL, including "
 "filters."
@@ -851,11 +909,11 @@ msgstr ""
 "URL angeben, die in dem Dashlet geladen werden soll. Es sind vollständige "
 "URLs mit Filtern möglich."
 
-#: /vagrant/application/controllers/ErrorController.php:109
+#: /vagrant/application/controllers/ErrorController.php:108
 msgid "Error"
 msgstr "Fehler"
 
-#: /vagrant/application/forms/Config/General/LoggingConfigForm.php:56
+#: /vagrant/application/forms/Config/General/LoggingConfigForm.php:58
 msgctxt "app.config.logging.level"
 msgid "Error"
 msgstr "Fehler"
@@ -864,10 +922,14 @@ msgstr "Fehler"
 msgid "Error details"
 msgstr "Fehlerdetails"
 
-#: /vagrant/application/forms/Config/UserBackendConfigForm.php:281
+#: /vagrant/application/forms/Config/UserBackendConfigForm.php:275
 msgid "External"
 msgstr "Extern"
 
+#: /vagrant/application/forms/Config/General/LoggingConfigForm.php:114
+msgid "Facility"
+msgstr "Facility"
+
 #: /vagrant/application/forms/Config/User/CreateMembershipForm.php:128
 #: /vagrant/application/forms/Config/UserGroup/AddMemberForm.php:163
 #, php-format
@@ -882,7 +944,11 @@ msgstr "Konnte Gruppe nicht hinzufügen"
 msgid "Failed to add user"
 msgstr "Konnte Benutzer nicht hinzufügen"
 
-#: /vagrant/library/Icinga/Repository/IniRepository.php:162
+#: /vagrant/application/forms/Announcement/AnnouncementForm.php:95
+msgid "Failed to create announcement"
+msgstr ""
+
+#: /vagrant/library/Icinga/Repository/IniRepository.php:364
 #, php-format
 msgid "Failed to delete. An error occurred: %s"
 msgstr "Löschen fehlgeschlagen. Es ist ein Fehler aufgetreten: %s"
@@ -931,11 +997,16 @@ msgstr ""
 "stellen Sie sicher, dass alle referenziertem Elternelemente existierende "
 "Navigationselemente sind: %s"
 
-#: /vagrant/library/Icinga/Repository/IniRepository.php:72
+#: /vagrant/library/Icinga/Repository/IniRepository.php:261
 #, php-format
 msgid "Failed to insert. An error occurred: %s"
 msgstr "Einfügen nicht möglich. Ein Fehler ist aufgetreten: %s"
 
+#: /vagrant/application/forms/Announcement/AnnouncementForm.php:115
+#, fuzzy
+msgid "Failed to remove announcement"
+msgstr "Benutzer “%s” konnte nicht entfernt werden"
+
 #: /vagrant/application/forms/Config/UserGroup/UserGroupForm.php:123
 #, php-format
 msgid "Failed to remove group \"%s\""
@@ -946,28 +1017,33 @@ msgstr "Gruppe “%s” konnte nicht entfernt werden"
 msgid "Failed to remove user \"%s\""
 msgstr "Benutzer “%s” konnte nicht entfernt werden"
 
-#: /vagrant/application/forms/Config/ResourceConfigForm.php:317
-#: /vagrant/application/forms/Config/UserBackendConfigForm.php:422
+#: /vagrant/application/forms/Config/ResourceConfigForm.php:335
+#: /vagrant/application/forms/Config/UserBackendConfigForm.php:416
 #, php-format
 msgid "Failed to successfully validate the configuration: %s"
 msgstr "Validierung der Konfiguration schlug fehl: %s"
 
-#: /vagrant/application/controllers/NavigationController.php:386
+#: /vagrant/application/controllers/NavigationController.php:381
 #, php-format
 msgid "Failed to unshare navigation item \"%s\""
 msgstr ""
 "Teilen des Navigationselementes “%s” konnte nicht rückgängig gemacht werden"
 
-#: /vagrant/library/Icinga/Repository/IniRepository.php:135
+#: /vagrant/application/forms/Announcement/AnnouncementForm.php:105
+#, fuzzy
+msgid "Failed to update announcement"
+msgstr "Aktualisierung fehlgeschlagen. Ein Fehler ist aufgetreten: %s"
+
+#: /vagrant/library/Icinga/Repository/IniRepository.php:334
 #, php-format
 msgid "Failed to update. An error occurred: %s"
 msgstr "Aktualisierung fehlgeschlagen. Ein Fehler ist aufgetreten: %s"
 
-#: /vagrant/application/forms/Config/ResourceConfigForm.php:235
+#: /vagrant/application/forms/Config/ResourceConfigForm.php:253
 msgid "File"
 msgstr "Datei"
 
-#: /vagrant/application/forms/Config/General/LoggingConfigForm.php:41
+#: /vagrant/application/forms/Config/General/LoggingConfigForm.php:43
 msgctxt "app.config.logging.type"
 msgid "File"
 msgstr "Datei"
@@ -976,7 +1052,7 @@ msgstr "Datei"
 msgid "File System (INI Files)"
 msgstr "Dateisystem"
 
-#: /vagrant/application/forms/Config/General/LoggingConfigForm.php:115
+#: /vagrant/application/forms/Config/General/LoggingConfigForm.php:128
 msgid "File path"
 msgstr "Dateipfad"
 
@@ -988,18 +1064,18 @@ msgstr "Dateipfad"
 msgid "Filter Pattern"
 msgstr "Muster"
 
-#: /vagrant/library/Icinga/Repository/Repository.php:1067
+#: /vagrant/library/Icinga/Repository/Repository.php:1194
 #, php-format
 msgid "Filter column \"%s\" not found"
 msgstr "Filterspalte “%s” nicht gefunden"
 
-#: /vagrant/library/Icinga/Repository/Repository.php:1071
+#: /vagrant/library/Icinga/Repository/Repository.php:1198
 #, php-format
 msgid "Filter column \"%s\" not found in table \"%s\""
 msgstr "Filterspalte “%s” in Tabelle “%s” nicht gefunden"
 
-#: /vagrant/library/Icinga/Web/Widget/FilterEditor.php:745
 #: /vagrant/library/Icinga/Web/Widget/FilterWidget.php:89
+#: /vagrant/library/Icinga/Web/Widget/FilterEditor.php:747
 msgid "Filter this list"
 msgstr "Diese Liste filtern"
 
@@ -1011,11 +1087,11 @@ msgstr "Gefiltert"
 msgid "Finish"
 msgstr "Fertigstellen"
 
-#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:68
+#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:66
 msgid "For using unix domain sockets, specify localhost"
 msgstr "Um UNIX Domain Sockets zu verwenden, localhost angeben"
 
-#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:64
+#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:62
 msgid ""
 "For using unix domain sockets, specify the path to the unix domain socket "
 "directory"
@@ -1023,29 +1099,34 @@ msgstr ""
 "Um UNIX Domain Sockets zu verwenden, ist die Angabe des Pfades zum UNIX "
 "Domain Socket Verzeicnis erforderlich"
 
-#: /vagrant/application/forms/Config/ResourceConfigForm.php:221
+#: /vagrant/application/forms/Config/ResourceConfigForm.php:239
 msgid "Force Changes"
 msgstr "Änderungen erzwingen"
 
-#: /vagrant/application/controllers/ConfigController.php:38
+#: /vagrant/application/controllers/ConfigController.php:39
 msgid "General"
 msgstr "Allgemein"
 
-#: /vagrant/application/views/scripts/about/index.phtml:18
+#: /vagrant/application/views/scripts/about/index.phtml:12
+#: /vagrant/application/views/scripts/config/module.phtml:44
 msgid "Git commit"
 msgstr "Git Commit"
 
-#: /vagrant/application/views/scripts/about/index.phtml:22
+#: /vagrant/application/views/scripts/about/index.phtml:16
 msgid "Git commit date"
 msgstr "Git Commit Datum"
 
+#: /vagrant/application/forms/Security/RoleForm.php:48
+msgid "Grant admin permissions, e.g. manage announcements"
+msgstr ""
+
 #: /vagrant/library/Icinga/Chart/GridChart.php:89
 msgid "Grid Chart"
 msgstr "Netzansicht"
 
+#: /vagrant/application/views/scripts/user/show.phtml:78
 #: /vagrant/application/controllers/GroupController.php:326
 #: /vagrant/application/controllers/UserController.php:109
-#: /vagrant/application/views/scripts/user/show.phtml:78
 msgid "Group"
 msgstr "Benutzergruppe"
 
@@ -1089,10 +1170,10 @@ msgstr "Gruppenmitlglied “%s” wurde erfolgreich hinzugefügt"
 msgid "Group members added successfully"
 msgstr "Gruppenmitglieder wurden erfolgreich hinzugefügt"
 
-#: /vagrant/application/forms/Config/User/CreateMembershipForm.php:79
-#: /vagrant/application/forms/Navigation/NavigationConfigForm.php:623
-#: /vagrant/application/forms/Security/RoleForm.php:125
 #: /vagrant/application/views/scripts/role/list.phtml:24
+#: /vagrant/application/forms/Security/RoleForm.php:130
+#: /vagrant/application/forms/Navigation/NavigationConfigForm.php:618
+#: /vagrant/application/forms/Config/User/CreateMembershipForm.php:79
 msgid "Groups"
 msgstr "Gruppen"
 
@@ -1100,7 +1181,7 @@ msgstr "Gruppen"
 msgid "Hint"
 msgstr "Hinweis"
 
-#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:96
+#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:95
 #: /vagrant/application/forms/Config/Resource/LdapResourceForm.php:47
 msgid "Host"
 msgstr "Host"
@@ -1113,7 +1194,7 @@ msgstr "Hosts"
 msgid "I'm ready to search, waiting for your input"
 msgstr "Ich bin bereit zur Suche. Warte auf Eingabe"
 
-#: /vagrant/application/views/scripts/about/index.phtml:106
+#: /vagrant/application/views/scripts/about/index.phtml:100
 msgid "Icinga Documentation"
 msgstr "Icinga Dokumentation"
 
@@ -1129,26 +1210,26 @@ msgstr "Icinga Web 2 Anmeldung"
 msgid "Icinga Web 2 Setup-Wizard"
 msgstr "Icinga Web 2 Einrichtungsassistent"
 
-#: /vagrant/application/views/scripts/about/index.phtml:96
+#: /vagrant/application/views/scripts/about/index.phtml:90
 msgid "Icinga Wiki"
 msgstr "Icinga Wiki"
 
-#: /vagrant/application/views/scripts/about/index.phtml:55
+#: /vagrant/application/views/scripts/about/index.phtml:49
 #: /vagrant/application/views/scripts/authentication/login.phtml:44
 msgid "Icinga on Facebook"
 msgstr "Icinga auf Facebook"
 
-#: /vagrant/application/views/scripts/about/index.phtml:64
+#: /vagrant/application/views/scripts/about/index.phtml:58
 #: /vagrant/application/views/scripts/authentication/login.phtml:53
 msgid "Icinga on Google+"
 msgstr "Icinga auf Google+"
 
-#: /vagrant/application/views/scripts/about/index.phtml:46
+#: /vagrant/application/views/scripts/about/index.phtml:40
 #: /vagrant/application/views/scripts/authentication/login.phtml:34
 msgid "Icinga on Twitter"
 msgstr "Icinga auf Twitter"
 
-#: /vagrant/application/forms/Navigation/NavigationItemForm.php:68
+#: /vagrant/application/forms/Navigation/NavigationItemForm.php:86
 msgid "Icon"
 msgstr "Icon"
 
@@ -1174,11 +1255,11 @@ msgstr ""
 msgid "Inactive"
 msgstr "Inaktiv"
 
-#: /vagrant/application/forms/Authentication/LoginForm.php:117
+#: /vagrant/application/forms/Authentication/LoginForm.php:118
 msgid "Incorrect username or password"
 msgstr "Benutzername oder Kennwort ungültig"
 
-#: /vagrant/application/forms/Config/General/LoggingConfigForm.php:58
+#: /vagrant/application/forms/Config/General/LoggingConfigForm.php:60
 msgctxt "app.config.logging.level"
 msgid "Information"
 msgstr "Information"
@@ -1189,7 +1270,7 @@ msgstr "Information"
 msgid "Invalid backend type \"%s\" provided"
 msgstr "Ungültiger Backendtyp “%s” angegeben"
 
-#: /vagrant/application/forms/Config/ResourceConfigForm.php:54
+#: /vagrant/application/forms/Config/ResourceConfigForm.php:62
 #, php-format
 msgid "Invalid resource type \"%s\" provided"
 msgstr "Ungültiger Ressourcentyp “%s” angegeben"
@@ -1211,8 +1292,8 @@ msgstr ""
 msgid "LDAP Base DN"
 msgstr "LDAP Basis DN"
 
-#: /vagrant/application/forms/Config/UserBackend/LdapBackendForm.php:68
 #: /vagrant/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php:53
+#: /vagrant/application/forms/Config/UserBackend/LdapBackendForm.php:68
 msgid "LDAP Connection"
 msgstr "LDAP Verbindung"
 
@@ -1220,56 +1301,56 @@ msgstr "LDAP Verbindung"
 msgid "LDAP Filter"
 msgstr "LDAP Filter"
 
-#: /vagrant/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php:190
+#: /vagrant/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php:192
 msgid "LDAP Group Base DN"
 msgstr "LDAP Basis-DN für Gruppen"
 
-#: /vagrant/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php:133
+#: /vagrant/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php:135
 msgid "LDAP Group Filter"
 msgstr "LDAP Filter für Gruppen"
 
-#: /vagrant/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php:180
+#: /vagrant/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php:182
 msgid "LDAP Group Member Attribute"
 msgstr "LDAP-Attribut für die Gruppenmitgliedschaft"
 
-#: /vagrant/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php:166
+#: /vagrant/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php:168
 msgid "LDAP Group Name Attribute"
 msgstr "LDAP-Attribut für den Gruppennamen"
 
-#: /vagrant/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php:122
+#: /vagrant/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php:124
 msgid "LDAP Group Object Class"
 msgstr "LDAP Objektklasse für die Gruppe"
 
-#: /vagrant/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php:271
+#: /vagrant/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php:273
 msgid "LDAP User Base DN"
 msgstr "LDAP Basis-DN für Benutzer"
 
-#: /vagrant/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php:226
+#: /vagrant/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php:228
 msgid "LDAP User Filter"
 msgstr "LDAP Filter für den Benutzer"
 
+#: /vagrant/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php:261
 #: /vagrant/application/forms/Config/UserBackend/LdapBackendForm.php:189
-#: /vagrant/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php:259
 msgid "LDAP User Name Attribute"
 msgstr "LDAP-Attribut für den Benutzernamen"
 
+#: /vagrant/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php:217
 #: /vagrant/application/forms/Config/UserBackend/LdapBackendForm.php:139
-#: /vagrant/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php:215
 msgid "LDAP User Object Class"
 msgstr "LDAP Objektklasse für den Benutzer"
 
-#: /vagrant/library/Icinga/Authentication/User/DbUserBackend.php:121
 #: /vagrant/library/Icinga/Authentication/User/LdapUserBackend.php:258
-#: /vagrant/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php:123
+#: /vagrant/library/Icinga/Authentication/User/DbUserBackend.php:121
 #: /vagrant/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php:467
+#: /vagrant/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php:123
 msgid "Last Modified"
 msgstr "Zuletzt verändert"
 
+#: /vagrant/application/views/scripts/user/show.phtml:40
+#: /vagrant/application/views/scripts/group/show.phtml:37
 #: /vagrant/application/controllers/GroupController.php:71
 #: /vagrant/application/controllers/GroupController.php:107
 #: /vagrant/application/controllers/UserController.php:72
-#: /vagrant/application/views/scripts/group/show.phtml:37
-#: /vagrant/application/views/scripts/user/show.phtml:40
 msgid "Last modified"
 msgstr "Zuletzt verändert"
 
@@ -1277,12 +1358,16 @@ msgstr "Zuletzt verändert"
 msgid "Leave empty for not updating the user's password"
 msgstr "Leer lassen, um das Passwort unverändert zu lassen"
 
+#: /vagrant/application/controllers/AnnouncementsController.php:25
+msgid "List All Announcements"
+msgstr ""
+
 #: /vagrant/application/controllers/NavigationController.php:192
 msgid "List and configure shared navigation items"
 msgstr "Geteilte Navigationselemente auflisten und bearbeiten"
 
 #: /vagrant/application/controllers/NavigationController.php:142
-#: /vagrant/application/controllers/PreferenceController.php:37
+#: /vagrant/application/controllers/AccountController.php:32
 msgid "List and configure your own navigation items"
 msgstr "Eigene Navigationselemente auflisten und bearbeiten"
 
@@ -1292,7 +1377,7 @@ msgstr "Eigene Navigationselemente auflisten und bearbeiten"
 msgid "List groups of user group backends"
 msgstr "Gruppierte Benutzergruppenbackends auflisten"
 
-#: /vagrant/application/controllers/ConfigController.php:97
+#: /vagrant/application/controllers/ConfigController.php:98
 msgid "List intalled modules"
 msgstr "Installierte Module auflisten"
 
@@ -1302,15 +1387,15 @@ msgstr "Installierte Module auflisten"
 msgid "List users of authentication backends"
 msgstr "Benutzer des Authentifizierungsbackends auflisten"
 
-#: /vagrant/application/views/scripts/about/index.phtml:110
+#: /vagrant/application/views/scripts/about/index.phtml:104
 msgid "Loaded modules"
 msgstr "Geladene Module"
 
-#: /vagrant/application/forms/Config/General/LoggingConfigForm.php:53
+#: /vagrant/application/forms/Config/General/LoggingConfigForm.php:55
 msgid "Logging Level"
 msgstr "Log-Level"
 
-#: /vagrant/application/forms/Config/General/LoggingConfigForm.php:37
+#: /vagrant/application/forms/Config/General/LoggingConfigForm.php:39
 msgid "Logging Type"
 msgstr "Logging-Typ"
 
@@ -1322,12 +1407,12 @@ msgstr "Anmelden"
 msgid "Logging out..."
 msgstr "Abmelden..."
 
-#: /vagrant/application/forms/Authentication/LoginForm.php:29
 #: /vagrant/application/views/scripts/authentication/logout.phtml:22
+#: /vagrant/application/forms/Authentication/LoginForm.php:29
 msgid "Login"
 msgstr "Anmelden"
 
-#: /vagrant/library/Icinga/Application/Web.php:355
+#: /vagrant/library/Icinga/Application/Web.php:360
 #: /vagrant/library/Icinga/Web/Menu.php:314
 msgid "Logout"
 msgstr "Abmelden"
@@ -1358,12 +1443,21 @@ msgstr "Mitgliedschaften erfolgreich angelegt"
 msgid "Menu Entry"
 msgstr "Menüeintrag"
 
-#: /vagrant/library/Icinga/Web/Controller/ActionController.php:249
+#: /vagrant/application/views/scripts/announcements/index.phtml:28
+#: /vagrant/application/forms/Announcement/AnnouncementForm.php:34
+msgid "Message"
+msgstr ""
+
+#: /vagrant/library/Icinga/Web/Controller/ActionController.php:255
 msgid "Method Not Allowed"
 msgstr "Nicht zulässig"
 
-#: /vagrant/library/Icinga/Web/Widget/FilterEditor.php:747
+#: /vagrant/application/forms/Navigation/NavigationItemForm.php:72
+msgid "Missing protocol identifier"
+msgstr ""
+
 #: /vagrant/library/Icinga/Web/Widget/FilterWidget.php:94
+#: /vagrant/library/Icinga/Web/Widget/FilterEditor.php:749
 msgid "Modify this filter"
 msgstr "Diesen Filter bearbeiten"
 
@@ -1371,12 +1465,12 @@ msgstr "Diesen Filter bearbeiten"
 msgid "Module"
 msgstr "Modul"
 
-#: /vagrant/application/controllers/ConfigController.php:161
+#: /vagrant/application/controllers/ConfigController.php:163
 #, php-format
 msgid "Module \"%s\" disabled"
 msgstr "Modul “%s” deaktiviert"
 
-#: /vagrant/application/controllers/ConfigController.php:141
+#: /vagrant/application/controllers/ConfigController.php:143
 #, php-format
 msgid "Module \"%s\" enabled"
 msgstr "Modul “%s” aktiviert"
@@ -1400,8 +1494,8 @@ msgstr "Modul “%s” ist aktiviert"
 msgid "Module Path"
 msgstr "Pfad zu den Modulen"
 
-#: /vagrant/application/controllers/ConfigController.php:96
-#: /vagrant/library/Icinga/Application/Web.php:336
+#: /vagrant/application/controllers/ConfigController.php:97
+#: /vagrant/library/Icinga/Application/Web.php:341
 #: /vagrant/library/Icinga/Web/Menu.php:299
 msgid "Modules"
 msgstr "Module"
@@ -1424,44 +1518,50 @@ msgstr "Benutzerbackend %s nach unten schieben"
 msgid "Move user backend %s upwards"
 msgstr "Benutzerbackend %s nach oben schieben"
 
-#: /vagrant/application/forms/Navigation/NavigationConfigForm.php:582
-#: /vagrant/application/views/scripts/about/index.phtml:114
+#: /vagrant/application/controllers/NavigationController.php:134
+#: /vagrant/application/controllers/AccountController.php:28
+#: /vagrant/library/Icinga/Application/Web.php:355
+msgid "My Account"
+msgstr ""
+
+#: /vagrant/application/views/scripts/about/index.phtml:108
 #: /vagrant/application/views/scripts/config/module.phtml:16
 #: /vagrant/application/views/scripts/role/list.phtml:22
+#: /vagrant/application/forms/Navigation/NavigationConfigForm.php:577
 msgid "Name"
 msgstr "Name"
 
-#: /vagrant/application/controllers/NavigationController.php:143
-#: /vagrant/application/controllers/NavigationController.php:151
-#: /vagrant/application/controllers/PreferenceController.php:38
 #: /vagrant/application/views/scripts/pivottablePagination.phtml:16
 #: /vagrant/application/views/scripts/layout/menu.phtml:16
 #: /vagrant/application/views/scripts/navigation/index.phtml:29
+#: /vagrant/application/controllers/NavigationController.php:143
+#: /vagrant/application/controllers/NavigationController.php:151
+#: /vagrant/application/controllers/AccountController.php:33
 msgid "Navigation"
 msgstr "Navigation"
 
-#: /vagrant/application/controllers/NavigationController.php:327
+#: /vagrant/application/controllers/NavigationController.php:322
 #, php-format
 msgid "Navigation Item \"%s\" not found. No action required"
 msgstr "Navigationselement “%s” nicht gefunden. Kein Eingriff erfoderlich"
 
-#: /vagrant/application/controllers/NavigationController.php:339
+#: /vagrant/application/controllers/NavigationController.php:334
 #, php-format
 msgid "Navigation Item \"%s\" successfully removed"
 msgstr "Navigationselement “%s” erfolgreich entfernt"
 
-#: /vagrant/application/controllers/NavigationController.php:379
+#: /vagrant/application/controllers/NavigationController.php:374
 #, php-format
 msgid "Navigation item \"%s\" has been unshared"
 msgstr "Teilen des Navigationselementes “%s” erfolgreich aufgehoben"
 
-#: /vagrant/application/controllers/NavigationController.php:301
-#: /vagrant/application/controllers/NavigationController.php:412
+#: /vagrant/application/controllers/NavigationController.php:296
+#: /vagrant/application/controllers/NavigationController.php:407
 #, php-format
 msgid "Navigation item \"%s\" not found"
 msgstr "Navigationselement “%s” wurde nicht gefunden"
 
-#: /vagrant/application/controllers/NavigationController.php:290
+#: /vagrant/application/controllers/NavigationController.php:285
 #, php-format
 msgid "Navigation item \"%s\" successfully updated"
 msgstr "Navigationselement “%s” erfolgreich aktualisiert"
@@ -1470,11 +1570,16 @@ msgstr "Navigationselement “%s” erfolgreich aktualisiert"
 msgid "Navigation item successfully created"
 msgstr "Navigationselement “%s” erfolgreich angelegt"
 
+#: /vagrant/application/controllers/AnnouncementsController.php:45
+#, fuzzy
+msgid "New Announcement"
+msgstr "Neue Spalte anlegen"
+
 #: /vagrant/application/forms/Navigation/NavigationItemForm.php:42
 msgid "New Column"
 msgstr "Neue Spalte anlegen"
 
-#: /vagrant/application/forms/Dashboard/DashletForm.php:110
+#: /vagrant/application/forms/Dashboard/DashletForm.php:111
 msgid "New Dashboard Title"
 msgstr "Neuen Dashboardtitel vergeben"
 
@@ -1486,7 +1591,12 @@ msgstr "Neues Dashlet"
 msgid "New Navigation Item"
 msgstr "Neues Navigationselement erstellen"
 
-#: /vagrant/application/controllers/ConfigController.php:326
+#: /vagrant/application/forms/Account/ChangePasswordForm.php:49
+#, fuzzy
+msgid "New Password"
+msgstr "Kennwort"
+
+#: /vagrant/application/controllers/ConfigController.php:323
 msgid "New Resource"
 msgstr "Neue Ressource erstellen"
 
@@ -1498,7 +1608,7 @@ msgstr "Neue Rolle anlegen"
 msgid "New User"
 msgstr "Neuen Benutzer anlegen"
 
-#: /vagrant/application/controllers/ConfigController.php:231
+#: /vagrant/application/controllers/ConfigController.php:233
 msgid "New User Backend"
 msgstr "Neues Backend für Benutzer anlegen"
 
@@ -1522,11 +1632,11 @@ msgstr "Neues Fenster"
 msgid "New configuration has successfully been stored"
 msgstr "Die neue Konfiguration wurde erfolgreich gespeichert"
 
-#: /vagrant/application/forms/Dashboard/DashletForm.php:100
+#: /vagrant/application/forms/Dashboard/DashletForm.php:101
 msgid "New dashboard"
 msgstr "Neues Dashboard"
 
-#: /vagrant/application/forms/Config/ResourceConfigForm.php:98
+#: /vagrant/application/forms/Config/ResourceConfigForm.php:106
 msgid "New resource name missing"
 msgstr "Name für die neue Ressource fehlt"
 
@@ -1543,11 +1653,16 @@ msgstr "Nächste Seite"
 msgid "No"
 msgstr "Nein"
 
-#: /vagrant/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php:297
+#: /vagrant/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php:312
 msgid "No LDAP resources available. Please configure an LDAP resource first."
 msgstr "Keine LDAP-Ressource verfügbar. Bitte zuerst eine konfigurieren."
 
-#: /vagrant/application/forms/Authentication/LoginForm.php:99
+#: /vagrant/application/views/scripts/announcements/index.phtml:21
+#, fuzzy
+msgid "No announcements found."
+msgstr "Es wurden keine Rollen gefunden"
+
+#: /vagrant/application/forms/Authentication/LoginForm.php:100
 msgid ""
 "No authentication methods available. Did you create authentication.ini when "
 "setting up Icinga Web 2?"
@@ -1592,12 +1707,12 @@ msgstr ""
 msgid "No users found matching the filter"
 msgstr "Es wurde kein Benutzer gefunden, der den Filterkriterien entspricht"
 
-#: /vagrant/application/forms/Navigation/NavigationConfigForm.php:674
+#: /vagrant/application/forms/Navigation/NavigationConfigForm.php:669
 msgctxt "No parent for a navigation item"
 msgid "None"
 msgstr "Keines"
 
-#: /vagrant/application/forms/Config/General/LoggingConfigForm.php:42
+#: /vagrant/application/forms/Config/General/LoggingConfigForm.php:44
 msgctxt "app.config.logging.type"
 msgid "None"
 msgstr "Nicht loggen"
@@ -1621,7 +1736,16 @@ msgstr ""
 "Bitte beachten Sie, dass allen Mitgliedern dieser Gruppe ihre Mitgliedschaft "
 "automatisch entzogen wird."
 
-#: /vagrant/application/forms/Config/ResourceConfigForm.php:96
+#: /vagrant/application/forms/Account/ChangePasswordForm.php:41
+#, fuzzy
+msgid "Old Password"
+msgstr "Bind Kennwort"
+
+#: /vagrant/application/forms/Account/ChangePasswordForm.php:93
+msgid "Old password is invalid"
+msgstr ""
+
+#: /vagrant/application/forms/Config/ResourceConfigForm.php:104
 msgid "Old resource name missing"
 msgstr "Der alte Ressourcenname fehlt"
 
@@ -1631,8 +1755,8 @@ msgstr ""
 "Auf dieser Ressource werden nur der Wurzelknoten und seine Kindknoten "
 "sichtbar sein."
 
-#: /vagrant/application/controllers/NavigationController.php:200
 #: /vagrant/application/views/scripts/navigation/shared.phtml:21
+#: /vagrant/application/controllers/NavigationController.php:200
 msgid "Owner"
 msgstr "Eigentümer"
 
@@ -1640,7 +1764,7 @@ msgstr "Eigentümer"
 msgid "Page not found"
 msgstr "Seite nicht gefunden."
 
-#: /vagrant/application/controllers/ErrorController.php:51
+#: /vagrant/application/controllers/ErrorController.php:49
 msgid "Page not found."
 msgstr "Seite nicht gefunden."
 
@@ -1652,15 +1776,15 @@ msgstr "Seitennavigation"
 msgid "Pane"
 msgstr "Dashboard"
 
-#: /vagrant/application/forms/Navigation/NavigationConfigForm.php:668
+#: /vagrant/application/forms/Navigation/NavigationConfigForm.php:663
 #: /vagrant/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php:121
 msgid "Parent"
 msgstr "Übergeordnetes Element"
 
-#: /vagrant/application/forms/Authentication/LoginForm.php:52
-#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:137
+#: /vagrant/application/forms/Authentication/LoginForm.php:53
 #: /vagrant/application/forms/Config/User/UserForm.php:41
 #: /vagrant/application/forms/Config/User/UserForm.php:63
+#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:136
 msgid "Password"
 msgstr "Kennwort"
 
@@ -1668,15 +1792,15 @@ msgstr "Kennwort"
 msgid "Pattern"
 msgstr "Muster"
 
-#: /vagrant/application/views/scripts/config/module.phtml:58
+#: /vagrant/application/views/scripts/config/module.phtml:68
 msgid "Permissions"
 msgstr "Berechtigungen"
 
-#: /vagrant/application/forms/Security/RoleForm.php:133
+#: /vagrant/application/forms/Security/RoleForm.php:138
 msgid "Permissions Set"
 msgstr "Berechtigungen"
 
-#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:157
+#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:156
 msgid "Persistent"
 msgstr "Persistent"
 
@@ -1688,7 +1812,7 @@ msgstr "Tortendiagramm"
 msgid "Please copy the following dashboard snippet to "
 msgstr "Bitte kopieren Sie den folgenden Ausschnitt aus dem Dashboard nach"
 
-#: /vagrant/application/forms/Authentication/LoginForm.php:112
+#: /vagrant/application/forms/Authentication/LoginForm.php:113
 msgid ""
 "Please note that not all authentication methods were available. Check the "
 "system log or Icinga Web 2 log for more information."
@@ -1713,14 +1837,12 @@ msgstr ""
 "Platzhaltern. Der Einfachheit halber hänge ich immer einen Platzhalter an "
 "das letzte von Ihnen eingegebene Zeichen an."
 
-#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:107
+#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:106
 #: /vagrant/application/forms/Config/Resource/LdapResourceForm.php:60
 msgid "Port"
 msgstr "Port"
 
-#: /vagrant/application/controllers/NavigationController.php:134
-#: /vagrant/application/controllers/PreferenceController.php:33
-#: /vagrant/library/Icinga/Application/Web.php:350
+#: /vagrant/application/views/scripts/account/index.phtml:9
 #: /vagrant/library/Icinga/Web/Menu.php:309
 msgid "Preferences"
 msgstr "Einstellungen"
@@ -1773,12 +1895,12 @@ msgid "Push to fill in the chosen connection's default settings."
 msgstr ""
 "Klicken Sie hier, um die gewählten Verbindungseinstellungen auszufüllen."
 
-#: /vagrant/library/Icinga/Repository/Repository.php:1019
+#: /vagrant/library/Icinga/Repository/Repository.php:1146
 #, php-format
 msgid "Query column \"%s\" not found"
 msgstr "Abfragespalte “%s” wurde nicht gefunden"
 
-#: /vagrant/library/Icinga/Repository/Repository.php:1027
+#: /vagrant/library/Icinga/Repository/Repository.php:1154
 #, php-format
 msgid "Query column \"%s\" not found in table \"%s\""
 msgstr "Abfragespalte “%s” wurde in Tabelle “%s” nicht gefunden"
@@ -1787,12 +1909,17 @@ msgstr "Abfragespalte “%s” wurde in Tabelle “%s” nicht gefunden"
 msgid "Ready to search"
 msgstr "Bereit zur Suche"
 
+#: /vagrant/application/views/scripts/user/list.phtml:53
 #: /vagrant/application/views/scripts/group/list.phtml:52
 #: /vagrant/application/views/scripts/group/show.phtml:77
-#: /vagrant/application/views/scripts/user/list.phtml:53
 msgid "Remove"
 msgstr "Entfernen"
 
+#: /vagrant/application/controllers/AnnouncementsController.php:77
+#, fuzzy
+msgid "Remove Announcement"
+msgstr "Ressource entfernen"
+
 #: /vagrant/application/controllers/DashboardController.php:228
 msgid "Remove Dashboard"
 msgstr "Dashboard entfernen"
@@ -1805,11 +1932,11 @@ msgstr "Dashlet entfernen"
 msgid "Remove Dashlet From Dashboard"
 msgstr "Dashlet aus Dashboard entfernen"
 
-#: /vagrant/application/controllers/NavigationController.php:347
+#: /vagrant/application/controllers/NavigationController.php:342
 msgid "Remove Navigation Item"
 msgstr "Dieses Navigationselement entfernen"
 
-#: /vagrant/application/controllers/ConfigController.php:365
+#: /vagrant/application/controllers/ConfigController.php:362
 msgid "Remove Resource"
 msgstr "Ressource entfernen"
 
@@ -1822,7 +1949,7 @@ msgstr "Rolle entfernen"
 msgid "Remove User"
 msgstr "Benutzer entfernen"
 
-#: /vagrant/application/controllers/ConfigController.php:306
+#: /vagrant/application/controllers/ConfigController.php:303
 msgid "Remove User Backend"
 msgstr "Backend für Benutzer entfernen"
 
@@ -1830,10 +1957,15 @@ msgstr "Backend für Benutzer entfernen"
 msgid "Remove User Group"
 msgstr "Benutzergruppe entfernen"
 
-#: /vagrant/application/controllers/UsergroupbackendController.php:133
+#: /vagrant/application/controllers/UsergroupbackendController.php:128
 msgid "Remove User Group Backend"
 msgstr "Backend für Benutzergruppen entfernen"
 
+#: /vagrant/application/forms/Announcement/AnnouncementForm.php:76
+#, fuzzy, php-format
+msgid "Remove announcement %s?"
+msgstr "Dashboard %s entfernen"
+
 #: /vagrant/application/views/scripts/dashboard/settings.phtml:72
 #, php-format
 msgid "Remove dashlet %s from pane %s"
@@ -1869,6 +2001,11 @@ msgstr "Rolle %s entfernen"
 msgid "Remove the %s resource"
 msgstr "Ressource %s entfernen"
 
+#: /vagrant/application/views/scripts/announcements/index.phtml:53
+#, fuzzy
+msgid "Remove this announcement"
+msgstr "Dieses Mitglied entfernen"
+
 #: /vagrant/library/Icinga/Web/Widget/FilterWidget.php:98
 msgid "Remove this filter"
 msgstr "Diesen Filter entfernen"
@@ -1906,14 +2043,14 @@ msgstr "Benutzergruppe %s entfernen"
 msgid "Remove user group backend %s"
 msgstr "Benutzergruppenbackend %s entfernen"
 
-#: /vagrant/application/views/scripts/about/index.phtml:76
+#: /vagrant/application/views/scripts/about/index.phtml:70
 msgid "Report a bug"
 msgstr "Einen Fehler melden"
 
-#: /vagrant/library/Icinga/Cli/Params.php:183
-#: /vagrant/library/Icinga/Cli/Params.php:285
 #: /vagrant/library/Icinga/Web/UrlParams.php:65
 #: /vagrant/library/Icinga/Web/UrlParams.php:160
+#: /vagrant/library/Icinga/Cli/Params.php:183
+#: /vagrant/library/Icinga/Cli/Params.php:285
 #, php-format
 msgid "Required parameter '%s' missing"
 msgstr "Der erforderliche Parametet ‘%s’ fehlt"
@@ -1922,68 +2059,68 @@ msgstr "Der erforderliche Parametet ‘%s’ fehlt"
 msgid "Resource"
 msgstr "Ressource"
 
-#: /vagrant/application/forms/Config/ResourceConfigForm.php:170
+#: /vagrant/application/forms/Config/ResourceConfigForm.php:188
 #, php-format
 msgid "Resource \"%s\" has been successfully changed"
 msgstr "Die Ressource “%s” wurde erfolgreich geändert"
 
-#: /vagrant/application/forms/Config/ResourceConfigForm.php:167
+#: /vagrant/application/forms/Config/ResourceConfigForm.php:185
 #, php-format
 msgid "Resource \"%s\" has been successfully created"
 msgstr "Die Ressource “%s” wurde erfolgreich angelegt"
 
-#: /vagrant/application/controllers/ConfigController.php:382
+#: /vagrant/application/controllers/ConfigController.php:379
 #, php-format
 msgid "Resource \"%s\" has been successfully removed"
 msgstr "Die Ressource “%s” wurde erfolgreich entfernt"
 
-#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:76
+#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:75
+#: /vagrant/application/forms/Config/Resource/SshResourceForm.php:36
 #: /vagrant/application/forms/Config/Resource/FileResourceForm.php:32
 #: /vagrant/application/forms/Config/Resource/LdapResourceForm.php:38
 #: /vagrant/application/forms/Config/Resource/LivestatusResourceForm.php:35
-#: /vagrant/application/forms/Config/Resource/SshResourceForm.php:36
 msgid "Resource Name"
 msgstr "Ressourcenname"
 
-#: /vagrant/application/forms/Config/ResourceConfigForm.php:252
+#: /vagrant/application/forms/Config/ResourceConfigForm.php:270
 msgid "Resource Type"
 msgstr "Ressourcentyp"
 
-#: /vagrant/application/forms/Config/ResourceConfigForm.php:75
+#: /vagrant/application/forms/Config/ResourceConfigForm.php:83
 msgid "Resource already exists"
 msgstr "Die Ressource existiert bereits"
 
-#: /vagrant/application/forms/Config/ResourceConfigForm.php:73
-#: /vagrant/application/forms/Config/ResourceConfigForm.php:122
-#: /vagrant/application/forms/Config/ResourceConfigForm.php:196
+#: /vagrant/application/forms/Config/ResourceConfigForm.php:81
+#: /vagrant/application/forms/Config/ResourceConfigForm.php:140
+#: /vagrant/application/forms/Config/ResourceConfigForm.php:214
 msgid "Resource name missing"
 msgstr "Der Ressourcenname fehlt"
 
-#: /vagrant/application/controllers/ConfigController.php:44
+#: /vagrant/application/controllers/ConfigController.php:45
 msgid "Resources"
 msgstr "Ressourcen"
 
-#: /vagrant/application/controllers/ConfigController.php:330
+#: /vagrant/application/controllers/ConfigController.php:327
 msgid "Resources are entities that provide data to Icinga Web 2."
 msgstr "Ressourcen dienen als Datenquellen für Icinga Web 2."
 
-#: /vagrant/application/forms/Security/RoleForm.php:59
+#: /vagrant/application/forms/Security/RoleForm.php:64
 msgid "Restrict which groups this role can share items and information with"
 msgstr ""
 "Beschränken Sie, mit welchen Gruppen diese Rolle Elemente und Informationen "
 "teilen kann."
 
-#: /vagrant/application/forms/Security/RoleForm.php:53
+#: /vagrant/application/forms/Security/RoleForm.php:58
 msgid "Restrict which users this role can share items and information with"
 msgstr ""
 "Beschränken Sie, mit welchen Benutzern diese Rolle Elemente und "
 "Informationen teilen kann."
 
-#: /vagrant/application/views/scripts/config/module.phtml:68
+#: /vagrant/application/views/scripts/config/module.phtml:78
 msgid "Restrictions"
 msgstr "Beschränkungen"
 
-#: /vagrant/application/forms/Security/RoleForm.php:108
+#: /vagrant/application/forms/Security/RoleForm.php:113
 msgid "Role Name"
 msgstr "Rollenname"
 
@@ -2010,32 +2147,53 @@ msgstr "Rollen"
 msgid "Root DN"
 msgstr "Wurzel-DN"
 
-#: /vagrant/application/forms/Config/ResourceConfigForm.php:243
+#: /vagrant/application/forms/Config/ResourceConfigForm.php:261
 msgid "SQL Database"
 msgstr "SQL Datenbank"
 
-#: /vagrant/application/forms/Config/ResourceConfigForm.php:237
+#: /vagrant/application/forms/Config/ResourceConfigForm.php:255
 msgid "SSH Identity"
 msgstr "SSH-Identität"
 
+#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:192
+msgid "SSL CA"
+msgstr "SSL-CA"
+
+#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:200
+msgid "SSL CA Path"
+msgstr "SSL-CA-Pfad"
+
+#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:184
+msgid "SSL Certificate"
+msgstr "SSL-Zertifikat"
+
+#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:210
+msgid "SSL Cipher"
+msgstr "SSL-Verschlüsselung"
+
+#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:176
+msgid "SSL Key"
+msgstr "SSL-Schlüssel"
+
+#: /vagrant/application/forms/Announcement/AnnouncementForm.php:68
 #: /vagrant/application/forms/Config/User/UserForm.php:68
 #: /vagrant/application/forms/Config/UserGroup/UserGroupForm.php:32
 msgid "Save"
 msgstr "Speichern"
 
+#: /vagrant/application/forms/Navigation/NavigationConfigForm.php:85
 #: /vagrant/application/forms/Config/GeneralConfigForm.php:22
-#: /vagrant/application/forms/Config/ResourceConfigForm.php:30
+#: /vagrant/application/forms/Config/ResourceConfigForm.php:38
 #: /vagrant/application/forms/Config/UserBackendConfigForm.php:46
 #: /vagrant/application/forms/Config/UserGroup/UserGroupBackendForm.php:29
-#: /vagrant/application/forms/Navigation/NavigationConfigForm.php:85
 msgid "Save Changes"
 msgstr "Änderungen speichern"
 
-#: /vagrant/application/forms/PreferenceForm.php:266
+#: /vagrant/application/forms/PreferenceForm.php:276
 msgid "Save for the current Session"
 msgstr "Für die aktuelle Sitzung speichern"
 
-#: /vagrant/application/forms/PreferenceForm.php:255
+#: /vagrant/application/forms/PreferenceForm.php:265
 msgid "Save to the Preferences"
 msgstr "Dauerhaft speichern"
 
@@ -2057,7 +2215,7 @@ msgstr "Domains durchsuchen"
 msgid "Search this domain for records of available servers."
 msgstr "Diese Domain nach verfügbaren Servern durchsuchen."
 
-#: /vagrant/library/Icinga/Web/Widget/FilterEditor.php:741
+#: /vagrant/library/Icinga/Web/Widget/FilterEditor.php:743
 msgid "Search..."
 msgstr "Suche..."
 
@@ -2065,7 +2223,7 @@ msgstr "Suche..."
 msgid "Searching"
 msgstr "Suche"
 
-#: /vagrant/application/forms/Dashboard/DashletForm.php:122
+#: /vagrant/application/forms/Dashboard/DashletForm.php:123
 msgid "Select a dashboard you want to add the dashlet to"
 msgstr "Wählen Sie das Dashboard aus, dem Sie das Dashlet hinzufügen wollen"
 
@@ -2097,7 +2255,7 @@ msgstr ""
 "Exceptions angezeigt werden soll. Dies kann auch von Benutzern mit den "
 "nötigen Rechten eingestellt werden."
 
-#: /vagrant/application/forms/PreferenceForm.php:224
+#: /vagrant/application/forms/PreferenceForm.php:234
 msgid "Set whether to show an exception's stacktrace."
 msgstr ""
 "Stellen Sie hier ein, ob ein Stacktrace im Falle von Exceptions angezeigt "
@@ -2107,16 +2265,16 @@ msgstr ""
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: /vagrant/application/controllers/NavigationController.php:150
-#: /vagrant/application/forms/Navigation/NavigationConfigForm.php:602
 #: /vagrant/application/views/scripts/navigation/index.phtml:31
+#: /vagrant/application/controllers/NavigationController.php:150
+#: /vagrant/application/forms/Navigation/NavigationConfigForm.php:597
 msgid "Shared"
 msgstr "Freigegeben"
 
+#: /vagrant/application/views/scripts/navigation/shared.phtml:19
 #: /vagrant/application/controllers/NavigationController.php:193
 #: /vagrant/application/controllers/NavigationController.php:201
-#: /vagrant/application/views/scripts/navigation/shared.phtml:19
-#: /vagrant/library/Icinga/Application/Web.php:330
+#: /vagrant/library/Icinga/Application/Web.php:335
 msgid "Shared Navigation"
 msgstr "Freigegebene Navigation"
 
@@ -2131,7 +2289,7 @@ msgctxt "dashboard.pane.tooltip"
 msgid "Show Search"
 msgstr "Suche anzeigen"
 
-#: /vagrant/application/forms/PreferenceForm.php:223
+#: /vagrant/application/forms/PreferenceForm.php:233
 #: /vagrant/application/forms/Config/General/ApplicationConfigForm.php:38
 msgid "Show Stacktraces"
 msgstr "Stacktrace anzeigen"
@@ -2141,8 +2299,8 @@ msgstr "Stacktrace anzeigen"
 msgid "Show dashlet %s"
 msgstr "Dashlet %s anzeigen"
 
-#: /vagrant/application/views/scripts/group/show.phtml:93
 #: /vagrant/application/views/scripts/user/list.phtml:68
+#: /vagrant/application/views/scripts/group/show.phtml:93
 #, php-format
 msgid "Show detailed information about %s"
 msgstr "Zeige detaillierte Informationen über %s"
@@ -2169,7 +2327,7 @@ msgstr "Zeige Gruppe %s"
 msgid "Show rows %u to %u of %u"
 msgstr "Zeige die Zeilen %d bis %d von %d"
 
-#: /vagrant/application/views/scripts/about/index.phtml:127
+#: /vagrant/application/views/scripts/about/index.phtml:121
 #: /vagrant/application/views/scripts/config/modules.phtml:32
 #, php-format
 msgid "Show the overview of the %s module"
@@ -2184,7 +2342,7 @@ msgstr "Zeige Benutzer %s"
 msgid "Single Column"
 msgstr "Eine Spalte"
 
-#: /vagrant/application/forms/Config/UserBackendConfigForm.php:381
+#: /vagrant/application/forms/Config/UserBackendConfigForm.php:375
 msgid "Skip Validation"
 msgstr "Überprüfung überspringen"
 
@@ -2204,8 +2362,13 @@ msgstr "Fehler beim Schreiben der Datei"
 msgid "Sort by"
 msgstr "Sortieren nach"
 
-#: /vagrant/application/views/scripts/config/module.phtml:20
+#: /vagrant/application/views/scripts/announcements/index.phtml:29
+#: /vagrant/application/forms/Announcement/AnnouncementForm.php:43
+msgid "Start"
+msgstr ""
+
 #: /vagrant/application/views/scripts/user/show.phtml:32
+#: /vagrant/application/views/scripts/config/module.phtml:20
 msgid "State"
 msgstr "Status"
 
@@ -2213,7 +2376,7 @@ msgstr "Status"
 msgid "Strip this filter"
 msgstr "Diesen Filter bearbeiten"
 
-#: /vagrant/application/views/scripts/about/index.phtml:86
+#: /vagrant/application/views/scripts/about/index.phtml:80
 msgid "Support / Mailinglists"
 msgstr "Support/Mailinglisten"
 
@@ -2226,7 +2389,11 @@ msgstr "System"
 msgid "Target"
 msgstr "Ziel"
 
-#: /vagrant/application/views/scripts/about/index.phtml:29
+#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:193
+msgid "The CA certificate file path"
+msgstr "Der Pfad zur CA-Zertifikat-Datei"
+
+#: /vagrant/application/views/scripts/about/index.phtml:23
 #: /vagrant/application/views/scripts/authentication/login.phtml:26
 msgid "The Icinga Project"
 msgstr "Das Icinga Projekt"
@@ -2242,24 +2409,24 @@ msgid "The LDAP connection to use for this backend."
 msgstr ""
 "Die Datenbankverbindung, welche mit diesem Backend verwendet werden soll."
 
-#: /vagrant/application/forms/Config/General/LoggingConfigForm.php:75
-#: /vagrant/application/forms/Config/General/LoggingConfigForm.php:85
+#: /vagrant/application/forms/Config/General/LoggingConfigForm.php:77
+#: /vagrant/application/forms/Config/General/LoggingConfigForm.php:87
 msgid "The application prefix must not contain whitespace."
 msgstr "Das Applikationspräfix darf keine Leerzeichen enthalten."
 
-#: /vagrant/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php:181
+#: /vagrant/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php:183
 msgid "The attribute name used for storing a group's members."
 msgstr ""
 "Der Attributname welcher benutzt wird, um Gruppenmitglieder auf dem LDAP-"
 "Server abzulegen"
 
-#: /vagrant/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php:168
+#: /vagrant/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php:170
 msgid "The attribute name used for storing a group's name on the LDAP server."
 msgstr ""
 "Der Attributname welcher benutzt wird, um Gruppennamen auf dem LDAP-Server "
 "abzulegen"
 
-#: /vagrant/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php:261
+#: /vagrant/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php:263
 msgid "The attribute name used for storing a user's name on the LDAP server."
 msgstr ""
 "Der Attributname welcher benutzt wird, um einen Benutzernamen auf dem LDAP-"
@@ -2271,16 +2438,24 @@ msgstr ""
 "Der Attributname welcher benutzt wird, um den Benutzernamen auf dem LDAP-"
 "Server abzulegen."
 
-#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:145
+#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:185
+msgid "The certificate file path"
+msgstr "Der Pfad zur Zertifikat-Datei"
+
+#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:144
 msgid "The character set for the database"
 msgstr "Der Zeichensatz für die Datenbank"
 
+#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:177
+msgid "The client key file path"
+msgstr "Der Pfad zum Schlüssel des Klienten"
+
 #: /vagrant/application/forms/Config/Resource/FileResourceForm.php:60
 msgid "The column pattern must be a valid regular expression."
 msgstr "Das Muster für die Spalte muss ein gültiger regulärer Ausdruck sein."
 
-#: /vagrant/application/forms/Config/ResourceConfigForm.php:324
-#: /vagrant/application/forms/Config/UserBackendConfigForm.php:429
+#: /vagrant/application/forms/Config/ResourceConfigForm.php:342
+#: /vagrant/application/forms/Config/UserBackendConfigForm.php:423
 msgid "The configuration has been successfully validated."
 msgstr "Die Konfiguration wurde erfolgreich überprüft."
 
@@ -2314,13 +2489,13 @@ msgstr "Die Datei aus welcher Informationen gelesen werden sollen"
 msgid "The filter is invalid. Please check your syntax."
 msgstr "Der Filter ist ungültig. Bitte überprüfen Sie Ihre Syntax."
 
-#: /vagrant/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php:151
-#: /vagrant/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php:244
+#: /vagrant/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php:153
+#: /vagrant/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php:246
 msgid "The filter must not be wrapped in parantheses."
 msgstr "Der Filter darf nicht in Klammern eingeschlossen sein."
 
-#: /vagrant/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php:139
-#: /vagrant/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php:232
+#: /vagrant/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php:141
+#: /vagrant/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php:234
 msgid ""
 "The filter needs to be expressed as standard LDAP expression, without outer "
 "parentheses. (e.g. &(foo=bar)(bar=foo) or foo=bar)"
@@ -2348,7 +2523,7 @@ msgstr ""
 "Der Filter, anhand dessen bestimmte Teile von Benutzernamen entfernt werden. "
 "Lassen Sie dieses Feld leer, wenn Sie keine Änderungen vornehmen möchten."
 
-#: /vagrant/application/forms/Config/General/LoggingConfigForm.php:116
+#: /vagrant/application/forms/Config/General/LoggingConfigForm.php:129
 msgid "The full path to the log file to write messages to."
 msgstr ""
 "Der vollständige Pfad zu der Logdatei, in welche Nachrichten geschrieben "
@@ -2358,7 +2533,7 @@ msgstr ""
 msgid "The given SSH key is invalid"
 msgstr "Der angegebene SSH-Schlüssel ist ungültig"
 
-#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:97
+#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:96
 msgid "The hostname of the database"
 msgstr "Der Hostname der Datenbank."
 
@@ -2368,19 +2543,27 @@ msgstr ""
 "Der Hostname oder die IP-Adresse des LDAP-Servers der zur Authentifizierung "
 "genutzt werden soll"
 
-#: /vagrant/application/forms/Navigation/NavigationItemForm.php:70
+#: /vagrant/application/forms/Navigation/NavigationItemForm.php:88
 msgid ""
 "The icon of this navigation item. Leave blank if you do not want a icon "
 "being displayed"
 msgstr ""
 "Das Icon für dieses Navigationselement. Leer lassen, um kein Icon anzuzeigen."
 
-#: /vagrant/application/forms/Config/General/LoggingConfigForm.php:54
+#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:211
+msgid "The list of permissible ciphers"
+msgstr "Liste zulässiger Verschlüsselungen"
+
+#: /vagrant/application/forms/Config/General/LoggingConfigForm.php:56
 msgid "The maximum logging level to emit."
 msgstr ""
 "Der höchste Loglevel, bis zu welchem Nachrichten ausgegeben werden sollen."
 
-#: /vagrant/application/forms/Config/General/LoggingConfigForm.php:73
+#: /vagrant/application/forms/Announcement/AnnouncementForm.php:35
+msgid "The message to display to users"
+msgstr ""
+
+#: /vagrant/application/forms/Config/General/LoggingConfigForm.php:75
 msgid "The name of the application by which to prefix syslog messages."
 msgstr ""
 "Der Anwendungsname, welcher Syslog-Nachrichten vorangestellt werden soll."
@@ -2390,11 +2573,11 @@ msgid "The name of the dashboard pane in which to display this dashlet"
 msgstr ""
 "Der Name des Dashboards, in welchem dieses Dashlet angezeigt werden soll."
 
-#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:119
+#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:118
 msgid "The name of the database to use"
 msgstr "Der Name der zu benutzenden Datenbank"
 
-#: /vagrant/application/forms/Security/RoleForm.php:109
+#: /vagrant/application/forms/Security/RoleForm.php:114
 msgid "The name of the role"
 msgstr "Der Name dieser Rolle"
 
@@ -2411,7 +2594,7 @@ msgid ""
 "from others."
 msgstr "Der eindeutige Name dieses Authentifizierungsproviders."
 
-#: /vagrant/application/forms/Navigation/NavigationConfigForm.php:584
+#: /vagrant/application/forms/Navigation/NavigationConfigForm.php:579
 msgid ""
 "The name of this navigation item that is used to differentiate it from others"
 msgstr "Der eindeutige dieses Navigationselementes"
@@ -2423,20 +2606,20 @@ msgid ""
 "others"
 msgstr "Der eindeutige Name dieses Benutzergruppenbackends"
 
-#: /vagrant/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php:123
+#: /vagrant/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php:125
 msgid "The object class used for storing groups on the LDAP server."
 msgstr ""
 "Die Objekt-Klasse welche benutzt wird, um Gruppen auf diesem LDAP-Server "
 "abzulegen"
 
+#: /vagrant/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php:218
 #: /vagrant/application/forms/Config/UserBackend/LdapBackendForm.php:140
-#: /vagrant/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php:216
 msgid "The object class used for storing users on the LDAP server."
 msgstr ""
 "Die Objekt-Klasse welche benutzt wird, um Benutzer auf diesem LDAP-Server "
 "abzulegen"
 
-#: /vagrant/application/forms/Navigation/NavigationConfigForm.php:670
+#: /vagrant/application/forms/Navigation/NavigationConfigForm.php:665
 msgid ""
 "The parent item to assign this navigation item to. Select \"None\" to make "
 "this a main navigation item"
@@ -2453,7 +2636,7 @@ msgstr ""
 "Der übergeordnete Menü, dem dieses Menü zugewiesen werden soll. Wählen Sie "
 "“Keines”, um dies zu einem Hauptmenüeintrag zu machen."
 
-#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:138
+#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:137
 msgid "The password to use for authentication"
 msgstr "Das Kennwort welches zur Authentifizierung benutzt werden soll"
 
@@ -2467,7 +2650,7 @@ msgstr ""
 "Der Pfad zu Ihrem Live-Status Socket, über welchen Monitoring-Daten "
 "abgefragt werden sollen"
 
-#: /vagrant/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php:192
+#: /vagrant/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php:194
 msgid ""
 "The path where groups can be found on the LDAP server. Leave empty to select "
 "all users available using the specified connection."
@@ -2476,8 +2659,8 @@ msgstr ""
 "lassen, um alle verfügbaren Benutzer für die angegebene Verbindung "
 "auszuwählen."
 
+#: /vagrant/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php:275
 #: /vagrant/application/forms/Config/UserBackend/LdapBackendForm.php:212
-#: /vagrant/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php:273
 msgid ""
 "The path where users can be found on the LDAP server. Leave empty to select "
 "all users available using the specified connection."
@@ -2490,7 +2673,7 @@ msgstr ""
 msgid "The pattern by which to identify columns."
 msgstr "Der reguläre Ausdruck, mit welchem Spalten identifiziert werden können"
 
-#: /vagrant/application/forms/Security/RoleForm.php:135
+#: /vagrant/application/forms/Security/RoleForm.php:140
 msgid "The permissions to grant. You may select more than one permission"
 msgstr ""
 "Die zu vergebenden Berechtigungen. Sie können mehrere gleichzeitig auswählen."
@@ -2500,7 +2683,7 @@ msgid "The port of the LDAP server to use for authentication"
 msgstr ""
 "Der Port des LDAP-Servers, der zur Authentifizierung genutzt werden soll."
 
-#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:106
+#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:105
 msgid "The port to use"
 msgstr "Der zu benutzende Port."
 
@@ -2513,7 +2696,7 @@ msgstr "Der private Schlüssel des Benutzers “%s” ist bereits hinterlegt."
 msgid "The private key which will be used for the SSH connections"
 msgstr "Der private Schlüssel, der für SSH-Verbindungen verwendet wird."
 
-#: /vagrant/application/controllers/ConfigController.php:398
+#: /vagrant/application/controllers/ConfigController.php:395
 #, php-format
 msgid ""
 "The resource \"%s\" is currently utilized for authentication by user backend "
@@ -2524,52 +2707,88 @@ msgstr ""
 "Benutzerbackend “%s” verwendet. Das Entfernen dieser Ressource kann dazu "
 "führen, dass kein Login mehr möglich ist."
 
+#: /vagrant/application/controllers/ConfigController.php:408
+#, fuzzy, php-format
+msgid ""
+"The resource \"%s\" is currently utilized to store user preferences. "
+"Removing the resource causes all current user preferences not being "
+"available any longer."
+msgstr ""
+"Die Ressource “%s” wird momentan für die Authentifizierung durch das "
+"Benutzerbackend “%s” verwendet. Das Entfernen dieser Ressource kann dazu "
+"führen, dass kein Login mehr möglich ist."
+
+#: /vagrant/application/forms/Config/General/LoggingConfigForm.php:115
+#, fuzzy
+msgid "The syslog facility to utilize."
+msgstr "Die zu benutzende Syslog-Facility"
+
 #: /vagrant/application/forms/Navigation/NavigationItemForm.php:39
 msgid "The target where to open this navigation item's url"
 msgstr "Das Target der URL dieses Navigationselementes"
 
-#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:87
+#: /vagrant/application/forms/Announcement/AnnouncementForm.php:44
+msgid "The time to display the announcement from"
+msgstr ""
+
+#: /vagrant/application/forms/Announcement/AnnouncementForm.php:53
+msgid "The time to display the announcement until"
+msgstr ""
+
+#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:202
+msgid "The trusted CA certificates in PEM format directory path"
+msgstr ""
+"Der Pfad zum Verzeichnis mit vertrauenswürdigen CA-Zertifikaten im PEM-Format"
+
+#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:86
 msgid "The type of SQL database"
 msgstr "Der Typ der SQL-Datenbank."
 
-#: /vagrant/application/forms/Config/General/LoggingConfigForm.php:38
+#: /vagrant/application/forms/Config/General/LoggingConfigForm.php:40
 msgid "The type of logging to utilize."
 msgstr "Der Typ des zu benutzenden Loggings."
 
-#: /vagrant/application/forms/Config/ResourceConfigForm.php:253
+#: /vagrant/application/forms/Config/ResourceConfigForm.php:271
 msgid "The type of resource"
 msgstr "Der Typ der Ressource"
 
-#: /vagrant/application/forms/Config/UserBackendConfigForm.php:297
+#: /vagrant/application/forms/Config/UserBackendConfigForm.php:291
 msgid "The type of the resource to use for this authenticaton provider"
 msgstr ""
 "Die Resource, die zum Authentifizieren mit diesem Provider genutzt werden "
 "soll"
 
-#: /vagrant/application/forms/Navigation/NavigationConfigForm.php:648
+#: /vagrant/application/forms/Navigation/NavigationConfigForm.php:643
 msgid "The type of this navigation item"
 msgstr "Der Typ dieses Navigationselementes"
 
-#: /vagrant/application/forms/Config/UserGroup/UserGroupBackendForm.php:181
+#: /vagrant/application/forms/Config/UserGroup/UserGroupBackendForm.php:174
 msgid "The type of this user group backend"
 msgstr "Der Typ dieses Authentifizierungsbackends für Benutzergruppen"
 
-#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:77
+#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:76
+#: /vagrant/application/forms/Config/Resource/SshResourceForm.php:37
 #: /vagrant/application/forms/Config/Resource/FileResourceForm.php:33
 #: /vagrant/application/forms/Config/Resource/LdapResourceForm.php:39
 #: /vagrant/application/forms/Config/Resource/LivestatusResourceForm.php:36
-#: /vagrant/application/forms/Config/Resource/SshResourceForm.php:37
 msgid "The unique name of this resource"
 msgstr "Der eindeutige Name dieser Ressource"
 
+#: /vagrant/library/Icinga/Web/Form/Validator/InternalUrlValidator.php:34
+msgid "The url must not be external."
+msgstr ""
+
 #: /vagrant/application/forms/Navigation/NavigationItemForm.php:56
 msgid ""
-"The url of this navigation item. Leave blank if only the name should be displayed. For urls with username and password and "
-"for all external urls, make sure to prepend an appropriate protocol identifier (e.g. http://example.tld)"
+"The url of this navigation item. Leave blank if only the name should be "
+"displayed. For urls with username and password and for all external urls, "
+"make sure to prepend an appropriate protocol identifier (e.g. http://example."
+"tld)"
 msgstr ""
-"Die URL dieses Navigationselementes. Dies kann leer gelassen werden, wenn nur der Name angezeigt werden soll. Stelle für URLs "
-"mit Benutzername und Passwort sowie alle externen URLs sicher, dass eine passender Protokollnamen voran gestellt ist (z.B. "
-"http://example.tld)"
+"Die URL dieses Navigationselementes. Dies kann leer gelassen werden, wenn "
+"nur der Name angezeigt werden soll. Stelle für URLs mit Benutzername und "
+"Passwort sowie alle externen URLs sicher, dass eine passender Protokollnamen "
+"voran gestellt ist (z.B. http://example.tld)"
 
 #: /vagrant/application/forms/Navigation/DashletForm.php:29
 msgid ""
@@ -2594,11 +2813,11 @@ msgstr ""
 "Der Benutzer DN, mit dem der LDAP-Server abgefragt werden soll. Leer lassen, "
 "um einen anonymen Zugriff zu versuchen."
 
-#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:128
+#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:127
 msgid "The user name to use for authentication"
 msgstr "Der für die Authentifizierung zu benutzende Benutzername."
 
-#: /vagrant/application/forms/PreferenceForm.php:170
+#: /vagrant/application/forms/PreferenceForm.php:180
 msgctxt "Form element label"
 msgid "Theme"
 msgstr "Theme"
@@ -2631,16 +2850,15 @@ msgstr ""
 "Dies ist ein untergeordnetes Element des Navigationselementes %1$s. Sie "
 "können die Freigabe nur aufheben, wenn Sie dies auch für %1$s tun."
 
-#: /vagrant/application/views/scripts/config/module.phtml:50
+#: /vagrant/application/views/scripts/config/module.phtml:60
 msgid "This module has no dependencies"
 msgstr "Dieses Modul hat keine Abhängigkeiten"
 
-#: /vagrant/library/Icinga/Application/Modules/Module.php:721
-#: /vagrant/library/Icinga/Application/Modules/ModuleInfo.php:13
+#: /vagrant/library/Icinga/Application/Modules/Module.php:726
 msgid "This module has no description"
 msgstr "Dieses Modul hat keine Beschreibung"
 
-#: /vagrant/application/forms/PreferenceForm.php:244
+#: /vagrant/application/forms/PreferenceForm.php:254
 msgid ""
 "This option allows you to enable or to disable the global page content auto "
 "refresh"
@@ -2648,30 +2866,22 @@ msgstr ""
 "Diese Option ermöglicht das De-/Aktivieren der globalen automatischen "
 "Aktualisierung der Seiteninhalte"
 
-#: /vagrant/application/forms/Navigation/NavigationConfigForm.php:603
+#: /vagrant/application/forms/Navigation/NavigationConfigForm.php:598
 msgid "Tick this box to share this item with others"
 msgstr ""
 "Markieren Sie dieses Kästchen, um dieses Element mit Anderen zu teilen."
 
-#: /vagrant/application/forms/Dashboard/PaneForm.php:34
-msgid "Title"
-msgstr "Titel"
-
-#: /vagrant/application/forms/Dashboard/PaneForm.php:33
-msgid "Title of the dashboard"
-msgstr "Titel für das Dashboard"
-
 #: /vagrant/application/forms/Config/Resource/SshResourceForm.php:91
 msgid "To modify the private key you must recreate this resource."
 msgstr ""
 "Um diesen privaten Schlüssel modifizieren zu können, müssen Sie diese "
 "Ressource neu anlegen."
 
-#: /vagrant/application/controllers/NavigationController.php:149
-#: /vagrant/application/controllers/NavigationController.php:199
-#: /vagrant/application/forms/Navigation/NavigationConfigForm.php:647
 #: /vagrant/application/views/scripts/navigation/index.phtml:30
 #: /vagrant/application/views/scripts/navigation/shared.phtml:20
+#: /vagrant/application/controllers/NavigationController.php:149
+#: /vagrant/application/controllers/NavigationController.php:199
+#: /vagrant/application/forms/Navigation/NavigationConfigForm.php:642
 msgid "Type"
 msgstr "Typ"
 
@@ -2679,7 +2889,7 @@ msgstr "Typ"
 msgid "UI Debug"
 msgstr "UI Debug"
 
-#: /vagrant/application/forms/Navigation/NavigationConfigForm.php:486
+#: /vagrant/application/forms/Navigation/NavigationConfigForm.php:481
 #, php-format
 msgid ""
 "Unable to delete navigation item \"%s\". There are other items dependent "
@@ -2688,7 +2898,7 @@ msgstr ""
 "Es ist nicht möglich, das Navigationselement “%s” zu löschen, da andere "
 "Elemente davon abhängen: %s"
 
-#: /vagrant/application/forms/Navigation/NavigationConfigForm.php:526
+#: /vagrant/application/forms/Navigation/NavigationConfigForm.php:521
 #, php-format
 msgid ""
 "Unable to unshare navigation item \"%s\". It is dependent from item \"%s\". "
@@ -2704,9 +2914,9 @@ msgstr ""
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: /vagrant/application/forms/Config/ResourceConfigForm.php:100
-#: /vagrant/application/forms/Config/ResourceConfigForm.php:124
-#: /vagrant/application/forms/Config/ResourceConfigForm.php:198
+#: /vagrant/application/forms/Config/ResourceConfigForm.php:108
+#: /vagrant/application/forms/Config/ResourceConfigForm.php:142
+#: /vagrant/application/forms/Config/ResourceConfigForm.php:216
 msgid "Unknown resource provided"
 msgstr "Unbekannte Ressource angegeben"
 
@@ -2718,20 +2928,26 @@ msgstr "Freigabe aufheben"
 msgid "Unshare this navigation item"
 msgstr "Freigabe dieses Navigationselementes aufheben"
 
-#: /vagrant/application/forms/Dashboard/PaneForm.php:21
-msgid "Update Dashboard"
-msgstr "Dashboard aktualisieren"
+#: /vagrant/application/forms/Account/ChangePasswordForm.php:29
+#, fuzzy
+msgid "Update Account"
+msgstr "Rolle aktualisieren"
+
+#: /vagrant/application/controllers/AnnouncementsController.php:61
+#, fuzzy
+msgid "Update Announcement"
+msgstr "Ressource aktualisieren"
 
 #: /vagrant/application/controllers/DashboardController.php:86
 #: /vagrant/application/controllers/DashboardController.php:92
 msgid "Update Dashlet"
 msgstr "Dashlet aktualisieren"
 
-#: /vagrant/application/controllers/NavigationController.php:304
+#: /vagrant/application/controllers/NavigationController.php:299
 msgid "Update Navigation Item"
 msgstr "Navigationselement aktualisieren"
 
-#: /vagrant/application/controllers/ConfigController.php:346
+#: /vagrant/application/controllers/ConfigController.php:343
 msgid "Update Resource"
 msgstr "Ressource aktualisieren"
 
@@ -2744,7 +2960,7 @@ msgstr "Rolle aktualisieren"
 msgid "Update User"
 msgstr "Benutzer aktualisieren"
 
-#: /vagrant/application/controllers/ConfigController.php:274
+#: /vagrant/application/controllers/ConfigController.php:271
 msgid "Update User Backend"
 msgstr "Backend für Benutzer aktualisieren"
 
@@ -2752,10 +2968,16 @@ msgstr "Backend für Benutzer aktualisieren"
 msgid "Update User Group"
 msgstr "Benutzergruppe aktualisieren"
 
-#: /vagrant/application/controllers/UsergroupbackendController.php:102
+#: /vagrant/application/controllers/UsergroupbackendController.php:97
 msgid "Update User Group Backend"
 msgstr "Backend für Benutzergruppe aktualisieren"
 
+#: /vagrant/application/controllers/NavigationController.php:133
+#: /vagrant/application/controllers/AccountController.php:27
+#, fuzzy
+msgid "Update your account"
+msgstr "Ressource aktualisieren"
+
 #: /vagrant/library/Icinga/Web/Form/Decorator/Autosubmit.php:99
 msgid ""
 "Upon any of this form's fields were changed, this page is being updated "
@@ -2771,22 +2993,26 @@ msgstr ""
 "Dieses Feld löst eine automatische Aktualisierung dieser Seite aus, wenn "
 "sein Inhalt geändert wird."
 
-#: /vagrant/application/forms/Dashboard/DashletForm.php:69
-#: /vagrant/application/forms/Navigation/DashletForm.php:27
-#: /vagrant/application/forms/Navigation/NavigationItemForm.php:54
 #: /vagrant/application/views/scripts/dashboard/settings.phtml:14
+#: /vagrant/application/forms/Dashboard/DashletForm.php:70
+#: /vagrant/application/forms/Navigation/NavigationItemForm.php:54
+#: /vagrant/application/forms/Navigation/DashletForm.php:27
 msgid "Url"
 msgstr "URL"
 
-#: /vagrant/application/forms/PreferenceForm.php:234
+#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:165
+msgid "Use SSL"
+msgstr "SSL verwenden"
+
+#: /vagrant/application/forms/PreferenceForm.php:244
 msgid "Use benchmark"
 msgstr "Benchmark verwenden"
 
-#: /vagrant/application/forms/PreferenceForm.php:198
+#: /vagrant/application/forms/PreferenceForm.php:208
 msgid "Use the following language to display texts and messages"
 msgstr "Die folgende Sprache verwenden, um Texte und Nachrichten anzuzeigen"
 
-#: /vagrant/application/forms/PreferenceForm.php:210
+#: /vagrant/application/forms/PreferenceForm.php:220
 msgid "Use the following timezone for dates and times"
 msgstr "Die folgende Zeitzone für Datums- und Zeitangaben verwenden."
 
@@ -2832,12 +3058,12 @@ msgstr "Backend für Benutzer"
 msgid "User Backends"
 msgstr "Backends für Benutzer"
 
+#: /vagrant/application/views/scripts/group/list.phtml:50
 #: /vagrant/application/controllers/GroupController.php:69
 #: /vagrant/application/controllers/UserController.php:101
-#: /vagrant/application/views/scripts/group/list.phtml:50
+#: /vagrant/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php:465
 #: /vagrant/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php:115
 #: /vagrant/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php:120
-#: /vagrant/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php:465
 msgid "User Group"
 msgstr "Benutzergruppe"
 
@@ -2863,23 +3089,23 @@ msgstr "Speicherart für die Benutzereinstellungen"
 msgid "User added successfully"
 msgstr "Benutzer erfolgreich hinzugefügt"
 
-#: /vagrant/application/controllers/ConfigController.php:271
+#: /vagrant/application/controllers/ConfigController.php:268
 #: /vagrant/application/forms/Config/UserBackendReorderForm.php:70
 #, php-format
 msgid "User backend \"%s\" not found"
 msgstr "Benutzerbackend “%s” wurde nicht gefunden"
 
-#: /vagrant/application/controllers/ConfigController.php:298
+#: /vagrant/application/controllers/ConfigController.php:295
 #, php-format
 msgid "User backend \"%s\" successfully removed"
 msgstr "Benutzerbackend “%s” erfolgreich entfernt"
 
-#: /vagrant/application/controllers/ConfigController.php:259
+#: /vagrant/application/controllers/ConfigController.php:256
 #, php-format
 msgid "User backend \"%s\" successfully updated"
 msgstr "Benutzerbackend “%s” erfolgreich aktualisiert"
 
-#: /vagrant/application/controllers/ConfigController.php:223
+#: /vagrant/application/controllers/ConfigController.php:225
 msgid "User backend successfully created"
 msgstr "Benutzerbackend erfolgreich angelegt"
 
@@ -2888,18 +3114,18 @@ msgstr "Benutzerbackend erfolgreich angelegt"
 msgid "User group backend \"%s\" is not %s"
 msgstr "Benutzerbackend “%s” ist nicht %s"
 
-#: /vagrant/application/controllers/UsergroupbackendController.php:99
+#: /vagrant/application/controllers/UsergroupbackendController.php:94
 #: /vagrant/library/Icinga/Web/Controller/AuthBackendController.php:120
 #, php-format
 msgid "User group backend \"%s\" not found"
 msgstr "Benutzergruppenbackend “%s” wurde nicht gefunden"
 
-#: /vagrant/application/controllers/UsergroupbackendController.php:125
+#: /vagrant/application/controllers/UsergroupbackendController.php:120
 #, php-format
 msgid "User group backend \"%s\" successfully removed"
 msgstr "Benutzergruppenbackend “%s” erfolgreich entfernt"
 
-#: /vagrant/application/controllers/UsergroupbackendController.php:88
+#: /vagrant/application/controllers/UsergroupbackendController.php:83
 #, php-format
 msgid "User group backend \"%s\" successfully updated"
 msgstr "Benutzergruppenbackend “%s” erfolgreich aktualisiert"
@@ -2921,29 +3147,29 @@ msgstr ""
 msgid "Usergroups"
 msgstr "Benutzergruppen"
 
+#: /vagrant/application/views/scripts/user/list.phtml:51
+#: /vagrant/application/views/scripts/group/show.phtml:75
 #: /vagrant/application/controllers/GroupController.php:105
 #: /vagrant/application/controllers/UserController.php:69
-#: /vagrant/application/forms/Authentication/LoginForm.php:43
-#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:127
+#: /vagrant/application/forms/Authentication/LoginForm.php:44
 #: /vagrant/application/forms/Config/User/UserForm.php:33
-#: /vagrant/application/views/scripts/group/show.phtml:75
-#: /vagrant/application/views/scripts/user/list.phtml:51
+#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:126
+#: /vagrant/library/Icinga/Authentication/User/LdapUserBackend.php:255
 #: /vagrant/library/Icinga/Authentication/User/DbUserBackend.php:115
 #: /vagrant/library/Icinga/Authentication/User/DbUserBackend.php:118
-#: /vagrant/library/Icinga/Authentication/User/LdapUserBackend.php:255
+#: /vagrant/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php:464
 #: /vagrant/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php:114
 #: /vagrant/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php:118
-#: /vagrant/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php:464
 msgid "Username"
 msgstr "Benutzername"
 
+#: /vagrant/application/views/scripts/role/list.phtml:23
 #: /vagrant/application/controllers/GroupController.php:356
 #: /vagrant/application/controllers/RoleController.php:165
 #: /vagrant/application/controllers/UserController.php:322
+#: /vagrant/application/forms/Security/RoleForm.php:122
+#: /vagrant/application/forms/Navigation/NavigationConfigForm.php:608
 #: /vagrant/application/forms/Config/UserGroup/AddMemberForm.php:118
-#: /vagrant/application/forms/Navigation/NavigationConfigForm.php:613
-#: /vagrant/application/forms/Security/RoleForm.php:117
-#: /vagrant/application/views/scripts/role/list.phtml:23
 #: /vagrant/library/Icinga/Web/Menu.php:289
 msgid "Users"
 msgstr "Benutzer"
@@ -2953,28 +3179,28 @@ msgctxt "Form element label"
 msgid "Users Can't Change Theme"
 msgstr "Theme Benutzeranpassung verbieten"
 
-#: /vagrant/application/forms/Config/ResourceConfigForm.php:348
-#: /vagrant/application/forms/Config/UserBackendConfigForm.php:453
+#: /vagrant/application/forms/Config/ResourceConfigForm.php:366
+#: /vagrant/application/forms/Config/UserBackendConfigForm.php:447
 msgid "Validate Configuration"
 msgstr "Konfiguration validieren"
 
-#: /vagrant/application/forms/Config/ResourceConfigForm.php:349
-#: /vagrant/application/forms/Config/UserBackendConfigForm.php:454
+#: /vagrant/application/forms/Config/ResourceConfigForm.php:367
+#: /vagrant/application/forms/Config/UserBackendConfigForm.php:448
 msgid "Validation In Progress"
 msgstr "Wird überprüft"
 
-#: /vagrant/application/forms/Config/ResourceConfigForm.php:306
-#: /vagrant/application/forms/Config/UserBackendConfigForm.php:411
+#: /vagrant/application/forms/Config/ResourceConfigForm.php:324
+#: /vagrant/application/forms/Config/UserBackendConfigForm.php:405
 msgid "Validation Log"
 msgstr "Validierungslog"
 
-#: /vagrant/application/views/scripts/about/index.phtml:14
-#: /vagrant/application/views/scripts/about/index.phtml:115
+#: /vagrant/application/views/scripts/about/index.phtml:8
+#: /vagrant/application/views/scripts/about/index.phtml:109
 #: /vagrant/application/views/scripts/config/module.phtml:39
 msgid "Version"
 msgstr "Version"
 
-#: /vagrant/application/forms/Config/General/LoggingConfigForm.php:57
+#: /vagrant/application/forms/Config/General/LoggingConfigForm.php:59
 msgctxt "app.config.logging.level"
 msgid "Warning"
 msgstr "Warnung"
@@ -3002,6 +3228,11 @@ msgstr ""
 "Verschlüsselung der Kommunikation. Wählen Sie STARTTLS oder LDAPS für "
 "verschlüsselte Kommunikation oder “Keine” für unverschlüsselte Kommunikation."
 
+#: /vagrant/application/forms/Config/Resource/DbResourceForm.php:167
+msgid "Whether to encrypt the connection or to authenticate using certificates"
+msgstr ""
+"Die Verbindung verschlüsseln oder mittels Zertifikaten authentifizieren"
+
 #: /vagrant/application/views/scripts/joystickPagination.phtml:70
 #: /vagrant/application/views/scripts/joystickPagination.phtml:96
 msgctxt "pagination.joystick"
@@ -3014,9 +3245,10 @@ msgctxt "pagination.joystick"
 msgid "Y-Axis"
 msgstr "Y-Achse"
 
+#: /vagrant/application/views/scripts/navigation/index.phtml:57
+#: /vagrant/application/forms/Announcement/AnnouncementForm.php:77
 #: /vagrant/application/forms/Config/User/UserForm.php:116
 #: /vagrant/application/forms/Config/UserGroup/UserGroupForm.php:66
-#: /vagrant/application/views/scripts/navigation/index.phtml:57
 msgid "Yes"
 msgstr "Ja"
 
@@ -3036,7 +3268,7 @@ msgstr ""
 "Sie müssen zuerst mindestens ein Benutzergruppenbackend anlegen, um neue "
 "Mitgliedschaften definieren zu können."
 
-#: /vagrant/application/forms/Authentication/LoginForm.php:138
+#: /vagrant/application/forms/Authentication/LoginForm.php:139
 msgid ""
 "You're currently not authenticated using any of the web server's "
 "authentication mechanisms. Make sure you'll configure such, otherwise you'll "
@@ -3046,14 +3278,21 @@ msgstr ""
 "konfigurieren Sie eine Authentifizierung über Ihren Webserver, sonst werden "
 "Sie sich nicht in Icinga Web 2 anmelden können."
 
-#: /vagrant/application/forms/PreferenceForm.php:197
+#: /vagrant/application/forms/PreferenceForm.php:207
 msgid "Your Current Language"
 msgstr "Ihre aktuelle Sprache"
 
-#: /vagrant/application/forms/PreferenceForm.php:209
+#: /vagrant/application/forms/PreferenceForm.php:219
 msgid "Your Current Timezone"
 msgstr "Ihre aktuelle Zeitzone"
 
+#: /vagrant/application/forms/PreferenceForm.php:162
+msgid ""
+"Your language setting is not applied because your platform is missing the "
+"corresponding locale. Make sure to install the correct language pack and "
+"restart your web server afterwards."
+msgstr ""
+
 #: /vagrant/library/Icinga/Date/DateFormatter.php:176
 #, php-format
 msgctxt "An event happened at the given time"
@@ -3066,7 +3305,7 @@ msgctxt "An event will happen at the given time"
 msgid "at %s"
 msgstr "in %s"
 
-#: /vagrant/application/forms/PreferenceForm.php:164
+#: /vagrant/application/forms/PreferenceForm.php:174
 #: /vagrant/application/forms/Config/General/ThemingConfigForm.php:34
 msgid "default"
 msgstr "standard"
@@ -3129,6 +3368,24 @@ msgstr "seit %s"
 msgid "toggle"
 msgstr "umschalten"
 
+#~ msgid "Adjust the preferences of Icinga Web 2 according to your needs"
+#~ msgstr "Anpassung von Icinga Web 2 an individuelle Bedürfnisse"
+
+#~ msgid "Disable the dashboard"
+#~ msgstr "Dashboard deaktivieren"
+
+#~ msgid "Disabled"
+#~ msgstr "Deaktiviert"
+
+#~ msgid "Title"
+#~ msgstr "Titel"
+
+#~ msgid "Title of the dashboard"
+#~ msgstr "Titel für das Dashboard"
+
+#~ msgid "Update Dashboard"
+#~ msgstr "Dashboard aktualisieren"
+
 #~ msgid "Add New Pane Or Dashlet"
 #~ msgstr "Neues Dashboard"
 
@@ -3136,9 +3393,6 @@ msgstr "umschalten"
 #~ msgid "Ascending"
 #~ msgstr "Aufsteigend [ Sortierreihenfolge ]"
 
-#~ msgid "Authorization"
-#~ msgstr "Autorisierung"
-
 #~ msgid "Configure how users are associated with groups by Icinga Web 2"
 #~ msgstr ""
 #~ "Konfiguration der Verknüpfung von Nutzern und Gruppen durch Icinga Web 2"
@@ -3246,9 +3500,6 @@ msgstr "umschalten"
 #~ msgid "Expression"
 #~ msgstr "Ausdruck"
 
-#~ msgid "Facility"
-#~ msgstr "Facility"
-
 #~ msgid "Location of your icinga objects.cache file"
 #~ msgstr "Pfad zur Datei objects.cache von Icinga"
 
@@ -3277,9 +3528,6 @@ msgstr "umschalten"
 #~ "Die zu benutzende Standard-Sprache. Kann von Benutzern in deren "
 #~ "Einstellungen überschrieben werden."
 
-#~ msgid "The Syslog facility to utilize."
-#~ msgstr "Die zu benutzende Syslog-Facility"
-
 #~ msgid "The path where users can be found on the ldap server"
 #~ msgstr ""
 #~ "Der Pfad unter welchem Benutzer auf diesem LDAP-Server gefunden werden "
diff --git a/modules/monitoring/application/locale/de_DE/LC_MESSAGES/monitoring.mo b/modules/monitoring/application/locale/de_DE/LC_MESSAGES/monitoring.mo
index 8a508762f..4becdf0e2 100644
Binary files a/modules/monitoring/application/locale/de_DE/LC_MESSAGES/monitoring.mo and b/modules/monitoring/application/locale/de_DE/LC_MESSAGES/monitoring.mo differ
diff --git a/modules/monitoring/application/locale/de_DE/LC_MESSAGES/monitoring.po b/modules/monitoring/application/locale/de_DE/LC_MESSAGES/monitoring.po
index adfad0abe..d1e67b9a1 100644
--- a/modules/monitoring/application/locale/de_DE/LC_MESSAGES/monitoring.po
+++ b/modules/monitoring/application/locale/de_DE/LC_MESSAGES/monitoring.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Monitoring Module (2.1.2)\n"
+"Project-Id-Version: Monitoring Module (2.3.4)\n"
 "Report-Msgid-Bugs-To: dev@icinga.org\n"
-"POT-Creation-Date: 2016-02-29 14:40+0000\n"
-"PO-Revision-Date: 2016-12-07 17:02+0100\n"
+"POT-Creation-Date: 2016-12-08 17:04+0000\n"
+"PO-Revision-Date: 2016-12-08 18:14+0100\n"
 "Last-Translator: Thomas Gelf <thomas@gelf.net>\n"
 "Language: de_DE\n"
 "MIME-Version: 1.0\n"
@@ -18,75 +18,17 @@ msgstr ""
 "Language-Team: \n"
 "X-Generator: Poedit 1.8.11\n"
 
-#: /vagrant/modules/monitoring/application/controllers/ChartController.php:375
-msgid " Down Hosts (Handled)"
-msgstr "Hosts Down (bestätigt)"
-
-#: /vagrant/modules/monitoring/application/controllers/ChartController.php:376
-msgid " Down Hosts (Unhandled)"
-msgstr "Hosts Down (unbestätigt)"
-
-#: /vagrant/modules/monitoring/application/controllers/ChartController.php:343
-#: /vagrant/modules/monitoring/application/controllers/ChartController.php:397
-msgid " Down Services (Handled)"
-msgstr "Services Down (bestätigt)"
-
-#: /vagrant/modules/monitoring/application/controllers/ChartController.php:344
-#: /vagrant/modules/monitoring/application/controllers/ChartController.php:398
-msgid " Down Services (Unhandled)"
-msgstr "Services Down (Unbestätigt)"
-
-#: /vagrant/modules/monitoring/application/controllers/ChartController.php:379
-msgid " Pending Hosts"
-msgstr "Ungeprüfte Hosts"
-
-#: /vagrant/modules/monitoring/application/controllers/ChartController.php:347
-#: /vagrant/modules/monitoring/application/controllers/ChartController.php:401
-msgid " Pending Services"
-msgstr "Ungeprüfte Services"
-
-#: /vagrant/modules/monitoring/application/controllers/ChartController.php:377
-msgid " Unreachable Hosts (Handled)"
-msgstr "Nicht erreichbare Hosts (bestätigt)"
-
-#: /vagrant/modules/monitoring/application/controllers/ChartController.php:378
-msgid " Unreachable Hosts (Unhandled)"
-msgstr "Nicht erreichbare Hosts (unbestätigt)"
-
-#: /vagrant/modules/monitoring/application/controllers/ChartController.php:345
-#: /vagrant/modules/monitoring/application/controllers/ChartController.php:399
-msgid " Unreachable Services (Handled)"
-msgstr "Nicht erreichbare Services (bestätigt)"
-
-#: /vagrant/modules/monitoring/application/controllers/ChartController.php:346
-#: /vagrant/modules/monitoring/application/controllers/ChartController.php:400
-msgid " Unreachable Services (Unhandled)"
-msgstr "Nicht erreichbare Services (unbestätigt)"
-
-#: /vagrant/modules/monitoring/application/controllers/ChartController.php:374
-msgid " Up Hosts"
-msgstr "Hosts UP"
-
-#: /vagrant/modules/monitoring/application/controllers/ChartController.php:394
-msgid " Up Services"
-msgstr "Services UP"
-
-#: /vagrant/modules/monitoring/application/controllers/ChartController.php:341
-#: /vagrant/modules/monitoring/application/controllers/ChartController.php:395
-msgid " Warning Services (Handled)"
-msgstr "Service-Warnungen (bestätigt)"
-
-#: /vagrant/modules/monitoring/application/controllers/ChartController.php:342
-#: /vagrant/modules/monitoring/application/controllers/ChartController.php:396
-msgid " Warning Services (Unhandled)"
-msgstr "Service-Warnungen (unbestätigt)"
-
 #: /vagrant/modules/monitoring/application/views/scripts/health/info.phtml:65
 #, php-format
 msgctxt "Last format parameter represents the time running"
 msgid "%1$s has been up and running with PID %2$d %3$s"
 msgstr "%1$s läuft mit PID %2$d %3$s"
 
+#: /vagrant/modules/monitoring/application/views/scripts/partials/event-history.phtml:35
+msgctxt "date.verbose"
+msgid "%A, %B %e, %Y"
+msgstr "%A, %e. %B %Y"
+
 #: /vagrant/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:75
 #, php-format
 msgid "%d Active"
@@ -110,17 +52,17 @@ msgid_plural "%d Passive"
 msgstr[0] "%d Passiv"
 msgstr[1] "%d Passive"
 
-#: /vagrant/modules/monitoring/application/views/scripts/list/eventgrid.phtml:42
+#: /vagrant/modules/monitoring/application/views/scripts/list/eventgrid.phtml:38
 #, php-format
 msgid "%d hosts down on %s"
 msgstr "%d Hosts down auf %s"
 
-#: /vagrant/modules/monitoring/application/views/scripts/list/eventgrid.phtml:20
+#: /vagrant/modules/monitoring/application/views/scripts/list/eventgrid.phtml:16
 #, php-format
 msgid "%d hosts ok on %s"
 msgstr "%d Hosts OK auf %s"
 
-#: /vagrant/modules/monitoring/application/views/scripts/list/eventgrid.phtml:25
+#: /vagrant/modules/monitoring/application/views/scripts/list/eventgrid.phtml:21
 #, php-format
 msgid "%d hosts unreachable on %s"
 msgstr "%d nicht erreichbare Hosts auf %s"
@@ -143,27 +85,27 @@ msgid_plural "%d scheduled downtimes"
 msgstr[0] "%d geplante Downtime"
 msgstr[1] "%d geplante Downtimes"
 
-#: /vagrant/modules/monitoring/application/views/scripts/list/eventgrid.phtml:30
+#: /vagrant/modules/monitoring/application/views/scripts/list/eventgrid.phtml:26
 #, php-format
 msgid "%d services critical on %s"
 msgstr "%d Services KRITISCH auf %s"
 
-#: /vagrant/modules/monitoring/application/views/scripts/list/eventgrid.phtml:52
+#: /vagrant/modules/monitoring/application/views/scripts/list/eventgrid.phtml:48
 #, php-format
 msgid "%d services ok on %s"
 msgstr "%d Services OK auf %s"
 
-#: /vagrant/modules/monitoring/application/views/scripts/list/eventgrid.phtml:47
+#: /vagrant/modules/monitoring/application/views/scripts/list/eventgrid.phtml:43
 #, php-format
 msgid "%d services unknown on %s"
 msgstr "%d Services UNBEKANNT auf %s"
 
-#: /vagrant/modules/monitoring/application/views/scripts/list/eventgrid.phtml:36
+#: /vagrant/modules/monitoring/application/views/scripts/list/eventgrid.phtml:32
 #, php-format
 msgid "%d services warning on %s"
 msgstr "%d Services WARNING auf %s"
 
-#: /vagrant/modules/monitoring/configuration.php:132
+#: /vagrant/modules/monitoring/configuration.php:136
 #, php-format
 msgid "%d unhandled hosts down"
 msgstr "%d unbestätigte Hosts DOWN"
@@ -174,7 +116,7 @@ msgstr "%d unbestätigte Hosts DOWN"
 msgid "%d unhandled problems"
 msgstr "%d unbestätigte Probleme"
 
-#: /vagrant/modules/monitoring/configuration.php:144
+#: /vagrant/modules/monitoring/configuration.php:148
 #, php-format
 msgid "%d unhandled services critical"
 msgstr "%d unbestätigte Services KRITISCH"
@@ -307,7 +249,7 @@ msgid_plural "%u are passively checked"
 msgstr[0] "%u wird passiv überwacht"
 msgstr[1] "%u werden passiv überwacht"
 
-#: /vagrant/modules/monitoring/application/views/scripts/list/hosts.phtml:64
+#: /vagrant/modules/monitoring/application/views/scripts/list/hosts.phtml:60
 #, php-format
 msgid "%u unhandled service"
 msgid_plural "%u unhandled services"
@@ -330,7 +272,7 @@ msgstr "2 Jahre"
 msgid "3 Months"
 msgstr "3 Monate"
 
-#: /vagrant/modules/monitoring/application/controllers/TimelineController.php:103
+#: /vagrant/modules/monitoring/application/controllers/TimelineController.php:102
 msgid "4 Hours"
 msgstr "4 Stunden"
 
@@ -350,15 +292,7 @@ msgstr "<b>{title}:</b> {value}m max. Reaktionszeit"
 msgid "<b>{title}:</b> {value}m min. reaction time"
 msgstr "<b>{title}:</b> {value}m min. Reaktionszeit"
 
-#: /vagrant/modules/monitoring/application/controllers/ChartController.php:289
-msgid "<b>{title}:</b><br> {value} of {sum} hosts are {label}"
-msgstr "<b>{title}:</b><br> {value} von {sum} Hosts sind {label}"
-
-#: /vagrant/modules/monitoring/application/controllers/ChartController.php:240
-msgid "<b>{title}:</b><br>{value} of {sum} services are {label}"
-msgstr "<b>{title}:</b><br>{value} von {sum} Servicesn sind {label}"
-
-#: /vagrant/modules/monitoring/application/forms/Config/TransportConfigForm.php:129
+#: /vagrant/modules/monitoring/application/forms/Config/TransportConfigForm.php:133
 #, php-format
 msgid "A command transport with the name \"%s\" does already exist"
 msgstr "Eine Befehlsschnittstelle mit dem Namen “%s” existiert bereits"
@@ -369,6 +303,12 @@ msgid ""
 msgstr ""
 "Ein Kommentar, wie vom Autor eingegeben, verknüpft mit der geplanten Downtime"
 
+#: /vagrant/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:74
+#: /vagrant/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:212
+#, fuzzy
+msgid "A downtime must not be in the past"
+msgstr "Zu diesem Filter wurden keine Downtimes gefunden"
+
 #: /vagrant/modules/monitoring/application/forms/Config/BackendConfigForm.php:113
 #, php-format
 msgid "A monitoring backend with the name \"%s\" does already exist"
@@ -379,17 +319,29 @@ msgstr "Ein Monitoringbackend mit dem Namen “%s” existiert bereits"
 msgid "A notification has been sent for this issue %s."
 msgstr "Eine Benachrichtigung für dieses Problem wurde %s gesendet"
 
-#: /vagrant/modules/monitoring/application/views/scripts/partials/event-history.phtml:63
+#: /vagrant/modules/monitoring/application/views/scripts/partials/event-history.phtml:72
 msgid "ACKNOWLEDGED"
 msgstr ""
 
-#: /vagrant/modules/monitoring/application/views/scripts/partials/event-history.phtml:68
+#: /vagrant/modules/monitoring/application/views/scripts/partials/event-history.phtml:78
 msgid "ACKNOWLEDGEMENT REMOVED"
 msgstr ""
 
+#: /vagrant/modules/monitoring/application/forms/Config/Transport/ApiTransportForm.php:62
+#, fuzzy
+msgid "API Password"
+msgstr "Passwort"
+
+#: /vagrant/modules/monitoring/application/forms/Config/Transport/ApiTransportForm.php:50
+#, fuzzy
+msgid "API Username"
+msgstr "Benutzername"
+
+#: /vagrant/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml:77
+#: /vagrant/modules/monitoring/application/views/scripts/partials/object/quick-actions.phtml:15
+#: /vagrant/modules/monitoring/application/views/scripts/partials/object/quick-actions.phtml:29
 #: /vagrant/modules/monitoring/application/views/scripts/hosts/show.phtml:30
 #: /vagrant/modules/monitoring/application/views/scripts/services/show.phtml:29
-#: /vagrant/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml:77
 msgid "Acknowledge"
 msgstr "Bestätigen"
 
@@ -397,7 +349,7 @@ msgstr "Bestätigen"
 msgid "Acknowledge Host Problem"
 msgstr "Hostproblem bestätigen"
 
-#: /vagrant/modules/monitoring/application/controllers/HostsController.php:174
+#: /vagrant/modules/monitoring/application/controllers/HostsController.php:175
 msgid "Acknowledge Host Problems"
 msgstr "Hostprobleme bestätigen"
 
@@ -405,17 +357,19 @@ msgstr "Hostprobleme bestätigen"
 msgid "Acknowledge Service Problem"
 msgstr "Serviceproblem bestätigen"
 
-#: /vagrant/modules/monitoring/application/controllers/ServicesController.php:177
+#: /vagrant/modules/monitoring/application/controllers/ServicesController.php:178
 msgid "Acknowledge Service Problems"
 msgstr "Serviceprobleme bestätigen"
 
-#: /vagrant/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:34
+#: /vagrant/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:35
 msgid "Acknowledge problem"
 msgid_plural "Acknowledge problems"
 msgstr[0] "Problem bestätigen"
 msgstr[1] "Probleme bestätigen"
 
 #: /vagrant/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml:85
+#: /vagrant/modules/monitoring/application/views/scripts/partials/object/quick-actions.phtml:23
+#: /vagrant/modules/monitoring/application/views/scripts/partials/object/quick-actions.phtml:37
 msgid ""
 "Acknowledge this problem, suppress all future notifications for it and tag "
 "it as being handled"
@@ -423,14 +377,18 @@ msgstr ""
 "Problem bestätigen, alle zukünftigen Benachrichtigungen unterdrücken und als "
 "“in Arbeit” markieren"
 
-#: /vagrant/modules/monitoring/application/views/helpers/HostFlags.php:16
-#: /vagrant/modules/monitoring/application/views/helpers/ServiceFlags.php:12
-#: /vagrant/modules/monitoring/application/views/scripts/partials/host/statusicons.phtml:9
-#: /vagrant/modules/monitoring/application/views/scripts/partials/service/statusicons.phtml:9
+#: /vagrant/modules/monitoring/application/views/helpers/HostFlags.php:13
+#: /vagrant/modules/monitoring/application/views/helpers/ServiceFlags.php:13
 #: /vagrant/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml:15
 msgid "Acknowledged"
 msgstr "Bestätigt"
 
+#: /vagrant/modules/monitoring/application/views/scripts/partials/event-history.phtml:71
+#, fuzzy
+msgctxt "tooltip"
+msgid "Acknowledged"
+msgstr "Bestätigt"
+
 #: /vagrant/modules/monitoring/configuration.php:331
 msgid "Acknowledged Problem Hosts"
 msgstr "Bestätigte Host-Probleme"
@@ -452,6 +410,12 @@ msgstr ""
 "Bestätigungen bleiben erhalten, bis %1$s sich erholt, sogar wenn %1$s den "
 "Zustand wechselt"
 
+#: /vagrant/modules/monitoring/application/views/scripts/partials/event-history.phtml:77
+#, fuzzy
+msgctxt "tooltip"
+msgid "Acknowledgement removed"
+msgstr "Bestätigung"
+
 #: /vagrant/modules/monitoring/application/controllers/TimelineController.php:65
 msgid "Acknowledgements"
 msgstr "Bestätigungen"
@@ -460,7 +424,7 @@ msgstr "Bestätigungen"
 msgid "Acknowledgements Active For At Least Three Days"
 msgstr "Bestätigungen älter als drei Tage"
 
-#: /vagrant/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:157
+#: /vagrant/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:162
 msgid "Acknowledging problem.."
 msgid_plural "Acknowledging problems.."
 msgstr[0] "Bestätige Problem.."
@@ -470,10 +434,8 @@ msgstr[1] "Bestätige Probleme.."
 msgid "Actions"
 msgstr "Aktionen"
 
-#: /vagrant/modules/monitoring/application/views/helpers/HostFlags.php:29
-#: /vagrant/modules/monitoring/application/views/helpers/ServiceFlags.php:25
-#: /vagrant/modules/monitoring/application/views/scripts/partials/host/statusicons.phtml:24
-#: /vagrant/modules/monitoring/application/views/scripts/partials/service/statusicons.phtml:24
+#: /vagrant/modules/monitoring/application/views/helpers/HostFlags.php:26
+#: /vagrant/modules/monitoring/application/views/helpers/ServiceFlags.php:26
 msgid "Active And Passive Checks Disabled"
 msgstr "Aktive und passive Checks deaktiviert"
 
@@ -481,10 +443,8 @@ msgstr "Aktive und passive Checks deaktiviert"
 msgid "Active Checks"
 msgstr "Aktive Checks"
 
-#: /vagrant/modules/monitoring/application/views/helpers/HostFlags.php:31
-#: /vagrant/modules/monitoring/application/views/helpers/ServiceFlags.php:27
-#: /vagrant/modules/monitoring/application/views/scripts/partials/host/statusicons.phtml:22
-#: /vagrant/modules/monitoring/application/views/scripts/partials/service/statusicons.phtml:22
+#: /vagrant/modules/monitoring/application/views/helpers/HostFlags.php:28
+#: /vagrant/modules/monitoring/application/views/helpers/ServiceFlags.php:28
 msgid "Active Checks Disabled"
 msgstr "Aktive Checks deaktiviert"
 
@@ -492,11 +452,11 @@ msgstr "Aktive Checks deaktiviert"
 msgid "Active Endpoint"
 msgstr "Aktiver Endpunkt"
 
-#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:87
+#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:90
 msgid "Active Host Checks"
 msgstr "Aktive Hostchecks"
 
-#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:96
+#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:99
 msgid "Active Service Checks"
 msgstr "Aktive Servicechecks"
 
@@ -516,7 +476,7 @@ msgstr "Tatsächliche Startzeit"
 msgid "Add Host Comment"
 msgstr "Kommentar zu Host hinzufügen"
 
-#: /vagrant/modules/monitoring/application/controllers/HostsController.php:162
+#: /vagrant/modules/monitoring/application/controllers/HostsController.php:163
 msgid "Add Host Comments"
 msgstr "Kommentare zu Host hinzufügen"
 
@@ -524,21 +484,23 @@ msgstr "Kommentare zu Host hinzufügen"
 msgid "Add Service Comment"
 msgstr "Kommentar zu Service hinzufügen"
 
-#: /vagrant/modules/monitoring/application/controllers/ServicesController.php:165
+#: /vagrant/modules/monitoring/application/controllers/ServicesController.php:166
 msgid "Add Service Comments"
 msgstr "Kommentare zu Service hinzufügen"
 
 #: /vagrant/modules/monitoring/application/views/scripts/show/components/comments.phtml:14
+#: /vagrant/modules/monitoring/application/views/scripts/partials/object/quick-actions.phtml:58
 msgid "Add a new comment to this host"
 msgstr "Neuen Kommentar für diesen Host hinzufügen"
 
 #: /vagrant/modules/monitoring/application/views/scripts/show/components/comments.phtml:26
+#: /vagrant/modules/monitoring/application/views/scripts/partials/object/quick-actions.phtml:70
 msgid "Add a new comment to this service"
 msgstr "Neuen Kommentar für diesen Service hinzufügen"
 
-#: /vagrant/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:28
 #: /vagrant/modules/monitoring/application/views/scripts/show/components/comments.phtml:7
 #: /vagrant/modules/monitoring/application/views/scripts/show/components/comments.phtml:19
+#: /vagrant/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:29
 msgid "Add comment"
 msgid_plural "Add comments"
 msgstr[0] "Kommentar hinzufügen"
@@ -549,17 +511,16 @@ msgstr[1] "Kommentare hinzufügen"
 msgid "Add comments"
 msgstr "Kommentare hinzufügen"
 
-#: /vagrant/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:85
+#: /vagrant/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:86
 msgid "Adding comment.."
 msgid_plural "Adding comments.."
 msgstr[0] "Füge Kommentar hinzu.."
 msgstr[1] "Füge Kommentare hinzu.."
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:96
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:90
 msgid "Address"
 msgstr "Adresse"
 
-#: /vagrant/modules/monitoring/configuration.php:237
 #: /vagrant/modules/monitoring/application/controllers/AlertsummaryController.php:54
 #: /vagrant/modules/monitoring/application/controllers/AlertsummaryController.php:58
 msgid "Alert Summary"
@@ -569,8 +530,14 @@ msgstr "Alarmübersicht"
 msgid "Alert summary"
 msgstr "Alarmübersicht"
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:297
-#: /vagrant/modules/monitoring/application/views/scripts/list/contactgroups.phtml:26
+#: /vagrant/modules/monitoring/application/views/scripts/list/contactgroups.phtml:24
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:327
+msgid "Alias"
+msgstr "Alias"
+
+#: /vagrant/modules/monitoring/application/views/scripts/partials/object/host-header.phtml:24
+#, fuzzy
+msgctxt "host"
 msgid "Alias"
 msgstr "Alias"
 
@@ -580,8 +547,8 @@ msgstr "Alias"
 msgid "All Hosts Enabled"
 msgstr "Alle Hosts aktiviert"
 
-#: /vagrant/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php:26
-#: /vagrant/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:31
+#: /vagrant/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:32
+#: /vagrant/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php:29
 msgid "All Services"
 msgstr "Alle Services"
 
@@ -708,9 +675,9 @@ msgstr ""
 msgid "Apply"
 msgstr "Anwenden"
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:230
 #: /vagrant/modules/monitoring/application/views/scripts/comment/show.phtml:42
 #: /vagrant/modules/monitoring/application/views/scripts/downtime/show.phtml:39
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:250
 msgid "Author"
 msgstr "Autor"
 
@@ -727,33 +694,41 @@ msgstr "ø (min)"
 msgid "Backend %s is not running"
 msgstr "Backend %s läuft nicht"
 
-#: /vagrant/modules/monitoring/application/forms/Config/BackendConfigForm.php:193
 #: /vagrant/modules/monitoring/application/forms/Setup/BackendPage.php:28
+#: /vagrant/modules/monitoring/application/forms/Config/BackendConfigForm.php:187
 msgid "Backend Name"
 msgstr "Backendname"
 
-#: /vagrant/modules/monitoring/application/forms/Config/BackendConfigForm.php:221
 #: /vagrant/modules/monitoring/application/forms/Setup/BackendPage.php:44
+#: /vagrant/modules/monitoring/application/forms/Config/BackendConfigForm.php:215
 msgid "Backend Type"
 msgstr "Backendtyp"
 
-#: /vagrant/modules/monitoring/configuration.php:90
+#: /vagrant/modules/monitoring/configuration.php:94
 msgid "Backends"
 msgstr "Backends"
 
-#: /vagrant/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:67
+#: /vagrant/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:73
 msgid "Broadcast"
 msgstr "Broadcast"
 
-#: /vagrant/modules/monitoring/application/views/scripts/partials/event-history.phtml:55
+#: /vagrant/modules/monitoring/library/Monitoring/BackendStep.php:134
+msgid "CA"
+msgstr "CA"
+
+#: /vagrant/modules/monitoring/library/Monitoring/BackendStep.php:141
+msgid "CA Path"
+msgstr "CA-Pfad"
+
+#: /vagrant/modules/monitoring/application/views/scripts/partials/event-history.phtml:62
 msgid "COMMENT"
 msgstr ""
 
-#: /vagrant/modules/monitoring/application/views/scripts/partials/event-history.phtml:59
+#: /vagrant/modules/monitoring/application/views/scripts/partials/event-history.phtml:67
 msgid "COMMENT DELETED"
 msgstr ""
 
-#: /vagrant/modules/monitoring/library/Monitoring/Object/Service.php:196
+#: /vagrant/modules/monitoring/library/Monitoring/Object/Service.php:197
 msgid "CRITICAL"
 msgstr "KRITISCH"
 
@@ -762,11 +737,11 @@ msgctxt "icinga.state"
 msgid "CRITICAL"
 msgstr "KRITISCH"
 
-#: /vagrant/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php:214
+#: /vagrant/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php:228
 msgid "Can't send external Icinga Command. Remote user is missing"
 msgstr "Kann externes Icingakommando nicht senden. Der Remotebenutzer fehlt."
 
-#: /vagrant/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php:219
+#: /vagrant/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php:233
 msgid ""
 "Can't send external Icinga Command. The private key for the remote user is "
 "missing"
@@ -783,16 +758,16 @@ msgstr ""
 "Kann die Einschränkung %s nicht mit dem Filter %s anwenden. Sie können nur "
 "die folgende Spalte verwenden: %s"
 
-#: /vagrant/modules/monitoring/library/Monitoring/Command/Transport/CommandTransport.php:76
-#, php-format
+#: /vagrant/modules/monitoring/library/Monitoring/Command/Transport/CommandTransport.php:79
+#, fuzzy, php-format
 msgid ""
 "Cannot create command transport \"%s\". Invalid transport defined in \"%s\". "
-"Use one of \"%s\" or \"%s\"."
+"Use one of \"%s\", \"%s\" or \"%s\"."
 msgstr ""
 "Kann die Befehlsschnittstelle “%s” nicht erzeugen. Ungültige Verbindung in "
 "“%s” angegeben. Verwenden Sie entweder “%s” oder “%s”."
 
-#: /vagrant/modules/monitoring/application/forms/Config/BackendConfigForm.php:350
+#: /vagrant/modules/monitoring/application/forms/Config/BackendConfigForm.php:344
 msgid ""
 "Cannot find the IDO schema. Please verify that the given database contains "
 "the schema and that the configured user has access to it."
@@ -856,7 +831,7 @@ msgstr ""
 "Häkchen setzen um die Überprüfung der Verbindung zum angegebenen Livestatus "
 "Socket zu unterbinden"
 
-#: /vagrant/modules/monitoring/application/forms/Config/BackendConfigForm.php:329
+#: /vagrant/modules/monitoring/application/forms/Config/BackendConfigForm.php:323
 msgid "Check this to not to validate the IDO schema of the chosen resource."
 msgstr ""
 "Häkchen setzen um das IDO Schema der gewählten Ressource nicht zu überprüfen."
@@ -869,10 +844,14 @@ msgstr "Häkchen setzen um die Konfiguration nicht zu überprüfen."
 msgid "Checks"
 msgstr "Checks"
 
-#: /vagrant/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:44
+#: /vagrant/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:43
 msgid "Child Hosts"
 msgstr "Kindhosts"
 
+#: /vagrant/modules/monitoring/library/Monitoring/BackendStep.php:148
+msgid "Cipher"
+msgstr "Verschlüsselung"
+
 #: /vagrant/modules/monitoring/application/forms/Config/SecurityConfigForm.php:58
 msgid ""
 "Comma separated case insensitive list of protected custom variables. Use * "
@@ -884,22 +863,19 @@ msgstr ""
 "Das Vorhandensein dieser angepassten Variablen wird angezeigt, aber deren "
 "Werte werden maskiert."
 
+#: /vagrant/modules/monitoring/application/views/scripts/show/components/command.phtml:12
 #: /vagrant/modules/monitoring/application/views/scripts/hosts/show.phtml:163
 #: /vagrant/modules/monitoring/application/views/scripts/services/show.phtml:165
-#: /vagrant/modules/monitoring/application/views/scripts/show/components/command.phtml:12
 msgid "Command"
 msgstr "Befehl"
 
-#: /vagrant/modules/monitoring/application/forms/Config/Transport/LocalTransportForm.php:30
 #: /vagrant/modules/monitoring/application/forms/Config/Transport/RemoteTransportForm.php:177
+#: /vagrant/modules/monitoring/application/forms/Config/Transport/LocalTransportForm.php:30
 msgid "Command File"
 msgstr "Befehlsdatei"
 
-#: /vagrant/modules/monitoring/library/Monitoring/TransportStep.php:43
-msgid "Command Transport"
-msgstr "Befehlsschnittstelle"
-
 #: /vagrant/modules/monitoring/application/forms/Setup/TransportPage.php:14
+#: /vagrant/modules/monitoring/library/Monitoring/TransportStep.php:119
 msgctxt "setup.page.title"
 msgid "Command Transport"
 msgstr "Befehlsschnittstelle"
@@ -908,7 +884,7 @@ msgstr "Befehlsschnittstelle"
 msgid "Command Transports"
 msgstr "Befehlsschnittstellen"
 
-#: /vagrant/modules/monitoring/application/controllers/ConfigController.php:228
+#: /vagrant/modules/monitoring/application/controllers/ConfigController.php:240
 #, php-format
 msgid "Command transport \"%s\" not found"
 msgstr "Befehlsschnittstelle “%s” nicht gefunden"
@@ -918,17 +894,17 @@ msgstr "Befehlsschnittstelle “%s” nicht gefunden"
 msgid "Command transport \"%s\" not found."
 msgstr "Befehlsschnittstelle “%s” nicht gefunden."
 
-#: /vagrant/modules/monitoring/application/controllers/ConfigController.php:179
+#: /vagrant/modules/monitoring/application/controllers/ConfigController.php:189
 #, php-format
 msgid "Command transport \"%s\" successfully removed"
 msgstr "Befehlsschnittstelle “%s” erfolgreich entfernt"
 
-#: /vagrant/modules/monitoring/application/controllers/ConfigController.php:217
+#: /vagrant/modules/monitoring/application/controllers/ConfigController.php:229
 #, php-format
 msgid "Command transport \"%s\" successfully updated"
 msgstr "Befehlsschnittstelle “%s” erfolgreich aktualisiert"
 
-#: /vagrant/modules/monitoring/library/Monitoring/TransportStep.php:98
+#: /vagrant/modules/monitoring/library/Monitoring/TransportStep.php:135
 #, php-format
 msgid ""
 "Command transport configuration could not be written to: %s. An error "
@@ -937,38 +913,46 @@ msgstr ""
 "Die Konfiguration der Befehlsschnittstelle konnte nicht nach %s geschrieben "
 "werden. Ein Fehler ist aufgetreten:"
 
-#: /vagrant/modules/monitoring/library/Monitoring/TransportStep.php:90
+#: /vagrant/modules/monitoring/library/Monitoring/TransportStep.php:127
 #, php-format
 msgid "Command transport configuration has been successfully created: %s"
 msgstr ""
 "Die Konfiguration der Befehlsschnittstelle wurde erfolgreich angelegt: %s"
 
-#: /vagrant/modules/monitoring/application/controllers/ConfigController.php:254
+#: /vagrant/modules/monitoring/application/controllers/ConfigController.php:268
 msgid "Command transport successfully created"
 msgstr "Die Befehlsschnittstelle wurde erfolgreich angelegt"
 
+#: /vagrant/modules/monitoring/application/views/scripts/downtimes/show.phtml:9
+#: /vagrant/modules/monitoring/application/views/scripts/show/contact.phtml:51
 #: /vagrant/modules/monitoring/application/views/scripts/comment/show.phtml:70
 #: /vagrant/modules/monitoring/application/views/scripts/comments/show.phtml:9
 #: /vagrant/modules/monitoring/application/views/scripts/downtime/show.phtml:163
-#: /vagrant/modules/monitoring/application/views/scripts/downtimes/show.phtml:9
-#: /vagrant/modules/monitoring/application/views/scripts/show/contact.phtml:51
 msgid "Commands"
 msgstr "Befehle"
 
-#: /vagrant/modules/monitoring/application/controllers/CommentController.php:55
-#: /vagrant/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:49
-#: /vagrant/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:42
-#: /vagrant/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:65
-#: /vagrant/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:43
+#: /vagrant/modules/monitoring/application/views/scripts/partials/object/quick-actions.phtml:51
+#: /vagrant/modules/monitoring/application/views/scripts/partials/object/quick-actions.phtml:63
 #: /vagrant/modules/monitoring/application/views/scripts/downtime/show.phtml:47
+#: /vagrant/modules/monitoring/application/controllers/CommentController.php:56
+#: /vagrant/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:52
+#: /vagrant/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:46
+#: /vagrant/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:43
+#: /vagrant/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:65
 msgid "Comment"
 msgstr "Kommentar"
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:415
+#: /vagrant/modules/monitoring/application/views/scripts/partials/event-history.phtml:61
+#, fuzzy
+msgctxt "tooltip"
+msgid "Comment"
+msgstr "Kommentar"
+
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:439
 msgid "Comment Timestamp"
 msgstr "Kommentarzeitstempel"
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:418
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:442
 msgid "Comment Type"
 msgstr "Kommentartyp"
 
@@ -976,10 +960,16 @@ msgstr "Kommentartyp"
 msgid "Comment detail information"
 msgstr "Detailinformation zum Kommentar"
 
-#: /vagrant/modules/monitoring/application/controllers/CommentController.php:48
+#: /vagrant/modules/monitoring/application/controllers/CommentController.php:49
 msgid "Comment not found"
 msgstr "Kommentar nicht gefunden"
 
+#: /vagrant/modules/monitoring/application/views/scripts/partials/event-history.phtml:66
+#, fuzzy
+msgctxt "tooltip"
+msgid "Comment removed"
+msgstr "Kommentar gelöscht"
+
 #: /vagrant/modules/monitoring/application/views/scripts/partials/comment/comment-description.phtml:16
 msgid "Comment was caused by a downtime"
 msgstr "Kommentar wurde durch eine Downtime erstellt."
@@ -996,14 +986,14 @@ msgstr "Kommentar wurde durch eine Bestätigung erstellt."
 msgid "Comment was created by an user"
 msgstr "Kommentar wurde von einem Benutzer erstellt."
 
-#: /vagrant/modules/monitoring/configuration.php:196
-#: /vagrant/modules/monitoring/application/controllers/CommentsController.php:62
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:390
-#: /vagrant/modules/monitoring/application/controllers/TimelineController.php:60
-#: /vagrant/modules/monitoring/application/forms/EventOverviewForm.php:64
+#: /vagrant/modules/monitoring/configuration.php:200
+#: /vagrant/modules/monitoring/application/views/scripts/show/components/comments.phtml:37
 #: /vagrant/modules/monitoring/application/views/scripts/hosts/show.phtml:59
 #: /vagrant/modules/monitoring/application/views/scripts/services/show.phtml:58
-#: /vagrant/modules/monitoring/application/views/scripts/show/components/comments.phtml:37
+#: /vagrant/modules/monitoring/application/controllers/CommentsController.php:63
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:411
+#: /vagrant/modules/monitoring/application/controllers/TimelineController.php:61
+#: /vagrant/modules/monitoring/application/forms/EventOverviewForm.php:64
 msgid "Comments"
 msgstr "Kommentare"
 
@@ -1012,31 +1002,31 @@ msgstr "Kommentare"
 msgid "Configuration for backend %s is disabled"
 msgstr "Die Konfiguration für das Backend %s ist deaktiviert"
 
-#: /vagrant/modules/monitoring/configuration.php:94
+#: /vagrant/modules/monitoring/configuration.php:98
 msgid ""
 "Configure how to protect your monitoring environment against prying eyes"
 msgstr ""
 "Konfigurieren Sie den Schutz Ihrer Monitoringumgebung gegen neugierige Blicke"
 
-#: /vagrant/modules/monitoring/configuration.php:89
+#: /vagrant/modules/monitoring/configuration.php:93
 msgid "Configure how to retrieve monitoring information"
 msgstr "Konfigurieren Sie, wie Monitoringinformationen geholt werden"
 
-#: /vagrant/modules/monitoring/application/controllers/CommentsController.php:95
+#: /vagrant/modules/monitoring/application/controllers/CommentsController.php:96
 #, php-format
 msgid "Confirm removal of %d comments."
 msgstr "Bestätigen Sie das Entfernen von %d Kommentaren."
 
-#: /vagrant/modules/monitoring/application/controllers/DowntimesController.php:99
+#: /vagrant/modules/monitoring/application/controllers/DowntimesController.php:100
 #, php-format
 msgid "Confirm removal of %d downtimes."
 msgstr "Bestätigen Sie das Entfernen von %d Downtimes."
 
-#: /vagrant/modules/monitoring/application/views/scripts/list/contactgroups.phtml:25
+#: /vagrant/modules/monitoring/application/views/scripts/list/contactgroups.phtml:23
 msgid "Contact Group "
 msgstr "Kontaktgruppe"
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:349
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:382
 msgid "Contact Groups"
 msgstr "Kontaktgruppen"
 
@@ -1044,33 +1034,25 @@ msgstr "Kontaktgruppen"
 msgid "Contact details"
 msgstr "Kontaktdetails"
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:366
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:398
 msgid "Contactgroup Alias"
 msgstr "Kontaktgruppen-Alias"
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:365
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:397
 msgid "Contactgroup Name"
 msgstr "Kontaktgruppenname"
 
-#: /vagrant/modules/monitoring/configuration.php:192
+#: /vagrant/modules/monitoring/configuration.php:196
 #: /vagrant/modules/monitoring/application/views/scripts/show/components/contacts.phtml:35
 msgid "Contactgroups"
 msgstr "Kontaktgruppen"
 
-#: /vagrant/modules/monitoring/configuration.php:188
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:279
+#: /vagrant/modules/monitoring/configuration.php:192
 #: /vagrant/modules/monitoring/application/views/scripts/show/components/contacts.phtml:17
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:308
 msgid "Contacts"
 msgstr "Kontakte"
 
-#: /vagrant/modules/monitoring/application/controllers/ChartController.php:292
-msgid "Contains host states of each service group."
-msgstr "Enthält die Hostzustände jeder einzelnen Servicegruppe."
-
-#: /vagrant/modules/monitoring/application/controllers/ChartController.php:233
-msgid "Contains service states for each service group."
-msgstr "Enthält die Servicezustände jeder einzelnen Servicegruppe."
-
 #: /vagrant/modules/monitoring/application/forms/Config/Transport/RemoteTransportForm.php:47
 msgid "Could not find any valid SSH resources"
 msgstr "Konnte keine keine gültigen SSH-Ressourcen finden"
@@ -1083,11 +1065,11 @@ msgstr ""
 "Konnte keine gültigen Ressourcen für das Monitoringbackend finden. Bitte "
 "konfigurieren Sie zuerst eine Datenbankressource."
 
-#: /vagrant/modules/monitoring/application/controllers/ConfigController.php:242
+#: /vagrant/modules/monitoring/application/controllers/ConfigController.php:254
 msgid "Create New Command Transport"
 msgstr "Neue Befehlsschnittstelle anlegen"
 
-#: /vagrant/modules/monitoring/application/controllers/ConfigController.php:83
+#: /vagrant/modules/monitoring/application/controllers/ConfigController.php:93
 msgid "Create New Monitoring Backend"
 msgstr "Neues Monitoringbackend anlegen"
 
@@ -1111,17 +1093,16 @@ msgstr "Neues Monitoringbackend anlegen"
 msgid "Created"
 msgstr "Angelegt"
 
-#: /vagrant/modules/monitoring/application/controllers/ChartController.php:257
-#: /vagrant/modules/monitoring/application/forms/StatehistoryForm.php:117
 #: /vagrant/modules/monitoring/application/views/helpers/Perfdata.php:41
+#: /vagrant/modules/monitoring/application/forms/StatehistoryForm.php:114
 msgid "Critical"
 msgstr "Kritisch"
 
-#: /vagrant/modules/monitoring/configuration.php:156
+#: /vagrant/modules/monitoring/configuration.php:160
 msgid "Current Downtimes"
 msgstr "Aktuelle Downtimes"
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:165
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:174
 msgid "Current Host State"
 msgstr "Aktueller Host-Zustand"
 
@@ -1129,11 +1110,11 @@ msgstr "Aktueller Host-Zustand"
 msgid "Current Incidents"
 msgstr "Aktuelle Probleme"
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:160
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:169
 msgid "Current Service State"
 msgstr "Aktueller Service-Zustand"
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:94
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:88
 msgid "Current State"
 msgstr "Aktueller Status"
 
@@ -1150,15 +1131,15 @@ msgctxt "icinga.state"
 msgid "DOWN"
 msgstr "DOWN"
 
-#: /vagrant/modules/monitoring/application/views/scripts/partials/event-history.phtml:79
+#: /vagrant/modules/monitoring/application/views/scripts/partials/event-history.phtml:89
 msgid "DOWNTIME DELETED"
 msgstr ""
 
-#: /vagrant/modules/monitoring/application/views/scripts/partials/event-history.phtml:104
+#: /vagrant/modules/monitoring/application/views/scripts/partials/event-history.phtml:127
 msgid "DOWNTIME END"
 msgstr ""
 
-#: /vagrant/modules/monitoring/application/views/scripts/partials/event-history.phtml:99
+#: /vagrant/modules/monitoring/application/views/scripts/partials/event-history.phtml:121
 msgid "DOWNTIME START"
 msgstr ""
 
@@ -1191,11 +1172,21 @@ msgstr "Fehlerübersicht"
 msgid "Defects"
 msgstr "Fehler"
 
-#: /vagrant/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:42
+#: /vagrant/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:41
 msgid "Define what should be done with the child hosts of the hosts."
 msgstr "Legen Sie fest, wie die Kindhosts der Hosts behandelt werden sollen."
 
-#: /vagrant/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php:76
+#: /vagrant/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml:61
+#, fuzzy
+msgid "Delete comment"
+msgstr "Kommentar löschen"
+
+#: /vagrant/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml:70
+#, fuzzy
+msgid "Delete downtime"
+msgstr "Downtime löschen"
+
+#: /vagrant/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php:40
 msgid "Delete this comment"
 msgstr "Kommentar löschen"
 
@@ -1203,18 +1194,18 @@ msgstr "Kommentar löschen"
 msgid "Delete this downtime"
 msgstr "Downtime löschen"
 
-#: /vagrant/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php:96
-#: /vagrant/modules/monitoring/application/forms/Command/Object/DeleteCommentsCommandForm.php:83
+#: /vagrant/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php:105
+#: /vagrant/modules/monitoring/application/forms/Command/Object/DeleteCommentsCommandForm.php:84
 msgid "Deleting comment.."
 msgid_plural "Deleting comments.."
 msgstr[0] "Entferne Kommentar"
 msgstr[1] "Entferne Kommentare"
 
-#: /vagrant/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php:97
+#: /vagrant/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php:106
 msgid "Deleting downtime."
 msgstr "Lösche Downtime"
 
-#: /vagrant/modules/monitoring/application/forms/Command/Object/DeleteDowntimesCommandForm.php:83
+#: /vagrant/modules/monitoring/application/forms/Command/Object/DeleteDowntimesCommandForm.php:84
 msgid "Deleting downtime.."
 msgid_plural "Deleting downtimes.."
 msgstr[0] "Lösche Downtime"
@@ -1229,17 +1220,17 @@ msgstr "Details"
 msgid "Disable Notifications"
 msgstr "Benachrichtigungen deaktivieren"
 
-#: /vagrant/modules/monitoring/application/forms/Config/BackendConfigForm.php:185
+#: /vagrant/modules/monitoring/application/forms/Config/BackendConfigForm.php:179
 msgid "Disable This Backend"
 msgstr "Backend deaktivieren"
 
-#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:65
+#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:69
 msgid "Disable notifications for a specific time on a program-wide basis"
 msgstr ""
 "Deaktiviere Benachrichtigungen applikationsweit für eine bestimmte "
 "Zeitspanne."
 
-#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:67
+#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:71
 msgid "Disable temporarily"
 msgstr "Vorübergehend deaktivieren"
 
@@ -1263,11 +1254,11 @@ msgstr "Deaktivierte Service-Notifizierungen"
 msgid "Disabling active checks.."
 msgstr "Deaktiviere aktive Checks.."
 
-#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:219
+#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:222
 msgid "Disabling active host checks.."
 msgstr "Deaktiviere aktive Host-Checks.."
 
-#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:223
+#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:226
 msgid "Disabling active service checks.."
 msgstr "Deaktiviere Aktive Service-Checks.."
 
@@ -1275,11 +1266,11 @@ msgstr "Deaktiviere Aktive Service-Checks.."
 msgid "Disabling event handler.."
 msgstr "Deaktiviere Event-Handler.."
 
-#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:227
+#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:230
 msgid "Disabling event handlers.."
 msgstr "Deaktiviere Event-Handler.."
 
-#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:231
+#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:234
 #: /vagrant/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:150
 msgid "Disabling flap detection.."
 msgstr "Deaktiviere Flap-Erkennung.."
@@ -1288,16 +1279,16 @@ msgstr "Deaktiviere Flap-Erkennung.."
 msgid "Disabling host and service notifications.."
 msgstr "Deaktiviere Benachrichtigungen für Hosts und Services.."
 
-#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:235
+#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:238
 #: /vagrant/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:142
 msgid "Disabling notifications.."
 msgstr "Deaktiviere Benachrichtigungen.."
 
-#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:239
+#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:242
 msgid "Disabling obsessing over hosts.."
 msgstr "Deaktiviere Verfolgung von Host.."
 
-#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:243
+#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:246
 msgid "Disabling obsessing over services.."
 msgstr "Deaktiviere Verfolgung von Servicesn.."
 
@@ -1309,31 +1300,31 @@ msgstr "Deaktiviere Verfolgung.."
 msgid "Disabling passive checks.."
 msgstr "Deaktiviere passive Checks.."
 
-#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:247
+#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:250
 msgid "Disabling passive host checks.."
 msgstr "Deaktiviere passive Host-Checks.."
 
-#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:251
+#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:254
 msgid "Disabling passive service checks.."
 msgstr "Deaktiviere passive Service-Checks.."
 
-#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:255
+#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:258
 msgid "Disabling performance data.."
 msgstr "Deaktiviere Performancedaten.."
 
-#: /vagrant/modules/monitoring/application/controllers/CommentController.php:56
+#: /vagrant/modules/monitoring/application/controllers/CommentController.php:57
 msgid "Display detailed information about a comment."
 msgstr "Zeige detaillierte Informationen über einen Kommentar."
 
-#: /vagrant/modules/monitoring/application/controllers/DowntimeController.php:66
+#: /vagrant/modules/monitoring/application/controllers/DowntimeController.php:67
 msgid "Display detailed information about a downtime."
 msgstr "Zeige detaillierte Informationen über eine Downtime."
 
-#: /vagrant/modules/monitoring/application/controllers/CommentsController.php:64
+#: /vagrant/modules/monitoring/application/controllers/CommentsController.php:65
 msgid "Display detailed information about multiple comments."
 msgstr "Zeige detaillierte Informationen über mehrere Kommentare."
 
-#: /vagrant/modules/monitoring/application/controllers/DowntimesController.php:70
+#: /vagrant/modules/monitoring/application/controllers/DowntimesController.php:71
 msgid "Display detailed information about multiple downtimes."
 msgstr "Zeige detaillierte Informationen über mehrere Downtimes."
 
@@ -1345,31 +1336,56 @@ msgstr ""
 "Zeige diese Aktion nur für Objekte, die diesem Filter entsprechen. Leer "
 "lassen, um diese Aktion unabhängig vom Objekt anzuzeigen."
 
-#: /vagrant/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:46
+#: /vagrant/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:45
 msgid "Do nothing with child hosts"
 msgstr "Mach nichts mit Kind-Objekten."
 
-#: /vagrant/modules/monitoring/application/controllers/ChartController.php:307
-#: /vagrant/modules/monitoring/application/forms/StatehistoryForm.php:138
+#: /vagrant/modules/monitoring/application/forms/StatehistoryForm.php:134
 msgid "Down"
 msgstr "Down"
 
-#: /vagrant/modules/monitoring/application/controllers/DowntimeController.php:65
 #: /vagrant/modules/monitoring/application/views/scripts/partials/comment/comment-description.phtml:15
+#: /vagrant/modules/monitoring/application/views/scripts/partials/object/quick-actions.phtml:112
+#: /vagrant/modules/monitoring/application/views/scripts/partials/object/quick-actions.phtml:126
+#: /vagrant/modules/monitoring/application/controllers/DowntimeController.php:66
 msgid "Downtime"
 msgstr "Downtime"
 
-#: /vagrant/modules/monitoring/application/controllers/DowntimeController.php:57
+#: /vagrant/modules/monitoring/application/views/scripts/partials/event-history.phtml:126
+#, fuzzy
+msgctxt "tooltip"
+msgid "Downtime ended"
+msgstr "Downtime Ende"
+
+#: /vagrant/modules/monitoring/application/controllers/DowntimeController.php:58
 msgid "Downtime not found"
 msgstr "Downtime nicht gefunden"
 
-#: /vagrant/modules/monitoring/configuration.php:200
-#: /vagrant/modules/monitoring/application/controllers/DowntimesController.php:69
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:194
-#: /vagrant/modules/monitoring/application/forms/EventOverviewForm.php:54
+#: /vagrant/modules/monitoring/application/views/scripts/partials/event-history.phtml:88
+#, fuzzy
+msgctxt "tooltip"
+msgid "Downtime removed"
+msgstr "Downtime entfernt"
+
+#: /vagrant/modules/monitoring/application/views/scripts/partials/event-history.phtml:82
+#, fuzzy
+msgctxt "tooltip"
+msgid "Downtime scheduled"
+msgstr "Die Planung dieser Downtime wurde angefordert"
+
+#: /vagrant/modules/monitoring/application/views/scripts/partials/event-history.phtml:120
+#, fuzzy
+msgctxt "tooltip"
+msgid "Downtime started"
+msgstr "Downtime Beginn"
+
+#: /vagrant/modules/monitoring/configuration.php:204
+#: /vagrant/modules/monitoring/application/views/scripts/show/components/downtime.phtml:41
 #: /vagrant/modules/monitoring/application/views/scripts/hosts/show.phtml:96
 #: /vagrant/modules/monitoring/application/views/scripts/services/show.phtml:95
-#: /vagrant/modules/monitoring/application/views/scripts/show/components/downtime.phtml:41
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:212
+#: /vagrant/modules/monitoring/application/controllers/DowntimesController.php:70
+#: /vagrant/modules/monitoring/application/forms/EventOverviewForm.php:54
 msgid "Downtimes"
 msgstr "Downtimes"
 
@@ -1377,9 +1393,9 @@ msgstr "Downtimes"
 msgid "Downtimes Active For More Than Three Days"
 msgstr "Downtimes älter als drei Tage"
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:235
 #: /vagrant/modules/monitoring/application/views/scripts/downtime/show.phtml:53
 #: /vagrant/modules/monitoring/application/views/scripts/downtime/show.phtml:135
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:255
 msgid "Duration"
 msgstr "Dauer"
 
@@ -1388,10 +1404,10 @@ msgctxt "Downtime status"
 msgid "ENDS"
 msgstr ""
 
-#: /vagrant/modules/monitoring/library/Monitoring/BackendStep.php:155
-#: /vagrant/modules/monitoring/library/Monitoring/BackendStep.php:168
+#: /vagrant/modules/monitoring/library/Monitoring/BackendStep.php:193
+#: /vagrant/modules/monitoring/library/Monitoring/BackendStep.php:206
+#: /vagrant/modules/monitoring/library/Monitoring/TransportStep.php:139
 #: /vagrant/modules/monitoring/library/Monitoring/SecurityStep.php:80
-#: /vagrant/modules/monitoring/library/Monitoring/TransportStep.php:102
 #, php-format
 msgid "ERROR: %s"
 msgstr "Fehler: %s"
@@ -1401,12 +1417,12 @@ msgctxt "Downtime status"
 msgid "EXPIRES"
 msgstr ""
 
-#: /vagrant/modules/monitoring/application/controllers/ConfigController.php:200
+#: /vagrant/modules/monitoring/application/controllers/ConfigController.php:210
 #, php-format
 msgid "Edit Command Transport %s"
 msgstr "Bearbeite Befehlsschnittstelle %s"
 
-#: /vagrant/modules/monitoring/application/controllers/ConfigController.php:41
+#: /vagrant/modules/monitoring/application/controllers/ConfigController.php:51
 #, php-format
 msgid "Edit Monitoring Backend %s"
 msgstr "Bearbeite Monitoring-Backend %s"
@@ -1421,10 +1437,10 @@ msgstr "Bearbeite Befehlsschnittstelle %s"
 msgid "Edit monitoring backend %s"
 msgstr "Bearbeite Monitoring-Backend %s"
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:298
-#: /vagrant/modules/monitoring/application/views/scripts/list/contacts.phtml:18
-#: /vagrant/modules/monitoring/application/views/scripts/list/contacts.phtml:37
+#: /vagrant/modules/monitoring/application/views/scripts/list/contacts.phtml:21
+#: /vagrant/modules/monitoring/application/views/scripts/list/contacts.phtml:42
 #: /vagrant/modules/monitoring/application/views/scripts/show/contact.phtml:24
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:328
 msgid "Email"
 msgstr "E-Mail"
 
@@ -1432,11 +1448,11 @@ msgstr "E-Mail"
 msgid "Enabling active checks.."
 msgstr "Aktiviere aktive Checks.."
 
-#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:218
+#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:221
 msgid "Enabling active host checks.."
 msgstr "Aktiviere aktive Host-Checks.."
 
-#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:222
+#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:225
 msgid "Enabling active service checks.."
 msgstr "Aktiviere aktive Service-Checks.."
 
@@ -1444,25 +1460,25 @@ msgstr "Aktiviere aktive Service-Checks.."
 msgid "Enabling event handler.."
 msgstr "Aktiviere Eventhandler.."
 
-#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:226
+#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:229
 msgid "Enabling event handlers.."
 msgstr "Aktiviere Eventhandler.."
 
-#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:230
+#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:233
 #: /vagrant/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:149
 msgid "Enabling flap detection.."
 msgstr "Aktiviere Flap-Erkennung.."
 
-#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:234
+#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:237
 #: /vagrant/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:141
 msgid "Enabling notifications.."
 msgstr "Aktiviere Benachrichtigungen.."
 
-#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:238
+#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:241
 msgid "Enabling obsessing over hosts.."
 msgstr "Aktiviere Hostverfolgung.."
 
-#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:242
+#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:245
 msgid "Enabling obsessing over services.."
 msgstr "Aktiviere Serviceverfolgung.."
 
@@ -1474,19 +1490,19 @@ msgstr "Aktiviere Verfolgung.."
 msgid "Enabling passive checks.."
 msgstr "Aktiviere passive Checks.."
 
-#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:246
+#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:249
 msgid "Enabling passive host checks.."
 msgstr "Aktiviere passive Host-Checks.."
 
-#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:250
+#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:253
 msgid "Enabling passive service checks.."
 msgstr "Aktiviere passive Service-Checks.."
 
-#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:254
+#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:257
 msgid "Enabling performance data.."
 msgstr "Aktiviere Performancedaten.."
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:232
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:252
 #: /vagrant/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:88
 msgid "End Time"
 msgstr "Endzeitpunkt"
@@ -1503,7 +1519,7 @@ msgstr ""
 "Tragen Sie hier die gewünschte Dauer der Downtime ein. Die Downtime wird "
 "nach Ablauf dieser Zeit automatisch gelöscht."
 
-#: /vagrant/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:90
+#: /vagrant/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:95
 msgid ""
 "Enter the expire date and time for this acknowledgement here. Icinga will "
 "delete the acknowledgement after this time expired."
@@ -1511,13 +1527,13 @@ msgstr ""
 "Tragen Sie hier Ablaufdatum und -uhrzeit für diese Bestätigung ein. Die "
 "Bestätigung wird nach Ablauf dieser Zeit automatisch gelöscht."
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:229
 #: /vagrant/modules/monitoring/application/views/scripts/downtime/show.phtml:43
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:249
 msgid "Entry Time"
 msgstr "Eingabezeitpunkt"
 
-#: /vagrant/modules/monitoring/configuration.php:212
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:307
+#: /vagrant/modules/monitoring/configuration.php:216
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:337
 msgid "Event Grid"
 msgstr "Ereignisraster"
 
@@ -1525,14 +1541,14 @@ msgstr "Ereignisraster"
 msgid "Event Handler"
 msgstr "Eventhandler"
 
-#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:105
 #: /vagrant/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:208
 #: /vagrant/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:210
+#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:108
 msgid "Event Handlers"
 msgstr "Eventhandler"
 
-#: /vagrant/modules/monitoring/configuration.php:216
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:508
+#: /vagrant/modules/monitoring/configuration.php:220
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:548
 msgid "Event Overview"
 msgstr "Ereignisverlauf"
 
@@ -1540,12 +1556,12 @@ msgstr "Ereignisverlauf"
 msgid "Execution time"
 msgstr "Ausführungsdauer"
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:419
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:443
 msgid "Expiration"
 msgstr "Verfall"
 
 #: /vagrant/modules/monitoring/application/forms/Command/Instance/DisableNotificationsExpireCommandForm.php:43
-#: /vagrant/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:87
+#: /vagrant/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:92
 msgid "Expire Time"
 msgstr "Verfallszeitpunkt"
 
@@ -1558,15 +1574,15 @@ msgstr "Verfällt"
 msgid "Expires %s"
 msgstr "Verfällt %s"
 
-#: /vagrant/modules/monitoring/application/views/scripts/partials/event-history.phtml:83
+#: /vagrant/modules/monitoring/application/views/scripts/partials/event-history.phtml:94
 msgid "FLAPPING"
 msgstr ""
 
-#: /vagrant/modules/monitoring/application/views/scripts/partials/event-history.phtml:87
+#: /vagrant/modules/monitoring/application/views/scripts/partials/event-history.phtml:100
 msgid "FLAPPING STOPPED"
 msgstr ""
 
-#: /vagrant/modules/monitoring/library/Monitoring/Command/Transport/CommandTransport.php:138
+#: /vagrant/modules/monitoring/library/Monitoring/Command/Transport/CommandTransport.php:142
 msgid ""
 "Failed to send external Icinga command. No transport has been configured for "
 "this instance. Please contact your Icinga Web administrator."
@@ -1580,10 +1596,10 @@ msgstr ""
 msgid "Failed to successfully validate the configuration: %s"
 msgstr "Die Validierung der Konfiguration ist fehlgeschlagen: %s"
 
-#: /vagrant/modules/monitoring/application/views/scripts/health/info.phtml:79
+#: /vagrant/modules/monitoring/application/views/scripts/show/components/flags.phtml:2
 #: /vagrant/modules/monitoring/application/views/scripts/hosts/show.phtml:200
 #: /vagrant/modules/monitoring/application/views/scripts/services/show.phtml:202
-#: /vagrant/modules/monitoring/application/views/scripts/show/components/flags.phtml:2
+#: /vagrant/modules/monitoring/application/views/scripts/health/info.phtml:79
 msgid "Feature Commands"
 msgstr "Unterstützte Befehle"
 
@@ -1591,8 +1607,8 @@ msgstr "Unterstützte Befehle"
 msgid "Filter"
 msgstr "Filter"
 
-#: /vagrant/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:107
 #: /vagrant/modules/monitoring/application/views/scripts/downtime/show.phtml:60
+#: /vagrant/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:107
 msgid "Fixed"
 msgstr "Fix"
 
@@ -1600,22 +1616,34 @@ msgstr "Fix"
 msgid "Fixed downtimes have a static start and end time."
 msgstr "Fixe Downtimes haben einen statischen Start- und Endzeitpunkt."
 
-#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:114
-#: /vagrant/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:58
 #: /vagrant/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:8
 #: /vagrant/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:10
+#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:117
+#: /vagrant/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:58
 msgid "Flap Detection"
 msgstr "Flap-Erkennung"
 
-#: /vagrant/modules/monitoring/application/forms/EventOverviewForm.php:84
-#: /vagrant/modules/monitoring/application/views/helpers/HostFlags.php:19
-#: /vagrant/modules/monitoring/application/views/helpers/ServiceFlags.php:15
+#: /vagrant/modules/monitoring/application/views/helpers/HostFlags.php:16
+#: /vagrant/modules/monitoring/application/views/helpers/ServiceFlags.php:16
 #: /vagrant/modules/monitoring/application/views/scripts/partials/comment/comment-description.phtml:5
+#: /vagrant/modules/monitoring/application/forms/EventOverviewForm.php:84
 msgid "Flapping"
 msgstr "Flapping"
 
-#: /vagrant/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:108
+#: /vagrant/modules/monitoring/application/views/scripts/partials/event-history.phtml:93
+#, fuzzy
+msgctxt "tooltip"
+msgid "Flapping started"
+msgstr "Flapping beendet"
+
+#: /vagrant/modules/monitoring/application/views/scripts/partials/event-history.phtml:99
+#, fuzzy
+msgctxt "tooltip"
+msgid "Flapping stopped"
+msgstr "Flapping beendet"
+
 #: /vagrant/modules/monitoring/application/views/scripts/downtime/show.phtml:60
+#: /vagrant/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:108
 msgid "Flexible"
 msgstr "Flexibel"
 
@@ -1637,7 +1665,7 @@ msgstr ""
 msgid "Force Check"
 msgstr "Check erzwingen"
 
-#: /vagrant/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:55
+#: /vagrant/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:58
 msgid "Forced"
 msgstr "Erzwungen"
 
@@ -1660,7 +1688,13 @@ msgstr "Globaler Service Event Handler"
 msgid "Handled"
 msgstr "Unbehandelt"
 
-#: /vagrant/modules/monitoring/application/controllers/TimelineController.php:55
+#: /vagrant/modules/monitoring/application/views/scripts/partials/event-history.phtml:108
+#, fuzzy
+msgctxt "tooltip"
+msgid "Hard state"
+msgstr "Hard Status"
+
+#: /vagrant/modules/monitoring/application/controllers/TimelineController.php:56
 msgid "Hard state changes"
 msgstr "Harte Status-Änderungen"
 
@@ -1668,32 +1702,39 @@ msgstr "Harte Status-Änderungen"
 msgid "Healing Chart"
 msgstr ""
 
-#: /vagrant/modules/monitoring/configuration.php:208
+#: /vagrant/modules/monitoring/configuration.php:89
+#, fuzzy
+msgid "Hide the properties of monitored objects that match the filter"
+msgstr "Beschränke die Sicht auf die Icingaobjekte, die dem Filter entsprechen"
+
+#: /vagrant/modules/monitoring/configuration.php:212
 #: /vagrant/modules/monitoring/application/views/scripts/alertsummary/index.phtml:69
-#: /vagrant/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:229
+#: /vagrant/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:251
 msgid "History"
 msgstr "Historie"
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:227
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:416
-#: /vagrant/modules/monitoring/application/forms/Config/Transport/RemoteTransportForm.php:139
+#: /vagrant/modules/monitoring/application/views/scripts/list/notifications.phtml:53
 #: /vagrant/modules/monitoring/application/views/scripts/comment/show.phtml:29
 #: /vagrant/modules/monitoring/application/views/scripts/comment/show.phtml:31
+#: /vagrant/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml:20
 #: /vagrant/modules/monitoring/application/views/scripts/downtime/show.phtml:15
 #: /vagrant/modules/monitoring/application/views/scripts/downtime/show.phtml:30
-#: /vagrant/modules/monitoring/application/views/scripts/list/notifications.phtml:53
-#: /vagrant/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml:20
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:247
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:440
+#: /vagrant/modules/monitoring/application/forms/Config/Transport/ApiTransportForm.php:29
+#: /vagrant/modules/monitoring/application/forms/Config/Transport/RemoteTransportForm.php:139
 #: /vagrant/modules/monitoring/library/Monitoring/BackendStep.php:97
+#: /vagrant/modules/monitoring/library/Monitoring/TransportStep.php:94
 #: /vagrant/modules/monitoring/library/Monitoring/DataView/DataView.php:275
-#: /vagrant/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:185
+#: /vagrant/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:207
 msgid "Host"
 msgstr "Host"
 
-#: /vagrant/modules/monitoring/configuration.php:111
+#: /vagrant/modules/monitoring/configuration.php:115
 msgid "Host Action"
 msgstr "Hostaktion"
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:167
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:176
 msgid "Host Address"
 msgstr "Host-IP"
 
@@ -1707,23 +1748,15 @@ msgstr "Host-Checks"
 msgid "Host Group"
 msgstr "Hostgruppe"
 
-#: /vagrant/modules/monitoring/application/controllers/ChartController.php:291
-msgid "Host Group Chart"
-msgstr "Hostgruppenübersicht"
-
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:498
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:536
 msgid "Host Group Name"
 msgstr "Hostgruppenname"
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:467
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:503
 msgid "Host Groups"
 msgstr "Hostgruppen"
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:301
-msgid "Host Notification Timeperiod"
-msgstr "Host-Benachrichtigungszeitraum"
-
-#: /vagrant/modules/monitoring/configuration.php:128
+#: /vagrant/modules/monitoring/configuration.php:132
 #: /vagrant/modules/monitoring/configuration.php:264
 msgid "Host Problems"
 msgstr "Host-Probleme"
@@ -1732,7 +1765,7 @@ msgstr "Host-Probleme"
 msgid "Host Problems:"
 msgstr "Host-Probleme:"
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:164
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:173
 #, fuzzy
 msgid "Host Severity"
 msgstr "Schwere"
@@ -1753,30 +1786,30 @@ msgstr "Die Host- und Servicebenachrichtigungen sind bereits deaktiviert."
 msgid "Host not found"
 msgstr "Kein Host gefunden"
 
-#: /vagrant/modules/monitoring/configuration.php:105
-#: /vagrant/modules/monitoring/configuration.php:184
+#: /vagrant/modules/monitoring/configuration.php:109
+#: /vagrant/modules/monitoring/configuration.php:188
 #: /vagrant/modules/monitoring/application/views/scripts/show/components/hostgroups.phtml:16
 msgid "Hostgroups"
 msgstr "Hostgruppen"
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:95
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:166
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:560
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:89
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:175
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:600
 msgid "Hostname"
 msgstr "Hostname"
 
+#: /vagrant/modules/monitoring/application/forms/Config/Transport/ApiTransportForm.php:31
 #: /vagrant/modules/monitoring/application/forms/Config/Transport/RemoteTransportForm.php:141
 msgid "Hostname or address of the remote Icinga instance"
 msgstr "Hostname oder IP-Adresse der entfernten Icingainstanz"
 
-#: /vagrant/modules/monitoring/configuration.php:103
-#: /vagrant/modules/monitoring/configuration.php:172
-#: /vagrant/modules/monitoring/application/controllers/ChartController.php:295
-#: /vagrant/modules/monitoring/application/controllers/HostsController.php:58
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:54
-#: /vagrant/modules/monitoring/application/forms/StatehistoryForm.php:100
-#: /vagrant/modules/monitoring/application/views/scripts/show/contact.phtml:39
+#: /vagrant/modules/monitoring/configuration.php:107
+#: /vagrant/modules/monitoring/configuration.php:176
 #: /vagrant/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:9
+#: /vagrant/modules/monitoring/application/views/scripts/show/contact.phtml:39
+#: /vagrant/modules/monitoring/application/controllers/HostsController.php:59
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:48
+#: /vagrant/modules/monitoring/application/forms/StatehistoryForm.php:98
 msgid "Hosts"
 msgstr "Hosts"
 
@@ -1788,16 +1821,20 @@ msgstr "Stunde"
 msgid "Hours"
 msgstr "Stunden"
 
-#: /vagrant/modules/monitoring/application/views/scripts/partials/object/host-header.phtml:29
+#: /vagrant/modules/monitoring/application/views/scripts/partials/object/host-header.phtml:34
 #: /vagrant/modules/monitoring/application/views/scripts/partials/object/service-header.phtml:30
 msgid "IPv4 address"
 msgstr "IPv4-Adresse"
 
-#: /vagrant/modules/monitoring/application/views/scripts/partials/object/host-header.phtml:24
+#: /vagrant/modules/monitoring/application/views/scripts/partials/object/host-header.phtml:29
 #: /vagrant/modules/monitoring/application/views/scripts/partials/object/service-header.phtml:25
 msgid "IPv6 address"
 msgstr "IPv6-Adresse"
 
+#: /vagrant/modules/monitoring/application/forms/Config/TransportConfigForm.php:225
+msgid "Icinga 2 API"
+msgstr ""
+
 #: /vagrant/modules/monitoring/library/Monitoring/SecurityStep.php:45
 msgid ""
 "Icinga Web 2 will protect your monitoring environment against prying eyes "
@@ -1834,7 +1871,7 @@ msgstr ""
 "Icinga Web 2 wird die Named Pipe “%s” verwenden, um Kommandos an Ihre "
 "Monitoringinstanz zu schicken."
 
-#: /vagrant/modules/monitoring/library/Monitoring/TransportStep.php:49
+#: /vagrant/modules/monitoring/library/Monitoring/TransportStep.php:60
 #, php-format
 msgid ""
 "Icinga Web 2 will use the named pipe located on a remote machine at \"%s\" "
@@ -1845,11 +1882,11 @@ msgstr ""
 "verwenden, um Kommandos an Ihre Monitoringinstanz zu senden. Dazu werden die "
 "weiter unter gelisteten Verbindungseinstellungen verwendet:"
 
-#: /vagrant/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:74
+#: /vagrant/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:79
 msgid "If the acknowledgement should expire, check this option."
 msgstr "Diese Option aktivieren, wenn die Bestätigung verfallen soll"
 
-#: /vagrant/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:58
+#: /vagrant/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:61
 msgid ""
 "If you check this option, the notification is sent out regardless of time "
 "restrictions and whether or not notifications are enabled."
@@ -1858,7 +1895,7 @@ msgstr ""
 "versendet, unabhängig von zeitlichen Beschränkungen und aktivierten "
 "Benachrichtigungen."
 
-#: /vagrant/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:70
+#: /vagrant/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:76
 msgid ""
 "If you check this option, the notification is sent out to all normal and "
 "escalated contacts."
@@ -1866,7 +1903,7 @@ msgstr ""
 "Wenn Sie diese Option aktivieren, wird die Benachrichtigung an alle normalen "
 "und Eskalationskontakte versendet."
 
-#: /vagrant/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:126
+#: /vagrant/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:131
 msgid ""
 "If you do not want an acknowledgement notification to be sent out to the "
 "appropriate contacts, uncheck this option."
@@ -1896,7 +1933,7 @@ msgstr ""
 "Wenn diese Option aktiviert wird, erzwingt Icinga einen Check unabhängig vom "
 "eingeplanten Zeitraum und auch dann, wenn aktive Checks nicht aktiv sind."
 
-#: /vagrant/modules/monitoring/application/controllers/ConfigController.php:165
+#: /vagrant/modules/monitoring/application/controllers/ConfigController.php:175
 #, fuzzy
 msgid ""
 "If you still have any environments or views referring to this transport, you "
@@ -1906,7 +1943,7 @@ msgstr ""
 "verweisen, werden Sie nach ihrer Löschung keine Kommandos mehr verschicken "
 "können."
 
-#: /vagrant/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:58
+#: /vagrant/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:59
 msgid ""
 "If you uncheck this option, the comment will automatically be deleted the "
 "next time Icinga is restarted."
@@ -1914,7 +1951,7 @@ msgstr ""
 "Wenn diese Option deaktiviert wird, wird der Kommentar beim nächsten "
 "Neustart von Icinga automatisch gelöscht."
 
-#: /vagrant/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:114
+#: /vagrant/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:119
 msgid ""
 "If you want the acknowledgement to remain until the host or service recovers "
 "even if the host or service changes state, check this option."
@@ -1922,14 +1959,15 @@ msgstr ""
 "Aktivieren Sie diese Option, wenn keine weiteren Benachrichtigungen "
 "versendet werden sollen, bis der Host/Service sich erholt hat."
 
-#: /vagrant/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:51
-#: /vagrant/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:44
+#: /vagrant/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:54
+#: /vagrant/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:48
+#: /vagrant/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:45
 #: /vagrant/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:67
-#: /vagrant/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:45
+#, fuzzy
 msgid ""
 "If you work with other administrators, you may find it useful to share "
-"information about the host or service that is having problems. Make sure you "
-"enter a brief description of what you are doing."
+"information about the the host or service that is having problems. Make sure "
+"you enter a brief description of what you are doing."
 msgstr ""
 "Wenn Sie mit anderen Administratoren zusammenarbeiten, werden Sie es "
 "nützlich finden, Informationen zu Hosts oder Services mit Problemen "
@@ -1937,7 +1975,7 @@ msgstr ""
 "arbeiten. Stellen Sie sicher, hier eine kurze Beschreibung zu Ihrer "
 "Tätigkeit einzutragen."
 
-#: /vagrant/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:63
+#: /vagrant/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:67
 msgid ""
 "If you would like the comment to remain even when the acknowledgement is "
 "removed, check this option."
@@ -1945,10 +1983,8 @@ msgstr ""
 "Aktivieren Sie diese Option, wenn der Kommentar auch nach dem Löschen der "
 "Bestätigung bestehen bleiben soll"
 
-#: /vagrant/modules/monitoring/application/views/helpers/HostFlags.php:25
-#: /vagrant/modules/monitoring/application/views/helpers/ServiceFlags.php:21
-#: /vagrant/modules/monitoring/application/views/scripts/partials/host/statusicons.phtml:17
-#: /vagrant/modules/monitoring/application/views/scripts/partials/service/statusicons.phtml:17
+#: /vagrant/modules/monitoring/application/views/helpers/HostFlags.php:22
+#: /vagrant/modules/monitoring/application/views/helpers/ServiceFlags.php:22
 msgid "In Downtime"
 msgstr "In einer Downtime"
 
@@ -1971,11 +2007,11 @@ msgstr ""
 msgid "Instance"
 msgstr "Instanz"
 
-#: /vagrant/modules/monitoring/application/forms/Config/TransportConfigForm.php:203
+#: /vagrant/modules/monitoring/application/forms/Config/TransportConfigForm.php:201
 msgid "Instance Link"
 msgstr "Instanzverknüpfung"
 
-#: /vagrant/modules/monitoring/application/forms/Config/TransportConfigForm.php:84
+#: /vagrant/modules/monitoring/application/forms/Config/TransportConfigForm.php:88
 #, php-format
 msgid "Invalid command transport type \"%s\" given"
 msgstr "Ungültige Befehlsschnittstelle “%s” angegeben"
@@ -1987,7 +2023,7 @@ msgstr ""
 "Ungültiger Filter angegeben. Sie können nur die folgenden Spalten verwenden: "
 "%s"
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:226
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:246
 msgid "Is In Effect"
 msgstr "Ist aktiv"
 
@@ -2009,7 +2045,7 @@ msgstr ""
 msgid "Label"
 msgstr "Label"
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:97
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:91
 msgid "Last Check"
 msgstr "Letzter Check"
 
@@ -2017,7 +2053,7 @@ msgstr "Letzter Check"
 msgid "Last External Command Check"
 msgstr "Letzter Check für externes Kommando"
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:168
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:177
 msgid "Last Host Check"
 msgstr "Letzter Host-Check"
 
@@ -2025,12 +2061,12 @@ msgstr "Letzter Host-Check"
 msgid "Last Log File Rotation"
 msgstr "Letzte Logdateirotation"
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:162
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:171
 msgid "Last Service Check"
 msgstr "Letzter Service-Check"
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:98
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:163
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:92
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:172
 #, fuzzy
 msgid "Last State Change"
 msgstr "Zustandsänderungen"
@@ -2063,21 +2099,21 @@ msgstr "Latenz"
 msgid "Legend"
 msgstr "Legende"
 
+#: /vagrant/modules/monitoring/application/views/scripts/show/components/notes.phtml:17
+#: /vagrant/modules/monitoring/application/views/scripts/show/components/notes.phtml:18
 #: /vagrant/modules/monitoring/application/views/scripts/show/components/actions.phtml:17
 #: /vagrant/modules/monitoring/application/views/scripts/show/components/actions.phtml:18
-#: /vagrant/modules/monitoring/application/views/scripts/show/components/notes.phtml:23
-#: /vagrant/modules/monitoring/application/views/scripts/show/components/notes.phtml:24
 msgid "Link opens in new window"
 msgstr "Link öffnet sich in einem neuen Fenster"
 
-#: /vagrant/modules/monitoring/application/views/scripts/list/hosts.phtml:77
+#: /vagrant/modules/monitoring/application/views/scripts/list/hosts.phtml:73
 #, php-format
 msgid "List %s unhandled service problem on host %s"
 msgid_plural "List %s unhandled service problems on host %s"
 msgstr[0] "Zeige %s unbestätigtes Serviceproblem auf Host %s"
 msgstr[1] "Zeige %s unbestätigte Serviceprobleme auf Host %s"
 
-#: /vagrant/modules/monitoring/application/views/scripts/timeline/index.phtml:112
+#: /vagrant/modules/monitoring/application/views/scripts/timeline/index.phtml:110
 #, php-format
 msgctxt "timeline.link.title"
 msgid "List %u %s registered %s"
@@ -2415,7 +2451,7 @@ msgstr "Zeige alle Services in der Gruppe “%s”"
 msgid "List all services of all hosts in host group \"%s\""
 msgstr "Zeige alle Services von allen Hosts in der Hostgruppe %s"
 
-#: /vagrant/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:209
+#: /vagrant/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:231
 #, php-format
 msgid "List all services on host %s"
 msgstr "Zeige alle Services von Host %s"
@@ -2437,15 +2473,15 @@ msgstr "Zeige alle Hosts, für die Benachrichtigungen aktiv sind"
 msgid "List all services, which are processing event handlers entirely"
 msgstr "Zeige alle Hosts, welche Eventhandler verarbeiten"
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:390
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:412
 msgid "List comments"
 msgstr "Zeige Kommentare"
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:350
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:383
 msgid "List contact groups"
 msgstr "Zeige Kontaktgruppen"
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:279
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:309
 msgid "List contacts"
 msgstr "Zeige Kontakte"
 
@@ -2454,39 +2490,39 @@ msgstr "Zeige Kontakte"
 msgid "List contacts in contact-group \"%s\""
 msgstr "Zeige Kontakte in der Kontaktgruppe “%s”"
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:194
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:213
 msgid "List downtimes"
 msgstr "Zeige Downtimes"
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:509
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:549
 msgid "List event records"
 msgstr "Zeige Ereigniseinträge"
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:467
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:504
 msgid "List host groups"
 msgstr "Zeige Hostgruppen"
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:54
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:49
 msgid "List hosts"
 msgstr "Zeige Hosts"
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:252
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:274
 msgid "List notifications"
 msgstr "Zeige Benachrichtigungen"
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:435
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:464
 msgid "List service groups"
 msgstr "Servicegruppen auflisten"
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:120
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:124
 msgid "List services"
 msgstr "Zeige Services"
 
-#: /vagrant/modules/monitoring/library/Monitoring/BackendStep.php:119
+#: /vagrant/modules/monitoring/library/Monitoring/BackendStep.php:157
 msgid "Livestatus Resource"
 msgstr "Livestatus Ressource"
 
-#: /vagrant/modules/monitoring/application/views/scripts/partials/event-history.phtml:170
+#: /vagrant/modules/monitoring/application/views/scripts/partials/event-history.phtml:202
 msgid "Load More"
 msgstr "Mehr laden"
 
@@ -2495,11 +2531,7 @@ msgstr "Mehr laden"
 msgid "Load more"
 msgstr "Mehr laden"
 
-#: /vagrant/modules/monitoring/application/views/scripts/config/index.phtml:95
-msgid "Local"
-msgstr "lokal"
-
-#: /vagrant/modules/monitoring/application/forms/Config/TransportConfigForm.php:225
+#: /vagrant/modules/monitoring/application/forms/Config/TransportConfigForm.php:223
 msgid "Local Command File"
 msgstr "lokale Kommandodatei"
 
@@ -2525,11 +2557,11 @@ msgid "Minutes"
 msgstr "Minuten"
 
 #: /vagrant/modules/monitoring/application/views/scripts/config/index.phtml:21
-#: /vagrant/modules/monitoring/library/Monitoring/BackendStep.php:73
 msgid "Monitoring Backend"
 msgstr "Monitoring-Backend"
 
 #: /vagrant/modules/monitoring/application/forms/Setup/BackendPage.php:14
+#: /vagrant/modules/monitoring/library/Monitoring/BackendStep.php:73
 msgctxt "setup.page.title"
 msgid "Monitoring Backend"
 msgstr "Monitoring-Backend"
@@ -2557,36 +2589,33 @@ msgctxt "setup.page.title"
 msgid "Monitoring Livestatus Resource"
 msgstr "Monitoring-Livestatus-Ressource"
 
-#: /vagrant/modules/monitoring/library/Monitoring/SecurityStep.php:42
-msgid "Monitoring Security"
-msgstr "Monitoring-Sicherheit"
-
 #: /vagrant/modules/monitoring/application/forms/Setup/SecurityPage.php:14
+#: /vagrant/modules/monitoring/library/Monitoring/SecurityStep.php:42
 msgctxt "setup.page.title"
 msgid "Monitoring Security"
 msgstr "Monitoring-Sicherheit"
 
-#: /vagrant/modules/monitoring/application/controllers/ConfigController.php:69
+#: /vagrant/modules/monitoring/application/controllers/ConfigController.php:79
 #, php-format
 msgid "Monitoring backend \"%s\" not found"
 msgstr "Das Monitoring-Backend “%s” wurde nicht gefunden"
 
-#: /vagrant/modules/monitoring/application/controllers/ConfigController.php:139
+#: /vagrant/modules/monitoring/application/controllers/ConfigController.php:149
 #, php-format
 msgid "Monitoring backend \"%s\" successfully removed"
 msgstr "Das Monitoring-Backend “%s” wurde erfolgreich entfernt"
 
-#: /vagrant/modules/monitoring/application/controllers/ConfigController.php:58
+#: /vagrant/modules/monitoring/application/controllers/ConfigController.php:68
 #, php-format
 msgid "Monitoring backend \"%s\" successfully updated"
 msgstr "Das Monitoring-Backend “%s” wurde erfolgreich aktualisiert"
 
-#: /vagrant/modules/monitoring/library/Monitoring/Web/Navigation/Renderer/BackendAvailabilityNavigationItemRenderer.php:66
+#: /vagrant/modules/monitoring/library/Monitoring/Web/Navigation/Renderer/BackendAvailabilityNavigationItemRenderer.php:55
 #, php-format
 msgid "Monitoring backend %s is not running"
 msgstr "Das Monitoring-Backend %s läuft nicht"
 
-#: /vagrant/modules/monitoring/library/Monitoring/BackendStep.php:151
+#: /vagrant/modules/monitoring/library/Monitoring/BackendStep.php:189
 #, php-format
 msgid ""
 "Monitoring backend configuration could not be written to: %s. An error "
@@ -2595,14 +2624,14 @@ msgstr ""
 "Die Konfiguration für das Monitoring-Backend konnte nicht nach “%s” "
 "geschrieben werden. Ein Fehler ist aufgetreten:"
 
-#: /vagrant/modules/monitoring/library/Monitoring/BackendStep.php:144
+#: /vagrant/modules/monitoring/library/Monitoring/BackendStep.php:182
 #, php-format
 msgid "Monitoring backend configuration has been successfully written to: %s"
 msgstr ""
 "Die Konfiguration für das Monitoring-Backend wurde erfolgreich nach “%s” "
 "geschrieben."
 
-#: /vagrant/modules/monitoring/application/controllers/ConfigController.php:106
+#: /vagrant/modules/monitoring/application/controllers/ConfigController.php:116
 msgid "Monitoring backend successfully created"
 msgstr "Monitoring-Backend erfolgreich angelegt"
 
@@ -2638,12 +2667,12 @@ msgstr ""
 msgid "N/A"
 msgstr "Nicht verfügbar"
 
-#: /vagrant/modules/monitoring/application/views/scripts/partials/event-history.phtml:45
+#: /vagrant/modules/monitoring/application/views/scripts/partials/event-history.phtml:51
 msgid "NOTIFICATION"
 msgstr ""
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:296
-#: /vagrant/modules/monitoring/application/views/scripts/list/contacts.phtml:17
+#: /vagrant/modules/monitoring/application/views/scripts/list/contacts.phtml:20
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:326
 msgid "Name"
 msgstr "Name"
 
@@ -2682,18 +2711,19 @@ msgstr "Zu diesem Filter wurden keine Kommentare gefunden"
 msgid "No configuration for backend %s"
 msgstr "Keine Konfiguration für Backend %s"
 
-#: /vagrant/modules/monitoring/application/views/scripts/list/contactgroups.phtml:17
-msgid "No contactgroups found matching the filter"
+#: /vagrant/modules/monitoring/application/views/scripts/list/contactgroups.phtml:16
+#, fuzzy
+msgid "No contact groups found matching the filter"
 msgstr "Zu diesem Filter wurden keine Kontaktgruppen gefunden"
 
-#: /vagrant/modules/monitoring/application/views/scripts/list/contacts.phtml:77
+#: /vagrant/modules/monitoring/application/views/scripts/list/contacts.phtml:14
 msgid "No contacts found matching the filter"
 msgstr "Zu diesem Filter wurden keine Kontakte gefunden"
 
-#: /vagrant/modules/monitoring/application/views/scripts/list/downtimes.phtml:41
-msgid ""
-"No downtimes found matching the filter, maybe the downtime already expired."
-msgstr "Zu diesem Filter wurden keine Downtimes gefunden."
+#: /vagrant/modules/monitoring/application/views/scripts/list/downtimes.phtml:19
+#, fuzzy
+msgid "No downtimes found matching the filter."
+msgstr "Zu diesem Filter wurden keine Downtimes gefunden"
 
 #: /vagrant/modules/monitoring/application/views/scripts/partials/event-history.phtml:31
 #, fuzzy
@@ -2708,7 +2738,7 @@ msgstr "Zu diesem Filter wurden keine Hostgruppen gefunden"
 msgid "No hosts found matching the filter"
 msgstr "Zu diesem Filter wurden keine Hosts gefunden"
 
-#: /vagrant/modules/monitoring/application/views/scripts/list/hosts.phtml:21
+#: /vagrant/modules/monitoring/application/views/scripts/list/hosts.phtml:17
 msgid "No hosts found matching the filter."
 msgstr "Zu diesem Filter wurden keine Hosts gefunden."
 
@@ -2735,12 +2765,12 @@ msgid "No services found matching the filter"
 msgstr "Zu diesem Filter wurden keine Servicegruppen gefundenn"
 
 #: /vagrant/modules/monitoring/application/views/scripts/list/servicegrid.phtml:14
-#: /vagrant/modules/monitoring/application/views/scripts/list/services.phtml:22
+#: /vagrant/modules/monitoring/application/views/scripts/list/services.phtml:18
 #, fuzzy
 msgid "No services found matching the filter."
 msgstr "Zu diesem Filter wurden keine Servicegruppen gefundenn"
 
-#: /vagrant/modules/monitoring/application/views/scripts/list/eventgrid.phtml:81
+#: /vagrant/modules/monitoring/application/views/scripts/list/eventgrid.phtml:77
 msgid "No state changes in the selected time period."
 msgstr "Keine Zustandsänderungen im gewählten Zeitabschnitt"
 
@@ -2748,12 +2778,14 @@ msgstr "Keine Zustandsänderungen im gewählten Zeitabschnitt"
 msgid "No such contact"
 msgstr "Der gewünschte Kontakt existiert nicht"
 
-#: /vagrant/modules/monitoring/library/Monitoring/SecurityStep.php:56
+#: /vagrant/modules/monitoring/application/forms/Config/TransportConfigForm.php:196
+msgctxt "command transport instance association"
 msgid "None"
 msgstr "Keines"
 
-#: /vagrant/modules/monitoring/application/forms/Config/TransportConfigForm.php:198
-msgctxt "command transport instance association"
+#: /vagrant/modules/monitoring/library/Monitoring/SecurityStep.php:56
+#, fuzzy
+msgctxt "monitoring.protected_customvars"
 msgid "None"
 msgstr "Keines"
 
@@ -2770,39 +2802,48 @@ msgstr "Nicht erreichbar"
 msgid "Not sent out to any contact"
 msgstr "Diese Benachrichtigung wurde an keinen Kontakt gesendet."
 
-#: /vagrant/modules/monitoring/application/views/scripts/show/components/notes.phtml:43
+#: /vagrant/modules/monitoring/application/views/scripts/show/components/notes.phtml:37
 msgid "Notes"
 msgstr "Bemerkungen"
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:273
+#: /vagrant/modules/monitoring/application/views/scripts/partials/object/quick-actions.phtml:80
+#: /vagrant/modules/monitoring/application/views/scripts/partials/object/quick-actions.phtml:94
+msgid "Notification"
+msgstr "Benachrichtigung"
+
+#: /vagrant/modules/monitoring/application/views/scripts/partials/event-history.phtml:50
+#, fuzzy
+msgctxt "tooltip"
+msgid "Notification"
+msgstr "Benachrichtigung"
+
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:295
 msgid "Notification Start"
 msgstr "Benachrichtigungsanfang"
 
-#: /vagrant/modules/monitoring/configuration.php:220
+#: /vagrant/modules/monitoring/configuration.php:224
+#: /vagrant/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:129
+#: /vagrant/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:131
+#: /vagrant/modules/monitoring/application/views/scripts/show/components/notifications.phtml:2
+#: /vagrant/modules/monitoring/application/views/scripts/partials/object/detail-content.phtml:24
+#: /vagrant/modules/monitoring/application/views/scripts/hosts/show.phtml:137
+#: /vagrant/modules/monitoring/application/views/scripts/hosts/show.phtml:141
+#: /vagrant/modules/monitoring/application/views/scripts/services/show.phtml:138
+#: /vagrant/modules/monitoring/application/views/scripts/services/show.phtml:143
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:273
 #: /vagrant/modules/monitoring/application/controllers/AlertsummaryController.php:329
 #: /vagrant/modules/monitoring/application/controllers/AlertsummaryController.php:424
 #: /vagrant/modules/monitoring/application/controllers/AlertsummaryController.php:467
 #: /vagrant/modules/monitoring/application/controllers/AlertsummaryController.php:474
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:251
-#: /vagrant/modules/monitoring/application/controllers/TimelineController.php:50
+#: /vagrant/modules/monitoring/application/controllers/TimelineController.php:51
 #: /vagrant/modules/monitoring/application/forms/EventOverviewForm.php:74
-#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:123
+#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:126
 #: /vagrant/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:50
-#: /vagrant/modules/monitoring/application/views/scripts/hosts/show.phtml:137
-#: /vagrant/modules/monitoring/application/views/scripts/hosts/show.phtml:141
-#: /vagrant/modules/monitoring/application/views/scripts/partials/object/detail-content.phtml:24
-#: /vagrant/modules/monitoring/application/views/scripts/services/show.phtml:138
-#: /vagrant/modules/monitoring/application/views/scripts/services/show.phtml:143
-#: /vagrant/modules/monitoring/application/views/scripts/show/components/notifications.phtml:2
-#: /vagrant/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:129
-#: /vagrant/modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml:131
 msgid "Notifications"
 msgstr "Benachrichtigungen"
 
-#: /vagrant/modules/monitoring/application/views/helpers/HostFlags.php:22
-#: /vagrant/modules/monitoring/application/views/helpers/ServiceFlags.php:18
-#: /vagrant/modules/monitoring/application/views/scripts/partials/host/statusicons.phtml:13
-#: /vagrant/modules/monitoring/application/views/scripts/partials/service/statusicons.phtml:13
+#: /vagrant/modules/monitoring/application/views/helpers/HostFlags.php:19
+#: /vagrant/modules/monitoring/application/views/helpers/ServiceFlags.php:19
 msgid "Notifications Disabled"
 msgstr "Benachrichtigungen inaktiv"
 
@@ -2819,12 +2860,17 @@ msgstr "Benachrichtigungen und durchschnittliche Reaktionszeiten pro Stunden."
 msgid "Notifications and defects per hour"
 msgstr "Benachrichtigungen per Stunde"
 
+#: /vagrant/modules/monitoring/library/Monitoring/Web/Navigation/Renderer/BackendAvailabilityNavigationItemRenderer.php:49
+#, fuzzy
+msgid "Notifications are disabled"
+msgstr "Benachrichtigungen inaktiv"
+
 #: /vagrant/modules/monitoring/application/views/scripts/show/contact.phtml:58
 #, fuzzy
 msgid "Notifications sent to this contact"
 msgstr "Für dieses Problem wurde keine Benachrichtigung gesendet"
 
-#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:74
+#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:78
 #, php-format
 msgid "Notifications will be re-enabled in <strong>%s</strong>"
 msgstr "Benachrichtigungen werden reaktiviert in <strong>%s</strong>"
@@ -2834,7 +2880,7 @@ msgstr "Benachrichtigungen werden reaktiviert in <strong>%s</strong>"
 msgid "Notifications will be re-enabled in <strong>%s</strong>."
 msgstr "Benachrichtigungen werden reaktiviert in <strong>%s</strong>."
 
-#: /vagrant/modules/monitoring/library/Monitoring/Object/Service.php:190
+#: /vagrant/modules/monitoring/library/Monitoring/Object/Service.php:191
 msgid "OK"
 msgstr "OK"
 
@@ -2843,7 +2889,7 @@ msgctxt "icinga.state"
 msgid "OK"
 msgstr "OK"
 
-#: /vagrant/modules/monitoring/application/forms/StatehistoryForm.php:96
+#: /vagrant/modules/monitoring/application/forms/StatehistoryForm.php:94
 msgid "Object type"
 msgstr "Objekttyp"
 
@@ -2851,40 +2897,39 @@ msgstr "Objekttyp"
 msgid "Obsessing"
 msgstr "Verfolgung"
 
-#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:146
+#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:149
 msgid "Obsessing Over Hosts"
 msgstr "Host-Checks verfolgen"
 
-#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:155
+#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:158
 msgid "Obsessing Over Services"
 msgstr "Service-Checks verfolgen"
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:530
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:570
 msgid "Occurence"
 msgstr "Vorkommen"
 
-#: /vagrant/modules/monitoring/application/controllers/ChartController.php:243
-#: /vagrant/modules/monitoring/application/forms/StatehistoryForm.php:120
+#: /vagrant/modules/monitoring/application/forms/StatehistoryForm.php:117
 msgid "Ok"
 msgstr "Ok"
 
 #: /vagrant/modules/monitoring/application/controllers/AlertsummaryController.php:535
-#: /vagrant/modules/monitoring/application/controllers/TimelineController.php:104
+#: /vagrant/modules/monitoring/application/controllers/TimelineController.php:103
 msgid "One day"
 msgstr "Ein Tag"
 
 #: /vagrant/modules/monitoring/application/controllers/AlertsummaryController.php:537
-#: /vagrant/modules/monitoring/application/controllers/TimelineController.php:106
+#: /vagrant/modules/monitoring/application/controllers/TimelineController.php:105
 msgid "One month"
 msgstr "Ein Monat"
 
 #: /vagrant/modules/monitoring/application/controllers/AlertsummaryController.php:536
-#: /vagrant/modules/monitoring/application/controllers/TimelineController.php:105
+#: /vagrant/modules/monitoring/application/controllers/TimelineController.php:104
 msgid "One week"
 msgstr "Eine Woche"
 
 #: /vagrant/modules/monitoring/application/controllers/AlertsummaryController.php:538
-#: /vagrant/modules/monitoring/application/controllers/TimelineController.php:107
+#: /vagrant/modules/monitoring/application/controllers/TimelineController.php:106
 msgid "One year"
 msgstr "Ein Jahr"
 
@@ -2896,34 +2941,34 @@ msgstr "Check Ausgabe"
 msgid "Overdue"
 msgstr "Überfällig"
 
-#: /vagrant/modules/monitoring/configuration.php:164
+#: /vagrant/modules/monitoring/configuration.php:168
 msgid "Overview"
 msgstr "Übersicht"
 
 #: /vagrant/modules/monitoring/library/Monitoring/Object/Host.php:191
-#: /vagrant/modules/monitoring/library/Monitoring/Object/Service.php:202
+#: /vagrant/modules/monitoring/library/Monitoring/Object/Service.php:203
 msgid "PENDING"
 msgstr "PENDING"
 
-#: /vagrant/modules/monitoring/application/views/scripts/list/contacts.phtml:19
+#: /vagrant/modules/monitoring/application/views/scripts/list/contacts.phtml:22
 #: /vagrant/modules/monitoring/application/views/scripts/show/contact.phtml:34
 msgid "Pager"
 msgstr "Pager"
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:299
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:329
 msgid "Pager Address / Number"
 msgstr "Pageradresse/-nummer"
 
-#: /vagrant/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:42
 #: /vagrant/modules/monitoring/application/views/scripts/health/stats.phtml:141
+#: /vagrant/modules/monitoring/application/forms/Command/Object/ToggleObjectFeaturesCommandForm.php:42
 msgid "Passive Checks"
 msgstr "Passive Checks"
 
-#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:164
+#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:167
 msgid "Passive Host Checks"
 msgstr "Passive Host-Checks"
 
-#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:173
+#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:176
 msgid "Passive Service Checks"
 msgstr "Passive Service-Checks"
 
@@ -2932,6 +2977,7 @@ msgid "Passive checks"
 msgstr "Passive Checks"
 
 #: /vagrant/modules/monitoring/library/Monitoring/BackendStep.php:113
+#: /vagrant/modules/monitoring/library/Monitoring/TransportStep.php:106
 msgid "Password"
 msgstr "Passwort"
 
@@ -2947,7 +2993,7 @@ msgstr "Pfad zur lokalen Icinga Kommandodatei"
 msgid "Per Host"
 msgstr "pro Host"
 
-#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:184
+#: /vagrant/modules/monitoring/application/forms/Command/Instance/ToggleInstanceFeaturesCommandForm.php:187
 #: /vagrant/modules/monitoring/application/forms/Command/Object/ProcessCheckResultCommandForm.php:77
 msgid "Performance Data"
 msgstr "Performancedaten"
@@ -2956,12 +3002,12 @@ msgstr "Performancedaten"
 msgid "Performance data"
 msgstr "Performancedaten"
 
-#: /vagrant/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:55
 #: /vagrant/modules/monitoring/application/views/scripts/comment/show.phtml:47
+#: /vagrant/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:56
 msgid "Persistent"
 msgstr "Persisten"
 
-#: /vagrant/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:61
+#: /vagrant/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:64
 msgid "Persistent Comment"
 msgstr "Persistenter Kommentar"
 
@@ -3001,8 +3047,10 @@ msgstr ""
 msgid "Plugin Output"
 msgstr "Ausgabe des Plugins"
 
+#: /vagrant/modules/monitoring/application/forms/Config/Transport/ApiTransportForm.php:40
 #: /vagrant/modules/monitoring/application/forms/Config/Transport/RemoteTransportForm.php:150
 #: /vagrant/modules/monitoring/library/Monitoring/BackendStep.php:101
+#: /vagrant/modules/monitoring/library/Monitoring/TransportStep.php:98
 msgid "Port"
 msgstr "Port"
 
@@ -3025,7 +3073,7 @@ msgstr "Problembehandlung"
 msgid "Problem handling"
 msgstr "Problembehandlung"
 
-#: /vagrant/modules/monitoring/configuration.php:120
+#: /vagrant/modules/monitoring/configuration.php:124
 msgid "Problems"
 msgstr "Probleme"
 
@@ -3039,10 +3087,10 @@ msgstr "Prozessinformation"
 msgid "Process Information"
 msgstr "Prozessinformation"
 
-#: /vagrant/modules/monitoring/application/views/scripts/hosts/show.phtml:166
-#: /vagrant/modules/monitoring/application/views/scripts/services/show.phtml:168
 #: /vagrant/modules/monitoring/application/views/scripts/show/components/command.phtml:21
 #: /vagrant/modules/monitoring/application/views/scripts/show/components/command.phtml:33
+#: /vagrant/modules/monitoring/application/views/scripts/hosts/show.phtml:166
+#: /vagrant/modules/monitoring/application/views/scripts/services/show.phtml:168
 msgid "Process check result"
 msgstr "Checkergebnis verarbeiten"
 
@@ -3069,29 +3117,25 @@ msgstr "Geschützte Customvariablen"
 msgid "Recently Recovered Services"
 msgstr "Vor kurzem erholte Services"
 
-#: /vagrant/modules/monitoring/application/views/scripts/config/index.phtml:95
-msgid "Remote"
-msgstr "Remote"
-
-#: /vagrant/modules/monitoring/application/forms/Config/TransportConfigForm.php:226
+#: /vagrant/modules/monitoring/application/forms/Config/TransportConfigForm.php:224
 msgid "Remote Command File"
 msgstr "Remote Kommandodatei"
 
-#: /vagrant/modules/monitoring/library/Monitoring/TransportStep.php:59
+#: /vagrant/modules/monitoring/library/Monitoring/TransportStep.php:69
 #, fuzzy
 msgid "Remote Host"
 msgstr "Remote SSH Port"
 
-#: /vagrant/modules/monitoring/library/Monitoring/TransportStep.php:63
+#: /vagrant/modules/monitoring/library/Monitoring/TransportStep.php:73
 msgid "Remote SSH Port"
 msgstr "Remote SSH Port"
 
-#: /vagrant/modules/monitoring/library/Monitoring/TransportStep.php:67
+#: /vagrant/modules/monitoring/library/Monitoring/TransportStep.php:77
 msgid "Remote SSH User"
 msgstr "Remote SSH Benutzer"
 
-#: /vagrant/modules/monitoring/application/forms/Command/Object/DeleteCommentsCommandForm.php:63
 #: /vagrant/modules/monitoring/application/forms/Command/Object/DeleteDowntimesCommandForm.php:63
+#: /vagrant/modules/monitoring/application/forms/Command/Object/DeleteCommentsCommandForm.php:63
 msgid "Remove"
 msgid_plural "Remove All"
 msgstr[0] "Entfernen"
@@ -3102,26 +3146,34 @@ msgstr[1] "Alles entfernen"
 msgid "Remove %d comments"
 msgstr "Entferne %d Kommentare"
 
-#: /vagrant/modules/monitoring/application/controllers/ConfigController.php:162
+#: /vagrant/modules/monitoring/application/controllers/ConfigController.php:172
 #, php-format
 msgid "Remove Command Transport %s"
 msgstr "Entferne Befehlsschnittstelle %s"
 
-#: /vagrant/modules/monitoring/application/controllers/ConfigController.php:129
+#: /vagrant/modules/monitoring/application/controllers/ConfigController.php:139
 #, php-format
 msgid "Remove Monitoring Backend %s"
 msgstr "Entferne Monitoringbackend %s"
 
+#: /vagrant/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php:73
+#: /vagrant/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php:92
+#, fuzzy
+msgid "Remove acknowledgement"
+msgid_plural "Remove acknowledgements"
+msgstr[0] "Bestätigung entfernen"
+msgstr[1] "Bestätigung entfernen"
+
 #: /vagrant/modules/monitoring/application/views/scripts/downtimes/show.phtml:11
 #, php-format
 msgid "Remove all %d scheduled downtimes"
 msgstr "Entferne alle %d geplanten Downtimes"
 
-#: /vagrant/modules/monitoring/application/controllers/CommentsController.php:93
+#: /vagrant/modules/monitoring/application/controllers/CommentsController.php:94
 msgid "Remove all Comments"
 msgstr "Entferne alle Kommentare"
 
-#: /vagrant/modules/monitoring/application/controllers/DowntimesController.php:97
+#: /vagrant/modules/monitoring/application/controllers/DowntimesController.php:98
 msgid "Remove all Downtimes"
 msgstr "Entferne alle Downtimes"
 
@@ -3143,16 +3195,10 @@ msgstr "Befehlsschnittstelle %s entfernen"
 msgid "Remove monitoring backend %s"
 msgstr "Entferne Monitoringbackend %s"
 
-#: /vagrant/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php:73
-#: /vagrant/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php:92
-msgid "Remove problem acknowledgement"
-msgid_plural "Remove problem acknowledgements"
-msgstr[0] "Entferne Problembestätigung"
-msgstr[1] "Problembestätigung entfernen"
-
 #: /vagrant/modules/monitoring/application/forms/Command/Object/RemoveAcknowledgementCommandForm.php:114
-msgid "Removing problem acknowledgement.."
-msgid_plural "Removing problem acknowledgements.."
+#, fuzzy
+msgid "Removing acknowledgement.."
+msgid_plural "Removing acknowledgements.."
 msgstr[0] "Entferne Problembestätigung.."
 msgstr[1] "Problembestätigung entfernen"
 
@@ -3160,14 +3206,14 @@ msgstr[1] "Problembestätigung entfernen"
 msgid "Report interval"
 msgstr "Berichtintervall"
 
-#: /vagrant/modules/monitoring/configuration.php:232
+#: /vagrant/modules/monitoring/configuration.php:236
 msgid "Reporting"
 msgstr "Berichte"
 
-#: /vagrant/modules/monitoring/application/views/scripts/hosts/show.phtml:188
-#: /vagrant/modules/monitoring/application/views/scripts/services/show.phtml:190
 #: /vagrant/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:34
 #: /vagrant/modules/monitoring/application/views/scripts/show/components/checkstatistics.phtml:48
+#: /vagrant/modules/monitoring/application/views/scripts/hosts/show.phtml:188
+#: /vagrant/modules/monitoring/application/views/scripts/services/show.phtml:190
 msgid "Reschedule"
 msgstr "Neu planen"
 
@@ -3175,7 +3221,7 @@ msgstr "Neu planen"
 msgid "Reschedule Host Check"
 msgstr "Host-Check neu planen"
 
-#: /vagrant/modules/monitoring/application/controllers/HostsController.php:186
+#: /vagrant/modules/monitoring/application/controllers/HostsController.php:187
 msgid "Reschedule Host Checks"
 msgstr "Host-Checks neu planen"
 
@@ -3183,27 +3229,27 @@ msgstr "Host-Checks neu planen"
 msgid "Reschedule Service Check"
 msgstr "Service-Check neu planen"
 
-#: /vagrant/modules/monitoring/application/controllers/ServicesController.php:189
+#: /vagrant/modules/monitoring/application/controllers/ServicesController.php:190
 msgid "Reschedule Service Checks"
 msgstr "Service-Checks neu planen"
 
-#: /vagrant/modules/monitoring/application/forms/Config/BackendConfigForm.php:236
+#: /vagrant/modules/monitoring/application/forms/Config/BackendConfigForm.php:230
 msgid "Resource"
 msgstr "Ressource"
 
 #: /vagrant/modules/monitoring/library/Monitoring/BackendStep.php:89
-#: /vagrant/modules/monitoring/library/Monitoring/BackendStep.php:124
+#: /vagrant/modules/monitoring/library/Monitoring/BackendStep.php:162
 msgid "Resource Name"
 msgstr "Ressourcenname"
 
-#: /vagrant/modules/monitoring/library/Monitoring/BackendStep.php:165
+#: /vagrant/modules/monitoring/library/Monitoring/BackendStep.php:203
 #, php-format
 msgid "Resource configuration could not be udpated: %s. An error occured:"
 msgstr ""
 "Die Resourcenkonfiguration konnte nicht aktualisiert werden: %s. Ein Fehler "
 "ist aufgetreten:"
 
-#: /vagrant/modules/monitoring/library/Monitoring/BackendStep.php:160
+#: /vagrant/modules/monitoring/library/Monitoring/BackendStep.php:198
 #, php-format
 msgid "Resource configuration has been successfully updated: %s"
 msgstr "Die Ressourcenkonfiguration wurde erfolgreich aktualisiert: %s"
@@ -3217,7 +3263,7 @@ msgstr "Beschränke die Sicht auf die Icingaobjekte, die dem Filter entsprechen"
 msgid "Runtime Variables"
 msgstr "Laufzeitvariablen"
 
-#: /vagrant/modules/monitoring/application/views/scripts/partials/event-history.phtml:73
+#: /vagrant/modules/monitoring/application/views/scripts/partials/event-history.phtml:83
 msgid "SCHEDULED DOWNTIME"
 msgstr ""
 
@@ -3225,10 +3271,19 @@ msgstr ""
 msgid "SSH Identity"
 msgstr "SSH-Identität"
 
+#: /vagrant/modules/monitoring/application/forms/Config/Transport/ApiTransportForm.php:41
 #: /vagrant/modules/monitoring/application/forms/Config/Transport/RemoteTransportForm.php:151
 msgid "SSH port to connect to on the remote Icinga instance"
 msgstr "SSH-Port auf der entfernten Icingainstanz"
 
+#: /vagrant/modules/monitoring/library/Monitoring/BackendStep.php:127
+msgid "SSL Cert"
+msgstr "SSL-Zertifikat"
+
+#: /vagrant/modules/monitoring/library/Monitoring/BackendStep.php:120
+msgid "SSL Key"
+msgstr "SSL-Schlüssel"
+
 #: /vagrant/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml:6
 msgctxt "Downtime status"
 msgid "STARTS"
@@ -3236,7 +3291,7 @@ msgstr ""
 
 #: /vagrant/modules/monitoring/application/forms/Config/BackendConfigForm.php:42
 #: /vagrant/modules/monitoring/application/forms/Config/SecurityConfigForm.php:20
-#: /vagrant/modules/monitoring/application/forms/Config/TransportConfigForm.php:40
+#: /vagrant/modules/monitoring/application/forms/Config/TransportConfigForm.php:42
 msgid "Save Changes"
 msgstr "Änderungen speichern"
 
@@ -3249,7 +3304,7 @@ msgstr "Check planen"
 msgid "Schedule Host Downtime"
 msgstr "Host-Downtime planen"
 
-#: /vagrant/modules/monitoring/application/controllers/HostsController.php:198
+#: /vagrant/modules/monitoring/application/controllers/HostsController.php:199
 msgid "Schedule Host Downtimes"
 msgstr "Host-Downtimes planen"
 
@@ -3257,12 +3312,14 @@ msgstr "Host-Downtimes planen"
 msgid "Schedule Service Downtime"
 msgstr "Service-Downtime planen"
 
-#: /vagrant/modules/monitoring/application/controllers/ServicesController.php:201
+#: /vagrant/modules/monitoring/application/controllers/ServicesController.php:202
 msgid "Schedule Service Downtimes"
 msgstr "Service-Downtimes planen"
 
 #: /vagrant/modules/monitoring/application/views/scripts/show/components/downtime.phtml:15
 #: /vagrant/modules/monitoring/application/views/scripts/show/components/downtime.phtml:29
+#: /vagrant/modules/monitoring/application/views/scripts/partials/object/quick-actions.phtml:120
+#: /vagrant/modules/monitoring/application/views/scripts/partials/object/quick-actions.phtml:134
 msgid ""
 "Schedule a downtime to suppress all problem notifications within a specific "
 "period of time"
@@ -3276,20 +3333,20 @@ msgid_plural "Schedule checks"
 msgstr[0] "Check planen"
 msgstr[1] "Check neu planen"
 
-#: /vagrant/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php:28
+#: /vagrant/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php:32
 msgid "Schedule check for all services on the hosts and the hosts themselves."
 msgstr ""
 "Plane einen Check für alle Services auf Hosts und für die Hosts an sich."
 
-#: /vagrant/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:47
 #: /vagrant/modules/monitoring/application/views/scripts/show/components/downtime.phtml:7
 #: /vagrant/modules/monitoring/application/views/scripts/show/components/downtime.phtml:21
+#: /vagrant/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:47
 msgid "Schedule downtime"
 msgid_plural "Schedule downtimes"
 msgstr[0] "Downtime planen"
 msgstr[1] "Downtime planen"
 
-#: /vagrant/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:29
+#: /vagrant/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:30
 msgid ""
 "Schedule downtime for all services on the hosts and the hosts themselves."
 msgstr ""
@@ -3300,7 +3357,7 @@ msgstr ""
 msgid "Schedule downtimes"
 msgstr "Downtimes planen"
 
-#: /vagrant/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:48
+#: /vagrant/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:47
 msgid "Schedule non-triggered downtime for all child hosts"
 msgstr "Plane Downtime ohne Auslöser für alle Kindhosts"
 
@@ -3315,7 +3372,7 @@ msgstr ""
 msgid "Schedule the next active check to run immediately"
 msgstr "Nächsten Check sofort einplanen"
 
-#: /vagrant/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:47
+#: /vagrant/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:46
 msgid "Schedule triggered downtime for all child hosts"
 msgstr "Plane eine Downtime mit Auslöser für alle Kindhosts"
 
@@ -3324,11 +3381,11 @@ msgstr "Plane eine Downtime mit Auslöser für alle Kindhosts"
 msgid "Scheduled"
 msgstr "Geplant"
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:234
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:254
 msgid "Scheduled End"
 msgstr "Geplantes Ende"
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:233
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:253
 msgid "Scheduled Start"
 msgstr "Geplanter Start"
 
@@ -3346,13 +3403,13 @@ msgid_plural "Scheduling checks.."
 msgstr[0] "Plane Check.."
 msgstr[1] "Plane Checks.."
 
-#: /vagrant/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php:51
+#: /vagrant/modules/monitoring/application/forms/Command/Object/ScheduleHostCheckCommandForm.php:55
 msgid "Scheduling host check.."
 msgid_plural "Scheduling host checks.."
 msgstr[0] "Plane Host-Check.."
 msgstr[1] "Plane Host-Checks.."
 
-#: /vagrant/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:94
+#: /vagrant/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:108
 msgid "Scheduling host downtime.."
 msgid_plural "Scheduling host downtimes.."
 msgstr[0] "Plane Host-Downtime.."
@@ -3364,49 +3421,51 @@ msgid_plural "Scheduling service checks.."
 msgstr[0] "Plane Service-Check.."
 msgstr[1] "Plane Service-Checks.."
 
-#: /vagrant/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:207
+#: /vagrant/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:223
 msgid "Scheduling service downtime.."
 msgid_plural "Scheduling service downtimes.."
 msgstr[0] "Plane Service-Downtime.."
 msgstr[1] "Plane Service-Downtimes.."
 
-#: /vagrant/modules/monitoring/configuration.php:95
+#: /vagrant/modules/monitoring/configuration.php:99
 msgid "Security"
 msgstr "Sicherheit"
 
+#: /vagrant/modules/monitoring/application/controllers/HostsController.php:223
 #: /vagrant/modules/monitoring/application/controllers/HostController.php:178
-#: /vagrant/modules/monitoring/application/controllers/HostsController.php:222
 msgid "Send Custom Host Notification"
 msgstr "Benutzerdefinierte Benachrichtigung senden"
 
+#: /vagrant/modules/monitoring/application/controllers/ServicesController.php:226
 #: /vagrant/modules/monitoring/application/controllers/ServiceController.php:136
-#: /vagrant/modules/monitoring/application/controllers/ServicesController.php:225
 msgid "Send Custom Service Notification"
 msgstr "Benutzerdefinierte Benachrichtigung senden"
 
-#: /vagrant/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:123
+#: /vagrant/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:128
 msgid "Send Notification"
 msgstr "Benachrichtigung senden"
 
 #: /vagrant/modules/monitoring/application/views/scripts/show/components/notifications.phtml:18
+#: /vagrant/modules/monitoring/application/views/scripts/partials/object/quick-actions.phtml:88
 msgid "Send a custom notification to contacts responsible for this host"
 msgstr ""
 "Benutzerdefinierte Benachrichtigung an Verantwortliche für diesen Host senden"
 
 #: /vagrant/modules/monitoring/application/views/scripts/show/components/notifications.phtml:33
+#: /vagrant/modules/monitoring/application/views/scripts/partials/object/quick-actions.phtml:102
 msgid "Send a custom notification to contacts responsible for this service"
 msgstr ""
 "Benutzerdefinierte Benachrichtigung an Verantwortliche für diesen Service "
 "senden"
 
-#: /vagrant/modules/monitoring/application/views/scripts/list/contacts.phtml:39
-#: /vagrant/modules/monitoring/application/views/scripts/list/contacts.phtml:40
+#: /vagrant/modules/monitoring/application/views/scripts/list/contacts.phtml:44
+#: /vagrant/modules/monitoring/application/views/scripts/list/contacts.phtml:45
 #: /vagrant/modules/monitoring/application/views/scripts/show/contact.phtml:26
 #, php-format
 msgid "Send a mail to %s"
 msgstr "Sende eine E-Mail an %s"
 
-#: /vagrant/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:29
+#: /vagrant/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:30
 msgid "Send custom notification"
 msgid_plural "Send custom notifications"
 msgstr[0] "Benutzerdefinierte Benachrichtigung senden"
@@ -3423,7 +3482,7 @@ msgstr "Benachrichtigung senden"
 msgid "Send notifications"
 msgstr "Benachrichtigung senden"
 
-#: /vagrant/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:95
+#: /vagrant/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:104
 msgid "Sending custom notification.."
 msgid_plural "Sending custom notifications.."
 msgstr[0] "Benutzerdefinierte Benachrichtigung senden"
@@ -3434,23 +3493,23 @@ msgstr[1] "Sende Benutzerdefinierte Benachrichtigung.."
 msgid "Sent to %s"
 msgstr "Gesendet an %s"
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:228
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:417
+#: /vagrant/modules/monitoring/application/views/scripts/list/notifications.phtml:44
 #: /vagrant/modules/monitoring/application/views/scripts/comment/show.phtml:17
 #: /vagrant/modules/monitoring/application/views/scripts/comment/show.phtml:19
-#: /vagrant/modules/monitoring/application/views/scripts/downtime/show.phtml:15
-#: /vagrant/modules/monitoring/application/views/scripts/downtime/show.phtml:26
-#: /vagrant/modules/monitoring/application/views/scripts/list/notifications.phtml:44
 #: /vagrant/modules/monitoring/application/views/scripts/partials/comment/comment-detail.phtml:3
 #: /vagrant/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml:13
 #: /vagrant/modules/monitoring/application/views/scripts/partials/object/service-header.phtml:48
+#: /vagrant/modules/monitoring/application/views/scripts/downtime/show.phtml:15
+#: /vagrant/modules/monitoring/application/views/scripts/downtime/show.phtml:26
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:248
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:441
 #: /vagrant/modules/monitoring/library/Monitoring/DataView/DataView.php:278
-#: /vagrant/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:199
+#: /vagrant/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:221
 #, fuzzy
 msgid "Service"
 msgstr "Service"
 
-#: /vagrant/modules/monitoring/configuration.php:112
+#: /vagrant/modules/monitoring/configuration.php:116
 #, fuzzy
 msgid "Service Action"
 msgstr "Service nicht gefunden"
@@ -3462,8 +3521,8 @@ msgstr "Service nicht gefunden"
 msgid "Service Checks"
 msgstr "Letzter Service-Check"
 
-#: /vagrant/modules/monitoring/configuration.php:152
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:536
+#: /vagrant/modules/monitoring/configuration.php:156
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:576
 #, fuzzy
 msgid "Service Grid"
 msgstr "Zeige das Servicesraster"
@@ -3473,31 +3532,23 @@ msgstr "Zeige das Servicesraster"
 msgid "Service Group"
 msgstr "Servicegruppenübersicht"
 
-#: /vagrant/modules/monitoring/application/controllers/ChartController.php:232
-msgid "Service Group Chart"
-msgstr "Servicegruppenübersicht"
-
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:460
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:489
 #, fuzzy
 msgid "Service Group Name"
 msgstr "Servicegruppenübersicht"
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:434
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:463
 #, fuzzy
 msgid "Service Groups"
 msgstr "Servicegruppenübersicht"
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:161
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:561
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:170
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:601
 #, fuzzy
 msgid "Service Name"
 msgstr "Service-Zustand"
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:300
-msgid "Service Notification Timeperiod"
-msgstr "Benachrichtigungszeitraum des Services"
-
-#: /vagrant/modules/monitoring/configuration.php:140
+#: /vagrant/modules/monitoring/configuration.php:144
 #: /vagrant/modules/monitoring/configuration.php:256
 #: /vagrant/modules/monitoring/application/views/scripts/tactical/components/ok_hosts.phtml:78
 #, fuzzy
@@ -3509,7 +3560,7 @@ msgstr "Serviceprobleme bestätigen"
 msgid "Service Problems:"
 msgstr "Serviceprobleme bestätigen"
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:159
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:168
 #, fuzzy
 msgid "Service Severity"
 msgstr "Service-Zustand"
@@ -3524,22 +3575,21 @@ msgstr "Service-Zustand"
 msgid "Service not found"
 msgstr "Service nicht gefunden"
 
-#: /vagrant/modules/monitoring/configuration.php:106
-#: /vagrant/modules/monitoring/configuration.php:180
+#: /vagrant/modules/monitoring/configuration.php:110
+#: /vagrant/modules/monitoring/configuration.php:184
 #: /vagrant/modules/monitoring/application/views/scripts/show/components/servicegroups.phtml:17
 #, fuzzy
 msgid "Servicegroups"
 msgstr "Servicegruppen auflisten"
 
-#: /vagrant/modules/monitoring/configuration.php:104
-#: /vagrant/modules/monitoring/configuration.php:176
-#: /vagrant/modules/monitoring/application/controllers/ChartController.php:236
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:120
-#: /vagrant/modules/monitoring/application/controllers/ServicesController.php:65
-#: /vagrant/modules/monitoring/application/forms/StatehistoryForm.php:99
-#: /vagrant/modules/monitoring/application/views/scripts/show/contact.phtml:44
+#: /vagrant/modules/monitoring/configuration.php:108
+#: /vagrant/modules/monitoring/configuration.php:180
 #: /vagrant/modules/monitoring/application/views/scripts/tactical/components/hostservicechecks.phtml:10
-#: /vagrant/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:212
+#: /vagrant/modules/monitoring/application/views/scripts/show/contact.phtml:44
+#: /vagrant/modules/monitoring/application/controllers/ServicesController.php:66
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:123
+#: /vagrant/modules/monitoring/application/forms/StatehistoryForm.php:97
+#: /vagrant/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:234
 #, fuzzy
 msgid "Services"
 msgstr "Services UP"
@@ -3561,34 +3611,36 @@ msgid "Set the start date and time for the downtime."
 msgstr "Setze den Startzeitpunkt für diese Downtime."
 
 #: /vagrant/modules/monitoring/library/Monitoring/MonitoringWizard.php:114
+#, fuzzy
+msgctxt "setup.summary.btn.finish"
 msgid "Setup the monitoring module for Icinga Web 2"
 msgstr "Einrichtung des Monitoringmoduls für Icinga Web 2"
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:93
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:459
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:497
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:87
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:488
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:535
 msgid "Severity"
 msgstr "Schwere"
 
 #: /vagrant/modules/monitoring/application/views/scripts/list/comments.phtml:45
-#: /vagrant/modules/monitoring/application/views/scripts/list/contacts.phtml:67
-#: /vagrant/modules/monitoring/application/views/scripts/list/downtimes.phtml:44
-#: /vagrant/modules/monitoring/application/views/scripts/list/hostgroups.phtml:269
-#: /vagrant/modules/monitoring/application/views/scripts/list/hosts.phtml:101
+#: /vagrant/modules/monitoring/application/views/scripts/list/hostgroups.phtml:270
+#: /vagrant/modules/monitoring/application/views/scripts/list/contacts.phtml:73
+#: /vagrant/modules/monitoring/application/views/scripts/list/servicegroups.phtml:166
+#: /vagrant/modules/monitoring/application/views/scripts/list/services.phtml:102
+#: /vagrant/modules/monitoring/application/views/scripts/list/downtimes.phtml:48
 #: /vagrant/modules/monitoring/application/views/scripts/list/notifications.phtml:82
-#: /vagrant/modules/monitoring/application/views/scripts/list/servicegroups.phtml:165
-#: /vagrant/modules/monitoring/application/views/scripts/list/services.phtml:106
-#: /vagrant/modules/monitoring/application/views/scripts/partials/event-history.phtml:160
+#: /vagrant/modules/monitoring/application/views/scripts/list/hosts.phtml:97
 #: /vagrant/modules/monitoring/application/views/scripts/partials/show-more.phtml:6
+#: /vagrant/modules/monitoring/application/views/scripts/partials/event-history.phtml:192
 msgid "Show More"
 msgstr "Mehr zeigen"
 
-#: /vagrant/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:227
+#: /vagrant/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:249
 #, php-format
 msgid "Show all event records of host %s"
 msgstr "Zeige alle Ereigniseinträge für den Host %s"
 
-#: /vagrant/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:223
+#: /vagrant/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:245
 #, php-format
 msgid "Show all event records of service %s on host %s"
 msgstr "Zeige alle Ereigniseinträge für Service %s auf Host %s"
@@ -3601,28 +3653,28 @@ msgstr ""
 "Zeige eine Übersicht aller Hosts und Services, ihre aktuellen Zustände und "
 "Ausutzung der Monitoringmerkmale"
 
-#: /vagrant/modules/monitoring/application/views/scripts/list/contactgroups.phtml:42
-#: /vagrant/modules/monitoring/application/views/scripts/list/contacts.phtml:31
-#: /vagrant/modules/monitoring/application/views/scripts/partials/event-history.phtml:12
+#: /vagrant/modules/monitoring/application/views/scripts/list/contactgroups.phtml:39
+#: /vagrant/modules/monitoring/application/views/scripts/list/contacts.phtml:35
 #: /vagrant/modules/monitoring/application/views/scripts/show/components/contacts.phtml:11
+#: /vagrant/modules/monitoring/application/views/scripts/partials/event-history.phtml:12
 #, php-format
 msgid "Show detailed information about %s"
 msgstr "Zeige detaillierte Informationen über %s"
 
 #: /vagrant/modules/monitoring/application/views/helpers/Link.php:37
-#: /vagrant/modules/monitoring/application/views/scripts/list/hosts.phtml:54
-#: /vagrant/modules/monitoring/application/views/scripts/list/services.phtml:69
-#: /vagrant/modules/monitoring/application/views/scripts/partials/event-history.phtml:124
-#: /vagrant/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:182
+#: /vagrant/modules/monitoring/application/views/scripts/list/services.phtml:65
+#: /vagrant/modules/monitoring/application/views/scripts/list/hosts.phtml:50
+#: /vagrant/modules/monitoring/application/views/scripts/partials/event-history.phtml:156
+#: /vagrant/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:204
 #, php-format
 msgid "Show detailed information for host %s"
 msgstr "Zeige detaillierte Informationen über Host %s"
 
 #: /vagrant/modules/monitoring/application/views/helpers/Link.php:63
 #: /vagrant/modules/monitoring/application/views/scripts/list/servicegrid.phtml:80
-#: /vagrant/modules/monitoring/application/views/scripts/list/services.phtml:80
-#: /vagrant/modules/monitoring/application/views/scripts/partials/event-history.phtml:138
-#: /vagrant/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:195
+#: /vagrant/modules/monitoring/application/views/scripts/list/services.phtml:76
+#: /vagrant/modules/monitoring/application/views/scripts/partials/event-history.phtml:170
+#: /vagrant/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php:217
 #, php-format
 msgid "Show detailed information for service %s on host %s"
 msgstr "Zeige detaillierte Informationen über Service %s auf Host %s"
@@ -3671,7 +3723,7 @@ msgstr ""
 "Zeige die letzten Alarme und visualisiere Benachrichtigungen und Probleme in "
 "Abhängigkeit von ihrer Anzahl und zeitlichen Verteilung."
 
-#: /vagrant/modules/monitoring/application/forms/Config/BackendConfigForm.php:255
+#: /vagrant/modules/monitoring/application/forms/Config/BackendConfigForm.php:249
 #: /vagrant/modules/monitoring/application/forms/Config/Transport/RemoteTransportForm.php:127
 msgid "Show resource configuration"
 msgstr "Zeige die Ressourcenkonfiguration"
@@ -3680,25 +3732,25 @@ msgstr "Zeige die Ressourcenkonfiguration"
 msgid "Show statistics about the monitored objects"
 msgstr "Zeige Statistiken zu den überwachten Objekten"
 
-#: /vagrant/modules/monitoring/application/controllers/HostsController.php:60
+#: /vagrant/modules/monitoring/application/controllers/HostsController.php:61
 #, php-format
 msgid "Show summarized information for %u hosts"
 msgstr "Zeige zusammengefasst Informationen für %u Hosts"
 
-#: /vagrant/modules/monitoring/application/controllers/ServicesController.php:67
+#: /vagrant/modules/monitoring/application/controllers/ServicesController.php:68
 #, php-format
 msgid "Show summarized information for %u services"
 msgstr "Zeige zusammengefasst Informationen für %u Services"
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:307
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:337
 msgid "Show the Event Grid"
 msgstr "Zeige das Ereignisraster"
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:536
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:576
 msgid "Show the Service Grid"
 msgstr "Zeige das Servicesraster"
 
-#: /vagrant/modules/monitoring/application/forms/Config/BackendConfigForm.php:254
+#: /vagrant/modules/monitoring/application/forms/Config/BackendConfigForm.php:248
 #: /vagrant/modules/monitoring/application/forms/Config/Transport/RemoteTransportForm.php:126
 #, php-format
 msgid "Show the configuration of the %s resource"
@@ -3710,18 +3762,18 @@ msgstr ""
 "Zeige die Anzahl der historischen Ereigniseinträge, gruppiert nach Zeit und "
 "Typ"
 
-#: /vagrant/modules/monitoring/application/forms/Config/BackendConfigForm.php:327
-#: /vagrant/modules/monitoring/application/forms/Setup/IdoResourcePage.php:184
 #: /vagrant/modules/monitoring/application/forms/Setup/LivestatusResourcePage.php:76
+#: /vagrant/modules/monitoring/application/forms/Setup/IdoResourcePage.php:184
+#: /vagrant/modules/monitoring/application/forms/Config/BackendConfigForm.php:321
 msgid "Skip Validation"
 msgstr "Validierung überspringen"
 
-#: /vagrant/modules/monitoring/library/Monitoring/BackendStep.php:128
+#: /vagrant/modules/monitoring/library/Monitoring/BackendStep.php:166
 msgid "Socket"
 msgstr "Socken"
 
-#: /vagrant/modules/monitoring/application/views/scripts/list/hosts.phtml:40
-#: /vagrant/modules/monitoring/application/views/scripts/list/services.phtml:53
+#: /vagrant/modules/monitoring/application/views/scripts/list/services.phtml:49
+#: /vagrant/modules/monitoring/application/views/scripts/list/hosts.phtml:36
 #: /vagrant/modules/monitoring/application/views/scripts/partials/object/host-header.phtml:12
 #: /vagrant/modules/monitoring/application/views/scripts/partials/object/service-header.phtml:13
 #: /vagrant/modules/monitoring/application/views/scripts/partials/object/service-header.phtml:42
@@ -3729,12 +3781,18 @@ msgctxt "Soft state"
 msgid "Soft"
 msgstr ""
 
+#: /vagrant/modules/monitoring/application/views/scripts/partials/event-history.phtml:114
+#, fuzzy
+msgctxt "tooltip"
+msgid "Soft state"
+msgstr "Soft Status"
+
 #: /vagrant/modules/monitoring/library/Monitoring/MonitoringWizard.php:111
 msgctxt "setup.welcome.btn.next"
 msgid "Start"
 msgstr "Anfangen"
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:231
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:251
 #: /vagrant/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:78
 msgid "Start Time"
 msgstr "Anfangszeit"
@@ -3743,8 +3801,8 @@ msgstr "Anfangszeit"
 msgid "Started downtimes"
 msgstr "Begonnene Downtimes"
 
-#: /vagrant/modules/monitoring/application/forms/StatehistoryForm.php:114
-#: /vagrant/modules/monitoring/application/forms/StatehistoryForm.php:134
+#: /vagrant/modules/monitoring/application/forms/StatehistoryForm.php:111
+#: /vagrant/modules/monitoring/application/forms/StatehistoryForm.php:130
 msgid "State"
 msgstr "Zustand"
 
@@ -3760,7 +3818,7 @@ msgstr "Statistiken"
 msgid "Status"
 msgstr "Zustand"
 
-#: /vagrant/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:111
+#: /vagrant/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:116
 msgid "Sticky Acknowledgement"
 msgstr "Klebrige Bestätigung"
 
@@ -3775,7 +3833,7 @@ msgstr[1] "Passives Check-Ergebnisse übermitteln"
 msgid "Submit Passive Host Check Result"
 msgstr "Passives Check-Ergebnis übermitteln"
 
-#: /vagrant/modules/monitoring/application/controllers/HostsController.php:210
+#: /vagrant/modules/monitoring/application/controllers/HostsController.php:211
 #, fuzzy
 msgid "Submit Passive Host Check Results"
 msgstr "Passives Check-Ergebnis übermitteln"
@@ -3785,7 +3843,7 @@ msgstr "Passives Check-Ergebnis übermitteln"
 msgid "Submit Passive Service Check Result"
 msgstr "Passives Check-Ergebnis übermitteln"
 
-#: /vagrant/modules/monitoring/application/controllers/ServicesController.php:213
+#: /vagrant/modules/monitoring/application/controllers/ServicesController.php:214
 #, fuzzy
 msgid "Submit Passive Service Check Results"
 msgstr "Passives Check-Ergebnis übermitteln"
@@ -3801,7 +3859,7 @@ msgstr ""
 msgid "System"
 msgstr "System"
 
-#: /vagrant/modules/monitoring/configuration.php:168
+#: /vagrant/modules/monitoring/configuration.php:172
 #: /vagrant/modules/monitoring/application/controllers/TacticalController.php:23
 msgid "Tactical Overview"
 msgstr "Taktische Übersicht"
@@ -3843,6 +3901,11 @@ msgid ""
 "that the downtime can start"
 msgstr ""
 
+#: /vagrant/modules/monitoring/application/forms/Command/Object/ScheduleHostDowntimeCommandForm.php:66
+#: /vagrant/modules/monitoring/application/forms/Command/Object/ScheduleServiceDowntimeCommandForm.php:204
+msgid "The end time must be greater than the start time"
+msgstr ""
+
 #: /vagrant/modules/monitoring/library/Monitoring/DataView/DataView.php:448
 #, php-format
 msgid "The filter column \"%s\" is not allowed here."
@@ -3861,7 +3924,7 @@ msgstr "Der Name des Backend"
 msgid "The last one was sent %s."
 msgstr ""
 
-#: /vagrant/modules/monitoring/application/forms/Config/TransportConfigForm.php:205
+#: /vagrant/modules/monitoring/application/forms/Config/TransportConfigForm.php:203
 msgid ""
 "The name of the Icinga instance this transport should exclusively transfer "
 "commands to."
@@ -3871,13 +3934,13 @@ msgstr ""
 msgid "The name of the person who scheduled this downtime"
 msgstr "Der Name der Person, die die Ausfallzeit geplant hat"
 
-#: /vagrant/modules/monitoring/application/forms/Config/TransportConfigForm.php:219
+#: /vagrant/modules/monitoring/application/forms/Config/TransportConfigForm.php:217
 msgid ""
 "The name of this command transport that is used to differentiate it from "
 "others"
 msgstr "Der Name der Kommando-Übertragung"
 
-#: /vagrant/modules/monitoring/application/forms/Config/BackendConfigForm.php:195
+#: /vagrant/modules/monitoring/application/forms/Config/BackendConfigForm.php:189
 msgid ""
 "The name of this monitoring backend that is used to differentiate it from "
 "others"
@@ -3893,7 +3956,7 @@ msgstr "Die Performance-Daten der Überprüfung."
 msgid "The plugin output of this check result"
 msgstr "Der Plugin Output der Überprüfung"
 
-#: /vagrant/modules/monitoring/application/forms/Config/BackendConfigForm.php:237
+#: /vagrant/modules/monitoring/application/forms/Config/BackendConfigForm.php:231
 #: /vagrant/modules/monitoring/application/forms/Config/Transport/RemoteTransportForm.php:109
 msgid "The resource to use"
 msgstr "Die zu benutzenden Ressource"
@@ -3907,11 +3970,11 @@ msgstr "Die Spalte “%s” ist in “%s” nicht zum Sortieren erlaubt."
 msgid "The state this check result should report"
 msgstr "Status der Überprüfung"
 
-#: /vagrant/modules/monitoring/application/forms/Config/BackendConfigForm.php:223
+#: /vagrant/modules/monitoring/application/forms/Config/BackendConfigForm.php:217
 msgid "The type of data source used for retrieving monitoring information"
 msgstr "Der Typ der Datenquelle für Monitoring-Daten"
 
-#: /vagrant/modules/monitoring/application/forms/Config/BackendConfigForm.php:381
+#: /vagrant/modules/monitoring/application/forms/Config/BackendConfigForm.php:375
 msgid ""
 "There is currently more than one icinga instance writing to the IDO. You'll "
 "see all objects from all instances without any differentation. If this is "
@@ -3921,7 +3984,7 @@ msgstr ""
 "werden die Objekte aller Instanzen angezeigt. Falls das nicht gewünscht ist, "
 "sollten separate IDO für Instanzen aufgesetzt werden."
 
-#: /vagrant/modules/monitoring/application/forms/Config/BackendConfigForm.php:375
+#: /vagrant/modules/monitoring/application/forms/Config/BackendConfigForm.php:369
 msgid ""
 "There is currently no icinga instance writing to the IDO. Make sure that a "
 "icinga instance is configured and able to write to the IDO."
@@ -3934,14 +3997,14 @@ msgstr ""
 msgid "There is no \"%s\" monitoring backend"
 msgstr "Es gibt kein “%s” Monitoring-Backend"
 
-#: /vagrant/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:22
+#: /vagrant/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:23
 msgid ""
 "This command is used to acknowledge host or service problems. When a problem "
 "is acknowledged, future notifications about problems are temporarily "
 "disabled until the host or service recovers."
 msgstr ""
 
-#: /vagrant/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:19
+#: /vagrant/modules/monitoring/application/forms/Command/Object/AddCommentCommandForm.php:20
 msgid "This command is used to add host or service comments."
 msgstr ""
 
@@ -3966,7 +4029,7 @@ msgid ""
 "will re-queue the hosts or services to be checked at the time you specify."
 msgstr ""
 
-#: /vagrant/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:20
+#: /vagrant/modules/monitoring/application/forms/Command/Object/SendCustomNotificationCommandForm.php:21
 #, fuzzy
 msgid ""
 "This command is used to send custom notifications about hosts or services."
@@ -4059,7 +4122,7 @@ msgstr ""
 msgid "This is the core module for Icinga Web 2."
 msgstr "Das monitoring-Modul ist das Kernmodul von Icinga Web 2 "
 
-#: /vagrant/modules/monitoring/application/views/scripts/partials/event-history.phtml:50
+#: /vagrant/modules/monitoring/application/views/scripts/partials/event-history.phtml:56
 msgid "This notification was not sent out to any contact."
 msgstr "Diese Benachrichtigung wurde an keinen Kontakt gesendet."
 
@@ -4067,17 +4130,17 @@ msgstr "Diese Benachrichtigung wurde an keinen Kontakt gesendet."
 msgid "Time to Reaction (Ack, Recover)"
 msgstr "Zeit bis zur Reaktion (Bestätigung, Wiederherstellung)"
 
-#: /vagrant/modules/monitoring/application/controllers/TimelineController.php:109
+#: /vagrant/modules/monitoring/application/controllers/TimelineController.php:108
 msgid "TimeLine interval"
 msgstr "Zeitleisten Intervall"
 
-#: /vagrant/modules/monitoring/configuration.php:224
+#: /vagrant/modules/monitoring/configuration.php:228
 #: /vagrant/modules/monitoring/application/controllers/TimelineController.php:25
 #: /vagrant/modules/monitoring/application/controllers/TimelineController.php:29
 msgid "Timeline"
 msgstr "Zeitleiste"
 
-#: /vagrant/modules/monitoring/application/forms/StatehistoryForm.php:82
+#: /vagrant/modules/monitoring/application/forms/StatehistoryForm.php:81
 msgid "To"
 msgstr "Um"
 
@@ -4105,7 +4168,7 @@ msgstr ""
 "Füllen Sie die Einstellungen unterhalb aus um Ihre Monitoring Umgebung gegen "
 "neugierige Augen zu beschützen. "
 
-#: /vagrant/modules/monitoring/application/forms/StatehistoryForm.php:85
+#: /vagrant/modules/monitoring/application/forms/StatehistoryForm.php:84
 msgid "Today"
 msgstr "Heute"
 
@@ -4118,12 +4181,12 @@ msgstr "Top 5 der letzten Alarme"
 msgid "Total"
 msgstr "Gesamt"
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:499
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:537
 msgid "Total Hosts"
 msgstr "Alle Hosts"
 
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:461
-#: /vagrant/modules/monitoring/application/controllers/ListController.php:500
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:490
+#: /vagrant/modules/monitoring/application/controllers/ListController.php:538
 msgid "Total Services"
 msgstr "Alle Services"
 
@@ -4131,11 +4194,11 @@ msgstr "Alle Services"
 msgid "Transport"
 msgstr "Transport"
 
-#: /vagrant/modules/monitoring/application/forms/Config/TransportConfigForm.php:217
+#: /vagrant/modules/monitoring/application/forms/Config/TransportConfigForm.php:215
 msgid "Transport Name"
 msgstr "Transport Name"
 
-#: /vagrant/modules/monitoring/application/forms/Config/TransportConfigForm.php:241
+#: /vagrant/modules/monitoring/application/forms/Config/TransportConfigForm.php:240
 msgid "Transport Type"
 msgstr "Transport Typ"
 
@@ -4157,7 +4220,7 @@ msgstr "Typ"
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: /vagrant/modules/monitoring/library/Monitoring/Object/Service.php:199
+#: /vagrant/modules/monitoring/library/Monitoring/Object/Service.php:200
 msgid "UNKNOWN"
 msgstr "UNBEKANNT"
 
@@ -4184,10 +4247,8 @@ msgctxt "icinga.state"
 msgid "UP"
 msgstr "UP"
 
-#: /vagrant/modules/monitoring/application/views/helpers/HostFlags.php:13
-#: /vagrant/modules/monitoring/application/views/helpers/ServiceFlags.php:9
-#: /vagrant/modules/monitoring/application/views/scripts/partials/host/statusicons.phtml:5
-#: /vagrant/modules/monitoring/application/views/scripts/partials/service/statusicons.phtml:5
+#: /vagrant/modules/monitoring/application/views/helpers/HostFlags.php:10
+#: /vagrant/modules/monitoring/application/views/helpers/ServiceFlags.php:10
 msgid "Unhandled"
 msgstr "Unbehandelt"
 
@@ -4195,22 +4256,19 @@ msgstr "Unbehandelt"
 msgid "Unhandled Problems:"
 msgstr "Unbehandelte Probleme:"
 
-#: /vagrant/modules/monitoring/application/controllers/ChartController.php:264
-#: /vagrant/modules/monitoring/application/forms/StatehistoryForm.php:119
+#: /vagrant/modules/monitoring/application/forms/StatehistoryForm.php:116
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: /vagrant/modules/monitoring/application/controllers/ChartController.php:314
-#: /vagrant/modules/monitoring/application/forms/StatehistoryForm.php:139
+#: /vagrant/modules/monitoring/application/forms/StatehistoryForm.php:135
 msgid "Unreachable"
 msgstr "Nicht erreichbar"
 
-#: /vagrant/modules/monitoring/application/controllers/ChartController.php:300
-#: /vagrant/modules/monitoring/application/forms/StatehistoryForm.php:137
+#: /vagrant/modules/monitoring/application/forms/StatehistoryForm.php:133
 msgid "Up"
 msgstr "Up"
 
-#: /vagrant/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:72
+#: /vagrant/modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php:76
 msgid "Use Expire Time"
 msgstr "Verfallszeitpunkt nutzen"
 
@@ -4218,9 +4276,9 @@ msgstr "Verfallszeitpunkt nutzen"
 msgid "Use SSH Identity"
 msgstr "Benutze SSH Identität"
 
-#: /vagrant/modules/monitoring/application/forms/Config/Transport/RemoteTransportForm.php:163
 #: /vagrant/modules/monitoring/application/views/scripts/comment/show.phtml:43
 #: /vagrant/modules/monitoring/application/views/scripts/downtime/show.phtml:40
+#: /vagrant/modules/monitoring/application/forms/Config/Transport/RemoteTransportForm.php:163
 msgid "User"
 msgstr "Benutzer"
 
@@ -4228,6 +4286,8 @@ msgstr "Benutzer"
 msgid "User Comment"
 msgstr "Benutzerkommentar"
 
+#: /vagrant/modules/monitoring/application/forms/Config/Transport/ApiTransportForm.php:52
+#: /vagrant/modules/monitoring/application/forms/Config/Transport/ApiTransportForm.php:64
 #: /vagrant/modules/monitoring/application/forms/Config/Transport/RemoteTransportForm.php:165
 msgid ""
 "User to log in as on the remote Icinga instance. Please note that key-based "
@@ -4237,6 +4297,7 @@ msgstr ""
 "Sie, der Benutzer muss sich per SSH Schlüssel einloggen können."
 
 #: /vagrant/modules/monitoring/library/Monitoring/BackendStep.php:109
+#: /vagrant/modules/monitoring/library/Monitoring/TransportStep.php:102
 msgid "Username"
 msgstr "Benutzername"
 
@@ -4260,7 +4321,7 @@ msgstr "Wert"
 msgid "Value for interval not valid"
 msgstr "Wert des Intervalls ist nicht zulässig"
 
-#: /vagrant/modules/monitoring/library/Monitoring/Object/Service.php:193
+#: /vagrant/modules/monitoring/library/Monitoring/Object/Service.php:194
 msgid "WARNING"
 msgstr "WARNUNG"
 
@@ -4269,9 +4330,8 @@ msgctxt "icinga.state"
 msgid "WARNING"
 msgstr "WARNUNG"
 
-#: /vagrant/modules/monitoring/application/controllers/ChartController.php:250
-#: /vagrant/modules/monitoring/application/forms/StatehistoryForm.php:118
 #: /vagrant/modules/monitoring/application/views/helpers/Perfdata.php:40
+#: /vagrant/modules/monitoring/application/forms/StatehistoryForm.php:115
 msgid "Warning"
 msgstr "Warnung"
 
@@ -4362,7 +4422,7 @@ msgid "he date/time the scheduled downtime was actually started"
 msgstr "Die geplante Downtime wurde gestartet"
 
 #: /vagrant/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml:29
-#: /vagrant/modules/monitoring/library/Monitoring/Object/MonitoredObject.php:705
+#: /vagrant/modules/monitoring/library/Monitoring/Object/MonitoredObject.php:733
 msgid "host"
 msgstr "Host"
 
@@ -4396,11 +4456,6 @@ msgstr "nicht erreichbar"
 msgid "is reachable"
 msgstr "erreichbar"
 
-#: /vagrant/modules/monitoring/application/views/scripts/partials/event-history.phtml:41
-msgctxt "date.verbose"
-msgid "%A, %B %e, %Y"
-msgstr "%A, %e. %B %Y"
-
 #: /vagrant/modules/monitoring/application/views/scripts/alertsummary/index.phtml:35
 msgid "notifications per hour"
 msgstr "Benachrichtigungen per Stunde"
@@ -4423,7 +4478,7 @@ msgctxt "Last format parameter represents the time scheduled"
 msgid "scheduled flexible %s"
 msgstr "%s wurde geplant"
 
-#: /vagrant/modules/monitoring/library/Monitoring/Object/MonitoredObject.php:708
+#: /vagrant/modules/monitoring/library/Monitoring/Object/MonitoredObject.php:736
 msgid "service"
 msgstr "Service"
 
@@ -4432,6 +4487,8 @@ msgid "soft state"
 msgstr "Soft Status"
 
 #: /vagrant/modules/monitoring/library/Monitoring/MonitoringWizard.php:53
+#, fuzzy
+msgctxt "setup.summary.subject"
 msgid "the monitoring module"
 msgstr "das Monitoring Modul"
 
@@ -4443,6 +4500,94 @@ msgstr "Unverändert"
 msgid "up"
 msgstr "up"
 
+#~ msgid " Down Hosts (Handled)"
+#~ msgstr "Hosts Down (bestätigt)"
+
+#~ msgid " Down Hosts (Unhandled)"
+#~ msgstr "Hosts Down (unbestätigt)"
+
+#~ msgid " Down Services (Handled)"
+#~ msgstr "Services Down (bestätigt)"
+
+#~ msgid " Down Services (Unhandled)"
+#~ msgstr "Services Down (Unbestätigt)"
+
+#~ msgid " Pending Hosts"
+#~ msgstr "Ungeprüfte Hosts"
+
+#~ msgid " Pending Services"
+#~ msgstr "Ungeprüfte Services"
+
+#~ msgid " Unreachable Hosts (Handled)"
+#~ msgstr "Nicht erreichbare Hosts (bestätigt)"
+
+#~ msgid " Unreachable Hosts (Unhandled)"
+#~ msgstr "Nicht erreichbare Hosts (unbestätigt)"
+
+#~ msgid " Unreachable Services (Handled)"
+#~ msgstr "Nicht erreichbare Services (bestätigt)"
+
+#~ msgid " Unreachable Services (Unhandled)"
+#~ msgstr "Nicht erreichbare Services (unbestätigt)"
+
+#~ msgid " Up Hosts"
+#~ msgstr "Hosts UP"
+
+#~ msgid " Up Services"
+#~ msgstr "Services UP"
+
+#~ msgid " Warning Services (Handled)"
+#~ msgstr "Service-Warnungen (bestätigt)"
+
+#~ msgid " Warning Services (Unhandled)"
+#~ msgstr "Service-Warnungen (unbestätigt)"
+
+#~ msgid "<b>{title}:</b><br> {value} of {sum} hosts are {label}"
+#~ msgstr "<b>{title}:</b><br> {value} von {sum} Hosts sind {label}"
+
+#~ msgid "<b>{title}:</b><br>{value} of {sum} services are {label}"
+#~ msgstr "<b>{title}:</b><br>{value} von {sum} Servicesn sind {label}"
+
+#~ msgid "Command Transport"
+#~ msgstr "Befehlsschnittstelle"
+
+#~ msgid "Contains host states of each service group."
+#~ msgstr "Enthält die Hostzustände jeder einzelnen Servicegruppe."
+
+#~ msgid "Contains service states for each service group."
+#~ msgstr "Enthält die Servicezustände jeder einzelnen Servicegruppe."
+
+#~ msgid "Host Group Chart"
+#~ msgstr "Hostgruppenübersicht"
+
+#~ msgid "Host Notification Timeperiod"
+#~ msgstr "Host-Benachrichtigungszeitraum"
+
+#~ msgid "Local"
+#~ msgstr "lokal"
+
+#~ msgid "Monitoring Security"
+#~ msgstr "Monitoring-Sicherheit"
+
+#~ msgid ""
+#~ "No downtimes found matching the filter, maybe the downtime already "
+#~ "expired."
+#~ msgstr "Zu diesem Filter wurden keine Downtimes gefunden."
+
+#~ msgid "Remote"
+#~ msgstr "Remote"
+
+#~ msgid "Remove problem acknowledgement"
+#~ msgid_plural "Remove problem acknowledgements"
+#~ msgstr[0] "Entferne Problembestätigung"
+#~ msgstr[1] "Problembestätigung entfernen"
+
+#~ msgid "Service Group Chart"
+#~ msgstr "Servicegruppenübersicht"
+
+#~ msgid "Service Notification Timeperiod"
+#~ msgstr "Benachrichtigungszeitraum des Services"
+
 #~ msgctxt "Service running on host"
 #~ msgid "%s on %s"
 #~ msgstr "%s auf %s"
@@ -4450,18 +4595,6 @@ msgstr "up"
 #~ msgid "Ack removed"
 #~ msgstr "Bestätigung entfernt"
 
-#~ msgid "Comment deleted"
-#~ msgstr "Kommentar gelöscht"
-
-#~ msgid "Downtime End"
-#~ msgstr "Downtime Ende"
-
-#~ msgid "Downtime Start"
-#~ msgstr "Downtime Beginn"
-
-#~ msgid "Downtime removed"
-#~ msgstr "Downtime entfernt"
-
 #~ msgid "Ends"
 #~ msgstr "Endet"
 
@@ -4476,9 +4609,6 @@ msgstr "up"
 #~ msgid "Flapping Stopped"
 #~ msgstr "Flapping beendet"
 
-#~ msgid "Flapping stopped"
-#~ msgstr "Flapping beendet"
-
 #~ msgid ""
 #~ "In case it's desired that a TCP connection is being used by Icinga Web 2 "
 #~ "to access a Livestatus interface, the Sockets module for PHP is required."
@@ -4487,9 +4617,6 @@ msgstr "up"
 #~ "Livestatus-Schnittstelle zugreifen zu lassen, benötigen das Sockets-Modul "
 #~ "für PHP."
 
-#~ msgid "Notification"
-#~ msgstr "Benachrichtigung"
-
 #~ msgid "Scroll to the bottom of this page to load additional events"
 #~ msgstr "Gehen Sie zum Ende der Seite um weitere Events zu laden"
 
@@ -4687,9 +4814,6 @@ msgstr "up"
 #~ msgid "Downtime removal requested"
 #~ msgstr "Entfernung dieser Downtime wurde angefordert"
 
-#~ msgid "Downtime scheduling requested"
-#~ msgstr "Die Planung dieser Downtime wurde angefordert"
-
 #~ msgid "Enable active checks for this host and its services."
 #~ msgstr "Aktive Checks für diesen Host und seine Services aktivieren."
 
@@ -4751,9 +4875,6 @@ msgstr "up"
 #~ msgid "Last check command"
 #~ msgstr "Letztes Check-Kommando"
 
-#~ msgid "No downtimes matching the filter"
-#~ msgstr "Zu diesem Filter wurden keine Downtimes gefunden"
-
 #~ msgid "No history entry matching the filter"
 #~ msgstr "Zu diesem Filter wurden keine historischen Ereignisse gefunden"
 
@@ -4792,9 +4913,6 @@ msgstr "up"
 #~ msgid "Process performance data"
 #~ msgstr "Performancedaten verarbeiten"
 
-#~ msgid "Remove Acknowledgement"
-#~ msgstr "Bestätigung entfernen"
-
 #~ msgid "Remove Problem Acknowledgement"
 #~ msgstr "Problembestätigung entfernen"
 
diff --git a/modules/setup/application/locale/de_DE/LC_MESSAGES/setup.mo b/modules/setup/application/locale/de_DE/LC_MESSAGES/setup.mo
index 0128d3d56..de4396330 100644
Binary files a/modules/setup/application/locale/de_DE/LC_MESSAGES/setup.mo and b/modules/setup/application/locale/de_DE/LC_MESSAGES/setup.mo differ
diff --git a/modules/setup/application/locale/de_DE/LC_MESSAGES/setup.po b/modules/setup/application/locale/de_DE/LC_MESSAGES/setup.po
index 208bb43cc..ba7a6eaf1 100644
--- a/modules/setup/application/locale/de_DE/LC_MESSAGES/setup.po
+++ b/modules/setup/application/locale/de_DE/LC_MESSAGES/setup.po
@@ -1,33 +1,33 @@
 # Icinga Web 2 - Head for multiple monitoring backends.
-# Copyright (C) 2015 Icinga Development Team
+# Copyright (C) 2016 Icinga Development Team
 # This file is distributed under the same license as Setup Module.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
-#, fuzzy
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: Setup Module (2.0.0)\n"
+"Project-Id-Version: Setup Module (2.3.4)\n"
 "Report-Msgid-Bugs-To: dev@icinga.org\n"
-"POT-Creation-Date: 2015-10-02 10:00+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2016-12-08 17:19+0000\n"
+"PO-Revision-Date: 2016-12-08 18:22+0100\n"
 "Language: de_DE\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"X-Generator: Poedit 1.8.11\n"
 
 #: /vagrant/modules/setup/library/Setup/Requirement/OSRequirement.php:15
 #, php-format
 msgid "%s Platform"
 msgstr ""
 
-#: /vagrant/modules/setup/application/views/scripts/form/setup-welcome.phtml:98
+#: /vagrant/modules/setup/application/views/scripts/form/setup-welcome.phtml:104
 msgid "<your-webserver-user>"
 msgstr ""
 
-#: /vagrant/modules/setup/application/views/scripts/form/setup-welcome.phtml:78
+#: /vagrant/modules/setup/application/views/scripts/form/setup-welcome.phtml:84
 msgid "A system group called \"icingaweb2\" exists"
 msgstr ""
 
@@ -52,11 +52,8 @@ msgstr ""
 msgid "Account \"%s\" has been successfully defined as initial administrator."
 msgstr ""
 
+#: /vagrant/modules/setup/application/forms/AdminAccountPage.php:52
 #: /vagrant/modules/setup/library/Setup/Steps/AuthenticationStep.php:122
-msgid "Administration"
-msgstr ""
-
-#: /vagrant/modules/setup/application/forms/AdminAccountPage.php:51
 msgctxt "setup.page.title"
 msgid "Administration"
 msgstr ""
@@ -82,14 +79,15 @@ msgid ""
 "\"%s\"."
 msgstr ""
 
+#: /vagrant/modules/setup/library/Setup/Steps/AuthenticationStep.php:73
+#: /vagrant/modules/setup/library/Setup/Steps/AuthenticationStep.php:83
 #: /vagrant/modules/setup/library/Setup/Steps/UserGroupStep.php:83
 #: /vagrant/modules/setup/library/Setup/Steps/UserGroupStep.php:105
 #: /vagrant/modules/setup/library/Setup/Steps/UserGroupStep.php:186
 #: /vagrant/modules/setup/library/Setup/Steps/UserGroupStep.php:191
 #: /vagrant/modules/setup/library/Setup/Steps/UserGroupStep.php:200
 #: /vagrant/modules/setup/library/Setup/Steps/UserGroupStep.php:206
-#: /vagrant/modules/setup/library/Setup/Steps/AuthenticationStep.php:73
-#: /vagrant/modules/setup/library/Setup/Steps/AuthenticationStep.php:83
+msgctxt "setup.role.name"
 msgid "Administrators"
 msgstr ""
 
@@ -101,11 +99,8 @@ msgstr ""
 msgid "An exception's stacktrace is shown to every user by default."
 msgstr ""
 
-#: /vagrant/modules/setup/library/Setup/Steps/GeneralConfigStep.php:50
-msgid "Application Configuration"
-msgstr ""
-
 #: /vagrant/modules/setup/application/forms/GeneralConfigPage.php:21
+#: /vagrant/modules/setup/library/Setup/Steps/GeneralConfigStep.php:50
 msgctxt "setup.page.title"
 msgid "Application Configuration"
 msgstr ""
@@ -124,25 +119,19 @@ msgid ""
 "is defining a name for your first authentication backend."
 msgstr ""
 
+#: /vagrant/modules/setup/application/forms/AuthenticationPage.php:22
 #: /vagrant/modules/setup/library/Setup/Steps/AuthenticationStep.php:120
-msgid "Authentication"
-msgstr ""
-
-#: /vagrant/modules/setup/application/forms/AuthenticationPage.php:21
 msgctxt "setup.page.title"
 msgid "Authentication"
 msgstr ""
 
-#: /vagrant/modules/setup/library/Setup/Steps/AuthenticationStep.php:121
-msgid "Authentication Backend"
-msgstr ""
-
 #: /vagrant/modules/setup/application/forms/AuthBackendPage.php:32
+#: /vagrant/modules/setup/library/Setup/Steps/AuthenticationStep.php:121
 msgctxt "setup.page.title"
 msgid "Authentication Backend"
 msgstr ""
 
-#: /vagrant/modules/setup/application/forms/AuthenticationPage.php:59
+#: /vagrant/modules/setup/application/forms/AuthenticationPage.php:63
 msgid "Authentication Type"
 msgstr ""
 
@@ -161,8 +150,8 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: /vagrant/modules/setup/library/Setup/Steps/UserGroupStep.php:141
 #: /vagrant/modules/setup/library/Setup/Steps/AuthenticationStep.php:138
+#: /vagrant/modules/setup/library/Setup/Steps/UserGroupStep.php:141
 msgid "Backend Name"
 msgstr ""
 
@@ -177,19 +166,27 @@ msgid ""
 "able to locate account details."
 msgstr ""
 
-#: /vagrant/modules/setup/library/Setup/Steps/ResourceStep.php:119
+#: /vagrant/modules/setup/library/Setup/Steps/ResourceStep.php:157
 msgid "Bind DN"
 msgstr ""
 
-#: /vagrant/modules/setup/library/Setup/Steps/ResourceStep.php:123
+#: /vagrant/modules/setup/library/Setup/Steps/ResourceStep.php:161
 msgid "Bind Password"
 msgstr ""
 
-#: /vagrant/modules/setup/application/forms/AdminAccountPage.php:103
+#: /vagrant/modules/setup/application/forms/AdminAccountPage.php:104
 msgctxt "setup.admin"
 msgid "By Name"
 msgstr ""
 
+#: /vagrant/modules/setup/library/Setup/Steps/ResourceStep.php:111
+msgid "CA"
+msgstr "CA"
+
+#: /vagrant/modules/setup/library/Setup/Steps/ResourceStep.php:118
+msgid "CA Path"
+msgstr "CA-Pfad"
+
 #: /vagrant/modules/setup/application/clicommands/ConfigCommand.php:78
 #, php-format
 msgid "Can't change the group of %s to %s: %s"
@@ -243,14 +240,14 @@ msgstr ""
 msgid "Check this to not to validate the configuration"
 msgstr ""
 
-#: /vagrant/modules/setup/application/forms/AdminAccountPage.php:172
+#: /vagrant/modules/setup/application/forms/AdminAccountPage.php:173
 msgctxt "setup.admin"
 msgid ""
 "Choose a user group reported by the LDAP backend to permit its members "
 "administrative access."
 msgstr ""
 
-#: /vagrant/modules/setup/application/forms/AdminAccountPage.php:190
+#: /vagrant/modules/setup/application/forms/AdminAccountPage.php:191
 #, php-format
 msgctxt "setup.admin"
 msgid ""
@@ -258,10 +255,14 @@ msgid ""
 "account."
 msgstr ""
 
-#: /vagrant/modules/setup/application/forms/AdminAccountPage.php:132
+#: /vagrant/modules/setup/application/forms/AdminAccountPage.php:133
 msgid "Choose how to define the desired account."
 msgstr ""
 
+#: /vagrant/modules/setup/library/Setup/Steps/ResourceStep.php:125
+msgid "Cipher"
+msgstr "Verschlüsselung"
+
 #: /vagrant/modules/setup/application/views/scripts/index/index.phtml:70
 msgctxt "setup.progress"
 msgid "Configuration"
@@ -271,9 +272,10 @@ msgstr ""
 msgid "Congratulations! Icinga Web 2 has been successfully set up."
 msgstr ""
 
-#: /vagrant/modules/setup/application/forms/LdapDiscoveryPage.php:81
+#: /vagrant/modules/setup/application/forms/LdapDiscoveryPage.php:80
 #, php-format
-msgid "Could not find any LDAP servers on the domain \"%s\"."
+msgid ""
+"Could not find any LDAP servers on the domain \"%s\". An error occurred: %s"
 msgstr ""
 
 #: /vagrant/modules/setup/application/clicommands/ConfigCommand.php:155
@@ -297,13 +299,17 @@ msgstr ""
 msgid "Creating new database \"%s\"..."
 msgstr ""
 
-#: /vagrant/modules/setup/library/Setup/Steps/UserGroupStep.php:149
 #: /vagrant/modules/setup/library/Setup/Steps/AuthenticationStep.php:147
+#: /vagrant/modules/setup/library/Setup/Steps/UserGroupStep.php:149
 msgid "Custom Filter"
 msgstr ""
 
+#: /vagrant/modules/setup/application/forms/AuthenticationPage.php:50
+msgid "Database"
+msgstr ""
+
 #: /vagrant/modules/setup/library/Setup/Steps/ResourceStep.php:61
-#: /vagrant/modules/setup/application/forms/AuthenticationPage.php:46
+msgctxt "setup.page.title"
 msgid "Database"
 msgstr ""
 
@@ -316,11 +322,8 @@ msgctxt "setup.page.title"
 msgid "Database Resource"
 msgstr ""
 
-#: /vagrant/modules/setup/library/Setup/Steps/DatabaseStep.php:245
-msgid "Database Setup"
-msgstr ""
-
 #: /vagrant/modules/setup/application/forms/DatabaseCreationPage.php:41
+#: /vagrant/modules/setup/library/Setup/Steps/DatabaseStep.php:245
 msgctxt "setup.page.title"
 msgid "Database Setup"
 msgstr ""
@@ -343,42 +346,36 @@ msgstr ""
 msgid "Default Timezone"
 msgstr ""
 
-#: /vagrant/modules/setup/application/forms/AdminAccountPage.php:157
+#: /vagrant/modules/setup/application/forms/AdminAccountPage.php:158
 msgid ""
 "Define the initial administrative account by providing a username that "
 "reflects a user created later or one that is authenticated using external "
 "mechanisms."
 msgstr ""
 
-#: /vagrant/modules/setup/library/Setup/Utils/MakeDirStep.php:53
-#, php-format
-msgid "Directory \"%s\" in \"%s\" has been successfully created."
-msgstr ""
-
-#: /vagrant/modules/setup/application/forms/LdapDiscoveryPage.php:50
+#: /vagrant/modules/setup/application/forms/LdapDiscoveryPage.php:51
 msgid "Do not discover LDAP servers and enter all settings manually."
 msgstr ""
 
-#: /vagrant/modules/setup/library/Setup/Utils/EnableModuleStep.php:61
-#: /vagrant/modules/setup/library/Setup/Utils/MakeDirStep.php:61
-#: /vagrant/modules/setup/library/Setup/Steps/UserGroupStep.php:180
-#: /vagrant/modules/setup/library/Setup/Steps/UserGroupStep.php:193
-#: /vagrant/modules/setup/library/Setup/Steps/UserGroupStep.php:208
-#: /vagrant/modules/setup/library/Setup/Steps/GeneralConfigStep.php:120
-#: /vagrant/modules/setup/library/Setup/Steps/ResourceStep.php:147
 #: /vagrant/modules/setup/library/Setup/Steps/DatabaseStep.php:257
+#: /vagrant/modules/setup/library/Setup/Steps/ResourceStep.php:185
+#: /vagrant/modules/setup/library/Setup/Steps/GeneralConfigStep.php:120
 #: /vagrant/modules/setup/library/Setup/Steps/AuthenticationStep.php:198
 #: /vagrant/modules/setup/library/Setup/Steps/AuthenticationStep.php:211
 #: /vagrant/modules/setup/library/Setup/Steps/AuthenticationStep.php:233
+#: /vagrant/modules/setup/library/Setup/Steps/UserGroupStep.php:180
+#: /vagrant/modules/setup/library/Setup/Steps/UserGroupStep.php:193
+#: /vagrant/modules/setup/library/Setup/Steps/UserGroupStep.php:208
+#: /vagrant/modules/setup/library/Setup/Utils/EnableModuleStep.php:61
 #, php-format
 msgid "ERROR: %s"
 msgstr ""
 
-#: /vagrant/modules/setup/application/forms/AdminAccountPage.php:222
+#: /vagrant/modules/setup/application/forms/AdminAccountPage.php:223
 msgid "Enter the password to assign to the newly created account."
 msgstr ""
 
-#: /vagrant/modules/setup/application/forms/AdminAccountPage.php:210
+#: /vagrant/modules/setup/application/forms/AdminAccountPage.php:211
 msgid ""
 "Enter the username to be used when creating an initial administrative "
 "account."
@@ -389,12 +386,12 @@ msgctxt "app.config.logging.level"
 msgid "Error"
 msgstr ""
 
-#: /vagrant/modules/setup/application/forms/AdminAccountPage.php:120
+#: /vagrant/modules/setup/application/forms/AdminAccountPage.php:121
 msgctxt "setup.admin"
 msgid "Existing User"
 msgstr ""
 
-#: /vagrant/modules/setup/application/forms/AuthenticationPage.php:51
+#: /vagrant/modules/setup/application/forms/AuthenticationPage.php:55
 msgid "External"
 msgstr ""
 
@@ -402,8 +399,8 @@ msgstr ""
 msgid "Failed to fully setup the database. An error occured:"
 msgstr ""
 
-#: /vagrant/modules/setup/application/forms/AuthBackendPage.php:199
 #: /vagrant/modules/setup/application/forms/LdapResourcePage.php:119
+#: /vagrant/modules/setup/application/forms/AuthBackendPage.php:199
 #: /vagrant/modules/setup/application/forms/DbResourcePage.php:117
 #, php-format
 msgid "Failed to successfully validate the configuration: %s"
@@ -432,7 +429,7 @@ msgctxt "setup.progress"
 msgid "Finish"
 msgstr ""
 
-#: /vagrant/modules/setup/application/forms/WelcomePage.php:37
+#: /vagrant/modules/setup/application/forms/WelcomePage.php:38
 msgid ""
 "For security reasons we need to ensure that you are permitted to run this "
 "wizard. Please provide a token by following the instructions below."
@@ -463,7 +460,7 @@ msgstr ""
 msgid "Group Member Attribute"
 msgstr ""
 
-#: /vagrant/modules/setup/application/forms/AdminAccountPage.php:170
+#: /vagrant/modules/setup/application/forms/AdminAccountPage.php:171
 msgid "Group Name"
 msgstr ""
 
@@ -476,11 +473,11 @@ msgid "Group Object Class"
 msgstr ""
 
 #: /vagrant/modules/setup/library/Setup/Steps/ResourceStep.php:74
-#: /vagrant/modules/setup/library/Setup/Steps/ResourceStep.php:107
+#: /vagrant/modules/setup/library/Setup/Steps/ResourceStep.php:145
 msgid "Host"
 msgstr ""
 
-#: /vagrant/modules/setup/application/views/scripts/form/setup-welcome.phtml:102
+#: /vagrant/modules/setup/application/views/scripts/form/setup-welcome.phtml:108
 msgid "Icinga Web 2 documentation"
 msgstr ""
 
@@ -502,16 +499,16 @@ msgid ""
 "is required."
 msgstr ""
 
-#: /vagrant/modules/setup/application/views/scripts/form/setup-welcome.phtml:91
+#: /vagrant/modules/setup/application/views/scripts/form/setup-welcome.phtml:97
 msgid "If you've got the IcingaCLI installed you can do the following:"
 msgstr ""
 
-#: /vagrant/modules/setup/application/views/scripts/form/setup-welcome.phtml:76
+#: /vagrant/modules/setup/application/views/scripts/form/setup-welcome.phtml:82
 msgid ""
 "In any case, make sure that all of the following applies to your environment:"
 msgstr ""
 
-#: /vagrant/modules/setup/application/views/scripts/form/setup-welcome.phtml:96
+#: /vagrant/modules/setup/application/views/scripts/form/setup-welcome.phtml:102
 msgid "In case the IcingaCLI is missing you can create the token manually:"
 msgstr ""
 
@@ -552,7 +549,7 @@ msgid ""
 "database. Please provide appropriate access credentials to solve this."
 msgstr ""
 
-#: /vagrant/modules/setup/application/forms/LdapDiscoveryPage.php:30
+#: /vagrant/modules/setup/application/forms/LdapDiscoveryPage.php:31
 msgctxt "setup.page.title"
 msgid "LDAP Discovery"
 msgstr ""
@@ -610,7 +607,7 @@ msgctxt "setup.progress"
 msgid "Modules"
 msgstr ""
 
-#: /vagrant/modules/setup/application/forms/AdminAccountPage.php:113
+#: /vagrant/modules/setup/application/forms/AdminAccountPage.php:114
 msgctxt "setup.admin"
 msgid "New User"
 msgstr ""
@@ -621,8 +618,8 @@ msgid ""
 "with the schema required by Icinga Web 2 manually."
 msgstr ""
 
-#: /vagrant/modules/setup/library/Setup/Steps/UserGroupStep.php:150
 #: /vagrant/modules/setup/library/Setup/Steps/AuthenticationStep.php:148
+#: /vagrant/modules/setup/library/Setup/Steps/UserGroupStep.php:150
 msgctxt "auth.ldap.filter"
 msgid "None"
 msgstr ""
@@ -646,7 +643,7 @@ msgid ""
 "action."
 msgstr ""
 
-#: /vagrant/modules/setup/application/forms/AdminAccountPage.php:53
+#: /vagrant/modules/setup/application/forms/AdminAccountPage.php:54
 msgid ""
 "Now it's time to configure your first administrative account or group for "
 "Icinga Web 2."
@@ -684,23 +681,23 @@ msgstr ""
 msgid "PHP Version"
 msgstr ""
 
-#: /vagrant/modules/setup/library/Setup/Steps/ResourceStep.php:90
-#: /vagrant/modules/setup/application/forms/AdminAccountPage.php:220
+#: /vagrant/modules/setup/application/forms/AdminAccountPage.php:221
 #: /vagrant/modules/setup/application/forms/DatabaseCreationPage.php:111
+#: /vagrant/modules/setup/library/Setup/Steps/ResourceStep.php:90
 msgid "Password"
 msgstr ""
 
-#: /vagrant/modules/setup/application/forms/AuthenticationPage.php:23
+#: /vagrant/modules/setup/application/forms/AuthenticationPage.php:24
 msgid ""
 "Please choose how you want to authenticate when accessing Icinga Web 2. "
 "Configuring backend specific details follows in a later step."
 msgstr ""
 
-#: /vagrant/modules/setup/application/forms/AdminAccountPage.php:234
+#: /vagrant/modules/setup/application/forms/AdminAccountPage.php:235
 msgid "Please repeat the password given above to avoid typing errors."
 msgstr ""
 
-#: /vagrant/modules/setup/application/views/scripts/form/setup-welcome.phtml:101
+#: /vagrant/modules/setup/application/views/scripts/form/setup-welcome.phtml:107
 #, php-format
 msgid ""
 "Please see the %s for an extensive description on how to access and use this "
@@ -708,7 +705,7 @@ msgid ""
 msgstr ""
 
 #: /vagrant/modules/setup/library/Setup/Steps/ResourceStep.php:78
-#: /vagrant/modules/setup/library/Setup/Steps/ResourceStep.php:111
+#: /vagrant/modules/setup/library/Setup/Steps/ResourceStep.php:149
 msgid "Port"
 msgstr ""
 
@@ -734,7 +731,7 @@ msgstr ""
 msgid "Refresh the page; %s"
 msgstr ""
 
-#: /vagrant/modules/setup/application/forms/AdminAccountPage.php:232
+#: /vagrant/modules/setup/application/forms/AdminAccountPage.php:233
 msgid "Repeat password"
 msgstr ""
 
@@ -750,29 +747,31 @@ msgid "Requirements"
 msgstr ""
 
 #: /vagrant/modules/setup/library/Setup/Steps/ResourceStep.php:57
+msgctxt "setup.page.title"
 msgid "Resource"
 msgstr ""
 
 #: /vagrant/modules/setup/library/Setup/Steps/ResourceStep.php:66
-#: /vagrant/modules/setup/library/Setup/Steps/ResourceStep.php:103
+#: /vagrant/modules/setup/library/Setup/Steps/ResourceStep.php:141
 msgid "Resource Name"
 msgstr ""
 
-#: /vagrant/modules/setup/library/Setup/Steps/ResourceStep.php:144
+#: /vagrant/modules/setup/library/Setup/Steps/ResourceStep.php:182
 #, php-format
 msgid "Resource configuration could not be written to: %s. An error occured:"
 msgstr ""
 
-#: /vagrant/modules/setup/library/Setup/Steps/ResourceStep.php:138
+#: /vagrant/modules/setup/library/Setup/Steps/ResourceStep.php:176
 #, php-format
 msgid "Resource configuration has been successfully written to: %s"
 msgstr ""
 
 #: /vagrant/modules/setup/library/Setup/Steps/ResourceStep.php:55
+msgctxt "setup.page.title"
 msgid "Resources"
 msgstr ""
 
-#: /vagrant/modules/setup/library/Setup/Steps/ResourceStep.php:115
+#: /vagrant/modules/setup/library/Setup/Steps/ResourceStep.php:153
 msgid "Root DN"
 msgstr ""
 
@@ -782,11 +781,20 @@ msgid ""
 "built-in web server require PHP version 5.4."
 msgstr ""
 
+#: /vagrant/modules/setup/library/Setup/Steps/ResourceStep.php:104
+msgid "SSL Cert"
+msgstr "SSL-Zertifikat"
+
+#: /vagrant/modules/setup/library/Setup/Steps/ResourceStep.php:97
+msgid "SSL Key"
+msgstr "SSL-Schlüssel"
+
 #: /vagrant/modules/setup/library/Setup/WebWizard.php:356
+msgctxt "setup.summary.btn.finish"
 msgid "Setup Icinga Web 2"
 msgstr ""
 
-#: /vagrant/modules/setup/application/forms/WelcomePage.php:35
+#: /vagrant/modules/setup/application/forms/WelcomePage.php:36
 msgid "Setup Token"
 msgstr ""
 
@@ -798,13 +806,13 @@ msgstr ""
 msgid "Show the login page of Icinga Web 2"
 msgstr ""
 
-#: /vagrant/modules/setup/application/forms/LdapDiscoveryPage.php:49
+#: /vagrant/modules/setup/application/forms/LdapDiscoveryPage.php:50
 msgid "Skip"
 msgstr ""
 
 #: /vagrant/modules/setup/application/forms/DatabaseCreationPage.php:201
-#: /vagrant/modules/setup/application/forms/AuthBackendPage.php:227
 #: /vagrant/modules/setup/application/forms/LdapResourcePage.php:145
+#: /vagrant/modules/setup/application/forms/AuthBackendPage.php:227
 #: /vagrant/modules/setup/application/forms/DbResourcePage.php:178
 msgid "Skip Validation"
 msgstr ""
@@ -814,6 +822,7 @@ msgid "Sorry! Failed to set up Icinga Web 2 successfully."
 msgstr ""
 
 #: /vagrant/modules/setup/library/Setup/WebWizard.php:354
+msgctxt "setup.welcome.btn.next"
 msgid "Start"
 msgstr ""
 
@@ -835,11 +844,13 @@ msgstr ""
 
 #: /vagrant/modules/setup/library/Setup/Requirement/ClassRequirement.php:16
 #, php-format
+msgctxt "setup.requirement.class"
 msgid "The %s is available."
 msgstr ""
 
 #: /vagrant/modules/setup/library/Setup/Requirement/ClassRequirement.php:22
 #, php-format
+msgctxt "setup.requirement.class"
 msgid "The %s is missing."
 msgstr ""
 
@@ -892,10 +903,10 @@ msgid ""
 "database."
 msgstr ""
 
-#: /vagrant/modules/setup/application/clicommands/TokenCommand.php:35
-#: /vagrant/modules/setup/application/clicommands/TokenCommand.php:67
 #: /vagrant/modules/setup/application/clicommands/ConfigCommand.php:39
 #: /vagrant/modules/setup/application/clicommands/ConfigCommand.php:140
+#: /vagrant/modules/setup/application/clicommands/TokenCommand.php:35
+#: /vagrant/modules/setup/application/clicommands/TokenCommand.php:67
 msgid ""
 "The argument --config expects a path to Icinga Web 2's configuration files"
 msgstr ""
@@ -920,8 +931,8 @@ msgid ""
 "webserver will serve files"
 msgstr ""
 
-#: /vagrant/modules/setup/application/forms/AuthBackendPage.php:206
 #: /vagrant/modules/setup/application/forms/LdapResourcePage.php:126
+#: /vagrant/modules/setup/application/forms/AuthBackendPage.php:206
 #: /vagrant/modules/setup/application/forms/DbResourcePage.php:96
 msgid "The configuration has been successfully validated."
 msgstr ""
@@ -987,8 +998,9 @@ msgid ""
 "to not mix different schemas in the same database. If this is intentional, "
 "you can skip the validation and ignore this warning. If not, please provide "
 "a different database."
-msgstr "Es scheint so, als wäre die von dir konfigurierte Datenbank jene von "
-"Icinga. Bitte beachte, dass diese Datenbank-Konfiguration für die alleinige "
+msgstr ""
+"Es scheint so, als wäre die von dir konfigurierte Datenbank jene von Icinga. "
+"Bitte beachte, dass diese Datenbank-Konfiguration für die alleinige "
 "Verwendung durch Icinga Web 2 vorgesehen und dass es empfehlenswert ist, "
 "keine unterschiedlichen Schemas in der selben Datenbank einzusetzen. Falls "
 "dies Absicht ist, kannst du die Validierung überspringen und diese Warnung "
@@ -1055,7 +1067,7 @@ msgid ""
 "the login \"%s\"."
 msgstr ""
 
-#: /vagrant/modules/setup/application/forms/AuthenticationPage.php:60
+#: /vagrant/modules/setup/application/forms/AuthenticationPage.php:64
 msgid "The type of authentication to use when accessing Icinga Web 2"
 msgstr ""
 
@@ -1063,12 +1075,12 @@ msgstr ""
 msgid "The type of the resource being used for this authenticaton provider"
 msgstr ""
 
-#: /vagrant/modules/setup/application/views/scripts/form/setup-welcome.phtml:80
+#: /vagrant/modules/setup/application/views/scripts/form/setup-welcome.phtml:86
 #, php-format
 msgid "The user \"%s\" is a member of the system group \"icingaweb2\""
 msgstr ""
 
-#: /vagrant/modules/setup/application/views/scripts/form/setup-welcome.phtml:56
+#: /vagrant/modules/setup/application/views/scripts/form/setup-welcome.phtml:62
 msgid ""
 "This wizard will guide you through the configuration of Icinga Web 2. Once "
 "completed and successfully finished you are able to log in and to explore "
@@ -1088,7 +1100,7 @@ msgid ""
 "required."
 msgstr ""
 
-#: /vagrant/modules/setup/application/views/scripts/form/setup-welcome.phtml:73
+#: /vagrant/modules/setup/application/views/scripts/form/setup-welcome.phtml:79
 msgid ""
 "To run this wizard a user needs to authenticate using a token which is "
 "usually provided to him by an administrator who'd followed the instructions "
@@ -1112,7 +1124,7 @@ msgctxt "app.config.logging"
 msgid "Type"
 msgstr ""
 
-#: /vagrant/modules/setup/application/forms/AdminAccountPage.php:131
+#: /vagrant/modules/setup/application/forms/AdminAccountPage.php:132
 msgid "Type Of Definition"
 msgstr ""
 
@@ -1128,11 +1140,6 @@ msgstr ""
 msgid "Unable to create account \"%s\". An error occured:"
 msgstr ""
 
-#: /vagrant/modules/setup/library/Setup/Utils/MakeDirStep.php:54
-#, php-format
-msgid "Unable to create directory \"%s\" in \"%s\". An error occured:"
-msgstr ""
-
 #: /vagrant/modules/setup/library/Setup/Steps/UserGroupStep.php:190
 #, php-format
 msgid "Unable to create user group \"%s\". An error occured:"
@@ -1155,7 +1162,7 @@ msgstr ""
 msgid "Unknown type"
 msgstr ""
 
-#: /vagrant/modules/setup/application/forms/AdminAccountPage.php:109
+#: /vagrant/modules/setup/application/forms/AdminAccountPage.php:110
 msgctxt "setup.admin"
 msgid "User Group"
 msgstr ""
@@ -1165,11 +1172,8 @@ msgstr ""
 msgid "User Group \"%s\" has been successfully created."
 msgstr ""
 
-#: /vagrant/modules/setup/library/Setup/Steps/UserGroupStep.php:135
-msgid "User Group Backend"
-msgstr ""
-
 #: /vagrant/modules/setup/application/forms/UserGroupBackendPage.php:37
+#: /vagrant/modules/setup/library/Setup/Steps/UserGroupStep.php:135
 msgctxt "setup.page.title"
 msgid "User Group Backend"
 msgstr ""
@@ -1187,6 +1191,7 @@ msgid "User Group Backend configuration has been successfully written to: %s"
 msgstr ""
 
 #: /vagrant/modules/setup/library/Setup/Steps/UserGroupStep.php:134
+msgctxt "setup.page.title"
 msgid "User Groups"
 msgstr ""
 
@@ -1198,20 +1203,21 @@ msgstr ""
 msgid "User Object Class"
 msgstr ""
 
-#: /vagrant/modules/setup/library/Setup/Steps/ResourceStep.php:86
-#: /vagrant/modules/setup/application/forms/AdminAccountPage.php:155
-#: /vagrant/modules/setup/application/forms/AdminAccountPage.php:187
-#: /vagrant/modules/setup/application/forms/AdminAccountPage.php:208
+#: /vagrant/modules/setup/application/forms/AdminAccountPage.php:156
+#: /vagrant/modules/setup/application/forms/AdminAccountPage.php:188
+#: /vagrant/modules/setup/application/forms/AdminAccountPage.php:209
 #: /vagrant/modules/setup/application/forms/DatabaseCreationPage.php:100
+#: /vagrant/modules/setup/library/Setup/Steps/ResourceStep.php:86
 msgid "Username"
 msgstr ""
 
-#: /vagrant/modules/setup/application/forms/AdminAccountPage.php:258
+#: /vagrant/modules/setup/application/forms/AdminAccountPage.php:259
 msgid "Username already exists."
 msgstr ""
 
 #: /vagrant/modules/setup/library/Setup/Steps/AuthenticationStep.php:126
 #, php-format
+msgctxt "setup.summary.auth"
 msgid "Users will authenticate using %s."
 msgstr ""
 
@@ -1223,8 +1229,8 @@ msgstr ""
 msgid "Validation In Progress"
 msgstr ""
 
-#: /vagrant/modules/setup/application/forms/AuthBackendPage.php:188
 #: /vagrant/modules/setup/application/forms/LdapResourcePage.php:108
+#: /vagrant/modules/setup/application/forms/AuthBackendPage.php:188
 msgid "Validation Log"
 msgstr ""
 
@@ -1238,7 +1244,7 @@ msgctxt "setup.progress"
 msgid "Welcome"
 msgstr ""
 
-#: /vagrant/modules/setup/application/views/scripts/form/setup-welcome.phtml:48
+#: /vagrant/modules/setup/application/views/scripts/form/setup-welcome.phtml:54
 msgid "Welcome to the configuration of Icinga Web 2!"
 msgstr ""
 
@@ -1257,7 +1263,7 @@ msgstr ""
 msgid "You are running PHP version %s."
 msgstr ""
 
-#: /vagrant/modules/setup/application/forms/LdapDiscoveryPage.php:32
+#: /vagrant/modules/setup/application/forms/LdapDiscoveryPage.php:33
 msgid ""
 "You can use this page to discover LDAP or ActiveDirectory servers  for "
 "authentication. If you don' want to execute a discovery, just skip this step."
@@ -1268,14 +1274,14 @@ msgid ""
 "You may also need to restart the web-server for the changes to take effect!"
 msgstr ""
 
-#: /vagrant/modules/setup/application/forms/AuthenticationPage.php:36
+#: /vagrant/modules/setup/application/forms/AuthenticationPage.php:39
 msgid ""
 "You're currently not authenticated using any of the web server's "
 "authentication mechanisms. Make sure you'll configure such, otherwise you'll "
 "not be able to log into Icinga Web 2."
 msgstr ""
 
-#: /vagrant/modules/setup/application/views/scripts/form/setup-welcome.phtml:51
+#: /vagrant/modules/setup/application/views/scripts/form/setup-welcome.phtml:57
 msgid ""
 "You've already completed the configuration of Icinga Web 2. Note that most "
 "of your configuration files will be overwritten in case you'll re-configure "
@@ -1298,7 +1304,7 @@ msgid ""
 "%1$s right after it has successfully been set up."
 msgstr ""
 
-#: /vagrant/modules/setup/application/views/scripts/form/setup-welcome.phtml:82
+#: /vagrant/modules/setup/application/views/scripts/form/setup-welcome.phtml:88
 msgid "Your webserver's user is a member of the system group \"icingaweb2\""
 msgstr ""
 
@@ -1311,19 +1317,22 @@ msgid "Zend database adapter for PostgreSQL"
 msgstr ""
 
 #: /vagrant/modules/setup/library/Setup/Steps/AuthenticationStep.php:127
+msgctxt "setup.summary.auth.type"
 msgid "a database"
 msgstr ""
 
 #: /vagrant/modules/setup/library/Setup/Requirement/ClassRequirement.php:17
 #: /vagrant/modules/setup/library/Setup/Requirement/ClassRequirement.php:23
+msgctxt "setup.requirement.class"
 msgid "class"
 msgstr ""
 
-#: /vagrant/modules/setup/application/forms/AdminAccountPage.php:194
+#: /vagrant/modules/setup/application/forms/AdminAccountPage.php:195
 msgctxt "setup.admin.authbackend"
 msgid "database"
 msgstr ""
 
 #: /vagrant/modules/setup/library/Setup/Steps/AuthenticationStep.php:129
+msgctxt "setup.summary.auth.type"
 msgid "webserver authentication"
 msgstr ""