Head

openlp/plugins/songs/forms/opensongexportdialog.py

@@ -24,18 +24,19 @@
 ###############################################################################
 
 from PyQt4 import QtCore, QtGui
+from openlp.core.lib import translate
 
 class Ui_OpenSongExportDialog(object):
-    def setupUi(self, OpenSongExportDialog):
+    def setupUi(self, OpenSongExportForm):
-        OpenSongExportDialog.setObjectName(u'OpenSongExportDialog')
+        OpenSongExportForm.setObjectName(u'OpenSongExportDialog')
-        OpenSongExportDialog.resize(473, 459)
+        OpenSongExportForm.resize(473, 459)
         icon = QtGui.QIcon()
         icon.addPixmap(QtGui.QPixmap(u':/icon/openlp.org-icon-32.bmp'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        OpenSongExportDialog.setWindowIcon(icon)
+        OpenSongExportForm.setWindowIcon(icon)
-        self.verticalLayout_5 = QtGui.QVBoxLayout(OpenSongExportDialog)
+        self.verticalLayout_5 = QtGui.QVBoxLayout(OpenSongExportForm)
         self.verticalLayout_5.setMargin(8)
         self.verticalLayout_5.setObjectName(u'verticalLayout_5')
-        self.ExportFileWidget = QtGui.QWidget(OpenSongExportDialog)
+        self.ExportFileWidget = QtGui.QWidget(OpenSongExportForm)
         sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
@@ -59,7 +60,7 @@ class Ui_OpenSongExportDialog(object):
         self.ExportFileSelectPushButton.setObjectName(u'ExportFileSelectPushButton')
         self.horizontalLayout.addWidget(self.ExportFileSelectPushButton)
         self.verticalLayout_5.addWidget(self.ExportFileWidget)
-        self.SongListFrame = QtGui.QFrame(OpenSongExportDialog)
+        self.SongListFrame = QtGui.QFrame(OpenSongExportForm)
         sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
@@ -242,7 +243,7 @@ class Ui_OpenSongExportDialog(object):
         self.verticalLayout_2.addWidget(self.SelectedRemoveSelectedWidget)
         self.horizontalLayout_6.addWidget(self.SelectedFileListWidget)
         self.verticalLayout_5.addWidget(self.SongListFrame)
-        self.ProgressGroupBox = QtGui.QGroupBox(OpenSongExportDialog)
+        self.ProgressGroupBox = QtGui.QGroupBox(OpenSongExportForm)
         sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
@@ -261,7 +262,7 @@ class Ui_OpenSongExportDialog(object):
         self.ProgressBar.setObjectName(u'ProgressBar')
         self.verticalLayout_4.addWidget(self.ProgressBar)
         self.verticalLayout_5.addWidget(self.ProgressGroupBox)
-        self.ButtonBarWidget = QtGui.QWidget(OpenSongExportDialog)
+        self.ButtonBarWidget = QtGui.QWidget(OpenSongExportForm)
         self.ButtonBarWidget.setObjectName(u'ButtonBarWidget')
         self.horizontalLayout_7 = QtGui.QHBoxLayout(self.ButtonBarWidget)
         self.horizontalLayout_7.setSpacing(8)
@@ -277,29 +278,29 @@ class Ui_OpenSongExportDialog(object):
         self.horizontalLayout_7.addWidget(self.ClosePushButton)
         self.verticalLayout_5.addWidget(self.ButtonBarWidget)
 
-        self.retranslateUi(OpenSongExportDialog)
+        self.retranslateUi(OpenSongExportForm)
-        QtCore.QObject.connect(self.ClosePushButton, QtCore.SIGNAL(u'clicked()'), OpenSongExportDialog.close)
+        QtCore.QObject.connect(self.ClosePushButton, QtCore.SIGNAL(u'clicked()'), OpenSongExportForm.close)
         QtCore.QObject.connect(self.ExportSelectAllPushButton, QtCore.SIGNAL(u'clicked()'), self.ExportListTable.selectAll)
         QtCore.QObject.connect(self.SelectedSelectAllPushButton, QtCore.SIGNAL(u'clicked()'), self.SelectedListTable.selectAll)
         QtCore.QObject.connect(self.SelectedRemoveSelectedButton, QtCore.SIGNAL(u'clicked()'), self.SelectedListTable.clear)
-        QtCore.QMetaObject.connectSlotsByName(OpenSongExportDialog)
+        QtCore.QMetaObject.connectSlotsByName(OpenSongExportForm)
 
-    def retranslateUi(self, OpenSongExportDialog):
+    def retranslateUi(self, OpenSongExportForm):
-        OpenSongExportDialog.setWindowTitle(self.trUtf8('OpenSong Song Exporter'))
+        OpenSongExportForm.setWindowTitle(translate('OpenSong Song Exporter'))
-        self.ExportFileLabel.setText(self.trUtf8('Select OpenSong song folder:'))
+        self.ExportFileLabel.setText(translate('OpenSongExportForm', 'Select OpenSong song folder:'))
-        self.ExportListLabel.setText(self.trUtf8('Full Song List'))
+        self.ExportListLabel.setText(translate('OpenSongExportForm', 'Full Song List'))
-        self.ExportListTable.horizontalHeaderItem(0).setText(self.trUtf8('Song Title'))
+        self.ExportListTable.horizontalHeaderItem(0).setText(translate('OpenSongExportForm', 'Song Title'))
-        self.ExportListTable.horizontalHeaderItem(1).setText(self.trUtf8('Author'))
+        self.ExportListTable.horizontalHeaderItem(1).setText(translate('OpenSongExportForm', 'Author'))
-        self.ExportSelectAllPushButton.setText(self.trUtf8('Select All'))
+        self.ExportSelectAllPushButton.setText(translate('OpenSongExportForm', 'Select All'))
-        self.ExportFilterComboBox.setItemText(0, self.trUtf8('Lyrics'))
+        self.ExportFilterComboBox.setItemText(0, translate('OpenSongExportForm', 'Lyrics'))
-        self.ExportFilterComboBox.setItemText(1, self.trUtf8('Title'))
+        self.ExportFilterComboBox.setItemText(1, translate('OpenSongExportForm', 'Title'))
-        self.ExportFilterComboBox.setItemText(2, self.trUtf8('Author'))
+        self.ExportFilterComboBox.setItemText(2, translate('OpenSongExportForm', 'Author'))
-        self.SelectedListLabel.setText(self.trUtf8('Song Export List'))
+        self.SelectedListLabel.setText(translate('OpenSongExportForm', 'Song Export List'))
-        self.SelectedListTable.horizontalHeaderItem(0).setText(self.trUtf8('Song Title'))
+        self.SelectedListTable.horizontalHeaderItem(0).setText(translate('OpenSongExportForm', 'Song Title'))
-        self.SelectedListTable.horizontalHeaderItem(1).setText(self.trUtf8('Author'))
+        self.SelectedListTable.horizontalHeaderItem(1).setText(translate('OpenSongExportForm', 'Author'))
-        self.SelectedSelectAllPushButton.setText(self.trUtf8('Select All'))
+        self.SelectedSelectAllPushButton.setText(translate('OpenSongExportForm', 'Select All'))
-        self.SelectedRemoveSelectedButton.setText(self.trUtf8('Remove Selected'))
+        self.SelectedRemoveSelectedButton.setText(translate('OpenSongExportForm', 'Remove Selected'))
-        self.ProgressGroupBox.setTitle(self.trUtf8('Progress:'))
+        self.ProgressGroupBox.setTitle(translate('OpenSongExportForm', 'Progress:'))
-        self.ProgressLabel.setText(self.trUtf8('Ready to export'))
+        self.ProgressLabel.setText(translate('OpenSongExportForm', 'Ready to export'))
-        self.ExportPushButton.setText(self.trUtf8('Export'))
+        self.ExportPushButton.setText(translate('OpenSongExportForm', 'Export'))
-        self.ClosePushButton.setText(self.trUtf8('Close'))
+        self.ClosePushButton.setText(translate('OpenSongExportForm', 'Close'))

openlp/plugins/songs/forms/opensongimportdialog.py

@@ -24,19 +24,20 @@
 ###############################################################################
 
 from PyQt4 import QtCore, QtGui
+from openlp.core.lib import translate
 
 class Ui_OpenSongImportDialog(object):
-    def setupUi(self, OpenSongImportDialog):
+    def setupUi(self, OpenSongImportForm):
-        OpenSongImportDialog.setObjectName(u'OpenSongImportDialog')
+        OpenSongImportForm.setObjectName(u'OpenSongImportDialog')
-        OpenSongImportDialog.resize(481, 172)
+        OpenSongImportForm.resize(481, 172)
         icon = QtGui.QIcon()
         icon.addPixmap(QtGui.QPixmap(u':/icon/openlp.org-icon-32.bmp'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        OpenSongImportDialog.setWindowIcon(icon)
+        OpenSongImportForm.setWindowIcon(icon)
-        self.verticalLayout = QtGui.QVBoxLayout(OpenSongImportDialog)
+        self.verticalLayout = QtGui.QVBoxLayout(OpenSongImportForm)
         self.verticalLayout.setSpacing(6)
         self.verticalLayout.setMargin(8)
         self.verticalLayout.setObjectName(u'verticalLayout')
-        self.ImportFileWidget = QtGui.QWidget(OpenSongImportDialog)
+        self.ImportFileWidget = QtGui.QWidget(OpenSongImportForm)
         sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
@@ -60,7 +61,7 @@ class Ui_OpenSongImportDialog(object):
         self.ImportFileSelectPushButton.setObjectName(u'ImportFileSelectPushButton')
         self.horizontalLayout.addWidget(self.ImportFileSelectPushButton)
         self.verticalLayout.addWidget(self.ImportFileWidget)
-        self.ProgressGroupBox = QtGui.QGroupBox(OpenSongImportDialog)
+        self.ProgressGroupBox = QtGui.QGroupBox(OpenSongImportForm)
         sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
@@ -79,7 +80,7 @@ class Ui_OpenSongImportDialog(object):
         self.ProgressBar.setObjectName(u'ProgressBar')
         self.verticalLayout_4.addWidget(self.ProgressBar)
         self.verticalLayout.addWidget(self.ProgressGroupBox)
-        self.ButtonBarWidget = QtGui.QWidget(OpenSongImportDialog)
+        self.ButtonBarWidget = QtGui.QWidget(OpenSongImportForm)
         self.ButtonBarWidget.setObjectName(u'ButtonBarWidget')
         self.horizontalLayout_7 = QtGui.QHBoxLayout(self.ButtonBarWidget)
         self.horizontalLayout_7.setSpacing(8)
@@ -95,14 +96,14 @@ class Ui_OpenSongImportDialog(object):
         self.horizontalLayout_7.addWidget(self.ClosePushButton)
         self.verticalLayout.addWidget(self.ButtonBarWidget)
 
-        self.retranslateUi(OpenSongImportDialog)
+        self.retranslateUi(OpenSongImportForm)
-        QtCore.QObject.connect(self.ClosePushButton, QtCore.SIGNAL(u'clicked()'), OpenSongImportDialog.close)
+        QtCore.QObject.connect(self.ClosePushButton, QtCore.SIGNAL(u'clicked()'), OpenSongImportForm.close)
-        QtCore.QMetaObject.connectSlotsByName(OpenSongImportDialog)
+        QtCore.QMetaObject.connectSlotsByName(OpenSongImportForm)
 
-    def retranslateUi(self, OpenSongImportDialog):
+    def retranslateUi(self, OpenSongImportForm):
-        OpenSongImportDialog.setWindowTitle(self.trUtf8('OpenSong Song Importer'))
+        OpenSongImportForm.setWindowTitle(translate('OpenSongImportForm', 'OpenSong Song Importer'))
-        self.ImportFileLabel.setText(self.trUtf8('OpenSong Folder:'))
+        self.ImportFileLabel.setText(translate('OpenSongImportForm', 'OpenSong Folder:'))
-        self.ProgressGroupBox.setTitle(self.trUtf8('Progress:'))
+        self.ProgressGroupBox.setTitle(translate('OpenSongImportForm', 'Progress:'))
-        self.ProgressLabel.setText(self.trUtf8('Ready to import'))
+        self.ProgressLabel.setText(translate('OpenSongImportForm', 'Ready to import'))
-        self.ImportPushButton.setText(self.trUtf8('Import'))
+        self.ImportPushButton.setText(translate('OpenSongImportForm', 'Import'))
-        self.ClosePushButton.setText(self.trUtf8('Close'))
+        self.ClosePushButton.setText(translate('OpenSongImportForm', 'Close'))

openlp/plugins/songs/forms/songbookdialog.py

@@ -24,32 +24,33 @@
 ###############################################################################
 
 from PyQt4 import QtCore, QtGui
+from openlp.core.lib import translate
 
 class Ui_SongBookDialog(object):
-    def setupUi(self, SongBookDialog):
+    def setupUi(self, SongBookForm):
-        SongBookDialog.setObjectName(u'SongBookDialog')
+        SongBookForm.setObjectName(u'SongBookDialog')
-        SongBookDialog.resize(367, 120)
+        SongBookForm.resize(367, 120)
-        self.SongBookLayout = QtGui.QFormLayout(SongBookDialog)
+        self.SongBookLayout = QtGui.QFormLayout(SongBookForm)
         self.SongBookLayout.setMargin(8)
         self.SongBookLayout.setSpacing(8)
         self.SongBookLayout.setObjectName(u'SongBookLayout')
-        self.NameLabel = QtGui.QLabel(SongBookDialog)
+        self.NameLabel = QtGui.QLabel(SongBookForm)
         self.NameLabel.setObjectName(u'NameLabel')
         self.SongBookLayout.setWidget(0,
             QtGui.QFormLayout.LabelRole, self.NameLabel)
-        self.NameEdit = QtGui.QLineEdit(SongBookDialog)
+        self.NameEdit = QtGui.QLineEdit(SongBookForm)
         self.NameEdit.setObjectName(u'NameEdit')
         self.SongBookLayout.setWidget(0,
             QtGui.QFormLayout.FieldRole, self.NameEdit)
-        self.PublisherLabel = QtGui.QLabel(SongBookDialog)
+        self.PublisherLabel = QtGui.QLabel(SongBookForm)
         self.PublisherLabel.setObjectName(u'PublisherLabel')
         self.SongBookLayout.setWidget(1,
             QtGui.QFormLayout.LabelRole, self.PublisherLabel)
-        self.PublisherEdit = QtGui.QLineEdit(SongBookDialog)
+        self.PublisherEdit = QtGui.QLineEdit(SongBookForm)
         self.PublisherEdit.setObjectName(u'PublisherEdit')
         self.SongBookLayout.setWidget(1,
             QtGui.QFormLayout.FieldRole, self.PublisherEdit)
-        self.ButtonBox = QtGui.QDialogButtonBox(SongBookDialog)
+        self.ButtonBox = QtGui.QDialogButtonBox(SongBookForm)
         self.ButtonBox.setOrientation(QtCore.Qt.Horizontal)
         self.ButtonBox.setStandardButtons(
             QtGui.QDialogButtonBox.Save | QtGui.QDialogButtonBox.Cancel)
@@ -57,14 +58,14 @@ class Ui_SongBookDialog(object):
         self.SongBookLayout.setWidget(2,
             QtGui.QFormLayout.FieldRole, self.ButtonBox)
 
-        self.retranslateUi(SongBookDialog)
+        self.retranslateUi(SongBookForm)
         QtCore.QObject.connect(self.ButtonBox,
-            QtCore.SIGNAL(u'accepted()'), SongBookDialog.accept)
+            QtCore.SIGNAL(u'accepted()'), SongBookForm.accept)
         QtCore.QObject.connect(self.ButtonBox,
-            QtCore.SIGNAL(u'rejected()'), SongBookDialog.reject)
+            QtCore.SIGNAL(u'rejected()'), SongBookForm.reject)
-        QtCore.QMetaObject.connectSlotsByName(SongBookDialog)
+        QtCore.QMetaObject.connectSlotsByName(SongBookForm)
 
-    def retranslateUi(self, SongBookDialog):
+    def retranslateUi(self, SongBookForm):
-        SongBookDialog.setWindowTitle(self.trUtf8('Edit Book'))
+        SongBookForm.setWindowTitle(translate('SongBookForm', 'Edit Book'))
-        self.NameLabel.setText(self.trUtf8('Name:'))
+        self.NameLabel.setText(translate('SongBookForm', 'Name:'))
-        self.PublisherLabel.setText(self.trUtf8('Publisher:'))
+        self.PublisherLabel.setText(translate('SongBookForm', 'Publisher:'))

openlp/plugins/songs/forms/songmaintenancedialog.py

@@ -25,18 +25,18 @@
 
 from PyQt4 import QtCore, QtGui
 
-from openlp.core.lib import build_icon
+from openlp.core.lib import build_icon,  translate
 
 class Ui_SongMaintenanceDialog(object):
-    def setupUi(self, SongMaintenanceDialog):
+    def setupUi(self, SongMaintenanceForm):
-        SongMaintenanceDialog.setObjectName(u'SongMaintenanceDialog')
+        SongMaintenanceForm.setObjectName(u'SongMaintenanceDialog')
-        SongMaintenanceDialog.setWindowModality(QtCore.Qt.ApplicationModal)
+        SongMaintenanceForm.setWindowModality(QtCore.Qt.ApplicationModal)
-        SongMaintenanceDialog.resize(486, 361)
+        SongMaintenanceForm.resize(486, 361)
-        self.DialogLayout = QtGui.QVBoxLayout(SongMaintenanceDialog)
+        self.DialogLayout = QtGui.QVBoxLayout(SongMaintenanceForm)
         self.DialogLayout.setSpacing(8)
         self.DialogLayout.setMargin(8)
         self.DialogLayout.setObjectName(u'DialogLayout')
-        self.ContentWidget = QtGui.QWidget(SongMaintenanceDialog)
+        self.ContentWidget = QtGui.QWidget(SongMaintenanceForm)
         self.ContentWidget.setObjectName(u'ContentWidget')
         self.ContentLayout = QtGui.QHBoxLayout(self.ContentWidget)
         self.ContentLayout.setSpacing(8)
@@ -192,32 +192,32 @@ class Ui_SongMaintenanceDialog(object):
         self.TypeStackedWidget.addWidget(self.BooksPage)
         self.ContentLayout.addWidget(self.TypeStackedWidget)
         self.DialogLayout.addWidget(self.ContentWidget)
-        self.MaintenanceButtonBox = QtGui.QDialogButtonBox(SongMaintenanceDialog)
+        self.MaintenanceButtonBox = QtGui.QDialogButtonBox(SongMaintenanceForm)
         self.MaintenanceButtonBox.setOrientation(QtCore.Qt.Horizontal)
         self.MaintenanceButtonBox.setStandardButtons(QtGui.QDialogButtonBox.Close)
         self.MaintenanceButtonBox.setObjectName(u'MaintenanceButtonBox')
         self.DialogLayout.addWidget(self.MaintenanceButtonBox)
 
-        self.retranslateUi(SongMaintenanceDialog)
+        self.retranslateUi(SongMaintenanceForm)
         self.TypeStackedWidget.setCurrentIndex(0)
         QtCore.QObject.connect(self.MaintenanceButtonBox,
-            QtCore.SIGNAL(u'rejected()'), SongMaintenanceDialog.accept)
+            QtCore.SIGNAL(u'rejected()'), SongMaintenanceForm.accept)
         QtCore.QObject.connect(self.TypeListWidget,
             QtCore.SIGNAL(u'currentRowChanged(int)'),
             self.TypeStackedWidget.setCurrentIndex)
-        QtCore.QMetaObject.connectSlotsByName(SongMaintenanceDialog)
+        QtCore.QMetaObject.connectSlotsByName(SongMaintenanceForm)
 
-    def retranslateUi(self, SongMaintenanceDialog):
+    def retranslateUi(self, SongMaintenanceForm):
-        SongMaintenanceDialog.setWindowTitle(self.trUtf8('Song Maintenance'))
+        SongMaintenanceForm.setWindowTitle(translate('SongMaintenanceForm', 'Song Maintenance'))
-        self.TypeListWidget.item(0).setText(self.trUtf8('Authors'))
+        self.TypeListWidget.item(0).setText(translate('SongMaintenanceForm', 'Authors'))
-        self.TypeListWidget.item(1).setText(self.trUtf8('Topics'))
+        self.TypeListWidget.item(1).setText(translate('SongMaintenanceForm', 'Topics'))
-        self.TypeListWidget.item(2).setText(self.trUtf8('Books/Hymnals'))
+        self.TypeListWidget.item(2).setText(translate('SongMaintenanceForm', 'Books/Hymnals'))
-        self.AuthorAddButton.setText(self.trUtf8('Add'))
+        self.AuthorAddButton.setText(translate('SongMaintenanceForm', 'Add'))
-        self.AuthorEditButton.setText(self.trUtf8('Edit'))
+        self.AuthorEditButton.setText(translate('SongMaintenanceForm', 'Edit'))
-        self.AuthorDeleteButton.setText(self.trUtf8('Delete'))
+        self.AuthorDeleteButton.setText(translate('SongMaintenanceForm', 'Delete'))
-        self.TopicAddButton.setText(self.trUtf8('Add'))
+        self.TopicAddButton.setText(translate('SongMaintenanceForm', 'Add'))
-        self.TopicEditButton.setText(self.trUtf8('Edit'))
+        self.TopicEditButton.setText(translate('SongMaintenanceForm', 'Edit'))
-        self.TopicDeleteButton.setText(self.trUtf8('Delete'))
+        self.TopicDeleteButton.setText(translate('SongMaintenanceForm', 'Delete'))
-        self.BookAddButton.setText(self.trUtf8('Add'))
+        self.BookAddButton.setText(translate('SongMaintenanceForm', 'Add'))
-        self.BookEditButton.setText(self.trUtf8('Edit'))
+        self.BookEditButton.setText(translate('SongMaintenanceForm', 'Edit'))
-        self.BookDeleteButton.setText(self.trUtf8('Delete'))
+        self.BookDeleteButton.setText(translate('SongMaintenanceForm', 'Delete'))

openlp/plugins/songs/forms/topicsdialog.py

@@ -24,26 +24,27 @@
 ###############################################################################
 
 from PyQt4 import QtCore, QtGui
+from openlp.core.lib import translate
 
 class Ui_TopicsDialog(object):
-    def setupUi(self, TopicsDialog):
+    def setupUi(self, TopicsForm):
-        TopicsDialog.setObjectName(u'TopicsDialog')
+        TopicsForm.setObjectName(u'TopicsDialog')
-        TopicsDialog.resize(365, 77)
+        TopicsForm.resize(365, 77)
-        self.TopicLayout = QtGui.QFormLayout(TopicsDialog)
+        self.TopicLayout = QtGui.QFormLayout(TopicsForm)
         self.TopicLayout.setFieldGrowthPolicy(
             QtGui.QFormLayout.ExpandingFieldsGrow)
         self.TopicLayout.setMargin(8)
         self.TopicLayout.setSpacing(8)
         self.TopicLayout.setObjectName(u'TopicLayout')
-        self.NameLabel = QtGui.QLabel(TopicsDialog)
+        self.NameLabel = QtGui.QLabel(TopicsForm)
         self.NameLabel.setObjectName(u'NameLabel')
         self.TopicLayout.setWidget(0,
             QtGui.QFormLayout.LabelRole, self.NameLabel)
-        self.NameEdit = QtGui.QLineEdit(TopicsDialog)
+        self.NameEdit = QtGui.QLineEdit(TopicsForm)
         self.NameEdit.setObjectName(u'NameEdit')
         self.TopicLayout.setWidget(0,
             QtGui.QFormLayout.FieldRole, self.NameEdit)
-        self.TopicButtonBox = QtGui.QDialogButtonBox(TopicsDialog)
+        self.TopicButtonBox = QtGui.QDialogButtonBox(TopicsForm)
         self.TopicButtonBox.setOrientation(QtCore.Qt.Horizontal)
         self.TopicButtonBox.setStandardButtons(
             QtGui.QDialogButtonBox.Save | QtGui.QDialogButtonBox.Cancel)
@@ -51,13 +52,13 @@ class Ui_TopicsDialog(object):
         self.TopicLayout.setWidget(1,
             QtGui.QFormLayout.FieldRole, self.TopicButtonBox)
 
-        self.retranslateUi(TopicsDialog)
+        self.retranslateUi(TopicsForm)
         QtCore.QObject.connect(self.TopicButtonBox,
-            QtCore.SIGNAL(u'accepted()'), TopicsDialog.accept)
+            QtCore.SIGNAL(u'accepted()'), TopicsForm.accept)
         QtCore.QObject.connect(self.TopicButtonBox,
-            QtCore.SIGNAL(u'rejected()'), TopicsDialog.reject)
+            QtCore.SIGNAL(u'rejected()'), TopicsForm.reject)
-        QtCore.QMetaObject.connectSlotsByName(TopicsDialog)
+        QtCore.QMetaObject.connectSlotsByName(TopicsForm)
 
