Index: plugins/SitesManager/templates/SitesManager.js
===================================================================
--- plugins/SitesManager/templates/SitesManager.js	(revision 451)
+++ plugins/SitesManager/templates/SitesManager.js	(working copy)
@@ -108,7 +108,7 @@
 			var idRow = $(this).attr('id');
 			var nameToDelete = $(this).parent().parent().find('#siteName').html();
 			var idsiteToDelete = $(this).parent().parent().find('#idSite').html();
-			if(confirm(sprintf(_pk_translate('SitesManager_DeleteConfirm','Are you sure you want to delete the website %s'),'"'+nameToDelete+'" (idSite = '+idsiteToDelete+')')) )
+			if(confirm(sprintf(_pk_translate('SitesManager_DeleteConfirm'),'"'+nameToDelete+'" (idSite = '+idsiteToDelete+')')) )
 			{
 				$.ajax( getDeleteSiteAJAX( idsiteToDelete ) );
 			}
Index: plugins/Dashboard/templates/Dashboard.js
===================================================================
--- plugins/Dashboard/templates/Dashboard.js	(revision 451)
+++ plugins/Dashboard/templates/Dashboard.js	(working copy)
@@ -143,7 +143,7 @@
 						//format the div for upcomming ajax loading and set a temporary content
 						$(this)	.attr('plugin', plugin)
 								.attr('id', action)
-								.html('<div id="previewLoading"><img src="themes/default/loading.gif" />'+ _pk_translate('Dashboard_LoadingPreview','Loading preview, please wait...') +'</div>').show();
+								.html('<div id="previewLoading"><img src="themes/default/loading.gif" />'+ _pk_translate('Dashboard_LoadingPreview') +'</div>').show();
 						self.dashboard.ajaxLoading(plugin, action);
 					}
 				});
@@ -193,12 +193,12 @@
 			if(contains(widgets, plugin+'.'+action))
 			{
 				$(this).addClass('menuDisabled');
-				$(this).attr('title', _pk_translate('Dashboard_TitleWidgetInDashboard','Widget already in dashboard'));
+				$(this).attr('title', _pk_translate('Dashboard_TitleWidgetInDashboard'));
 			}
 			else
 			{
 				$(this).removeClass('menuDisabled');
-				$(this).attr('title', _pk_translate('Dashboard_TitleClickToAdd','Click to add to dashboard'));
+				$(this).attr('title', _pk_translate('Dashboard_TitleClickToAdd'));
 			}
 		});
 	},
@@ -328,7 +328,7 @@
 		if(typeof onTop == "undefined")
 			onTop = false;
 		
