openlp-core team mailing list archive

[Jon Tibble <meths@xxxxxxxxxxxxxx>]

Jon Tibble has proposed merging lp:~meths/openlp/trivialfixes into lp:openlp.

    Requested reviews:
    OpenLP Core (openlp-core)


Fix mismerge and typo
-- 
https://code.launchpad.net/~meths/openlp/trivialfixes/+merge/14448
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/core/lib/mediamanageritem.py'
--- openlp/core/lib/mediamanageritem.py	2009-11-04 18:21:08 +0000
+++ openlp/core/lib/mediamanageritem.py	2009-11-04 23:25:18 +0000
@@ -377,7 +377,6 @@
         service_item = self.buildServiceItem()
         if service_item:
             service_item.fromPlugin = True
-            service_item.uuid = unicode(uuid.uuid1())
             self.parent.live_controller.addServiceItem(service_item)
 
     def onAddClick(self):

=== modified file 'openlp/core/ui/generaltab.py'
--- openlp/core/ui/generaltab.py	2009-10-30 22:03:09 +0000
+++ openlp/core/ui/generaltab.py	2009-11-04 23:25:18 +0000
@@ -151,7 +151,7 @@
         self.AutoOpenCheckBox.setText(self.trUtf8(u'Automatically open the last service'))
         self.ShowSplashCheckBox.setText(self.trUtf8(u'Show the splash screen'))
         self.SettingsGroupBox.setTitle(self.trUtf8(u'Application Settings'))
-        self.SaveCheckServiceCheckBox.setText(self.trUtf8(u'Prompt to save Sevice before starting New'))
+        self.SaveCheckServiceCheckBox.setText(self.trUtf8(u'Prompt to save Service before starting New'))
         self.CCLIGroupBox.setTitle(self.trUtf8(u'CCLI Details'))
         self.NumberLabel.setText(self.trUtf8(u'CCLI Number:'))
         self.UsernameLabel.setText(self.trUtf8(u'SongSelect Username:'))