-    def retranslateUi(self, TopicsDialog):
+    def retranslateUi(self, TopicsForm):
-        TopicsDialog.setWindowTitle(self.trUtf8('Topic Maintenance'))
+        TopicsForm.setWindowTitle(translate('TopicsForm', 'Topic Maintenance'))
-        self.NameLabel.setText(self.trUtf8('Topic name:'))
+        self.NameLabel.setText(translate('TopicsForm', 'Topic name:'))

openlp/plugins/songusage/forms/songusagedeletedialog.py

@@ -24,6 +24,7 @@
 ###############################################################################
 
 from PyQt4 import QtCore, QtGui
+from openlp.core.lib import translate
 
 class Ui_SongUsageDeleteDialog(object):
     def setupUi(self, AuditDeleteDialog):
@@ -57,4 +58,4 @@ class Ui_SongUsageDeleteDialog(object):
         QtCore.QMetaObject.connectSlotsByName(AuditDeleteDialog)
 
     def retranslateUi(self, AuditDeleteDialog):
-        AuditDeleteDialog.setWindowTitle(self.trUtf8('Song Usage Delete'))
+        AuditDeleteDialog.setWindowTitle(translate('AuditDeleteDialog', 'Song Usage Delete'))

openlp/plugins/songusage/forms/songusagedetaildialog.py

