diff --git a/openlp/plugins/alerts/lib/alertsmanager.py b/openlp/plugins/alerts/lib/alertsmanager.py
index 6838fefa0..41fc25562 100644
--- a/openlp/plugins/alerts/lib/alertsmanager.py
+++ b/openlp/plugins/alerts/lib/alertsmanager.py
@@ -76,7 +76,7 @@ class AlertsManager(QtCore.QObject):
display text
"""
log.debug(u'display alert called %s' % text)
- self.parent.maindisplay.parent.StatusBar.showMessage(self.trUtf8(u''))
+ self.parent.maindisplay.parent.StatusBar.showMessage(u'')
self.alertList.append(text)
if self.timer_id != 0 or self.parent.maindisplay.mediaLoaded:
self.parent.maindisplay.parent.StatusBar.showMessage(\
diff --git a/resources/i18n/openlp_en.ts b/resources/i18n/openlp_en.ts
index d92273c1d..6f9d4a26a 100644
--- a/resources/i18n/openlp_en.ts
+++ b/resources/i18n/openlp_en.ts
@@ -4,879 +4,2296 @@
BibleMediaItem
-
+
-
- AlertsTab
-
-
-
-
-
-
-
-
-
-
-
-
- Ui_OpenLPExportDialog
-
-
-
-
-
-
-
- Ui_AmendThemeDialog
-
-
-
-
-
-
-
- AlertForm
-
-
-
-
-
-
-
- SplashScreen
-
-
-
-
-
-
-
- MediaManagerItem
-
-
-
-
-
-
-
- EditCustomForm
-
-
-
-
-
-
-
- Ui_AmendThemeDialog
-
-
-
-
-
-
-
- TestMediaManager:
-
-
-
-
-
-
-
- AboutForm
-
-
-
-
-
-
-
- TestMediaManager:
-
-
-
-
-
-
-
- Ui_MainWindow
-
-
-
-
-
-
-
- Ui_AmendThemeDialog
-
-
-
-
-
-
-
- Ui_OpenSongImportDialog
-
-
-
-
-
-
-
- Ui_AmendThemeDialog
-
-
-
-
-
-
-
-
-
-
-
Ui_customEditDialog
-
-
-
-
-
-
-
-
-
-
-
- BibleImportForm
-
-
-
-
-
-
-
- Ui_OpenSongExportDialog
-
-
-
-
-
-
-
- Ui_customEditDialog
-
-
-
-
-
-
-
- Ui_OpenLPImportDialog
-
-
-
-
-
-
-
- ImageTab
-
-
-
-
-
-
-
- Ui_OpenSongExportDialog
-
-
-
-
-
-
-
- BibleMediaItem
-
-
-
-
-
-
-
- Ui_OpenSongExportDialog
-
-
-
-
-
-
-
- Ui_PluginViewDialog
-
-
-
-
-
-
-
- Ui_OpenLPImportDialog
-
-
-
-
-
-
-
- Ui_MainWindow
-
-
-
-
-
-
-
-
-
-
-
-
- Ui_SongMaintenanceDialog
-
-
-
-
-
-
-
- Ui_AmendThemeDialog
-
-
-
-
-
-
-
- SongMaintenanceForm
-
-
-
-
-
-
-
- Ui_AmendThemeDialog
-
-
-
-
-
-
-
- Ui_MainWindow
-
-
-
-
-
-
-
- Ui_AmendThemeDialog
-
-
-
-
-
-
-
- MediaManagerItem
-
-
-
-
-
-
-
- BibleMediaItem
-
-
-
-
-
-
-
- Ui_SongMaintenanceDialog
-
-
-
-
-
-
-
- Ui_EditSongDialog
-
-
-
-
-
-
-
- SongsPlugin
-
-
-
-
-
-
-
- MediaManagerItem
-
-
-
-
-
-
-
-
-
-
-
-
- Ui_AmendThemeDialog
-
-
-
-
-
-
-
- Ui_BibleImportDialog
-
-
-
-
-
-
-
- Ui_AmendThemeDialog
-
-
-
-
-
-
-
- GeneralTab
-
-
-
-
-
-
-
- ThemeManager
-
-
-
-
-
-
-
- Ui_AmendThemeDialog
-
-
-
-
-
-
-
- AlertsTab
-
-
-
-
-
-
-
- Ui_OpenLPExportDialog
-
-
-
-
-
-
-
- Ui_OpenLPImportDialog
-
-
-
+
+
BiblesTab
-
-
+
+
- Ui_AuditDetailDialog
+ RemoteTab
-
-
+
+
- Ui_BibleImportDialog
+ ServiceManager
-
-
-
-
-
-
- SongBookForm
-
-
-
-
-
-
-
- Ui_OpenLPImportDialog
-
-
-
-
-
-
-
- Ui_PluginViewDialog
-
-
-
-
-
-
-
- AboutForm
-
-
-
-
-
-
-
- GeneralTab
-
-
-
+
+
Ui_AmendThemeDialog
-
-
-
-
-
-
- TopicsForm
-
-
-
-
-
-
-
- SlideController
-
-
-
-
-
-
-
- Ui_OpenLPExportDialog
-
-
-
-
-
-
-
- BibleMediaItem
-
-
-
-
-
-
-
- Ui_AmendThemeDialog
-
-
-
-
-
-
-
- Ui_EditSongDialog
-
-
-
-
-
-
-
- AboutForm
-
-
-
-
-
-
-
- AlertForm
-
-
-
-
-
-
-
- AuthorsForm
-
-
-
+
+
Ui_OpenSongExportDialog
-
-
-
-
-
-
- MediaManagerItem
-
-
-
-
-
-
-
- Ui_SettingsDialog
-
-
-
-
-
-
-
- BibleMediaItem
-
-
-
-
-
-
-
- Ui_OpenLPExportDialog
-
-
-
-
-
-
-
- ImageTab
-
-
-
-
-
-
-
- Ui_AmendThemeDialog
-
-
-
-
-
-
-
-
-
-
-
-
- Ui_EditSongDialog
-
-
-
-
-
-
-
- BibleMediaItem
-
-
-
-
-
-
-
- MediaTab
-
-
-
-
-
-
-
- AboutForm
-
-
+
- Ui_EditSongDialog
+ ThemeManager
-
-
-
-
-
-
- Ui_OpenLPImportDialog
-
-
-
+
+
Ui_AmendThemeDialog
-
-
+
+
- Ui_EditSongDialog
+ ImportWizardForm
-
-
-
-
-
-
- Ui_OpenSongExportDialog
-
-
-
+
+
ThemesTab
-
-
+
+
- Ui_EditSongDialog
+ BibleMediaItem
-
-
+
+
- Ui_BibleImportDialog
+ ServiceManager
-
-
+
+
- Ui_SongMaintenanceDialog
+ SongUsagePlugin
-
-
-
-
-
-
- Ui_AuditDetailDialog
-
-
-
-
-
-
-
- Ui_SongMaintenanceDialog
-
-
-
-
-
-
-
- SlideController
-
-
-
-
-
-
-
- SongMediaItem
-
-
-
-
-
-
-
-
-
-
-
-
- Ui_BibleImportDialog
-
-
-
-
-
-
-
- Ui_customEditDialog
-
-
-
-
-
-
-
- PresentationTab
-
-
-
-
-
-
-
- ThemeManager
-
-
-
-
-
-
-
- EditSongForm
-
-
-
-
-
-
-
- Ui_SongMaintenanceDialog
-
-
-
-
-
-
-
- Ui_BibleImportDialog
-
-
-
+
+
Ui_OpenLPExportDialog
-
-
+
+
- GeneralTab
+ Ui_customEditDialog
-
-
-
-
-
-
-
+
+
- Ui_AmendThemeDialog
+ SongMediaItem
-
-
+
+
+
+
+
+
+ Ui_SongUsageDeleteDialog
+
+
+
+
+
+
+
+ BibleMediaItem
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ Ui_customEditDialog
+
+
+
+
+
+
+
+ Ui_ServiceNoteEdit
+
+
+
+
+
+
+
+ SongMaintenanceForm
+
+
+
+
+
+
+
+ Ui_customEditDialog
+
+
+
+
+
+
+
+ ThemesTab
+
+
+
+
+
+
+
+ SongUsagePlugin
+
+
+
+
+
+
+
+ MainWindow
+
+
+
+
+
+
+
+ Ui_OpenSongExportDialog
+
+
+
+
+
+
+
+ Ui_AlertDialog
+
+
+
+
+
+
+
+ Ui_customEditDialog
+
+
+
+
+
+
+
+ SongMaintenanceForm
+
+
+
+
+
+
+
+ ThemeManager
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
SlideController
-
-
+
+
+
+
+
+
+
+
+
+
+
+ Ui_PluginViewDialog
+
+
+
AlertsTab
-
-
+
+
+
+
+
+
+
+
+
+
+
+ SlideController
+
+
+
+
+
+
+
+ SongMaintenanceForm
+
+
+
BiblesTab
-
-
+
+
+
+
+
+
+ Ui_customEditDialog
+
+
+
+
+
+
+
+ SongMaintenanceForm
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ ImportWizardForm
+
+
+
+
+
+
+
+ ThemeManager
+
+
+
+
+
+
+
+ SplashScreen
+
+
+
+
+
+
+
+ SongMediaItem
+
+
+
+
+
+
+
+ SongUsageDeleteForm
+
+
+
+
+
+
+
+ Ui_OpenSongExportDialog
+
+
+
+
+
+
+
+ BibleMediaItem
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ SongMaintenanceForm
+
+
+
+
+
+
+
+ SongUsagePlugin
+
+
+
+
+
+
+
+ Ui_customEditDialog
+
+
+
+
+
+
+
+ SongsPlugin
+
+
+
+
+
+
+
+ AlertsManager
+
+
+
+
+
+
+
+ Ui_EditSongDialog
+
+
+
+
+
+
+
+ ServiceManager
+
+
+
+
+
+
+
+ BiblesTab
+
+
+
Ui_AmendThemeDialog
-
+
+
+
+
+
+
+ EditSongForm
+
+
+
+
+
+
+
+ ThemeManager
+
+
+
+
+
+
+
+ ImportWizardForm
+
+
+
+
+
+
+
+ ThemesTab
+
+
+
+
+
+
+
+ ThemeManager
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ Ui_OpenLPImportDialog
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ ThemeManager
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ SongBookForm
+
+
+
+
+
+
+
+ Ui_AuthorsDialog
+
+
+
+
+
+
+
+ Ui_customEditDialog
+
+
+
+
+
+
+
+ ImportWizardForm
+
+
+
+
+
+
+
+ SongMediaItem
+
+
+
+
+
+
+
+ Ui_AlertEditDialog
+
+
+
+
+
+
+
+ EditCustomForm
+
+
+
+
+
+
+
+ BibleMediaItem
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ BibleMediaItem
+
+
+
+
+
+
+
+ Ui_OpenLPExportDialog
+
+
+
+
+
+
+
+ SongUsagePlugin
+
+
+
+
+
+
+
+ Ui_SongUsageDetailDialog
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ SongMediaItem
+
+
+
+
+
+
+
+ ImageMediaItem
+
+
+
+
+
+
+
+ BibleMediaItem
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ ImageMediaItem
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ MediaManagerItem
+
+
+
+
+
+
+
+ GeneralTab
+
+
+
+
+
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ SongMaintenanceForm
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ SongUsageDeleteForm
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ ImportWizardForm
+
+
+
+
+
+
+
+ CustomPlugin
+
+
+
+
+
+
+
+ AuthorsForm
+
+
+
+
+
+
+
+ SongsTab
+
+
+
+
+
+
+
+ ServiceManager
+
+
+
+
+
+
+
+ ImageMediaItem
+
+
+
+
+
+
+
+ Ui_SongMaintenanceDialog
+
+
+
+
+
+
+
+ Ui_OpenSongExportDialog
+
+
+
+
+
+
+
+ ThemesTab
+
+
+
+
+
+
+
+ PresentationMediaItem
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ CustomTab
+
+
+
+
+
+
+
+ Ui_OpenLPImportDialog
+
+
+
+
+
+
+
+ MainWindow
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ SlideController
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ Ui_OpenLPExportDialog
+
+
+
+
+
+
+
+ ImportWizardForm
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ SlideController
+
+
+
+
+
+
+
+ Ui_AboutDialog
+
+
+
+
+
+
+
+ GeneralTab
+
+
+
+
+
+
+
+ Ui_EditSongDialog
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ Ui_customEditDialog
+
+
+
+
+
+
+
+ SlideController
+
+
+
+
+
+
+
+ ImportWizardForm
+
+
+
+
+
+
+
+ BiblesTab
+
+
+
+
+
+
+
+ Ui_EditVerseDialog
+
+
+
+
+
+
+
+ GeneralTab
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ Ui_OpenSongImportDialog
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ Ui_EditSongDialog
+
+
+
+
+
+
+
+ Ui_SongUsageDetailDialog
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+
+
+
+
+
+ SongMediaItem
+
+
+
+
+
+
+
+ Ui_OpenLPImportDialog
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ GeneralTab
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ ServiceManager
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ Ui_OpenLPImportDialog
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ ThemesTab
+
+
+
+
+
+
+
+ BiblesTab
+
+
+
+
+
+
+
+ Ui_customEditDialog
+
+
+
+
+
+
+
+ MediaManagerItem
+
+
+
+
+
+
+
+ GeneralTab
+
+
+
+
+
+
+
+ ServiceManager
+
+
+
+
+
+
+
+ ImportWizardForm
+
+
+
+
+
+
+
+ GeneralTab
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ BibleMediaItem
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+
+
+
+
+
+ ImportWizardForm
+
+
+
+
+
+
+
+ GeneralTab
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ ServiceManager
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ SongMaintenanceForm
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ ImageMediaItem
+
+
+
+
+
+
+
+ Ui_AuthorsDialog
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ Ui_OpenSongImportDialog
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ SongMaintenanceForm
+
+
+
+
+
+
+
+ ImportWizardForm
+
+
+
+
+
+
+
+ SlideController
+
+
+
+
+
+
+
+ SongMediaItem
+
+
+
+
+
+
+
+ Ui_AboutDialog
+
+
+
+
+
+
+
+ TopicsForm
+
+
+
+
+
+
+
+ Ui_OpenSongExportDialog
+
+
+
+
+
+
+
+ BibleMediaItem
+
+
+
+
+
+
+
+ ImageTab
+
+
+
+
+
+
+
+ ServiceManager
+
+
+
+
+
+
+
+ GeneralTab
+
+
+
+
+
+
+
+ Ui_OpenLPImportDialog
+
+
+
+
+
+
+
+ Ui_OpenSongExportDialog
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+
+
+
+
+
+ ServiceManager
+
+
+
+
+
+
+
+ Ui_SongMaintenanceDialog
+
+
+
+
+
+
+
+ Ui_OpenLPImportDialog
+
+
+
+
+
+
+
+ Ui_customEditDialog
+
+
+
+
+
+
+
+ Ui_EditSongDialog
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ SongMaintenanceForm
+
+
+
+
+
+
+
+ ThemeManager
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ GeneralTab
+
+
+
+
+
+
+
+ Ui_EditSongDialog
+
+
+
+
+
+
+
+ SongMaintenanceForm
+
+
+
+
+
+
+
+ SlideController
+
+
+
+
+
+
+
+ Ui_EditVerseDialog
+
+
+
+
+
+
+
+ Ui_EditSongDialog
+
+
+
+
+
+
+
+ Ui_EditVerseDialog
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ BibleMediaItem
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ PresentationTab
+
+
+
+
+
+
+
+ ImportWizardForm
+
+
+
+
+
+
+
+ TopicsForm
+
+
+
+
+
+
+
+ RemoteTab
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ Ui_OpenLPExportDialog
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ ThemeManager
+
+
+
+
+
+
+
+ ServiceManager
+
+
+
+
+
+
+
+ Ui_AlertDialog
+
+
+
+
+
+
+
+ ImportWizardForm
+
+
+
+
+
+
+
+ GeneralTab
+
+
+
+
+
+
+
+ AlertsTab
+
+
+
+
+
+
+
+ Ui_EditSongDialog
+
+
+
+
+
+
+
+ EditSongForm
+
+
+
+
+
+
+
+ BibleMediaItem
+
+
+
+
+
+
+
+ CustomTab
+
+
+
+
+
+
+
+ BiblePlugin
+
+
+
+
+
+
+
+ Ui_EditSongDialog
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ SongsPlugin
+
+
+
+
+
+
+
+ MediaManagerItem
+
+
+
+
+
+
+
+ AlertEditForm
+
+
+
+
+
+
+
+ SongsPlugin
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ EditSongForm
+
+
+
+
+
+
+
+ BibleMediaItem
+
+
+
+
+
+
+
+ Ui_OpenLPExportDialog
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ BibleMediaItem
+
+
+
+
+
+
+
+ SongUsagePlugin
+
+
+
+
+
+
+
+ Ui_EditSongDialog
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ PresentationMediaItem
+
+
+
+
+
+
+
+ ServiceManager
+
+
+
+
+
+
+
+ Ui_EditVerseDialog
+
+
+
+
+
+
+
+ Ui_EditSongDialog
+
+
+
+
+
+
+
+ Ui_AboutDialog
+
+
+
+
+
+
+
+ Ui_OpenLPExportDialog
+
+
+
+
+
+
+
+ AuthorsForm
+
+
+
+
+
+
+
+ SongMediaItem
+
+
+
+
+
+
+
+ AmendThemeForm
+
+
+
+
+
+
+
+ Ui_OpenSongImportDialog
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ Ui_AlertDialog
+
+
+
+
+
+
+
+ Ui_EditSongDialog
+
+
+
+
+
+
+
+ AlertsTab
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ CustomTab
+
+
+
+
+
+
+
+ Ui_OpenSongExportDialog
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ Ui_EditSongDialog
+
+
+
+
+
+
+
+ ThemeManager
+
+
+
+
+
+
+
+ ImageMediaItem
+
+
+
+
+
+
+
+ Ui_SongBookDialog
+
+
+
+
+
+
+
+ Ui_AuthorsDialog
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+
+
+
+
+
+ BibleMediaItem
+
+
+
+
+
+
+
+ Ui_OpenLPExportDialog
+
+
+
+
+
+
+
+ Ui_OpenSongImportDialog
+
+
+
+
+
+
+
+ SlideController
+
+
+
+
+
+
+
+ Ui_OpenLPExportDialog
+
+
+
+
+
+
+
+ Ui_SongMaintenanceDialog
+
+
+
+
+
+
+
+ SongMaintenanceForm
+
+
+
+
+
+
+
+ SongUsagePlugin
+
+
+
+
+
+
+
+ BibleMediaItem
+
+
+
+
+
+
+
+ Ui_SongBookDialog
+
+
+
+
+
+
+
+ EditSongForm
+
+
+
+
+
+
+
+ Ui_SongBookDialog
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
@@ -884,84 +2301,63 @@
SongMediaItem
-
+
- Ui_OpenSongImportDialog
+ Ui_BibleImportWizard
-
-
+
+
Ui_AmendThemeDialog
-
+
- Ui_EditSongDialog
+ Ui_BibleImportWizard
-
-
+
+
+
+
+
+
+ Ui_customEditDialog
+
+
+
+
+
+
+
+ MediaMediaItem
+
+
+
+
+
+
+
+ PresentationMediaItem
+
+
+
SongMediaItem
-
-
-
-
-
-
- MediaManagerItem
-
-
-
-
-
-
-
- Ui_MainWindow
-
-
-
-
-
-
-
-
-
-
-
-
- Ui_AuditDetailDialog
-
-
-
-
-
-
-
- Ui_MainWindow
-
-
-
-
-
-
-
- SongMediaItem
-
-
+
@@ -969,23 +2365,2479 @@
Ui_PluginViewDialog
-
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+
+
+
+
Ui_AmendThemeDialog
-
-
+
+
+
+
+
+
+ SongMaintenanceForm
+
+
+
+
+
+
+
+ Ui_AlertEditDialog
+
+
+
+
+
+
+
+ Ui_EditSongDialog
+
+
+
+
+
+
+
+ AlertsTab
+
+
+
+
+
+
+
+ SongsPlugin
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ MediaManagerItem
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
-
+
+
+
+
+
+
+ ThemeManager
+
+
+
+
+
+
+
+ ThemesTab
+
+
+
+
+
+
+
+ BibleMediaItem
+
+
+
+
+
+
+
+ Ui_AboutDialog
+
+
+
+
+
+
+
+ SongsPlugin
+
+
+
+
+
+
+
+ ServiceManager
+
+
+
+
+
+
+
+ Ui_TopicsDialog
+
+
+
+
+
+
+
+ ThemeManager
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ ServiceManager
+
+
+
+
+
+
+
+ Ui_EditSongDialog
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ AlertEditForm
+
+
+
+
+
+
+
+ BibleMediaItem
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ ServiceManager
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ Ui_OpenLPImportDialog
+
+
+
+
+
+
+
+ MainWindow
+
+
+
+
+
+
+
+ Ui_customEditDialog
+
+
+
+
+
+
+
+
+
+
+
+
+ EditCustomForm
+
+
+
+
+
+
+
+ ThemeManager
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ Ui_OpenSongExportDialog
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ TestMediaManager
+
+
+
+
+
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ BiblesTab
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ MediaManagerItem
+
+
+
+
+
+
+
+ AmendThemeForm
+
+
+
+
+
+
+
+ ThemesTab
+
+
+
+
+
+
+
+ alertsPlugin
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ SongMaintenanceForm
+
+
+
+
+
+
+
+ Ui_OpenLPExportDialog
+
+
+
+
+
+
+
+ ThemeManager
+
+
+
+
+
+
+
+ ImageTab
+
+
+
+
+
+
+
+ Ui_OpenSongImportDialog
+
+
+
+
+
+
+
+ BiblesTab
+
+
+
+
+
+
+
+ SongUsagePlugin
+
+
+
+
+
+
+
+ AlertsTab
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ MediaManagerItem
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ CustomMediaItem
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ SongsPlugin
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ Ui_EditVerseDialog
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ SlideController
+
+
+
+
+
+
+
+ ImportWizardForm
+
+
+
+
+
+
+
+ ServiceManager
+
+
+
+
+
+
+
+ Ui_OpenSongExportDialog
+
+
+
+
+
+
+
+ SongMediaItem
+
+
+
+
+
+
+
+ MainWindow
+
+
+
+
+
+
+
+
+
+
+
+
+ EditSongForm
+
+
+
+
+
+
+
+ Ui_EditSongDialog
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ BiblesTab
+
+
+
+
+
+
+
+ ImportWizardForm
+
+
+
+
+
+
+
+ Ui_AlertEditDialog
+
+
+
+
+
+
+
+ EditCustomForm
+
+
+
+
+
+
+
+ RemotesPlugin
+
+
+
+
+
+
+
+ SongMaintenanceForm
+
+
+
+
+
+
+
+ BibleMediaItem
+
+
+
+
+
+
+
+ AlertEditForm
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ ThemeManager
+
+
+
+
+
+
+
+ ImageMediaItem
+
+
+
+
+
+
+
+ MediaManagerItem
+
+
+
+
+
+
+
+ AuthorsForm
+
+
+
+
+
+
+
+ BibleMediaItem
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ Ui_OpenLPExportDialog
+
+
+
+
+
+
+
+ Ui_SettingsDialog
+
+
+
+
+
+
+
+ BiblesTab
+
+
+
+
+
+
+
+ MediaManagerItem
+
+
+
+
+
+
+
+ SlideController
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ BiblePlugin
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ ImportWizardForm
+
+
+
+
+
+
+
+ SongMaintenanceForm
+
+
+
+
+
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ ServiceManager
+
+
+
+
+
+
+
+ Ui_OpenLPImportDialog
+
+
+
+
+
+
+
+ BiblesTab
+
+
+
+
+
+
+
+ Ui_AlertEditDialog
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ ServiceManager
+
+
+
+
+
+
+
+ ThemesTab
+
+
+
+
+
+
+
+ ServiceManager
+
+
+
+
+
+
+
+ Ui_PluginViewDialog
+
+
+
+
+
+
+
+ Ui_EditSongDialog
+
+
+
+
+
+
+
+ ImportWizardForm
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ AlertEditForm
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ Ui_SongMaintenanceDialog
+
+
+
+
+
+
+
+ SongUsageDetailForm
+
+
+
+
+
+
+
+ BiblesTab
+
+
+
+
+
+
+
+ GeneralTab
+
+
+
+
+
+
+
+ ImportWizardForm
+
+
+
+
+
+
+
+ BiblesTab
+
+
+
+
+
+
+
+ Ui_EditVerseDialog
+
+
+
+
+
+
+
+ ServiceManager
+
+
+
+
+
+
+
+ PresentationTab
+
+
+
+
+
+
+
+ ThemeManager
+
+
+
+
+
+
+
+ SongMaintenanceForm
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ Ui_PluginViewDialog
+
+
+
+
+
+
+
+ Ui_AlertEditDialog
+
+
+
+
+
+
+
+ GeneralTab
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ ServiceManager
+
+
+
+
+
+
+
+ BiblesTab
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ AlertsTab
+
+
+
+
+
+
+
+ alertsPlugin
+
+
+
+
+
+
+
+ GeneralTab
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ SlideController
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ SlideController
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ MediaManagerItem
+
+
+
+
+
+
+
+ Ui_EditSongDialog
+
+
+
+
+
+
+
+ alertsPlugin
+
+
+
+
+
+
+
+ BibleMediaItem
+
+
+
+
+
+
+
+ ImageMediaItem
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+
+
+
+
+
+ MediaPlugin
+
+
+
+
+
+
+
+ BiblesTab
+
+
+
+
+
+
+
+ SongsPlugin
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ AlertsTab
+
+
+
+
+
+
+
+ Ui_customEditDialog
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ ServiceManager
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ PresentationTab
+
+
+
+
+
+
+
+ SplashScreen
+
+
+
+
+
+
+
+ ImageTab
+
+
+
+
+
+
+
+ ServiceManager
+
+
+
+
+
+
+
+ AlertsTab
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ MediaManagerItem
+
+
+
+
+
+
+
+ ThemeManager
+
+
+
+
+
+
+
+
+
+
+
+
+ MediaMediaItem
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ Ui_OpenSongExportDialog
+
+
+
+
+
+
+
+ AmendThemeForm
+
+
+
+
+
+
+
+ Ui_EditSongDialog
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ Ui_OpenLPImportDialog
+
+
+
+
+
+
+
+ Ui_EditSongDialog
+
+
+
+
+
+
+
+ alertsPlugin
+
+
+
+
+
+
+
+ Ui_OpenLPExportDialog
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ ThemeManager
+
+
+
+
+
+
+
+ PresentationPlugin
+
+
+
+
+
+
+
+ ImageMediaItem
+
+
+
+
+
+
+
+ SongsTab
+
+
+
+
+
+
+
+ Ui_AlertDialog
+
+
+
+
+
+
+
+ Ui_OpenLPImportDialog
+
+
+
+
+
+
+
+ Ui_EditVerseDialog
+
+
+
+
+
+
+
+ Ui_EditSongDialog
+
+
+
+
+
+
+
+ AuthorsForm
+
+
+
+
+
+
+
+ SongsTab
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ ThemesTab
+
+
+
+
+
+
+
+ ImageTab
+
+
+
+
+
+
+
+ BibleMediaItem
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ Ui_OpenLPExportDialog
+
+
+
+
+
+
+
+ ThemeManager
+
+
+
+
+
+
+
+ Ui_SongMaintenanceDialog
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ Ui_AboutDialog
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ PresentationMediaItem
+
+
+
+
+
+
+
+ AlertsTab
+
+
+
+
+
+
+
+ ImportWizardForm
+
+
+
+
+
+
+
+ Ui_OpenLPImportDialog
+
+
+
+
+
+
+
+ MediaManagerItem
+
+
+
+
+
+
+
+ AlertsTab
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ Ui_customEditDialog
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ AlertsTab
+
+
+
+
+
+
+
+ SongMaintenanceForm
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+
+
+
+
+
+ AmendThemeForm
+
+
+
+
+
+
+
+ Ui_EditSongDialog
+
+
+
+
+
+
+
+
+
+
+
+
+ GeneralTab
+
+
+
+
+
+
+
+ AlertsTab
+
+
+
+
+
+
+
+ ImagePlugin
+
+
+
+
+
+
+
+ Ui_AlertEditDialog
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ MediaManagerItem
+
+
+
+
+
+
+
+ Ui_OpenLPImportDialog
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ Ui_OpenLPImportDialog
+
+
+
+
+
+
+
+ Ui_OpenSongExportDialog
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ SongUsagePlugin
+
+
+
+
+
+
+
+ GeneralTab
+
+
+
+
+
+
+
+ EditCustomForm
+
+
+
+
+
+
+
+ ImportWizardForm
+
+
+
+
+
+
+
+ Ui_EditVerseDialog
+
+
+
+
+
+
+
+ ThemeManager
+
+
+
+
+
+
+
+ Ui_EditSongDialog
+
+
+
+
+
+
+
+ AlertsTab
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ AlertsTab
+
+
+
+
+
+
+
+ SlideController
+
+
+
+
+
+
+
+ Ui_PluginViewDialog
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Ui_OpenSongExportDialog
+
+
+
+
+
+
+
+
+
+
+
+
+ Ui_PluginViewDialog
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ Ui_EditSongDialog
+
+
+
+
+
+
+
+ Ui_SongUsageDetailDialog
+
+
+
+
+
+
+
+ Ui_OpenLPExportDialog
+
+
+
+
+
+
+
+ EditCustomForm
+
+
+
+
+
+
+
+ Ui_OpenLPExportDialog
+
+
+
+
+
+
+
+ Ui_SongUsageDetailDialog
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ MainWindow
+
+
+
+
+
+
+
+ Ui_OpenLPImportDialog
+
+
+
+
+
+
+
+ OpenSongBible
+
+
+
+
+
+
+
+ Ui_EditSongDialog
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ PresentationMediaItem
+
+
+
+
+
+
+
+ Ui_OpenSongImportDialog
+
+
+
+
+
+
+
+ SlideController
+
+
+
+
+
+
+
+
+
+
+
+
+ SongMediaItem
+
+
+
+
+
+
+
+ Ui_customEditDialog
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ BiblesTab
+
+
+
+
+
+
+
+ ImportWizardForm
+
+
+
+
+
+
+
+ EditSongForm
+
+
+
+
+
+
+
+ Ui_customEditDialog
+
+
+
+
+
+
+
+ Ui_AuthorsDialog
+
+
+
+
+
+
+
+ SongMaintenanceForm
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ Ui_SongMaintenanceDialog
+
+
+
+
+
+
+
+ Ui_EditVerseDialog
+
+
+
+
+
+
+
+ SongsTab
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ Ui_AboutDialog
+
+
+
+
+
+
+
+ MediaManagerItem
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ Ui_AboutDialog
+
+
+
+
+
+
+
+ Ui_EditVerseDialog
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ ServiceManager
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+
+
+
+
+
+ ThemeManager
+
+
+
+
+
+
+
+
+
+
+
+
+ AmendThemeForm
+
+
+
+
+
+
+
+ Ui_TopicsDialog
+
+
+
+
+
+
+
+ Ui_customEditDialog
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
+
+ SongBookForm
+
+
+
+
+
+
+
+ ImportWizardForm
+
+
+
+
+
+
+
+ Ui_MainWindow
+
+
+
+
+
+
+
+ Ui_BibleImportWizard
+
+
+
+
+
+
+
+ Ui_SongMaintenanceDialog
+
+
+
+
+
+
+
+ Ui_AboutDialog
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+ AlertsTab
+
+
+
+
+
+
+
+ Ui_OpenSongExportDialog
+
+
+
+
+
+
+
+ Ui_AmendThemeDialog
+
+
+
+
+
+
diff --git a/scripts/get-strings.py b/scripts/get-strings.py
index 8d9dad174..ed3cdcb41 100755
--- a/scripts/get-strings.py
+++ b/scripts/get-strings.py
@@ -24,6 +24,7 @@
###############################################################################
import os
+from cgi import escape
from ast import parse, NodeVisitor, Str
ts_file = u"""
@@ -45,7 +46,8 @@ ts_message = u"""
class StringExtractor(NodeVisitor):
- def __init__(self, strings, filename):
+ def __init__(self, strings, filename, base_path):
+ self.base_path = base_path
self.filename = filename
self.strings = strings
self.classname = 'unknown'
@@ -58,10 +60,10 @@ class StringExtractor(NodeVisitor):
if hasattr(node.func, 'attr') and node.func.attr == 'trUtf8' and isinstance(node.args[0], Str):
string = node.args[0].s
key = '%s-%s' % (self.classname, string)
- self.strings[key] = [self.classname, self.filename, node.lineno, string]
+ self.strings[key] = [self.classname, self.filename[len(self.base_path) + 1:], node.lineno, escape(string)]
self.generic_visit(node)
-def parse_file(filename, strings):
+def parse_file(base_path, filename, strings):
file = open(filename, u'r')
try:
ast = parse(file.read())
@@ -70,7 +72,7 @@ def parse_file(filename, strings):
return
file.close()
- StringExtractor(strings, filename).visit(ast)
+ StringExtractor(strings, filename, base_path).visit(ast)
def write_file(filename, strings):
translation_file = u''
@@ -94,15 +96,18 @@ def write_file(filename, strings):
def main():
strings = {}
- start_dir = os.path.abspath(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), strings)
+ parse_file(start_dir, os.path.join(root, file), strings)
print u'Generating TS file...',
- write_file(os.path.join(start_dir, u'i18n', u'openlp_en.ts'), strings)
+ write_file(os.path.join(start_dir, u'resources', u'i18n', u'openlp_en.ts'), strings)
print u'done.'
if __name__ == u'__main__':
- main()
\ No newline at end of file
+ if os.path.split(os.path.abspath(u'.'))[1] != u'scripts':
+ print u'You need to run this script from the scripts directory.'
+ else:
+ main()