diff options
| author | sgiehl <stefan@piwik.org> | 2015-12-25 21:47:55 +0300 |
|---|---|---|
| committer | sgiehl <stefan@piwik.org> | 2015-12-25 21:47:55 +0300 |
| commit | b22dee447834c12f1095ba8ecf356970b2312dbf (patch) | |
| tree | 46a966716922f3d44734929486c43a26d37230f7 /plugins/UserLanguage | |
| parent | 72fa5107adcdbe1f4b8850f89c95dd3d5f5e6f4a (diff) | |
| parent | 611316e743d17d819b511d008da0e80e6425b686 (diff) | |
Merge branch 'master' into 3.0
Conflicts:
core/Version.php
plugins/CoreConsole/Commands/ManagePlugin.php
plugins/CoreHome/angularjs/siteselector/siteselector.directive.js
plugins/CoreHome/javascripts/corehome.js
plugins/Ecommerce/Menu.php
plugins/Events/Events.php
plugins/Goals/Goals.php
plugins/Live/templates/index.twig
plugins/UserCountryMap/UserCountryMap.php
plugins/UsersManager/stylesheets/usersManager.less
plugins/VisitsSummary/Controller.php
plugins/VisitsSummary/Reports/Get.php
tests/UI/expected-ui-screenshots
Diffstat (limited to 'plugins/UserLanguage')
| -rw-r--r-- | plugins/UserLanguage/Reports/Base.php | 1 | ||||
| -rw-r--r-- | plugins/UserLanguage/lang/nb.json | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/UserLanguage/Reports/Base.php b/plugins/UserLanguage/Reports/Base.php index 68e8a91b4b..9aa6a6ab35 100644 --- a/plugins/UserLanguage/Reports/Base.php +++ b/plugins/UserLanguage/Reports/Base.php @@ -8,7 +8,6 @@ */ namespace Piwik\Plugins\UserLanguage\Reports; -use Piwik\Plugin\ViewDataTable; use Piwik\Plugins\CoreVisualizations\Visualizations\Graph; abstract class Base extends \Piwik\Plugin\Report diff --git a/plugins/UserLanguage/lang/nb.json b/plugins/UserLanguage/lang/nb.json index 8f801da735..d647c56bc5 100644 --- a/plugins/UserLanguage/lang/nb.json +++ b/plugins/UserLanguage/lang/nb.json @@ -1,6 +1,7 @@ { "UserLanguage": { "BrowserLanguage": "Nettleserspråk", - "LanguageCode": "Språkkode" + "LanguageCode": "Språkkode", + "PluginDescription": "Rapporterer språket som er brukt av dine besøkeres nettlesere." } }
\ No newline at end of file |