diff options
author | Matthieu Aubry <mattab@users.noreply.github.com> | 2017-01-02 03:13:26 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-02 03:13:26 +0300 |
commit | 50b866dae9caf2e216cf228bbc37b16d30beb4d0 (patch) | |
tree | 0e3a58d8916c92168a905d29cc21f10eb4a687b1 /plugins | |
parent | 726447ce88aa43e587eedc18f50fcccb4ac0bce5 (diff) | |
parent | 8e057ae52582473047828c9c3266df90fc2061e8 (diff) |
Merge pull request #11124 from piwik/3.x-dev3.0.1-b2
3.0.1-b2
Diffstat (limited to 'plugins')
m--------- | plugins/Bandwidth | 0 | ||||
m--------- | plugins/CustomAlerts | 0 | ||||
m--------- | plugins/CustomDimensions | 0 | ||||
m--------- | plugins/LogViewer | 0 | ||||
m--------- | plugins/QueuedTracking | 0 | ||||
m--------- | plugins/SecurityInfo | 0 | ||||
m--------- | plugins/TasksTimetable | 0 | ||||
-rw-r--r-- | plugins/UserCountryMap/Controller.php | 2 | ||||
m--------- | plugins/VisitorGenerator | 0 |
9 files changed, 1 insertions, 1 deletions
diff --git a/plugins/Bandwidth b/plugins/Bandwidth -Subproject b3db9b1d8d16704fc74afa6c5479c5ca2a8d160 +Subproject fe8483fd66e7a6ba9af0d8665629380a7f6775f diff --git a/plugins/CustomAlerts b/plugins/CustomAlerts -Subproject 8c861c9084a25dc36e1176496598a175a1619ee +Subproject 8b0b11a887063354ab67e3366733ed5c19ab634 diff --git a/plugins/CustomDimensions b/plugins/CustomDimensions -Subproject 8372a86d1681ebd98ae682d0ab0884146d1c7e9 +Subproject d74be369cc456fe9a7956dbb1e742588738d415 diff --git a/plugins/LogViewer b/plugins/LogViewer -Subproject a9a0e5ac1fd22a2eaf981f49e882de28479536d +Subproject e02c1d9f4f6bc00221d18313932b42e73345bab diff --git a/plugins/QueuedTracking b/plugins/QueuedTracking -Subproject 0547d18cbfa6497ea082321aa7498191ecb3479 +Subproject c4905a42b008c3eb0d58f8c24e541625d482ef4 diff --git a/plugins/SecurityInfo b/plugins/SecurityInfo -Subproject aef66a071ca376813d56585974120e95a1478e3 +Subproject c620723f0ad4e94966d93df834cf07b5b0ad76b diff --git a/plugins/TasksTimetable b/plugins/TasksTimetable -Subproject ba305a46f9ca2b02fc6a0ffca141d2be2c3ee5a +Subproject 18cc00ffc21916ebcd70e92b1b3416eecdab8b3 diff --git a/plugins/UserCountryMap/Controller.php b/plugins/UserCountryMap/Controller.php index cb3b15f639..7f291a8b15 100644 --- a/plugins/UserCountryMap/Controller.php +++ b/plugins/UserCountryMap/Controller.php @@ -189,7 +189,7 @@ class Controller extends \Piwik\Plugin\Controller 'hours' => $this->translator->translate('Intl_Hours'), 'hours_ago' => $this->translator->translate('UserCountryMap_HoursAgo'), 'days_ago' => $this->translator->translate('UserCountryMap_DaysAgo'), - 'actions' => $this->translator->translate('VisitsSummary_NbPageviewsDescription'), + 'actions' => $this->translator->translate('Transitions_NumPageviews'), 'searches' => $this->translator->translate('UserCountryMap_Searches'), 'goal_conversions' => $this->translator->translate('UserCountryMap_GoalConversions'), ); diff --git a/plugins/VisitorGenerator b/plugins/VisitorGenerator -Subproject 3e49303e43f59027f0a7fd7fcfb5ca9060902a5 +Subproject 3cc7198c9ae509a22f020aef68071170aa3c9a6 |