Merge branch 'totals' of git://github.com/danikachhour/matomo into 3.x-dev

4 files changed, 12 insertions, 12 deletions

diff --git a/plugins/Actions/Reports/GetPageTitlesFollowingSiteSearch.php b/plugins/Actions/Reports/GetPageTitlesFollowingSiteSearch.php
index 4b3911780a..cd8a6e4d75 100644
--- a/plugins/Actions/Reports/GetPageTitlesFollowingSiteSearch.php
+++ b/plugins/Actions/Reports/GetPageTitlesFollowingSiteSearch.php
@@ -48,7 +48,7 @@ class GetPageTitlesFollowingSiteSearch extends SiteSearchBase
     {
         return array(
             'nb_hits_following_search' => Piwik::translate('General_ColumnViewedAfterSearch'),
-            'nb_hits'                  => Piwik::translate('General_ColumnTotalPageviews'),
+            'nb_hits'                  => Piwik::translate('General_ColumnPageviews'),
         );
     }
 
diff --git a/plugins/Events/Columns/TotalEvents.php b/plugins/Events/Columns/TotalEvents.php
index f96392c194..17acdd235a 100644
--- a/plugins/Events/Columns/TotalEvents.php
+++ b/plugins/Events/Columns/TotalEvents.php
@@ -18,7 +18,7 @@ class TotalEvents extends VisitDimension
     protected $columnName = 'visit_total_events';
     protected $columnType = 'INT(11) UNSIGNED NULL';
     protected $segmentName = 'events';
-    protected $nameSingular = 'Events_TotalEvents';
+    protected $nameSingular = 'Events_Events';
     protected $acceptValues = 'To select all visits who triggered an Event, use: &segment=events>0';
 
     protected $type = self::TYPE_NUMBER;
@@ -61,4 +61,4 @@ class TotalEvents extends VisitDimension
     {
         return ($action && $action->getActionType() == Action::TYPE_EVENT);
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/Events/Events.php b/plugins/Events/Events.php
index d3fc8501f1..4c12a53fe0 100644
--- a/plugins/Events/Events.php
+++ b/plugins/Events/Events.php
@@ -45,8 +45,8 @@ class Events extends \Piwik\Plugin
     public function getMetricDocumentation()
     {
         $documentation = array(
-            'nb_events'            => 'Events_TotalEventsDocumentation',
-            'sum_event_value'      => 'Events_TotalValueDocumentation',
+            'nb_events'            => 'Events_EventsDocumentation',
+            'sum_event_value'      => 'Events_EventValueDocumentation',
             'min_event_value'      => 'Events_MinValueDocumentation',
             'max_event_value'      => 'Events_MaxValueDocumentation',
             'avg_event_value'      => 'Events_AvgValueDocumentation',
@@ -59,8 +59,8 @@ class Events extends \Piwik\Plugin
     public function getMetricTranslations()
     {
         $metrics = array(
-            'nb_events'            => 'Events_TotalEvents',
-            'sum_event_value'      => 'Events_TotalValue',
+            'nb_events'            => 'Events_Events',
+            'sum_event_value'      => 'Events_EventValue',
             'min_event_value'      => 'Events_MinValue',
             'max_event_value'      => 'Events_MaxValue',
             'avg_event_value'      => 'Events_AvgValue',
diff --git a/plugins/Events/lang/en.json b/plugins/Events/lang/en.json
index 8658bd6ed0..52597feabd 100644
--- a/plugins/Events/lang/en.json
+++ b/plugins/Events/lang/en.json
@@ -16,19 +16,19 @@
         "Events": "Events",
         "EventsWithValue": "Events with a value",
         "EventsWithValueDocumentation": "Number of events where an Event value was set",
-        "EventValue": "Event Value",
+        "EventValue": "Event value",
         "EventValueTooltip": "Total Event value is the sum of %1$s events values %2$s between minimum of %3$s and maximum of %4$s.",
-        "MaxValue": "Maximum value",
+        "MaxValue": "Maximum Event value",
         "MaxValueDocumentation": "The maximum value for this event",
-        "MinValue": "Minimum value",
+        "MinValue": "Minimum Event value",
         "MinValueDocumentation": "The minimum value for this event",
         "SecondaryDimension": "Secondary dimension is %s.",
         "SwitchToSecondaryDimension": "Switch to %s",
         "TopEvents": "Top Events",
         "TotalEvents": "Total events",
         "TotalEventsDocumentation": "Total number of events",
-        "TotalValue": "Total value",
+        "TotalValue": "Event value",
         "TotalValueDocumentation": "The sum of event values",
         "ViewEvents": "View Events"
     }
-}
\ No newline at end of file
+}