diff options
author | Thomas Steur <thomas.steur@gmail.com> | 2015-10-19 20:12:51 +0300 |
---|---|---|
committer | Thomas Steur <thomas.steur@gmail.com> | 2015-10-19 20:12:51 +0300 |
commit | 1b6050626d18e966cb18f03320ead7af14525db5 (patch) | |
tree | d6192b535e944226f3e6acf12351db70a5fc36e1 /plugins/Dashboard/Dashboard.php | |
parent | 6a14b0ce8461e62a4a37298c370775380305d71b (diff) | |
parent | 48ca332907257c35a7d94c1b120c9ad6cfaf320d (diff) |
Merge branch 'master' into 3.0
Conflicts:
core/Version.php
plugins/Actions/Menu.php
plugins/CoreHome/angularjs/history/history.service.js
plugins/CoreHome/javascripts/menu.js
plugins/CoreHome/templates/_menu.twig
plugins/Dashboard/Menu.php
plugins/Ecommerce/Menu.php
plugins/ExampleUI/Menu.php
plugins/Goals/Menu.php
plugins/Referrers/Menu.php
plugins/VisitsSummary/Menu.php
tests/UI/expected-ui-screenshots
tests/UI/specs/UIIntegration_spec.js
Diffstat (limited to 'plugins/Dashboard/Dashboard.php')
-rw-r--r-- | plugins/Dashboard/Dashboard.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/plugins/Dashboard/Dashboard.php b/plugins/Dashboard/Dashboard.php index f46bf1526f..5eee375988 100644 --- a/plugins/Dashboard/Dashboard.php +++ b/plugins/Dashboard/Dashboard.php @@ -297,6 +297,7 @@ class Dashboard extends \Piwik\Plugin $translationKeys[] = 'Dashboard_WidgetNotFound'; $translationKeys[] = 'Dashboard_DashboardCopied'; $translationKeys[] = 'Dashboard_Dashboard'; + $translationKeys[] = 'Dashboard_RemoveDefaultDashboardNotPossible'; $translationKeys[] = 'General_Close'; $translationKeys[] = 'General_Refresh'; } |