@@ -24,6 +24,7 @@
 ###############################################################################
 
 from PyQt4 import QtCore, QtGui
+from openlp.core.lib import translate
 
 class Ui_SongUsageDetailDialog(object):
     def setupUi(self, AuditDetailDialog):
@@ -86,7 +87,7 @@ class Ui_SongUsageDetailDialog(object):
         QtCore.QMetaObject.connectSlotsByName(AuditDetailDialog)
 
     def retranslateUi(self, AuditDetailDialog):
-        AuditDetailDialog.setWindowTitle(self.trUtf8('Song Usage Extraction'))
+        AuditDetailDialog.setWindowTitle(translate('AuditDetailDialog', 'Song Usage Extraction'))
-        self.DateRangeGroupBox.setTitle(self.trUtf8('Select Date Range'))
+        self.DateRangeGroupBox.setTitle(translate('AuditDetailDialog', 'Select Date Range'))
-        self.ToLabel.setText(self.trUtf8('to'))
+        self.ToLabel.setText(translate('AuditDetailDialog', 'to'))
-        self.FileGroupBox.setTitle(self.trUtf8('Report Location'))
+        self.FileGroupBox.setTitle(translate('AuditDetailDialog', 'Report Location'))

resources/i18n/openlp_en.ts

@@ -598,6 +598,37 @@ This General Public License does not permit incorporating your program into prop
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>AuditDeleteDialog</name>
+    <message>
+        <location filename="openlp/plugins/songusage/forms/songusagedeletedialog.py" line="61"/>
+        <source>Song Usage Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AuditDetailDialog</name>
+    <message>
+        <location filename="openlp/plugins/songusage/forms/songusagedetaildialog.py" line="90"/>
+        <source>Song Usage Extraction</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songusage/forms/songusagedetaildialog.py" line="91"/>
+        <source>Select Date Range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songusage/forms/songusagedetaildialog.py" line="92"/>
+        <source>to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songusage/forms/songusagedetaildialog.py" line="93"/>
+        <source>Report Location</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>AuthorsForm</name>
     <message>
