merge master => 3.0

1 files changed, 9 insertions, 9 deletions

diff --git a/plugins/Goals/lang/en.json b/plugins/Goals/lang/en.json
index 8820b333e7..d5b221a3fc 100644
--- a/plugins/Goals/lang/en.json
+++ b/plugins/Goals/lang/en.json
@@ -3,16 +3,16 @@
         "AbandonedCart": "Abandoned Cart",
         "AddGoal": "Add Goal",
         "AddNewGoal": "Add a new Goal",
-        "AddNewGoalOrEditExistingGoal": "%sAdd a new Goal%s or %sEdit%s existing Goals",
+        "AddNewGoalOrEditExistingGoal": "%1$sAdd a new Goal%2$s or %3$sEdit%4$s existing Goals",
         "AllowGoalConvertedMoreThanOncePerVisit": "Allow Goal to be converted more than once per visit",
         "AllowMultipleConversionsPerVisit": "Allow multiple conversions per visit",
         "BestCountries": "Your best converting countries are:",
         "BestKeywords": "Your top converting keywords are:",
         "BestReferrers": "Your best converting websites referrers are:",
         "CaseSensitive": "Case sensitive match",
-        "CancelAndReturnToGoals": "Cancel and %sreturn to the list of goals%s",
+        "CancelAndReturnToGoals": "Cancel and %1$sreturn to the list of goals%2$s",
         "CategoryTextGeneral_Visitors": "User location",
-        "CategoryTextReferrers_Referrers": "Referrers", 
+        "CategoryTextReferrers_Referrers": "Referrers",
         "CategoryTextVisitsSummary_VisitsSummary": "User attribute",
         "CategoryTextGeneral_Visit": "engagement",
         "ChooseGoal": "Choose Goal",
@@ -33,7 +33,7 @@
         "ColumnVisits": "The total number of visits, regardless of whether a goal was triggered or not.",
         "ColumnVisitsProductDocumentation": "The number of visits on the Product\/Category page. This is also used to process the %s conversion rate. This metric is in the report if Ecommerce view tracking was setup on Product\/Category pages.",
         "Contains": "contains %s",
-        "ConversionByTypeReportDocumentation": "This report provides detailed information about the goal performance (conversions, conversion rates and revenue per visit) for each of the categories available in the left panel. %s Please click on one of the categories to view the report. %s For more information, read the %sTracking Goals documentation%s",
+        "ConversionByTypeReportDocumentation": "This report provides detailed information about the goal performance (conversions, conversion rates and revenue per visit) for each of the categories available in the left panel. %1$s Please click on one of the categories to view the report. %2$s For more information, read the %3$sTracking Goals documentation%4$s",
         "ConversionRate": "%s conversion rate",
         "Conversions": "%s conversions",
         "ConversionsDescription": "conversions",
@@ -53,7 +53,7 @@
         "EcommerceOrder": "Ecommerce order",
         "EcommerceOverview": "Ecommerce Overview",
         "EcommerceReports": "Ecommerce Reports",
-        "ExceptionInvalidMatchingString": "If you choose 'exact match', the matching string must be a URL starting with %s. For example, '%s'.",
+        "ExceptionInvalidMatchingString": "If you choose 'exact match', the matching string must be a URL starting with %1$s. For example, '%2$s'.",
         "ExternalWebsiteUrl": "external website URL",
         "Filename": "filename",
         "GoalConversion": "Goal conversion",
@@ -69,9 +69,9 @@
         "GoalX": "Goal %s",
         "HelpOneConversionPerVisit": "If a Page matching this Goal is refreshed or viewed more than once in a Visit, the Goal will only be tracked the first time the page was loaded during this visit.",
         "IsExactly": "is exactly %s",
-        "LearnMoreAboutGoalTrackingDocumentation": "Learn more about %s Tracking Goals in Piwik%s in the user documentation.",
+        "LearnMoreAboutGoalTrackingDocumentation": "Learn more about %1$s Tracking Goals in Piwik%2$s in the user documentation.",
         "LeftInCart": "%s left in cart",
-        "ManageGoalsOrCreateANewGoal": "%sManage Goals%s or create a new Goal now!",
+        "ManageGoalsOrCreateANewGoal": "%1$sManage Goals%2$s or create a new Goal now!",
         "Manually": "manually",
         "ManuallyTriggeredUsingJavascriptFunction": "Goal is manually triggered using the JavaScript API trackGoal()",
         "MatchesExpression": "matches the expression %s",
@@ -102,7 +102,7 @@
         "VisitUrl": "Visit a given URL (page or group of pages)",
         "WhenVisitors": "when visitors",
         "WhereThe": "where the",
-        "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "where the visited page contains a call to the JavaScript 'trackGoal' method (%slearn more%s)",
-        "YouCanEnableEcommerceReports": "You can enable %s for this website in the %s page."
+        "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "where the visited page contains a call to the JavaScript 'trackGoal' method (%1$slearn more%2$s)",
+        "YouCanEnableEcommerceReports": "You can enable %1$s for this website in the %2$s page."
     }
 }