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/Insights | |
| 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/Insights')
| -rw-r--r-- | plugins/Insights/lang/nb.json | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/plugins/Insights/lang/nb.json b/plugins/Insights/lang/nb.json index 53bb501e52..967feeb49e 100644 --- a/plugins/Insights/lang/nb.json +++ b/plugins/Insights/lang/nb.json @@ -1,16 +1,16 @@ { "Insights": { "ControlComparedToDescription": "Vekst sammenlignet med", - "DayComparedToPreviousDay": "forrige dag", + "DayComparedToPreviousDay": "dagen før", "DayComparedToPreviousWeek": "samme dag i forrige uke", - "DayComparedToPreviousYear": "samme dag i foregående år", + "DayComparedToPreviousYear": "samme dag året før", "Filter": "Filter", "FilterOnlyNew": "Bare nye", - "MonthComparedToPreviousMonth": "forrige måned", + "MonthComparedToPreviousMonth": "måneden før", "MonthComparedToPreviousYear": "samme måned året før", - "TitleRowChangeDetails": "'%1$s' endret fra %2$s (%3$s) til %4$s (%5$s) %6$s.", - "WeekComparedToPreviousWeek": "forrige uke", + "TitleRowChangeDetails": "«%1$s» endret fra %2$s (%3$s) til %4$s (%5$s) %6$s.", + "WeekComparedToPreviousWeek": "uken før", "WidgetCategory": "Innsikt", - "YearComparedToPreviousYear": "forrige år" + "YearComparedToPreviousYear": "året før" } }
\ No newline at end of file |