CoreHome -> General for consistency.

7 files changed, 108 insertions, 108 deletions

diff --git a/lang/en.php b/lang/en.php
index e83e9dcd15..8ea853a00d 100644
--- a/lang/en.php
+++ b/lang/en.php
@@ -618,61 +618,61 @@ Piwik will let you track visitors to your website for free. You should definitel
 	'CoreHome_PeriodMonths' => 'months',
 	'CoreHome_PeriodYears' => 'years',
 	'General_YearShort_js' => 'yr',
-	'CoreHome_DaySu_js' => 'Su',
-	'CoreHome_DayMo_js' => 'Mo',
-	'CoreHome_DayTu_js' => 'Tu',
-	'CoreHome_DayWe_js' => 'We',
-	'CoreHome_DayTh_js' => 'Th',
-	'CoreHome_DayFr_js' => 'Fr',
-	'CoreHome_DaySa_js' => 'Sa',
-	'CoreHome_ShortDay_1_js' => 'Sun',
-	'CoreHome_ShortDay_2_js' => 'Mon',
-	'CoreHome_ShortDay_3_js' => 'Tue',
-	'CoreHome_ShortDay_4_js' => 'Wed',
-	'CoreHome_ShortDay_5_js' => 'Thu',
-	'CoreHome_ShortDay_6_js' => 'Fri',
-	'CoreHome_ShortDay_7_js' => 'Sat',
-	'CoreHome_LongDay_1_js' => 'Sunday',
-	'CoreHome_LongDay_2_js' => 'Monday',
-	'CoreHome_LongDay_3_js' => 'Tuesday',
-	'CoreHome_LongDay_4_js' => 'Wednesday',
-	'CoreHome_LongDay_5_js' => 'Thursday',
-	'CoreHome_LongDay_6_js' => 'Friday',
-	'CoreHome_LongDay_7_js' => 'Saturday',
-	'CoreHome_ShortMonth_1_js' => 'Jan',
-	'CoreHome_ShortMonth_2_js' => 'Feb',
-	'CoreHome_ShortMonth_3_js' => 'Mar',
-	'CoreHome_ShortMonth_4_js' => 'Apr',
-	'CoreHome_ShortMonth_5_js' => 'May',
-	'CoreHome_ShortMonth_6_js' => 'Jun',
-	'CoreHome_ShortMonth_7_js' => 'Jul',
-	'CoreHome_ShortMonth_8_js' => 'Aug',
-	'CoreHome_ShortMonth_9_js' => 'Sep',
-	'CoreHome_ShortMonth_10_js' => 'Oct',
-	'CoreHome_ShortMonth_11_js' => 'Nov',
-	'CoreHome_ShortMonth_12_js' => 'Dec',
-	'CoreHome_MonthJanuary_js' => 'January',
-	'CoreHome_MonthFebruary_js' => 'February',
-	'CoreHome_MonthMarch_js' => 'March',
-	'CoreHome_MonthApril_js' => 'April',
-	'CoreHome_MonthMay_js' => 'May',
-	'CoreHome_MonthJune_js' => 'June',
-	'CoreHome_MonthJuly_js' => 'July',
-	'CoreHome_MonthAugust_js' => 'August',
-	'CoreHome_MonthSeptember_js' => 'September',
-	'CoreHome_MonthOctober_js' => 'October',
-	'CoreHome_MonthNovember_js' => 'November',
-	'CoreHome_MonthDecember_js' => 'December',
+	'General_DaySu_js' => 'Su',
+	'General_DayMo_js' => 'Mo',
+	'General_DayTu_js' => 'Tu',
+	'General_DayWe_js' => 'We',
+	'General_DayTh_js' => 'Th',
+	'General_DayFr_js' => 'Fr',
+	'General_DaySa_js' => 'Sa',
+	'General_ShortDay_1_js' => 'Sun',
+	'General_ShortDay_2_js' => 'Mon',
+	'General_ShortDay_3_js' => 'Tue',
+	'General_ShortDay_4_js' => 'Wed',
+	'General_ShortDay_5_js' => 'Thu',
+	'General_ShortDay_6_js' => 'Fri',
+	'General_ShortDay_7_js' => 'Sat',
+	'General_LongDay_1_js' => 'Sunday',
+	'General_LongDay_2_js' => 'Monday',
+	'General_LongDay_3_js' => 'Tuesday',
+	'General_LongDay_4_js' => 'Wednesday',
+	'General_LongDay_5_js' => 'Thursday',
+	'General_LongDay_6_js' => 'Friday',
+	'General_LongDay_7_js' => 'Saturday',
+	'General_ShortMonth_1_js' => 'Jan',
+	'General_ShortMonth_2_js' => 'Feb',
+	'General_ShortMonth_3_js' => 'Mar',
+	'General_ShortMonth_4_js' => 'Apr',
+	'General_ShortMonth_5_js' => 'May',
+	'General_ShortMonth_6_js' => 'Jun',
+	'General_ShortMonth_7_js' => 'Jul',
+	'General_ShortMonth_8_js' => 'Aug',
+	'General_ShortMonth_9_js' => 'Sep',
+	'General_ShortMonth_10_js' => 'Oct',
+	'General_ShortMonth_11_js' => 'Nov',
+	'General_ShortMonth_12_js' => 'Dec',
+	'General_MonthJanuary_js' => 'January',
+	'General_MonthFebruary_js' => 'February',
+	'General_MonthMarch_js' => 'March',
+	'General_MonthApril_js' => 'April',
+	'General_MonthMay_js' => 'May',
+	'General_MonthJune_js' => 'June',
+	'General_MonthJuly_js' => 'July',
+	'General_MonthAugust_js' => 'August',
+	'General_MonthSeptember_js' => 'September',
+	'General_MonthOctober_js' => 'October',
+	'General_MonthNovember_js' => 'November',
+	'General_MonthDecember_js' => 'December',
 	'CoreHome_ReportGeneratedOn' => 'Report generated on %s',
 	'CoreHome_ReportGeneratedXAgo' => 'Report generated %s ago',
