Fixes #3338, tweaked translations and UI labels/text.

git-svn-id: http://dev.piwik.org/svn/trunk@6848 59fd770c-687e-43c8-a1e3-f5a4ff64c105

8 files changed, 20 insertions, 17 deletions

diff --git a/plugins/Actions/Actions.php b/plugins/Actions/Actions.php
index 1bfc8c04bb..f7e8722867 100644
--- a/plugins/Actions/Actions.php
+++ b/plugins/Actions/Actions.php
@@ -406,13 +406,13 @@ class Piwik_Actions extends Piwik_Plugin
 	function addWidgets()
 	{
 		Piwik_AddWidget( 'Actions_Actions', 'Actions_SubmenuPages', 'Actions', 'getPageUrls');
-		Piwik_AddWidget( 'Actions_Actions', 'Actions_SubmenuPageTitles', 'Actions', 'getPageTitles');
+		Piwik_AddWidget( 'Actions_Actions', 'Actions_WidgetPageTitles', 'Actions', 'getPageTitles');
 		Piwik_AddWidget( 'Actions_Actions', 'Actions_SubmenuOutlinks', 'Actions', 'getOutlinks');
 		Piwik_AddWidget( 'Actions_Actions', 'Actions_SubmenuDownloads', 'Actions', 'getDownloads');
-		Piwik_AddWidget( 'Actions_Actions', 'Actions_SubmenuPagesEntry', 'Actions', 'getEntryPageUrls');
-		Piwik_AddWidget( 'Actions_Actions', 'Actions_SubmenuPagesExit', 'Actions', 'getExitPageUrls');
-		Piwik_AddWidget( 'Actions_Actions', 'Actions_EntryPageTitles', 'Actions', 'getEntryPageTitles' );
-		Piwik_AddWidget( 'Actions_Actions', 'Actions_ExitPageTitles', 'Actions', 'getExitPageTitles' );
+		Piwik_AddWidget( 'Actions_Actions', 'Actions_WidgetPagesEntry', 'Actions', 'getEntryPageUrls');
+		Piwik_AddWidget( 'Actions_Actions', 'Actions_WidgetPagesExit', 'Actions', 'getExitPageUrls');
+		Piwik_AddWidget( 'Actions_Actions', 'Actions_WidgetEntryPageTitles', 'Actions', 'getEntryPageTitles' );
+		Piwik_AddWidget( 'Actions_Actions', 'Actions_WidgetExitPageTitles', 'Actions', 'getExitPageTitles' );
 	}
 	
 	function addMenus()
diff --git a/plugins/ExampleFeedburner/ExampleFeedburner.php b/plugins/ExampleFeedburner/ExampleFeedburner.php
index 86881e2b5f..faab347bce 100644
--- a/plugins/ExampleFeedburner/ExampleFeedburner.php
+++ b/plugins/ExampleFeedburner/ExampleFeedburner.php
@@ -53,7 +53,7 @@ class Piwik_ExampleFeedburner extends Piwik_Plugin
 	}
 }
 
