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/VisitsSummary | |
| 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/VisitsSummary')
| -rw-r--r-- | plugins/VisitsSummary/Reports/Get.php | 1 | ||||
| -rw-r--r-- | plugins/VisitsSummary/lang/nb.json | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/plugins/VisitsSummary/Reports/Get.php b/plugins/VisitsSummary/Reports/Get.php index 46ba992787..c74a82566f 100644 --- a/plugins/VisitsSummary/Reports/Get.php +++ b/plugins/VisitsSummary/Reports/Get.php @@ -11,7 +11,6 @@ namespace Piwik\Plugins\VisitsSummary\Reports; use Piwik\Common; use Piwik\Container\StaticContainer; use Piwik\DataTable; -use Piwik\DataTable\DataTableInterface; use Piwik\Metrics\Formatter; use Piwik\NumberFormatter; use Piwik\Piwik; diff --git a/plugins/VisitsSummary/lang/nb.json b/plugins/VisitsSummary/lang/nb.json index 8310f1b531..e304e11936 100644 --- a/plugins/VisitsSummary/lang/nb.json +++ b/plugins/VisitsSummary/lang/nb.json @@ -5,18 +5,21 @@ "GenerateQueries": "%s spørringer kjørt", "GenerateTime": "%s sekunder for å generere denne siden", "MaxNbActions": "%s maks handlinger i ett besøk", - "NbActionsDescription": "%s handlinger (sidevisninger, nedlastinger og utlenker)", - "NbActionsPerVisit": "%s handlinger per besøk", + "NbActionsDescription": "%s handlinger", + "NbActionsPerVisit": "%s handlinger (sidevisninger, nedlastinger, utlenker og interne nettstedssøk) per besøk", "NbDownloadsDescription": "%s nedlastinger", "NbKeywordsDescription": "%s unike nøkkelord", "NbOutlinksDescription": "%s utlenker", "NbPageviewsDescription": "%s sidevisninger", + "NbSearchesDescription": "%s søk totalt på ditt nettsted", "NbUniqueDownloadsDescription": "%s unike nedlastinger", "NbUniqueOutlinksDescription": "%s unike utlenker", "NbUniquePageviewsDescription": "%s unike sidevisninger", "NbUniqueVisitors": "%s unike besøkende", "NbVisitsBounced": "%s besøk har sprettet (forlatt nettstedet etter en side)", + "PluginDescription": "Rapporterer generelle analysetall: besøk, unike besøkere, antall handlinger, sprettfrekvens, etc.", "VisitsSummary": "Besøksammendrag", + "VisitsSummaryDocumentation": "Dette er en oversikt over besøksutvikling.", "WidgetLastVisits": "Graf over siste besøk", "WidgetOverviewGraph": "Oversikt med grafikk", "WidgetVisits": "Besøksoversikt" |