-	'CoreHome_LoadingPopover_js' => 'Loading %s...',
-	'CoreHome_LoadingPopoverFor_js' => 'Loading %s for',
-	'CoreHome_RowEvolutionRowActionTooltipTitle_js' => 'Open Row Evolution',
-	'CoreHome_RowEvolutionRowActionTooltip_js' => 'See how the metrics for this row changed over time',
-	'CoreHome_TransitionsRowActionTooltipTitle_js' => 'Open Transitions',
-	'CoreHome_TransitionsRowActionTooltip_js' => 'See what visitors did before and after viewing this page',
-	'CoreHome_OverlayRowActionTooltipTitle_js' => 'Open Page Overlay',
-	'CoreHome_OverlayRowActionTooltip_js' => 'See analytics data directly on your website (opens new tab)',
+	'General_LoadingPopover_js' => 'Loading %s...',
+	'General_LoadingPopoverFor_js' => 'Loading %s for',
+	'General_RowEvolutionRowActionTooltipTitle_js' => 'Open Row Evolution',
+	'General_RowEvolutionRowActionTooltip_js' => 'See how the metrics for this row changed over time',
+	'General_TransitionsRowActionTooltipTitle_js' => 'Open Transitions',
+	'General_TransitionsRowActionTooltip_js' => 'See what visitors did before and after viewing this page',
+	'General_OverlayRowActionTooltipTitle_js' => 'Open Page Overlay',
+	'General_OverlayRowActionTooltip_js' => 'See analytics data directly on your website (opens new tab)',
 	'CoreHome_MakeOneTimeDonation' => 'Make a one time donation, instead.',
 	'CorePluginsAdmin_PluginDescription' => 'Plugins Administration Interface.',
 	'CorePluginsAdmin_Plugins' => 'Plugins',
