Index: plugins/Goals/templates/list_goal_edit.tpl
===================================================================
--- plugins/Goals/templates/list_goal_edit.tpl	(revision 1661)
+++ plugins/Goals/templates/list_goal_edit.tpl	(working copy)
@@ -2,20 +2,20 @@
 	<table class="tableForm">
 	<thead style="font-weight:bold">
 		<td>Id</td>
-		<td>Goal Name</td>
-		<td>Goal is Triggered when</td>
-		<td>Revenue</td>
-		<td>Edit</td>
-		<td>Delete</td>
+        <td>{'Goals_GoalName'|translate}</td>
+        <td>{'Goals_GoalIsTriggeredWhen'|translate}</td>
+        <td>{'Goals_ColumnRevenue'|translate}</td>
+        <td>{'General_Edit'|translate}</td>
+        <td>{'General_Delete'|translate}</td>
 	</thead>
 	{foreach from=$goals item=goal}
 	<tr>
 		<td>{$goal.idgoal}</td>
 		<td>{$goal.name}</td>
-		<td>{$goal.match_attribute} {if isset($goal.pattern_type)}<br>Pattern {$goal.pattern_type}: {$goal.pattern}</b>{/if}</td>
+        <td>{$goal.match_attribute} {if isset($goal.pattern_type)}<br>{'General_Pattern'|translate} {$goal.pattern_type}: {$goal.pattern}</b>{/if}</td>
 		<td>{if $goal.revenue==0}-{else}{$currency}{$goal.revenue}{/if}</td>
-		<td><a href='#' name="linkEditGoal" id="{$goal.idgoal}"><img src='plugins/UsersManager/images/edit.png' border=0> Edit</a></td>
-		<td><a href='#' name="linkDeleteGoal" id="{$goal.idgoal}"><img src='plugins/UsersManager/images/remove.png' border=0> Delete</a></td>
+		<td><a href='#' name="linkEditGoal" id="{$goal.idgoal}"><img src='plugins/UsersManager/images/edit.png' border=0> {'General_Edit'|translate}</a></td>
+		<td><a href='#' name="linkDeleteGoal" id="{$goal.idgoal}"><img src='plugins/UsersManager/images/remove.png' border=0> {'General_Delete'|translate}</a></td>
 	</tr>
 	{/foreach}
 	</table>
