Refs #1556

 * Manage PDF reports -> manage email report 
 * Go! -> Next >> 
 * General Setup -> Super User

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

lang/en.php

@@ -522,8 +522,8 @@ $translations = array(
 	'Installation_Timezone' => 'website time zone',
 	'Installation_SetupWebsiteError' => 'There was an error when adding the website',
 	'Installation_SetupWebsiteSetupSuccess' => 'Website %s created with success!',
-	'Installation_GeneralSetup' => 'General Setup',
-	'Installation_GeneralSetupSuccess' => 'General Setup configured with success',
+	'Installation_SuperUser' => 'Super User',
+	'Installation_SuperUserSetupSuccess' => 'Super User created with success!',
 	'Installation_SuperUserLogin' => 'super user login',
 	'Installation_Password' => 'password',
 	'Installation_PasswordRepeat' => 'password (repeat)',
@@ -531,7 +531,6 @@ $translations = array(
 	'Installation_SecurityNewsletter' => 'email me with major Piwik upgrades and security alerts',
 	'Installation_CommunityNewsletter' => 'email me with community updates (new plugins, new features, etc.)',
 	'Installation_PasswordDoNotMatch' => 'password do not match',
-	'Installation_SubmitGo' => 'Go!',
 	'Installation_Requirements' => 'Piwik Requirements',
 	'Installation_Optional' => 'Optional',
 	'Installation_Legend' => 'Legend',
@@ -1197,7 +1196,7 @@ $translations = array(
 	'VisitTime_NHour' => '%sh',
 	'Widgetize_PluginDescription' => 'The plugin makes it very easy to export any Piwik Widget in your Blog, Website or on Igoogle and Netvibes!',
 	'PDFReports_PluginDescription' => 'Create and download your custom PDF reports, and have them emailed daily, weekly or monthly.',
-	'PDFReports_ManagePdfReports' => 'Manage PDF Reports',
+	'PDFReports_ManageEmailReports' => 'Manage Email Reports',
 	'PDFReports_EmailReports' => 'Email Reports',
 	'PDFReports_PDF' => 'PDF',
 	'PDFReports_SendReportNow' => 'Send Report now',

plugins/Installation/Controller.php

@@ -24,7 +24,7 @@ class Piwik_Installation_Controller extends Piwik_Controller
 			'databaseSetup'         => 'Installation_DatabaseSetup',
 			'databaseCheck'         => 'Installation_DatabaseCheck',
 			'tablesCreation'        => 'Installation_Tables',
-			'generalSetup'          => 'Installation_GeneralSetup',
+			'generalSetup'          => 'Installation_SuperUser',
 			'firstWebsiteSetup'     => 'Installation_SetupWebsite',
 			'displayJavascriptCode' => 'Installation_JsTag',
 			'finished'              => 'Installation_Congratulations',

plugins/Installation/FormDatabaseSetup.php

@@ -53,7 +53,7 @@ class Piwik_Installation_FormDatabaseSetup extends Piwik_QuickForm2
 		     ->loadOptions($adapters)
 		     ->addRule('required', Piwik_Translate('General_Required', Piwik_Translate('Installation_DatabaseSetupAdapter')));
 
-		$this->addElement('submit', 'submit', array('value' => Piwik_Translate('Installation_SubmitGo'), 'class' => 'submit'));
+		$this->addElement('submit', 'submit', array('value' => Piwik_Translate('General_Next') .' »', 'class' => 'submit'));
 
 		// default values
 		$this->addDataSource(new HTML_QuickForm2_DataSource_Array(array(

plugins/Installation/FormFirstWebsiteSetup.php

@@ -48,7 +48,7 @@ class Piwik_Installation_FormFirstWebsiteSetup extends Piwik_QuickForm2
 		$tz->addRule('required', Piwik_Translate('General_Required', Piwik_Translate('Installation_Timezone')));
 		$tz->addRule('checkTimezone', Piwik_Translate('General_NotValid', Piwik_Translate('Installation_Timezone')));
 
-		$this->addElement('submit', 'submit', array('value' => Piwik_Translate('Installation_SubmitGo'), 'class' => 'submit'));
+		$this->addElement('submit', 'submit', array('value' => Piwik_Translate('General_Next').' »', 'class' => 'submit'));
 
 		// default values
 		$this->addDataSource(new HTML_QuickForm2_DataSource_Array(array(

plugins/Installation/FormGeneralSetup.php

@@ -53,7 +53,7 @@ class Piwik_Installation_FormGeneralSetup extends Piwik_QuickForm2
 			'content' => '  ' . Piwik_Translate('Installation_CommunityNewsletter'),
 		));
 
-		$this->addElement('submit', 'submit', array('value' => Piwik_Translate('Installation_SubmitGo'), 'class' => 'submit'));
+		$this->addElement('submit', 'submit', array('value' => Piwik_Translate('General_Next').' »', 'class' => 'submit'));
 
 		// default values
 		$this->addDataSource(new HTML_QuickForm2_DataSource_Array(array(

plugins/Installation/templates/firstWebsiteSetup.tpl

@@ -2,7 +2,7 @@
 
 {if isset($displayGeneralSetupSuccess)}
 <span id="toFade" class="success">
-	{'Installation_GeneralSetupSuccess'|translate}
+	{'Installation_SuperUserSetupSuccess'|translate}
 	<img src="themes/default/images/success_medium.png" />
 </span>
 {/if}

plugins/Installation/templates/generalSetup.tpl

-<h2>{'Installation_GeneralSetup'|translate}</h2>
+<h2>{'Installation_SuperUser'|translate}</h2>
 
 {if isset($form_data)}
 	{include file=default/genericForm.tpl}

plugins/PDFReports/templates/index.tpl

@@ -7,7 +7,7 @@
 </div>
 
 <div class="centerLargeDiv">
-	<h2>{'PDFReports_ManagePdfReports'|translate}</h2>
+	<h2>{'PDFReports_ManageEmailReports'|translate}</h2>
 	
 	<div class="entityContainer">
 		{ajaxErrorDiv}