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/VisitorInterest | |
| 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/VisitorInterest')
| -rw-r--r-- | plugins/VisitorInterest/lang/nb.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/VisitorInterest/lang/nb.json b/plugins/VisitorInterest/lang/nb.json index d3f7f1d968..19c38738f5 100644 --- a/plugins/VisitorInterest/lang/nb.json +++ b/plugins/VisitorInterest/lang/nb.json @@ -1,6 +1,6 @@ { "VisitorInterest": { - "BetweenXYMinutes": "%1$s-%2$s min", + "BetweenXYMinutes": "%1$s – %2$s min", "BetweenXYSeconds": "%1$s-%2$ss", "ColumnPagesPerVisit": "Sider pr. besøk", "ColumnVisitDuration": "Besøksvarighet", |