Refs #1845, rewrote Installation JavaScript Tracking code page's text and used async JavaScript for tracking code. Also, tweaked and applied some fixes for JavaScript Tracking code admin page.

1 files changed, 13 insertions, 7 deletions

diff --git a/lang/en.php b/lang/en.php
index 0c3caeca2c..5bef4f0db9 100644
--- a/lang/en.php
+++ b/lang/en.php
@@ -365,6 +365,7 @@ $translations = array(
 	'General_MoreDetails' => 'More Details',
 	'General_Source' => 'Source',
 	'General_Options' => 'Options',
+	'General_ReadThisToLearnMore' => '%1$sRead this to learn more.%2$s',
 	'Actions_PluginDescription' => 'Reports about the page views, the outlinks and downloads. Outlinks and Downloads tracking is automatic! You can also track your internal website\'s Search Engine.',
 	'Actions_Actions' => 'Actions',
 	'Actions_SubmenuPages' => 'Pages',
@@ -471,9 +472,10 @@ $translations = array(
 	'CoreAdminHome_ValidPiwikHostname' => 'Valid Piwik Hostname',
 	'CoreAdminHome_MissingPluginsWarning' => 'The following plugins were not loaded because they could not be found in the \'plugins\' directory: %1$s. You can disable these plugins on the %2$sManage Plugins%3$s page.',
 	'CoreAdminHome_JSTrackingIntro1' => 'You can track visitors to your website many different ways. The recommended way to do it is through JavaScript. To use this method you must make sure every webpage of your website has some JavaScript code, which you can generate here.',
-	'CoreAdminHome_JSTrackingIntro2' => 'Once you have the JavaScript tracking code for your website, copy and paste it to all the pages you want to track with Piwik. In most websites, blogs, CMS, etc. you can use a pre-made plugin to do the technical work for you. (See our %1$slist of plugins used to integrate Piwik%2$s.) If no plugin exists you can edit your website templates and add this code in the "footer" file.',
-	'CoreAdminHome_JSTrackingIntro3' => 'If you don\'t want to use JavaScript to track visitors, %1$sgenerate an image tracking link below%2$s.',
-	'CoreAdminHome_JSTrackingIntro4' => 'If you want to do more than tracking a page view, please check out the %1$sPiwik Javascript Tracking documentation%2$s for the list of available functions (for example: Tracking Goals, Custom Variables, Ecommerce orders, products and abandoned carts, etc.).',
+	'CoreAdminHome_JSTrackingIntro2' => 'Once you have the JavaScript tracking code for your website, copy and paste it to all the pages you want to track with Piwik.',
+	'CoreAdminHome_JSTrackingIntro3' => 'In most websites, blogs, CMS, etc. you can use a pre-made plugin to do the technical work for you. (See our %1$slist of plugins used to integrate Piwik%2$s.) If no plugin exists you can edit your website templates and add this code in the "footer" file.',
+	'CoreAdminHome_JSTrackingIntro4' => 'If you don\'t want to use JavaScript to track visitors, %1$sgenerate an image tracking link below%2$s.',
+	'CoreAdminHome_JSTrackingIntro5' => 'If you want to do more than track page views, please check out the %1$sPiwik Javascript Tracking documentation%2$s for the list of available functions. Using these functions you can track goals, custom variables, ecommerce orders, abandoned carts and more.',
 	'CoreAdminHome_TrackingCode' => 'Tracking Code',
 	'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.',
@@ -491,8 +493,10 @@ $translations = array(
 	'CoreAdminHome_JSTracking_CampaignNameParam' => 'Campaign Name parameter',
 	'CoreAdminHome_JSTracking_CampaignKwdParam' => 'Campaign Keyword parameter',
 	'CoreAdminHome_JSTracking_CodeNote' => 'Make sure this code is on every page of your website before the %1$s tag.',
-	'CoreAdminHome_ImageTrackingIntro1' => 'When a visitor has disabled JavaScript, or when JavaScript cannot be used, you can use an image tracking link to track visitors. Generate the link below and copy-paste the generated HTML to the page. If you\'re using this as a fallback for JavaScript tracking, you can surround it in %1$s tags.',
-	'CoreAdminHome_ImageTrackingIntro2' => 'For the whole list of options you can use with an image tracking link, see the %1$sTracking API Documentation%2$s.',
+	'CoreAdminHome_JSTracking_CustomCampaignQueryParamDesc' => 'Note: %1$sPiwik will automatically detect Google Analytics parameters.%2$s',
+	'CoreAdminHome_ImageTrackingIntro1' => 'When a visitor has disabled JavaScript, or when JavaScript cannot be used, you can use an image tracking link to track visitors.',
+	'CoreAdminHome_ImageTrackingIntro2' => 'Generate the link below and copy-paste the generated HTML to the page. If you\'re using this as a fallback for JavaScript tracking, you can surround it in %1$s tags.',
+	'CoreAdminHome_ImageTrackingIntro3' => 'For the whole list of options you can use with an image tracking link, see the %1$sTracking API Documentation%2$s.',
 	'CoreAdminHome_ImageTracking' => 'Image Tracking',
 	'CoreAdminHome_TrackAGoal' => 'Track a goal',
 	'CoreAdminHome_WithOptionalRevenue' => 'with optional revenue',
@@ -940,9 +944,9 @@ Piwik will let you track visitors to your website for free. You should definitel
 	'Installation_DatabaseClientVersion' => 'Database client version',
 	'Installation_DatabaseCreation' => 'Database creation',
 	'Installation_PleaseFixTheFollowingErrors' => 'Please fix the following errors',
-	'Installation_LargePiwikInstances' => 'Help for large Piwik instances',
+	'Installation_LargePiwikInstances' => 'Help for users with high traffic websites',
 	'Installation_JsTag' => 'JavaScript Tracking Code',
-	'Installation_JsTagArchivingHelp' => 'For medium and high traffic websites, check out the  <a target="_blank" href="http://piwik.org/docs/setup-auto-archiving/">How to setup auto archiving page</a> to make Piwik run really fast!',
+	'Installation_JsTagArchivingHelp1' => 'For medium and high traffic websites there are certain optimizations that should be made to help Piwik run faster (such as %1$ssetting up auto-archiving%2$s).',
 	'Installation_Congratulations' => 'Congratulations',
 	'Installation_CongratulationsHelp' => '<p>Congratulations! Your Piwik installation is complete.</p><p>Make sure your JavaScript code is entered on your pages, and wait for your first visitors!</p>',
 	'Installation_ContinueToPiwik' => 'Continue to Piwik',
@@ -1043,6 +1047,8 @@ Piwik will let you track visitors to your website for free. You should definitel
 	'Installation_NfsFilesystemWarning' => 'Your server is using an NFS filesystem.',
 	'Installation_NfsFilesystemWarningSuffixAdmin' => 'This means Piwik will be extremely slow when using file based sessions.',
 	'Installation_NfsFilesystemWarningSuffixInstall' => 'Using file based sessions on NFS is extremely slow, so Piwik will use database sessions. If you have many concurrent dashboard users, you may need to increase the maximum number of client connections to the database server.',
+	'Installation_JSTracking_Intro' => 'To track your web traffic with Piwik you need to make sure some extra code is added to each of your webpages.',
+	'Installation_JSTracking_EndNote' => 'Note: After the installation process, you can generate customized tracking code in the %1$sTracking Code%2$s admin section.',
 	'LanguagesManager_PluginDescription' => 'This plugin will display a list of the available languages for the Piwik interface. The language selected will be saved in the preferences for each user.',
 	'LanguagesManager_AboutPiwikTranslations' => 'About Piwik translations',
 	'Live_PluginDescription' => 'Watch your visitors live in real-time!',