Fix #2702 (Trivial Calibre Welcome Wizard wording discrepancy)

src/calibre/gui2/main.py

@@ -318,8 +318,9 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI):
         pm = QMenu()
         ap = self.action_preferences
         pm.addAction(ap.icon(), ap.text())
-        pm.addAction(self.preferences_action)
         pm.addAction(_('Run welcome wizard'))
+        self.connect(pm.actions()[0], SIGNAL('triggered(bool)'),
+                self.do_config)
         self.connect(pm.actions()[1], SIGNAL('triggered(bool)'),
                 self.run_wizard)
         self.action_preferences.setMenu(pm)

src/calibre/gui2/wizard/__init__.py

@@ -482,6 +482,9 @@ class Wizard(QWizard):
         self.device_page = DevicePage()
         self.library_page = LibraryPage()
         self.finish_page = FinishPage()
+        bt = self.buttonText(self.FinishButton)
+        t = unicode(self.finish_page.finish_text.text())
+        self.finish_page.finish_text.setText(t%bt)
         self.kindle_page = KindlePage()
         self.stanza_page = StanzaPage()
         self.setPage(self.library_page.ID, self.library_page)

src/calibre/gui2/wizard/finish.ui

@@ -21,9 +21,9 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="QLabel" name="label">
+    <widget class="QLabel" name="finish_text">
      <property name="text">
-      <string>&lt;h2&gt;Congratulations!&lt;/h2&gt; You have succesfully setup calibre. Press the Finish button to apply your settings.</string>
+      <string>&lt;h2&gt;Congratulations!&lt;/h2&gt; You have successfully setup calibre. Press the %s button to apply your settings.</string>
      </property>
      <property name="wordWrap">
       <bool>true</bool>