Update german translation

application/forms/Dashboard/DashletForm.php

@@ -69,7 +69,7 @@ class DashletForm extends Form
                 'required'      => true,
                 'label'         => $this->translate('Url'),
                 'description'   => $this->translate(
-                    'Enter url being loaded in the dashlet. You can paste the full URL, including filters.'
+                    'Enter url to be loaded in the dashlet. You can paste the full URL, including filters.'
                 ),
                 'validators'    => array(new UrlValidator(), new InternalUrlValidator())
             )

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-12-09 13:27+0000\n"
+"POT-Creation-Date: 2016-12-12 09:32+0000\n"
-"PO-Revision-Date: 2016-12-09 15:33+0100\n"
+"PO-Revision-Date: 2016-12-12 10:32+0100\n"
 "Language: de_DE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -47,6 +47,11 @@ msgstr "%s (%%value%%) hat den falschen MIME-Type \"%%type%%\""
 msgid "%s (%%value%%) has no MIME type"
 msgstr "%s (%%value%%) hat keinen MIME-Typ"
 
+#: /vagrant/library/Icinga/Web/Form/Decorator/FormHints.php:61
+#, php-format
+msgid "%s Required field"
+msgstr ""
+
 #: /vagrant/library/Icinga/Date/DateFormatter.php:171
 #, php-format
 msgctxt "An event that happened the given time interval ago"
@@ -585,7 +590,8 @@ msgstr ""
 "legen Sie als Erstes eine Ressource für die Authentifizierung an."
 
 #: /vagrant/application/views/scripts/dashboard/error.phtml:2
-msgid "Could not persist dashboard"
+#, fuzzy
+msgid "Could not save dashboard"
 msgstr "Konnte Dashboard nicht speichern"
 
 #: /vagrant/application/forms/Announcement/AnnouncementForm.php:58
@@ -674,7 +680,6 @@ msgid "Create memberships for %s"
 msgstr "Mitgliedschaften für %s erstellen"
 
 #: /vagrant/library/Icinga/Authentication/User/LdapUserBackend.php:257
-#: /vagrant/library/Icinga/Authentication/User/DbUserBackend.php:120
 #: /vagrant/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php:496
 #: /vagrant/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php:122
 msgid "Created At"
@@ -685,6 +690,7 @@ msgstr "Erstellt am"
 #: /vagrant/application/controllers/GroupController.php:70
 #: /vagrant/application/controllers/GroupController.php:106
 #: /vagrant/application/controllers/UserController.php:71
+#: /vagrant/library/Icinga/Authentication/User/DbUserBackend.php:120
 msgid "Created at"
 msgstr "Erstellt am"
 
@@ -901,11 +907,11 @@ msgstr "Titel für das Dashboard eingeben"
 
 #: /vagrant/application/forms/Dashboard/DashletForm.php:72
 msgid ""
-"Enter url being loaded in the dashlet. You can paste the full URL, including "
+"Enter url to be loaded in the dashlet. You can paste the full URL, including "
 "filters."
 msgstr ""
-"URL angeben, die in dem Dashlet geladen werden soll. Es sind vollständige "
+"URL angeben, die in dem Dashlet geladen werden soll. Es kann die "
-"URLs mit Filtern möglich."
+"vollständige URL mit Filtern eingefügt werden."
 
 #: /vagrant/application/controllers/ErrorController.php:108
 msgid "Error"
@@ -1337,18 +1343,15 @@ msgstr "LDAP-Attribut für den Benutzernamen"
 msgid "LDAP User Object Class"
 msgstr "LDAP Objektklasse für den Benutzer"
 
-#: /vagrant/library/Icinga/Authentication/User/LdapUserBackend.php:258
-#: /vagrant/library/Icinga/Authentication/User/DbUserBackend.php:121
-#: /vagrant/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php:497
-#: /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/library/Icinga/Authentication/User/LdapUserBackend.php:258
+#: /vagrant/library/Icinga/Authentication/User/DbUserBackend.php:121
+#: /vagrant/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php:497
+#: /vagrant/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php:123
 msgid "Last modified"
 msgstr "Zuletzt verändert"
 
@@ -3366,12 +3369,25 @@ 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 "Could not persist dashboard"
+#~ msgstr "Konnte Dashboard nicht speichern"
+
 #~ msgid "Disable the dashboard"
 #~ msgstr "Dashboard deaktivieren"
 
 #~ msgid "Disabled"
 #~ msgstr "Deaktiviert"
 