-Piwik_AddWidget('Example Widgets', 'Feedburner statistics', 'ExampleFeedburner', 'feedburner');
+Piwik_AddWidget('Example Widgets', 'Feedburner Statistics', 'ExampleFeedburner', 'feedburner');
 
 /**
  *
diff --git a/plugins/ExamplePlugin/lang/en.php b/plugins/ExamplePlugin/lang/en.php
index 57d5be81b3..c9f885e5ea 100644
--- a/plugins/ExamplePlugin/lang/en.php
+++ b/plugins/ExamplePlugin/lang/en.php
@@ -13,7 +13,7 @@
 $translations = array(
 	'ExamplePlugin_PluginDescription' => 'Example Plugin: This plugin shows how to create a very simple plugin, that exports two widgets in the Dashboard.',
 	'ExamplePlugin_exampleWidgets' => 'Example Widgets',
-	'ExamplePlugin_exampleWidget' => 'Example widget',
+	'ExamplePlugin_exampleWidget' => 'Example Widget',
 	'ExamplePlugin_photostreamMatt' => 'Matt\'s Photos',
 	'ExamplePlugin_piwikForumVisits' => 'Piwik Forums visits',
 	'ExamplePlugin_PiwikForumReceivedVisits' => 'On %s, Piwik forums received %s visits.'
diff --git a/plugins/PrivacyManager/templates/privacySettings.tpl b/plugins/PrivacyManager/templates/privacySettings.tpl
index e2bdf2c4a7..9dfec96602 100644
--- a/plugins/PrivacyManager/templates/privacySettings.tpl
+++ b/plugins/PrivacyManager/templates/privacySettings.tpl
@@ -117,18 +117,16 @@ See also our official guide <b><a href='http://piwik.org/privacy/' target='_blan
 			</td>
 		</tr>
 		<tr id='deleteReportsSettingEnabled'>
-			<td width="250">{'PrivacyManager_UseDeleteReports'|translate}<br/>
-			
+			<td width="250">{'PrivacyManager_UseDeleteReports'|translate}
 			</td>
 			<td width="500">
 				<label><input type="radio" name="deleteReportsEnable" value="1" {if $deleteData.config.delete_reports_enable eq '1'}checked="true"{/if}/> {'General_Yes'|translate}</label>
 				<label><input type="radio" name="deleteReportsEnable" value="0" {if $deleteData.config.delete_reports_enable eq '0'}checked="true"{/if} style="margin-left:20px;"/> {'General_No'|translate}
-				<span class="form-description">{'General_Recommended'|translate}</span>
 				</label>
 				
 				<span class="ajaxSuccess">
 					{capture assign=deleteOldLogs}{'PrivacyManager_UseDeleteLog'|translate}{/capture}
-					{'PrivacyManager_DeleteReportsInfo'|translate}
+					{'PrivacyManager_DeleteReportsInfo'|translate:'<em>':'</em>'}
 					<span id='deleteOldReportsMoreInfo'><br/><br/>
 					{'PrivacyManager_DeleteReportsInfo2'|translate:$deleteOldLogs}<br/><br/>
 					{'PrivacyManager_DeleteReportsInfo3'|translate:$deleteOldLogs}</span>
diff --git a/plugins/UserCountry/UserCountry.php b/plugins/UserCountry/UserCountry.php
index e3c02cd67c..3e2352d840 100644
--- a/plugins/UserCountry/UserCountry.php
+++ b/plugins/UserCountry/UserCountry.php
@@ -43,8 +43,13 @@ class Piwik_UserCountry extends Piwik_Plugin
 
 	function addWidgets()
 	{
-		Piwik_AddWidget( 'General_Visitors', 'UserCountry_WidgetContinents', 'UserCountry', 'getContinent');
-		Piwik_AddWidget( 'General_Visitors', 'UserCountry_WidgetCountries', 'UserCountry', 'getCountry');
+		$widgetContinentLabel = Piwik_Translate('UserCountry_WidgetLocation')
+							  . ' ('.Piwik_Translate('UserCountry_Continent').')';
+		$widgetCountryLabel = Piwik_Translate('UserCountry_WidgetLocation')
+							. ' ('.Piwik_Translate('UserCountry_Country').')';
+		
+		Piwik_AddWidget( 'General_Visitors', $widgetContinentLabel, 'UserCountry', 'getContinent');
+		Piwik_AddWidget( 'General_Visitors', $widgetCountryLabel, 'UserCountry', 'getCountry');
 	}
 
 	function addMenu()
diff --git a/plugins/UserCountryMap/UserCountryMap.php b/plugins/UserCountryMap/UserCountryMap.php
index 79448d8ab1..66b7f95d37 100644
--- a/plugins/UserCountryMap/UserCountryMap.php
+++ b/plugins/UserCountryMap/UserCountryMap.php
@@ -29,6 +29,6 @@ class Piwik_UserCountryMap extends Piwik_Plugin
 
 	function postLoad()
 	{
-		Piwik_AddWidget('General_Visitors', Piwik_Translate('UserCountry_WidgetCountries').' ('.Piwik_Translate('UserCountryMap_worldMap').')', 'UserCountryMap', 'worldMap');
+		Piwik_AddWidget('General_Visitors', Piwik_Translate('UserCountry_WidgetLocation').' ('.Piwik_Translate('UserCountryMap_worldMap').')', 'UserCountryMap', 'worldMap');
 	}
 }
diff --git a/plugins/UserSettings/UserSettings.php b/plugins/UserSettings/UserSettings.php
index a357a4d74e..1f811f58f4 100644
--- a/plugins/UserSettings/UserSettings.php
+++ b/plugins/UserSettings/UserSettings.php
@@ -67,7 +67,7 @@ class Piwik_UserSettings extends Piwik_Plugin
 		
 		// browser version
 		array( 	'UserSettings_VisitorSettings',
-				'UserSettings_ColumnBrowserVersion',
+				'UserSettings_WidgetBrowserVersion',
 				'UserSettings',
 				'getBrowserVersion',
 				'UserSettings_ColumnBrowserVersion',
@@ -128,7 +128,7 @@ class Piwik_UserSettings extends Piwik_Plugin
 		
 		// operating system family
 		array(	'UserSettings_VisitorSettings',
-				'UserSettings_OperatingSystemFamily',
+				'UserSettings_WidgetOperatingSystemFamily',
 				'UserSettings',
 				'getOSFamily',
 				'UserSettings_OperatingSystemFamily',
diff --git a/plugins/VisitsSummary/templates/index.tpl b/plugins/VisitsSummary/templates/index.tpl
index e755cde709..b1b149b9bb 100644
--- a/plugins/VisitsSummary/templates/index.tpl
+++ b/plugins/VisitsSummary/templates/index.tpl
@@ -2,7 +2,7 @@
 <a name="evolutionGraph" graphId="VisitsSummarygetEvolutionGraph"></a>
 
 <h2>{if $period=='range'}{'Referers_Evolution'|translate}
-	{else}{'VisitsSummary_EvolutionOverLastPeriods'|translate:$periodsNames.$period.plural}{/if}
+	{else}{'VisitsSummary_EvolutionOverLastPeriods'|translate:'30':$periodsNames.$period.plural}{/if}
 </h2>
 {$graphEvolutionVisitsSummary}