diff --git a/openlp/core/ui/aboutdialog.py b/openlp/core/ui/aboutdialog.py
index fac8874f5..f31b214b6 100644
--- a/openlp/core/ui/aboutdialog.py
+++ b/openlp/core/ui/aboutdialog.py
@@ -114,8 +114,8 @@ class Ui_AboutDialog(object):
         QtCore.QMetaObject.connectSlotsByName(AboutDialog)
 
     def retranslateUi(self, AboutDialog):
-        AboutDialog.setWindowTitle(translate('AboutForm', 'About OpenLP'))
-        self.AboutTextEdit.setPlainText(translate('AboutForm', 
+        AboutDialog.setWindowTitle(translate(u'AboutForm', u'About OpenLP'))
+        self.AboutTextEdit.setPlainText(translate(u'AboutForm', u
             'OpenLP <version><revision> - Open Source Lyrics '
             'Projection\n'
             '\n'
@@ -132,9 +132,10 @@ class Ui_AboutDialog(object):
             'consider contributing by using the button below.'
         ))
         self.AboutNotebook.setTabText(
-            self.AboutNotebook.indexOf(self.AboutTab), translate('AboutForm', 'About'))
-        self.CreditsTextEdit.setPlainText(translate('AboutForm', 
-            'Project Lead\n'
+            self.AboutNotebook.indexOf(self.AboutTab), 
+            translate(u'AboutForm', u'About'))
+        self.CreditsTextEdit.setPlainText(translate(u'AboutForm', 
+            u'Project Lead\n'
             '    Raoul "superfly" Snyman\n'
             '\n'
             'Developers\n'
@@ -165,8 +166,8 @@ class Ui_AboutDialog(object):
         ))
         self.AboutNotebook.setTabText(
             self.AboutNotebook.indexOf(self.CreditsTab),
-            translate('AboutForm', 'Credits'))
-        self.LicenseTextEdit.setPlainText(translate('AboutForm', 
+            translate(u'AboutForm', u'Credits'))
+        self.LicenseTextEdit.setPlainText(translate(u'AboutForm', 
             'Copyright \xa9 2004-2010 Raoul Snyman\n'
             'Portions copyright \xa9 2004-2010 '
             'Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri, '
@@ -557,6 +558,6 @@ class Ui_AboutDialog(object):
             'instead of this License.'))
         self.AboutNotebook.setTabText(
             self.AboutNotebook.indexOf(self.LicenseTab),
-            translate('AboutForm', 'License'))
-        self.ContributeButton.setText(translate('AboutForm', 'Contribute'))
-        self.CloseButton.setText(translate('AboutForm', 'Close'))
+            translate(u'AboutForm', u'License'))
+        self.ContributeButton.setText(translate(u'AboutForm', u'Contribute'))
+        self.CloseButton.setText(translate(u'AboutForm', u'Close'))
diff --git a/openlp/core/ui/amendthemedialog.py b/openlp/core/ui/amendthemedialog.py
index 848f6ec72..636975726 100644
--- a/openlp/core/ui/amendthemedialog.py
+++ b/openlp/core/ui/amendthemedialog.py
@@ -603,95 +603,159 @@ class Ui_AmendThemeDialog(object):
         AmendThemeDialog.setTabOrder(self.HorizontalComboBox, self.VerticalComboBox)
 
     def retranslateUi(self, AmendThemeDialog):
-        AmendThemeDialog.setWindowTitle(translate('AmendThemeForm', 'Theme Maintenance'))
-        self.ThemeNameLabel.setText(translate('AmendThemeForm', 'Theme Name:'))
-        self.BackgroundLabel.setText(translate('AmendThemeForm', 'Background:'))
-        self.BackgroundComboBox.setItemText(0, translate('AmendThemeForm', 'Opaque'))
-        self.BackgroundComboBox.setItemText(1, translate('AmendThemeForm', 'Transparent'))
-        self.BackgroundTypeLabel.setText(translate('AmendThemeForm', 'Background Type:'))
-        self.BackgroundTypeComboBox.setItemText(0, translate('AmendThemeForm', 'Solid Color'))
-        self.BackgroundTypeComboBox.setItemText(1, translate('AmendThemeForm', 'Gradient'))
-        self.BackgroundTypeComboBox.setItemText(2, translate('AmendThemeForm', 'Image'))
-        self.Color1Label.setText(translate('AmendThemeForm', '<Color1>'))
-        self.Color2Label.setText(translate('AmendThemeForm', '<Color2>'))
-        self.ImageLabel.setText(translate('AmendThemeForm', 'Image:'))
-        self.GradientLabel.setText(translate('AmendThemeForm', 'Gradient :'))
-        self.GradientComboBox.setItemText(0, translate('AmendThemeForm', 'Horizontal'))
-        self.GradientComboBox.setItemText(1, translate('AmendThemeForm', 'Vertical'))
-        self.GradientComboBox.setItemText(2, translate('AmendThemeForm', 'Circular'))
+        AmendThemeDialog.setWindowTitle(
+            translate(u'AmendThemeForm', u'Theme Maintenance'))
+        self.ThemeNameLabel.setText(
+            translate(u'AmendThemeForm', u'Theme Name:'))
+        self.BackgroundLabel.setText(
+            translate(u'AmendThemeForm', u'Background:'))
+        self.BackgroundComboBox.setItemText(0,
+            translate(u'AmendThemeForm', u'Opaque'))
+        self.BackgroundComboBox.setItemText(1, 
+            translate(u'AmendThemeForm', u'Transparent'))
+        self.BackgroundTypeLabel.setText(
+            translate(u'AmendThemeForm', u'Background Type:'))
+        self.BackgroundTypeComboBox.setItemText(0,
+            translate(u'AmendThemeForm', u'Solid Color'))
+        self.BackgroundTypeComboBox.setItemText(1, 
+            translate(u'AmendThemeForm', u'Gradient'))
+        self.BackgroundTypeComboBox.setItemText(2, 
+            translate(u'AmendThemeForm', u'Image'))
+        self.Color1Label.setText(
+            translate(u'AmendThemeForm', u'<Color1>'))
+        self.Color2Label.setText(translate(u'AmendThemeForm', u'<Color2>'))
+        self.ImageLabel.setText(translate(u'AmendThemeForm', u'Image:'))
+        self.GradientLabel.setText(translate(u'AmendThemeForm', u'Gradient :'))
+        self.GradientComboBox.setItemText(0, 
+            translate(u'AmendThemeForm', u'Horizontal'))
+        self.GradientComboBox.setItemText(1, 
+            translate(u'AmendThemeForm', u'Vertical'))
+        self.GradientComboBox.setItemText(2, 
+            translate(u'AmendThemeForm', u'Circular'))
         self.ThemeTabWidget.setTabText(
             self.ThemeTabWidget.indexOf(self.BackgroundTab),
-            translate('AmendThemeForm', 'Background'))
-        self.FontMainGroupBox.setTitle(translate('AmendThemeForm', 'Main Font'))
-        self.FontMainlabel.setText(translate('AmendThemeForm', 'Font:'))
-        self.FontMainColorLabel.setText(translate('AmendThemeForm', 'Font Color:'))
-        self.FontMainSize.setText(translate('AmendThemeForm', 'Size:'))
-        self.FontMainSizeSpinBox.setSuffix(translate('AmendThemeForm', 'pt'))
-        self.FontMainWrapIndentationLabel.setText(translate('AmendThemeForm', 'Wrap Indentation'))
-        self.FontMainWrapLineAdjustmentLabel.setText(translate('AmendThemeForm', 'Adjust Line Spacing'))
-        self.FontMainWeightComboBox.setItemText(0, translate('AmendThemeForm', 'Normal'))
-        self.FontMainWeightComboBox.setItemText(1, translate('AmendThemeForm', 'Bold'))
-        self.FontMainWeightComboBox.setItemText(2, translate('AmendThemeForm', 'Italics'))
-        self.FontMainWeightComboBox.setItemText(3, translate('AmendThemeForm', 'Bold/Italics'))
-        self.FontMainWeightLabel.setText(translate('AmendThemeForm', 'Font Weight:'))
-        self.MainLocationGroupBox.setTitle(translate('AmendThemeForm', 'Display Location'))
-        self.DefaultLocationLabel.setText(translate('AmendThemeForm', 'Use Default Location:'))
-        self.FontMainXLabel.setText(translate('AmendThemeForm', 'X Position:'))
-        self.FontMainYLabel.setText(translate('AmendThemeForm', 'Y Position:'))
-        self.FontMainWidthLabel.setText(translate('AmendThemeForm', 'Width:'))
-        self.FontMainHeightLabel.setText(translate('AmendThemeForm', 'Height:'))
-        self.FontMainXSpinBox.setSuffix(translate('AmendThemeForm', 'px'))
-        self.FontMainYSpinBox.setSuffix(translate('AmendThemeForm', 'px'))
-        self.FontMainWidthSpinBox.setSuffix(translate('AmendThemeForm', 'px'))
-        self.FontMainHeightSpinBox.setSuffix(translate('AmendThemeForm', 'px'))
+            translate(u'AmendThemeForm', u'Background'))
+        self.FontMainGroupBox.setTitle(
+            translate(u'AmendThemeForm', u'Main Font'))
+        self.FontMainlabel.setText(translate(u'AmendThemeForm', u'Font:'))
+        self.FontMainColorLabel.setText(
+            translate(u'AmendThemeForm', u'Font Color:'))
+        self.FontMainSize.setText(translate(u'AmendThemeForm', u'Size:'))
+        self.FontMainSizeSpinBox.setSuffix(translate(u'AmendThemeForm', u'pt'))
+        self.FontMainWrapIndentationLabel.setText(
+            translate(u'AmendThemeForm', u'Wrap Indentation'))
+        self.FontMainWrapLineAdjustmentLabel.setText(
+            translate(u'AmendThemeForm', u'Adjust Line Spacing'))
+        self.FontMainWeightComboBox.setItemText(0, 
+            translate(u'AmendThemeForm', u'Normal'))
+        self.FontMainWeightComboBox.setItemText(1, 
+            translate(u'AmendThemeForm', u'Bold'))
+        self.FontMainWeightComboBox.setItemText(2, 
+            translate(u'AmendThemeForm', u'Italics'))
+        self.FontMainWeightComboBox.setItemText(3, 
+            translate(u'AmendThemeForm', u'Bold/Italics'))
+        self.FontMainWeightLabel.setText(
+            translate(u'AmendThemeForm', u'Font Weight:'))
+        self.MainLocationGroupBox.setTitle(
+            translate(u'AmendThemeForm', u'Display Location'))
+        self.DefaultLocationLabel.setText(
+            translate(u'AmendThemeForm', u'Use Default Location:'))
+        self.FontMainXLabel.setText(
+            translate(u'AmendThemeForm', u'X Position:'))
+        self.FontMainYLabel.setText(
+            translate(u'AmendThemeForm', u'Y Position:'))
+        self.FontMainWidthLabel.setText(
+            translate(u'AmendThemeForm', u'Width:'))
+        self.FontMainHeightLabel.setText(
+            translate(u'AmendThemeForm', u'Height:'))
+        self.FontMainXSpinBox.setSuffix(translate(u'AmendThemeForm', u'px'))
+        self.FontMainYSpinBox.setSuffix(translate(u'AmendThemeForm', u'px'))
+        self.FontMainWidthSpinBox.setSuffix(translate(u'AmendThemeForm', u'px'))
+        self.FontMainHeightSpinBox.setSuffix(
+            translate(u'AmendThemeForm', u'px'))
         self.ThemeTabWidget.setTabText(
             self.ThemeTabWidget.indexOf(self.FontMainTab),
-            translate('AmendThemeForm', 'Font Main'))
-        self.FooterFontGroupBox.setTitle(translate('AmendThemeForm', 'Footer Font'))
-        self.FontFooterLabel.setText(translate('AmendThemeForm', 'Font:'))
-        self.FontFooterColorLabel.setText(translate('AmendThemeForm', 'Font Color:'))
-        self.FontFooterSizeLabel.setText(translate('AmendThemeForm', 'Size:'))
-        self.FontFooterSizeSpinBox.setSuffix(translate('AmendThemeForm', 'pt'))
-        self.FontFooterWeightComboBox.setItemText(0, translate('AmendThemeForm', 'Normal'))
-        self.FontFooterWeightComboBox.setItemText(1, translate('AmendThemeForm', 'Bold'))
-        self.FontFooterWeightComboBox.setItemText(2, translate('AmendThemeForm', 'Italics'))
-        self.FontFooterWeightComboBox.setItemText(3, translate('AmendThemeForm', 'Bold/Italics'))
-        self.FontFooterWeightLabel.setText(translate('AmendThemeForm', 'Font Weight:'))
-        self.LocationFooterGroupBox.setTitle(translate('AmendThemeForm', 'Display Location'))
-        self.FontFooterDefaultLabel.setText(translate('AmendThemeForm', 'Use Default Location:'))
-        self.FontFooterXLabel.setText(translate('AmendThemeForm', 'X Position:'))
-        self.FontFooterYLabel.setText(translate('AmendThemeForm', 'Y Position:'))
-        self.FontFooterWidthLabel.setText(translate('AmendThemeForm', 'Width:'))
-        self.FontFooterHeightLabel.setText(translate('AmendThemeForm', 'Height:'))
-        self.FontFooterXSpinBox.setSuffix(translate('AmendThemeForm', 'px'))
-        self.FontFooterYSpinBox.setSuffix(translate('AmendThemeForm', 'px'))
-        self.FontFooterWidthSpinBox.setSuffix(translate('AmendThemeForm', 'px'))
-        self.FontFooterHeightSpinBox.setSuffix(translate('AmendThemeForm', 'px'))
+            translate(u'AmendThemeForm', u'Font Main'))
+        self.FooterFontGroupBox.setTitle(
+            translate(u'AmendThemeForm', u'Footer Font'))
+        self.FontFooterLabel.setText(translate(u'AmendThemeForm', u'Font:'))
+        self.FontFooterColorLabel.setText(
+            translate(u'AmendThemeForm', u'Font Color:'))
+        self.FontFooterSizeLabel.setText(translate(u'AmendThemeForm', u'Size:'))
+        self.FontFooterSizeSpinBox.setSuffix(translate(u'AmendThemeForm', u'pt'))
+        self.FontFooterWeightComboBox.setItemText(0, 
+            translate(u'AmendThemeForm', u'Normal'))
+        self.FontFooterWeightComboBox.setItemText(1,
+            translate(u'AmendThemeForm', u'Bold'))
+        self.FontFooterWeightComboBox.setItemText(2, 
+            translate(u'AmendThemeForm', u'Italics'))
+        self.FontFooterWeightComboBox.setItemText(3, 
+            translate(u'AmendThemeForm', u'Bold/Italics'))
+        self.FontFooterWeightLabel.setText(
+            translate(u'AmendThemeForm', u'Font Weight:'))
+        self.LocationFooterGroupBox.setTitle(
+            translate(u'AmendThemeForm', u'Display Location'))
+        self.FontFooterDefaultLabel.setText(
+            translate(u'AmendThemeForm', u'Use Default Location:'))
+        self.FontFooterXLabel.setText(
+            translate(u'AmendThemeForm', u'X Position:'))
+        self.FontFooterYLabel.setText(
+            translate(u'AmendThemeForm', u'Y Position:'))
+        self.FontFooterWidthLabel.setText(
+            translate(u'AmendThemeForm', u'Width:'))
+        self.FontFooterHeightLabel.setText(
+            translate(u'AmendThemeForm', u'Height:'))
+        self.FontFooterXSpinBox.setSuffix(
+            translate(u'AmendThemeForm', u'px'))
+        self.FontFooterYSpinBox.setSuffix(
+            translate(u'AmendThemeForm', u'px'))
+        self.FontFooterWidthSpinBox.setSuffix(
+            translate(u'AmendThemeForm', u'px'))
+        self.FontFooterHeightSpinBox.setSuffix(
+            translate(u'AmendThemeForm', u'px'))
         self.ThemeTabWidget.setTabText(
             self.ThemeTabWidget.indexOf(self.FontFooterTab),
-            translate('AmendThemeForm', 'Font Footer'))
-        self.OutlineGroupBox.setTitle(translate('AmendThemeForm', 'Outline'))
-        self.OutlineSpinBoxLabel.setText(translate('AmendThemeForm', 'Outline Size:'))
-        self.OutlineSpinBox.setSuffix(translate('AmendThemeForm', 'px'))
-        self.OutlineColorLabel.setText(translate('AmendThemeForm', 'Outline Color:'))
-        self.OutlineEnabledLabel.setText(translate('AmendThemeForm', 'Show Outline:'))
-        self.ShadowGroupBox.setTitle(translate('AmendThemeForm', 'Shadow'))
-        self.ShadowSpinBoxLabel.setText(translate('AmendThemeForm', 'Shadow Size:'))
-        self.ShadowSpinBox.setSuffix(translate('AmendThemeForm', 'px'))
-        self.ShadowColorLabel.setText(translate('AmendThemeForm', 'Shadow Color:'))
-        self.ShadowEnabledLabel.setText(translate('AmendThemeForm', 'Show Shadow:'))
-        self.AlignmentGroupBox.setTitle(translate('AmendThemeForm', 'Alignment'))
-        self.HorizontalLabel.setText(translate('AmendThemeForm', 'Horizontal Align:'))
-        self.HorizontalComboBox.setItemText(0, translate('AmendThemeForm', 'Left'))
-        self.HorizontalComboBox.setItemText(1, translate('AmendThemeForm', 'Right'))
-        self.HorizontalComboBox.setItemText(2, translate('AmendThemeForm', 'Center'))
-        self.VerticalLabel.setText(translate('AmendThemeForm', 'Vertical Align:'))
-        self.VerticalComboBox.setItemText(0, translate('AmendThemeForm', 'Top'))
-        self.VerticalComboBox.setItemText(1, translate('AmendThemeForm', 'Middle'))
-        self.VerticalComboBox.setItemText(2, translate('AmendThemeForm', 'Bottom'))
-        self.TransitionGroupBox.setTitle(translate('AmendThemeForm', 'Slide Transition'))
-        self.SlideTransitionCheckedBoxLabel.setText(translate('AmendThemeForm', 'Transition Active:'))
+            translate(u'AmendThemeForm', u'Font Footer'))
+        self.OutlineGroupBox.setTitle(translate(u'AmendThemeForm', u'Outline'))
+        self.OutlineSpinBoxLabel.setText(
+            translate(u'AmendThemeForm', u'Outline Size:'))
+        self.OutlineSpinBox.setSuffix(translate(u'AmendThemeForm', u'px'))
+        self.OutlineColorLabel.setText(
+            translate(u'AmendThemeForm', u'Outline Color:'))
+        self.OutlineEnabledLabel.setText(
+            translate(u'AmendThemeForm', u'Show Outline:'))
+        self.ShadowGroupBox.setTitle(
+            translate(u'AmendThemeForm', u'Shadow'))
+        self.ShadowSpinBoxLabel.setText(
+            translate(u'AmendThemeForm', u'Shadow Size:'))
+        self.ShadowSpinBox.setSuffix(translate(u'AmendThemeForm', u'px'))
+        self.ShadowColorLabel.setText(
+            translate(u'AmendThemeForm', u'Shadow Color:'))
+        self.ShadowEnabledLabel.setText(
+            translate(u'AmendThemeForm', u'Show Shadow:'))
+        self.AlignmentGroupBox.setTitle(
+            translate(u'AmendThemeForm', u'Alignment'))
+        self.HorizontalLabel.setText(
+            translate(u'AmendThemeForm', u'Horizontal Align:'))
+        self.HorizontalComboBox.setItemText(0, 
+            translate(u'AmendThemeForm', u'Left'))
+        self.HorizontalComboBox.setItemText(1, 
+            translate(u'AmendThemeForm', u'Right'))
+        self.HorizontalComboBox.setItemText(2, 
+            translate(u'AmendThemeForm', u'Center'))
+        self.VerticalLabel.setText(
+            translate(u'AmendThemeForm', u'Vertical Align:'))
+        self.VerticalComboBox.setItemText(0, 
+            translate(u'AmendThemeForm', u'Top'))
+        self.VerticalComboBox.setItemText(1, 
+            translate(u'AmendThemeForm', u'Middle'))
+        self.VerticalComboBox.setItemText(2, 
+            translate(u'AmendThemeForm', u'Bottom'))
+        self.TransitionGroupBox.setTitle(
+            translate(u'AmendThemeForm', u'Slide Transition'))
+        self.SlideTransitionCheckedBoxLabel.setText(
+            translate(u'AmendThemeForm', u'Transition Active:'))
         self.ThemeTabWidget.setTabText(
             self.ThemeTabWidget.indexOf(self.OtherOptionsTab),
-            translate('AmendThemeForm', 'Other Options'))
-        self.PreviewGroupBox.setTitle(translate('AmendThemeForm', 'Preview'))
+            translate(u'AmendThemeForm', u'Other Options'))
+        self.PreviewGroupBox.setTitle(translate(u'AmendThemeForm', u'Preview'))
diff --git a/openlp/core/ui/plugindialog.py b/openlp/core/ui/plugindialog.py
index e9c205e20..f0112dac9 100644
--- a/openlp/core/ui/plugindialog.py
+++ b/openlp/core/ui/plugindialog.py
@@ -99,11 +99,15 @@ class Ui_PluginViewDialog(object):
         QtCore.QMetaObject.connectSlotsByName(PluginViewDialog)
 
     def retranslateUi(self, PluginViewDialog):
