diff options
-rw-r--r-- | lang/en.php | 18 | ||||
-rw-r--r-- | plugins/CoreHome/templates/header_message.tpl | 2 | ||||
-rw-r--r-- | plugins/Goals/templates/single_goal.tpl | 6 |
3 files changed, 13 insertions, 13 deletions
diff --git a/lang/en.php b/lang/en.php index 0016058f75..422a199bd6 100644 --- a/lang/en.php +++ b/lang/en.php @@ -85,7 +85,7 @@ $translations = array( 'General_NoDataForTagCloud' => 'No data for this tag cloud.', 'General_DisplayNormalTable' => 'Display normal table', 'General_DisplayMoreData' => 'Display more data', - 'General_PiwikIsACollaborativeProjectYouCanContribute' => '%1$s Piwik %2$s is a collaborative project. %3$s If you like Piwik, you can help! Check out %4$s How to participate in Piwik?%5$s ', + 'General_PiwikIsACollaborativeProjectYouCanContribute' => '%1$s Piwik %2$s is a collaborative project. %3$s If you like Piwik, you can help! Check out %4$s How to participate in Piwik?%5$s', 'General_YouAreCurrentlyViewingDemoOfPiwik' => 'You are currently viewing the demo of %1$s; %2$sdownload%3$s the full version! Check out %4$s', 'General_PiwikXIsAvailablePleaseUpdateNow' => 'Piwik %1$s is available. %2$s Please update now!%3$s (see %4$s changes%5$s).', 'General_PiwikXIsAvailablePleaseNotifyPiwikAdmin' => '%s is available. Please notify the site administrator.', @@ -319,7 +319,7 @@ $translations = array( 'Feedback_HowToAnonymizeIP' => 'How do I mask visitor IP addresses in my database?', 'Feedback_VisitTheForums' => 'Visit the %s Forums%s', 'Feedback_LearnWaysToParticipate' => 'Learn about all the ways you can %s participate%s', - 'Feedback_SpecialRequest' => 'Do you have a special request for the Piwik team? ', + 'Feedback_SpecialRequest' => 'Do you have a special request for the Piwik team?', 'Feedback_ContactThePiwikTeam' => 'Contact the Piwik team!', 'Feedback_IWantTo' => 'I want to:', 'Feedback_CategoryShareStory' => 'Share a Piwik success story', @@ -344,7 +344,7 @@ $translations = array( 'Goals_OverallConversionRate' => '%s overall conversion rate (visits with a completed goal)', 'Goals_Conversions' => '%s conversions', 'Goals_ConversionRate' => '%s conversion rate', - 'Goals_NoGoalsNeedAccess' => 'Only an Administrator or the Super User can add Goals for a given website. Please ask your Piwik administrator to set up a Goal for your website. <br>Tracking Goals is a great way to help understand and maximize your website performance! ', + 'Goals_NoGoalsNeedAccess' => 'Only an Administrator or the Super User can add Goals for a given website. Please ask your Piwik administrator to set up a Goal for your website. <br>Tracking Goals is a great way to help understand and maximize your website performance!', 'Goals_AddNewGoal' => 'Add a new Goal', 'Goals_AddNewGoalOrEditExistingGoal' => '%sAdd a new Goal%s or %sEdit%s existing Goals', 'Goals_AddGoal_js' => 'Add Goal', @@ -361,12 +361,12 @@ $translations = array( 'Goals_ClickOutlink' => 'Click on a Link to an external website', 'Goals_Optional' => '(optional)', 'Goals_WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore' => 'where the visited page contains a call to the JavaScript piwikTracker.trackGoal() method (%slearn more%s)', - 'Goals_DefaultRevenue' => 'Goal default revenue is ', + 'Goals_DefaultRevenue' => 'Goal default revenue is', 'Goals_DefaultRevenueHelp' => 'For example, a Contact Form submitted by a visitor may be worth $10 on average. Piwik will help you understand how well your visitors segments are performing.', 'Goals_ConversionsOverview' => 'Conversions Overview', - 'Goals_BestCountries' => 'Your best converting countries are: ', - 'Goals_BestKeywords' => 'Your top converting keywords are: ', - 'Goals_BestReferers' => 'Your best converting websites referers are: ', + 'Goals_BestCountries' => 'Your best converting countries are:', + 'Goals_BestKeywords' => 'Your top converting keywords are:', + 'Goals_BestReferers' => 'Your best converting websites referers are:', 'Goals_ReturningVisitorsConversionRateIs' => 'Returning visitors conversion rate is %s', 'Goals_NewVisitorsConversionRateIs' => 'New visitors conversion rate is %s', 'Goals_Contains' => 'contains %s', @@ -508,7 +508,7 @@ $translations = array( 'Provider_WidgetProviders' => 'Providers', 'Provider_ColumnProvider' => 'Provider', 'Provider_SubmenuLocationsProvider' => 'Locations & Provider', - 'Referers_PluginDescription' => 'Reports the Referers data: Search Engines, Keywords, Websites, Campaign Tracking, Direct Entry. ', + 'Referers_PluginDescription' => 'Reports the Referers data: Search Engines, Keywords, Websites, Campaign Tracking, Direct Entry.', 'Referers_Referers' => 'Referers', 'Referers_SearchEngines' => 'Search Engines', 'Referers_Keywords' => 'Keywords', @@ -577,7 +577,7 @@ $translations = array( 'SitesManager_ListOfQueryParametersToBeExcludedOnAllWebsites' => 'The Query URLs parameters below will be excluded from URLs on all websites.', 'SitesManager_ListOfQueryParametersToExclude' => 'Enter the list of URL Query Parameters, one per line, to exclude from the Page URLs reports.', 'SitesManager_PiwikWillAutomaticallyExcludeCommonSessionParameters' => 'Piwik will automatically exclude the common session parameters (%s).', - 'SitesManager_HelpExcludedIps' => 'Enter the list of IPs, one per line, that you wish to exclude from being tracked by Piwik. You can use wildcards, eg. %1$s or %2$s ', + 'SitesManager_HelpExcludedIps' => 'Enter the list of IPs, one per line, that you wish to exclude from being tracked by Piwik. You can use wildcards, eg. %1$s or %2$s', 'SitesManager_YourCurrentIpAddressIs' => 'Your current IP address is %s', 'SitesManager_SelectACity' => 'Select a city', 'SitesManager_ChooseCityInSameTimezoneAsYou' => 'Choose a city in the same time zone as you.', diff --git a/plugins/CoreHome/templates/header_message.tpl b/plugins/CoreHome/templates/header_message.tpl index e2f05d01e0..2fca652693 100644 --- a/plugins/CoreHome/templates/header_message.tpl +++ b/plugins/CoreHome/templates/header_message.tpl @@ -9,6 +9,6 @@ {'General_PiwikXIsAvailablePleaseNotifyPiwikAdmin'|translate:"<a href='misc/redirectToUrl.php?url=http://piwik.org/' target='_blank'>Piwik</a> <a href='misc/redirectToUrl.php?url=http://piwik.org/changelog/' target='_blank'>$latest_version_available</a>"} {/if} {else} - {'General_PiwikIsACollaborativeProjectYouCanContribute'|translate:"<a href='misc/redirectToUrl.php?url=http://piwik.org'>":"$piwik_version</a>":"<br />":"<a target='_blank' href='misc/redirectToUrl.php?url=http://piwik.org/contribute/'>":"</a>"} + {'General_PiwikIsACollaborativeProjectYouCanContribute'|translate:"<a href='misc/redirectToUrl.php?url=http://piwik.org'>":"$piwik_version</a>":"<br />":"<a target='_blank' href='misc/redirectToUrl.php?url=http://piwik.org/contribute/'>":"</a>"} {/if} </span> diff --git a/plugins/Goals/templates/single_goal.tpl b/plugins/Goals/templates/single_goal.tpl index 48f142def8..47ca1c4654 100644 --- a/plugins/Goals/templates/single_goal.tpl +++ b/plugins/Goals/templates/single_goal.tpl @@ -4,9 +4,9 @@ {if $nb_conversions > 0} <h2>{'Goals_ConversionsOverview'|translate}</h2> <ul class="ulGoalTopElements"> - <li>{'Goals_BestCountries'|translate}{include file='Goals/templates/list_top_segment.tpl' topSegment=$topSegments.country}</li> - {if count($topSegments.keyword)>0}<li>{'Goals_BestKeywords'|translate}{include file='Goals/templates/list_top_segment.tpl' topSegment=$topSegments.keyword}</li>{/if} - {if count($topSegments.website)>0}<li>{'Goals_BestReferers'|translate}{include file='Goals/templates/list_top_segment.tpl' topSegment=$topSegments.website}</li>{/if} + <li>{'Goals_BestCountries'|translate} {include file='Goals/templates/list_top_segment.tpl' topSegment=$topSegments.country}</li> + {if count($topSegments.keyword)>0}<li>{'Goals_BestKeywords'|translate} {include file='Goals/templates/list_top_segment.tpl' topSegment=$topSegments.keyword}</li>{/if} + {if count($topSegments.website)>0}<li>{'Goals_BestReferers'|translate} {include file='Goals/templates/list_top_segment.tpl' topSegment=$topSegments.website}</li>{/if} <li>{'Goals_ReturningVisitorsConversionRateIs'|translate:"<b>$conversion_rate_returning%</b>"}, {'Goals_NewVisitorsConversionRateIs'|translate:"<b>$conversion_rate_new%</b>"}</li> </ul> {/if} |