-		var item = '<div class="items"><div class="widget"><div class="widgetLoading">'+ _pk_translate('Dashboard_LoadingWidget','Loading widget, please wait...') +'</div><div plugin="'+plugin+'"'+' id="'+action+'" class="widgetDiv"></div></div></div>';
+		var item = '<div class="items"><div class="widget"><div class="widgetLoading">'+ _pk_translate('Dashboard_LoadingWidget') +'</div><div plugin="'+plugin+'"'+' id="'+action+'" class="widgetDiv"></div></div></div>';
 	
 		if(onTop)
 		{
@@ -375,7 +375,7 @@
 	{
 		var self = this;
 		
-		var title = _pk_translate('Dashboard_WidgetNotFound','Widget not found');
+		var title = _pk_translate('Dashboard_WidgetNotFound');
 		var widgets = piwik.availableWidgets[plugin];
 		for(var i in widgets)
 		{
Index: plugins/Home/templates/datatable.js
===================================================================
--- plugins/Home/templates/datatable.js	(revision 451)
+++ plugins/Home/templates/datatable.js	(working copy)
@@ -268,11 +268,11 @@
 					{
 						if(Number(self.param.filter_excludelowpop) != 0)
 						{
-							string = _pk_translate('Home_IncludeAllPopulation','Include all population');
+							string = _pk_translate('Home_IncludeAllPopulation');
 						}
 						else
 						{
-							string = _pk_translate('Home_ExcludeLowPopulation','Exclude low population');
+							string = _pk_translate('Home_ExcludeLowPopulation');
 						}
 						$(this).html(string);
 					} 
@@ -410,7 +410,7 @@
 					// only show this string if there is some rows in the datatable
 					if(totalRows != 0)
 					{
-						var str = sprintf(_pk_translate('Home_PageOf','%s of %s'),offset + '-' + offsetEndDisp,totalRows);
+						var str = sprintf(_pk_translate('Home_PageOf'),offset + '-' + offsetEndDisp,totalRows);
 						$(this).text(str);
 					}
 				}
@@ -618,7 +618,7 @@
 					<tr>\
 						<td colspan="'+numberOfColumns+'" class="cellSubDataTable">\
 							<div id="'+divIdToReplaceWithSubTable+'">\
-								<span id="loadingDataTable" style="display:inline"><img src="themes/default/images/loading-blue.gif" />'+ _pk_translate('Home_Loading','Loading...') +'</span>\
+								<span id="loadingDataTable" style="display:inline"><img src="themes/default/images/loading-blue.gif" />'+ _pk_translate('Home_Loading') +'</span>\
 							</div>\
 						</td>\
 					</tr>\
Index: plugins/UsersManager/templates/UsersManager.js
===================================================================
--- plugins/UsersManager/templates/UsersManager.js	(revision 451)
+++ plugins/UsersManager/templates/UsersManager.js	(working copy)
@@ -222,7 +222,7 @@
 			ajaxHideError();
 			var idRow = $(this).attr('id');
 			var loginToDelete = $(this).parent().parent().find('#userLogin').html();
-			if( confirm(sprintf(_pk_translate('UsersManager_DeleteConfirm','Are you sure you want to delete the user %s'),'"'+loginToDelete+'"')) )
+			if( confirm(sprintf(_pk_translate('UsersManager_DeleteConfirm'),'"'+loginToDelete+'"')) )
 			{
 				$.ajax( getDeleteUserAJAX( loginToDelete ) );
 			}
Index: plugins/VisitsSummary/sparklines.tpl
===================================================================
--- plugins/VisitsSummary/sparklines.tpl	(revision 451)
+++ plugins/VisitsSummary/sparklines.tpl	(working copy)
@@ -1,8 +1,8 @@
 <div id="to remove this div" class="parentDiv">
-<img class="sparkline" src="{$urlSparklineNbVisits}" /> <span>{'VisitsSummary_NbVisits'|translate:"<strong>$nbVisits</strong>"}</span></p>
-<img class="sparkline" src="{$urlSparklineNbUniqVisitors}" /> <span>{'VisitsSummary_NbUniqueVisitors'|translate:"<strong>$nbUniqVisitors</strong>"}</span></p>
-<img class="sparkline" src="{$urlSparklineNbActions}" /> <span>{'VisitsSummary_NbActions'|translate:"<strong>$nbActions</strong>"}</span></p>
-<img class="sparkline" src="{$urlSparklineSumVisitLength}" /> <span>{assign var=sumtimeVisitLength value=$sumVisitLength|sumtime} {'VisitsSummary_TotalTime'|translate:"<strong>$sumtimeVisitLength</strong>"}</span></p>
-<img class="sparkline" src="{$urlSparklineMaxActions}" /> <span>{'VisitsSummary_MaxNbActions'|translate:"<strong>$maxActions</strong>"}</span></p>
-<img class="sparkline" src="{$urlSparklineBounceCount}" /> <span>{'VisitsSummary_NbBounced'|translate:"<strong>$bounceCount</strong>"}</span></p>
-</div>
\ No newline at end of file
+<p><img class="sparkline" src="{$urlSparklineNbVisits}" /> <span>{'VisitsSummary_NbVisits'|translate:"<strong>$nbVisits</strong>"}</span></p>
+<p><img class="sparkline" src="{$urlSparklineNbUniqVisitors}" /> <span>{'VisitsSummary_NbUniqueVisitors'|translate:"<strong>$nbUniqVisitors</strong>"}</span></p>
+<p><img class="sparkline" src="{$urlSparklineNbActions}" /> <span>{'VisitsSummary_NbActions'|translate:"<strong>$nbActions</strong>"}</span></p>
+<p><img class="sparkline" src="{$urlSparklineSumVisitLength}" /> <span>{assign var=sumtimeVisitLength value=$sumVisitLength|sumtime} {'VisitsSummary_TotalTime'|translate:"<strong>$sumtimeVisitLength</strong>"}</span></p>
+<p><img class="sparkline" src="{$urlSparklineMaxActions}" /> <span>{'VisitsSummary_MaxNbActions'|translate:"<strong>$maxActions</strong>"}</span></p>
+<p><img class="sparkline" src="{$urlSparklineBounceCount}" /> <span>{'VisitsSummary_NbBounced'|translate:"<strong>$bounceCount</strong>"}</span></p>
+</div>
Index: modules/SmartyPlugins/function.loadJavascriptTranslations.php
===================================================================
--- modules/SmartyPlugins/function.loadJavascriptTranslations.php	(revision 451)
+++ modules/SmartyPlugins/function.loadJavascriptTranslations.php	(working copy)
@@ -20,15 +20,16 @@
  *  (it is always loaded with translations):
  *
  *  <script type="text/javascript">
- *     alert(_pk_translate('MY_TRANSLATION_STRING','Default string in English'))
+ *     alert(_pk_translate('MY_TRANSLATION_STRING'))
  *  </script>
  *
  *  Note: Use translation string from your translation file WITHOUT '_js' suffix.
  * 
  * _pk_translate DOES NOT support printf() arguments, but you can call:
  *
- *   sprintf(_pk_translate('_NB_OF_EGGS','There is %s eggs on the table'),'ten')
- *
+ *   sprintf(_pk_translate('_NB_OF_EGGS'),'ten')
+ *   (where _NB_OF_EGGS is defined in translation file as i.e. 'There is %s eggs on the table')
+ * 
  * sprintf() function is by default included when loading translations
  */
 
Index: modules/Translate.php
===================================================================
--- modules/Translate.php	(revision 451)
+++ modules/Translate.php	(working copy)
@@ -108,8 +108,8 @@
 		}
 		
 		$js .= '};';
-		$js .= 'function _pk_translate(tvar, str) { '.
-			'var s = str; if( typeof(translations[tvar]) != \'undefined\' ) s = translations[tvar];'.
+		$js .= 'function _pk_translate(k) { '.
+			'var s = k; if( typeof(translations[k]) != \'undefined\' ) s = translations[k];'.
 			'return s;}';
 		
 		return $js;