Minor changes

5 files changed, 21 insertions, 20 deletions

diff --git a/lang/en.php b/lang/en.php
index 8ea853a00d..22109e611f 100644
--- a/lang/en.php
+++ b/lang/en.php
@@ -478,8 +478,8 @@ $translations = array(
 	'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.',
-	'CoreAdminHome_JSTracking_MergeAliases' => 'Track visitors across all alias URLs of',
+	'CoreAdminHome_JSTracking_MergeSubdomainsDesc' => 'So if one visitor visits %1$s and %2$s, they will be counted as a unique visitor.',
+	'CoreAdminHome_JSTracking_MergeAliases' => 'In the "Outlinks" report, hide clicks to known alias URLs of',
 	'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.',
@@ -496,7 +496,7 @@ $translations = array(
 	'CoreAdminHome_JSTracking_CodeNote' => 'Make sure this code is on every page of your website before the %1$s tag.',
 	'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_ImageTrackingIntro2' => 'Generate the link below and copy-paste the generated HTML in 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',
diff --git a/misc/proxy-hide-piwik-url/piwik.php b/misc/proxy-hide-piwik-url/piwik.php
index d5878bd846..e724e8d6b4 100644
--- a/misc/proxy-hide-piwik-url/piwik.php
+++ b/misc/proxy-hide-piwik-url/piwik.php
@@ -31,7 +31,7 @@
           var u=(("https:" == document.location.protocol) ? "https" : "http") + "://trackedsite.com/";
           _paq.push(["setTrackerUrl", u+"piwik.php"]);
           var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
-          g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
+          g.defer=true; g.async=true; g.src=u+"piwik.php"; s.parentNode.insertBefore(g,s);
         })();
       </script>
       <!-- End Piwik Code -->
diff --git a/plugins/CoreAdminHome/templates/jsTrackingGenerator.tpl b/plugins/CoreAdminHome/templates/jsTrackingGenerator.tpl
index 14a1a995e0..a8bd8a466a 100644
--- a/plugins/CoreAdminHome/templates/jsTrackingGenerator.tpl
+++ b/plugins/CoreAdminHome/templates/jsTrackingGenerator.tpl
@@ -45,26 +45,27 @@
 			{'CoreAdminHome_JSTracking_MergeSubdomainsDesc'|translate:'x.domain.com':'y.domain.com'}
 		</div>
 	</div>
-	
+
+	{* group page titles by site domain *}
+		<div class="tracking-option-section">
+			<input type="checkbox" id="javascript-tracking-group-by-domain"/>
+			<label for="javascript-tracking-group-by-domain">{'CoreAdminHome_JSTracking_GroupPageTitlesByDomain'|translate}</label>
+
+			<div class="small-form-description">
+			{'CoreAdminHome_JSTracking_GroupPageTitlesByDomainDesc'|translate}
+			</div>
+		</div>
+
 	{* track across all site aliases *}
-	<div class="tracking-option-section">
+		<div class="tracking-option-section">
 		<input type="checkbox" id="javascript-tracking-all-aliases"/>
 		<label for="javascript-tracking-all-aliases">{'CoreAdminHome_JSTracking_MergeAliases'|translate} <span class='current-site-name'>{$defaultReportSiteName}</span></label>
-		
-		<div class="small-form-description">
-			{'CoreAdminHome_JSTracking_MergeAliasesDesc'|translate:'x.domain.com'}
-		</div>
-	</div>
-	
-	{* group page titles by site domain *}
-	<div class="tracking-option-section">
-		<input type="checkbox" id="javascript-tracking-group-by-domain"/>
-		<label for="javascript-tracking-group-by-domain">{'CoreAdminHome_JSTracking_GroupPageTitlesByDomain'|translate}</label>
-		
+
 		<div class="small-form-description">
-			{'CoreAdminHome_JSTracking_GroupPageTitlesByDomainDesc'|translate}
+		{'CoreAdminHome_JSTracking_MergeAliasesDesc'|translate:'x.domain.com'}
 		</div>
 	</div>
+
 </td>
 <td>
 	<div id="javascript-advanced-options" style="display:none">
diff --git a/plugins/Login/Controller.php b/plugins/Login/Controller.php
index 9084d4e3bf..7031ca4307 100644
--- a/plugins/Login/Controller.php
+++ b/plugins/Login/Controller.php
@@ -80,7 +80,7 @@ class Piwik_Login_Controller extends Piwik_Controller
 
 		$view = Piwik_View::factory('login');
 		$view->AccessErrorString = $messageNoAccess;
-		$view->infoMessage = $infoMessage;
+		$view->infoMessage = nl2br($infoMessage);
 		$view->addForm( $form );
 		$this->configureView($view);
 		self::setHostValidationVariablesView($view);
diff --git a/tests/PHPUnit/bootstrap.php b/tests/PHPUnit/bootstrap.php
index e72567814a..ea4b862118 100644
--- a/tests/PHPUnit/bootstrap.php
+++ b/tests/PHPUnit/bootstrap.php
@@ -60,7 +60,7 @@ Try again and now the tests should run!";
 	try {
 		$fetched = Piwik_Http::sendHttpRequest($piwikServerUrl, $timeout = 3);
 	} catch(Exception $e) {
-		$fetched = $e->getMessage();
+		$fetched = "ERROR fetching: " . $e->getMessage();
 	}
 	$expectedString = 'plugins/CoreHome/templates/images/favicon.ico';