diff --git a/plugins/CoreHome/templates/calendar.js b/plugins/CoreHome/templates/calendar.js
index 096728e0c6..f1805ea4be 100644
--- a/plugins/CoreHome/templates/calendar.js
+++ b/plugins/CoreHome/templates/calendar.js
@@ -138,55 +138,55 @@ piwik.getBaseDatePickerOptions = function(defaultDate)
 		stepMonths: 1,
 		// jquery-ui-i18n 1.7.2 lacks some translations, so we use our own
 		dayNamesMin: [
-			_pk_translate('CoreHome_DaySu_js'),
-			_pk_translate('CoreHome_DayMo_js'),
-			_pk_translate('CoreHome_DayTu_js'),
-			_pk_translate('CoreHome_DayWe_js'),
-			_pk_translate('CoreHome_DayTh_js'),
-			_pk_translate('CoreHome_DayFr_js'),
-			_pk_translate('CoreHome_DaySa_js')],
+			_pk_translate('General_DaySu_js'),
+			_pk_translate('General_DayMo_js'),
+			_pk_translate('General_DayTu_js'),
+			_pk_translate('General_DayWe_js'),
+			_pk_translate('General_DayTh_js'),
+			_pk_translate('General_DayFr_js'),
+			_pk_translate('General_DaySa_js')],
 		dayNamesShort: [
-			_pk_translate('CoreHome_ShortDay_1_js'),
-			_pk_translate('CoreHome_ShortDay_2_js'),
-			_pk_translate('CoreHome_ShortDay_3_js'),
-			_pk_translate('CoreHome_ShortDay_4_js'),
-			_pk_translate('CoreHome_ShortDay_5_js'),
-			_pk_translate('CoreHome_ShortDay_6_js'),
-			_pk_translate('CoreHome_ShortDay_7_js')],
+			_pk_translate('General_ShortDay_1_js'),
+			_pk_translate('General_ShortDay_2_js'),
+			_pk_translate('General_ShortDay_3_js'),
+			_pk_translate('General_ShortDay_4_js'),
+			_pk_translate('General_ShortDay_5_js'),
+			_pk_translate('General_ShortDay_6_js'),
+			_pk_translate('General_ShortDay_7_js')],
 		dayNames: [
-			_pk_translate('CoreHome_LongDay_1_js'),
-			_pk_translate('CoreHome_LongDay_2_js'),
-			_pk_translate('CoreHome_LongDay_3_js'),
-			_pk_translate('CoreHome_LongDay_4_js'),
-			_pk_translate('CoreHome_LongDay_5_js'),
-			_pk_translate('CoreHome_LongDay_6_js'),
-			_pk_translate('CoreHome_LongDay_7_js')],
+			_pk_translate('General_LongDay_1_js'),
+			_pk_translate('General_LongDay_2_js'),
+			_pk_translate('General_LongDay_3_js'),
+			_pk_translate('General_LongDay_4_js'),
+			_pk_translate('General_LongDay_5_js'),
+			_pk_translate('General_LongDay_6_js'),
+			_pk_translate('General_LongDay_7_js')],
 		monthNamesShort: [
-			_pk_translate('CoreHome_ShortMonth_1_js'),
-			_pk_translate('CoreHome_ShortMonth_2_js'),
-			_pk_translate('CoreHome_ShortMonth_3_js'),
-			_pk_translate('CoreHome_ShortMonth_4_js'),
-			_pk_translate('CoreHome_ShortMonth_5_js'),
-			_pk_translate('CoreHome_ShortMonth_6_js'),
-			_pk_translate('CoreHome_ShortMonth_7_js'),
-			_pk_translate('CoreHome_ShortMonth_8_js'),
-			_pk_translate('CoreHome_ShortMonth_9_js'),
-			_pk_translate('CoreHome_ShortMonth_10_js'),
-			_pk_translate('CoreHome_ShortMonth_11_js'),
-			_pk_translate('CoreHome_ShortMonth_12_js')],
+			_pk_translate('General_ShortMonth_1_js'),
+			_pk_translate('General_ShortMonth_2_js'),
+			_pk_translate('General_ShortMonth_3_js'),
+			_pk_translate('General_ShortMonth_4_js'),
+			_pk_translate('General_ShortMonth_5_js'),
+			_pk_translate('General_ShortMonth_6_js'),
+			_pk_translate('General_ShortMonth_7_js'),
+			_pk_translate('General_ShortMonth_8_js'),
+			_pk_translate('General_ShortMonth_9_js'),
+			_pk_translate('General_ShortMonth_10_js'),
+			_pk_translate('General_ShortMonth_11_js'),
+			_pk_translate('General_ShortMonth_12_js')],
 		monthNames: [
-			_pk_translate('CoreHome_MonthJanuary_js'),
-			_pk_translate('CoreHome_MonthFebruary_js'),
-			_pk_translate('CoreHome_MonthMarch_js'),
-			_pk_translate('CoreHome_MonthApril_js'),
-			_pk_translate('CoreHome_MonthMay_js'),
-			_pk_translate('CoreHome_MonthJune_js'),
-			_pk_translate('CoreHome_MonthJuly_js'),
-			_pk_translate('CoreHome_MonthAugust_js'),
-			_pk_translate('CoreHome_MonthSeptember_js'),
-			_pk_translate('CoreHome_MonthOctober_js'),
-			_pk_translate('CoreHome_MonthNovember_js'),
-			_pk_translate('CoreHome_MonthDecember_js')]
+			_pk_translate('General_MonthJanuary_js'),
+			_pk_translate('General_MonthFebruary_js'),
+			_pk_translate('General_MonthMarch_js'),
+			_pk_translate('General_MonthApril_js'),
+			_pk_translate('General_MonthMay_js'),
+			_pk_translate('General_MonthJune_js'),
+			_pk_translate('General_MonthJuly_js'),
+			_pk_translate('General_MonthAugust_js'),
+			_pk_translate('General_MonthSeptember_js'),
+			_pk_translate('General_MonthOctober_js'),
+			_pk_translate('General_MonthNovember_js'),
+			_pk_translate('General_MonthDecember_js')]
 	};
 };
 
