tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/permission-application-log-is-not-configurable-12655' 

fixes #12655
This commit is contained in:
Alexander A. Klimov 2016-10-11 10:42:08 +02:00
parent 529ba8ed8a 5576e00a01
commit 2d0f81c035
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/forms/Security/RoleForm.php
View File

@ -42,6 +42,8 @@ class RoleForm extends ConfigForm
'application/stacktraces' => $this->translate( 'application/stacktraces' => $this->translate(
'Allow to adjust in the preferences whether to show stacktraces' 'Allow to adjust in the preferences whether to show stacktraces'
) . ' (application/stacktraces)', ) . ' (application/stacktraces)',
'application/log' => $this->translate('Allow to view the application log')
. ' (application/log)',
'config/*' => $this->translate('Allow config access') . ' (config/*)' 'config/*' => $this->translate('Allow config access') . ' (config/*)'
); );

BIN
application/locale/de_DE/LC_MESSAGES/icinga.mo
View File

Binary file not shown.

10
application/locale/de_DE/LC_MESSAGES/icinga.po
View File

@ -7,8 +7,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Icinga Web 2 (None)\n" "Project-Id-Version: Icinga Web 2 (None)\n"
"Report-Msgid-Bugs-To: dev@icinga.org\n" "Report-Msgid-Bugs-To: dev@icinga.org\n"
"POT-Creation-Date: 2016-06-02 14:11+0200\n" "POT-Creation-Date: 2016-09-27 09:09+0000\n"
"PO-Revision-Date: 2016-06-02 15:45+0200\n" "PO-Revision-Date: 2016-09-27 11:15+0200\n"
"Last-Translator: Eric Lippmann <eric.lippmann@netways.de>\n" "Last-Translator: Eric Lippmann <eric.lippmann@netways.de>\n"
"Language: de_DE\n" "Language: de_DE\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -16,7 +16,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Language-Team: \n" "Language-Team: \n"
"X-Generator: Poedit 1.8.8\n" "X-Generator: Poedit 1.8.9\n"
#: /vagrant/library/Icinga/Web/Form/Validator/InArray.php:16 #: /vagrant/library/Icinga/Web/Form/Validator/InArray.php:16
#, php-format #, php-format
@ -230,6 +230,10 @@ msgstr "Erlaubt die Einstellung zur Anzeige von Stacktraces"
msgid "Allow to share navigation items" msgid "Allow to share navigation items"
msgstr "Erlaubt das Teilen von Navigationselemten" msgstr "Erlaubt das Teilen von Navigationselemten"
#: /vagrant/application/forms/Security/RoleForm.php:45
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:135
msgid "" msgid ""
"An additional filter to use when looking up groups using the specified " "An additional filter to use when looking up groups using the specified "