diff --git a/openlp/plugins/songs/forms/opensongexportdialog.py b/openlp/plugins/songs/forms/opensongexportdialog.py
index c40800dfa..571be630b 100644
--- a/openlp/plugins/songs/forms/opensongexportdialog.py
+++ b/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):
- OpenSongExportDialog.setObjectName(u'OpenSongExportDialog')
- OpenSongExportDialog.resize(473, 459)
+ def setupUi(self, OpenSongExportForm):
+ OpenSongExportForm.setObjectName(u'OpenSongExportDialog')
+ 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)
- self.verticalLayout_5 = QtGui.QVBoxLayout(OpenSongExportDialog)
+ OpenSongExportForm.setWindowIcon(icon)
+ 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)
- QtCore.QObject.connect(self.ClosePushButton, QtCore.SIGNAL(u'clicked()'), OpenSongExportDialog.close)
+ self.retranslateUi(OpenSongExportForm)
+ 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):
- OpenSongExportDialog.setWindowTitle(self.trUtf8('OpenSong Song Exporter'))
- self.ExportFileLabel.setText(self.trUtf8('Select OpenSong song folder:'))
- self.ExportListLabel.setText(self.trUtf8('Full Song List'))
- self.ExportListTable.horizontalHeaderItem(0).setText(self.trUtf8('Song Title'))
- self.ExportListTable.horizontalHeaderItem(1).setText(self.trUtf8('Author'))
- self.ExportSelectAllPushButton.setText(self.trUtf8('Select All'))
- self.ExportFilterComboBox.setItemText(0, self.trUtf8('Lyrics'))
- self.ExportFilterComboBox.setItemText(1, self.trUtf8('Title'))
- self.ExportFilterComboBox.setItemText(2, self.trUtf8('Author'))
- self.SelectedListLabel.setText(self.trUtf8('Song Export List'))
- self.SelectedListTable.horizontalHeaderItem(0).setText(self.trUtf8('Song Title'))
- self.SelectedListTable.horizontalHeaderItem(1).setText(self.trUtf8('Author'))
- self.SelectedSelectAllPushButton.setText(self.trUtf8('Select All'))
- self.SelectedRemoveSelectedButton.setText(self.trUtf8('Remove Selected'))
- self.ProgressGroupBox.setTitle(self.trUtf8('Progress:'))
- self.ProgressLabel.setText(self.trUtf8('Ready to export'))
- self.ExportPushButton.setText(self.trUtf8('Export'))
- self.ClosePushButton.setText(self.trUtf8('Close'))
+ def retranslateUi(self, OpenSongExportForm):
+ OpenSongExportForm.setWindowTitle(translate('OpenSong Song Exporter'))
+ self.ExportFileLabel.setText(translate('OpenSongExportForm', 'Select OpenSong song folder:'))
+ self.ExportListLabel.setText(translate('OpenSongExportForm', 'Full Song List'))
+ self.ExportListTable.horizontalHeaderItem(0).setText(translate('OpenSongExportForm', 'Song Title'))
+ self.ExportListTable.horizontalHeaderItem(1).setText(translate('OpenSongExportForm', 'Author'))
+ self.ExportSelectAllPushButton.setText(translate('OpenSongExportForm', 'Select All'))
+ self.ExportFilterComboBox.setItemText(0, translate('OpenSongExportForm', 'Lyrics'))
+ self.ExportFilterComboBox.setItemText(1, translate('OpenSongExportForm', 'Title'))
+ self.ExportFilterComboBox.setItemText(2, translate('OpenSongExportForm', 'Author'))
+ self.SelectedListLabel.setText(translate('OpenSongExportForm', 'Song Export List'))
+ self.SelectedListTable.horizontalHeaderItem(0).setText(translate('OpenSongExportForm', 'Song Title'))
+ self.SelectedListTable.horizontalHeaderItem(1).setText(translate('OpenSongExportForm', 'Author'))
+ self.SelectedSelectAllPushButton.setText(translate('OpenSongExportForm', 'Select All'))
+ self.SelectedRemoveSelectedButton.setText(translate('OpenSongExportForm', 'Remove Selected'))
+ self.ProgressGroupBox.setTitle(translate('OpenSongExportForm', 'Progress:'))
+ self.ProgressLabel.setText(translate('OpenSongExportForm', 'Ready to export'))
+ self.ExportPushButton.setText(translate('OpenSongExportForm', 'Export'))
+ self.ClosePushButton.setText(translate('OpenSongExportForm', 'Close'))
diff --git a/openlp/plugins/songs/forms/opensongimportdialog.py b/openlp/plugins/songs/forms/opensongimportdialog.py
index e0fd23821..df9bce507 100644
--- a/openlp/plugins/songs/forms/opensongimportdialog.py
+++ b/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):
- OpenSongImportDialog.setObjectName(u'OpenSongImportDialog')
- OpenSongImportDialog.resize(481, 172)
+ def setupUi(self, OpenSongImportForm):
+ OpenSongImportForm.setObjectName(u'OpenSongImportDialog')
+ 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)
- self.verticalLayout = QtGui.QVBoxLayout(OpenSongImportDialog)
+ OpenSongImportForm.setWindowIcon(icon)
+ 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)
- QtCore.QObject.connect(self.ClosePushButton, QtCore.SIGNAL(u'clicked()'), OpenSongImportDialog.close)
- QtCore.QMetaObject.connectSlotsByName(OpenSongImportDialog)
+ self.retranslateUi(OpenSongImportForm)
+ QtCore.QObject.connect(self.ClosePushButton, QtCore.SIGNAL(u'clicked()'), OpenSongImportForm.close)
+ QtCore.QMetaObject.connectSlotsByName(OpenSongImportForm)
- def retranslateUi(self, OpenSongImportDialog):
- OpenSongImportDialog.setWindowTitle(self.trUtf8('OpenSong Song Importer'))
- self.ImportFileLabel.setText(self.trUtf8('OpenSong Folder:'))
- self.ProgressGroupBox.setTitle(self.trUtf8('Progress:'))
- self.ProgressLabel.setText(self.trUtf8('Ready to import'))
- self.ImportPushButton.setText(self.trUtf8('Import'))
- self.ClosePushButton.setText(self.trUtf8('Close'))
+ def retranslateUi(self, OpenSongImportForm):
+ OpenSongImportForm.setWindowTitle(translate('OpenSongImportForm', 'OpenSong Song Importer'))
+ self.ImportFileLabel.setText(translate('OpenSongImportForm', 'OpenSong Folder:'))
+ self.ProgressGroupBox.setTitle(translate('OpenSongImportForm', 'Progress:'))
+ self.ProgressLabel.setText(translate('OpenSongImportForm', 'Ready to import'))
+ self.ImportPushButton.setText(translate('OpenSongImportForm', 'Import'))
+ self.ClosePushButton.setText(translate('OpenSongImportForm', 'Close'))
diff --git a/openlp/plugins/songs/forms/songbookdialog.py b/openlp/plugins/songs/forms/songbookdialog.py
index 823e20eba..4276ae9da 100644
--- a/openlp/plugins/songs/forms/songbookdialog.py
+++ b/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):
- SongBookDialog.setObjectName(u'SongBookDialog')
- SongBookDialog.resize(367, 120)
- self.SongBookLayout = QtGui.QFormLayout(SongBookDialog)
+ def setupUi(self, SongBookForm):
+ SongBookForm.setObjectName(u'SongBookDialog')
+ SongBookForm.resize(367, 120)
+ 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.QMetaObject.connectSlotsByName(SongBookDialog)
+ QtCore.SIGNAL(u'rejected()'), SongBookForm.reject)
+ QtCore.QMetaObject.connectSlotsByName(SongBookForm)
- def retranslateUi(self, SongBookDialog):
- SongBookDialog.setWindowTitle(self.trUtf8('Edit Book'))
- self.NameLabel.setText(self.trUtf8('Name:'))
- self.PublisherLabel.setText(self.trUtf8('Publisher:'))
+ def retranslateUi(self, SongBookForm):
+ SongBookForm.setWindowTitle(translate('SongBookForm', 'Edit Book'))
+ self.NameLabel.setText(translate('SongBookForm', 'Name:'))
+ self.PublisherLabel.setText(translate('SongBookForm', 'Publisher:'))
diff --git a/openlp/plugins/songs/forms/songmaintenancedialog.py b/openlp/plugins/songs/forms/songmaintenancedialog.py
index cbd08f34d..ca4b5ec0e 100644
--- a/openlp/plugins/songs/forms/songmaintenancedialog.py
+++ b/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):
- SongMaintenanceDialog.setObjectName(u'SongMaintenanceDialog')
- SongMaintenanceDialog.setWindowModality(QtCore.Qt.ApplicationModal)
- SongMaintenanceDialog.resize(486, 361)
- self.DialogLayout = QtGui.QVBoxLayout(SongMaintenanceDialog)
+ def setupUi(self, SongMaintenanceForm):
+ SongMaintenanceForm.setObjectName(u'SongMaintenanceDialog')
+ SongMaintenanceForm.setWindowModality(QtCore.Qt.ApplicationModal)
+ SongMaintenanceForm.resize(486, 361)
+ 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):
- SongMaintenanceDialog.setWindowTitle(self.trUtf8('Song Maintenance'))
- self.TypeListWidget.item(0).setText(self.trUtf8('Authors'))
- self.TypeListWidget.item(1).setText(self.trUtf8('Topics'))
- self.TypeListWidget.item(2).setText(self.trUtf8('Books/Hymnals'))
- self.AuthorAddButton.setText(self.trUtf8('Add'))
- self.AuthorEditButton.setText(self.trUtf8('Edit'))
- self.AuthorDeleteButton.setText(self.trUtf8('Delete'))
- self.TopicAddButton.setText(self.trUtf8('Add'))
- self.TopicEditButton.setText(self.trUtf8('Edit'))
- self.TopicDeleteButton.setText(self.trUtf8('Delete'))
- self.BookAddButton.setText(self.trUtf8('Add'))
- self.BookEditButton.setText(self.trUtf8('Edit'))
- self.BookDeleteButton.setText(self.trUtf8('Delete'))
+ def retranslateUi(self, SongMaintenanceForm):
+ SongMaintenanceForm.setWindowTitle(translate('SongMaintenanceForm', 'Song Maintenance'))
+ self.TypeListWidget.item(0).setText(translate('SongMaintenanceForm', 'Authors'))
+ self.TypeListWidget.item(1).setText(translate('SongMaintenanceForm', 'Topics'))
+ self.TypeListWidget.item(2).setText(translate('SongMaintenanceForm', 'Books/Hymnals'))
+ self.AuthorAddButton.setText(translate('SongMaintenanceForm', 'Add'))
+ self.AuthorEditButton.setText(translate('SongMaintenanceForm', 'Edit'))
+ self.AuthorDeleteButton.setText(translate('SongMaintenanceForm', 'Delete'))
+ self.TopicAddButton.setText(translate('SongMaintenanceForm', 'Add'))
+ self.TopicEditButton.setText(translate('SongMaintenanceForm', 'Edit'))
+ self.TopicDeleteButton.setText(translate('SongMaintenanceForm', 'Delete'))
+ self.BookAddButton.setText(translate('SongMaintenanceForm', 'Add'))
+ self.BookEditButton.setText(translate('SongMaintenanceForm', 'Edit'))
+ self.BookDeleteButton.setText(translate('SongMaintenanceForm', 'Delete'))
diff --git a/openlp/plugins/songs/forms/topicsdialog.py b/openlp/plugins/songs/forms/topicsdialog.py
index 122af0455..559c24e12 100644
--- a/openlp/plugins/songs/forms/topicsdialog.py
+++ b/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):
- TopicsDialog.setObjectName(u'TopicsDialog')
- TopicsDialog.resize(365, 77)
- self.TopicLayout = QtGui.QFormLayout(TopicsDialog)
+ def setupUi(self, TopicsForm):
+ TopicsForm.setObjectName(u'TopicsDialog')
+ TopicsForm.resize(365, 77)
+ 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.QMetaObject.connectSlotsByName(TopicsDialog)
+ QtCore.SIGNAL(u'rejected()'), TopicsForm.reject)
+ QtCore.QMetaObject.connectSlotsByName(TopicsForm)
- def retranslateUi(self, TopicsDialog):
- TopicsDialog.setWindowTitle(self.trUtf8('Topic Maintenance'))
- self.NameLabel.setText(self.trUtf8('Topic name:'))
+ def retranslateUi(self, TopicsForm):
+ TopicsForm.setWindowTitle(translate('TopicsForm', 'Topic Maintenance'))
+ self.NameLabel.setText(translate('TopicsForm', 'Topic name:'))
diff --git a/openlp/plugins/songusage/forms/songusagedeletedialog.py b/openlp/plugins/songusage/forms/songusagedeletedialog.py
index 2cb19f4f5..dc02965f5 100644
--- a/openlp/plugins/songusage/forms/songusagedeletedialog.py
+++ b/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'))
diff --git a/openlp/plugins/songusage/forms/songusagedetaildialog.py b/openlp/plugins/songusage/forms/songusagedetaildialog.py
index 13b4fe18d..9512a4278 100644
--- a/openlp/plugins/songusage/forms/songusagedetaildialog.py
+++ b/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'))
- self.DateRangeGroupBox.setTitle(self.trUtf8('Select Date Range'))
- self.ToLabel.setText(self.trUtf8('to'))
- self.FileGroupBox.setTitle(self.trUtf8('Report Location'))
+ AuditDetailDialog.setWindowTitle(translate('AuditDetailDialog', 'Song Usage Extraction'))
+ self.DateRangeGroupBox.setTitle(translate('AuditDetailDialog', 'Select Date Range'))
+ self.ToLabel.setText(translate('AuditDetailDialog', 'to'))
+ self.FileGroupBox.setTitle(translate('AuditDetailDialog', 'Report Location'))
diff --git a/resources/i18n/openlp_af.qm b/resources/i18n/openlp_af.qm
index 8767c8032..865213138 100644
Binary files a/resources/i18n/openlp_af.qm and b/resources/i18n/openlp_af.qm differ
diff --git a/resources/i18n/openlp_de.qm b/resources/i18n/openlp_de.qm
index 44973fb58..3142046ef 100644
Binary files a/resources/i18n/openlp_de.qm and b/resources/i18n/openlp_de.qm differ
diff --git a/resources/i18n/openlp_en.ts b/resources/i18n/openlp_en.ts
index 9d50330c1..c27f8bd5a 100644
--- a/resources/i18n/openlp_en.ts
+++ b/resources/i18n/openlp_en.ts
@@ -598,6 +598,37 @@ This General Public License does not permit incorporating your program into prop
+
+ AuditDeleteDialog
+
+
+ Song Usage Delete
+
+
+
+
+ AuditDetailDialog
+
+
+ Song Usage Extraction
+
+
+
+
+ Select Date Range
+
+
+
+
+ to
+
+
+
+
+ Report Location
+
+
+
AuthorsForm
@@ -2345,6 +2376,107 @@ You can download the latest version from http://openlp.org
+
+ OpenSongExportForm
+
+
+ Select OpenSong song folder:
+
+
+
+
+ Full Song List
+
+
+
+
+ Song Title
+
+
+
+
+ Author
+
+
+
+
+ Select All
+
+
+
+
+ Lyrics
+
+
+
+
+ Title
+
+
+
+
+ Song Export List
+
+
+
+
+ Remove Selected
+
+
+
+
+ Progress:
+
+
+
+
+ Ready to export
+
+
+
+
+ Export
+
+
+
+
+ Close
+
+
+
+
+ OpenSongImportForm
+
+
+ OpenSong Song Importer
+
+
+
+
+ OpenSong Folder:
+
+
+
+
+ Progress:
+
+
+
+
+ Ready to import
+
+
+
+
+ Import
+
+
+
+
+ Close
+
+
+
PluginForm
@@ -2750,6 +2882,21 @@ You can download the latest version from http://openlp.org
You need to type in a book name!
+
+
+ Edit Book
+
+
+
+
+ Name:
+
+
+
+
+ Publisher:
+
+
SongMaintenanceForm
@@ -2848,6 +2995,41 @@ You can download the latest version from http://openlp.org
Are you sure you want to delete the selected topic?
+
+
+ Song Maintenance
+
+
+
+
+ Authors
+
+
+
+
+ Topics
+
+
+
+
+ Books/Hymnals
+
+
+
+
+ Add
+
+
+
+
+ Edit
+
+
+
+
+ Delete
+
+
SongMediaItem
@@ -3180,210 +3362,14 @@ You can download the latest version from http://openlp.org
Error
-
-
- Ui_OpenSongExportDialog
-
-
- Close
-
-
-
-
- Lyrics
-
-
-
-
- Song Title
-
-
-
-
- Select All
-
-
-
-
- Song Export List
-
-
-
-
- Author
-
-
-
-
- Title
-
-
-
-
- OpenSong Song Exporter
-
-
-
-
- Remove Selected
-
-
-
-
- Progress:
-
-
-
-
- Select OpenSong song folder:
-
-
-
-
- Ready to export
-
-
-
-
- Export
-
-
-
-
- Full Song List
-
-
-
-
- Ui_OpenSongImportDialog
-
-
- OpenSong Folder:
-
-
-
-
- Import
-
-
-
-
- Close
-
-
-
-
- Progress:
-
-
-
-
- OpenSong Song Importer
-
-
-
-
- Ready to import
-
-
-
-
- Ui_SongBookDialog
-
-
- Name:
-
-
-
-
- Edit Book
-
-
-
-
- Publisher:
-
-
-
-
- Ui_SongMaintenanceDialog
-
-
- Edit
-
-
-
-
- Topics
-
-
-
-
- Add
-
-
-
-
- Authors
-
-
-
-
- Delete
-
-
-
-
- Song Maintenance
-
-
-
-
- Books/Hymnals
-
-
-
-
- Ui_SongUsageDeleteDialog
-
-
- Song Usage Delete
-
-
-
-
- Ui_SongUsageDetailDialog
-
-
- Report Location
-
-
-
-
- Song Usage Extraction
-
-
-
-
- Select Date Range
-
-
-
-
- to
-
-
-
-
- Ui_TopicsDialog
- Topic name:
+ Topic Maintenance
-
- Topic Maintenance
+
+ Topic name:
diff --git a/resources/i18n/openlp_en_GB.qm b/resources/i18n/openlp_en_GB.qm
index 0103ea308..6ccb8a4ac 100644
Binary files a/resources/i18n/openlp_en_GB.qm and b/resources/i18n/openlp_en_GB.qm differ
diff --git a/resources/i18n/openlp_en_ZA.qm b/resources/i18n/openlp_en_ZA.qm
index f21e060ce..58ee3e02c 100644
Binary files a/resources/i18n/openlp_en_ZA.qm and b/resources/i18n/openlp_en_ZA.qm differ
diff --git a/resources/i18n/openlp_es.qm b/resources/i18n/openlp_es.qm
index 689a22430..f128095b8 100644
Binary files a/resources/i18n/openlp_es.qm and b/resources/i18n/openlp_es.qm differ
diff --git a/resources/i18n/openlp_hu.qm b/resources/i18n/openlp_hu.qm
index 2dfc0bf7f..9f67c7dbc 100644
Binary files a/resources/i18n/openlp_hu.qm and b/resources/i18n/openlp_hu.qm differ
diff --git a/resources/i18n/openlp_nb.qm b/resources/i18n/openlp_nb.qm
index 2a5215730..f88756cab 100644
Binary files a/resources/i18n/openlp_nb.qm and b/resources/i18n/openlp_nb.qm differ
diff --git a/resources/i18n/openlp_pt_BR.qm b/resources/i18n/openlp_pt_BR.qm
index 64d9f6364..a0d2b109b 100644
Binary files a/resources/i18n/openlp_pt_BR.qm and b/resources/i18n/openlp_pt_BR.qm differ
diff --git a/resources/i18n/openlp_sv.qm b/resources/i18n/openlp_sv.qm
index ba50bcea7..bd6daac49 100644
Binary files a/resources/i18n/openlp_sv.qm and b/resources/i18n/openlp_sv.qm differ