-        PluginViewDialog.setWindowTitle(translate('PluginForm', 'Plugin List'))
-        self.PluginInfoGroupBox.setTitle(translate('PluginForm', 'Plugin Details'))
-        self.VersionLabel.setText(translate('PluginForm', 'Version:'))
-        self.VersionNumberLabel.setText(translate('PluginForm', 'TextLabel'))
-        self.AboutLabel.setText(translate('PluginForm', 'About:'))
-        self.StatusLabel.setText(translate('PluginForm', 'Status:'))
-        self.StatusComboBox.setItemText(0, translate('PluginForm', 'Active'))
-        self.StatusComboBox.setItemText(1, translate('PluginForm', 'Inactive'))
+        PluginViewDialog.setWindowTitle(
+            translate(u'PluginForm', u'Plugin List'))
+        self.PluginInfoGroupBox.setTitle(
+            translate(u'PluginForm', u'Plugin Details'))
+        self.VersionLabel.setText(
+            translate(u'PluginForm', u'Version:'))
+        self.VersionNumberLabel.setText(translate(u'PluginForm', u'TextLabel'))
+        self.AboutLabel.setText(translate(u'PluginForm', u'About:'))
+        self.StatusLabel.setText(translate(u'PluginForm', u'Status:'))
+        self.StatusComboBox.setItemText(0, translate(u'PluginForm', u'Active'))
+        self.StatusComboBox.setItemText(1, 
+            translate(u'PluginForm', u'Inactive'))
diff --git a/openlp/core/ui/serviceitemeditdialog.py b/openlp/core/ui/serviceitemeditdialog.py
index 467c2aed8..855cae4fa 100644
--- a/openlp/core/ui/serviceitemeditdialog.py
+++ b/openlp/core/ui/serviceitemeditdialog.py
@@ -67,8 +67,9 @@ class Ui_ServiceItemEditDialog(object):
         QtCore.QMetaObject.connectSlotsByName(ServiceItemEditDialog)
 
     def retranslateUi(self, ServiceItemEditDialog):