@@ -2345,6 +2376,107 @@ You can download the latest version from http://openlp.org</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>OpenSongExportForm</name>
+    <message>
+        <location filename="openlp/plugins/songs/forms/opensongexportdialog.py" line="290"/>
+        <source>Select OpenSong song folder:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songs/forms/opensongexportdialog.py" line="291"/>
+        <source>Full Song List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songs/forms/opensongexportdialog.py" line="299"/>
+        <source>Song Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songs/forms/opensongexportdialog.py" line="300"/>
+        <source>Author</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songs/forms/opensongexportdialog.py" line="301"/>
+        <source>Select All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songs/forms/opensongexportdialog.py" line="295"/>
+        <source>Lyrics</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songs/forms/opensongexportdialog.py" line="296"/>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songs/forms/opensongexportdialog.py" line="298"/>
+        <source>Song Export List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songs/forms/opensongexportdialog.py" line="302"/>
+        <source>Remove Selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songs/forms/opensongexportdialog.py" line="303"/>
+        <source>Progress:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songs/forms/opensongexportdialog.py" line="304"/>
+        <source>Ready to export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songs/forms/opensongexportdialog.py" line="305"/>
+        <source>Export</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songs/forms/opensongexportdialog.py" line="306"/>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OpenSongImportForm</name>
+    <message>
+        <location filename="openlp/plugins/songs/forms/opensongimportdialog.py" line="104"/>
+        <source>OpenSong Song Importer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songs/forms/opensongimportdialog.py" line="105"/>
+        <source>OpenSong Folder:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songs/forms/opensongimportdialog.py" line="106"/>
+        <source>Progress:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songs/forms/opensongimportdialog.py" line="107"/>
+        <source>Ready to import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songs/forms/opensongimportdialog.py" line="108"/>
+        <source>Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songs/forms/opensongimportdialog.py" line="109"/>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>PluginForm</name>
     <message>
