Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authormattab <matthieu.aubry@gmail.com>2013-02-26 11:57:20 +0400
committermattab <matthieu.aubry@gmail.com>2013-02-26 11:57:20 +0400
commitc405a15af93d981bee32d26a8f38ee1371d9be78 (patch)
treeaa9862b52334866766e68ed457b985fd804d43d1 /lang
parentb562ded89964307f83379c8b4e6b2366b77208b9 (diff)
Refs #1845
* the tests/js is now passing following Benaka's commit, sweeet * Adding setsiteId to the "special case" so that setSiteId can be called after trackpageView and it still works * Adding pathname in the generated JS * HTML entity the & in the IMG src
Diffstat (limited to 'lang')
-rw-r--r--lang/en.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lang/en.php b/lang/en.php
index d5afc2cf1d..e83e9dcd15 100644
--- a/lang/en.php
+++ b/lang/en.php
@@ -480,7 +480,7 @@ $translations = array(
'CoreAdminHome_JSTracking_MergeSubdomains' => 'Track visitors across all subdomains of',
'CoreAdminHome_JSTracking_MergeSubdomainsDesc' => 'So visitors to %1$s will not be treated as new if they visit %2$s for the first time.',
'CoreAdminHome_JSTracking_MergeAliases' => 'Track visitors across all alias URLs of',
- 'CoreAdminHome_JSTracking_MergeAliasesDesc' => 'So visitors to the main URL will not be treated as new if they visit an alias URL for the first time.',
+ 'CoreAdminHome_JSTracking_MergeAliasesDesc' => 'So clicks on links to Alias URLs (eg. %s) will not be counted as "Outlink".',
'CoreAdminHome_JSTracking_GroupPageTitlesByDomain' => 'Prepend the site domain to the page title when tracking',
'CoreAdminHome_JSTracking_GroupPageTitlesByDomainDesc' => 'So if someone visits the \'About\' page on blog.example.com it will be recorded as \'blog / About\'. This is the easiest way to get an overview of your traffic by sub-domain.',
'CoreAdminHome_JSTracking_VisitorCustomVars' => 'Track custom variables for this visitor',
@@ -617,7 +617,7 @@ Piwik will let you track visitors to your website for free. You should definitel
'CoreHome_PeriodWeeks' => 'weeks',
'CoreHome_PeriodMonths' => 'months',
'CoreHome_PeriodYears' => 'years',
- 'CoreHome_YearShort_js' => 'yr',
+ 'General_YearShort_js' => 'yr',
'CoreHome_DaySu_js' => 'Su',
'CoreHome_DayMo_js' => 'Mo',
'CoreHome_DayTu_js' => 'Tu',