+#~ msgid ""
+#~ "Enter url being loaded in the dashlet. You can paste the full URL, "
+#~ "including filters."
+#~ msgstr ""
+#~ "URL angeben, die in dem Dashlet geladen werden soll. Es sind vollständige "
+#~ "URLs mit Filtern möglich."
+
+#~ msgid "Last Modified"
+#~ msgstr "Zuletzt verändert"
+
 #~ msgid "Title"
 #~ msgstr "Titel"
 
@@ -3543,10 +3559,27 @@ msgstr "umschalten"
 #~ msgid "The type of SQL database you want to create."
 #~ msgstr "Der Typ der zu benutzenden SQL Datenbank."
 
+#~ msgid ""
+#~ "The url of this navigation item. Leave blank if you only want the name "
+#~ "being displayed. For 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. Stellen Sie für externe URLs sicher, "
+#~ "dass Sie einen passenden Protokollnamen voran stellen (z.B. http://"
+#~ "example.tld)"
+
 #~ msgid "The user dn to use for querying the ldap server"
 #~ msgstr ""
 #~ "Die DN des Benutzers mit welchem dieser LDAP-Server befragt werden soll"
 
+#~ msgid ""
+#~ "Upon its value has changed, this field issues an automatic update of this "
+#~ "page."
+#~ msgstr ""
+#~ "Dieses Feld löst eine automatische Aktualisierung dieser Seite aus, wenn "
+#~ "sein Inhalt geändert wird."
+
 #~ msgid "Use Default Language"
 #~ msgstr "Standardsprache verwenden"
 

application/locale/fi_FI/LC_MESSAGES/icinga.po

@@ -244,7 +244,7 @@ msgid "Could not find any resources for authentication"
 msgstr "Yhtään tunnistautumisresurssia ei löytynyt"
 
 #: /usr/share/icingaweb2/application/views/scripts/dashboard/error.phtml:2
-msgid "Could not persist dashboard"
+msgid "Could not save dashboard"
 msgstr "Kojelauta ei pysy"
 
 #: /usr/share/icingaweb2/application/controllers/AuthenticationController.php:62
@@ -395,7 +395,7 @@ msgstr "Ruudun otsikko"
 
 #: /usr/share/icingaweb2/application/forms/Dashboard/DashletForm.php:70
 msgid ""
-"Enter url being loaded in the dashlet. You can paste the full URL, including filters."
+"Enter url to be loaded in the dashlet. You can paste the full URL, including filters."
 msgstr "Anna url, jonka haluat ladattavan dashletiin. Voit käyttää copy-pastea."
 
 #: /usr/share/icingaweb2/application/forms/Config/General/LoggingConfigForm.php:51

application/locale/pt_BR/LC_MESSAGES/icinga.po

@@ -268,7 +268,7 @@ msgid "Could not find any resources for authentication"
 msgstr "Não foi possível encontrar os recursos para autenticação"
 
 #: /usr/local/icingaweb/application/views/scripts/dashboard/error.phtml:2
-msgid "Could not persist dashboard"
+msgid "Could not save dashboard"
 msgstr "Não foi possível salvar o dashboard"
 
 #: /usr/local/icingaweb/application/controllers/AuthenticationController.php:60
@@ -440,7 +440,7 @@ msgstr "Entre com o título para o novo painel."
 #: /usr/local/icingaweb/application/forms/Dashboard/ComponentForm.php:70
 #: /usr/local/icingaweb/application/forms/Dashboard/DashletForm.php:71
 msgid ""
-"Enter url being loaded in the dashlet. You can paste the full URL, including "
+"Enter url to be loaded in the dashlet. You can paste the full URL, including "
 "filters."
 msgstr ""
 "Digite url a ser carregada no dashlet. Você pode colar a URL completa, "

application/views/scripts/dashboard/error.phtml

@@ -1,5 +1,5 @@
 <div class="content">
-    <h1><?= $this->translate('Could not persist dashboard'); ?></h1>
+    <h1><?= $this->translate('Could not save dashboard'); ?></h1>
     <p>
         <?= $this->translate('Please copy the following dashboard snippet to '); ?>
         <strong><?= $this->config->getConfigFile(); ?>;</strong>.

library/Icinga/Authentication/User/DbUserBackend.php

@@ -117,8 +117,8 @@ class DbUserBackend extends DbRepository implements UserBackendInterface, Inspec
             $userLabel          => 'user',
             t('Username')       => 'user_name',
             t('Active')         => 'is_active',
-            t('Created At')     => 'created_at',
+            t('Created at')     => 'created_at',
-            t('Last Modified')  => 'last_modified'
+            t('Last modified')  => 'last_modified'
         );
     }
 

library/Icinga/Authentication/User/LdapUserBackend.php