-        ServiceItemEditDialog.setWindowTitle(translate('ServiceItemEditForm', 'Service Item Maintenance'))
-        self.upButton.setText(translate('ServiceItemEditForm', 'Up'))
-        self.deleteButton.setText(translate('ServiceItemEditForm', 'Delete'))
-        self.downButton.setText(translate('ServiceItemEditForm', 'Down'))
+        ServiceItemEditDialog.setWindowTitle(
+            translate(u'ServiceItemEditForm', u'Service Item Maintenance'))
+        self.upButton.setText(translate(u'ServiceItemEditForm', u'Up'))
+        self.deleteButton.setText(translate(u'ServiceItemEditForm', u'Delete'))
+        self.downButton.setText(translate(u'ServiceItemEditForm', u'Down'))
 
diff --git a/openlp/core/ui/servicenotedialog.py b/openlp/core/ui/servicenotedialog.py
index b21adce8d..4bf2ee531 100644
--- a/openlp/core/ui/servicenotedialog.py
+++ b/openlp/core/ui/servicenotedialog.py
@@ -39,7 +39,8 @@ class Ui_ServiceNoteEdit(object):
         self.textEdit.setObjectName(u'textEdit')
         self.verticalLayout.addWidget(self.textEdit)
         self.buttonBox = QtGui.QDialogButtonBox(self.widget)