diff --git a/plugins/CoreHome/templates/datatable_rowactions.js b/plugins/CoreHome/templates/datatable_rowactions.js
index bd4b962e59..cbaebb07e8 100644
--- a/plugins/CoreHome/templates/datatable_rowactions.js
+++ b/plugins/CoreHome/templates/datatable_rowactions.js
@@ -65,8 +65,8 @@ DataTable_RowActions_Registry.register({
 	order: 50,
 
 	dataTableIconTooltip: [
-		_pk_translate('CoreHome_RowEvolutionRowActionTooltipTitle_js'),
-		_pk_translate('CoreHome_RowEvolutionRowActionTooltip_js')
+		_pk_translate('General_RowEvolutionRowActionTooltipTitle_js'),
+		_pk_translate('General_RowEvolutionRowActionTooltip_js')
 	],
 
 	createInstance: function(dataTable, param) {
diff --git a/plugins/CoreHome/templates/popover.js b/plugins/CoreHome/templates/popover.js
index 678e0088e2..f7365113b2 100644
--- a/plugins/CoreHome/templates/popover.js
+++ b/plugins/CoreHome/templates/popover.js
@@ -68,8 +68,8 @@ var Piwik_Popover = (function() {
 		showLoading: function(popoverName, popoverSubject, height) {
 			var loading = $(document.createElement('div')).addClass('Piwik_Popover_Loading');
 
-			var loadingMessage = popoverSubject ? translations.CoreHome_LoadingPopoverFor_js :
-				translations.CoreHome_LoadingPopover_js;
+			var loadingMessage = popoverSubject ? translations.General_LoadingPopoverFor_js :
+				translations.General_LoadingPopover_js;
 
 			loadingMessage = loadingMessage.replace(/%s/, popoverName);
 			
diff --git a/plugins/Overlay/templates/index.tpl b/plugins/Overlay/templates/index.tpl
index 7100e8531d..d2fe954194 100644
--- a/plugins/Overlay/templates/index.tpl
+++ b/plugins/Overlay/templates/index.tpl
@@ -35,8 +35,8 @@
 
 <div id="Overlay_Sidebar"></div>
 
-<a id="Overlay_RowEvolution">{'CoreHome_RowEvolutionRowActionTooltipTitle_js'|translate|escape:'html'}</a>
-<a id="Overlay_Transitions">{'CoreHome_TransitionsRowActionTooltipTitle_js'|translate|escape:'html'}</a>
+<a id="Overlay_RowEvolution">{'General_RowEvolutionRowActionTooltipTitle_js'|translate|escape:'html'}</a>
+<a id="Overlay_Transitions">{'General_TransitionsRowActionTooltipTitle_js'|translate|escape:'html'}</a>
 
 <!-- TODO: rethink the way the sidebar works -->
 <!-- <a id="Overlay_FullScreen" href="#">
diff --git a/plugins/Overlay/templates/rowaction.js b/plugins/Overlay/templates/rowaction.js
index 9adc0fbb2d..b73cd27c57 100644
--- a/plugins/Overlay/templates/rowaction.js
+++ b/plugins/Overlay/templates/rowaction.js
@@ -41,8 +41,8 @@ DataTable_RowActions_Registry.register({
 	order: 30,
 
 	dataTableIconTooltip: [
-		_pk_translate('CoreHome_OverlayRowActionTooltipTitle_js'),
-		_pk_translate('CoreHome_OverlayRowActionTooltip_js')
+		_pk_translate('General_OverlayRowActionTooltipTitle_js'),
+		_pk_translate('General_OverlayRowActionTooltip_js')
 	],
 
 	createInstance: function(dataTable) {
diff --git a/plugins/Transitions/templates/transitions.js b/plugins/Transitions/templates/transitions.js
index c3a186249a..72d96e795d 100644
--- a/plugins/Transitions/templates/transitions.js
+++ b/plugins/Transitions/templates/transitions.js
@@ -84,8 +84,8 @@ DataTable_RowActions_Registry.register({
 	order: 20,
 
 	dataTableIconTooltip: [
-		_pk_translate('CoreHome_TransitionsRowActionTooltipTitle_js'),
-		_pk_translate('CoreHome_TransitionsRowActionTooltip_js')
+		_pk_translate('General_TransitionsRowActionTooltipTitle_js'),
+		_pk_translate('General_TransitionsRowActionTooltip_js')
 	],
 
 	createInstance: function(dataTable) {