openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #00888
[Merge] lp:~raoul-snyman/openlp/i18n into lp:openlp
Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/i18n into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
Here we go, all the trUtf8(u'...') changed to trUtf('...')
--
https://code.launchpad.net/~raoul-snyman/openlp/i18n/+merge/15335
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp-get-strings.py'
--- openlp-get-strings.py 2009-11-21 12:53:36 +0000
+++ openlp-get-strings.py 2009-11-27 21:15:22 +0000
@@ -83,14 +83,14 @@
file.close()
def main():
- start_dir = u'.'
+ start_dir = os.path.abspath(u'.')
for root, dirs, files in os.walk(start_dir):
for file in files:
if file.endswith(u'.py'):
print u'Parsing "%s"' % file
parse_file(os.path.join(root, file))
print u'Generating TS file...',
- write_file(os.path.join(start_dir, u'i18n', u'openlp_en.ts'))
+ write_file(os.path.join(start_dir, u'..', u'resources', u'i18n', u'openlp_en.ts'))
print u'done.'
if __name__ == u'__main__':
=== modified file 'openlp/core/lib/mediamanageritem.py'
--- openlp/core/lib/mediamanageritem.py 2009-11-04 23:13:17 +0000
+++ openlp/core/lib/mediamanageritem.py 2009-11-27 21:15:22 +0000
@@ -211,21 +211,21 @@
if self.hasFileIcon:
self.addToolbarButton(
u'Load %s' % self.PluginNameShort,
- u'%s %s' % (self.trUtf8(u'Load a new'), self.PluginNameVisible),
+ u'%s %s' % (self.trUtf8('Load a new'), self.PluginNameVisible),
u':%s_load.png' % self.IconPath, self.onFileClick,
u'%sFileItem' % self.PluginNameShort)
## New Button ##
if self.hasNewIcon:
self.addToolbarButton(
u'New %s' % self.PluginNameShort,
- u'%s %s' % (self.trUtf8(u'Add a new'), self.PluginNameVisible),
+ u'%s %s' % (self.trUtf8('Add a new'), self.PluginNameVisible),
u':%s_new.png' % self.IconPath, self.onNewClick,
u'%sNewItem' % self.PluginNameShort)
## Edit Button ##
if self.hasEditIcon:
self.addToolbarButton(
u'Edit %s' % self.PluginNameShort,
- u'%s %s' % (self.trUtf8(u'Edit the selected'),
+ u'%s %s' % (self.trUtf8('Edit the selected'),
self.PluginNameVisible),
u':%s_edit.png' % self.IconPath, self.onEditClick,
u'%sEditItem' % self.PluginNameShort)
@@ -233,7 +233,7 @@
if self.hasDeleteIcon:
self.addToolbarButton(
u'Delete %s' % self.PluginNameShort,
- self.trUtf8(u'Delete the selected item'),
+ self.trUtf8('Delete the selected item'),
u':%s_delete.png' % self.IconPath, self.onDeleteClick,
u'%sDeleteItem' % self.PluginNameShort)
## Separator Line ##
@@ -241,19 +241,19 @@
## Preview ##
self.addToolbarButton(
u'Preview %s' % self.PluginNameShort,
- self.trUtf8(u'Preview the selected item'),
+ self.trUtf8('Preview the selected item'),
u':/system/system_preview.png', self.onPreviewClick,
u'PreviewItem')
## Live Button ##
self.addToolbarButton(
u'Go Live',
- self.trUtf8(u'Send the selected item live'),
+ self.trUtf8('Send the selected item live'),
u':/system/system_live.png', self.onLiveClick,
u'LiveItem')
## Add to service Button ##
self.addToolbarButton(
- u'%s %s %s' % (u'Add', self.PluginNameShort, u'to Service'),
- self.trUtf8(u'Add the selected item(s) to the service'),
+ u'Add %s to Service' % self.PluginNameShort,
+ self.trUtf8('Add the selected item(s) to the service'),
u':/system/system_add.png', self.onAddClick,
u'%sAddServiceItem' % self.PluginNameShort)
@@ -276,22 +276,22 @@
self.ListView.addAction(
contextMenuAction(
self.ListView, u':%s_new.png' % self.IconPath,
- u'%s %s' % (self.trUtf8(u'&Edit'), self.PluginNameVisible),
+ u'%s %s' % (self.trUtf8('&Edit'), self.PluginNameVisible),
self.onEditClick))
self.ListView.addAction(contextMenuSeparator(self.ListView))
self.ListView.addAction(
contextMenuAction(
self.ListView, u':/system/system_preview.png',
- u'%s %s' % (self.trUtf8(u'&Preview'), self.PluginNameVisible),
+ u'%s %s' % (self.trUtf8('&Preview'), self.PluginNameVisible),
self.onPreviewClick))
self.ListView.addAction(
contextMenuAction(
self.ListView, u':/system/system_live.png',
- self.trUtf8(u'&Show Live'), self.onLiveClick))
+ self.trUtf8('&Show Live'), self.onLiveClick))
self.ListView.addAction(
contextMenuAction(
self.ListView, u':/system/system_add.png',
- self.trUtf8(u'&Add to Service'), self.onAddClick))
+ self.trUtf8('&Add to Service'), self.onAddClick))
QtCore.QObject.connect(
self.ListView, QtCore.SIGNAL(u'doubleClicked(QModelIndex)'),
self.onPreviewClick)
@@ -360,8 +360,8 @@
def onPreviewClick(self):
if not self.ListView.selectedIndexes() and not self.remoteTriggered:
QtGui.QMessageBox.information(self,
- self.trUtf8(u'No items selected...'),
- self.trUtf8(u'You must select one or more items'))
+ self.trUtf8('No items selected...'),
+ self.trUtf8('You must select one or more items'))
log.debug(self.PluginNameShort + u' Preview Requested')
service_item = self.buildServiceItem()
if service_item:
@@ -371,8 +371,8 @@
def onLiveClick(self):
if not self.ListView.selectedIndexes():
QtGui.QMessageBox.information(self,
- self.trUtf8(u'No items selected...'),
- self.trUtf8(u'You must select one or more items'))
+ self.trUtf8('No items selected...'),
+ self.trUtf8('You must select one or more items'))
log.debug(self.PluginNameShort + u' Live Requested')
service_item = self.buildServiceItem()
if service_item:
@@ -382,8 +382,8 @@
def onAddClick(self):
if not self.ListView.selectedIndexes() and not self.remoteTriggered:
QtGui.QMessageBox.information(self,
- self.trUtf8(u'No items selected...'),
- self.trUtf8(u'You must select one or more items'))
+ self.trUtf8('No items selected...'),
+ self.trUtf8('You must select one or more items'))
log.debug(self.PluginNameShort + u' Add Requested')
service_item = self.buildServiceItem()
if service_item:
=== modified file 'openlp/core/test/test_mediamanageritem.py'
--- openlp/core/test/test_mediamanageritem.py 2009-10-23 13:17:43 +0000
+++ openlp/core/test/test_mediamanageritem.py 2009-11-27 21:15:22 +0000
@@ -69,9 +69,9 @@
i2.addToolbar()
i2.addToolbarButton(u'Test2', u'Test2', None)
self.MediaToolBox.setItemText(
- self.MediaToolBox.indexOf(i1), self.trUtf8(u'Item1'))
+ self.MediaToolBox.indexOf(i1), self.trUtf8('Item1'))
self.MediaToolBox.setItemText(
- self.MediaToolBox.indexOf(i2), self.trUtf8(u'Item2'))
+ self.MediaToolBox.indexOf(i2), self.trUtf8('Item2'))
log.info(u'Show window')
self.main_window.show()
log.info(u'End')
=== modified file 'openlp/core/ui/about.py'
--- openlp/core/ui/about.py 2009-11-01 09:07:10 +0000
+++ openlp/core/ui/about.py 2009-11-27 21:15:22 +0000
@@ -148,50 +148,50 @@
"""
Set up translation
"""
- AboutForm.setWindowTitle(self.trUtf8(u'About openlp.org'))
+ AboutForm.setWindowTitle(self.trUtf8('About openlp.org'))
self.CopyrightLabel.setText(
- self.trUtf8(u'Copyright \xa9 2004-2009 openlp.org Foundation'))
+ self.trUtf8('Copyright \u00a9 2004-2009 openlp.org Foundation'))
self.AboutAuthors.setText(self.trUtf8(
- u'openlp.org is written and maintained by volunteers. If you would '
- u'like to see more free Christian software being written, please '
- u'consider contributing by using the button below.'))
+ 'openlp.org is written and maintained by volunteers. If you would '
+ 'like to see more free Christian software being written, please '
+ 'consider contributing by using the button below.'))
self.License1Label.setText(self.trUtf8(
- u'This program is free software; you can redistribute it and/or '
- u'modify it under the terms of the GNU General Public License as '
- u'published by the Free Software Foundation; either version 2 of '
- u'the License, or (at your option) any later version.'))
+ 'This program is free software; you can redistribute it and/or '
+ 'modify it under the terms of the GNU General Public License as '
+ 'published by the Free Software Foundation; either version 2 of '
+ 'the License, or (at your option) any later version.'))
self.License2Label.setText(self.trUtf8(
- u'You should have received a copy of the GNU General Public '
- u'License along with this program; if not, write to the Free '
- u'Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, '
- u'MA 02111-1307 USA.'))
+ 'You should have received a copy of the GNU General Public '
+ 'License along with this program; if not, write to the Free '
+ 'Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, '
+ 'MA 02111-1307 USA.'))
self.License3Label.setText(self.trUtf8(
- u'This program is distributed in the hope that it will be useful, '
- u'but WITHOUT ANY WARRANTY; without even the implied warranty of '
- u'MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU '
- u'General Public License for more details.'))
+ 'This program is distributed in the hope that it will be useful, '
+ 'but WITHOUT ANY WARRANTY; without even the implied warranty of '
+ 'MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU '
+ 'General Public License for more details.'))
self.License4Label.setText(unicode(self.trUtf8(
- u'Software version %s, Build %s')) %
+ 'Software version %s, Build %s')) %
(self.applicationVersion[u'version'], self.applicationVersion[u'build']))
self.AboutNotebook.setTabText(
- self.AboutNotebook.indexOf(self.LicenseTab), self.trUtf8(u'License'))
+ self.AboutNotebook.indexOf(self.LicenseTab), self.trUtf8('License'))
self.CreditsTextEdit.setPlainText(self.trUtf8(
- u'Project Lead\n'
- u' Raoul \"superfly\" Snyman\n'
- u'\n'
- u'Developers\n'
- u' Tim \"TRB143\" Bentley\n'
- u' Jonathan \"gushie\" Corwin\n'
- u' Scott \"sguerrieri\" Guerrieri\n'
- u' Raoul \"superfly\" Snyman\n'
- u' Martin \"mijiti\" Thompson\n'
- u' Jon \"Meths\" Tibble\n'
- u' Carsten \"catini\" Tingaard'))
+ 'Project Lead\n'
+ ' Raoul \"superfly\" Snyman\n'
+ '\n'
+ 'Developers\n'
+ ' Tim \"TRB143\" Bentley\n'
+ ' Jonathan \"gushie\" Corwin\n'
+ ' Scott \"sguerrieri\" Guerrieri\n'
+ ' Raoul \"superfly\" Snyman\n'
+ ' Martin \"mijiti\" Thompson\n'
+ ' Jon \"Meths\" Tibble\n'
+ ' Carsten \"catini\" Tingaard'))
self.AboutNotebook.setTabText(
- self.AboutNotebook.indexOf(self.CreditsTab), self.trUtf8(u'Credits'))
- self.ContributeButton.setText(self.trUtf8(u'Contribute'))
- self.CloseButton.setText(self.trUtf8(u'Close'))
- self.extContributeItem.setText(self.trUtf8(u'&Contribute'))
+ self.AboutNotebook.indexOf(self.CreditsTab), self.trUtf8('Credits'))
+ self.ContributeButton.setText(self.trUtf8('Contribute'))
+ self.CloseButton.setText(self.trUtf8('Close'))
+ self.extContributeItem.setText(self.trUtf8('&Contribute'))
def onContributeButtonClicked(self):
"""
=== modified file 'openlp/core/ui/alertform.py'
--- openlp/core/ui/alertform.py 2009-10-24 16:40:36 +0000
+++ openlp/core/ui/alertform.py 2009-11-27 21:15:22 +0000
@@ -92,10 +92,10 @@
QtCore.QMetaObject.connectSlotsByName(AlertForm)
def retranslateUi(self, AlertForm):
- AlertForm.setWindowTitle(self.trUtf8(u'Alert Message'))
- self.AlertEntryLabel.setText(self.trUtf8(u'Alert Text:'))
- self.DisplayButton.setText(self.trUtf8(u'Display'))
- self.CancelButton.setText(self.trUtf8(u'Cancel'))
+ AlertForm.setWindowTitle(self.trUtf8('Alert Message'))
+ self.AlertEntryLabel.setText(self.trUtf8('Alert Text:'))
+ self.DisplayButton.setText(self.trUtf8('Display'))
+ self.CancelButton.setText(self.trUtf8('Cancel'))
def onDisplayClicked(self):
self.parent.mainDisplay.displayAlert(self.AlertEntryEditItem.text())
=== modified file 'openlp/core/ui/alertstab.py'
--- openlp/core/ui/alertstab.py 2009-10-30 17:44:16 +0000
+++ openlp/core/ui/alertstab.py 2009-11-27 21:15:22 +0000
@@ -37,7 +37,7 @@
def setupUi(self):
self.setObjectName(u'AlertsTab')
- self.tabTitleVisible = self.trUtf8(u'Alerts')
+ self.tabTitleVisible = self.trUtf8('Alerts')
self.AlertsLayout = QtGui.QHBoxLayout(self)
self.AlertsLayout.setSpacing(8)
self.AlertsLayout.setMargin(8)
@@ -147,14 +147,14 @@
QtCore.SIGNAL(u'valueChanged(int)'), self.onTimeoutSpinBoxChanged)
def retranslateUi(self):
- self.FontGroupBox.setTitle(self.trUtf8(u'Font'))
- self.FontLabel.setText(self.trUtf8(u'Font Name:'))
- self.FontColorLabel.setText(self.trUtf8(u'Font Color:'))
- self.BackgroundColorLabel.setText(self.trUtf8(u'Background Color:'))
- self.TimeoutLabel.setText(self.trUtf8(u'Alert timeout:'))
- self.TimeoutSpinBox.setSuffix(self.trUtf8(u's'))
- self.PreviewGroupBox.setTitle(self.trUtf8(u'Preview'))
- self.FontPreview.setText(self.trUtf8(u'openlp.org 2.0 rocks!'))
+ self.FontGroupBox.setTitle(self.trUtf8('Font'))
+ self.FontLabel.setText(self.trUtf8('Font Name:'))
+ self.FontColorLabel.setText(self.trUtf8('Font Color:'))
+ self.BackgroundColorLabel.setText(self.trUtf8('Background Color:'))
+ self.TimeoutLabel.setText(self.trUtf8('Alert timeout:'))
+ self.TimeoutSpinBox.setSuffix(self.trUtf8('s'))
+ self.PreviewGroupBox.setTitle(self.trUtf8('Preview'))
+ self.FontPreview.setText(self.trUtf8('openlp.org 2.0 rocks!'))
def onBackgroundColorButtonClicked(self):
self.bg_color = QtGui.QColorDialog.getColor(
=== modified file 'openlp/core/ui/amendthemedialog.py'
--- openlp/core/ui/amendthemedialog.py 2009-10-24 16:40:36 +0000
+++ openlp/core/ui/amendthemedialog.py 2009-11-27 21:15:22 +0000
@@ -562,87 +562,87 @@
AmendThemeDialog.setTabOrder(self.HorizontalComboBox, self.VerticalComboBox)
def retranslateUi(self, AmendThemeDialog):
- AmendThemeDialog.setWindowTitle(self.trUtf8(u'Theme Maintenance'))
- self.ThemeNameLabel.setText(self.trUtf8(u'Theme Name:'))
- self.BackgroundLabel.setText(self.trUtf8(u'Background:'))
- self.BackgroundComboBox.setItemText(0, self.trUtf8(u'Opaque'))
- self.BackgroundComboBox.setItemText(1, self.trUtf8(u'Transparent'))
- self.BackgroundTypeLabel.setText(self.trUtf8(u'Background Type:'))
- self.BackgroundTypeComboBox.setItemText(0, self.trUtf8(u'Solid Color'))
- self.BackgroundTypeComboBox.setItemText(1, self.trUtf8(u'Gradient'))
- self.BackgroundTypeComboBox.setItemText(2, self.trUtf8(u'Image'))
- self.Color1Label.setText(self.trUtf8(u'<Color1>'))
- self.Color2Label.setText(self.trUtf8(u'<Color2>'))
- self.ImageLabel.setText(self.trUtf8(u'Image:'))
- self.GradientLabel.setText(self.trUtf8(u'Gradient :'))
- self.GradientComboBox.setItemText(0, self.trUtf8(u'Horizontal'))
- self.GradientComboBox.setItemText(1, self.trUtf8(u'Vertical'))
- self.GradientComboBox.setItemText(2, self.trUtf8(u'Circular'))
+ AmendThemeDialog.setWindowTitle(self.trUtf8('Theme Maintenance'))
+ self.ThemeNameLabel.setText(self.trUtf8('Theme Name:'))
+ self.BackgroundLabel.setText(self.trUtf8('Background:'))
+ self.BackgroundComboBox.setItemText(0, self.trUtf8('Opaque'))
+ self.BackgroundComboBox.setItemText(1, self.trUtf8('Transparent'))
+ self.BackgroundTypeLabel.setText(self.trUtf8('Background Type:'))
+ self.BackgroundTypeComboBox.setItemText(0, self.trUtf8('Solid Color'))
+ self.BackgroundTypeComboBox.setItemText(1, self.trUtf8('Gradient'))
+ self.BackgroundTypeComboBox.setItemText(2, self.trUtf8('Image'))
+ self.Color1Label.setText(self.trUtf8('<Color1>'))
+ self.Color2Label.setText(self.trUtf8('<Color2>'))
+ self.ImageLabel.setText(self.trUtf8('Image:'))
+ self.GradientLabel.setText(self.trUtf8('Gradient :'))
+ self.GradientComboBox.setItemText(0, self.trUtf8('Horizontal'))
+ self.GradientComboBox.setItemText(1, self.trUtf8('Vertical'))
+ self.GradientComboBox.setItemText(2, self.trUtf8('Circular'))
self.ThemeTabWidget.setTabText(
self.ThemeTabWidget.indexOf(self.BackgroundTab),
- self.trUtf8(u'Background'))
- self.FontMainGroupBox.setTitle(self.trUtf8(u'Main Font'))
- self.FontMainlabel.setText(self.trUtf8(u'Font:'))
- self.FontMainColorLabel.setText(self.trUtf8(u'Font Color:'))
- self.FontMainSize.setText(self.trUtf8(u'Size:'))
- self.FontMainSizeSpinBox.setSuffix(self.trUtf8(u'pt'))
- self.FontMainWrapIndentationLabel.setText(self.trUtf8(u'Wrap Indentation'))
- self.FontMainWeightComboBox.setItemText(0, self.trUtf8(u'Normal'))
- self.FontMainWeightComboBox.setItemText(1, self.trUtf8(u'Bold'))
- self.FontMainWeightComboBox.setItemText(2, self.trUtf8(u'Italics'))
- self.FontMainWeightComboBox.setItemText(3, self.trUtf8(u'Bold/Italics'))
- self.FontMainWeightLabel.setText(self.trUtf8(u'Font Weight:'))
- self.MainLocationGroupBox.setTitle(self.trUtf8(u'Display Location'))
- self.DefaultLocationLabel.setText(self.trUtf8(u'Use Default Location:'))
- self.FontMainXLabel.setText(self.trUtf8(u'X Position:'))
- self.FontMainYLabel.setText(self.trUtf8(u'Y Position:'))
- self.FontMainWidthLabel.setText(self.trUtf8(u'Width:'))
- self.FontMainHeightLabel.setText(self.trUtf8(u'Height:'))
- self.FontMainXSpinBox.setSuffix(self.trUtf8(u'px'))
- self.FontMainYSpinBox.setSuffix(self.trUtf8(u'px'))
- self.FontMainWidthSpinBox.setSuffix(self.trUtf8(u'px'))
- self.FontMainHeightSpinBox.setSuffix(self.trUtf8(u'px'))
+ self.trUtf8('Background'))
+ self.FontMainGroupBox.setTitle(self.trUtf8('Main Font'))
+ self.FontMainlabel.setText(self.trUtf8('Font:'))
+ self.FontMainColorLabel.setText(self.trUtf8('Font Color:'))
+ self.FontMainSize.setText(self.trUtf8('Size:'))
+ self.FontMainSizeSpinBox.setSuffix(self.trUtf8('pt'))
+ self.FontMainWrapIndentationLabel.setText(self.trUtf8('Wrap Indentation'))
+ self.FontMainWeightComboBox.setItemText(0, self.trUtf8('Normal'))
+ self.FontMainWeightComboBox.setItemText(1, self.trUtf8('Bold'))
+ self.FontMainWeightComboBox.setItemText(2, self.trUtf8('Italics'))
+ self.FontMainWeightComboBox.setItemText(3, self.trUtf8('Bold/Italics'))
+ self.FontMainWeightLabel.setText(self.trUtf8('Font Weight:'))
+ self.MainLocationGroupBox.setTitle(self.trUtf8('Display Location'))
+ self.DefaultLocationLabel.setText(self.trUtf8('Use Default Location:'))
+ self.FontMainXLabel.setText(self.trUtf8('X Position:'))
+ self.FontMainYLabel.setText(self.trUtf8('Y Position:'))
+ self.FontMainWidthLabel.setText(self.trUtf8('Width:'))
+ self.FontMainHeightLabel.setText(self.trUtf8('Height:'))
+ self.FontMainXSpinBox.setSuffix(self.trUtf8('px'))
+ self.FontMainYSpinBox.setSuffix(self.trUtf8('px'))
+ self.FontMainWidthSpinBox.setSuffix(self.trUtf8('px'))
+ self.FontMainHeightSpinBox.setSuffix(self.trUtf8('px'))
self.ThemeTabWidget.setTabText(
self.ThemeTabWidget.indexOf(self.FontMainTab),
- self.trUtf8(u'Font Main'))
- self.FooterFontGroupBox.setTitle(self.trUtf8(u'Footer Font'))
- self.FontFooterLabel.setText(self.trUtf8(u'Font:'))
- self.FontFooterColorLabel.setText(self.trUtf8(u'Font Color:'))
- self.FontFooterSizeLabel.setText(self.trUtf8(u'Size:'))
- self.FontFooterSizeSpinBox.setSuffix(self.trUtf8(u'pt'))
- self.FontFooterWeightComboBox.setItemText(0, self.trUtf8(u'Normal'))
- self.FontFooterWeightComboBox.setItemText(1, self.trUtf8(u'Bold'))
- self.FontFooterWeightComboBox.setItemText(2, self.trUtf8(u'Italics'))
- self.FontFooterWeightComboBox.setItemText(3, self.trUtf8(u'Bold/Italics'))
- self.FontFooterWeightLabel.setText(self.trUtf8(u'Font Weight:'))
- self.LocationFooterGroupBox.setTitle(self.trUtf8(u'Display Location'))
- self.FontFooterDefaultLabel.setText(self.trUtf8(u'Use Default Location:'))
- self.FontFooterXLabel.setText(self.trUtf8(u'X Position:'))
- self.FontFooterYLabel.setText(self.trUtf8(u'Y Position:'))
- self.FontFooterWidthLabel.setText(self.trUtf8(u'Width:'))
- self.FontFooterHeightLabel.setText(self.trUtf8(u'Height:'))
- self.FontFooterXSpinBox.setSuffix(self.trUtf8(u'px'))
- self.FontFooterYSpinBox.setSuffix(self.trUtf8(u'px'))
- self.FontFooterWidthSpinBox.setSuffix(self.trUtf8(u'px'))
- self.FontFooterHeightSpinBox.setSuffix(self.trUtf8(u'px'))
+ self.trUtf8('Font Main'))
+ self.FooterFontGroupBox.setTitle(self.trUtf8('Footer Font'))
+ self.FontFooterLabel.setText(self.trUtf8('Font:'))
+ self.FontFooterColorLabel.setText(self.trUtf8('Font Color:'))
+ self.FontFooterSizeLabel.setText(self.trUtf8('Size:'))
+ self.FontFooterSizeSpinBox.setSuffix(self.trUtf8('pt'))
+ self.FontFooterWeightComboBox.setItemText(0, self.trUtf8('Normal'))
+ self.FontFooterWeightComboBox.setItemText(1, self.trUtf8('Bold'))
+ self.FontFooterWeightComboBox.setItemText(2, self.trUtf8('Italics'))
+ self.FontFooterWeightComboBox.setItemText(3, self.trUtf8('Bold/Italics'))
+ self.FontFooterWeightLabel.setText(self.trUtf8('Font Weight:'))
+ self.LocationFooterGroupBox.setTitle(self.trUtf8('Display Location'))
+ self.FontFooterDefaultLabel.setText(self.trUtf8('Use Default Location:'))
+ self.FontFooterXLabel.setText(self.trUtf8('X Position:'))
+ self.FontFooterYLabel.setText(self.trUtf8('Y Position:'))
+ self.FontFooterWidthLabel.setText(self.trUtf8('Width:'))
+ self.FontFooterHeightLabel.setText(self.trUtf8('Height:'))
+ self.FontFooterXSpinBox.setSuffix(self.trUtf8('px'))
+ self.FontFooterYSpinBox.setSuffix(self.trUtf8('px'))
+ self.FontFooterWidthSpinBox.setSuffix(self.trUtf8('px'))
+ self.FontFooterHeightSpinBox.setSuffix(self.trUtf8('px'))
self.ThemeTabWidget.setTabText(
self.ThemeTabWidget.indexOf(self.FontFooterTab),
- self.trUtf8(u'Font Footer'))
- self.ShadowGroupBox.setTitle(self.trUtf8(u'Shadow && Outline'))
- self.OutlineColorLabel.setText(self.trUtf8(u'Outline Color:'))
- self.OutlineEnabledLabel.setText(self.trUtf8(u'Show Outline:'))
- self.ShadowColorLabel.setText(self.trUtf8(u'Shadow Color:'))
- self.ShadowEnabledLabel.setText(self.trUtf8(u'Show Shadow:'))
- self.AlignmentGroupBox.setTitle(self.trUtf8(u'Alignment'))
- self.HorizontalLabel.setText(self.trUtf8(u'Horizontal Align:'))
- self.HorizontalComboBox.setItemText(0, self.trUtf8(u'Left'))
- self.HorizontalComboBox.setItemText(1, self.trUtf8(u'Right'))
- self.HorizontalComboBox.setItemText(2, self.trUtf8(u'Center'))
- self.VerticalLabel.setText(self.trUtf8(u'Vertical Align:'))
- self.VerticalComboBox.setItemText(0, self.trUtf8(u'Top'))
- self.VerticalComboBox.setItemText(1, self.trUtf8(u'Middle'))
- self.VerticalComboBox.setItemText(2, self.trUtf8(u'Bottom'))
+ self.trUtf8('Font Footer'))
+ self.ShadowGroupBox.setTitle(self.trUtf8('Shadow && Outline'))
+ self.OutlineColorLabel.setText(self.trUtf8('Outline Color:'))
+ self.OutlineEnabledLabel.setText(self.trUtf8('Show Outline:'))
+ self.ShadowColorLabel.setText(self.trUtf8('Shadow Color:'))
+ self.ShadowEnabledLabel.setText(self.trUtf8('Show Shadow:'))
+ self.AlignmentGroupBox.setTitle(self.trUtf8('Alignment'))
+ self.HorizontalLabel.setText(self.trUtf8('Horizontal Align:'))
+ self.HorizontalComboBox.setItemText(0, self.trUtf8('Left'))
+ self.HorizontalComboBox.setItemText(1, self.trUtf8('Right'))
+ self.HorizontalComboBox.setItemText(2, self.trUtf8('Center'))
+ self.VerticalLabel.setText(self.trUtf8('Vertical Align:'))
+ self.VerticalComboBox.setItemText(0, self.trUtf8('Top'))
+ self.VerticalComboBox.setItemText(1, self.trUtf8('Middle'))
+ self.VerticalComboBox.setItemText(2, self.trUtf8('Bottom'))
self.ThemeTabWidget.setTabText(
self.ThemeTabWidget.indexOf(self.OtherOptionsTab),
- self.trUtf8(u'Other Options'))
- self.PreviewGroupBox.setTitle(self.trUtf8(u'Preview'))
+ self.trUtf8('Other Options'))
+ self.PreviewGroupBox.setTitle(self.trUtf8('Preview'))
=== modified file 'openlp/core/ui/amendthemeform.py'
--- openlp/core/ui/amendthemeform.py 2009-11-21 14:32:19 +0000
+++ openlp/core/ui/amendthemeform.py 2009-11-27 21:15:22 +0000
@@ -584,7 +584,7 @@
if theme.background_type == u'solid':
self.Color1PushButton.setStyleSheet(
u'background-color: %s' % unicode(theme.background_color))
- self.Color1Label.setText(self.trUtf8(u'Background Color:'))
+ self.Color1Label.setText(self.trUtf8('Background Color:'))
self.Color1Label.setVisible(True)
self.Color1PushButton.setVisible(True)
self.Color2Label.setVisible(False)
@@ -599,8 +599,8 @@
% unicode(theme.background_startColor))
self.Color2PushButton.setStyleSheet(u'background-color: %s' \
% unicode(theme.background_endColor))
- self.Color1Label.setText(self.trUtf8(u'First Color:'))
- self.Color2Label.setText(self.trUtf8(u'Second Color:'))
+ self.Color1Label.setText(self.trUtf8('First Color:'))
+ self.Color2Label.setText(self.trUtf8('Second Color:'))
self.Color1Label.setVisible(True)
self.Color1PushButton.setVisible(True)
self.Color2Label.setVisible(True)
@@ -662,7 +662,7 @@
log.debug(u'Page Length area height %s, metrics %s, lines %s' %
(self.FontMainHeightSpinBox.value(), metrics.height(),
page_length))
- page_length_text = unicode(self.trUtf8(u'Slide Height is %s rows'))
+ page_length_text = unicode(self.trUtf8('Slide Height is %s rows'))
self.FontMainLinesPageLabel.setText(page_length_text % page_length)
#a=c
frame = self.thememanager.generateImage(self.theme)
=== modified file 'openlp/core/ui/generaltab.py'
--- openlp/core/ui/generaltab.py 2009-11-04 23:16:33 +0000
+++ openlp/core/ui/generaltab.py 2009-11-27 21:15:22 +0000
@@ -36,7 +36,7 @@
def setupUi(self):
self.setObjectName(u'GeneralTab')
- self.tabTitleVisible = self.trUtf8(u'General')
+ self.tabTitleVisible = self.trUtf8('General')
self.GeneralLayout = QtGui.QHBoxLayout(self)
self.GeneralLayout.setSpacing(8)
self.GeneralLayout.setMargin(8)
@@ -144,18 +144,18 @@
QtCore.SIGNAL(u'editingFinished()'), self.onPasswordEditLostFocus)
def retranslateUi(self):
- self.MonitorGroupBox.setTitle(self.trUtf8(u'Monitors'))
- self.MonitorLabel.setText(self.trUtf8(u'Select monitor for output display:'))
- self.StartupGroupBox.setTitle(self.trUtf8(u'Application Startup'))
- self.WarningCheckBox.setText(self.trUtf8(u'Show blank screen warning'))
- 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 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:'))
- self.PasswordLabel.setText(self.trUtf8(u'SongSelect Password:'))
+ self.MonitorGroupBox.setTitle(self.trUtf8('Monitors'))
+ self.MonitorLabel.setText(self.trUtf8('Select monitor for output display:'))
+ self.StartupGroupBox.setTitle(self.trUtf8('Application Startup'))
+ self.WarningCheckBox.setText(self.trUtf8('Show blank screen warning'))
+ self.AutoOpenCheckBox.setText(self.trUtf8('Automatically open the last service'))
+ self.ShowSplashCheckBox.setText(self.trUtf8('Show the splash screen'))
+ self.SettingsGroupBox.setTitle(self.trUtf8('Application Settings'))
+ self.SaveCheckServiceCheckBox.setText(self.trUtf8('Prompt to save Service before starting New'))
+ self.CCLIGroupBox.setTitle(self.trUtf8('CCLI Details'))
+ self.NumberLabel.setText(self.trUtf8('CCLI Number:'))
+ self.UsernameLabel.setText(self.trUtf8('SongSelect Username:'))
+ self.PasswordLabel.setText(self.trUtf8('SongSelect Password:'))
def onMonitorComboBoxChanged(self):
self.MonitorNumber = self.MonitorComboBox.currentIndex()
@@ -183,9 +183,9 @@
def load(self):
for screen in self.screen_list:
- screen_name = u'%s %d' % (self.trUtf8(u'Screen'), screen[u'number'] + 1)
+ screen_name = u'%s %d' % (self.trUtf8('Screen'), screen[u'number'] + 1)
if screen[u'primary']:
- screen_name = u'%s (%s)' % (self.trUtf8(u'primary'), screen_name)
+ screen_name = u'%s (%s)' % (self.trUtf8('primary'), screen_name)
self.MonitorComboBox.addItem(screen_name)
# Get the configs
self.MonitorNumber = int(self.config.get_config(u'Monitor', u'0'))
=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py 2009-11-24 19:10:54 +0000
+++ openlp/core/ui/mainwindow.py 2009-11-27 21:15:22 +0000
@@ -316,98 +316,98 @@
"""
Set up the translation system
"""
- MainWindow.mainTitle = self.trUtf8(u'OpenLP 2.0')
+ MainWindow.mainTitle = self.trUtf8('OpenLP 2.0')
MainWindow.defaultThemeText = self.trUtf8(
'Default Theme: ')
MainWindow.setWindowTitle(MainWindow.mainTitle)
- self.FileMenu.setTitle(self.trUtf8(u'&File'))
- self.FileImportMenu.setTitle(self.trUtf8(u'&Import'))
- self.FileExportMenu.setTitle(self.trUtf8(u'&Export'))
- self.OptionsMenu.setTitle(self.trUtf8(u'&Options'))
- self.OptionsViewMenu.setTitle(self.trUtf8(u'&View'))
- self.ViewModeMenu.setTitle(self.trUtf8(u'M&ode'))
+ self.FileMenu.setTitle(self.trUtf8('&File'))
+ self.FileImportMenu.setTitle(self.trUtf8('&Import'))
+ self.FileExportMenu.setTitle(self.trUtf8('&Export'))
+ self.OptionsMenu.setTitle(self.trUtf8('&Options'))
+ self.OptionsViewMenu.setTitle(self.trUtf8('&View'))
+ self.ViewModeMenu.setTitle(self.trUtf8('M&ode'))
self.OptionsLanguageMenu.setTitle(self.trUtf8(
u'&Language'))
- self.ToolsMenu.setTitle(self.trUtf8(u'&Tools'))
- self.HelpMenu.setTitle(self.trUtf8(u'&Help'))
+ self.ToolsMenu.setTitle(self.trUtf8('&Tools'))
+ self.HelpMenu.setTitle(self.trUtf8('&Help'))
self.MediaManagerDock.setWindowTitle(
- self.trUtf8(u'Media Manager'))
+ self.trUtf8('Media Manager'))
self.ServiceManagerDock.setWindowTitle(
- self.trUtf8(u'Service Manager'))
+ self.trUtf8('Service Manager'))
self.ThemeManagerDock.setWindowTitle(
- self.trUtf8(u'Theme Manager'))
- self.FileNewItem.setText(self.trUtf8(u'&New'))
- self.FileNewItem.setToolTip(self.trUtf8(u'New Service'))
- self.FileNewItem.setStatusTip(self.trUtf8(u'Create a new Service'))
- self.FileNewItem.setShortcut(self.trUtf8(u'Ctrl+N'))
- self.FileOpenItem.setText(self.trUtf8(u'&Open'))
- self.FileOpenItem.setToolTip(self.trUtf8(u'Open Service'))
- self.FileOpenItem.setStatusTip(self.trUtf8(u'Open an existing service'))
- self.FileOpenItem.setShortcut(self.trUtf8(u'Ctrl+O'))
- self.FileSaveItem.setText(self.trUtf8(u'&Save'))
- self.FileSaveItem.setToolTip(self.trUtf8(u'Save Service'))
+ self.trUtf8('Theme Manager'))
+ self.FileNewItem.setText(self.trUtf8('&New'))
+ self.FileNewItem.setToolTip(self.trUtf8('New Service'))
+ self.FileNewItem.setStatusTip(self.trUtf8('Create a new Service'))
+ self.FileNewItem.setShortcut(self.trUtf8('Ctrl+N'))
+ self.FileOpenItem.setText(self.trUtf8('&Open'))
+ self.FileOpenItem.setToolTip(self.trUtf8('Open Service'))
+ self.FileOpenItem.setStatusTip(self.trUtf8('Open an existing service'))
+ self.FileOpenItem.setShortcut(self.trUtf8('Ctrl+O'))
+ self.FileSaveItem.setText(self.trUtf8('&Save'))
+ self.FileSaveItem.setToolTip(self.trUtf8('Save Service'))
self.FileSaveItem.setStatusTip(
- self.trUtf8(u'Save the current service to disk'))
- self.FileSaveItem.setShortcut(self.trUtf8(u'Ctrl+S'))
- self.FileSaveAsItem.setText(self.trUtf8(u'Save &As...'))
- self.FileSaveAsItem.setToolTip(self.trUtf8(u'Save Service As'))
+ self.trUtf8('Save the current service to disk'))
+ self.FileSaveItem.setShortcut(self.trUtf8('Ctrl+S'))
+ self.FileSaveAsItem.setText(self.trUtf8('Save &As...'))
+ self.FileSaveAsItem.setToolTip(self.trUtf8('Save Service As'))
self.FileSaveAsItem.setStatusTip(
- self.trUtf8(u'Save the current service under a new name'))
- self.FileSaveAsItem.setShortcut(self.trUtf8(u'F12'))
- self.FileExitItem.setText(self.trUtf8(u'E&xit'))
- self.FileExitItem.setStatusTip(self.trUtf8(u'Quit OpenLP'))
- self.FileExitItem.setShortcut(self.trUtf8(u'Alt+F4'))
- self.ImportThemeItem.setText(self.trUtf8(u'&Theme'))
- self.ImportLanguageItem.setText(self.trUtf8(u'&Language'))
- self.ExportThemeItem.setText(self.trUtf8(u'&Theme'))
- self.ExportLanguageItem.setText(self.trUtf8(u'&Language'))
- self.actionLook_Feel.setText(self.trUtf8(u'Look && &Feel'))
- self.OptionsSettingsItem.setText(self.trUtf8(u'&Settings'))
- self.ViewMediaManagerItem.setText(self.trUtf8(u'&Media Manager'))
- self.ViewMediaManagerItem.setToolTip(self.trUtf8(u'Toggle Media Manager'))
+ self.trUtf8('Save the current service under a new name'))
+ self.FileSaveAsItem.setShortcut(self.trUtf8('F12'))
+ self.FileExitItem.setText(self.trUtf8('E&xit'))
+ self.FileExitItem.setStatusTip(self.trUtf8('Quit OpenLP'))
+ self.FileExitItem.setShortcut(self.trUtf8('Alt+F4'))
+ self.ImportThemeItem.setText(self.trUtf8('&Theme'))
+ self.ImportLanguageItem.setText(self.trUtf8('&Language'))
+ self.ExportThemeItem.setText(self.trUtf8('&Theme'))
+ self.ExportLanguageItem.setText(self.trUtf8('&Language'))
+ self.actionLook_Feel.setText(self.trUtf8('Look && &Feel'))
+ self.OptionsSettingsItem.setText(self.trUtf8('&Settings'))
+ self.ViewMediaManagerItem.setText(self.trUtf8('&Media Manager'))
+ self.ViewMediaManagerItem.setToolTip(self.trUtf8('Toggle Media Manager'))
self.ViewMediaManagerItem.setStatusTip(
- self.trUtf8(u'Toggle the visibility of the Media Manager'))
- self.ViewMediaManagerItem.setShortcut(self.trUtf8(u'F8'))
- self.ViewThemeManagerItem.setText(self.trUtf8(u'&Theme Manager'))
- self.ViewThemeManagerItem.setToolTip(self.trUtf8(u'Toggle Theme Manager'))
+ self.trUtf8('Toggle the visibility of the Media Manager'))
+ self.ViewMediaManagerItem.setShortcut(self.trUtf8('F8'))
+ self.ViewThemeManagerItem.setText(self.trUtf8('&Theme Manager'))
+ self.ViewThemeManagerItem.setToolTip(self.trUtf8('Toggle Theme Manager'))
self.ViewThemeManagerItem.setStatusTip(
- self.trUtf8(u'Toggle the visibility of the Theme Manager'))
- self.ViewThemeManagerItem.setShortcut(self.trUtf8(u'F10'))
- self.ViewServiceManagerItem.setText(self.trUtf8(u'&Service Manager'))
+ self.trUtf8('Toggle the visibility of the Theme Manager'))
+ self.ViewThemeManagerItem.setShortcut(self.trUtf8('F10'))
+ self.ViewServiceManagerItem.setText(self.trUtf8('&Service Manager'))
self.ViewServiceManagerItem.setToolTip(
- self.trUtf8(u'Toggle Service Manager'))
+ self.trUtf8('Toggle Service Manager'))
self.ViewServiceManagerItem.setStatusTip(
- self.trUtf8(u'Toggle the visibility of the Service Manager'))
- self.ViewServiceManagerItem.setShortcut(self.trUtf8(u'F9'))
- self.action_Preview_Panel.setText(self.trUtf8(u'&Preview Panel'))
- self.action_Preview_Panel.setToolTip(self.trUtf8(u'Toggle Preview Panel'))
+ self.trUtf8('Toggle the visibility of the Service Manager'))
+ self.ViewServiceManagerItem.setShortcut(self.trUtf8('F9'))
+ self.action_Preview_Panel.setText(self.trUtf8('&Preview Panel'))
+ self.action_Preview_Panel.setToolTip(self.trUtf8('Toggle Preview Panel'))
self.action_Preview_Panel.setStatusTip(
- self.trUtf8(u'Toggle the visibility of the Preview Panel'))
- self.action_Preview_Panel.setShortcut(self.trUtf8(u'F11'))
- self.ToolsAlertItem.setText(self.trUtf8(u'&Alert'))
- self.ToolsAlertItem.setStatusTip(self.trUtf8(u'Show an alert message'))
- self.ToolsAlertItem.setShortcut(self.trUtf8(u'F7'))
- self.PluginItem.setText(self.trUtf8(u'&Plugin List'))
- self.PluginItem.setStatusTip(self.trUtf8(u'List the Plugins'))
- self.PluginItem.setShortcut(self.trUtf8(u'Alt+F7'))
- self.HelpDocumentationItem.setText(self.trUtf8(u'&User Guide'))
- self.HelpAboutItem.setText(self.trUtf8(u'&About'))
+ self.trUtf8('Toggle the visibility of the Preview Panel'))
+ self.action_Preview_Panel.setShortcut(self.trUtf8('F11'))
+ self.ToolsAlertItem.setText(self.trUtf8('&Alert'))
+ self.ToolsAlertItem.setStatusTip(self.trUtf8('Show an alert message'))
+ self.ToolsAlertItem.setShortcut(self.trUtf8('F7'))
+ self.PluginItem.setText(self.trUtf8('&Plugin List'))
+ self.PluginItem.setStatusTip(self.trUtf8('List the Plugins'))
+ self.PluginItem.setShortcut(self.trUtf8('Alt+F7'))
+ self.HelpDocumentationItem.setText(self.trUtf8('&User Guide'))
+ self.HelpAboutItem.setText(self.trUtf8('&About'))
self.HelpAboutItem.setStatusTip(
- self.trUtf8(u'More information about OpenLP'))
- self.HelpAboutItem.setShortcut(self.trUtf8(u'Ctrl+F1'))
- self.HelpOnlineHelpItem.setText(self.trUtf8(u'&Online Help'))
- self.HelpWebSiteItem.setText(self.trUtf8(u'&Web Site'))
- self.LanguageTranslateItem.setText(self.trUtf8(u'&Translate'))
+ self.trUtf8('More information about OpenLP'))
+ self.HelpAboutItem.setShortcut(self.trUtf8('Ctrl+F1'))
+ self.HelpOnlineHelpItem.setText(self.trUtf8('&Online Help'))
+ self.HelpWebSiteItem.setText(self.trUtf8('&Web Site'))
+ self.LanguageTranslateItem.setText(self.trUtf8('&Translate'))
self.LanguageTranslateItem.setStatusTip(
- self.trUtf8(u'Translate the interface to your language'))
- self.LanguageEnglishItem.setText(self.trUtf8(u'English'))
+ self.trUtf8('Translate the interface to your language'))
+ self.LanguageEnglishItem.setText(self.trUtf8('English'))
self.LanguageEnglishItem.setStatusTip(
- self.trUtf8(u'Set the interface language to English'))
- self.ToolsAddToolItem.setText(self.trUtf8(u'&Add Tool...'))
+ self.trUtf8('Set the interface language to English'))
+ self.ToolsAddToolItem.setText(self.trUtf8('&Add Tool...'))
self.ToolsAddToolItem.setStatusTip(
- self.trUtf8(u'Add an application to the list of tools'))
- self.action_Preview_Panel.setText(self.trUtf8(u'&Preview Pane'))
- self.ModeLiveItem.setText(self.trUtf8(u'&Live'))
+ self.trUtf8('Add an application to the list of tools'))
+ self.action_Preview_Panel.setText(self.trUtf8('&Preview Pane'))
+ self.ModeLiveItem.setText(self.trUtf8('&Live'))
class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
@@ -542,10 +542,10 @@
applicationVersion = self.applicationVersion[u'Full']
version = check_latest_version(self.generalConfig, applicationVersion)
if applicationVersion != version:
- version_text = unicode(self.trUtf8(u'OpenLP version %s has been updated '
- u'to version %s\n\nYou can obtain the latest version from http://openlp.org'))
+ version_text = unicode(self.trUtf8('OpenLP version %s has been updated '
+ 'to version %s\n\nYou can obtain the latest version from http://openlp.org'))
QtGui.QMessageBox.question(None,
- self.trUtf8(u'OpenLP Version Updated'),
+ self.trUtf8('OpenLP Version Updated'),
version_text % (applicationVersion, version),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok),
QtGui.QMessageBox.Ok)
@@ -580,8 +580,8 @@
if str_to_bool(self.generalConfig.get_config(u'screen blank', False)) \
and str_to_bool(self.generalConfig.get_config(u'blank warning', False)):
QtGui.QMessageBox.question(None,
- self.trUtf8(u'OpenLP Main Display Blanked'),
- self.trUtf8(u'The Main Display has been blanked out'),
+ self.trUtf8('OpenLP Main Display Blanked'),
+ self.trUtf8('The Main Display has been blanked out'),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok),
QtGui.QMessageBox.Ok)
self.LiveController.blankButton.setChecked(True)
@@ -623,8 +623,8 @@
"""
if self.serviceNotSaved:
ret = QtGui.QMessageBox.question(None,
- self.trUtf8(u'Save Changes to Service?'),
- self.trUtf8(u'Your service has changed, do you want to save those changes?'),
+ self.trUtf8('Save Changes to Service?'),
+ self.trUtf8('Your service has changed, do you want to save those changes?'),
QtGui.QMessageBox.StandardButtons(
QtGui.QMessageBox.Cancel |
QtGui.QMessageBox.Discard |
=== modified file 'openlp/core/ui/plugindialog.py'
--- openlp/core/ui/plugindialog.py 2009-10-27 07:20:01 +0000
+++ openlp/core/ui/plugindialog.py 2009-11-27 21:15:22 +0000
@@ -97,11 +97,11 @@
QtCore.QMetaObject.connectSlotsByName(PluginViewDialog)
def retranslateUi(self, PluginViewDialog):
- PluginViewDialog.setWindowTitle(self.trUtf8(u'Plugin List'))
- self.PluginInfoGroupBox.setTitle(self.trUtf8(u'Plugin Details'))
- self.VersionLabel.setText(self.trUtf8(u'Version:'))
- self.VersionNumberLabel.setText(self.trUtf8(u'TextLabel'))
- self.AboutLabel.setText(self.trUtf8(u'About:'))
- self.StatusLabel.setText(self.trUtf8(u'Status:'))
- self.StatusComboBox.setItemText(0, self.trUtf8(u'Active'))
- self.StatusComboBox.setItemText(1, self.trUtf8(u'Inactive'))
+ PluginViewDialog.setWindowTitle(self.trUtf8('Plugin List'))
+ self.PluginInfoGroupBox.setTitle(self.trUtf8('Plugin Details'))
+ self.VersionLabel.setText(self.trUtf8('Version:'))
+ self.VersionNumberLabel.setText(self.trUtf8('TextLabel'))
+ self.AboutLabel.setText(self.trUtf8('About:'))
+ self.StatusLabel.setText(self.trUtf8('Status:'))
+ self.StatusComboBox.setItemText(0, self.trUtf8('Active'))
+ self.StatusComboBox.setItemText(1, self.trUtf8('Inactive'))
=== modified file 'openlp/core/ui/servicemanager.py'
--- openlp/core/ui/servicemanager.py 2009-11-15 07:24:30 +0000
+++ openlp/core/ui/servicemanager.py 2009-11-27 21:15:22 +0000
@@ -127,16 +127,16 @@
# Create the top toolbar
self.Toolbar = OpenLPToolbar(self)
self.Toolbar.addToolbarButton(
- self.trUtf8(u'New Service'), u':/services/service_new.png',
- self.trUtf8(u'Create a new service'), self.onNewService)
- self.Toolbar.addToolbarButton(
- self.trUtf8(u'Open Service'), u':/services/service_open.png',
- self.trUtf8(u'Load an existing service'), self.onLoadService)
- self.Toolbar.addToolbarButton(
- self.trUtf8(u'Save Service'), u':/services/service_save.png',
- self.trUtf8(u'Save this service'), self.onSaveService)
+ self.trUtf8('New Service'), u':/services/service_new.png',
+ self.trUtf8('Create a new service'), self.onNewService)
+ self.Toolbar.addToolbarButton(
+ self.trUtf8('Open Service'), u':/services/service_open.png',
+ self.trUtf8('Load an existing service'), self.onLoadService)
+ self.Toolbar.addToolbarButton(
+ self.trUtf8('Save Service'), u':/services/service_save.png',
+ self.trUtf8('Save this service'), self.onSaveService)
self.Toolbar.addSeparator()
- self.ThemeLabel = QtGui.QLabel(self.trUtf8(u'Theme:'),
+ self.ThemeLabel = QtGui.QLabel(self.trUtf8('Theme:'),
self)
self.ThemeLabel.setMargin(3)
self.Toolbar.addWidget(self.ThemeLabel)
@@ -170,46 +170,46 @@
QtCore.Qt.ActionsContextMenu)
self.editAction = contextMenuAction(
self.ServiceManagerList, ':/system/system_live.png',
- self.trUtf8(u'&Edit Item'), self.remoteEdit)
+ self.trUtf8('&Edit Item'), self.remoteEdit)
self.ServiceManagerList.addAction(self.editAction)
self.ServiceManagerList.addAction(contextMenuSeparator(
self.ServiceManagerList))
self.ServiceManagerList.addAction(contextMenuAction(
self.ServiceManagerList, ':/system/system_preview.png',
- self.trUtf8(u'&Preview Verse'), self.makePreview))
+ self.trUtf8('&Preview Verse'), self.makePreview))
self.ServiceManagerList.addAction(contextMenuAction(
self.ServiceManagerList, ':/system/system_live.png',
- self.trUtf8(u'&Show Live'), self.makeLive))
+ self.trUtf8('&Show Live'), self.makeLive))
self.ServiceManagerList.addAction(contextMenuSeparator(
self.ServiceManagerList))
self.ServiceManagerList.addAction(contextMenuAction(
self.ServiceManagerList, ':/services/service_delete',
- self.trUtf8(u'&Remove from Service'), self.onDeleteFromService))
+ self.trUtf8('&Remove from Service'), self.onDeleteFromService))
self.ServiceManagerList.addAction(contextMenuSeparator(
self.ServiceManagerList))
self.ThemeMenu = contextMenu(
self.ServiceManagerList, '',
- self.trUtf8(u'&Change Item Theme'))
+ self.trUtf8('&Change Item Theme'))
self.ServiceManagerList.addAction(self.ThemeMenu.menuAction())
self.Layout.addWidget(self.ServiceManagerList)
# Add the bottom toolbar
self.OrderToolbar = OpenLPToolbar(self)
self.OrderToolbar.addToolbarButton(
- self.trUtf8(u'Move to top'), u':/services/service_top.png',
- self.trUtf8(u'Move to top'), self.onServiceTop)
- self.OrderToolbar.addToolbarButton(
- self.trUtf8(u'Move up'), u':/services/service_up.png',
- self.trUtf8(u'Move up order'), self.onServiceUp)
- self.OrderToolbar.addToolbarButton(
- self.trUtf8(u'Move down'), u':/services/service_down.png',
- self.trUtf8(u'Move down order'), self.onServiceDown)
- self.OrderToolbar.addToolbarButton(
- self.trUtf8(u'Move to bottom'), u':/services/service_bottom.png',
- self.trUtf8(u'Move to end'), self.onServiceEnd)
+ self.trUtf8('Move to top'), u':/services/service_top.png',
+ self.trUtf8('Move to top'), self.onServiceTop)
+ self.OrderToolbar.addToolbarButton(
+ self.trUtf8('Move up'), u':/services/service_up.png',
+ self.trUtf8('Move up order'), self.onServiceUp)
+ self.OrderToolbar.addToolbarButton(
+ self.trUtf8('Move down'), u':/services/service_down.png',
+ self.trUtf8('Move down order'), self.onServiceDown)
+ self.OrderToolbar.addToolbarButton(
+ self.trUtf8('Move to bottom'), u':/services/service_bottom.png',
+ self.trUtf8('Move to end'), self.onServiceEnd)
self.OrderToolbar.addSeparator()
self.OrderToolbar.addToolbarButton(
- self.trUtf8(u'Delete From Service'), u':/services/service_delete.png',
- self.trUtf8(u'Delete From Service'), self.onDeleteFromService)
+ self.trUtf8('Delete From Service'), u':/services/service_delete.png',
+ self.trUtf8('Delete From Service'), self.onDeleteFromService)
self.Layout.addWidget(self.OrderToolbar)
# Connect up our signals and slots
QtCore.QObject.connect(self.ThemeComboBox,
@@ -348,9 +348,9 @@
str_to_bool(PluginConfig(u'General').
get_config(u'prompt save service', u'False')):
ret = QtGui.QMessageBox.question(None,
- self.trUtf8(u'Save Changes to Service?'),
- self.trUtf8(u'Your service is unsaved, do you want to save those '
- u'changes before creating a new one ?'),
+ self.trUtf8('Save Changes to Service?'),
+ self.trUtf8('Your service is unsaved, do you want to save those '
+ 'changes before creating a new one ?'),
QtGui.QMessageBox.StandardButtons(
QtGui.QMessageBox.Cancel |
QtGui.QMessageBox.Save),
@@ -469,7 +469,7 @@
filename = self.config.get_last_dir()
else:
filename = QtGui.QFileDialog.getOpenFileName(
- self, self.trUtf8(u'Open Service'),
+ self, self.trUtf8('Open Service'),
self.config.get_last_dir(), u'Services (*.osz)')
filename = unicode(filename)
name = filename.split(os.path.sep)
=== modified file 'openlp/core/ui/settingsdialog.py'
--- openlp/core/ui/settingsdialog.py 2009-10-28 21:52:13 +0000
+++ openlp/core/ui/settingsdialog.py 2009-11-27 21:15:22 +0000
@@ -58,4 +58,4 @@
QtCore.QMetaObject.connectSlotsByName(SettingsDialog)
def retranslateUi(self, SettingsDialog):
- SettingsDialog.setWindowTitle(self.trUtf8(u'Settings'))
+ SettingsDialog.setWindowTitle(self.trUtf8('Settings'))
=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py 2009-11-15 07:24:30 +0000
+++ openlp/core/ui/slidecontroller.py 2009-11-27 21:15:22 +0000
@@ -97,12 +97,12 @@
self.TypeLabel = QtGui.QLabel(self.Panel)
if self.isLive:
self.TypeLabel.setText(u'<strong>%s</strong>' %
- self.trUtf8(u'Live'))
+ self.trUtf8('Live'))
self.split = 1
prefix = u'live_slidecontroller'
else:
self.TypeLabel.setText(u'<strong>%s</strong>' %
- self.trUtf8(u'Preview'))
+ self.trUtf8('Preview'))
self.split = 0
prefix = u'preview_slidecontroller'
self.TypeLabel.setAlignment(QtCore.Qt.AlignCenter)
@@ -145,58 +145,58 @@
if self.isLive:
self.Toolbar.addToolbarButton(
u'First Slide', u':/slides/slide_first.png',
- self.trUtf8(u'Move to first'), self.onSlideSelectedFirst)
+ self.trUtf8('Move to first'), self.onSlideSelectedFirst)
self.Toolbar.addToolbarButton(
u'Previous Slide', u':/slides/slide_previous.png',
- self.trUtf8(u'Move to previous'), self.onSlideSelectedPrevious)
+ self.trUtf8('Move to previous'), self.onSlideSelectedPrevious)
self.Toolbar.addToolbarButton(
u'Next Slide', u':/slides/slide_next.png',
- self.trUtf8(u'Move to next'), self.onSlideSelectedNext)
+ self.trUtf8('Move to next'), self.onSlideSelectedNext)
if self.isLive:
self.Toolbar.addToolbarButton(
u'Last Slide', u':/slides/slide_last.png',
- self.trUtf8(u'Move to last'), self.onSlideSelectedLast)
+ self.trUtf8('Move to last'), self.onSlideSelectedLast)
if self.isLive:
self.Toolbar.addToolbarSeparator(u'Close Separator')
self.blankButton = self.Toolbar.addToolbarButton(
u'Blank Screen', u':/slides/slide_close.png',
- self.trUtf8(u'Blank Screen'), self.onBlankScreen, True)
+ self.trUtf8('Blank Screen'), self.onBlankScreen, True)
QtCore.QObject.connect(Receiver.get_receiver(),
QtCore.SIGNAL(u'live_slide_blank'), self.onBlankDisplay)
if not self.isLive:
self.Toolbar.addToolbarSeparator(u'Close Separator')
self.Toolbar.addToolbarButton(
u'Go Live', u':/system/system_live.png',
- self.trUtf8(u'Move to live'), self.onGoLive)
+ self.trUtf8('Move to live'), self.onGoLive)
self.Toolbar.addToolbarSeparator(u'Close Separator')
self.Toolbar.addToolbarButton(
u'Edit Song', u':songs/song_edit.png',
- self.trUtf8(u'Edit and re-preview Song'), self.onEditSong)
+ self.trUtf8('Edit and re-preview Song'), self.onEditSong)
if isLive:
self.Toolbar.addToolbarSeparator(u'Loop Separator')
self.Toolbar.addToolbarButton(
u'Start Loop', u':/media/media_time.png',
- self.trUtf8(u'Start continuous loop'), self.onStartLoop)
+ self.trUtf8('Start continuous loop'), self.onStartLoop)
self.Toolbar.addToolbarButton(
u'Stop Loop', u':/media/media_stop.png',
- self.trUtf8(u'Stop continuous loop'), self.onStopLoop)
+ self.trUtf8('Stop continuous loop'), self.onStopLoop)
self.DelaySpinBox = QtGui.QSpinBox()
self.Toolbar.addToolbarWidget(
u'Image SpinBox', self.DelaySpinBox)
- self.DelaySpinBox.setSuffix(self.trUtf8(u's'))
- self.DelaySpinBox.setToolTip(self.trUtf8(u'Delay between slides in seconds'))
+ self.DelaySpinBox.setSuffix(self.trUtf8('s'))
+ self.DelaySpinBox.setToolTip(self.trUtf8('Delay between slides in seconds'))
self.ControllerLayout.addWidget(self.Toolbar)
#Build a Media ToolBar
self.Mediabar = OpenLPToolbar(self)
self.Mediabar.addToolbarButton(
u'Media Start', u':/slides/media_playback_start.png',
- self.trUtf8(u'Start playing media'), self.onMediaPlay)
+ self.trUtf8('Start playing media'), self.onMediaPlay)
self.Mediabar.addToolbarButton(
u'Media Pause', u':/slides/media_playback_pause.png',
- self.trUtf8(u'Start playing media'), self.onMediaPause)
+ self.trUtf8('Start playing media'), self.onMediaPause)
self.Mediabar.addToolbarButton(
u'Media Stop', u':/slides/media_playback_stop.png',
- self.trUtf8(u'Start playing media'), self.onMediaStop)
+ self.trUtf8('Start playing media'), self.onMediaStop)
self.volumeSlider = Phonon.VolumeSlider()
self.volumeSlider.setGeometry(QtCore.QRect(90, 260, 221, 24))
self.volumeSlider.setObjectName(u'volumeSlider')
@@ -208,16 +208,16 @@
self.Songbar = OpenLPToolbar(self)
self.Songbar.addToolbarButton(
u'Bridge', u':/pages/page_bridge.png',
- self.trUtf8(u'Bridge'),
+ self.trUtf8('Bridge'),
self.onSongBarHandler)
self.Songbar.addToolbarButton(
u'Chorus', u':/pages/page_chorus.png',
- self.trUtf8(u'Chorus'),
+ self.trUtf8('Chorus'),
self.onSongBarHandler)
for verse in range(1, 12):
self.Songbar.addToolbarButton(
unicode(verse), u':/pages/page_%s.png' % verse,
- unicode(self.trUtf8(u'Verse %s'))%verse,
+ unicode(self.trUtf8('Verse %s'))%verse,
self.onSongBarHandler)
self.ControllerLayout.addWidget(self.Songbar)
self.Songbar.setVisible(False)
=== modified file 'openlp/core/ui/splashscreen.py'
--- openlp/core/ui/splashscreen.py 2009-10-24 16:40:36 +0000
+++ openlp/core/ui/splashscreen.py 2009-11-27 21:15:22 +0000
@@ -29,8 +29,8 @@
def __init__(self, version):
self.splash_screen = QtGui.QSplashScreen()
self.setupUi()
- self.message = self.splash_screen.trUtf8(u'Starting')\
- + u'..... ' + version
+ self.message = self.splash_screen.trUtf8('Starting')\
+ + '..... ' + version
def setupUi(self):
self.splash_screen.setObjectName(u'splash_screen')
@@ -57,7 +57,7 @@
def retranslateUi(self):
self.splash_screen.setWindowTitle(
- self.splash_screen.trUtf8(u'Splash Screen'))
+ self.splash_screen.trUtf8('Splash Screen'))
def show(self):
self.splash_screen.show()
=== modified file 'openlp/core/ui/thememanager.py'
--- openlp/core/ui/thememanager.py 2009-11-15 07:02:27 +0000
+++ openlp/core/ui/thememanager.py 2009-11-27 21:15:22 +0000
@@ -53,21 +53,21 @@
self.amendThemeForm = AmendThemeForm(self)
self.Toolbar = OpenLPToolbar(self)
self.Toolbar.addToolbarButton(
- self.trUtf8(u'New Theme'), u':/themes/theme_new.png',
- self.trUtf8(u'Create a new theme'), self.onAddTheme)
- self.Toolbar.addToolbarButton(
- self.trUtf8(u'Edit Theme'), u':/themes/theme_edit.png',
- self.trUtf8(u'Edit a theme'), self.onEditTheme)
- self.Toolbar.addToolbarButton(
- self.trUtf8(u'Delete Theme'), u':/themes/theme_delete.png',
- self.trUtf8(u'Delete a theme'), self.onDeleteTheme)
+ self.trUtf8('New Theme'), u':/themes/theme_new.png',
+ self.trUtf8('Create a new theme'), self.onAddTheme)
+ self.Toolbar.addToolbarButton(
+ self.trUtf8('Edit Theme'), u':/themes/theme_edit.png',
+ self.trUtf8('Edit a theme'), self.onEditTheme)
+ self.Toolbar.addToolbarButton(
+ self.trUtf8('Delete Theme'), u':/themes/theme_delete.png',
+ self.trUtf8('Delete a theme'), self.onDeleteTheme)
self.Toolbar.addSeparator()
self.Toolbar.addToolbarButton(
- self.trUtf8(u'Import Theme'), u':/themes/theme_import.png',
- self.trUtf8(u'Import a theme'), self.onImportTheme)
+ self.trUtf8('Import Theme'), u':/themes/theme_import.png',
+ self.trUtf8('Import a theme'), self.onImportTheme)
self.Toolbar.addToolbarButton(
- self.trUtf8(u'Export Theme'), u':/themes/theme_export.png',
- self.trUtf8(u'Export a theme'), self.onExportTheme)
+ self.trUtf8('Export Theme'), u':/themes/theme_export.png',
+ self.trUtf8('Export a theme'), self.onExportTheme)
self.ThemeWidget = QtGui.QWidgetAction(self.Toolbar)
self.Layout.addWidget(self.Toolbar)
self.ThemeListWidget = QtGui.QListWidget(self)
@@ -77,23 +77,23 @@
self.ThemeListWidget.setContextMenuPolicy(QtCore.Qt.ActionsContextMenu)
self.ThemeListWidget.addAction(
contextMenuAction(self.ThemeListWidget, u':/themes/theme_edit.png',
- self.trUtf8(u'Edit a theme'), self.onEditTheme))
+ self.trUtf8('Edit a theme'), self.onEditTheme))
self.ThemeListWidget.addAction(
contextMenuSeparator(self.ThemeListWidget))
self.ThemeListWidget.addAction(
contextMenuAction(self.ThemeListWidget,
u':/themes/theme_delete.png',
- self.trUtf8(u'Delete theme'),
+ self.trUtf8('Delete theme'),
self.onDeleteTheme))
self.ThemeListWidget.addAction(
contextMenuAction(self.ThemeListWidget,
u':/themes/theme_export.png',
- self.trUtf8(u'Make Global'),
+ self.trUtf8('Make Global'),
self.changeGlobalFromScreen))
self.ThemeListWidget.addAction(
contextMenuAction(self.ThemeListWidget,
u':/themes/theme_export.png',
- self.trUtf8(u'Export theme'),
+ self.trUtf8('Export theme'),
self.onExportTheme))
self.ThemeListWidget.addAction(
contextMenuSeparator(self.ThemeListWidget))
@@ -125,7 +125,7 @@
self.ThemeListWidget.item(count).setText(newName)
#Set the new name
if themeName == newName:
- name = u'%s (%s)' % (newName, self.trUtf8(u'default'))
+ name = u'%s (%s)' % (newName, self.trUtf8('default'))
self.ThemeListWidget.item(count).setText(name)
def changeGlobalFromScreen(self, index = -1):
@@ -142,7 +142,7 @@
if count == selected_row:
self.global_theme = unicode(
self.ThemeListWidget.item(count).text())
- name = u'%s (%s)' % (self.global_theme, self.trUtf8(u'default'))
+ name = u'%s (%s)' % (self.global_theme, self.trUtf8('default'))
self.ThemeListWidget.item(count).setText(name)
self.config.set_config(u'theme global theme', self.global_theme)
Receiver.send_message(
@@ -174,8 +174,8 @@
# should be the same unless default
if theme != unicode(item.data(QtCore.Qt.UserRole).toString()):
QtGui.QMessageBox.critical(
- self, self.trUtf8(u'Error'),
- self.trUtf8(u'You are unable to delete the default theme!'),
+ self, self.trUtf8('Error'),
+ self.trUtf8('You are unable to delete the default theme!'),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
else:
self.themelist.remove(theme)
@@ -199,13 +199,13 @@
"""
item = self.ThemeListWidget.currentItem()
if item is None:
- QtGui.QMessageBox.critical(self, self.trUtf8(u'Error'),
- self.trUtf8(u'You have not selected a theme!'),
+ QtGui.QMessageBox.critical(self, self.trUtf8('Error'),
+ self.trUtf8('You have not selected a theme!'),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
return
theme = unicode(item.data(QtCore.Qt.UserRole).toString())
path = QtGui.QFileDialog.getExistingDirectory(self,
- unicode(self.trUtf8(u'Save Theme - (%s)')) % theme,
+ unicode(self.trUtf8('Save Theme - (%s)')) % theme,
self.config.get_last_dir(1) )
path = unicode(path)
if path:
@@ -227,7 +227,7 @@
def onImportTheme(self):
files = QtGui.QFileDialog.getOpenFileNames(
- self, self.trUtf8(u'Select Theme Import File'),
+ self, self.trUtf8('Select Theme Import File'),
self.config.get_last_dir(), u'Theme (*.*)')
log.info(u'New Themes %s', unicode(files))
if len(files) > 0:
@@ -255,7 +255,7 @@
textName = os.path.splitext(name)[0]
if textName == self.global_theme:
name = u'%s (%s)' % (textName,
- self.trUtf8(u'default'))
+ self.trUtf8('default'))
else:
name = textName
item_name = QtGui.QListWidgetItem(name)
@@ -328,8 +328,8 @@
self.generateAndSaveImage(dir, themename, filexml)
except:
QtGui.QMessageBox.critical(
- self, self.trUtf8(u'Error'),
- self.trUtf8(u'File is not a valid theme!'),
+ self, self.trUtf8('Error'),
+ self.trUtf8('File is not a valid theme!'),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
log.exception(u'Importing theme from zip file failed')
finally:
@@ -407,9 +407,9 @@
if self.saveThemeName != name:
if os.path.exists(theme_file):
result = QtGui.QMessageBox.question(
- self, self.trUtf8(u'Theme Exists'),
- self.trUtf8(u'A theme with this name already exists, '
- u'would you like to overwrite it?'),
+ self, self.trUtf8('Theme Exists'),
+ self.trUtf8('A theme with this name already exists, '
+ 'would you like to overwrite it?'),
(QtGui.QMessageBox.Yes | QtGui.QMessageBox.No),
QtGui.QMessageBox.No)
else:
@@ -465,7 +465,7 @@
def baseTheme(self):
log.debug(u'base theme created')
newtheme = ThemeXML()
- newtheme.new_document(unicode(self.trUtf8(u'New Theme')))
+ newtheme.new_document(unicode(self.trUtf8('New Theme')))
newtheme.add_background_solid(unicode(u'#000000'))
newtheme.add_font(unicode(QtGui.QFont().family()), unicode(u'#FFFFFF'),
unicode(30), u'False')
=== modified file 'openlp/core/ui/themestab.py'
--- openlp/core/ui/themestab.py 2009-11-13 21:24:59 +0000
+++ openlp/core/ui/themestab.py 2009-11-27 21:15:22 +0000
@@ -36,7 +36,7 @@
def setupUi(self):
self.setObjectName(u'ThemesTab')
- self.tabTitleVisible = self.trUtf8(u'Themes')
+ self.tabTitleVisible = self.trUtf8('Themes')
self.ThemesTabLayout = QtGui.QHBoxLayout(self)
self.ThemesTabLayout.setSpacing(8)
self.ThemesTabLayout.setMargin(8)
@@ -105,21 +105,21 @@
QtCore.SIGNAL(u'update_themes'), self.updateThemeList)
def retranslateUi(self):
- self.GlobalGroupBox.setTitle(self.trUtf8(u'Global theme'))
- self.LevelGroupBox.setTitle(self.trUtf8(u'Theme level'))
- self.SongLevelRadioButton.setText(self.trUtf8(u'Song level'))
- self.SongLevelLabel.setText(self.trUtf8(u'Use the theme from each song '
- u'in the database. If a song doesn\'t have a theme associated with '
- u'it, then use the service\'s theme. If the service doesn\'t have '
- u'a theme, then use the global theme.'))
- self.ServiceLevelRadioButton.setText(self.trUtf8(u'Service level'))
- self.ServiceLevelLabel.setText(self.trUtf8(u'Use the theme from the '
- u'service, overriding any of the individual songs\' themes. If the '
- u'service doesn\'t have a theme, then use the global theme.'))
- self.GlobalLevelRadioButton.setText(self.trUtf8(u'Global level'))
- self.GlobalLevelLabel.setText(self.trUtf8(u'Use the global theme, '
- u'overriding any themes associated with either the service or the '
- u'songs.'))
+ self.GlobalGroupBox.setTitle(self.trUtf8('Global theme'))
+ self.LevelGroupBox.setTitle(self.trUtf8('Theme level'))
+ self.SongLevelRadioButton.setText(self.trUtf8('Song level'))
+ self.SongLevelLabel.setText(self.trUtf8('Use the theme from each song '
+ 'in the database. If a song doesn\'t have a theme associated with '
+ 'it, then use the service\'s theme. If the service doesn\'t have '
+ 'a theme, then use the global theme.'))
+ self.ServiceLevelRadioButton.setText(self.trUtf8('Service level'))
+ self.ServiceLevelLabel.setText(self.trUtf8('Use the theme from the '
+ 'service, overriding any of the individual songs\' themes. If the '
+ 'service doesn\'t have a theme, then use the global theme.'))
+ self.GlobalLevelRadioButton.setText(self.trUtf8('Global level'))
+ self.GlobalLevelLabel.setText(self.trUtf8('Use the global theme, '
+ 'overriding any themes associated with either the service or the '
+ 'songs.'))
def load(self):
self.global_style = self.config.get_config(
=== modified file 'openlp/plugins/bibles/bibleplugin.py'
--- openlp/plugins/bibles/bibleplugin.py 2009-11-07 07:42:18 +0000
+++ openlp/plugins/bibles/bibleplugin.py 2009-11-27 21:15:22 +0000
@@ -68,7 +68,7 @@
self.ImportBibleItem = QtGui.QAction(import_menu)
self.ImportBibleItem.setObjectName(u'ImportBibleItem')
import_menu.addAction(self.ImportBibleItem)
- self.ImportBibleItem.setText(import_menu.trUtf8(u'&Bible'))
+ self.ImportBibleItem.setText(import_menu.trUtf8('&Bible'))
# Signals and slots
QtCore.QObject.connect(self.ImportBibleItem,
QtCore.SIGNAL(u'triggered()'), self.onBibleNewClick)
@@ -78,7 +78,7 @@
self.ExportBibleItem = QtGui.QAction(export_menu)
self.ExportBibleItem.setObjectName(u'ExportBibleItem')
export_menu.addAction(self.ExportBibleItem)
- self.ExportBibleItem.setText(export_menu.trUtf8(u'&Bible'))
+ self.ExportBibleItem.setText(export_menu.trUtf8('&Bible'))
self.ExportBibleItem.setVisible(False)
def onBibleNewClick(self):
@@ -86,7 +86,7 @@
self.media_item.onNewClick()
def about(self):
- about_text = self.trUtf8(u'<strong>Bible Plugin</strong><br />This '
- u'plugin allows bible verses from different sources to be '
- u'displayed on the screen during the service.')
+ about_text = self.trUtf8('<strong>Bible Plugin</strong><br />This '
+ 'plugin allows bible verses from different sources to be '
+ 'displayed on the screen during the service.')
return about_text
=== modified file 'openlp/plugins/bibles/forms/bibleimportdialog.py'
--- openlp/plugins/bibles/forms/bibleimportdialog.py 2009-10-28 20:57:14 +0000
+++ openlp/plugins/bibles/forms/bibleimportdialog.py 2009-11-27 21:15:22 +0000
@@ -226,33 +226,33 @@
BibleImportDialog.setTabOrder(self.CopyrightEdit, self.PermisionEdit)
def retranslateUi(self, BibleImportDialog):
- BibleImportDialog.setWindowTitle(self.trUtf8(u'Bible Registration'))
- self.LicenceDetailsGroupBox.setTitle(self.trUtf8(u'Licence Details'))
- self.VersionNameLabel.setText(self.trUtf8(u'Version Name:'))
- self.CopyrightLabel.setText(self.trUtf8(u'Copyright:'))
- self.PermisionLabel.setText(self.trUtf8(u'Permission:'))
- self.ProgressGroupBox.setTitle(self.trUtf8(u'Import Progress'))
- self.ProgressBar.setFormat(self.trUtf8(u'%p'))
- self.ImportButton.setText(self.trUtf8(u'Import'))
- self.CancelButton.setText(self.trUtf8(u'Cancel'))
- self.OSISGroupBox.setTitle(self.trUtf8(u'OSIS Bible'))
- self.BibleNameLabel.setText(self.trUtf8(u'Bible Name:'))
- self.LocatioLabel.setText(self.trUtf8(u'File Location:'))
+ BibleImportDialog.setWindowTitle(self.trUtf8('Bible Registration'))
+ self.LicenceDetailsGroupBox.setTitle(self.trUtf8('Licence Details'))
+ self.VersionNameLabel.setText(self.trUtf8('Version Name:'))
+ self.CopyrightLabel.setText(self.trUtf8('Copyright:'))
+ self.PermisionLabel.setText(self.trUtf8('Permission:'))
+ self.ProgressGroupBox.setTitle(self.trUtf8('Import Progress'))
+ self.ProgressBar.setFormat(self.trUtf8('%p'))
+ self.ImportButton.setText(self.trUtf8('Import'))
+ self.CancelButton.setText(self.trUtf8('Cancel'))
+ self.OSISGroupBox.setTitle(self.trUtf8('OSIS Bible'))
+ self.BibleNameLabel.setText(self.trUtf8('Bible Name:'))
+ self.LocatioLabel.setText(self.trUtf8('File Location:'))
self.tabWidget.setTabText(self.tabWidget.indexOf(self.OsisTab),
- self.trUtf8(u'Osis (Sword) Imports'))
- self.CVSGroupBox.setTitle(self.trUtf8(u'CVS Bible'))
- self.BooksLocationLabel.setText(self.trUtf8(u'Books Location:'))
- self.VerseLocationLabel.setText(self.trUtf8(u'Verse Location:'))
+ self.trUtf8('Osis (Sword) Imports'))
+ self.CVSGroupBox.setTitle(self.trUtf8('CVS Bible'))
+ self.BooksLocationLabel.setText(self.trUtf8('Books Location:'))
+ self.VerseLocationLabel.setText(self.trUtf8('Verse Location:'))
self.tabWidget.setTabText(self.tabWidget.indexOf(self.CsvTab),
- self.trUtf8(u'CSV File Imports'))
- self.OptionsGroupBox.setTitle(self.trUtf8(u'Download Options'))
- self.LocationLabel.setText(self.trUtf8(u'Location:'))
- self.LocationComboBox.setItemText(0, self.trUtf8(u'Crosswalk'))
- self.LocationComboBox.setItemText(1, self.trUtf8(u'BibleGateway'))
- self.BibleLabel.setText(self.trUtf8(u'Bible:'))
- self.ProxyGroupBox.setTitle(self.trUtf8(u'Proxy Settings (Optional)'))
- self.AddressLabel.setText(self.trUtf8(u'Proxy Address:'))
- self.UsernameLabel.setText(self.trUtf8(u'Username:'))
- self.PasswordLabel.setText(self.trUtf8(u'Password:'))
+ self.trUtf8('CSV File Imports'))
+ self.OptionsGroupBox.setTitle(self.trUtf8('Download Options'))
+ self.LocationLabel.setText(self.trUtf8('Location:'))
+ self.LocationComboBox.setItemText(0, self.trUtf8('Crosswalk'))
+ self.LocationComboBox.setItemText(1, self.trUtf8('BibleGateway'))
+ self.BibleLabel.setText(self.trUtf8('Bible:'))
+ self.ProxyGroupBox.setTitle(self.trUtf8('Proxy Settings (Optional)'))
+ self.AddressLabel.setText(self.trUtf8('Proxy Address:'))
+ self.UsernameLabel.setText(self.trUtf8('Username:'))
+ self.PasswordLabel.setText(self.trUtf8('Password:'))
self.tabWidget.setTabText(self.tabWidget.indexOf(self.HttpTab),
- self.trUtf8(u'Web Downloads'))
+ self.trUtf8('Web Downloads'))
=== modified file 'openlp/plugins/bibles/forms/bibleimportform.py'
--- openlp/plugins/bibles/forms/bibleimportform.py 2009-11-13 21:24:59 +0000
+++ openlp/plugins/bibles/forms/bibleimportform.py 2009-11-27 21:15:22 +0000
@@ -130,7 +130,7 @@
def onVersesFileButtonClicked(self):
filename = QtGui.QFileDialog.getOpenFileName(
- self, self.trUtf8(u'Open Bible Verses file'),
+ self, self.trUtf8('Open Bible Verses file'),
self.config.get_last_dir(1))
if filename:
self.VerseLocationEdit.setText(filename)
@@ -139,7 +139,7 @@
def onBooksFileButtonClicked(self):
filename = QtGui.QFileDialog.getOpenFileName(
- self, self.trUtf8(u'Open Bible Books file'),
+ self, self.trUtf8('Open Bible Books file'),
self.config.get_last_dir(2))
if filename:
self.BooksLocationEdit.setText(filename)
@@ -148,7 +148,7 @@
def onOsisFileButtonClicked(self):
filename = QtGui.QFileDialog.getOpenFileName(
- self, self.trUtf8(u'Open OSIS import file'),
+ self, self.trUtf8('Open OSIS import file'),
self.config.get_last_dir(3))
if filename:
self.OSISLocationEdit.setText(filename)
@@ -198,18 +198,18 @@
def onCancelButtonClicked(self):
# tell import to stop
- self.message = self.trUtf8(u'Bible import stopped')
+ self.message = self.trUtf8('Bible import stopped')
Receiver.send_message(u'stop_import')
# tell bibleplugin to reload the bibles
Receiver.send_message(u'pre_load_bibles')
self.close()
def onImportButtonClicked(self):
- message = self.trUtf8(u'Bible import completed')
+ message = self.trUtf8('Bible import completed')
if self.biblemanager:
if not self.bible_type is None and \
len(self.BibleNameEdit.displayText()) > 0:
- self.MessageLabel.setText(self.trUtf8(u'Import Started'))
+ self.MessageLabel.setText(self.trUtf8('Import Started'))
self.ProgressBar.setMinimum(0)
self.setMax(65)
self.ProgressBar.setValue(0)
@@ -222,7 +222,7 @@
# tell bibleplugin to reload the bibles
Receiver.send_message(u'pre_load_bibles')
QtGui.QMessageBox.information(self,
- self.trUtf8(u'Information'), self.trUtf8(message))
+ self.trUtf8('Information'), self.trUtf8(message))
def setMax(self, max):
log.debug(u'set Max %s', max)
@@ -231,7 +231,7 @@
def incrementProgressBar(self, text ):
log.debug(u'IncrementBar %s', text)
- self.MessageLabel.setText(self.trUtf8(u'Import processing %s') % text)
+ self.MessageLabel.setText(self.trUtf8('Import processing %s') % text)
self.ProgressBar.setValue(self.ProgressBar.value() + 1)
def importBible(self):
@@ -268,7 +268,7 @@
unicode(self.CopyrightEdit.displayText()),
unicode(self.PermisionEdit.displayText()))
else:
- message = self.trUtf8(u'Bible import failed')
+ message = self.trUtf8('Bible import failed')
self.bible_type = None
# free the screen state restrictions
self.resetScreenFieldStates()
=== modified file 'openlp/plugins/bibles/lib/biblestab.py'
--- openlp/plugins/bibles/lib/biblestab.py 2009-10-30 17:44:16 +0000
+++ openlp/plugins/bibles/lib/biblestab.py 2009-11-27 21:15:22 +0000
@@ -45,7 +45,7 @@
def setupUi(self):
self.setObjectName(u'BiblesTab')
- self.tabTitleVisible = self.trUtf8(u'Bibles')
+ self.tabTitleVisible = self.trUtf8('Bibles')
self.BibleLayout = QtGui.QHBoxLayout(self)
self.BibleLayout.setSpacing(8)
self.BibleLayout.setMargin(8)
@@ -149,21 +149,21 @@
QtCore.SIGNAL(u'update_themes'), self.updateThemeList)
def retranslateUi(self):
- self.VerseDisplayGroupBox.setTitle(self.trUtf8(u'Verse Display'))
- self.NewChaptersCheckBox.setText(self.trUtf8(u'Only show new chapter numbers'))
- self.LayoutStyleLabel.setText(self.trUtf8(u'Layout Style:'))
- self.DisplayStyleLabel.setText(self.trUtf8(u'Display Style:'))
- self.BibleThemeLabel.setText(self.trUtf8(u'Bible Theme:'))
- self.LayoutStyleComboBox.setItemText(0, self.trUtf8(u'verse per slide'))
- self.LayoutStyleComboBox.setItemText(1, self.trUtf8(u'verse per line'))
- self.LayoutStyleComboBox.setItemText(2, self.trUtf8(u'continuous'))
- self.DisplayStyleComboBox.setItemText(0, self.trUtf8(u'No brackets'))
- self.DisplayStyleComboBox.setItemText(1, self.trUtf8(u'( and )'))
- self.DisplayStyleComboBox.setItemText(2, self.trUtf8(u'{ and }'))
- self.DisplayStyleComboBox.setItemText(3, self.trUtf8(u'[ and ]'))
+ self.VerseDisplayGroupBox.setTitle(self.trUtf8('Verse Display'))
+ self.NewChaptersCheckBox.setText(self.trUtf8('Only show new chapter numbers'))
+ self.LayoutStyleLabel.setText(self.trUtf8('Layout Style:'))
+ self.DisplayStyleLabel.setText(self.trUtf8('Display Style:'))
+ self.BibleThemeLabel.setText(self.trUtf8('Bible Theme:'))
+ self.LayoutStyleComboBox.setItemText(0, self.trUtf8('verse per slide'))
+ self.LayoutStyleComboBox.setItemText(1, self.trUtf8('verse per line'))
+ self.LayoutStyleComboBox.setItemText(2, self.trUtf8('continuous'))
+ self.DisplayStyleComboBox.setItemText(0, self.trUtf8('No brackets'))
+ self.DisplayStyleComboBox.setItemText(1, self.trUtf8('( and )'))
+ self.DisplayStyleComboBox.setItemText(2, self.trUtf8('{ and }'))
+ self.DisplayStyleComboBox.setItemText(3, self.trUtf8('[ and ]'))
self.ChangeNoteLabel.setText(
- self.trUtf8(u'Note:\nChanges don\'t affect verses already in the service'))
- self.BibleDualCheckBox.setText(self.trUtf8(u'Display Dual Bible Verses'))
+ self.trUtf8('Note:\nChanges don\'t affect verses already in the service'))
+ self.BibleDualCheckBox.setText(self.trUtf8('Display Dual Bible Verses'))
def onBibleThemeComboBoxChanged(self):
self.bible_theme = self.BibleThemeComboBox.currentText()
=== modified file 'openlp/plugins/bibles/lib/manager.py'
--- openlp/plugins/bibles/lib/manager.py 2009-11-07 00:00:36 +0000
+++ openlp/plugins/bibles/lib/manager.py 2009-11-27 21:15:22 +0000
@@ -351,7 +351,7 @@
log.debug(u'get_verse_text : new book')
for chapter in range(schapter, echapter + 1):
self.media.setQuickMessage(
- unicode(self.media.trUtf8(u'Downloading %s: %s')) %
+ unicode(self.media.trUtf8('Downloading %s: %s')) %
(bookname, chapter))
search_results = \
self.bible_http_cache[bible].get_bible_chapter(
@@ -381,7 +381,7 @@
book.id, chapter)
if v is None:
self.media.setQuickMessage(
- unicode(self.media.trUtf8(u'%Downloading %s: %s'))\
+ unicode(self.media.trUtf8('%Downloading %s: %s'))\
% (bookname, chapter))
self.bible_db_cache[bible].create_chapter(
book.id, chapter,
@@ -394,7 +394,7 @@
if v is None:
try:
self.media.setQuickMessage(\
- unicode(self.media.trUtf8(u'Downloading %s: %s'))
+ unicode(self.media.trUtf8('Downloading %s: %s'))
% (bookname, chapter))
search_results = \
self.bible_http_cache[bible].get_bible_chapter(
=== modified file 'openlp/plugins/bibles/lib/mediaitem.py'
--- openlp/plugins/bibles/lib/mediaitem.py 2009-11-13 21:24:59 +0000
+++ openlp/plugins/bibles/lib/mediaitem.py 2009-11-27 21:15:22 +0000
@@ -58,7 +58,7 @@
QtCore.SIGNAL(u'openlpreloadbibles'), self.reloadBibles)
def initPluginNameVisible(self):
- self.PluginNameVisible = self.trUtf8(u'Bible')
+ self.PluginNameVisible = self.trUtf8('Bible')
def requiredIcons(self):
MediaManagerItem.requiredIcons(self)
@@ -131,7 +131,7 @@
self.QuickMessage = QtGui.QLabel(self.QuickTab)
self.QuickMessage.setObjectName(u'QuickMessage')
self.QuickLayout.addWidget(self.QuickMessage, 6, 0, 1, 3)
- self.SearchTabWidget.addTab(self.QuickTab, self.trUtf8(u'Quick'))
+ self.SearchTabWidget.addTab(self.QuickTab, self.trUtf8('Quick'))
QuickSpacerItem = QtGui.QSpacerItem(20, 35, QtGui.QSizePolicy.Minimum,
QtGui.QSizePolicy.Expanding)
self.QuickLayout.addItem(QuickSpacerItem, 6, 2, 1, 1)
@@ -215,7 +215,7 @@
self.AdvancedMessage = QtGui.QLabel(self.AdvancedTab)
self.AdvancedMessage.setObjectName(u'AdvancedMessage')
self.AdvancedLayout.addWidget(self.AdvancedMessage, 8, 0, 1, 3)
- self.SearchTabWidget.addTab(self.AdvancedTab, self.trUtf8(u'Advanced'))
+ self.SearchTabWidget.addTab(self.AdvancedTab, self.trUtf8('Advanced'))
# Add the search tab widget to the page layout
self.PageLayout.addWidget(self.SearchTabWidget)
# Combo Boxes
@@ -252,27 +252,27 @@
def retranslateUi(self):
log.debug(u'retranslateUi')
- self.QuickVersionLabel.setText(self.trUtf8(u'Version:'))
- self.QuickSecondVersionLabel.setText(self.trUtf8(u'Dual:'))
- self.QuickSearchLabel.setText(self.trUtf8(u'Search Type:'))
- self.QuickSearchLabel.setText(self.trUtf8(u'Find:'))
- self.QuickSearchButton.setText(self.trUtf8(u'Search'))
- self.QuickClearLabel.setText(self.trUtf8(u'Results:'))
- self.AdvancedVersionLabel.setText(self.trUtf8(u'Version:'))
- self.AdvancedSecondBibleLabel.setText(self.trUtf8(u'Dual:'))
- self.AdvancedBookLabel.setText(self.trUtf8(u'Book:'))
- self.AdvancedChapterLabel.setText(self.trUtf8(u'Chapter:'))
- self.AdvancedVerseLabel.setText(self.trUtf8(u'Verse:'))
- self.AdvancedFromLabel.setText(self.trUtf8(u'From:'))
- self.AdvancedToLabel.setText(self.trUtf8(u'To:'))
- self.AdvancedClearLabel.setText(self.trUtf8(u'Results:'))
- self.AdvancedSearchButton.setText(self.trUtf8(u'Search'))
- self.QuickSearchComboBox.addItem(self.trUtf8(u'Verse Search'))
- self.QuickSearchComboBox.addItem(self.trUtf8(u'Text Search'))
- self.ClearQuickSearchComboBox.addItem(self.trUtf8(u'Clear'))
- self.ClearQuickSearchComboBox.addItem(self.trUtf8(u'Keep'))
- self.ClearAdvancedSearchComboBox.addItem(self.trUtf8(u'Clear'))
- self.ClearAdvancedSearchComboBox.addItem(self.trUtf8(u'Keep'))
+ self.QuickVersionLabel.setText(self.trUtf8('Version:'))
+ self.QuickSecondVersionLabel.setText(self.trUtf8('Dual:'))
+ self.QuickSearchLabel.setText(self.trUtf8('Search Type:'))
+ self.QuickSearchLabel.setText(self.trUtf8('Find:'))
+ self.QuickSearchButton.setText(self.trUtf8('Search'))
+ self.QuickClearLabel.setText(self.trUtf8('Results:'))
+ self.AdvancedVersionLabel.setText(self.trUtf8('Version:'))
+ self.AdvancedSecondBibleLabel.setText(self.trUtf8('Dual:'))
+ self.AdvancedBookLabel.setText(self.trUtf8('Book:'))
+ self.AdvancedChapterLabel.setText(self.trUtf8('Chapter:'))
+ self.AdvancedVerseLabel.setText(self.trUtf8('Verse:'))
+ self.AdvancedFromLabel.setText(self.trUtf8('From:'))
+ self.AdvancedToLabel.setText(self.trUtf8('To:'))
+ self.AdvancedClearLabel.setText(self.trUtf8('Results:'))
+ self.AdvancedSearchButton.setText(self.trUtf8('Search'))
+ self.QuickSearchComboBox.addItem(self.trUtf8('Verse Search'))
+ self.QuickSearchComboBox.addItem(self.trUtf8('Text Search'))
+ self.ClearQuickSearchComboBox.addItem(self.trUtf8('Clear'))
+ self.ClearQuickSearchComboBox.addItem(self.trUtf8('Keep'))
+ self.ClearAdvancedSearchComboBox.addItem(self.trUtf8('Clear'))
+ self.ClearAdvancedSearchComboBox.addItem(self.trUtf8('Keep'))
def initialise(self):
log.debug(u'bible manager initialise')
@@ -495,7 +495,7 @@
book, 1)
if self.verses == 0:
self.AdvancedSearchButton.setEnabled(False)
- self.AdvancedMessage.setText(self.trUtf8(u'Bible not fully loaded'))
+ self.AdvancedMessage.setText(self.trUtf8('Bible not fully loaded'))
else:
self.AdvancedSearchButton.setEnabled(True)
self.AdvancedMessage.setText(u'')
@@ -588,7 +588,7 @@
if end_verse == u'':
end_verse = 99
if start_chapter == u'':
- message = self.trUtf8(u'No chapter found for search criteria')
+ message = self.trUtf8('No chapter found for search criteria')
log.debug(u'results = %s @ %s : %s @ %s : %s'% \
(unicode(book), unicode(start_chapter), unicode(end_chapter),
unicode(start_verse), unicode(end_verse)))
@@ -605,4 +605,4 @@
bible, u'Version').value)
else:
QtGui.QMessageBox.information(
- self, self.trUtf8(u'Information'), message)
+ self, self.trUtf8('Information'), message)
=== modified file 'openlp/plugins/custom/customplugin.py'
--- openlp/plugins/custom/customplugin.py 2009-11-07 07:42:18 +0000
+++ openlp/plugins/custom/customplugin.py 2009-11-27 21:15:22 +0000
@@ -64,8 +64,8 @@
self.remove_toolbox_item()
def about(self):
- about_text = self.trUtf8(u'<b>Custom Plugin</b><br>This plugin '
- u'allows slides to be displayed on the screen in the same way '
- u'songs are. This plugin provides greater freedom over the '
- u'songs plugin.<br>')
+ about_text = self.trUtf8('<b>Custom Plugin</b><br>This plugin '
+ 'allows slides to be displayed on the screen in the same way '
+ 'songs are. This plugin provides greater freedom over the '
+ 'songs plugin.<br>')
return about_text
=== modified file 'openlp/plugins/custom/forms/editcustomdialog.py'
--- openlp/plugins/custom/forms/editcustomdialog.py 2009-10-31 20:38:57 +0000
+++ openlp/plugins/custom/forms/editcustomdialog.py 2009-11-27 21:15:22 +0000
@@ -144,22 +144,22 @@
customEditDialog.setTabOrder(self.ThemeComboBox, self.buttonBox)
def retranslateUi(self, customEditDialog):
- self.UpButton.setToolTip(self.trUtf8(u'Move slide Up 1'))
- self.DownButton.setToolTip(self.trUtf8(u'Move slide down 1'))
- customEditDialog.setWindowTitle(self.trUtf8(u'Edit Custom Slides'))
- self.TitleLabel.setText(self.trUtf8(u'Title:'))
- self.AddButton.setText(self.trUtf8(u'Add New'))
- self.AddButton.setToolTip(self.trUtf8(u'Add new slide at bottom'))
- self.EditButton.setText(self.trUtf8(u'Edit'))
- self.EditButton.setToolTip(self.trUtf8(u'Edit selected slide'))
- self.EditAllButton.setText(self.trUtf8(u'Edit All'))
- self.EditAllButton.setToolTip(self.trUtf8(u'Edit all slides'))
- self.SaveButton.setText(self.trUtf8(u'Save'))
- self.SaveButton.setToolTip(self.trUtf8(u'Replace edited slide'))
- self.DeleteButton.setText(self.trUtf8(u'Delete'))
- self.DeleteButton.setToolTip(self.trUtf8(u'Delete selected slide'))
- self.ClearButton.setText(self.trUtf8(u'Clear'))
- self.ClearButton.setToolTip(self.trUtf8(u'Clear edit area'))
- self.ThemeLabel.setText(self.trUtf8(u'Theme:'))
- self.ThemeComboBox.setToolTip(self.trUtf8(u'Set Theme for Slides'))
- self.CreditLabel.setText(self.trUtf8(u'Credits:'))
+ self.UpButton.setToolTip(self.trUtf8('Move slide Up 1'))
+ self.DownButton.setToolTip(self.trUtf8('Move slide down 1'))
+ customEditDialog.setWindowTitle(self.trUtf8('Edit Custom Slides'))
+ self.TitleLabel.setText(self.trUtf8('Title:'))
+ self.AddButton.setText(self.trUtf8('Add New'))
+ self.AddButton.setToolTip(self.trUtf8('Add new slide at bottom'))
+ self.EditButton.setText(self.trUtf8('Edit'))
+ self.EditButton.setToolTip(self.trUtf8('Edit selected slide'))
+ self.EditAllButton.setText(self.trUtf8('Edit All'))
+ self.EditAllButton.setToolTip(self.trUtf8('Edit all slides'))
+ self.SaveButton.setText(self.trUtf8('Save'))
+ self.SaveButton.setToolTip(self.trUtf8('Replace edited slide'))
+ self.DeleteButton.setText(self.trUtf8('Delete'))
+ self.DeleteButton.setToolTip(self.trUtf8('Delete selected slide'))
+ self.ClearButton.setText(self.trUtf8('Clear'))
+ self.ClearButton.setToolTip(self.trUtf8('Clear edit area'))
+ self.ThemeLabel.setText(self.trUtf8('Theme:'))
+ self.ThemeComboBox.setToolTip(self.trUtf8('Set Theme for Slides'))
+ self.CreditLabel.setText(self.trUtf8('Credits:'))
=== modified file 'openlp/plugins/custom/forms/editcustomform.py'
--- openlp/plugins/custom/forms/editcustomform.py 2009-11-13 21:24:59 +0000
+++ openlp/plugins/custom/forms/editcustomform.py 2009-11-27 21:15:22 +0000
@@ -45,7 +45,7 @@
self.setupUi(self)
# Connecting signals and slots
self.previewButton = QtGui.QPushButton()
- self.previewButton.setText(self.trUtf8(u'Save && Preview'))
+ self.previewButton.setText(self.trUtf8('Save && Preview'))
self.buttonBox.addButton(
self.previewButton, QtGui.QDialogButtonBox.ActionRole)
QtCore.QObject.connect(self.buttonBox,
@@ -80,7 +80,7 @@
def onPreview(self, button):
log.debug(u'onPreview')
- if button.text() == unicode(self.trUtf8(u'Save && Preview')) \
+ if button.text() == unicode(self.trUtf8('Save && Preview')) \
and self.saveCustom():
Receiver.send_message(u'preview_custom')
@@ -142,7 +142,7 @@
def saveCustom(self):
valid, message = self._validate()
if not valid:
- QtGui.QMessageBox.critical(self, self.trUtf8(u'Error'), message,
+ QtGui.QMessageBox.critical(self, self.trUtf8('Error'), message,
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
return False
sxml = SongXMLBuilder()
@@ -249,12 +249,12 @@
def _validate(self):
if len(self.TitleEdit.displayText()) == 0:
self.TitleEdit.setFocus()
- return False, self.trUtf8(u'You need to enter a title')
+ return False, self.trUtf8('You need to enter a title')
# must have 1 slide
if self.VerseListView.count() == 0:
self.VerseTextEdit.setFocus()
- return False, self.trUtf8(u'You need to enter a slide')
+ return False, self.trUtf8('You need to enter a slide')
if len(self.VerseTextEdit.toPlainText()) > 0:
self.VerseTextEdit.setFocus()
- return False, self.trUtf8(u'You have unsaved data')
+ return False, self.trUtf8('You have unsaved data')
return True, u''
=== modified file 'openlp/plugins/custom/lib/mediaitem.py'
--- openlp/plugins/custom/lib/mediaitem.py 2009-11-14 09:41:11 +0000
+++ openlp/plugins/custom/lib/mediaitem.py 2009-11-27 21:15:22 +0000
@@ -65,7 +65,7 @@
QtCore.SIGNAL(u'preview_custom'), self.onPreviewClick)
def initPluginNameVisible(self):
- self.PluginNameVisible = self.trUtf8(u'Custom')
+ self.PluginNameVisible = self.trUtf8('Custom')
def requiredIcons(self):
MediaManagerItem.requiredIcons(self)
@@ -159,4 +159,4 @@
for slide in raw_slides:
service_item.add_from_text(slide[:30], slide)
service_item.raw_footer = raw_footer
- return True
\ No newline at end of file
+ return True
=== modified file 'openlp/plugins/images/imageplugin.py'
--- openlp/plugins/images/imageplugin.py 2009-11-07 07:42:18 +0000
+++ openlp/plugins/images/imageplugin.py 2009-11-27 21:15:22 +0000
@@ -54,11 +54,11 @@
return ImageMediaItem(self, self.icon, self.name)
def about(self):
- about_text = self.trUtf8(u'<b>Image Plugin</b><br>Allows images of '
- u'all types to be displayed. If a number of images are selected '
- u'together and presented on the live controller it is possible '
- u'to turn them into a timed loop.<br<br>From the plugin if the '
- u'<i>Override background</i> is chosen and an image is selected '
- u'any somgs which are rendered will use the selected image from '
- u'the background instead of the one provied by the theme.<br>')
+ about_text = self.trUtf8('<b>Image Plugin</b><br>Allows images of '
+ 'all types to be displayed. If a number of images are selected '
+ 'together and presented on the live controller it is possible '
+ 'to turn them into a timed loop.<br<br>From the plugin if the '
+ '<i>Override background</i> is chosen and an image is selected '
+ 'any somgs which are rendered will use the selected image from '
+ 'the background instead of the one provied by the theme.<br>')
return about_text
=== modified file 'openlp/plugins/images/lib/imagetab.py'
--- openlp/plugins/images/lib/imagetab.py 2009-11-13 21:24:59 +0000
+++ openlp/plugins/images/lib/imagetab.py 2009-11-27 21:15:22 +0000
@@ -35,7 +35,7 @@
def setupUi(self):
self.setObjectName(u'ImageTab')
- self.tabTitleVisible = self.trUtf8(u'Images')
+ self.tabTitleVisible = self.trUtf8('Images')
self.ImageLayout = QtGui.QFormLayout(self)
self.ImageLayout.setObjectName(u'ImageLayout')
self.ImageSettingsGroupBox = QtGui.QGroupBox(self)
@@ -61,9 +61,9 @@
QtCore.SIGNAL(u'valueChanged(int)'), self.onTimeoutSpinBoxChanged)
def retranslateUi(self):
- self.ImageSettingsGroupBox.setTitle(self.trUtf8(u'Image Settings'))
- self.TimeoutLabel.setText(self.trUtf8(u'Slide Loop Delay:'))
- self.TimeoutSpinBox.setSuffix(self.trUtf8(u'sec'))
+ self.ImageSettingsGroupBox.setTitle(self.trUtf8('Image Settings'))
+ self.TimeoutLabel.setText(self.trUtf8('Slide Loop Delay:'))
+ self.TimeoutSpinBox.setSuffix(self.trUtf8('sec'))
def onTimeoutSpinBoxChanged(self):
self.loop_delay = self.TimeoutSpinBox.value()
=== modified file 'openlp/plugins/images/lib/mediaitem.py'
--- openlp/plugins/images/lib/mediaitem.py 2009-11-03 15:13:52 +0000
+++ openlp/plugins/images/lib/mediaitem.py 2009-11-27 21:15:23 +0000
@@ -55,12 +55,12 @@
self.overrideActive = False
def initPluginNameVisible(self):
- self.PluginNameVisible = self.trUtf8(u'Image')
+ self.PluginNameVisible = self.trUtf8('Image')
def retranslateUi(self):
- self.OnNewPrompt = self.trUtf8(u'Select Image(s)')
+ self.OnNewPrompt = self.trUtf8('Select Image(s)')
self.OnNewFileMasks = \
- self.trUtf8(u'Images (*.jpg *jpeg *.gif *.png *.bmp)')
+ self.trUtf8('Images (*.jpg *jpeg *.gif *.png *.bmp)')
def requiredIcons(self):
MediaManagerItem.requiredIcons(self)
@@ -98,9 +98,9 @@
self.OverrideCheckBox.setObjectName(u'OverrideCheckBox')
self.OverrideCheckBox.setCheckable(True)
self.OverrideCheckBox.setChecked(False)
- self.OverrideCheckBox.setText(self.trUtf8(u'Override background'))
+ self.OverrideCheckBox.setText(self.trUtf8('Override background'))
self.OverrideCheckBox.setStatusTip(
- self.trUtf8(u'Allow background of live slide to be overridden'))
+ self.trUtf8('Allow background of live slide to be overridden'))
self.OverrideLayout.addWidget(self.OverrideCheckBox)
self.OverrideLabel = QtGui.QLabel(self.ImageWidget)
self.OverrideLabel.setObjectName(u'OverrideLabel')
@@ -142,7 +142,7 @@
def generateSlideData(self, service_item):
items = self.ListView.selectedIndexes()
if items:
- service_item.title = self.trUtf8(u'Image(s)')
+ service_item.title = self.trUtf8('Image(s)')
for item in items:
bitem = self.ListView.item(item.row())
filename = unicode((bitem.data(QtCore.Qt.UserRole)).toString())
@@ -163,8 +163,8 @@
if self.overrideActive:
if not self.ListView.selectedIndexes():
QtGui.QMessageBox.information(self,
- self.trUtf8(u'No items selected...'),
- self.trUtf8(u'You must select one or more items'))
+ self.trUtf8('No items selected...'),
+ self.trUtf8('You must select one or more items'))
items = self.ListView.selectedIndexes()
for item in items:
bitem = self.ListView.item(item.row())
=== modified file 'openlp/plugins/media/lib/mediaitem.py'
--- openlp/plugins/media/lib/mediaitem.py 2009-11-12 18:44:45 +0000
+++ openlp/plugins/media/lib/mediaitem.py 2009-11-27 21:15:23 +0000
@@ -56,11 +56,11 @@
self.MainDisplay = self.parent.live_controller.parent.mainDisplay
def initPluginNameVisible(self):
- self.PluginNameVisible = self.trUtf8(u'Media')
+ self.PluginNameVisible = self.trUtf8('Media')
def retranslateUi(self):
- self.OnNewPrompt = self.trUtf8(u'Select Media')
- self.OnNewFileMasks = self.trUtf8(u'Videos (*.avi *.mpeg *.mpg'
+ self.OnNewPrompt = self.trUtf8('Select Media')
+ self.OnNewFileMasks = self.trUtf8('Videos (*.avi *.mpeg *.mpg'
'*.mp4);;Audio (*.ogg *.mp3 *.wma);;All files (*)')
def requiredIcons(self):
@@ -79,7 +79,7 @@
items = self.ListView.selectedIndexes()
if len(items) > 1:
return False
- service_item.title = unicode(self.trUtf8(u'Media'))
+ service_item.title = unicode(self.trUtf8('Media'))
for item in items:
bitem = self.ListView.item(item.row())
filename = unicode((bitem.data(QtCore.Qt.UserRole)).toString())
=== modified file 'openlp/plugins/media/lib/mediatab.py'
--- openlp/plugins/media/lib/mediatab.py 2009-10-30 17:44:16 +0000
+++ openlp/plugins/media/lib/mediatab.py 2009-11-27 21:15:23 +0000
@@ -35,7 +35,7 @@
def setupUi(self):
self.setObjectName(u'MediaTab')
- self.tabTitleVisible = self.trUtf8(u'Media')
+ self.tabTitleVisible = self.trUtf8('Media')
self.MediaLayout = QtGui.QFormLayout(self)
self.MediaLayout.setObjectName(u'MediaLayout')
self.MediaModeGroupBox = QtGui.QGroupBox(self)
@@ -58,10 +58,10 @@
QtCore.SIGNAL(u'stateChanged(int)'), self.onVMRCheckBoxChanged)
def retranslateUi(self):
- self.MediaModeGroupBox.setTitle(self.trUtf8(u'Media Mode'))
- self.UseVMRCheckBox.setText(self.trUtf8(u'Use Video Mode Rendering'))
+ self.MediaModeGroupBox.setTitle(self.trUtf8('Media Mode'))
+ self.UseVMRCheckBox.setText(self.trUtf8('Use Video Mode Rendering'))
self.UseVMRLabel.setText(
- self.trUtf8(u'<em>No video preview available with VMR enabled</em>'))
+ self.trUtf8('<em>No video preview available with VMR enabled</em>'))
def onVMRCheckBoxChanged(self):
use_vmr_mode = self.UseVMRCheckBox.checkState()
=== modified file 'openlp/plugins/media/mediaplugin.py'
--- openlp/plugins/media/mediaplugin.py 2009-11-07 07:42:18 +0000
+++ openlp/plugins/media/mediaplugin.py 2009-11-27 21:15:23 +0000
@@ -56,6 +56,6 @@
return MediaMediaItem(self, self.icon, self.name)
def about(self):
- about_text = self.trUtf8(u'<b>Media Plugin</b><br>This plugin '
- u'allows the playing of audio and video media')
+ about_text = self.trUtf8('<b>Media Plugin</b><br>This plugin '
+ 'allows the playing of audio and video media')
return about_text
=== modified file 'openlp/plugins/presentations/lib/mediaitem.py'
--- openlp/plugins/presentations/lib/mediaitem.py 2009-11-14 08:40:14 +0000
+++ openlp/plugins/presentations/lib/mediaitem.py 2009-11-27 21:15:23 +0000
@@ -58,11 +58,11 @@
self.message_listener = MessageListener(controllers)
def initPluginNameVisible(self):
- self.PluginNameVisible = self.trUtf8(u'Presentation')
+ self.PluginNameVisible = self.trUtf8('Presentation')
def retranslateUi(self):
- self.OnNewPrompt = self.trUtf8(u'Select Presentation(s)')
- self.OnNewFileMasks = self.trUtf8(u'Presentations (*.ppt *.pps *.odp)')
+ self.OnNewPrompt = self.trUtf8('Select Presentation(s)')
+ self.OnNewFileMasks = self.trUtf8('Presentations (*.ppt *.pps *.odp)')
def requiredIcons(self):
MediaManagerItem.requiredIcons(self)
@@ -88,7 +88,7 @@
self.DisplayTypeLabel = QtGui.QLabel(self.PresentationWidget)
self.DisplayTypeLabel.setObjectName(u'SearchTypeLabel')
self.DisplayLayout.addWidget(self.DisplayTypeLabel, 0, 0, 1, 1)
- self.DisplayTypeLabel.setText(self.trUtf8(u'Present using:'))
+ self.DisplayTypeLabel.setText(self.trUtf8('Present using:'))
# Add the Presentation widget to the page layout
self.PageLayout.addWidget(self.PresentationWidget)
@@ -111,8 +111,8 @@
(path, filename) = os.path.split(unicode(file))
if titles.count(filename) > 0:
QtGui.QMessageBox.critical(
- self, self.trUtf8(u'File exists'), self.trUtf8(
- u'A presentation with that filename already exists.'),
+ self, self.trUtf8('File exists'), self.trUtf8(
+ 'A presentation with that filename already exists.'),
QtGui.QMessageBox.Ok)
else:
item_name = QtGui.QListWidgetItem(filename)
=== modified file 'openlp/plugins/presentations/lib/presentationtab.py'
--- openlp/plugins/presentations/lib/presentationtab.py 2009-10-30 17:44:16 +0000
+++ openlp/plugins/presentations/lib/presentationtab.py 2009-11-27 21:15:23 +0000
@@ -36,7 +36,7 @@
def setupUi(self):
self.setObjectName(u'PresentationTab')
- self.tabTitleVisible = self.trUtf8(u'Presentations')
+ self.tabTitleVisible = self.trUtf8('Presentations')
self.PresentationLayout = QtGui.QHBoxLayout(self)
self.PresentationLayout.setSpacing(8)
self.PresentationLayout.setMargin(8)
@@ -99,7 +99,7 @@
controller = self.controllers[key]
checkbox = self.PresenterCheckboxes[controller.name]
checkbox.setText(
- u'%s %s:' % (controller.name, self.trUtf8(u'available')))
+ u'%s %s:' % (controller.name, self.trUtf8('available')))
def load(self):
for key in self.controllers:
=== modified file 'openlp/plugins/presentations/presentationplugin.py'
--- openlp/plugins/presentations/presentationplugin.py 2009-11-07 07:42:18 +0000
+++ openlp/plugins/presentations/presentationplugin.py 2009-11-27 21:15:23 +0000
@@ -101,8 +101,8 @@
return False
def about(self):
- about_text = self.trUtf8(u'<b>Presentation Plugin</b> <br> Delivers '
- u'the ability to show presentations using a number of different '
- u'programs. The choice of available presentation programs is '
- u'available to the user in a drop down box.')
+ about_text = self.trUtf8('<b>Presentation Plugin</b> <br> Delivers '
+ 'the ability to show presentations using a number of different '
+ 'programs. The choice of available presentation programs is '
+ 'available to the user in a drop down box.')
return about_text
=== modified file 'openlp/plugins/remotes/lib/remotetab.py'
--- openlp/plugins/remotes/lib/remotetab.py 2009-10-30 17:44:16 +0000
+++ openlp/plugins/remotes/lib/remotetab.py 2009-11-27 21:15:23 +0000
@@ -35,7 +35,7 @@
def setupUi(self):
self.setObjectName(u'RemoteTab')
- self.tabTitleVisible = self.trUtf8(u'Remotes')
+ self.tabTitleVisible = self.trUtf8('Remotes')
self.RemoteLayout = QtGui.QFormLayout(self)
self.RemoteLayout.setObjectName(u'RemoteLayout')
self.RemoteModeGroupBox = QtGui.QGroupBox(self)
@@ -52,7 +52,7 @@
0, QtGui.QFormLayout.LabelRole, self.RemoteModeGroupBox)
def retranslateUi(self):
- self.RemoteModeGroupBox.setTitle(self.trUtf8(u'Remotes Receiver Port'))
+ self.RemoteModeGroupBox.setTitle(self.trUtf8('Remotes Receiver Port'))
def load(self):
self.RemotePortSpinBox.setValue(
=== modified file 'openlp/plugins/remotes/remoteplugin.py'
--- openlp/plugins/remotes/remoteplugin.py 2009-11-13 21:24:59 +0000
+++ openlp/plugins/remotes/remoteplugin.py 2009-11-27 21:15:23 +0000
@@ -78,8 +78,8 @@
Receiver.send_message(u'live_slide_next')
def about(self):
- about_text = self.trUtf8(u'<b>Remote Plugin</b><br>This plugin '
- u'provides the ability to send messages to a running version of '
- u'openlp on a different computer.<br>The Primary use for this '
- u'would be to send alerts from a creche')
+ about_text = self.trUtf8('<b>Remote Plugin</b><br>This plugin '
+ 'provides the ability to send messages to a running version of '
+ 'openlp on a different computer.<br>The Primary use for this '
+ 'would be to send alerts from a creche')
return about_text
=== modified file 'openlp/plugins/songs/forms/authorsdialog.py'
--- openlp/plugins/songs/forms/authorsdialog.py 2009-10-24 16:40:36 +0000
+++ openlp/plugins/songs/forms/authorsdialog.py 2009-11-27 21:15:23 +0000
@@ -72,7 +72,7 @@
QtCore.QMetaObject.connectSlotsByName(AuthorsDialog)
def retranslateUi(self, AuthorsDialog):
- AuthorsDialog.setWindowTitle(self.trUtf8(u'Author Maintenance'))
- self.DisplayLabel.setText(self.trUtf8(u'Display name:'))
- self.FirstNameLabel.setText(self.trUtf8(u'First name:'))
- self.LastNameLabel.setText(self.trUtf8(u'Last name:'))
+ AuthorsDialog.setWindowTitle(self.trUtf8('Author Maintenance'))
+ self.DisplayLabel.setText(self.trUtf8('Display name:'))
+ self.FirstNameLabel.setText(self.trUtf8('First name:'))
+ self.LastNameLabel.setText(self.trUtf8('Last name:'))
=== modified file 'openlp/plugins/songs/forms/authorsform.py'
--- openlp/plugins/songs/forms/authorsform.py 2009-10-24 16:40:36 +0000
+++ openlp/plugins/songs/forms/authorsform.py 2009-11-27 21:15:23 +0000
@@ -75,24 +75,24 @@
def accept(self):
if not self.FirstNameEdit.text():
QtGui.QMessageBox.critical(
- self, self.trUtf8(u'Error'),
- self.trUtf8(u'You need to type in the first name of the author.'),
+ self, self.trUtf8('Error'),
+ self.trUtf8('You need to type in the first name of the author.'),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
self.FirstNameEdit.setFocus()
return False
elif not self.LastNameEdit.text():
QtGui.QMessageBox.critical(
- self, self.trUtf8(u'Error'),
- self.trUtf8(u'You need to type in the last name of the author.'),
+ self, self.trUtf8('Error'),
+ self.trUtf8('You need to type in the last name of the author.'),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
self.LastNameEdit.setFocus()
return False
elif not self.DisplayEdit.text():
if QtGui.QMessageBox.critical(
- self, self.trUtf8(u'Error'),
- self.trUtf8(u'You haven\'t set a display name for the '
- u'author, would you like me to combine the first and '
- u'last names for you?'),
+ self, self.trUtf8('Error'),
+ self.trUtf8('You haven\'t set a display name for the '
+ 'author, would you like me to combine the first and '
+ 'last names for you?'),
QtGui.QMessageBox.StandardButtons(
QtGui.QMessageBox.Yes | QtGui.QMessageBox.No)
) == QtGui.QMessageBox.Yes:
=== modified file 'openlp/plugins/songs/forms/editsongdialog.py'
--- openlp/plugins/songs/forms/editsongdialog.py 2009-10-29 09:18:26 +0000
+++ openlp/plugins/songs/forms/editsongdialog.py 2009-11-27 21:15:23 +0000
@@ -414,36 +414,36 @@
EditSongDialog.setTabOrder(self.CommentsEdit, self.ButtonBox)
def retranslateUi(self, EditSongDialog):
- EditSongDialog.setWindowTitle(self.trUtf8(u'Song Editor'))
- self.TitleLabel.setText(self.trUtf8(u'Title:'))
- self.AlternativeTitleLabel.setText(self.trUtf8(u'Alternative Title:'))
- self.LyricsLabel.setText(self.trUtf8(u'Lyrics:'))
- self.VerseOrderLabel.setText(self.trUtf8(u'Verse Order:'))
- self.VerseAddButton.setText(self.trUtf8(u'Add'))
- self.VerseEditButton.setText(self.trUtf8(u'Edit'))
- self.VerseEditAllButton.setText(self.trUtf8(u'Edit All'))
- self.VerseDeleteButton.setText(self.trUtf8(u'Delete'))
+ EditSongDialog.setWindowTitle(self.trUtf8('Song Editor'))
+ self.TitleLabel.setText(self.trUtf8('Title:'))
+ self.AlternativeTitleLabel.setText(self.trUtf8('Alternative Title:'))
+ self.LyricsLabel.setText(self.trUtf8('Lyrics:'))
+ self.VerseOrderLabel.setText(self.trUtf8('Verse Order:'))
+ self.VerseAddButton.setText(self.trUtf8('Add'))
+ self.VerseEditButton.setText(self.trUtf8('Edit'))
+ self.VerseEditAllButton.setText(self.trUtf8('Edit All'))
+ self.VerseDeleteButton.setText(self.trUtf8('Delete'))
self.SongTabWidget.setTabText(
self.SongTabWidget.indexOf(self.LyricsTab),
- self.trUtf8(u'Title && Lyrics'))
- self.AuthorsGroupBox.setTitle(self.trUtf8(u'Authors'))
- self.AuthorAddButton.setText(self.trUtf8(u'&Add to Song'))
- self.AuthorRemoveButton.setText(self.trUtf8(u'&Remove'))
+ self.trUtf8('Title && Lyrics'))
+ self.AuthorsGroupBox.setTitle(self.trUtf8('Authors'))
+ self.AuthorAddButton.setText(self.trUtf8('&Add to Song'))
+ self.AuthorRemoveButton.setText(self.trUtf8('&Remove'))
self.MaintenanceButton.setText(
- self.trUtf8(u'&Manage Authors, Topics, Books'))
- self.TopicGroupBox.setTitle(self.trUtf8(u'Topic'))
- self.TopicAddButton.setText(self.trUtf8(u'A&dd to Song'))
- self.TopicRemoveButton.setText(self.trUtf8(u'R&emove'))
- self.SongBookGroup.setTitle(self.trUtf8(u'Song Book'))
+ self.trUtf8('&Manage Authors, Topics, Books'))
+ self.TopicGroupBox.setTitle(self.trUtf8('Topic'))
+ self.TopicAddButton.setText(self.trUtf8('A&dd to Song'))
+ self.TopicRemoveButton.setText(self.trUtf8('R&emove'))
+ self.SongBookGroup.setTitle(self.trUtf8('Song Book'))
self.SongTabWidget.setTabText(
self.SongTabWidget.indexOf(self.AuthorsTab),
- self.trUtf8(u'Authors, Topics && Book'))
- self.ThemeGroupBox.setTitle(self.trUtf8(u'Theme'))
- self.ThemeAddButton.setText(self.trUtf8(u'Add a Theme'))
- self.CopyrightGroupBox.setTitle(self.trUtf8(u'Copyright Information'))
- self.CopyrightInsertButton.setText(self.trUtf8(u'\xa9'))
- self.CCLILabel.setText(self.trUtf8(u'CCLI Number:'))
- self.CommentsGroupBox.setTitle(self.trUtf8(u'Comments'))
+ self.trUtf8('Authors, Topics && Book'))
+ self.ThemeGroupBox.setTitle(self.trUtf8('Theme'))
+ self.ThemeAddButton.setText(self.trUtf8('Add a Theme'))
+ self.CopyrightGroupBox.setTitle(self.trUtf8('Copyright Information'))
+ self.CopyrightInsertButton.setText(self.trUtf8('\u00a9'))
+ self.CCLILabel.setText(self.trUtf8('CCLI Number:'))
+ self.CommentsGroupBox.setTitle(self.trUtf8('Comments'))
self.SongTabWidget.setTabText(
self.SongTabWidget.indexOf(self.ThemeTab),
- self.trUtf8(u'Theme, Copyright Info && Comments'))
+ self.trUtf8('Theme, Copyright Info && Comments'))
=== modified file 'openlp/plugins/songs/forms/editsongform.py'
--- openlp/plugins/songs/forms/editsongform.py 2009-11-13 21:24:59 +0000
+++ openlp/plugins/songs/forms/editsongform.py 2009-11-27 21:15:23 +0000
@@ -97,7 +97,7 @@
QtCore.QObject.connect(self.VerseOrderEdit,
QtCore.SIGNAL(u'lostFocus()'), self.onVerseOrderEditLostFocus)
self.previewButton = QtGui.QPushButton()
- self.previewButton.setText(self.trUtf8(u'Save && Preview'))
+ self.previewButton.setText(self.trUtf8('Save && Preview'))
self.ButtonBox.addButton(
self.previewButton, QtGui.QDialogButtonBox.ActionRole)
QtCore.QObject.connect(self.ButtonBox,
@@ -363,15 +363,15 @@
if len(self.TitleEditItem.displayText()) == 0:
self.SongTabWidget.setCurrentIndex(0)
self.TitleEditItem.setFocus()
- return False, self.trUtf8(u'You need to enter a song title.')
+ return False, self.trUtf8('You need to enter a song title.')
if self.VerseListWidget.count() == 0:
self.SongTabWidget.setCurrentIndex(0)
self.VerseListWidget.setFocus()
- return False, self.trUtf8(u'You need to enter some verses.')
+ return False, self.trUtf8('You need to enter some verses.')
if self.AuthorsListView.count() == 0:
self.SongTabWidget.setCurrentIndex(2)
self.AuthorsListView.setFocus()
- return False, self.trUtf8(u'You need to provide at least one author.')
+ return False, self.trUtf8('You need to provide at least one author.')
return True, u''
def onTitleEditItemLostFocus(self):
@@ -402,7 +402,7 @@
def onPreview(self, button):
log.debug(u'onPreview')
- if button.text() == unicode(self.trUtf8(u'Save && Preview')) \
+ if button.text() == unicode(self.trUtf8('Save && Preview')) \
and self.saveSong():
Receiver.send_message(u'preview_song')
@@ -420,7 +420,7 @@
valid, message = self._validate_song()
if not valid:
QtGui.QMessageBox.critical(
- self, self.trUtf8(u'Error'), message,
+ self, self.trUtf8('Error'), message,
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
return False
self.song.title = unicode(self.TitleEditItem.displayText())
=== modified file 'openlp/plugins/songs/forms/editversedialog.py'
--- openlp/plugins/songs/forms/editversedialog.py 2009-10-24 16:40:36 +0000
+++ openlp/plugins/songs/forms/editversedialog.py 2009-11-27 21:15:23 +0000
@@ -49,4 +49,4 @@
self.VerseTextEdit.setFocus(QtCore.Qt.OtherFocusReason)
def retranslateUi(self, EditVerseDialog):
- EditVerseDialog.setWindowTitle(self.trUtf8(u'Edit Verse'))
+ EditVerseDialog.setWindowTitle(self.trUtf8('Edit Verse'))
=== modified file 'openlp/plugins/songs/forms/openlpexportdialog.py'
--- openlp/plugins/songs/forms/openlpexportdialog.py 2009-10-23 18:48:49 +0000
+++ openlp/plugins/songs/forms/openlpexportdialog.py 2009-11-27 21:15:23 +0000
@@ -284,22 +284,22 @@
QtCore.QMetaObject.connectSlotsByName(OpenLPExportDialog)
def retranslateUi(self, OpenLPExportDialog):
- OpenLPExportDialog.setWindowTitle(self.trUtf8(u'openlp.org Song Exporter'))
- self.ExportFileLabel.setText(self.trUtf8(u'Select openlp.org export filename:'))
- self.ExportListLabel.setText(self.trUtf8(u'Full Song List'))
- self.ExportListTable.horizontalHeaderItem(0).setText(self.trUtf8(u'Song Title'))
- self.ExportListTable.horizontalHeaderItem(1).setText(self.trUtf8(u'Author'))
- self.ExportSelectAllPushButton.setText(self.trUtf8(u'Select All'))
- self.ExportFilterComboBox.setItemText(0, self.trUtf8(u'Lyrics'))
- self.ExportFilterComboBox.setItemText(1, self.trUtf8(u'Title'))
- self.ExportFilterComboBox.setItemText(2, self.trUtf8(u'Author'))
- self.SelectedListLabel.setText(self.trUtf8(u'Song Export List'))
- self.SelectedListTable.horizontalHeaderItem(0).setText(self.trUtf8(u'Song Title'))
- self.SelectedListTable.horizontalHeaderItem(1).setText(self.trUtf8(u'Author'))
- self.SelectedSelectAllPushButton.setText(self.trUtf8(u'Select All'))
- self.SelectedRemoveSelectedButton.setText(self.trUtf8(u'Remove Selected'))
- self.ProgressGroupBox.setTitle(self.trUtf8(u'Progress:'))
- self.ProgressLabel.setText(self.trUtf8(u'Ready to export'))
- self.ExportPushButton.setText(self.trUtf8(u'Export'))
- self.ClosePushButton.setText(self.trUtf8(u'Close'))
+ OpenLPExportDialog.setWindowTitle(self.trUtf8('openlp.org Song Exporter'))
+ self.ExportFileLabel.setText(self.trUtf8('Select openlp.org export filename:'))
+ 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'))
=== modified file 'openlp/plugins/songs/forms/openlpimportdialog.py'
--- openlp/plugins/songs/forms/openlpimportdialog.py 2009-10-23 18:48:49 +0000
+++ openlp/plugins/songs/forms/openlpimportdialog.py 2009-11-27 21:15:23 +0000
@@ -284,22 +284,22 @@
QtCore.QMetaObject.connectSlotsByName(OpenLPImportDialog)
def retranslateUi(self, OpenLPImportDialog):
- OpenLPImportDialog.setWindowTitle(self.trUtf8(u'openlp.org Song Importer'))
- self.ImportFileLabel.setText(self.trUtf8(u'Select openlp.org songfile to import:'))
- self.ImportListLabel.setText(self.trUtf8(u'Import File Song List'))
- self.ImportListTable.horizontalHeaderItem(0).setText(self.trUtf8(u'Song Title'))
- self.ImportListTable.horizontalHeaderItem(1).setText(self.trUtf8(u'Author'))
- self.ImportSelectAllPushButton.setText(self.trUtf8(u'Select All'))
- self.ImportFilterComboBox.setItemText(0, self.trUtf8(u'Lyrics'))
- self.ImportFilterComboBox.setItemText(1, self.trUtf8(u'Title'))
- self.ImportFilterComboBox.setItemText(2, self.trUtf8(u'Author'))
- self.SelectedListLabel.setText(self.trUtf8(u'Song Import List'))
- self.SelectedListTable.horizontalHeaderItem(0).setText(self.trUtf8(u'Song Title'))
- self.SelectedListTable.horizontalHeaderItem(1).setText(self.trUtf8(u'Author'))
- self.SelectedSelectAllPushButton.setText(self.trUtf8(u'Select All'))
- self.SelectedRemoveSelectedButton.setText(self.trUtf8(u'Remove Selected'))
- self.ProgressGroupBox.setTitle(self.trUtf8(u'Progress:'))
- self.ProgressLabel.setText(self.trUtf8(u'Ready to import'))
- self.ImportPushButton.setText(self.trUtf8(u'Import'))
- self.ClosePushButton.setText(self.trUtf8(u'Close'))
+ OpenLPImportDialog.setWindowTitle(self.trUtf8('openlp.org Song Importer'))
+ self.ImportFileLabel.setText(self.trUtf8('Select openlp.org songfile to import:'))
+ self.ImportListLabel.setText(self.trUtf8('Import File Song List'))
+ self.ImportListTable.horizontalHeaderItem(0).setText(self.trUtf8('Song Title'))
+ self.ImportListTable.horizontalHeaderItem(1).setText(self.trUtf8('Author'))
+ self.ImportSelectAllPushButton.setText(self.trUtf8('Select All'))
+ self.ImportFilterComboBox.setItemText(0, self.trUtf8('Lyrics'))
+ self.ImportFilterComboBox.setItemText(1, self.trUtf8('Title'))
+ self.ImportFilterComboBox.setItemText(2, self.trUtf8('Author'))
+ self.SelectedListLabel.setText(self.trUtf8('Song Import 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 import'))
+ self.ImportPushButton.setText(self.trUtf8('Import'))
+ self.ClosePushButton.setText(self.trUtf8('Close'))
=== modified file 'openlp/plugins/songs/forms/opensongexportdialog.py'
--- openlp/plugins/songs/forms/opensongexportdialog.py 2009-10-23 18:48:49 +0000
+++ openlp/plugins/songs/forms/opensongexportdialog.py 2009-11-27 21:15:23 +0000
@@ -284,22 +284,22 @@
QtCore.QMetaObject.connectSlotsByName(OpenSongExportDialog)
def retranslateUi(self, OpenSongExportDialog):
- OpenSongExportDialog.setWindowTitle(self.trUtf8(u'OpenSong Song Exporter'))
- self.ExportFileLabel.setText(self.trUtf8(u'Select OpenSong song folder:'))
- self.ExportListLabel.setText(self.trUtf8(u'Full Song List'))
- self.ExportListTable.horizontalHeaderItem(0).setText(self.trUtf8(u'Song Title'))
- self.ExportListTable.horizontalHeaderItem(1).setText(self.trUtf8(u'Author'))
- self.ExportSelectAllPushButton.setText(self.trUtf8(u'Select All'))
- self.ExportFilterComboBox.setItemText(0, self.trUtf8(u'Lyrics'))
- self.ExportFilterComboBox.setItemText(1, self.trUtf8(u'Title'))
- self.ExportFilterComboBox.setItemText(2, self.trUtf8(u'Author'))
- self.SelectedListLabel.setText(self.trUtf8(u'Song Export List'))
- self.SelectedListTable.horizontalHeaderItem(0).setText(self.trUtf8(u'Song Title'))
- self.SelectedListTable.horizontalHeaderItem(1).setText(self.trUtf8(u'Author'))
- self.SelectedSelectAllPushButton.setText(self.trUtf8(u'Select All'))
- self.SelectedRemoveSelectedButton.setText(self.trUtf8(u'Remove Selected'))
- self.ProgressGroupBox.setTitle(self.trUtf8(u'Progress:'))
- self.ProgressLabel.setText(self.trUtf8(u'Ready to export'))
- self.ExportPushButton.setText(self.trUtf8(u'Export'))
- self.ClosePushButton.setText(self.trUtf8(u'Close'))
+ 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'))
=== modified file 'openlp/plugins/songs/forms/opensongimportdialog.py'
--- openlp/plugins/songs/forms/opensongimportdialog.py 2009-10-23 18:48:49 +0000
+++ openlp/plugins/songs/forms/opensongimportdialog.py 2009-11-27 21:15:23 +0000
@@ -99,10 +99,10 @@
QtCore.QMetaObject.connectSlotsByName(OpenSongImportDialog)
def retranslateUi(self, OpenSongImportDialog):
- OpenSongImportDialog.setWindowTitle(self.trUtf8(u'OpenSong Song Importer'))
- self.ImportFileLabel.setText(self.trUtf8(u'OpenSong Folder:'))
- self.ProgressGroupBox.setTitle(self.trUtf8(u'Progress:'))
- self.ProgressLabel.setText(self.trUtf8(u'Ready to import'))
- self.ImportPushButton.setText(self.trUtf8(u'Import'))
- self.ClosePushButton.setText(self.trUtf8(u'Close'))
+ 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'))
=== modified file 'openlp/plugins/songs/forms/songbookdialog.py'
--- openlp/plugins/songs/forms/songbookdialog.py 2009-10-24 16:40:36 +0000
+++ openlp/plugins/songs/forms/songbookdialog.py 2009-11-27 21:15:23 +0000
@@ -64,6 +64,6 @@
QtCore.QMetaObject.connectSlotsByName(SongBookDialog)
def retranslateUi(self, SongBookDialog):
- SongBookDialog.setWindowTitle(self.trUtf8(u'Edit Book'))
- self.NameLabel.setText(self.trUtf8(u'Name:'))
- self.PublisherLabel.setText(self.trUtf8(u'Publisher:'))
+ SongBookDialog.setWindowTitle(self.trUtf8('Edit Book'))
+ self.NameLabel.setText(self.trUtf8('Name:'))
+ self.PublisherLabel.setText(self.trUtf8('Publisher:'))
=== modified file 'openlp/plugins/songs/forms/songbookform.py'
--- openlp/plugins/songs/forms/songbookform.py 2009-10-24 16:40:36 +0000
+++ openlp/plugins/songs/forms/songbookform.py 2009-11-27 21:15:23 +0000
@@ -47,8 +47,8 @@
def accept(self):
if not self.NameEdit.text():
QtGui.QMessageBox.critical(
- self, self.trUtf8(u'Error'),
- self.trUtf8(u'You need to type in a book name!'),
+ self, self.trUtf8('Error'),
+ self.trUtf8('You need to type in a book name!'),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
self.NameEdit.setFocus()
return False
=== modified file 'openlp/plugins/songs/forms/songmaintenancedialog.py'
--- openlp/plugins/songs/forms/songmaintenancedialog.py 2009-10-24 16:40:36 +0000
+++ openlp/plugins/songs/forms/songmaintenancedialog.py 2009-11-27 21:15:23 +0000
@@ -207,17 +207,17 @@
QtCore.QMetaObject.connectSlotsByName(SongMaintenanceDialog)
def retranslateUi(self, SongMaintenanceDialog):
- SongMaintenanceDialog.setWindowTitle(self.trUtf8(u'Song Maintenance'))
- self.TypeListWidget.item(0).setText(self.trUtf8(u'Authors'))
- self.TypeListWidget.item(1).setText(self.trUtf8(u'Topics'))
- self.TypeListWidget.item(2).setText(self.trUtf8(u'Books/Hymnals'))
- self.AuthorAddButton.setText(self.trUtf8(u'Add'))
- self.AuthorEditButton.setText(self.trUtf8(u'Edit'))
- self.AuthorDeleteButton.setText(self.trUtf8(u'Delete'))
- self.TopicAddButton.setText(self.trUtf8(u'Add'))
- self.TopicEditButton.setText(self.trUtf8(u'Edit'))
- self.TopicDeleteButton.setText(self.trUtf8(u'Delete'))
- self.BookAddButton.setText(self.trUtf8(u'Add'))
- self.BookEditButton.setText(self.trUtf8(u'Edit'))
- self.BookDeleteButton.setText(self.trUtf8(u'Delete'))
+ 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'))
=== modified file 'openlp/plugins/songs/forms/songmaintenanceform.py'
--- openlp/plugins/songs/forms/songmaintenanceform.py 2009-11-03 19:01:53 +0000
+++ openlp/plugins/songs/forms/songmaintenanceform.py 2009-11-27 21:15:23 +0000
@@ -132,8 +132,8 @@
self.resetAuthors()
else:
QtGui.QMessageBox.critical(
- self, self.trUtf8(u'Error'),
- self.trUtf8(u'Couldn\'t add your author!'),
+ self, self.trUtf8('Error'),
+ self.trUtf8('Couldn\'t add your author!'),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
def onTopicAddButtonClick(self):
@@ -143,8 +143,8 @@
self.resetTopics()
else:
QtGui.QMessageBox.critical(
- self, self.trUtf8(u'Error'),
- self.trUtf8(u'Couldn\'t add your topic!'),
+ self, self.trUtf8('Error'),
+ self.trUtf8('Couldn\'t add your topic!'),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
def onBookAddButtonClick(self):
@@ -155,8 +155,8 @@
self.resetBooks()
else:
QtGui.QMessageBox.critical(
- self, self.trUtf8(u'Error'),
- self.trUtf8(u'Couldn\'t add your book!'),
+ self, self.trUtf8('Error'),
+ self.trUtf8('Couldn\'t add your book!'),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
def onAuthorEditButtonClick(self):
@@ -175,8 +175,8 @@
self.resetAuthors()
else:
QtGui.QMessageBox.critical(
- self, self.trUtf8(u'Error'),
- self.trUtf8(u'Couldn\'t save your author!'),
+ self, self.trUtf8('Error'),
+ self.trUtf8('Couldn\'t save your author!'),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
def onTopicEditButtonClick(self):
@@ -190,8 +190,8 @@
self.resetTopics()
else:
QtGui.QMessageBox.critical(
- self, self.trUtf8(u'Error'),
- self.trUtf8(u'Couldn\'t save your topic!'),
+ self, self.trUtf8('Error'),
+ self.trUtf8('Couldn\'t save your topic!'),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
def onBookEditButtonClick(self):
@@ -207,8 +207,8 @@
self.resetBooks()
else:
QtGui.QMessageBox.critical(
- self, self.trUtf8(u'Error'),
- self.trUtf8(u'Couldn\'t save your book!'),
+ self, self.trUtf8('Error'),
+ self.trUtf8('Couldn\'t save your book!'),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
def onAuthorDeleteButtonClick(self):
@@ -218,11 +218,11 @@
self._deleteItem(
self.AuthorsListWidget, self.songmanager.get_author,
self.songmanager.delete_author, self.resetAuthors,
- self.trUtf8(u'Delete Author'),
- self.trUtf8(u'Are you sure you want to delete the selected author?'),
- self.trUtf8(u'This author can\'t be deleted, they are currently '
- u'assigned to at least one song!'),
- self.trUtf8(u'No author selected!'))
+ self.trUtf8('Delete Author'),
+ self.trUtf8('Are you sure you want to delete the selected author?'),
+ self.trUtf8('This author can\'t be deleted, they are currently '
+ 'assigned to at least one song!'),
+ self.trUtf8('No author selected!'))
def onTopicDeleteButtonClick(self):
"""
@@ -231,11 +231,11 @@
self._deleteItem(
self.TopicsListWidget, self.songmanager.get_topic,
self.songmanager.delete_topic, self.resetTopics,
- self.trUtf8(u'Delete Topic'),
- self.trUtf8(u'Are you sure you want to delete the selected topic?'),
- self.trUtf8(u'This topic can\'t be deleted, it is currently '
- u'assigned to at least one song!'),
- self.trUtf8(u'No topic selected!'))
+ self.trUtf8('Delete Topic'),
+ self.trUtf8('Are you sure you want to delete the selected topic?'),
+ self.trUtf8('This topic can\'t be deleted, it is currently '
+ 'assigned to at least one song!'),
+ self.trUtf8('No topic selected!'))
def onBookDeleteButtonClick(self):
"""
@@ -244,8 +244,8 @@
self._deleteItem(
self.BooksListWidget, self.songmanager.get_book,
self.songmanager.delete_book, self.resetBooks,
- self.trUtf8(u'Delete Book'),
- self.trUtf8(u'Are you sure you want to delete the selected book?'),
- self.trUtf8(u'This book can\'t be deleted, it is currently '
- u'assigned to at least one song!'),
- self.trUtf8(u'No book selected!'))
+ self.trUtf8('Delete Book'),
+ self.trUtf8('Are you sure you want to delete the selected book?'),
+ self.trUtf8('This book can\'t be deleted, it is currently '
+ 'assigned to at least one song!'),
+ self.trUtf8('No book selected!'))
=== modified file 'openlp/plugins/songs/forms/topicsdialog.py'
--- openlp/plugins/songs/forms/topicsdialog.py 2009-10-24 16:40:36 +0000
+++ openlp/plugins/songs/forms/topicsdialog.py 2009-11-27 21:15:23 +0000
@@ -58,6 +58,6 @@
QtCore.QMetaObject.connectSlotsByName(TopicsDialog)
def retranslateUi(self, TopicsDialog):
- TopicsDialog.setWindowTitle(self.trUtf8(u'Topic Maintenance'))
- self.NameLabel.setText(self.trUtf8(u'Topic name:'))
+ TopicsDialog.setWindowTitle(self.trUtf8('Topic Maintenance'))
+ self.NameLabel.setText(self.trUtf8('Topic name:'))
=== modified file 'openlp/plugins/songs/forms/topicsform.py'
--- openlp/plugins/songs/forms/topicsform.py 2009-10-24 16:40:36 +0000
+++ openlp/plugins/songs/forms/topicsform.py 2009-11-27 21:15:23 +0000
@@ -46,8 +46,8 @@
def accept(self):
if not self.NameEdit.text():
QtGui.QMessageBox.critical(
- self, self.trUtf8(u'Error'),
- self.trUtf8(u'You need to type in a topic name!'),
+ self, self.trUtf8('Error'),
+ self.trUtf8('You need to type in a topic name!'),
QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Ok))
self.NameEdit.setFocus()
return False
=== modified file 'openlp/plugins/songs/lib/mediaitem.py'
--- openlp/plugins/songs/lib/mediaitem.py 2009-11-14 09:41:11 +0000
+++ openlp/plugins/songs/lib/mediaitem.py 2009-11-27 21:15:23 +0000
@@ -58,7 +58,7 @@
self.remoteSong = -1
def initPluginNameVisible(self):
- self.PluginNameVisible = self.trUtf8(u'Song')
+ self.PluginNameVisible = self.trUtf8('Song')
def requiredIcons(self):
MediaManagerItem.requiredIcons(self)
@@ -67,8 +67,8 @@
def addEndHeaderBar(self):
self.addToolbarSeparator()
## Song Maintenance Button ##
- self.addToolbarButton(self.trUtf8(u'Song Maintenance'),
- self.trUtf8(u'Maintain the lists of authors, topics and books'),
+ self.addToolbarButton(self.trUtf8('Song Maintenance'),
+ self.trUtf8('Maintain the lists of authors, topics and books'),
':/songs/song_maintenance.png', self.onSongMaintenanceClick,
'SongMaintenanceItem')
self.PageLayout.setSpacing(4)
@@ -137,15 +137,15 @@
self.parent.config.get_config(u'search as type', u'False'))
def retranslateUi(self):
- self.SearchTextLabel.setText(self.trUtf8(u'Search:'))
- self.SearchTypeLabel.setText(self.trUtf8(u'Type:'))
- self.ClearTextButton.setText(self.trUtf8(u'Clear'))
- self.SearchTextButton.setText(self.trUtf8(u'Search'))
+ self.SearchTextLabel.setText(self.trUtf8('Search:'))
+ self.SearchTypeLabel.setText(self.trUtf8('Type:'))
+ self.ClearTextButton.setText(self.trUtf8('Clear'))
+ self.SearchTextButton.setText(self.trUtf8('Search'))
def initialise(self):
- self.SearchTypeComboBox.addItem(self.trUtf8(u'Titles'))
- self.SearchTypeComboBox.addItem(self.trUtf8(u'Lyrics'))
- self.SearchTypeComboBox.addItem(self.trUtf8(u'Authors'))
+ self.SearchTypeComboBox.addItem(self.trUtf8('Titles'))
+ self.SearchTypeComboBox.addItem(self.trUtf8('Lyrics'))
+ self.SearchTypeComboBox.addItem(self.trUtf8('Authors'))
self.configUpdated()
def onSearchTextButtonClick(self):
@@ -185,7 +185,7 @@
if author_list != u'':
author_list = author_list + u', '
author_list = author_list + author.display_name
- song_detail = unicode(self.trUtf8(u'%s (%s)' % \
+ song_detail = unicode(self.trUtf8('%s (%s)' % \
(unicode(song.title), unicode(author_list))))
song_name = QtGui.QListWidgetItem(song_detail)
song_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(song.id))
@@ -196,7 +196,7 @@
self.ListView.clear()
for author in searchresults:
for song in author.songs:
- song_detail = unicode(self.trUtf8(u'%s (%s)' % \
+ song_detail = unicode(self.trUtf8('%s (%s)' % \
(unicode(author.display_name), unicode(song.title))))
song_name = QtGui.QListWidgetItem(song_detail)
song_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(song.id))
@@ -314,7 +314,7 @@
raw_footer.append(author_list)
raw_footer.append(song.copyright )
raw_footer.append(unicode(
- self.trUtf8(u'CCL Licence: ') + ccl))
+ self.trUtf8('CCL Licence: ') + ccl))
service_item.raw_footer = raw_footer
service_item.audit = [
song.title, author_audit, song.copyright, song.ccli_number
=== modified file 'openlp/plugins/songs/lib/songstab.py'
--- openlp/plugins/songs/lib/songstab.py 2009-10-30 17:44:16 +0000
+++ openlp/plugins/songs/lib/songstab.py 2009-11-27 21:15:23 +0000
@@ -35,7 +35,7 @@
def setupUi(self):
self.setObjectName(u'SongsTab')
- self.tabTitleVisible = self.trUtf8(u'Songs')
+ self.tabTitleVisible = self.trUtf8('Songs')
self.SongsLayout = QtGui.QFormLayout(self)
self.SongsLayout.setObjectName(u'SongsLayout')
self.SongsModeGroupBox = QtGui.QGroupBox(self)
@@ -60,11 +60,11 @@
self.SongBarActiveCheckBoxChanged)
def retranslateUi(self):
- self.SongsModeGroupBox.setTitle(self.trUtf8(u'Songs Mode'))
+ self.SongsModeGroupBox.setTitle(self.trUtf8('Songs Mode'))
self.SearchAsTypeCheckBox.setText(
- self.trUtf8(u'Enable search as you type:'))
+ self.trUtf8('Enable search as you type:'))
self.SongBarActiveCheckBox.setText(
- self.trUtf8(u'Display Verses on Live Tool bar:'))
+ self.trUtf8('Display Verses on Live Tool bar:'))
def onSearchAsTypeCheckBoxChanged(self, check_state):
self.song_search = False
=== modified file 'openlp/plugins/songs/songsplugin.py'
--- openlp/plugins/songs/songsplugin.py 2009-11-07 07:42:18 +0000
+++ openlp/plugins/songs/songsplugin.py 2009-11-27 21:15:23 +0000
@@ -107,18 +107,18 @@
self.ImportSongMenu.addAction(self.ImportOpenSongItem)
import_menu.addAction(self.ImportSongMenu.menuAction())
# Translations...
- self.ImportSongMenu.setTitle(import_menu.trUtf8(u'&Song'))
- self.ImportOpenSongItem.setText(import_menu.trUtf8(u'OpenSong'))
- self.ImportOpenlp1Item.setText(import_menu.trUtf8(u'openlp.org 1.0'))
+ self.ImportSongMenu.setTitle(import_menu.trUtf8('&Song'))
+ self.ImportOpenSongItem.setText(import_menu.trUtf8('OpenSong'))
+ self.ImportOpenlp1Item.setText(import_menu.trUtf8('openlp.org 1.0'))
self.ImportOpenlp1Item.setToolTip(
- import_menu.trUtf8(u'Export songs in openlp.org 1.0 format'))
+ import_menu.trUtf8('Export songs in openlp.org 1.0 format'))
self.ImportOpenlp1Item.setStatusTip(
- import_menu.trUtf8(u'Export songs in openlp.org 1.0 format'))
- self.ImportOpenlp2Item.setText(import_menu.trUtf8(u'OpenLP 2.0'))
+ import_menu.trUtf8('Export songs in openlp.org 1.0 format'))
+ self.ImportOpenlp2Item.setText(import_menu.trUtf8('OpenLP 2.0'))
self.ImportOpenlp2Item.setToolTip(
- import_menu.trUtf8(u'Export songs in OpenLP 2.0 format'))
+ import_menu.trUtf8('Export songs in OpenLP 2.0 format'))
self.ImportOpenlp2Item.setStatusTip(
- import_menu.trUtf8(u'Export songs in OpenLP 2.0 format'))
+ import_menu.trUtf8('Export songs in OpenLP 2.0 format'))
# Signals and slots
QtCore.QObject.connect(self.ImportOpenlp1Item,
QtCore.SIGNAL(u'triggered()'), self.onImportOpenlp1ItemClick)
@@ -151,10 +151,10 @@
self.ExportSongMenu.addAction(self.ExportOpenSongItem)
export_menu.addAction(self.ExportSongMenu.menuAction())
# Translations...
- self.ExportSongMenu.setTitle(export_menu.trUtf8(u'&Song'))
- self.ExportOpenSongItem.setText(export_menu.trUtf8(u'OpenSong'))
- self.ExportOpenlp1Item.setText(export_menu.trUtf8(u'openlp.org 1.0'))
- self.ExportOpenlp2Item.setText(export_menu.trUtf8(u'OpenLP 2.0'))
+ self.ExportSongMenu.setTitle(export_menu.trUtf8('&Song'))
+ self.ExportOpenSongItem.setText(export_menu.trUtf8('OpenSong'))
+ self.ExportOpenlp1Item.setText(export_menu.trUtf8('openlp.org 1.0'))
+ self.ExportOpenlp2Item.setText(export_menu.trUtf8('OpenLP 2.0'))
# Signals and slots
QtCore.QObject.connect(self.ExportOpenlp1Item,
QtCore.SIGNAL(u'triggered()'), self.onExportOpenlp1ItemClicked)
@@ -175,6 +175,6 @@
self.opensong_export_form.show()
def about(self):
- about_text = self.trUtf8(u'<b>Song Plugin</b> <br>This plugin allows '
- u'Songs to be managed and displayed.<br>')
+ about_text = self.trUtf8('<b>Song Plugin</b> <br>This plugin allows '
+ 'Songs to be managed and displayed.<br>')
return about_text
=== modified file 'openlp/plugins/songusage/forms/songusagedeletedialog.py'
--- openlp/plugins/songusage/forms/songusagedeletedialog.py 2009-10-27 08:38:02 +0000
+++ openlp/plugins/songusage/forms/songusagedeletedialog.py 2009-11-27 21:15:23 +0000
@@ -41,5 +41,5 @@
QtCore.QMetaObject.connectSlotsByName(AuditDeleteDialog)
def retranslateUi(self, AuditDeleteDialog):
- AuditDeleteDialog.setWindowTitle(self.trUtf8(u'Audit Delete'))
+ AuditDeleteDialog.setWindowTitle(self.trUtf8('Audit Delete'))
=== modified file 'openlp/plugins/songusage/forms/songusagedeleteform.py'
--- openlp/plugins/songusage/forms/songusagedeleteform.py 2009-10-27 08:38:02 +0000
+++ openlp/plugins/songusage/forms/songusagedeleteform.py 2009-11-27 21:15:23 +0000
@@ -42,8 +42,8 @@
def accept(self):
ret = QtGui.QMessageBox.question(self,
- self.trUtf8(u'Delete Selected Audit Events?'),
- self.trUtf8(u'Are you sure you want to delete selected Audit Data?'),
+ self.trUtf8('Delete Selected Audit Events?'),
+ self.trUtf8('Are you sure you want to delete selected Audit Data?'),
QtGui.QMessageBox.StandardButtons(
QtGui.QMessageBox.Ok |
QtGui.QMessageBox.Cancel),
=== modified file 'openlp/plugins/songusage/forms/songusagedetaildialog.py'
--- openlp/plugins/songusage/forms/songusagedetaildialog.py 2009-10-27 08:38:02 +0000
+++ openlp/plugins/songusage/forms/songusagedetaildialog.py 2009-11-27 21:15:23 +0000
@@ -157,25 +157,25 @@
QtCore.QMetaObject.connectSlotsByName(AuditDetailDialog)
def retranslateUi(self, AuditDetailDialog):
- AuditDetailDialog.setWindowTitle(self.trUtf8(u'Audit Detail Extraction'))
- self.FileGroupBox.setTitle(self.trUtf8(u'Report Location'))
- self.ReportTypeGroup.setTitle(self.trUtf8(u'Report Type'))
- self.SummaryReport.setText(self.trUtf8(u'Summary'))
- self.DetailedReport.setText(self.trUtf8(u'Detailed'))
- self.DateRangeGroupBox.setTitle(self.trUtf8(u'Select Date Range'))
- self.FromDateEdit.setDisplayFormat(self.trUtf8(u'dd/MM/yyyy'))
- self.To.setText(self.trUtf8(u'to'))
- self.ToDateEdit.setDisplayFormat(self.trUtf8(u'dd/MM/yyyy'))
- self.TimePeriodGroupBox.setTitle(self.trUtf8(u'Select Time Periods'))
- self.FirstCheckBox.setText(self.trUtf8(u'First Service'))
- self.FirstFromTimeEdit.setDisplayFormat(self.trUtf8(u'hh:mm AP'))
- self.FirstTo.setText(self.trUtf8(u'to'))
- self.FirstToTimeEdit.setDisplayFormat(self.trUtf8(u'hh:mm AP'))
- self.SecondCheckBox.setText(self.trUtf8(u'Second Service'))
- self.SecondFromTimeEdit.setDisplayFormat(self.trUtf8(u'hh:mm AP'))
- self.SecondTo.setText(self.trUtf8(u'to'))
- self.SecondToTimeEdit.setDisplayFormat(self.trUtf8(u'hh:mm AP'))
- self.ThirdCheckBox.setText(self.trUtf8(u'Third Service'))
- self.ThirdFromTimeEdit.setDisplayFormat(self.trUtf8(u'hh:mm AP'))
- self.ThirdTo.setText(self.trUtf8(u'to'))
- self.ThirdToTimeEdit.setDisplayFormat(self.trUtf8(u'hh:mm AP'))
+ AuditDetailDialog.setWindowTitle(self.trUtf8('Audit Detail Extraction'))
+ self.FileGroupBox.setTitle(self.trUtf8('Report Location'))
+ self.ReportTypeGroup.setTitle(self.trUtf8('Report Type'))
+ self.SummaryReport.setText(self.trUtf8('Summary'))
+ self.DetailedReport.setText(self.trUtf8('Detailed'))
+ self.DateRangeGroupBox.setTitle(self.trUtf8('Select Date Range'))
+ self.FromDateEdit.setDisplayFormat(self.trUtf8('dd/MM/yyyy'))
+ self.To.setText(self.trUtf8('to'))
+ self.ToDateEdit.setDisplayFormat(self.trUtf8('dd/MM/yyyy'))
+ self.TimePeriodGroupBox.setTitle(self.trUtf8('Select Time Periods'))
+ self.FirstCheckBox.setText(self.trUtf8('First Service'))
+ self.FirstFromTimeEdit.setDisplayFormat(self.trUtf8('hh:mm AP'))
+ self.FirstTo.setText(self.trUtf8('to'))
+ self.FirstToTimeEdit.setDisplayFormat(self.trUtf8('hh:mm AP'))
+ self.SecondCheckBox.setText(self.trUtf8('Second Service'))
+ self.SecondFromTimeEdit.setDisplayFormat(self.trUtf8('hh:mm AP'))
+ self.SecondTo.setText(self.trUtf8('to'))
+ self.SecondToTimeEdit.setDisplayFormat(self.trUtf8('hh:mm AP'))
+ self.ThirdCheckBox.setText(self.trUtf8('Third Service'))
+ self.ThirdFromTimeEdit.setDisplayFormat(self.trUtf8('hh:mm AP'))
+ self.ThirdTo.setText(self.trUtf8('to'))
+ self.ThirdToTimeEdit.setDisplayFormat(self.trUtf8('hh:mm AP'))
=== modified file 'openlp/plugins/songusage/forms/songusagedetailform.py'
--- openlp/plugins/songusage/forms/songusagedetailform.py 2009-11-07 00:00:36 +0000
+++ openlp/plugins/songusage/forms/songusagedetailform.py 2009-11-27 21:15:23 +0000
@@ -70,7 +70,7 @@
def defineOutputLocation(self):
path = QtGui.QFileDialog.getExistingDirectory(self,
- self.trUtf8(u'Output File Location'),
+ self.trUtf8('Output File Location'),
self.parent.config.get_last_dir(1) )
path = unicode(path)
if path != u'':
=== modified file 'openlp/plugins/songusage/songusageplugin.py'
--- openlp/plugins/songusage/songusageplugin.py 2009-11-07 07:42:18 +0000
+++ openlp/plugins/songusage/songusageplugin.py 2009-11-27 21:15:23 +0000
@@ -57,20 +57,20 @@
self.toolsMenu = tools_menu
self.SongUsageMenu = QtGui.QMenu(tools_menu)
self.SongUsageMenu.setObjectName(u'SongUsageMenu')
- self.SongUsageMenu.setTitle(tools_menu.trUtf8(u'&Song Usage'))
+ self.SongUsageMenu.setTitle(tools_menu.trUtf8('&Song Usage'))
#SongUsage Delete
self.SongUsageDelete = QtGui.QAction(tools_menu)
self.SongUsageDelete.setText(
- tools_menu.trUtf8(u'&Delete recorded data'))
+ tools_menu.trUtf8('&Delete recorded data'))
self.SongUsageDelete.setStatusTip(
- tools_menu.trUtf8(u'Delete song usage to specified date'))
+ tools_menu.trUtf8('Delete song usage to specified date'))
self.SongUsageDelete.setObjectName(u'SongUsageDelete')
#SongUsage Report
self.SongUsageReport = QtGui.QAction(tools_menu)
self.SongUsageReport.setText(
- tools_menu.trUtf8(u'&Extract recorded data'))
+ tools_menu.trUtf8('&Extract recorded data'))
self.SongUsageReport.setStatusTip(
- tools_menu.trUtf8(u'Generate report on Song Usage'))
+ tools_menu.trUtf8('Generate report on Song Usage'))
self.SongUsageReport.setObjectName(u'SongUsageReport')
#SongUsage activation
SongUsageIcon = buildIcon(u':/tools/tools_alert.png')
@@ -78,9 +78,9 @@
self.SongUsageStatus.setIcon(SongUsageIcon)
self.SongUsageStatus.setCheckable(True)
self.SongUsageStatus.setChecked(False)
- self.SongUsageStatus.setText(tools_menu.trUtf8(u'Song Usage Status'))
+ self.SongUsageStatus.setText(tools_menu.trUtf8('Song Usage Status'))
self.SongUsageStatus.setStatusTip(
- tools_menu.trUtf8(u'Start/Stop live song usage recording'))
+ tools_menu.trUtf8('Start/Stop live song usage recording'))
self.SongUsageStatus.setShortcut(u'F4')
self.SongUsageStatus.setObjectName(u'SongUsageStatus')
#Add Menus together
@@ -150,7 +150,7 @@
self.SongUsagedetailform.exec_()
def about(self):
- about_text = self.trUtf8(u'<b>SongUsage Plugin</b><br>This plugin '
- u'records the use of songs and when they have been used during '
- u'a live service')
+ about_text = self.trUtf8('<b>SongUsage Plugin</b><br>This plugin '
+ 'records the use of songs and when they have been used during '
+ 'a live service')
return about_text
=== renamed directory 'i18n' => 'resources/i18n'
Follow ups