@@ -255,7 +255,7 @@ class LdapUserBackend extends LdapRepository implements UserBackendInterface, In
             t('Username')       => 'user_name',
             t('Active')         => 'is_active',
             t('Created At')     => 'created_at',
-            t('Last Modified')  => 'last_modified'
+            t('Last modified')  => 'last_modified'
         );
     }
 

library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php

@@ -120,7 +120,7 @@ class DbUserGroupBackend extends DbRepository implements UserGroupBackendInterfa
             t('User Group')     => 'group_name',
             t('Parent')         => 'parent',
             t('Created At')     => 'created_at',
-            t('Last Modified')  => 'last_modified'
+            t('Last modified')  => 'last_modified'
         );
     }
 

library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php

@@ -494,7 +494,7 @@ class LdapUserGroupBackend extends LdapRepository implements UserGroupBackendInt
             t('Username')       => 'user_name',
             t('User Group')     => 'group_name',
             t('Created At')     => 'created_at',
-            t('Last Modified')  => 'last_modified'
+            t('Last modified')  => 'last_modified'
         );
     }
 

library/Icinga/Web/Form/Decorator/FormHints.php

@@ -57,10 +57,10 @@ class FormHints extends Zend_Form_Decorator_Abstract
 
         $hints = $this->recurseForm($form, $entirelyRequired);
         if ($entirelyRequired !== null) {
-            $hints[] = $form->getView()->translate(sprintf(
+            $hints[] = sprintf(
-                '%s Required field',
+                $form->getView()->translate('%s Required field'),
                 $form->getRequiredCue()
-            ));
+            );
         }
 
         if (empty($hints)) {

modules/doc/library/Doc/Renderer/DocSearchRenderer.php

@@ -109,16 +109,22 @@ class DocSearchRenderer extends DocRenderer
             $url->setAnchor($this->encodeAnchor($section->getId()));
             $urlAttributes = array(
                 'data-base-target'  => '_next',
-                'title'             => sprintf(
+                'title'             => $section->getId() === $section->getChapter()->getId()
+                    ? sprintf(
                         $this->getView()->translate(
-                        'Show all matches of "%s" in %sthe chapter "%s"',
+                            'Show all matches of "%s" in the chapter "%s"',
                             'search.render.section.link'
                         ),
                         $this->getInnerIterator()->getSearch()->getInput(),
-                    $section->getId() !== $section->getChapter()->getId() ? sprintf(
+                        $section->getChapter()->getTitle()
-                        $this->getView()->translate('the section "%s" of ', 'search.render.section.link'),
+                    )
-                        $section->getTitle()
+                    : sprintf(
-                    ) : '',
+                        $this->getView()->translate(
+                            'Show all matches of "%s" in the section "%s" of the chapter "%s"',
+                            'search.render.section.link'
+                        ),
+                        $this->getInnerIterator()->getSearch()->getInput(),
+                        $section->getTitle(),
                         $section->getChapter()->getTitle()
                     )
             );

modules/doc/library/Doc/Renderer/DocTocRenderer.php

@@ -108,12 +108,14 @@ class DocTocRenderer extends DocRenderer
             }
             $urlAttributes = array(
                 'data-base-target'  => '_next',
-                'title'             => sprintf(
+                'title'             => $section->getId() === $section->getChapter()->getId()
-                    $this->getView()->translate('Show the %schapter "%s"', 'toc.render.section.link'),
+                    ? sprintf(
-                    $section->getId() !== $section->getChapter()->getId() ? sprintf(
+                        $view->translate('Show the chapter "%s"', 'toc.render.section.link'),
-                        $this->getView()->translate('section "%s" of the ', 'toc.render.section.link'),
+                        $section->getChapter()->getTitle()
-                        $section->getTitle()
+                    )
-                    ) : '',
+                    : sprintf(
+                        $view->translate('Show the section "%s" of the chapter "%s"', 'toc.render.section.link'),
+                        $section->getTitle(),
                         $section->getChapter()->getTitle()
                     )
             );

modules/setup/application/views/scripts/form/setup-welcome.phtml

@@ -72,7 +72,7 @@ if (! (false === ($distro = Platform::getLinuxDistro(1)) || $distro === 'linux')
     </div>
   </form>
   <div class="note">
-    <h3>Generating a New Setup Token</h3>
+    <h3><?= $this->translate('Generating a New Setup Token'); ?></h3>
     <div>
       <p><?=
         $this->translate(

modules/setup/library/Setup/Requirement.php

@@ -56,6 +56,20 @@ abstract class Requirement
      */
     protected $alias;
 
+    /**
+     * The text to display if the given requirement is fulfilled
+     *
+     * @var string
+     */
+    protected $textAvailable;
+
+    /**
+     * The text to display if the given requirement is not fulfilled
+     *
+     * @var string
+     */
+    protected $textMissing;
+
     /**
      * Create a new requirement
      *
@@ -130,6 +144,10 @@ abstract class Requirement
      */
     public function getStateText()
     {
+        $state = $this->getState();
+        if ($this->stateText === null) {
+            return $state ? $this->getTextAvailable() : $this->getTextMissing();
+        }
         return $this->stateText;
     }
 
@@ -254,6 +272,48 @@ abstract class Requirement
         return $this->alias;
     }
 
+    /**
+     * Set the text to display if the given requirement is fulfilled
+     *
+     * @param   string  $textAvailable
+     *
+     * @return  Requirement
+     */
+    public function setTextAvailable($textAvailable) {
+        $this->textAvailable = $textAvailable;
+        return $this;
+    }
+
+    /**
+     * Get the text to display if the given requirement is fulfilled
+     *
+     * @return  string
+     */
+    public function getTextAvailable() {
+        return $this->textAvailable;
+    }
+
+    /**
+     * Set the text to display if the given requirement is not fulfilled
+     *
+     * @param   string  $textMissing
+     *
+     * @return  Requirement
+     */
+    public function setTextMissing($textMissing) {
+        $this->textMissing = $textMissing;
+        return $this;
+    }
+
+    /**
+     * Get the text to display if the given requirement is not fulfilled
+     *
+     * @return  string
+     */
+    public function getTextMissing() {
+        return $this->textMissing;
+    }
+
     /**
      * Evaluate this requirement and return whether it is fulfilled
      *

modules/setup/library/Setup/Requirement/ClassRequirement.php

@@ -10,19 +10,27 @@ class ClassRequirement extends Requirement
 {
     protected function evaluate()
     {
-        $classNameOrPath = $this->getCondition();
+        return Platform::classExists($this->getCondition());
-        if (Platform::classExists($classNameOrPath)) {
-            $this->setStateText(sprintf(
-                mt('setup', 'The %s is available.', 'setup.requirement.class'),
-                $this->getAlias() ?: $classNameOrPath . ' ' . mt('setup', 'class', 'setup.requirement.class')
-            ));
-            return true;
-        } else {
-            $this->setStateText(sprintf(
-                mt('setup', 'The %s is missing.', 'setup.requirement.class'),
-                $this->getAlias() ?: $classNameOrPath . ' ' . mt('setup', 'class', 'setup.requirement.class')
-            ));
-            return false;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getStateText()
+    {
+        $stateText = parent::getStateText();
+        if ($stateText === null) {
+            $alias = $this->getAlias();
+            if ($this->getState()) {
+                $stateText = $alias === null
+                    ? sprintf(mt('setup', 'The %s class is available.', 'setup.requirement.class'), $this->getCondition())
+                    : sprintf(mt('setup', 'The %s is available.', 'setup.requirement.class'), $alias);
+            } else {
+                $stateText = $alias === null
+                    ? sprintf(mt('setup', 'The %s class is missing.', 'setup.requirement.class'), $this->getCondition())
+                    : sprintf(mt('setup', 'The %s is missing.', 'setup.requirement.class'), $alias);
+            }
+        }
+        return $stateText;
     }
 }

modules/setup/library/Setup/WebWizard.php

@@ -654,6 +654,16 @@ class WebWizard extends Wizard implements SetupWizard
             'description'   => mt(
                 'setup',
                 'The Zend database adapter for MySQL is required to access a MySQL database.'
+            ),
+            'textAvailable' => mt(
+                'setup',
+                'The Zend database adapter for MySQL is available.',
+                'setup.requirement.class'
+            ),
+            'textMissing'   => mt(
+                'setup',
+                'The Zend database adapter for MySQL is missing.',
+                'setup.requirement.class'
             )
         )));
         $set->merge($mysqlSet);
@@ -675,6 +685,16 @@ class WebWizard extends Wizard implements SetupWizard
             'description'   => mt(
                 'setup',
                 'The Zend database adapter for PostgreSQL is required to access a PostgreSQL database.'
+            ),
+            'textAvailable' => mt(
+                'setup',
+                'The Zend database adapter for PostgreSQL is available.',
+                'setup.requirement.class'
+            ),
+            'textMissing'   => mt(
+                'setup',
+                'The Zend database adapter for PostgreSQL is missing.',
+                'setup.requirement.class'
             )
         )));
         $set->merge($pgsqlSet);