-        self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Save)
+        self.buttonBox.setStandardButtons(
+            QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Save)
         self.buttonBox.setObjectName(u'buttonBox')
         self.verticalLayout.addWidget(self.buttonBox)
 
@@ -47,4 +48,5 @@ class Ui_ServiceNoteEdit(object):
         QtCore.QMetaObject.connectSlotsByName(ServiceNoteEdit)
 
     def retranslateUi(self, ServiceNoteEdit):
-        ServiceNoteEdit.setWindowTitle(translate('ServiceNoteForm', 'Service Item Notes'))
+        ServiceNoteEdit.setWindowTitle(
+            translate(u'ServiceNoteForm', u'Service Item Notes'))
diff --git a/openlp/core/ui/settingsdialog.py b/openlp/core/ui/settingsdialog.py
index 66501e380..c5874b84c 100644
--- a/openlp/core/ui/settingsdialog.py
+++ b/openlp/core/ui/settingsdialog.py
@@ -60,4 +60,4 @@ class Ui_SettingsDialog(object):
         QtCore.QMetaObject.connectSlotsByName(SettingsDialog)
 
     def retranslateUi(self, SettingsDialog):
-        SettingsDialog.setWindowTitle(translate('SettingsForm', 'Settings'))
+        SettingsDialog.setWindowTitle(translate(u'SettingsForm', u'Settings'))
diff --git a/openlp/core/utils/languagemanager.py b/openlp/core/utils/languagemanager.py
index 8be408d17..8621095ab 100644
--- a/openlp/core/utils/languagemanager.py
+++ b/openlp/core/utils/languagemanager.py
@@ -89,9 +89,9 @@ class LanguageManager(object):
             u'general/language', QtCore.QVariant(language))
         log.info(u'Language file: \'%s\' written to conf file' % language)
         QtGui.QMessageBox.information(None,  
-                    translate('LanguageManager', 'Language'), 
-                    translate('LanguageManager', 
-                        'After restart new Language settings will be used.'))
+                    translate(u'LanguageManager', u'Language'), 
+                    translate(u'LanguageManager', 
+                        u'After restart new Language settings will be used.'))
 
     @staticmethod
     def init_qm_list():