Index: plugins/Goals/templates/GoalForm.js
===================================================================
--- plugins/Goals/templates/GoalForm.js	(revision 1661)
+++ plugins/Goals/templates/GoalForm.js	(working copy)
@@ -94,7 +94,7 @@
 	$('a[name=linkDeleteGoal]').click( function() {
 		var goalId = $(this).attr('id');
 		var goal = piwik.goals[goalId];
-		if(confirm(sprintf("Are you sure you want to delete the Goal '%s'?", goal.name)))
+        if(confirm(sprintf("{'Goals_DeleteGoalConfirm'|translate}", goal.name)))
 		{
 			$.ajax( getAjaxDeleteGoal( goalId ) );
 		}
Index: plugins/Goals/templates/add_new_goal.tpl
===================================================================
--- plugins/Goals/templates/add_new_goal.tpl	(revision 1661)
+++ plugins/Goals/templates/add_new_goal.tpl	(working copy)
@@ -2,7 +2,5 @@
 {if $userCanEditGoals}
 	{include file=Goals/templates/add_edit_goal.tpl}
 {else}
-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 are a great tool to help you maximize your website performance!
+{'Goals_NoGoalsNeedAccess'|translate}
 {/if}
Index: plugins/Goals/templates/single_goal.tpl
===================================================================
--- plugins/Goals/templates/single_goal.tpl	(revision 1661)
+++ plugins/Goals/templates/single_goal.tpl	(working copy)
@@ -2,12 +2,12 @@
 
 <div style="clear:both"></div>
 {if $nb_conversions > 0}
-	<h2>Conversions Overview</h2>
+    <h2>{'Goals_Conversions_Overview'|translate}</h2>
 	<ul class="ulGoalTopElements">
-	<li>Your best converting countries are: {include file='Goals/templates/list_top_segment.tpl' topSegment=$topSegments.country}</li>
-	{if count($topSegments.keyword)>0}<li>Your top converting keywords are: {include file='Goals/templates/list_top_segment.tpl' topSegment=$topSegments.keyword}</li>{/if}
-	{if count($topSegments.website)>0}<li>Your best converting websites referers are: {include file='Goals/templates/list_top_segment.tpl' topSegment=$topSegments.website}</li>{/if}
-	<li>Returning visitors conversion rate is <b>{$conversion_rate_returning}%</b>, New Visitors conversion rate is <b>{$conversion_rate_new}%</b></li>
+    <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_ReturningVisitorsConversionRate'|translate}<b>{$conversion_rate_returning}%</b>, {'Goals_NewVisitorsConversionRate'|translate}<b>{$conversion_rate_new}%</b></li>
 	</ul>
 {/if}
 <hr>
Index: plugins/Goals/templates/overview.tpl
===================================================================
--- plugins/Goals/templates/overview.tpl	(revision 1661)
+++ plugins/Goals/templates/overview.tpl	(working copy)
@@ -7,12 +7,12 @@
 <h2 style="padding-top: 30px;">{$goal.name} (goal)</h2>
 <div id='leftcolumn'>
 	<div class="sparkline">{sparkline src=$goal.urlSparklineConversions}
-	{'%s conversions'|translate:"<strong>$nb_conversions</strong>"}</div>
+	{'Goals_Conversions'|translate:"<strong>$nb_conversions</strong>"}</div>
 </div>
 <div id='rightcolumn'>
 	<div class="sparkline">{sparkline src=$goal.urlSparklineConversionRate}
-	{'%s conversion rate'|translate:"<strong>$conversion_rate%</strong>"}</div>
-	{* (<a href=''>more</a>) *}
+	{'Goals_ConversionRate'|translate:"<strong>$conversion_rate%</strong>"}</div>
+    {* (<a href=''>{'General_More'|translate}</a>) *}
 </div>
 {/foreach}
 
Index: plugins/Goals/templates/release_notes.tpl
===================================================================
--- plugins/Goals/templates/release_notes.tpl	(revision 1661)
+++ plugins/Goals/templates/release_notes.tpl	(working copy)
@@ -1,4 +1,5 @@
-<div style="clear:both" />
+<div style="clear:both"/> 
+<div class="unstable_warning"> 
 <br><br><hr>
 <b>About the Goal Tracking Plugin</b><br>
 <pre>
@@ -34,3 +35,4 @@
 - Goal conversions, revenue, etc. by hour
 - I would like to be able to plot conversions, for a given keyword/website, over the last N days/weeks/etc. See	#534
 - when entering the regex to detect as a goal, we could query the piwik API for this regex and list all URLs that match the regex; allows for an easy debug/check that the regex is correct and will be triggererd when expected
+</div><!-- /unstable_warning -->
Index: plugins/Goals/templates/title_and_evolution_graph.tpl
===================================================================
--- plugins/Goals/templates/title_and_evolution_graph.tpl	(revision 1661)
+++ plugins/Goals/templates/title_and_evolution_graph.tpl	(working copy)
@@ -6,13 +6,13 @@
 
 <div id='leftcolumn'>
 	<div class="sparkline">{sparkline src=$urlSparklineConversions}
-	{'%s conversions'|translate:"<strong>$nb_conversions</strong>"}</div>
+	{'Goals_Conversions'|translate:"<strong>$nb_conversions</strong>"}</div>
 	{if $revenue != 0 }
 		<div class="sparkline">{sparkline src=$urlSparklineRevenue}
-		{'%s overall revenue'|translate:"<strong>$currency$revenue</strong>"}</div>
+		{'Goals_OverallRevenue'|translate:"<strong>$currency$revenue</strong>"}</div>
 	{/if}
 </div>
 <div id='rightcolumn'>
 	<div class="sparkline">{sparkline src=$urlSparklineConversionRate}
-	{'%s overall conversion rate (visits with a completed goal)'|translate:"<strong>$conversion_rate%</strong>"}</div>
+	{'Goals_OverallConversionRate'|translate:"<strong>$conversion_rate%</strong>"}</div>
 </div>
Index: plugins/Goals/templates/form_add_goal.tpl
===================================================================
--- plugins/Goals/templates/form_add_goal.tpl	(revision 1661)
+++ plugins/Goals/templates/form_add_goal.tpl	(working copy)
@@ -10,25 +10,25 @@
 	<table class="tableForm">
 		<tbody>
 			<tr>
-				<td>Goal Name </td>
+                <td>{'Goals_GoalName'|translate} </td>
 				<td><input type="text" name="name" value="" id="goal_name" /></td>
 			</tr>
 			<tr>
-				<td>Goal is triggered
+				<td>{'Goals_GoalIsTriggered'|translate}
 					<select name="trigger_type">
-						<option value="visitors">when visitors</option>
-						<option value="manually">manually</option>
+						<option value="visitors">{'Goals_WhenVisitors'|translate}</option>
+						<option value="manually">{'Goals_Manually'|translate}</option>
 					</select>
 				</td>
 				<td>
 					<input type="radio" id="match_attribute_url" value="url" name="match_attribute"/>
-					<label for="match_attribute_url">Visit a given URL (page or group of pages)</label>
+                    <label for="match_attribute_url">{'Goals_VisitUrl'|translate}</label>
 					<br />
 					<input type="radio" id="match_attribute_file" value="file" name="match_attribute"/>
-					<label for="match_attribute_file">Download a file</label>
+					<label for="match_attribute_file">{'Goals_Download'|translate}</label>
 					<br />
 					<input type="radio" id="match_attribute_external_website" value="external_website" name="match_attribute"/>
-					<label for="match_attribute_external_website">Click on a Link to an external website </label>
+					<label for="match_attribute_external_website">{'Goals_ClickOutlink'|translate}</label>
 				</td>
 				</tr>
 		</tbody>
@@ -37,9 +37,9 @@
 				<td>where the <span id="match_attribute_name"></span></td>
 				<td>
 					<select name="pattern_type">
-						<option value="contains">contains</option>
-						<option value="exact">is exactly</option>
-						<option value="regex">matches the expression</option>
+                        <option value="contains">{'General_Contains'|translate}</option>
+                        <option value="exact">{'General_IsExactly'|translate}</option>
+                        <option value="regex">{'General_MatchesExpression'|translate}</option>
 					</select>
 				
 					<input type="text" name="pattern" value=""/>
@@ -48,7 +48,7 @@
 					<br />
 					<span style="float:right">
 					(optional) <input type="checkbox" id="case_sensitive"/>
-					<label for="case_sensitive">Case sensitive match</label>
+                    <label for="case_sensitive">{'General_CaseSensitive'|translate}</label>
 					</span>
 				</td>
 			</tr>
@@ -62,12 +62,9 @@
 		</tbody>
 		<tbody>
 			<tr>
-				<td>(optional) Goal default value is </td>
+                <td>(optional) {'Goals_DefaultRevenue'|translate}</td>
 				<td>{$currency} <input type="text" name="revenue" size="1" value="0"/>
-				<div class="goalInlineHelp"> 
-				For example, a Contact Form submitted by a visitor <br />
-				may be worth $10 on average. Piwik will help you understand <br />
-				how well your visitors segments are performing.</div>
+                <div class="goalInlineHelp"> {'Goals_DefaultRevenueHelp'|translate} </div>
 				</td>
 			</tr>
 			<tr>
@@ -75,7 +72,7 @@
 				<div class="submit">	
 					<input type="hidden" name="methodGoalAPI" value="">	
 					<input type="hidden" name="goalIdUpdate" value="">
-					<input type="submit" value="Add Goal" name="submit" id="goal_submit" class="submit" />
+                    <input type="submit" value="{'Goals_SaveGoal'|translate}" name="submit" id="goal_submit" class="submit" />
 				</div>
 				</td>
 			</tr>
Index: plugins/Goals/templates/add_edit_goal.tpl
===================================================================
--- plugins/Goals/templates/add_edit_goal.tpl	(revision 1661)
+++ plugins/Goals/templates/add_edit_goal.tpl	(working copy)
@@ -1,9 +1,9 @@
 
 <div id="AddEditGoals">
 {if isset($onlyShowAddNewGoal)}
-	<h2>Add a new Goal</h2>
+    <h2>{'Goals_AddNewGoal'|translate}</h2>
 {else}
-	<h2><a onclick='' name="linkAddNewGoal">+ Add a new Goal</a> 
+	<h2><a onclick='' name="linkAddNewGoal">+ {'Goals_AddNewGoal'|translate}</a> 
 	or <a onclick='' name="linkEditGoals">Edit</a> existing Goals</h2>
 {/if}
 
Index: plugins/Goals/templates/list_top_segment.tpl
===================================================================
--- plugins/Goals/templates/list_top_segment.tpl	(revision 1661)
+++ plugins/Goals/templates/list_top_segment.tpl	(working copy)
@@ -1,5 +1,5 @@
 
 {foreach from=$topSegment item=element name=topGoalElements}
-<span class='goalTopElement' title='<b>{$element.nb_conversions}</b> conversions, <b>{$element.conversion_rate}%</b> conversion rate'>
+<span class='goalTopElement' title='<b>{$element.nb_conversions}</b> {'Goals_ColumnConversions'|translate}, <b>{$element.conversion_rate}%</b> {'Goals_ColumnConversionRate'|translate}'>
 {$element.name}</span>{logoHtml metadata=$element.metadata alt=$element.name}{if $smarty.foreach.topGoalElements.iteration == $smarty.foreach.topGoalElements.total-1} and {elseif $smarty.foreach.topGoalElements.iteration < $smarty.foreach.topGoalElements.total-1}, {else}{/if}
 {/foreach} {* (<a href=''>more</a>) *}