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)


Stray backslashes and more translate()
-- 
https://code.launchpad.net/~meths/openlp/trivialfixes/+merge/28118
Your team OpenLP Core is requested to review the proposed merge of lp:~meths/openlp/trivialfixes into lp:openlp.

=== modified file 'openlp/plugins/bibles/bibleplugin.py'
--- openlp/plugins/bibles/bibleplugin.py	2010-06-21 18:28:36 +0000
+++ openlp/plugins/bibles/bibleplugin.py	2010-06-21 21:17:28 +0000
@@ -82,7 +82,7 @@
         self.ExportBibleItem.setObjectName(u'ExportBibleItem')
         export_menu.addAction(self.ExportBibleItem)
         self.ExportBibleItem.setText(translate(
-            u'BiblePlugin', u'&Bible'))
+            'BiblePlugin', '&Bible'))
         self.ExportBibleItem.setVisible(False)
 
     def onBibleImportClick(self):

=== modified file 'openlp/plugins/songs/lib/songimport.py'
--- openlp/plugins/songs/lib/songimport.py	2010-06-20 13:03:06 +0000
+++ openlp/plugins/songs/lib/songimport.py	2010-06-21 21:17:28 +0000
@@ -63,9 +63,9 @@
         self.verses = []
         self.versecount = 0
         self.choruscount = 0
-        self.copyright_string = unicode(QtGui.QApplication.translate( \
+        self.copyright_string = unicode(QtGui.QApplication.translate(
             u'SongsPlugin.SongImport', u'copyright'))
-        self.copyright_symbol = unicode(QtGui.QApplication.translate( \
+        self.copyright_symbol = unicode(QtGui.QApplication.translate(
             u'SongsPlugin.SongImport', u'\xa9'))
 
     @staticmethod

=== modified file 'openlp/plugins/songs/songsplugin.py'
--- openlp/plugins/songs/songsplugin.py	2010-06-21 18:28:36 +0000
+++ openlp/plugins/songs/songsplugin.py	2010-06-21 21:17:28 +0000
@@ -91,10 +91,9 @@
         self.SongImportItem = QtGui.QAction(import_menu)
         self.SongImportItem.setObjectName(u'SongImportItem')
         self.SongImportItem.setText(translate(
-            u'SongsPlugin', u'&Song'))
-        self.SongImportItem.setToolTip(
-            translate('SongsPlugin',
-                'Import songs using the import wizard.'))
+            'SongsPlugin', '&Song'))
+        self.SongImportItem.setToolTip(translate('SongsPlugin',
+            'Import songs using the import wizard.'))
         import_menu.addAction(self.SongImportItem)
         # Songs of Fellowship import menu item - will be removed and the
         # functionality will be contained within the import wizard

=== modified file 'openlp/plugins/songusage/songusageplugin.py'
--- openlp/plugins/songusage/songusageplugin.py	2010-06-21 18:28:36 +0000
+++ openlp/plugins/songusage/songusageplugin.py	2010-06-21 21:17:28 +0000
@@ -60,24 +60,20 @@
         self.SongUsageMenu = QtGui.QMenu(tools_menu)
         self.SongUsageMenu.setObjectName(u'SongUsageMenu')
         self.SongUsageMenu.setTitle(translate(
-            u'SongUsagePlugin', u'&Song Usage'))
+            'SongUsagePlugin', '&Song Usage'))
         #SongUsage Delete
         self.SongUsageDelete = QtGui.QAction(tools_menu)
-        self.SongUsageDelete.setText(
-            translate('SongUsagePlugin',
-                '&Delete recorded data'))
-        self.SongUsageDelete.setStatusTip(
-            translate('SongUsagePlugin',
-                'Delete song usage to specified date'))
+        self.SongUsageDelete.setText(translate('SongUsagePlugin',
+            '&Delete recorded data'))
+        self.SongUsageDelete.setStatusTip(translate('SongUsagePlugin',
+            'Delete song usage to specified date'))
         self.SongUsageDelete.setObjectName(u'SongUsageDelete')
         #SongUsage Report
         self.SongUsageReport = QtGui.QAction(tools_menu)
         self.SongUsageReport.setText(
-            translate('SongUsagePlugin',
-                '&Extract recorded data'))
+            translate('SongUsagePlugin', '&Extract recorded data'))
         self.SongUsageReport.setStatusTip(
-            translate('SongUsagePlugin',
-                'Generate report on Song Usage'))
+            translate('SongUsagePlugin', 'Generate report on Song Usage'))
         self.SongUsageReport.setObjectName(u'SongUsageReport')
         #SongUsage activation
         SongUsageIcon = build_icon(u':/tools/tools_alert.png')
@@ -87,8 +83,7 @@
         self.SongUsageStatus.setChecked(False)
         self.SongUsageStatus.setText(translate(
             'SongUsagePlugin', 'Song Usage Status'))
-        self.SongUsageStatus.setStatusTip(
-            translate('SongUsagePlugin',
+        self.SongUsageStatus.setStatusTip(translate('SongUsagePlugin',
                 'Start/Stop live song usage recording'))
         self.SongUsageStatus.setShortcut(u'F4')
         self.SongUsageStatus.setObjectName(u'SongUsageStatus')