translations cleanup: removed a couple of duplicate keys

7 files changed, 62 insertions, 62 deletions

diff --git a/plugins/API/ProcessedReport.php b/plugins/API/ProcessedReport.php
index 6926595b6f..9ee01d003e 100644
--- a/plugins/API/ProcessedReport.php
+++ b/plugins/API/ProcessedReport.php
@@ -193,7 +193,7 @@ class ProcessedReport
                 Piwik_Translate('General_MultiSitesSummary'),
                 Piwik_Translate('VisitsSummary_VisitsSummary'),
                 Piwik_Translate('Goals_Ecommerce'),
-                Piwik_Translate('Actions_Actions'),
+                Piwik_Translate('General_Actions'),
                 Piwik_Translate('Actions_SubmenuSitesearch'),
                 Piwik_Translate('Referers_Referers'),
                 Piwik_Translate('Goals_Goals'),
diff --git a/plugins/Actions/Actions.php b/plugins/Actions/Actions.php
index 4e936bab2f..93e432b11b 100644
--- a/plugins/Actions/Actions.php
+++ b/plugins/Actions/Actions.php
@@ -84,7 +84,7 @@ class Actions extends \Piwik\Plugin
         // entry and exit pages of visit
         $segments[] = array(
             'type'       => 'dimension',
-            'category'   => 'Actions_Actions',
+            'category'   => 'General_Actions',
             'name'       => 'Actions_ColumnEntryPageURL',
             'segment'    => 'entryPageUrl',
             'sqlSegment' => 'log_visit.visit_entry_idaction_url',
@@ -92,7 +92,7 @@ class Actions extends \Piwik\Plugin
         );
         $segments[] = array(
             'type'       => 'dimension',
-            'category'   => 'Actions_Actions',
+            'category'   => 'General_Actions',
             'name'       => 'Actions_ColumnEntryPageTitle',
             'segment'    => 'entryPageTitle',
             'sqlSegment' => 'log_visit.visit_entry_idaction_name',
@@ -100,7 +100,7 @@ class Actions extends \Piwik\Plugin
         );
         $segments[] = array(
             'type'       => 'dimension',
-            'category'   => 'Actions_Actions',
+            'category'   => 'General_Actions',
             'name'       => 'Actions_ColumnExitPageURL',
             'segment'    => 'exitPageUrl',
             'sqlSegment' => 'log_visit.visit_exit_idaction_url',
@@ -108,7 +108,7 @@ class Actions extends \Piwik\Plugin
         );
         $segments[] = array(
             'type'       => 'dimension',
-            'category'   => 'Actions_Actions',
+            'category'   => 'General_Actions',
             'name'       => 'Actions_ColumnExitPageTitle',
             'segment'    => 'exitPageTitle',
             'sqlSegment' => 'log_visit.visit_exit_idaction_name',
@@ -118,7 +118,7 @@ class Actions extends \Piwik\Plugin
         // single pages
         $segments[] = array(
             'type'           => 'dimension',
-            'category'       => 'Actions_Actions',
+            'category'       => 'General_Actions',
             'name'           => 'Actions_ColumnPageURL',
             'segment'        => 'pageUrl',
             'sqlSegment'     => 'log_link_visit_action.idaction_url',
@@ -127,7 +127,7 @@ class Actions extends \Piwik\Plugin
         );
         $segments[] = array(
             'type'       => 'dimension',
-            'category'   => 'Actions_Actions',
+            'category'   => 'General_Actions',
             'name'       => 'Actions_ColumnPageName',
             'segment'    => 'pageTitle',
             'sqlSegment' => 'log_link_visit_action.idaction_name',
@@ -135,7 +135,7 @@ class Actions extends \Piwik\Plugin
         );
         $segments[] = array(
             'type'       => 'dimension',
-            'category'   => 'Actions_Actions',
+            'category'   => 'General_Actions',
             'name'       => 'Actions_SiteSearchKeyword',
             'segment'    => 'siteSearchKeyword',
             'sqlSegment' => 'log_link_visit_action.idaction_name',
@@ -211,8 +211,8 @@ class Actions extends \Piwik\Plugin
     public function getReportMetadata(&$reports)
     {
         $reports[] = array(
-            'category'             => Piwik_Translate('Actions_Actions'),
-            'name'                 => Piwik_Translate('Actions_Actions') . ' - ' . Piwik_Translate('General_MainMetrics'),
+            'category'             => Piwik_Translate('General_Actions'),
+            'name'                 => Piwik_Translate('General_Actions') . ' - ' . Piwik_Translate('General_MainMetrics'),
             'module'               => 'Actions',
             'action'               => 'get',
             'metrics'              => array(
@@ -261,7 +261,7 @@ class Actions extends \Piwik\Plugin
 
         // pages report
         $reports[] = array(
-            'category'              => Piwik_Translate('Actions_Actions'),
+            'category'              => Piwik_Translate('General_Actions'),
             'name'                  => Piwik_Translate('Actions_PageUrls'),
             'module'                => 'Actions',
             'action'                => 'getPageUrls',
@@ -277,7 +277,7 @@ class Actions extends \Piwik\Plugin
 
         // entry pages report
         $reports[] = array(
-            'category'              => Piwik_Translate('Actions_Actions'),
+            'category'              => Piwik_Translate('General_Actions'),
             'name'                  => Piwik_Translate('Actions_SubmenuPagesEntry'),
             'module'                => 'Actions',
             'action'                => 'getEntryPageUrls',
@@ -301,7 +301,7 @@ class Actions extends \Piwik\Plugin
 
         // exit pages report
         $reports[] = array(
-            'category'              => Piwik_Translate('Actions_Actions'),
+            'category'              => Piwik_Translate('General_Actions'),
             'name'                  => Piwik_Translate('Actions_SubmenuPagesExit'),
             'module'                => 'Actions',
             'action'                => 'getExitPageUrls',
@@ -325,7 +325,7 @@ class Actions extends \Piwik\Plugin
 
         // page titles report
         $reports[] = array(
-            'category'              => Piwik_Translate('Actions_Actions'),
+            'category'              => Piwik_Translate('General_Actions'),
             'name'                  => Piwik_Translate('Actions_SubmenuPageTitles'),
             'module'                => 'Actions',
             'action'                => 'getPageTitles',
@@ -341,7 +341,7 @@ class Actions extends \Piwik\Plugin
 
         // entry page titles report
         $reports[] = array(
-            'category'              => Piwik_Translate('Actions_Actions'),
+            'category'              => Piwik_Translate('General_Actions'),
             'name'                  => Piwik_Translate('Actions_EntryPageTitles'),
             'module'                => 'Actions',
             'action'                => 'getEntryPageTitles',
@@ -365,7 +365,7 @@ class Actions extends \Piwik\Plugin
 
         // exit page titles report
         $reports[] = array(
-            'category'              => Piwik_Translate('Actions_Actions'),
+            'category'              => Piwik_Translate('General_Actions'),
             'name'                  => Piwik_Translate('Actions_ExitPageTitles'),
             'module'                => 'Actions',
             'action'                => 'getExitPageTitles',
@@ -394,7 +394,7 @@ class Actions extends \Piwik\Plugin
 
         // outlinks report
         $reports[] = array(
-            'category'              => Piwik_Translate('Actions_Actions'),
+            'category'              => Piwik_Translate('General_Actions'),
             'name'                  => Piwik_Translate('Actions_SubmenuOutlinks'),
             'module'                => 'Actions',
             'action'                => 'getOutlinks',
@@ -414,7 +414,7 @@ class Actions extends \Piwik\Plugin
 
         // downloads report
         $reports[] = array(
-            'category'              => Piwik_Translate('Actions_Actions'),
+            'category'              => Piwik_Translate('General_Actions'),
             'name'                  => Piwik_Translate('Actions_SubmenuDownloads'),
             'module'                => 'Actions',
             'action'                => 'getDownloads',
@@ -541,14 +541,14 @@ class Actions extends \Piwik\Plugin
 
     function addWidgets()
     {
-        WidgetsList::add('Actions_Actions', 'Actions_SubmenuPages', 'Actions', 'getPageUrls');
-        WidgetsList::add('Actions_Actions', 'Actions_WidgetPageTitles', 'Actions', 'getPageTitles');
-        WidgetsList::add('Actions_Actions', 'Actions_SubmenuOutlinks', 'Actions', 'getOutlinks');
-        WidgetsList::add('Actions_Actions', 'Actions_SubmenuDownloads', 'Actions', 'getDownloads');
-        WidgetsList::add('Actions_Actions', 'Actions_WidgetPagesEntry', 'Actions', 'getEntryPageUrls');
-        WidgetsList::add('Actions_Actions', 'Actions_WidgetPagesExit', 'Actions', 'getExitPageUrls');
-        WidgetsList::add('Actions_Actions', 'Actions_WidgetEntryPageTitles', 'Actions', 'getEntryPageTitles');
-        WidgetsList::add('Actions_Actions', 'Actions_WidgetExitPageTitles', 'Actions', 'getExitPageTitles');
+        WidgetsList::add('General_Actions', 'Actions_SubmenuPages', 'Actions', 'getPageUrls');
+        WidgetsList::add('General_Actions', 'Actions_WidgetPageTitles', 'Actions', 'getPageTitles');
+        WidgetsList::add('General_Actions', 'Actions_SubmenuOutlinks', 'Actions', 'getOutlinks');
+        WidgetsList::add('General_Actions', 'Actions_SubmenuDownloads', 'Actions', 'getDownloads');
+        WidgetsList::add('General_Actions', 'Actions_WidgetPagesEntry', 'Actions', 'getEntryPageUrls');
+        WidgetsList::add('General_Actions', 'Actions_WidgetPagesExit', 'Actions', 'getExitPageUrls');
+        WidgetsList::add('General_Actions', 'Actions_WidgetEntryPageTitles', 'Actions', 'getEntryPageTitles');
+        WidgetsList::add('General_Actions', 'Actions_WidgetExitPageTitles', 'Actions', 'getExitPageTitles');
 
         if ($this->isSiteSearchEnabled()) {
             WidgetsList::add('Actions_SubmenuSitesearch', 'Actions_WidgetSearchKeywords', 'Actions', 'getSiteSearchKeywords');
@@ -564,16 +564,16 @@ class Actions extends \Piwik\Plugin
 
     function addMenus()
     {
-        Piwik_AddMenu('Actions_Actions', '', array('module' => 'Actions', 'action' => 'indexPageUrls'), true, 15);
-        Piwik_AddMenu('Actions_Actions', 'Actions_SubmenuPages', array('module' => 'Actions', 'action' => 'indexPageUrls'), true, 1);
-        Piwik_AddMenu('Actions_Actions', 'Actions_SubmenuPagesEntry', array('module' => 'Actions', 'action' => 'indexEntryPageUrls'), true, 2);
-        Piwik_AddMenu('Actions_Actions', 'Actions_SubmenuPagesExit', array('module' => 'Actions', 'action' => 'indexExitPageUrls'), true, 3);
-        Piwik_AddMenu('Actions_Actions', 'Actions_SubmenuPageTitles', array('module' => 'Actions', 'action' => 'indexPageTitles'), true, 4);
-        Piwik_AddMenu('Actions_Actions', 'Actions_SubmenuOutlinks', array('module' => 'Actions', 'action' => 'indexOutlinks'), true, 6);
-        Piwik_AddMenu('Actions_Actions', 'Actions_SubmenuDownloads', array('module' => 'Actions', 'action' => 'indexDownloads'), true, 7);
+        Piwik_AddMenu('General_Actions', '', array('module' => 'Actions', 'action' => 'indexPageUrls'), true, 15);
+        Piwik_AddMenu('General_Actions', 'Actions_SubmenuPages', array('module' => 'Actions', 'action' => 'indexPageUrls'), true, 1);
+        Piwik_AddMenu('General_Actions', 'Actions_SubmenuPagesEntry', array('module' => 'Actions', 'action' => 'indexEntryPageUrls'), true, 2);
+        Piwik_AddMenu('General_Actions', 'Actions_SubmenuPagesExit', array('module' => 'Actions', 'action' => 'indexExitPageUrls'), true, 3);
+        Piwik_AddMenu('General_Actions', 'Actions_SubmenuPageTitles', array('module' => 'Actions', 'action' => 'indexPageTitles'), true, 4);
+        Piwik_AddMenu('General_Actions', 'Actions_SubmenuOutlinks', array('module' => 'Actions', 'action' => 'indexOutlinks'), true, 6);
+        Piwik_AddMenu('General_Actions', 'Actions_SubmenuDownloads', array('module' => 'Actions', 'action' => 'indexDownloads'), true, 7);
 
         if ($this->isSiteSearchEnabled()) {
-            Piwik_AddMenu('Actions_Actions', 'Actions_SubmenuSitesearch', array('module' => 'Actions', 'action' => 'indexSiteSearch'), true, 5);
+            Piwik_AddMenu('General_Actions', 'Actions_SubmenuSitesearch', array('module' => 'Actions', 'action' => 'indexSiteSearch'), true, 5);
         }
     }
 
diff --git a/plugins/CoreHome/CoreHome.php b/plugins/CoreHome/CoreHome.php
index 9e80cf47d5..b7dfca0796 100644
--- a/plugins/CoreHome/CoreHome.php
+++ b/plugins/CoreHome/CoreHome.php
@@ -115,18 +115,6 @@ class CoreHome extends \Piwik\Plugin
         $translationKeys[] = 'Annotations_HideAnnotationsFor';
         $translationKeys[] = 'General_LoadingPopover';
         $translationKeys[] = 'General_LoadingPopoverFor';
-        $translationKeys[] = 'General_MonthJanuary';
-        $translationKeys[] = 'General_MonthFebruary';
-        $translationKeys[] = 'General_MonthMarch';
-        $translationKeys[] = 'General_MonthApril';
-        $translationKeys[] = 'General_MonthMay';
-        $translationKeys[] = 'General_MonthJune';
-        $translationKeys[] = 'General_MonthJuly';
-        $translationKeys[] = 'General_MonthAugust';
-        $translationKeys[] = 'General_MonthSeptember';
-        $translationKeys[] = 'General_MonthOctober';
-        $translationKeys[] = 'General_MonthNovember';
-        $translationKeys[] = 'General_MonthDecember';
         $translationKeys[] = 'General_ShortMonth_1';
         $translationKeys[] = 'General_ShortMonth_2';
         $translationKeys[] = 'General_ShortMonth_3';
@@ -139,6 +127,18 @@ class CoreHome extends \Piwik\Plugin
         $translationKeys[] = 'General_ShortMonth_10';
         $translationKeys[] = 'General_ShortMonth_11';
         $translationKeys[] = 'General_ShortMonth_12';
+        $translationKeys[] = 'General_LongMonth_1';
+        $translationKeys[] = 'General_LongMonth_2';
+        $translationKeys[] = 'General_LongMonth_3';
+        $translationKeys[] = 'General_LongMonth_4';
+        $translationKeys[] = 'General_LongMonth_5';
+        $translationKeys[] = 'General_LongMonth_6';
+        $translationKeys[] = 'General_LongMonth_7';
+        $translationKeys[] = 'General_LongMonth_8';
+        $translationKeys[] = 'General_LongMonth_9';
+        $translationKeys[] = 'General_LongMonth_10';
+        $translationKeys[] = 'General_LongMonth_11';
+        $translationKeys[] = 'General_LongMonth_12';
         $translationKeys[] = 'General_ShortDay_1';
         $translationKeys[] = 'General_ShortDay_2';
         $translationKeys[] = 'General_ShortDay_3';
diff --git a/plugins/CoreHome/javascripts/calendar.js b/plugins/CoreHome/javascripts/calendar.js
index a7b7aca6e0..42850f1969 100644
--- a/plugins/CoreHome/javascripts/calendar.js
+++ b/plugins/CoreHome/javascripts/calendar.js
@@ -164,18 +164,18 @@
                 _pk_translate('General_ShortMonth_11'),
                 _pk_translate('General_ShortMonth_12')],
             monthNames: [
-                _pk_translate('General_MonthJanuary'),
-                _pk_translate('General_MonthFebruary'),
-                _pk_translate('General_MonthMarch'),
-                _pk_translate('General_MonthApril'),
-                _pk_translate('General_MonthMay'),
-                _pk_translate('General_MonthJune'),
-                _pk_translate('General_MonthJuly'),
-                _pk_translate('General_MonthAugust'),
-                _pk_translate('General_MonthSeptember'),
-                _pk_translate('General_MonthOctober'),
-                _pk_translate('General_MonthNovember'),
-                _pk_translate('General_MonthDecember')]
+                _pk_translate('General_LongMonth_1'),
+                _pk_translate('General_LongMonth_2'),
+                _pk_translate('General_LongMonth_3'),
+                _pk_translate('General_LongMonth_4'),
+                _pk_translate('General_LongMonth_5'),
+                _pk_translate('General_LongMonth_6'),
+                _pk_translate('General_LongMonth_7'),
+                _pk_translate('General_LongMonth_8'),
+                _pk_translate('General_LongMonth_9'),
+                _pk_translate('General_LongMonth_10'),
+                _pk_translate('General_LongMonth_11'),
+                _pk_translate('General_LongMonth_12')]
         };
     };
 
diff --git a/plugins/CoreHome/templates/_topBarHelloMenu.twig b/plugins/CoreHome/templates/_topBarHelloMenu.twig
index 7fb0aadb81..eac13e2332 100644
--- a/plugins/CoreHome/templates/_topBarHelloMenu.twig
+++ b/plugins/CoreHome/templates/_topBarHelloMenu.twig
@@ -19,7 +19,7 @@
         {% if userLogin == 'anonymous' %}
             <a href='index.php?module={{ loginModule }}'>{{ 'Login_LogIn'|translate }}</a>
         {% else %}
-            <a href='index.php?module={{ loginModule }}&amp;action=logout'>{{ 'Login_Logout'|translate }}</a>
+            <a href='index.php?module={{ loginModule }}&amp;action=logout'>{{ 'General_Logout'|translate }}</a>
         {% endif %}
     </span>
 </div>
diff --git a/plugins/Live/templates/getLastVisitsStart.twig b/plugins/Live/templates/getLastVisitsStart.twig
index 53244c474f..f7245664b4 100644
--- a/plugins/Live/templates/getLastVisitsStart.twig
+++ b/plugins/Live/templates/getLastVisitsStart.twig
@@ -5,7 +5,7 @@
     {% for visitor in visitors %}
         <li id="{{ visitor.idVisit }}" class="visit">
             <div style="display:none;" class="idvisit">{{ visitor.idVisit }}</div>
-            <div title="{{ visitor.actionDetails|length }} {{ 'Live_Actions'|translate }}" class="datetime">
+            <div title="{{ visitor.actionDetails|length }} {{ 'General_Actions'|translate }}" class="datetime">
                 <span style="display:none;" class="serverTimestamp">{{ visitor.serverTimestamp|raw }}</span>
                 {{ visitor.serverDatePretty }} - {{ visitor.serverTimePretty }} {% if visitor.visitDuration > 0 %}<em>({{ visitor.visitDurationPretty|raw }})</em>{% endif %}
                 &nbsp;<img src="{{ visitor.countryFlag }}" title="{{ visitor.location }}, {{ 'Provider_ColumnProvider'|translate }} {{ visitor.providerName }}"/>
@@ -63,7 +63,7 @@
                 {% endif %}
             </div>
             <div id="{{ visitor.idVisit }}_actions" class="settings">
-                <span class="pagesTitle" title="{{ visitor.actionDetails|length }} {{ 'Live_Actions'|translate }}">{{ 'Actions_SubmenuPages'|translate }}:</span>&nbsp;
+                <span class="pagesTitle" title="{{ visitor.actionDetails|length }} {{ 'General_Actions'|translate }}">{{ 'Actions_SubmenuPages'|translate }}:</span>&nbsp;
                 {% set col = 0 %}
                 {% for action in visitor.actionDetails %}
                     {% if loop.index <= maxPagesDisplayedByVisitor %}
diff --git a/plugins/Live/templates/getVisitorLog.twig b/plugins/Live/templates/getVisitorLog.twig
index e84274b16b..c7da605891 100644
--- a/plugins/Live/templates/getVisitorLog.twig
+++ b/plugins/Live/templates/getVisitorLog.twig
@@ -182,7 +182,7 @@ GPS (lat/long): {{ visitor.getColumn('latitude') }},{{ visitor.getColumn('longit
                         {% if visitor.getColumn('actionDetails')|length <= 1 %}
                             {{ 'Live_Action'|translate }}
                         {% else %}
-                            {{ 'Live_Actions'|translate }}
+                            {{ 'General_Actions'|translate }}
                         {% endif %}
                         {% if visitor.getColumn('visitDuration') > 0 %}- {{ visitor.getColumn('visitDurationPretty')|raw }}{% endif %}
                     </strong>