diff --git a/core/Metrics/Formatter.php b/core/Metrics/Formatter.php
index 0e54dd959b6f789c44e962b1fdb65e459c7dcf5c..c2b8a1062d2fddb33f20e29f68065b127ff2cb6a 100644
--- a/core/Metrics/Formatter.php
+++ b/core/Metrics/Formatter.php
@@ -109,7 +109,7 @@ class Formatter
} elseif ($minutes > 0) {
$return = sprintf(Piwik::translate('General_MinutesSeconds'), $minutes, $seconds);
} else {
- $return = sprintf(Piwik::translate('General_Seconds'), $seconds);
+ $return = sprintf(Piwik::translate('Intl_NSecondsShort'), $seconds);
}
if ($isNegative) {
diff --git a/core/Period/Week.php b/core/Period/Week.php
index a8af2fbed80ba42204a40f8fa4d64d79fbff0e2c..60b1af2ce618ab5cc5d80d9a8ffc7c56e7a815ea 100644
--- a/core/Period/Week.php
+++ b/core/Period/Week.php
@@ -43,7 +43,7 @@ class Week extends Period
$format = $this->translator->translate('CoreHome_LongWeekFormat');
$string = self::getTranslatedRange($format, $this->getDateStart(), $this->getDateEnd());
- return $this->translator->translate('CoreHome_PeriodWeek') . " " . $string;
+ return $this->translator->translate('Intl_PeriodWeek') . " " . $string;
}
/**
diff --git a/core/Plugin/Controller.php b/core/Plugin/Controller.php
index 3e710608ebe0e1fa003a42805b56b042973301a4..c23044d2c2e86bf30ceb8797deee21ca350a0106 100644
--- a/core/Plugin/Controller.php
+++ b/core/Plugin/Controller.php
@@ -199,20 +199,20 @@ abstract class Controller
$availablePeriods = self::getEnabledPeriodsInUI();
$periodNames = array(
'day' => array(
- 'singular' => Piwik::translate('CoreHome_PeriodDay'),
- 'plural' => Piwik::translate('CoreHome_PeriodDays')
+ 'singular' => Piwik::translate('Intl_PeriodDay'),
+ 'plural' => Piwik::translate('Intl_PeriodDays')
),
'week' => array(
- 'singular' => Piwik::translate('CoreHome_PeriodWeek'),
- 'plural' => Piwik::translate('CoreHome_PeriodWeeks')
+ 'singular' => Piwik::translate('Intl_PeriodWeek'),
+ 'plural' => Piwik::translate('Intl_PeriodWeeks')
),
'month' => array(
- 'singular' => Piwik::translate('CoreHome_PeriodMonth'),
- 'plural' => Piwik::translate('CoreHome_PeriodMonths')
+ 'singular' => Piwik::translate('Intl_PeriodMonth'),
+ 'plural' => Piwik::translate('Intl_PeriodMonths')
),
'year' => array(
- 'singular' => Piwik::translate('CoreHome_PeriodYear'),
- 'plural' => Piwik::translate('CoreHome_PeriodYears')
+ 'singular' => Piwik::translate('Intl_PeriodYear'),
+ 'plural' => Piwik::translate('Intl_PeriodYears')
),
// Note: plural is not used for date range
'range' => array(
diff --git a/core/Visualization/Sparkline.php b/core/Visualization/Sparkline.php
index 642c1325cb00755799ef0f2fd429f7bf1ecc88b7..a4d3c6feed5150ca5a474e5b3db14b55da96ff3c 100644
--- a/core/Visualization/Sparkline.php
+++ b/core/Visualization/Sparkline.php
@@ -109,7 +109,7 @@ class Sparkline implements ViewInterface
$min = $max = $last = null;
$i = 0;
- $seconds = Piwik::translate('General_Seconds');
+ $seconds = Piwik::translate('Intl_NSecondsShort');
$toRemove = array('%', str_replace('%s', '', $seconds));
foreach ($this->values as $value) {
diff --git a/lang/en.json b/lang/en.json
index 4e2f3c9f47575272b80f4f1b241985c21d89a10c..9b442efc2341a8b675900d0b081e09b9387c3e65 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -229,14 +229,12 @@
"Name": "Name",
"NbActions": "Number of Actions",
"NbSearches": "Number of Internal Searches",
- "NDays": "%s days",
"Never": "Never",
"NewReportsWillBeProcessedByCron": "When Piwik archiving is not triggered by the browser, new reports will be processed by the crontab.",
"NewUpdatePiwikX": "New Update: Piwik %s",
"NewVisitor": "New Visitor",
"NewVisits": "New visits",
"Next": "Next",
- "NMinutes": "%s minutes",
"No": "No",
"NoDataForGraph": "No data for this graph.",
"NoDataForTagCloud": "No data for this tag cloud.",
@@ -245,14 +243,11 @@
"NotInstalled": "Not Installed",
"NotRecommended": "not recommended",
"NotValid": "%s is not valid",
- "NSeconds": "%s seconds",
"NumberOfVisits": "Number of visits",
"NUsers": "%s users",
"NVisits": "%s visits",
"Ok": "Ok",
"OneAction": "1 action",
- "OneDay": "1 day",
- "OneMinute": "1 minute",
"OneVisit": "1 visit",
"OnlyEnterIfRequired": "Only enter a username if your SMTP server requires it.",
"OnlyEnterIfRequiredPassword": "Only enter a password if your SMTP server requires it.",
@@ -331,7 +326,6 @@
"Search": "Search",
"Clear": "Clear",
"SearchNoResults": "No results",
- "Seconds": "%ss",
"SeeAll": "see all",
"SeeTheOfficialDocumentationForMoreInformation": "See the %sofficial documentation%s for more information.",
"SeeThisFaq": "See %1$sthis faq%2$s.",
diff --git a/plugins/CoreAdminHome/templates/generalSettings.twig b/plugins/CoreAdminHome/templates/generalSettings.twig
index b5d60087fcffaececee3613ca1ca7939b9310031..e3dae726a9e239bc4ae4a69cabca805ff54103aa 100644
--- a/plugins/CoreAdminHome/templates/generalSettings.twig
+++ b/plugins/CoreAdminHome/templates/generalSettings.twig
@@ -62,7 +62,7 @@
{% endif %}
<div class="input-group">
<input value='{{ todayArchiveTimeToLive }}' id='todayArchiveTimeToLive' {% if not isGeneralSettingsAdminEnabled %}disabled="disabled"{% endif %} />
- <span class="input-group-addon">{{ 'General_NSeconds'|translate('') }}</span>
+ <span class="input-group-addon">{{ 'Intl_NSeconds'|translate('') }}</span>
</div>
<span class="form-description">
{{ 'General_RearchiveTimeIntervalOnlyForTodayReports'|translate }}
diff --git a/plugins/CoreHome/lang/en.json b/plugins/CoreHome/lang/en.json
index 0945d5bb538c6d5aeb6050bfaca7c62af9aecada..f9bdf246c4d78a1f095926a1d3577fc636eb2f3e 100644
--- a/plugins/CoreHome/lang/en.json
+++ b/plugins/CoreHome/lang/en.json
@@ -33,15 +33,7 @@
"NoPrivilegesAskPiwikAdmin": "You are logged in as '%s' but it seems you don't have any permission set in Piwik. %s Ask your Piwik administrator (click to email)%s to give you 'view' access to a website.",
"OnlyForSuperUserAccess": "This widget is only displayed to users having Super User access.",
"PageOf": "%1$s of %2$s",
- "PeriodDay": "Day",
- "PeriodDays": "days",
- "PeriodMonth": "Month",
- "PeriodMonths": "months",
"PeriodRange": "Range",
- "PeriodWeek": "Week",
- "PeriodWeeks": "weeks",
- "PeriodYear": "Year",
- "PeriodYears": "years",
"ReportGeneratedOn": "Report generated on %s",
"ReportGeneratedXAgo": "Report generated %s ago",
"SharePiwikLong": "Hi! I just found a great piece of free software: Piwik!\n\nPiwik will let you track visitors to your website for free. You should definitely check it out!",
@@ -52,7 +44,7 @@
"ShortMonthFormat": "%shortMonth% %longYear%",
"ShortWeekFormat": "%dayFrom% %shortMonthFrom% - %dayTo% %shortMonthTo% %shortYearTo%",
"ShowJSCode": "Show the JavaScript code to insert",
- "SkipToContent": "Skip to content",
+ "SkipToContent": "Skip to content",
"SubscribeAndBecomePiwikSupporter": "Proceed to a secure credit card payment page (Paypal) to become a Piwik Supporter!",
"SupportPiwik": "Support Piwik!",
"TableNoData": "No data for this table.",
diff --git a/plugins/DBStats/Reports/Base.php b/plugins/DBStats/Reports/Base.php
index c32e2d741018a3516f4bc2eb418fd7df2b98ebf5..3c9b3a6b6eb5a65cb65da442f6036ccc1d30edb4 100644
--- a/plugins/DBStats/Reports/Base.php
+++ b/plugins/DBStats/Reports/Base.php
@@ -51,7 +51,7 @@ abstract class Base extends \Piwik\Plugin\Report
$view->config->addTranslations(array(
'label' => Piwik::translate('DBStats_Table'),
- 'year' => Piwik::translate('CoreHome_PeriodYear'),
+ 'year' => Piwik::translate('Intl_PeriodYear'),
'data_size' => Piwik::translate('DBStats_DataSize'),
'index_size' => Piwik::translate('DBStats_IndexSize'),
'total_size' => Piwik::translate('DBStats_TotalSize'),
diff --git a/plugins/DBStats/Reports/GetMetricDataSummaryByYear.php b/plugins/DBStats/Reports/GetMetricDataSummaryByYear.php
index 74907d4d9fb459b9f2545e7255cc008ce0841ce7..bc5e8e5c3cc2332ae3b10cef4f8f28bff8f5c480 100644
--- a/plugins/DBStats/Reports/GetMetricDataSummaryByYear.php
+++ b/plugins/DBStats/Reports/GetMetricDataSummaryByYear.php
@@ -29,7 +29,7 @@ class GetMetricDataSummaryByYear extends Base
$this->addPresentationFilters($view);
$view->config->title = $this->name;
- $view->config->addTranslation('label', Piwik::translate('CoreHome_PeriodYear'));
+ $view->config->addTranslation('label', Piwik::translate('Intl_PeriodYear'));
}
public function getRelatedReports()
diff --git a/plugins/DBStats/Reports/GetReportDataSummaryByYear.php b/plugins/DBStats/Reports/GetReportDataSummaryByYear.php
index 173bdd2037b955c7992734142ca958b990627e16..1bbe67e4670a4a0735a8af17919af6fdaadeb49f 100644
--- a/plugins/DBStats/Reports/GetReportDataSummaryByYear.php
+++ b/plugins/DBStats/Reports/GetReportDataSummaryByYear.php
@@ -29,7 +29,7 @@ class GetReportDataSummaryByYear extends Base
$this->addPresentationFilters($view);
$view->config->title = $this->name;
- $view->config->addTranslation('label', Piwik::translate('CoreHome_PeriodYear'));
+ $view->config->addTranslation('label', Piwik::translate('Intl_PeriodYear'));
}
public function getRelatedReports()
diff --git a/plugins/Goals/API.php b/plugins/Goals/API.php
index 6850aa25ff06dfe7845eb41a6014d5f9271288aa..80a898fe340aca5335f460308313f65bf4b06434 100644
--- a/plugins/Goals/API.php
+++ b/plugins/Goals/API.php
@@ -564,7 +564,7 @@ class API extends \Piwik\Plugin\API
$dataTable->queueFilter('Sort', array('label', 'asc', true, false));
$dataTable->queueFilter(
- 'BeautifyRangeLabels', array(Piwik::translate('General_OneDay'), Piwik::translate('General_NDays')));
+ 'BeautifyRangeLabels', array(Piwik::translate('Intl_OneDay'), Piwik::translate('Intl_NDays')));
return $dataTable;
}
diff --git a/plugins/Intl/Commands/GenerateIntl.php b/plugins/Intl/Commands/GenerateIntl.php
index 30a8c231996c0a142869760ae1edf1c14f9f1551..5e34b4f7f977d637f395e4f8db6bcac85912d63b 100644
--- a/plugins/Intl/Commands/GenerateIntl.php
+++ b/plugins/Intl/Commands/GenerateIntl.php
@@ -280,10 +280,10 @@ class GenerateIntl extends ConsoleCommand
$dateFieldData = json_decode($dateFieldData, true);
$dateFieldData = $dateFieldData['main'][$requestLangCode]['dates']['fields'];
- $translations['Intl']['PeriodWeek'] = $dateFieldData['week']['displayName']; // CoreHome_PeriodWeek
- $translations['Intl']['PeriodYear'] = $dateFieldData['year']['displayName']; // CoreHome_PeriodYear
- $translations['Intl']['PeriodDay'] = $dateFieldData['day']['displayName']; // CoreHome_PeriodDay
- $translations['Intl']['PeriodMonth'] = $dateFieldData['month']['displayName']; // CoreHome_PeriodMonth
+ $translations['Intl']['PeriodWeek'] = $dateFieldData['week']['displayName'];
+ $translations['Intl']['PeriodYear'] = $dateFieldData['year']['displayName'];
+ $translations['Intl']['PeriodDay'] = $dateFieldData['day']['displayName'];
+ $translations['Intl']['PeriodMonth'] = $dateFieldData['month']['displayName'];
$translations['Intl']['YearShort'] = $dateFieldData['year-narrow']['displayName'];
$translations['Intl']['Today'] = $this->transform($dateFieldData['day']['relative-type-0']);
$translations['Intl']['Yesterday'] = $this->transform($dateFieldData['day']['relative-type--1']);
@@ -303,41 +303,41 @@ class GenerateIntl extends ConsoleCommand
$unitsData = json_decode($unitsData, true);
$unitsData = $unitsData['main'][$requestLangCode]['units'];
- $translations['Intl']['NSeconds'] = $this->replacePlaceHolder($unitsData['long']['duration-second']['unitPattern-count-other']); // General_NSeconds
- $translations['Intl']['NSecondsShort'] = $this->replacePlaceHolder($unitsData['narrow']['duration-second']['unitPattern-count-other']); // General_Seconds
- $translations['Intl']['Seconds'] = $unitsData['long']['duration-second']['displayName']; // UserCountryMap_Seconds
+ $translations['Intl']['NSeconds'] = $this->replacePlaceHolder($unitsData['long']['duration-second']['unitPattern-count-other']);
+ $translations['Intl']['NSecondsShort'] = $this->replacePlaceHolder($unitsData['narrow']['duration-second']['unitPattern-count-other']);
+ $translations['Intl']['Seconds'] = $unitsData['long']['duration-second']['displayName'];
- $translations['Intl']['NMinutes'] = $this->replacePlaceHolder($unitsData['long']['duration-minute']['unitPattern-count-other']); // General_NMinutes
+ $translations['Intl']['NMinutes'] = $this->replacePlaceHolder($unitsData['long']['duration-minute']['unitPattern-count-other']);
if (isset($unitsData['long']['duration-minute']['unitPattern-count-one'])) {
- $translations['Intl']['OneMinute'] = $this->replacePlaceHolder($unitsData['long']['duration-minute']['unitPattern-count-one'], '1'); // General_OneMinute
+ $translations['Intl']['OneMinute'] = $this->replacePlaceHolder($unitsData['long']['duration-minute']['unitPattern-count-one'], '1');
} else {
$translations['Intl']['OneMinute'] = $this->replacePlaceHolder($unitsData['long']['duration-minute']['unitPattern-count-other'], '1');
}
if (isset($unitsData['short']['duration-minute']['unitPattern-count-one'])) {
- $translations['Intl']['OneMinuteShort'] = $this->replacePlaceHolder($unitsData['short']['duration-minute']['unitPattern-count-one'], '1'); // VisitorInterest_OneMinute
+ $translations['Intl']['OneMinuteShort'] = $this->replacePlaceHolder($unitsData['short']['duration-minute']['unitPattern-count-one'], '1');
} else {
$translations['Intl']['OneMinuteShort'] = $this->replacePlaceHolder($unitsData['short']['duration-minute']['unitPattern-count-other'], '1');
}
- $translations['Intl']['Minutes'] = $unitsData['long']['duration-minute']['displayName']; // UserCountryMap_Minutes
+ $translations['Intl']['Minutes'] = $unitsData['long']['duration-minute']['displayName'];
- $translations['Intl']['Hours'] = $unitsData['long']['duration-hour']['displayName']; // UserCountryMap_Hours
- $translations['Intl']['NHoursShort'] = $this->replacePlaceHolder($unitsData['narrow']['duration-hour']['unitPattern-count-other']); // VisitTime_NHour
+ $translations['Intl']['Hours'] = $unitsData['long']['duration-hour']['displayName'];
+ $translations['Intl']['NHoursShort'] = $this->replacePlaceHolder($unitsData['narrow']['duration-hour']['unitPattern-count-other']);
- $translations['Intl']['NDays'] = $this->replacePlaceHolder($unitsData['long']['duration-day']['unitPattern-count-other']); // General_NDays
+ $translations['Intl']['NDays'] = $this->replacePlaceHolder($unitsData['long']['duration-day']['unitPattern-count-other']);
if (isset($unitsData['short']['duration-day']['unitPattern-count-one'])) {
- $translations['Intl']['OneDay'] = $this->replacePlaceHolder($unitsData['long']['duration-day']['unitPattern-count-one'], '1'); // General_OneDay
+ $translations['Intl']['OneDay'] = $this->replacePlaceHolder($unitsData['long']['duration-day']['unitPattern-count-one'], '1');
} else {
$translations['Intl']['OneDay'] = $this->replacePlaceHolder($unitsData['long']['duration-day']['unitPattern-count-other'], '1');
}
- $translations['Intl']['PeriodWeeks'] = $unitsData['long']['duration-week']['displayName']; // CoreHome_PeriodWeeks
- $translations['Intl']['PeriodYears'] = $unitsData['long']['duration-year']['displayName']; // CoreHome_PeriodYears
- $translations['Intl']['PeriodDays'] = $unitsData['long']['duration-day']['displayName']; // CoreHome_PeriodDays
- $translations['Intl']['PeriodMonths'] = $unitsData['long']['duration-month']['displayName']; // CoreHome_PeriodMonths
+ $translations['Intl']['PeriodWeeks'] = $unitsData['long']['duration-week']['displayName'];
+ $translations['Intl']['PeriodYears'] = $unitsData['long']['duration-year']['displayName'];
+ $translations['Intl']['PeriodDays'] = $unitsData['long']['duration-day']['displayName'];
+ $translations['Intl']['PeriodMonths'] = $unitsData['long']['duration-month']['displayName'];
$output->writeln('Saved unit data for ' . $langCode);
diff --git a/plugins/Live/Reports/GetSimpleLastVisitCount.php b/plugins/Live/Reports/GetSimpleLastVisitCount.php
index e2a17135c52f135f4a495ba30251abb2a0abc432..8c08f7772c090bf06199bf4b7864f628e19f0376 100644
--- a/plugins/Live/Reports/GetSimpleLastVisitCount.php
+++ b/plugins/Live/Reports/GetSimpleLastVisitCount.php
@@ -44,12 +44,12 @@ class GetSimpleLastVisitCount extends Base
$view->translations = array(
'one_visitor' => Piwik::translate('Live_NbVisitor'),
'visitors' => Piwik::translate('Live_NbVisitors'),
- 'one_visit' => Piwik::translate('General_OneVisit'),
- 'visits' => Piwik::translate('General_NVisits'),
+ 'one_visit' => Piwik::translate('Intl_OneVisit'),
+ 'visits' => Piwik::translate('Intl_NVisits'),
'one_action' => Piwik::translate('General_OneAction'),
'actions' => Piwik::translate('VisitsSummary_NbActionsDescription'),
- 'one_minute' => Piwik::translate('General_OneMinute'),
- 'minutes' => Piwik::translate('General_NMinutes')
+ 'one_minute' => Piwik::translate('Intl_OneMinute'),
+ 'minutes' => Piwik::translate('Intl_NMinutes')
);
return $view->render();
diff --git a/plugins/Live/templates/getSimpleLastVisitCount.twig b/plugins/Live/templates/getSimpleLastVisitCount.twig
index 7bb82101977ad1ff61ccbf8d9afa85c5fb82f98a..8f167544ebee62ba5129239aa0a32dfb5479381b 100644
--- a/plugins/Live/templates/getSimpleLastVisitCount.twig
+++ b/plugins/Live/templates/getSimpleLastVisitCount.twig
@@ -12,7 +12,7 @@
<span class="simple-realtime-metric" data-metric="actions">{% if actions == 1 %}{{ 'General_OneAction'|translate }}{% else %}{{ 'VisitsSummary_NbActionsDescription'|translate(actions) }}{% endif %}</span>
{% endset %}
{% set minutesMessage %}
- <span class="simple-realtime-metric" data-metric="minutes">{% if lastMinutes == 1 %}{{ 'General_OneMinute'|translate }}{% else %}{{ 'General_NMinutes'|translate(lastMinutes) }}{% endif %}</span>
+ <span class="simple-realtime-metric" data-metric="minutes">{% if lastMinutes == 1 %}{{ 'Intl_OneMinute'|translate }}{% else %}{{ 'Intl_NMinutes'|translate(lastMinutes) }}{% endif %}</span>
{% endset %}
{{ 'Live_SimpleRealTimeWidget_Message'|translate(visitsMessage,actionsMessage,minutesMessage) | raw }}
diff --git a/plugins/PrivacyManager/templates/privacySettings.twig b/plugins/PrivacyManager/templates/privacySettings.twig
index b36e204e6aacd923e7000120cbe88df211d5f72d..332b772b83f87a1df5eabf58a117074671968c0f 100644
--- a/plugins/PrivacyManager/templates/privacySettings.twig
+++ b/plugins/PrivacyManager/templates/privacySettings.twig
@@ -135,7 +135,7 @@
</div>
<div class="input-group">
<input type="text" id="deleteOlderThan" value="{{ deleteData.config.delete_logs_older_than }}" name="deleteOlderThan"/>
- <span class="input-group-addon">{{ 'CoreHome_PeriodDays'|translate }}</span>
+ <span class="input-group-addon">{{ 'Intl_PeriodDays'|translate }}</span>
</div>
</div>
@@ -176,7 +176,7 @@
</div>
<div class="input-group">
<input type="text" id="deleteReportsOlderThan" value="{{ deleteData.config.delete_reports_older_than }}" name="deleteReportsOlderThan"/>
- <span class="input-group-addon">{{ 'CoreHome_PeriodMonths'|translate }}</span>
+ <span class="input-group-addon">{{ 'Intl_PeriodMonths'|translate }}</span>
</div>
</div>
<div class="form-group">
@@ -250,11 +250,11 @@
<label>{{ 'PrivacyManager_DeleteDataInterval'|translate }}</label>
<select id="deleteLowestInterval" name="deleteLowestInterval">
<option {% if deleteData.config.delete_logs_schedule_lowest_interval == '1' %} selected="selected" {% endif %}
- value="1"> {{ 'CoreHome_PeriodDay'|translate }}</option>
+ value="1"> {{ 'Intl_PeriodDay'|translate }}</option>
<option {% if deleteData.config.delete_logs_schedule_lowest_interval == '7' %} selected="selected" {% endif %}
- value="7">{{ 'CoreHome_PeriodWeek'|translate }}</option>
+ value="7">{{ 'Intl_PeriodWeek'|translate }}</option>
<option {% if deleteData.config.delete_logs_schedule_lowest_interval == '30' %} selected="selected" {% endif %}
- value="30">{{ 'CoreHome_PeriodMonth'|translate }}</option>
+ value="30">{{ 'Intl_PeriodMonth'|translate }}</option>
</select>
</div>
diff --git a/plugins/UserCountry/templates/_updaterManage.twig b/plugins/UserCountry/templates/_updaterManage.twig
index bffc1731c0ccf187729740c670e1babf5b2a5412..26aadd803205e81c9c776f53d324ce213be39a35 100755
--- a/plugins/UserCountry/templates/_updaterManage.twig
+++ b/plugins/UserCountry/templates/_updaterManage.twig
@@ -34,10 +34,10 @@
<td width="150">{{ 'UserCountry_DownloadNewDatabasesEvery'|translate }}</td>
<td id="geoip-update-period-cell">
<input type="radio" name="geoip-update-period" value="month" id="geoip-update-period-month" {% if geoIPUpdatePeriod == 'month' %}checked="checked"{% endif %} />
- <label for="geoip-update-period-month">{{ 'CoreHome_PeriodMonth'|translate }}</label>
+ <label for="geoip-update-period-month">{{ 'Intl_PeriodMonth'|translate }}</label>
<input type="radio" name="geoip-update-period" value="week" id="geoip-update-period-week" {% if geoIPUpdatePeriod == 'week' %}checked="checked"{% endif %}/>
- <label for="geoip-update-period-week">{{ 'CoreHome_PeriodWeek'|translate }}</label>
+ <label for="geoip-update-period-week">{{ 'Intl_PeriodWeek'|translate }}</label>
</td>
<td width="164">
<div class="alert alert-info">
diff --git a/plugins/UserCountryMap/Controller.php b/plugins/UserCountryMap/Controller.php
index 00cf891b3bd801837d700e964e71bd395afa4e38..ccd1a8c5e66cc544f070c9ded990d58a7d26bba1 100644
--- a/plugins/UserCountryMap/Controller.php
+++ b/plugins/UserCountryMap/Controller.php
@@ -162,11 +162,11 @@ class Controller extends \Piwik\Plugin\Controller
'nb_actions' => $this->translator->translate('VisitsSummary_NbActionsDescription'),
'local_time' => $this->translator->translate('VisitTime_ColumnLocalTime'),
'from' => $this->translator->translate('General_FromReferrer'),
- 'seconds' => $this->translator->translate('UserCountryMap_Seconds'),
+ 'seconds' => $this->translator->translate('Intl_Seconds'),
'seconds_ago' => $this->translator->translate('UserCountryMap_SecondsAgo'),
- 'minutes' => $this->translator->translate('UserCountryMap_Minutes'),
+ 'minutes' => $this->translator->translate('Intl_Minutes'),
'minutes_ago' => $this->translator->translate('UserCountryMap_MinutesAgo'),
- 'hours' => $this->translator->translate('UserCountryMap_Hours'),
+ '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'),
diff --git a/plugins/UserCountryMap/lang/en.json b/plugins/UserCountryMap/lang/en.json
index 20070062ddf1cdb32313fe46e4581b0dfd2ff589..90f10244d79b3e564d70de92c4afb08416751d00 100644
--- a/plugins/UserCountryMap/lang/en.json
+++ b/plugins/UserCountryMap/lang/en.json
@@ -6,17 +6,14 @@
"Countries": "Countries",
"DaysAgo": "%s days ago",
"GoalConversions": "%s goal conversions",
- "Hours": "hours",
"HoursAgo": "%s hours ago",
"map": "map",
- "Minutes": "minutes",
"MinutesAgo": "%s minutes ago",
"None": "None",
"NoVisit": "No visit",
"RealTimeMap": "Real-time Map",
"Regions": "Regions",
"Searches": "%s searches",
- "Seconds": "seconds",
"SecondsAgo": "%s seconds ago",
"ShowingVisits": "Geo-located visits of last",
"Unlocated": "<b>%s<\/b> %p of the visits from %c couldn't be geo located.",
diff --git a/plugins/VisitTime/functions.php b/plugins/VisitTime/functions.php
index 4b7d0250085b41e3d0afabbe5d712a1e9dfd408b..caba56ecfad2621060f64bcecad099bc97439925 100644
--- a/plugins/VisitTime/functions.php
+++ b/plugins/VisitTime/functions.php
@@ -13,7 +13,7 @@ use Piwik\Piwik;
function getTimeLabel($label)
{
- return sprintf(Piwik::translate('VisitTime_NHour'), $label);
+ return sprintf(Piwik::translate('Intl_NHoursShort'), $label);
}
/**
diff --git a/plugins/VisitorInterest/API.php b/plugins/VisitorInterest/API.php
index 74f050c33a538662261fb9a27bf51ebeef0bcf9c..6567d96c3ecb5bbe78daf18c1315e4532c4374c2 100644
--- a/plugins/VisitorInterest/API.php
+++ b/plugins/VisitorInterest/API.php
@@ -36,7 +36,7 @@ class API extends \Piwik\Plugin\API
$dataTable->queueFilter('Sort', array('label', 'asc', true, false));
$dataTable->queueFilter('BeautifyTimeRangeLabels', array(
Piwik::translate('VisitorInterest_BetweenXYSeconds'),
- Piwik::translate('VisitorInterest_OneMinute'),
+ Piwik::translate('Intl_OneMinuteShort'),
Piwik::translate('VisitorInterest_PlusXMin')));
return $dataTable;
}
@@ -65,7 +65,7 @@ class API extends \Piwik\Plugin\API
{
$dataTable = $this->getDataTable(
Archiver::DAYS_SINCE_LAST_RECORD_NAME, $idSite, $period, $date, $segment, Metrics::INDEX_NB_VISITS);
- $dataTable->queueFilter('BeautifyRangeLabels', array(Piwik::translate('General_OneDay'), Piwik::translate('General_NDays')));
+ $dataTable->queueFilter('BeautifyRangeLabels', array(Piwik::translate('Intl_OneDay'), Piwik::translate('Intl_NDays')));
return $dataTable;
}
diff --git a/plugins/VisitorInterest/lang/en.json b/plugins/VisitorInterest/lang/en.json
index e61911c061dad46c7ef4c35de923f1e03540befa..dd7fe1441df9effe0326bc9502b8dc6dd5bbd094 100644
--- a/plugins/VisitorInterest/lang/en.json
+++ b/plugins/VisitorInterest/lang/en.json
@@ -6,7 +6,6 @@
"ColumnVisitDuration": "Visit duration",
"Engagement": "Engagement",
"NPages": "%s pages",
- "OneMinute": "1 min",
"OnePage": "1 page",
"PluginDescription": "Reports about visitors interest: number of pages viewed, time spent on the Website, days since last visit, and more.",
"PlusXMin": "%s min",