@@ -2750,6 +2882,21 @@ You can download the latest version from http://openlp.org</source>
         <source>You need to type in a book name!</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="openlp/plugins/songs/forms/songbookdialog.py" line="69"/>
+        <source>Edit Book</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songs/forms/songbookdialog.py" line="70"/>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songs/forms/songbookdialog.py" line="71"/>
+        <source>Publisher:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SongMaintenanceForm</name>
@@ -2848,6 +2995,41 @@ You can download the latest version from http://openlp.org</source>
         <source>Are you sure you want to delete the selected topic?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="openlp/plugins/songs/forms/songmaintenancedialog.py" line="211"/>
+        <source>Song Maintenance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songs/forms/songmaintenancedialog.py" line="212"/>
+        <source>Authors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songs/forms/songmaintenancedialog.py" line="213"/>
+        <source>Topics</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songs/forms/songmaintenancedialog.py" line="214"/>
+        <source>Books/Hymnals</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songs/forms/songmaintenancedialog.py" line="221"/>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songs/forms/songmaintenancedialog.py" line="222"/>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songs/forms/songmaintenancedialog.py" line="223"/>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SongMediaItem</name>
@@ -3180,210 +3362,14 @@ You can download the latest version from http://openlp.org</source>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>Ui_OpenSongExportDialog</name>
-    <message>
-        <location filename="openlp/plugins/songs/forms/opensongexportdialog.py" line="305"/>
-        <source>Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/songs/forms/opensongexportdialog.py" line="294"/>
-        <source>Lyrics</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/songs/forms/opensongexportdialog.py" line="298"/>
-        <source>Song Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/songs/forms/opensongexportdialog.py" line="300"/>
-        <source>Select All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/songs/forms/opensongexportdialog.py" line="297"/>
-        <source>Song Export List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/songs/forms/opensongexportdialog.py" line="299"/>
-        <source>Author</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/songs/forms/opensongexportdialog.py" line="295"/>
-        <source>Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/songs/forms/opensongexportdialog.py" line="288"/>
-        <source>OpenSong Song Exporter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/songs/forms/opensongexportdialog.py" line="301"/>
-        <source>Remove Selected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/songs/forms/opensongexportdialog.py" line="302"/>
-        <source>Progress:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/songs/forms/opensongexportdialog.py" line="289"/>
-        <source>Select OpenSong song folder:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/songs/forms/opensongexportdialog.py" line="303"/>
-        <source>Ready to export</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/songs/forms/opensongexportdialog.py" line="304"/>
-        <source>Export</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/songs/forms/opensongexportdialog.py" line="290"/>
-        <source>Full Song List</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Ui_OpenSongImportDialog</name>
-    <message>
-        <location filename="openlp/plugins/songs/forms/opensongimportdialog.py" line="104"/>
-        <source>OpenSong Folder:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/songs/forms/opensongimportdialog.py" line="107"/>
-        <source>Import</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/songs/forms/opensongimportdialog.py" line="108"/>
-        <source>Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/songs/forms/opensongimportdialog.py" line="105"/>
-        <source>Progress:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/songs/forms/opensongimportdialog.py" line="103"/>
-        <source>OpenSong Song Importer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/songs/forms/opensongimportdialog.py" line="106"/>
-        <source>Ready to import</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Ui_SongBookDialog</name>
-    <message>
-        <location filename="openlp/plugins/songs/forms/songbookdialog.py" line="69"/>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/songs/forms/songbookdialog.py" line="68"/>
-        <source>Edit Book</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/songs/forms/songbookdialog.py" line="70"/>
-        <source>Publisher:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Ui_SongMaintenanceDialog</name>
-    <message>
-        <location filename="openlp/plugins/songs/forms/songmaintenancedialog.py" line="222"/>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/songs/forms/songmaintenancedialog.py" line="213"/>
-        <source>Topics</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/songs/forms/songmaintenancedialog.py" line="221"/>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/songs/forms/songmaintenancedialog.py" line="212"/>
-        <source>Authors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/songs/forms/songmaintenancedialog.py" line="223"/>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/songs/forms/songmaintenancedialog.py" line="211"/>
-        <source>Song Maintenance</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/songs/forms/songmaintenancedialog.py" line="214"/>
-        <source>Books/Hymnals</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Ui_SongUsageDeleteDialog</name>
-    <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedeletedialog.py" line="60"/>
-        <source>Song Usage Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Ui_SongUsageDetailDialog</name>
-    <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedetaildialog.py" line="92"/>
-        <source>Report Location</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedetaildialog.py" line="89"/>
-        <source>Song Usage Extraction</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedetaildialog.py" line="90"/>
-        <source>Select Date Range</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedetaildialog.py" line="91"/>
-        <source>to</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Ui_TopicsDialog</name>
     <message>
         <location filename="openlp/plugins/songs/forms/topicsdialog.py" line="63"/>
-        <source>Topic name:</source>
+        <source>Topic Maintenance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/topicsdialog.py" line="62"/>
+        <location filename="openlp/plugins/songs/forms/topicsdialog.py" line="64"/>
-        <source>Topic Maintenance</source>
+        <source>Topic name:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>