diff --git a/openlp/.version b/openlp/.version
index 4489023a7..338414e8c 100644
--- a/openlp/.version
+++ b/openlp/.version
@@ -1 +1 @@
-1.9.0-bzr722
+1.9.0-bzr743
diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index beb7cd148..ab2eaf7d8 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -23,7 +23,6 @@
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
###############################################################################
-import os
import logging
import time
diff --git a/openlp/core/ui/settingsform.py b/openlp/core/ui/settingsform.py
index 0f183e40c..b2db0f567 100644
--- a/openlp/core/ui/settingsform.py
+++ b/openlp/core/ui/settingsform.py
@@ -28,7 +28,6 @@ import logging
from PyQt4 import QtGui
from openlp.core.ui import GeneralTab, ThemesTab
-from openlp.core.lib import Receiver
from settingsdialog import Ui_SettingsDialog
log = logging.getLogger(__name__)
@@ -45,7 +44,7 @@ class SettingsForm(QtGui.QDialog, Ui_SettingsDialog):
self.ThemesTab = ThemesTab(mainWindow)
self.addTab(u'Themes', self.ThemesTab)
- def addTab(self, name, tab):
+ def addTab(self, name, tab):
log.info(u'Adding %s tab' % tab.tabTitle)
self.SettingsTabWidget.addTab(tab, tab.tabTitleVisible)
diff --git a/openlp/core/utils/__init__.py b/openlp/core/utils/__init__.py
index 5d97dd8f2..d29ff17b4 100644
--- a/openlp/core/utils/__init__.py
+++ b/openlp/core/utils/__init__.py
@@ -29,6 +29,8 @@ import logging
import urllib2
from datetime import datetime
+import openlp
+
log = logging.getLogger(__name__)
class AppLocation(object):
@@ -43,7 +45,7 @@ class AppLocation(object):
@staticmethod
def get_directory(dir_type):
if dir_type == AppLocation.AppDir:
- return os.path.abspath(os.path.split(sys.argv[0])[0])
+ return os.path.abspath(os.path.split(sys.argv[0])[0])
elif dir_type == AppLocation.ConfigDir:
if sys.platform == u'win32':
path = os.path.join(os.getenv(u'APPDATA'), u'openlp')
@@ -71,11 +73,19 @@ class AppLocation(object):
path = os.path.join(os.getenv(u'HOME'), u'.openlp', u'data')
return path
elif dir_type == AppLocation.PluginsDir:
+ plugin_path = None
app_path = os.path.abspath(os.path.split(sys.argv[0])[0])
- if hasattr(sys, u'frozen') and sys.frozen == 1:
- return os.path.join(app_path, u'plugins')
+ if sys.platform == u'win32':
+ if hasattr(sys, u'frozen') and sys.frozen == 1:
+ plugin_path = os.path.join(app_path, u'plugins')
+ else:
+ plugin_path = os.path.join(app_path, u'openlp', u'plugins')
+ elif sys.platform == u'darwin':
+ plugin_path = os.path.join(app_path, u'plugins')
else:
- return os.path.join(app_path, u'openlp', u'plugins')
+ plugin_path = os.path.join(
+ os.path.split(openlp.__file__)[0], u'plugins')
+ return plugin_path
def check_latest_version(config, current_version):
diff --git a/openlp/plugins/bibles/bibleplugin.py b/openlp/plugins/bibles/bibleplugin.py
index bd65b6622..580d2f590 100644
--- a/openlp/plugins/bibles/bibleplugin.py
+++ b/openlp/plugins/bibles/bibleplugin.py
@@ -93,7 +93,6 @@ class BiblePlugin(Plugin):
'displayed on the screen during the service.')
return about_text
-
def can_delete_theme(self, theme):
if self.settings_tab.bible_theme == theme:
return False
diff --git a/openlp/plugins/bibles/lib/db.py b/openlp/plugins/bibles/lib/db.py
index be4112a54..8f55fb5fc 100644
--- a/openlp/plugins/bibles/lib/db.py
+++ b/openlp/plugins/bibles/lib/db.py
@@ -26,6 +26,7 @@
import os
import logging
import chardet
+import re
from sqlalchemy import or_
from PyQt4 import QtCore
@@ -63,16 +64,22 @@ class BibleDB(QtCore.QObject):
QtCore.QObject.__init__(self)
if u'path' not in kwargs:
raise KeyError(u'Missing keyword argument "path".')
- if u'name' not in kwargs:
- raise KeyError(u'Missing keyword argument "name".')
if u'config' not in kwargs:
raise KeyError(u'Missing keyword argument "config".')
+ if u'name' not in kwargs and u'file' not in kwargs:
+ raise KeyError(u'Missing keyword argument "name" or "file".')
self.stop_import_flag = False
- self.name = kwargs[u'name']
self.config = kwargs[u'config']
- self.db_file = os.path.join(kwargs[u'path'],
- u'%s.sqlite' % kwargs[u'name'])
- log.debug(u'Load bible %s on path %s', kwargs[u'name'], self.db_file)
+ if u'name' in kwargs:
+ self.name = kwargs[u'name']
+ if not isinstance(self.name, unicode):
+ self.name = unicode(self.name, u'utf-8')
+ self.file = self.clean_filename(self.name)
+ if u'file' in kwargs:
+ self.file = kwargs[u'file']
+
+ self.db_file = os.path.join(kwargs[u'path'], self.file)
+ log.debug(u'Load bible %s on path %s', self.file, self.db_file)
db_type = self.config.get_config(u'db type', u'sqlite')
db_url = u''
if db_type == u'sqlite':
@@ -85,12 +92,28 @@ class BibleDB(QtCore.QObject):
self.config.get_config(u'db database'))
self.metadata, self.session = init_models(db_url)
self.metadata.create_all(checkfirst=True)
+ if u'file' in kwargs:
+ self.get_name()
+
+ def get_name(self):
+ version_name = self.get_meta(u'Version')
+ if version_name:
+ self.name = version_name.value
+ else:
+ self.name = None
+ return self.name
+
+ def clean_filename(self, old_filename):
+ if not isinstance(old_filename, unicode):
+ old_filename = unicode(old_filename, u'utf-8')
+ old_filename = re.sub(r'[^\w]+', u'_', old_filename).strip(u'_')
+ return old_filename + u'.sqlite'
def register(self, wizard):
"""
This method basically just initialialises the database. It is called
from the Bible Manager when a Bible is imported. Descendant classes
- may want to override this method to supply their own custom
+ may want to override this method to suVersionpply their own custom
initialisation as well.
"""
self.wizard = wizard
@@ -241,8 +264,6 @@ class BibleDB(QtCore.QObject):
count = self.session.query(Verse.chapter).join(Book)\
.filter(Book.name==book)\
.distinct().count()
- #verse = self.session.query(Verse).join(Book).filter(
- # Book.name == bookname).order_by(Verse.chapter.desc()).first()
if not count:
return 0
else:
@@ -254,9 +275,6 @@ class BibleDB(QtCore.QObject):
.filter(Book.name==book)\
.filter(Verse.chapter==chapter)\
.count()
- #verse = self.session.query(Verse).join(Book).filter(
- # Book.name == bookname).filter(
- # Verse.chapter == chapter).order_by(Verse.verse.desc()).first()
if not count:
return 0
else:
diff --git a/openlp/plugins/bibles/lib/http.py b/openlp/plugins/bibles/lib/http.py
index 5a170d84c..55350c093 100644
--- a/openlp/plugins/bibles/lib/http.py
+++ b/openlp/plugins/bibles/lib/http.py
@@ -28,7 +28,7 @@ import urllib2
import os
import sqlite3
-from BeautifulSoup import BeautifulSoup
+from BeautifulSoup import BeautifulSoup, Tag, NavigableString
from openlp.core.lib import Receiver
from openlp.core.utils import AppLocation
@@ -146,44 +146,62 @@ class BGExtract(BibleCommon):
urlstring = u'http://www.biblegateway.com/passage/?search=%s+%s' \
u'&version=%s' % (bookname, chapter, version)
log.debug(u'BibleGateway url = %s' % urlstring)
- xml_string = self._get_web_text(urlstring, self.proxyurl)
- verseSearch = u' -1:
- # clear out string
- verseText = u''
- versePos = xml_string.find(u'', versePos) + 6
- i = xml_string.find(verseSearch, versePos + 1)
- # Not sure if this is needed now
- if i == -1:
- i = xml_string.find(u' 0 and j < i:
- i = j
- verseText = xml_string[versePos + 7 : i ]
- # store the verse
- bible[verse] = self._clean_text(verseText)
- versePos = -1
- else:
- verseText = xml_string[versePos: i]
- start_tag = verseText.find(verseFootnote)
- while start_tag > -1:
- end_tag = verseText.find(u'')
- verseText = verseText[:start_tag] + verseText[end_tag + 6:len(verseText)]
- start_tag = verseText.find(verseFootnote)
- # Chop off verse and start again
- xml_string = xml_string[i:]
- #look for the next verse
- versePos = xml_string.find(verseSearch)
- # store the verse
- bible[verse] = self._clean_text(verseText)
- verse += 1
- return SearchResults(bookname, chapter, bible)
+ # Let's get the page, and then open it in BeautifulSoup, so as to
+ # attempt to make "easy" work of bad HTML.
+ page = urllib2.urlopen(urlstring)
+ soup = BeautifulSoup(page)
+ verses = soup.find(u'div', u'result-text-style-normal')
+ verse_number = 0
+ verse_list = {0: u''}
+ # http://www.codinghorror.com/blog/2009/11/parsing-html-the-cthulhu-way.html
+ # This is a PERFECT example of opening the Cthulu tag!
+ # O Bible Gateway, why doth ye such horrific HTML produce?
+ for verse in verses:
+ if isinstance(verse, Tag) and verse.name == u'div' and filter(lambda a: a[0] == u'class', verse.attrs)[0][1] == u'footnotes':
+ break
+ if isinstance(verse, Tag) and verse.name == u'sup' and filter(lambda a: a[0] == u'class', verse.attrs)[0][1] != u'versenum':
+ continue
+ if isinstance(verse, Tag) and verse.name == u'p' and not verse.contents:
+ continue
+ if isinstance(verse, Tag) and (verse.name == u'p' or verse.name == u'font') and verse.contents:
+ for item in verse.contents:
+ if isinstance(item, Tag) and (item.name == u'h4' or item.name == u'h5'):
+ continue
+ if isinstance(item, Tag) and item.name == u'sup' and filter(lambda a: a[0] == u'class', item.attrs)[0][1] != u'versenum':
+ continue
+ if isinstance(item, Tag) and item.name == u'p' and not item.contents:
+ continue
+ if isinstance(item, Tag) and item.name == u'sup':
+ verse_number = int(str(item.contents[0]))
+ verse_list[verse_number] = u''
+ continue
+ if isinstance(item, Tag) and item.name == u'font':
+ for subitem in item.contents:
+ if isinstance(subitem, Tag) and subitem.name == u'sup' and filter(lambda a: a[0] == u'class', subitem.attrs)[0][1] != u'versenum':
+ continue
+ if isinstance(subitem, Tag) and subitem.name == u'p' and not subitem.contents:
+ continue
+ if isinstance(subitem, Tag) and subitem.name == u'sup':
+ verse_number = int(str(subitem.contents[0]))
+ verse_list[verse_number] = u''
+ continue
+ if isinstance(subitem, NavigableString):
+ verse_list[verse_number] = verse_list[verse_number] + subitem.replace(u' ', u' ')
+ continue
+ if isinstance(item, NavigableString):
+ verse_list[verse_number] = verse_list[verse_number] + item.replace(u' ', u' ')
+ continue
+ if isinstance(verse, Tag) and verse.name == u'sup':
+ verse_number = int(str(verse.contents[0]))
+ verse_list[verse_number] = u''
+ continue
+ if isinstance(verse, NavigableString):
+ verse_list[verse_number] = verse_list[verse_number] + verse.replace(u' ', u' ')
+ # Delete the "0" element, since we don't need it, it's just there for
+ # some stupid initial whitespace, courtesy of Bible Gateway.
+ del verse_list[0]
+ # Finally, return the list of verses in a "SearchResults" object.
+ return SearchResults(bookname, chapter, verse_list)
class CWExtract(BibleCommon):
log.info(u'%s CWExtract loaded', __name__)
diff --git a/openlp/plugins/bibles/lib/manager.py b/openlp/plugins/bibles/lib/manager.py
index d24982532..10ee7b9f9 100644
--- a/openlp/plugins/bibles/lib/manager.py
+++ b/openlp/plugins/bibles/lib/manager.py
@@ -24,7 +24,6 @@
###############################################################################
import logging
-import os
from common import parse_reference
from opensong import OpenSongBible
@@ -123,19 +122,21 @@ class BibleManager(object):
log.debug(u'Bible Files %s', files)
self.db_cache = {}
for filename in files:
- name, extension = os.path.splitext(filename)
- self.db_cache[name] = BibleDB(self.parent, path=self.path, name=name, config=self.config)
+ bible = BibleDB(self.parent, path=self.path, file=filename,
+ config=self.config)
+ name = bible.get_name()
+ log.debug(u'Bible Name: "%s"', name)
+ self.db_cache[name] = bible
# look to see if lazy load bible exists and get create getter.
source = self.db_cache[name].get_meta(u'download source')
if source:
download_name = self.db_cache[name].get_meta(u'download name').value
meta_proxy = self.db_cache[name].get_meta(u'proxy url')
- web_bible = HTTPBible(self.parent, path=self.path, name=name,
- config=self.config, download_source=source.value,
- download_name=download_name)
+ web_bible = HTTPBible(self.parent, path=self.path,
+ file=filename, config=self.config,
+ download_source=source.value, download_name=download_name)
if meta_proxy:
web_bible.set_proxy_server(meta_proxy.value)
- #del self.db_cache[name]
self.db_cache[name] = web_bible
log.debug(u'Bibles reloaded')
diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py
index c2aaf0d64..bd9670dc1 100644
--- a/openlp/plugins/bibles/lib/mediaitem.py
+++ b/openlp/plugins/bibles/lib/mediaitem.py
@@ -45,6 +45,7 @@ class BibleListView(BaseListWithDnD):
def resizeEvent(self, event):
self.parent.onListViewResize(event.size().width(), event.size().width())
+
class BibleMediaItem(MediaManagerItem):
"""
This is the custom media manager item for Bibles.
@@ -65,6 +66,12 @@ class BibleMediaItem(MediaManagerItem):
QtCore.QObject.connect(Receiver.get_receiver(),
QtCore.SIGNAL(u'openlpreloadbibles'), self.reloadBibles)
+ def _decodeQtObject(self, listobj, key):
+ obj = listobj[QtCore.QString(key)]
+ if isinstance(obj, QtCore.QVariant):
+ obj = obj.toPyObject()
+ return unicode(obj)
+
def initPluginNameVisible(self):
self.PluginNameVisible = self.trUtf8('Bible')
@@ -452,15 +459,17 @@ class BibleMediaItem(MediaManagerItem):
# Let's loop through the main lot, and assemble our verses
for item in items:
bitem = self.ListView.item(item.row())
- reference = bitem.data(QtCore.Qt.UserRole).toPyObject()
- bible = unicode(reference[QtCore.QString('bible')])
- book = unicode(reference[QtCore.QString('book')])
- chapter = unicode(reference[QtCore.QString('chapter')])
- verse = unicode(reference[QtCore.QString('verse')])
- text = unicode(reference[QtCore.QString('text')])
- version = unicode(reference[QtCore.QString('version')])
- copyright = unicode(reference[QtCore.QString('copyright')])
- permission = unicode(reference[QtCore.QString('permission')])
+ reference = bitem.data(QtCore.Qt.UserRole)
+ if isinstance(reference, QtCore.QVariant):
+ reference = reference.toPyObject()
+ bible = self._decodeQtObject(reference, 'bible')
+ book = self._decodeQtObject(reference, 'book')
+ chapter = self._decodeQtObject(reference, 'chapter')
+ verse = self._decodeQtObject(reference, 'verse')
+ text = self._decodeQtObject(reference, 'text')
+ version = self._decodeQtObject(reference, 'version')
+ copyright = self._decodeQtObject(reference, 'copyright')
+ permission = self._decodeQtObject(reference, 'permission')
if self.parent.settings_tab.display_style == 1:
verse_text = self.formatVerse(old_chapter, chapter, verse, u'(u', u')')
elif self.parent.settings_tab.display_style == 2:
@@ -567,7 +576,7 @@ class BibleMediaItem(MediaManagerItem):
permission = u''
else:
permission = permission.value
- for count, verse in enumerate(self.search_results):
+ for count, verse in enumerate(self.search_results):
bible_text = u' %s %d:%d (%s)' % \
(verse.book.name, verse.chapter, verse.verse, bible)
bible_verse = QtGui.QListWidgetItem(bible_text)
diff --git a/openlp/plugins/bibles/lib/opensong.py b/openlp/plugins/bibles/lib/opensong.py
index 6fa18cf6d..43b9e71a3 100644
--- a/openlp/plugins/bibles/lib/opensong.py
+++ b/openlp/plugins/bibles/lib/opensong.py
@@ -102,7 +102,7 @@ class OpenSongBible(BibleDB):
finally:
if file:
file.close()
- if self.stop_import:
+ if self.stop_import_flag:
self.wizard.incrementProgressBar(u'Import canceled!')
return False
else:
diff --git a/resources/i18n/openlp_en.ts b/resources/i18n/openlp_en.ts
index 6f9d4a26a..1660428e2 100644
--- a/resources/i18n/openlp_en.ts
+++ b/resources/i18n/openlp_en.ts
@@ -4,7 +4,7 @@
BibleMediaItem
-
+ Quick
@@ -34,10 +34,10 @@
- ServiceManager
+ Ui_EditSongDialog
-
- Save Service
+
+ &Remove
@@ -74,10 +74,10 @@
- ImportWizardForm
+ SongMaintenanceForm
-
- Bible Exists
+
+ Are you sure you want to delete the selected book?
@@ -92,7 +92,7 @@
BibleMediaItem
-
+ Bible
@@ -100,7 +100,7 @@
ServiceManager
-
+ Save Changes to Service?
@@ -137,22 +137,6 @@
-
- Ui_SongUsageDeleteDialog
-
-
- Audit Delete
-
-
-
-
- BibleMediaItem
-
-
- Clear
-
-
- Ui_BibleImportWizard
@@ -169,6 +153,14 @@
+
+ SongMaintenanceForm
+
+
+ Couldn't save your author.
+
+
+ Ui_ServiceNoteEdit
@@ -178,15 +170,12 @@
- SongMaintenanceForm
+ Ui_customEditDialog
-
- Couldn't save your author!
+
+ Add new slide at bottom
-
-
- Ui_customEditDialogClear
@@ -201,6 +190,14 @@
+
+ PresentationPlugin
+
+
+ <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.
+
+
+ SongUsagePlugin
@@ -212,7 +209,7 @@
MainWindow
-
+ The Main Display has been blanked out
@@ -233,6 +230,14 @@
+
+ SongMaintenanceForm
+
+
+ This author can't be deleted, they are currently assigned to at least one song.
+
+
+ Ui_customEditDialog
@@ -242,10 +247,18 @@
- SongMaintenanceForm
+ Ui_EditVerseDialog
-
- This author can't be deleted, they are currently assigned to at least one song!
+
+ Verse
+
+
+
+
+ Ui_OpenSongImportDialog
+
+
+ OpenSong Folder:
@@ -260,7 +273,7 @@
Ui_MainWindow
-
+ Open an existing service
@@ -268,13 +281,16 @@
SlideController
-
+ Move to previous
+
+
+ SongsPlugin
-
- Edit and re-preview Song
+
+ &Song
@@ -287,12 +303,15 @@
- AlertsTab
+ ImportWizardForm
-
- pt
+
+ You need to specify a file with books of the Bible to use in the import.
+
+
+ AlertsTabEdit History:
@@ -300,18 +319,10 @@
- SlideController
+ Ui_MainWindow
-
- Delay between slides in seconds
-
-
-
-
- SongMaintenanceForm
-
-
- Couldn't add your book!
+
+ &File
@@ -333,6 +344,11 @@
SongMaintenanceForm
+
+
+ Couldn't add your book.
+
+ Error
@@ -347,14 +363,6 @@
-
- ImportWizardForm
-
-
- You need to specify a file with books of the Bible to use in the import!
-
-
- ThemeManager
@@ -379,14 +387,6 @@
-
- SongUsageDeleteForm
-
-
- Delete Selected Audit Events?
-
-
- Ui_OpenSongExportDialog
@@ -396,17 +396,17 @@
- BibleMediaItem
+ Ui_AmendThemeDialog
-
- Search
+
+ BottomUi_MainWindow
-
+ List the Plugins
@@ -419,6 +419,14 @@
+
+ SongUsageDeleteForm
+
+
+ Delete Selected Song Usage Events?
+
+
+ SongUsagePlugin
@@ -462,7 +470,7 @@
ServiceManager
-
+ Open Service
@@ -486,7 +494,7 @@
EditSongForm
-
+ You need to enter a song title.
@@ -499,19 +507,27 @@
+
+ Ui_SongUsageDeleteDialog
+
+
+ Song Usage Delete
+
+
+ ImportWizardForm
-
+ Invalid Bible Location
- ThemesTab
+ BibleMediaItem
-
- Global level
+
+ Book:
@@ -526,7 +542,7 @@
Ui_MainWindow
-
+ &Service Manager
@@ -547,14 +563,6 @@
-
- Ui_BibleImportWizard
-
-
- Books Location:
-
-
- ThemeManager
@@ -587,6 +595,14 @@
+
+ ThemesTab
+
+
+ Use the global theme, overriding any themes associated with either the service or the songs.
+
+
+ Ui_customEditDialog
@@ -598,7 +614,7 @@
ImportWizardForm
-
+ You need to set a copyright for your Bible! Bibles in the Public Domain need to be marked as such.
@@ -627,14 +643,6 @@
-
- BibleMediaItem
-
-
- To:
-
-
- Ui_AmendThemeDialog
@@ -646,16 +654,16 @@
BibleMediaItem
-
+ Text Search
- Ui_OpenLPExportDialog
+ Ui_BibleImportWizard
-
- openlp.org Song Exporter
+
+ CSV
@@ -686,16 +694,16 @@
Ui_MainWindow
-
+ Open Service
- SongMediaItem
+ BibleMediaItem
-
- Titles
+
+ Find:
@@ -710,7 +718,7 @@
BibleMediaItem
-
+ Search Type:
@@ -718,23 +726,12 @@
Ui_MainWindow
-
+ Media Manager
-
-
- ImageMediaItem
-
- Images (*.jpg *jpeg *.gif *.png *.bmp);; All files (*)
-
-
-
-
- Ui_MainWindow
-
-
+ Alt+F4
@@ -754,48 +751,51 @@
CCLI Details
+
+
+ BibleMediaItem
-
- SongSelect Password:
+
+ Bible not fully loadedUi_MainWindow
-
+ Toggle the visibility of the Preview Panel
- SongMaintenanceForm
+ ImportWizardForm
-
- Are you sure you want to delete the selected book?
+
+ Bible ExistsUi_MainWindow
-
+ &User Guide
- SongUsageDeleteForm
+ AlertsTab
-
- Are you sure you want to delete selected Audit Data?
+
+ ptUi_MainWindow
-
+ Set the interface language to English
@@ -811,19 +811,11 @@
ImportWizardForm
-
+ Empty Copyright
-
- CustomPlugin
-
-
- <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>
-
-
- AuthorsForm
@@ -883,7 +875,7 @@
PresentationMediaItem
-
+ Presentation
@@ -915,7 +907,7 @@
MainWindow
-
+ OpenLP version %s has been updated to version %s
You can obtain the latest version from http://openlp.org
@@ -933,20 +925,28 @@ You can obtain the latest version from http://openlp.org
SlideController
-
+ Go to Verse
+
+ SongMaintenanceForm
+
+
+ Couldn't add your topic.
+
+
+ Ui_MainWindow
-
+ &Import
-
+ Quit OpenLP
@@ -970,7 +970,7 @@ You can obtain the latest version from http://openlp.org
ImportWizardForm
-
+ Empty Version Name
@@ -978,7 +978,7 @@ You can obtain the latest version from http://openlp.org
Ui_MainWindow
-
+ &Preview Panel
@@ -986,19 +986,11 @@ You can obtain the latest version from http://openlp.org
SlideController
-
+ Start continuous loop
-
- Ui_AboutDialog
-
-
- License
-
-
- GeneralTab
@@ -1018,7 +1010,7 @@ You can obtain the latest version from http://openlp.org
Ui_MainWindow
-
+ &New
@@ -1031,19 +1023,27 @@ You can obtain the latest version from http://openlp.org
+
+ Ui_EditSongDialog
+
+
+ R&emove
+
+
+ SlideController
-
+ Live
- ImportWizardForm
+ Ui_AmendThemeDialog
-
- You need to specify a file of Bible verses to import!
+
+ Font Main
@@ -1056,10 +1056,10 @@ You can obtain the latest version from http://openlp.org
- Ui_EditVerseDialog
+ ThemeManager
-
- Number
+
+ File is not a valid theme.
@@ -1088,10 +1088,10 @@ You can obtain the latest version from http://openlp.org
- Ui_MainWindow
+ Ui_AmendThemeDialog
-
- Ctrl+N
+
+ Other Options
@@ -1103,23 +1103,15 @@ You can obtain the latest version from http://openlp.org
-
- Ui_SongUsageDetailDialog
-
-
- ASelect Date Range
-
-
- Ui_MainWindow
-
+ Default Theme:
-
+ Toggle Preview Panel
@@ -1156,6 +1148,22 @@ You can obtain the latest version from http://openlp.org
+
+ Ui_MainWindow
+
+
+ &Settings
+
+
+
+
+ EditSongForm
+
+
+ Invalid verse entry - values must be Numeric, I,B,C,T,P,E,O
+
+
+ Ui_AmendThemeDialog
@@ -1213,10 +1221,10 @@ You can obtain the latest version from http://openlp.org
- Ui_customEditDialog
+ Ui_BibleImportWizard
-
- Save
+
+ Verse Location:
@@ -1247,7 +1255,7 @@ You can obtain the latest version from http://openlp.org
ImportWizardForm
-
+ Open Books CSV file
@@ -1271,7 +1279,7 @@ You can obtain the latest version from http://openlp.org
BibleMediaItem
-
+ No matching book could be found in this Bible.
@@ -1283,16 +1291,27 @@ You can obtain the latest version from http://openlp.org
Server:
+
+
+ Ui_EditVerseDialog
-
- Download Options
+
+ Ending
+
+
+
+
+ CustomTab
+
+
+ Display Footer:ImportWizardForm
-
+ Invalid OpenSong Bible
@@ -1321,26 +1340,34 @@ You can obtain the latest version from http://openlp.org
+
+ AlertEditForm
+
+
+ Please save or clear selected item
+
+
+ Ui_MainWindow
-
+ &Live
- SongMaintenanceForm
+ Ui_AmendThemeDialog
-
- Delete Topic
+
+ <Color2>Ui_MainWindow
-
+ English
@@ -1361,6 +1388,14 @@ You can obtain the latest version from http://openlp.org
+
+ Ui_OpenLPExportDialog
+
+
+ Select openlp.org export filename:
+
+
+ Ui_BibleImportWizard
@@ -1378,18 +1413,18 @@ You can obtain the latest version from http://openlp.org
- Ui_AmendThemeDialog
+ Ui_SongUsageDetailDialog
-
- Opaque
+
+ Song Usage Extraction
- SongMaintenanceForm
+ Ui_AmendThemeDialog
-
- This book can't be deleted, it is currently assigned to at least one song!
+
+ Opaque
@@ -1404,7 +1439,7 @@ You can obtain the latest version from http://openlp.org
SlideController
-
+ Start playing media
@@ -1417,6 +1452,14 @@ You can obtain the latest version from http://openlp.org
+
+ SongMaintenanceForm
+
+
+ This book can't be deleted, it is currently assigned to at least one song.
+
+
+ Ui_AboutDialog
@@ -1444,7 +1487,7 @@ You can obtain the latest version from http://openlp.org
BibleMediaItem
-
+ Dual:
@@ -1508,12 +1551,12 @@ You can obtain the latest version from http://openlp.org
Ui_MainWindow
-
+ F9
-
+ F8
@@ -1521,7 +1564,7 @@ You can obtain the latest version from http://openlp.org
ServiceManager
-
+ &Change Item Theme
@@ -1550,14 +1593,6 @@ You can obtain the latest version from http://openlp.org
-
- Ui_EditSongDialog
-
-
- &Remove
-
-
- Ui_BibleImportWizard
@@ -1566,6 +1601,14 @@ You can obtain the latest version from http://openlp.org
+
+ Ui_EditVerseDialog
+
+
+ Number
+
+
+ Ui_AmendThemeDialog
@@ -1625,7 +1668,7 @@ You can obtain the latest version from http://openlp.org
SlideController
-
+ Move to live
@@ -1647,17 +1690,25 @@ You can obtain the latest version from http://openlp.org
- Ui_EditVerseDialog
+ ServiceManager
-
- Verse
+
+ Save Service
+
+
+
+
+ Ui_SongUsageDetailDialog
+
+
+ Select Date RangeUi_MainWindow
-
+ Save the current service to disk
@@ -1665,16 +1716,13 @@ You can obtain the latest version from http://openlp.org
BibleMediaItem
-
+ Chapter:
-
-
- Ui_AmendThemeDialog
-
- Bottom
+
+ Search
@@ -1687,10 +1735,10 @@ You can obtain the latest version from http://openlp.org
- ImportWizardForm
+ Ui_MainWindow
-
- Open Verses CSV file
+
+ Add &Tool...
@@ -1713,7 +1761,7 @@ You can obtain the latest version from http://openlp.org
Ui_MainWindow
-
+ &View
@@ -1751,10 +1799,10 @@ You can obtain the latest version from http://openlp.org
- ServiceManager
+ SlideController
-
- &Preview Verse
+
+ Preview
@@ -1782,6 +1830,14 @@ You can obtain the latest version from http://openlp.org
+
+ ImportWizardForm
+
+
+ You need to specify a file of Bible verses to import.
+
+
+ AlertsTab
@@ -1801,24 +1857,16 @@ You can obtain the latest version from http://openlp.org
EditSongForm
-
+ You need to enter some verses.
- BibleMediaItem
+ Ui_BibleImportWizard
-
- Bible not fully loaded
-
-
-
-
- CustomTab
-
-
- Display Footer:
+
+ Download Options
@@ -1841,7 +1889,7 @@ You can obtain the latest version from http://openlp.org
Ui_MainWindow
-
+ &Export
@@ -1897,16 +1945,24 @@ You can obtain the latest version from http://openlp.org
EditSongForm
-
+ Invalid verse entry - vX
- BibleMediaItem
+ ServiceManager
-
- No Book Found
+
+ OpenLP Service Files (*.osz)
+
+
+
+
+ MediaManagerItem
+
+
+ Delete the selected item
@@ -1929,7 +1985,7 @@ You can obtain the latest version from http://openlp.org
BibleMediaItem
-
+ Keep
@@ -1953,32 +2009,24 @@ You can obtain the latest version from http://openlp.org
Ui_MainWindow
-
+ &Open
- PresentationMediaItem
+ AuthorsForm
-
- Present using:
+
+ You haven't set a display name for the author, would you like me to combine the first and last names for you?
- ServiceManager
+ AmendThemeForm
-
- &Live Verse
-
-
-
-
- Ui_EditVerseDialog
-
-
- Pre-Chorus
+
+ Slide Height is %s rows
@@ -2013,6 +2061,14 @@ Testers
+
+ SongMediaItem
+
+
+ Titles
+
+
+ Ui_OpenLPExportDialog
@@ -2022,10 +2078,10 @@ Testers
- AuthorsForm
+ PresentationMediaItem
-
- You haven't set a display name for the author, would you like me to combine the first and last names for you?
+
+ Present using:
@@ -2038,10 +2094,10 @@ Testers
- AmendThemeForm
+ ServiceManager
-
- Slide Height is %s rows
+
+ &Live Verse
@@ -2056,7 +2112,7 @@ Testers
Ui_MainWindow
-
+ Toggle Theme Manager
@@ -2166,14 +2222,17 @@ Testers
- Ui_MainWindow
+ BiblesTab
-
- &Settings
+
+ Verse Display
+
+
+ Ui_MainWindow
-
+ &Options
@@ -2181,7 +2240,7 @@ Testers
BibleMediaItem
-
+ Results:
@@ -2195,17 +2254,17 @@ Testers
- Ui_OpenSongImportDialog
+ ServiceManager
-
- OpenSong Folder:
+
+ Move to &topSlideController
-
+ Move to last
@@ -2245,7 +2304,7 @@ Testers
BibleMediaItem
-
+ Verse Search
@@ -2261,7 +2320,7 @@ Testers
EditSongForm
-
+ Save && Preview
@@ -2339,18 +2398,18 @@ Testers
- MediaMediaItem
+ SongsTab
-
- Select Media
+
+ Enable search as you type:
- PresentationMediaItem
+ Ui_MainWindow
-
- Select Presentation(s)
+
+ Ctrl+S
@@ -2370,32 +2429,24 @@ Testers
-
- Ui_MainWindow
-
-
- Save the current service under a new name
-
-
-
-
- Ctrl+O
-
-
-
-
- Ui_AmendThemeDialog
-
-
- Other Options
-
-
- SongMaintenanceForm
- Couldn't add your author!
+ Couldn't add your author.
+
+
+
+
+ Ui_MainWindow
+
+
+ Ctrl+O
+
+
+
+
+ Ctrl+N
@@ -2424,18 +2475,15 @@ Testers
- SongsPlugin
+ SlideController
-
- &Song
+
+ Edit and re-preview Song
-
-
- Ui_MainWindow
-
- &File
+
+ Delay between slides in seconds
@@ -2461,25 +2509,25 @@ Testers
- ThemeManager
+ ThemesTab
-
- You are unable to delete the default theme!
+
+ Global level
- ThemesTab
+ ThemeManager
-
- Use the global theme, overriding any themes associated with either the service or the songs.
+
+ You are unable to delete the default theme.BibleMediaItem
-
+ Version:
@@ -2522,14 +2570,6 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
-
- ThemeManager
-
-
- File is not a valid theme!
-
-
- Ui_BibleImportWizard
@@ -2539,18 +2579,18 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
- ServiceManager
+ Ui_AboutDialog
-
- Move down
+
+ License
- Ui_EditSongDialog
+ OpenSongBible
-
- R&emove
+
+ Importing
@@ -2563,10 +2603,10 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
- Ui_BibleImportWizard
+ Ui_customEditDialog
-
- Verse Location:
+
+ Save
@@ -2581,7 +2621,7 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
BibleMediaItem
-
+ From:
@@ -2597,7 +2637,7 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
ServiceManager
-
+ &Notes
@@ -2605,7 +2645,7 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
Ui_MainWindow
-
+ E&xit
@@ -2621,7 +2661,7 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
MainWindow
-
+ OpenLP Version Updated
@@ -2633,11 +2673,6 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
Replace edited slide
-
-
- Add new slide at bottom
-
- EditCustomForm
@@ -2658,11 +2693,19 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
Ui_MainWindow
-
+ &Help
+
+ Ui_EditVerseDialog
+
+
+ Bridge
+
+
+ Ui_OpenSongExportDialog
@@ -2680,15 +2723,10 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
- TestMediaManager
+ Ui_EditVerseDialog
-
- Item2
-
-
-
-
- Item1
+
+ Pre-Chorus
@@ -2711,11 +2749,19 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
Ui_MainWindow
-
+ Toggle Service Manager
+
+ Ui_EditSongDialog
+
+
+ Delete
+
+
+ MediaManagerItem
@@ -2751,7 +2797,7 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
Ui_MainWindow
-
+ Ctrl+F1
@@ -2760,7 +2806,15 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
SongMaintenanceForm
- Couldn't save your topic!
+ Couldn't save your topic.
+
+
+
+
+ Ui_MainWindow
+
+
+ Save the current service under a new name
@@ -2796,14 +2850,6 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
-
- BiblesTab
-
-
- Bibles
-
-
- SongUsagePlugin
@@ -2823,7 +2869,7 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
Ui_MainWindow
-
+ &Web Site
@@ -2839,17 +2885,17 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
Ui_MainWindow
-
+ M&ode
-
+ Translate the interface to your language
-
+ Service Manager
@@ -2881,7 +2927,7 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
Ui_MainWindow
-
+ &Theme
@@ -2897,31 +2943,20 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
Ui_MainWindow
-
+ &Language
-
- SlideController
-
-
- Verse
-
-
-
-
- ImportWizardForm
-
-
- You need to specify an OpenSong Bible file to import!
-
-
- ServiceManager
-
+
+ Move to end
+
+
+
+ Your service is unsaved, do you want to save those changes before creating a new one ?
@@ -2945,21 +2980,21 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
MainWindow
-
+ Save Changes to Service?
-
+ Your service has changed, do you want to save those changes?
- EditSongForm
+ ServiceManager
-
- Invalid verse entry - values must be Numeric, I,B,C,T,P,E,O
+
+ &Delete From Service
@@ -2974,11 +3009,19 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
Ui_MainWindow
-
+ &About
+
+ ImportWizardForm
+
+
+ You need to specify a version name for your Bible.
+
+
+ BiblesTab
@@ -2987,14 +3030,6 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
-
- ImportWizardForm
-
-
- You need to specify a version name for your Bible!
-
-
- Ui_AlertEditDialog
@@ -3012,26 +3047,10 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
- RemotesPlugin
+ ThemesTab
-
- <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
-
-
-
-
- SongMaintenanceForm
-
-
- This topic can't be deleted, it is currently assigned to at least one song!
-
-
-
-
- BibleMediaItem
-
-
- Find:
+
+ 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.
@@ -3059,14 +3078,6 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
-
- ImageMediaItem
-
-
- Allow background of live slide to be overridden
-
-
- MediaManagerItem
@@ -3083,14 +3094,6 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
-
- BibleMediaItem
-
-
- Book:
-
-
- Ui_AmendThemeDialog
@@ -3100,10 +3103,10 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
- Ui_OpenLPExportDialog
+ Ui_OpenLPImportDialog
-
- Select openlp.org export filename:
+
+ Select openlp.org songfile to import:
@@ -3118,8 +3121,8 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
BiblesTab
-
- Verse Display
+
+ Layout Style:
@@ -3134,7 +3137,7 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
SlideController
-
+ Move to next
@@ -3142,7 +3145,7 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
Ui_MainWindow
-
+ &Plugin List
@@ -3174,21 +3177,32 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
ImportWizardForm
-
+ Open OSIS file
+
+ Ui_AmendThemeDialog
+
+
+ Circular
+
+
+
+
+ PresentationMediaItem
+
+
+ Automatic
+
+
+ SongMaintenanceForm
- Couldn't save your book!
-
-
-
-
- Couldn't add your topic!
+ Couldn't save your book.
@@ -3201,26 +3215,10 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
- Ui_MainWindow
+ SongMaintenanceForm
-
- &Add Tool...
-
-
-
-
- Ui_AmendThemeDialog
-
-
- <Color2>
-
-
-
-
- ServiceManager
-
-
- Move up
+
+ Delete Topic
@@ -3272,14 +3270,6 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
-
- ServiceManager
-
-
- Move to bottom
-
-
- Ui_PluginViewDialog
@@ -3299,7 +3289,7 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
ImportWizardForm
-
+ This Bible already exists! Please import a different Bible or first delete the existing one.
@@ -3307,24 +3297,16 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
Ui_MainWindow
-
+ &Translate
- AlertEditForm
+ BiblesTab
-
- Please Save or Clear seletced item
-
-
-
-
- Ui_MainWindow
-
-
- Save Service As
+
+ Bibles
@@ -3473,14 +3455,6 @@ Changes don't affect verses already in the service
-
- Ui_BibleImportWizard
-
-
- Welcome to the Bible Import Wizard
-
-
- Ui_AmendThemeDialog
@@ -3516,7 +3490,7 @@ Changes don't affect verses already in the service
Ui_MainWindow
-
+ New Service
@@ -3524,7 +3498,7 @@ Changes don't affect verses already in the service
SlideController
-
+ Move to first
@@ -3532,7 +3506,7 @@ Changes don't affect verses already in the service
Ui_MainWindow
-
+ &Online Help
@@ -3540,7 +3514,7 @@ Changes don't affect verses already in the service
SlideController
-
+ Blank Screen
@@ -3548,26 +3522,26 @@ Changes don't affect verses already in the service
Ui_MainWindow
-
+ Save Service
-
+ Save &As...
-
+ Toggle the visibility of the Media Manager
- MediaManagerItem
+ BibleMediaItem
-
- Delete the selected item
+
+ No Book Found
@@ -3590,7 +3564,7 @@ Changes don't affect verses already in the service
BibleMediaItem
-
+ Advanced
@@ -3606,38 +3580,38 @@ Changes don't affect verses already in the service
Ui_MainWindow
-
+ F11
-
+ F10
-
+ F12
- Ui_BibleImportWizard
+ CustomPlugin
-
- Select the import format, and where to import from.
+
+ <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>Ui_MainWindow
-
+ Alt+F7
-
+ Add an application to the list of tools
@@ -3650,6 +3624,14 @@ Changes don't affect verses already in the service
+
+ ServiceManager
+
+
+ Move &down
+
+
+ BiblesTab
@@ -3669,7 +3651,7 @@ Changes don't affect verses already in the service
Ui_MainWindow
-
+ Theme Manager
@@ -3709,7 +3691,7 @@ Changes don't affect verses already in the service
Ui_MainWindow
-
+ Toggle the visibility of the Theme Manager
@@ -3739,10 +3721,10 @@ Changes don't affect verses already in the service
- ServiceManager
+ SlideController
-
- Move to end
+
+ Verse
@@ -3757,7 +3739,7 @@ Changes don't affect verses already in the service
Ui_MainWindow
-
+ &Preview Pane
@@ -3792,15 +3774,12 @@ Changes don't affect verses already in the service
- Ui_BibleImportWizard
+ Ui_AmendThemeDialog
-
- Password:
+
+ Preview
-
-
- Ui_AmendThemeDialogOutline Size:
@@ -3832,18 +3811,18 @@ Changes don't affect verses already in the service
- Ui_MainWindow
+ Ui_AboutDialog
-
- &Theme Manager
+
+ Credits
- Ui_OpenLPImportDialog
+ BibleMediaItem
-
- Select openlp.org songfile to import:
+
+ To:
@@ -3855,14 +3834,6 @@ Changes don't affect verses already in the service
-
- alertsPlugin
-
-
- F7
-
-
- Ui_OpenLPExportDialog
@@ -3887,14 +3858,6 @@ Changes don't affect verses already in the service
-
- PresentationPlugin
-
-
- <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.
-
-
- ImageMediaItem
@@ -3904,10 +3867,18 @@ Changes don't affect verses already in the service
- SongsTab
+ BibleMediaItem
-
- Enable search as you type:
+
+ Clear
+
+
+
+
+ Ui_MainWindow
+
+
+ Save Service As
@@ -3968,10 +3939,10 @@ Changes don't affect verses already in the service
- ThemesTab
+ RemotesPlugin
-
- 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.
+
+ <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
@@ -3986,21 +3957,18 @@ Changes don't affect verses already in the service
BibleMediaItem
-
+ Verse:
- Ui_BibleImportWizard
+ Ui_OpenLPExportDialog
-
- CSV
+
+ openlp.org Song Exporter
-
-
- Ui_OpenLPExportDialogSong Export List
@@ -4042,7 +4010,7 @@ Changes don't affect verses already in the service
Ui_MainWindow
-
+ Toggle the visibility of the Service Manager
@@ -4050,11 +4018,27 @@ Changes don't affect verses already in the service
PresentationMediaItem
-
+ A presentation with that filename already exists.
+
+ ImageMediaItem
+
+
+ Allow the background of live slide to be overridden
+
+
+
+
+ SongUsageDeleteForm
+
+
+ Are you sure you want to delete selected Song Usage data?
+
+
+ AlertsTab
@@ -4066,7 +4050,7 @@ Changes don't affect verses already in the service
ImportWizardForm
-
+ Invalid Books File
@@ -4103,6 +4087,14 @@ Changes don't affect verses already in the service
+
+ ImportWizardForm
+
+
+ Open Verses CSV file
+
+
+ Ui_customEditDialog
@@ -4114,7 +4106,7 @@ Changes don't affect verses already in the service
Ui_MainWindow
-
+ More information about OpenLP
@@ -4138,12 +4130,12 @@ Changes don't affect verses already in the service
Ui_MainWindow
-
+ &Media Manager
-
+ &Tools
@@ -4178,18 +4170,18 @@ Changes don't affect verses already in the service
- AlertsTab
+ SongMaintenanceForm
-
- s
+
+ This topic can't be deleted, it is currently assigned to at least one song.
- ImagePlugin
+ AlertsTab
-
- <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>
+
+ s
@@ -4226,10 +4218,10 @@ Changes don't affect verses already in the service
- Ui_AmendThemeDialog
+ Ui_BibleImportWizard
-
- Font Main
+
+ Select the import format, and where to import from.
@@ -4252,7 +4244,7 @@ Changes don't affect verses already in the service
Ui_MainWindow
-
+ Toggle Media Manager
@@ -4282,10 +4274,10 @@ Changes don't affect verses already in the service
- ImportWizardForm
+ ThemeManager
-
- You need to specify a file to import your Bible from!
+
+ You have not selected a theme.
@@ -4298,10 +4290,10 @@ Changes don't affect verses already in the service
- ThemeManager
+ ImportWizardForm
-
- You have not selected a theme!
+
+ You need to specify a file to import your Bible from.
@@ -4324,7 +4316,7 @@ Changes don't affect verses already in the service
Ui_MainWindow
-
+ Create a new Service
@@ -4338,10 +4330,10 @@ Changes don't affect verses already in the service
- SlideController
+ ServiceManager
-
- Preview
+
+ &Preview Verse
@@ -4352,6 +4344,17 @@ Changes don't affect verses already in the service
TextLabel
+
+
+ AlertsTab
+
+
+ Font Size:
+
+
+
+
+ Ui_PluginViewDialogAbout:
@@ -4408,14 +4411,6 @@ Changes don't affect verses already in the service
-
- Ui_SongUsageDetailDialog
-
-
- Audit Detail Extraction
-
-
- Ui_OpenLPExportDialog
@@ -4424,6 +4419,14 @@ Changes don't affect verses already in the service
+
+ ImageMediaItem
+
+
+ Images (*.jpg *.jpeg *.gif *.png *.bmp);; All files (*)
+
+
+ EditCustomForm
@@ -4459,7 +4462,7 @@ Changes don't affect verses already in the service
MainWindow
-
+ OpenLP Main Display Blanked
@@ -4473,33 +4476,30 @@ Changes don't affect verses already in the service
- OpenSongBible
+ ServiceManager
-
- Importing
+
+ Move &up
- Ui_EditSongDialog
+ ImportWizardForm
-
- Delete
-
-
-
-
- Ui_MainWindow
-
-
- Ctrl+S
+
+ You need to specify an OpenSong Bible file to import.PresentationMediaItem
-
+
+ Select Presentation(s)
+
+
+
+ File exists
@@ -4515,16 +4515,24 @@ Changes don't affect verses already in the service
SlideController
-
+ Stop continuous loop
-
+ s
+
+ ImagePlugin
+
+
+ <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 songs which are rendered will use the selected image from the background instead of the one provied by the theme.<br>
+
+
+ SongMediaItem
@@ -4549,18 +4557,10 @@ Changes don't affect verses already in the service
-
- BiblesTab
-
-
- Layout Style:
-
-
- ImportWizardForm
-
+ Invalid Verse File
@@ -4568,7 +4568,7 @@ Changes don't affect verses already in the service
EditSongForm
-
+ Error
@@ -4614,10 +4614,10 @@ Changes don't affect verses already in the service
- Ui_EditVerseDialog
+ Ui_BibleImportWizard
-
- Bridge
+
+ Welcome to the Bible Import Wizard
@@ -4630,18 +4630,18 @@ Changes don't affect verses already in the service
- Ui_AmendThemeDialog
+ Ui_BibleImportWizard
-
- Preview
+
+ Password:
- Ui_AboutDialog
+ Ui_MainWindow
-
- Credits
+
+ &Theme Manager
@@ -4670,10 +4670,10 @@ Changes don't affect verses already in the service
- Ui_EditVerseDialog
+ MediaMediaItem
-
- Ending
+
+ Select Media
@@ -4688,7 +4688,7 @@ Changes don't affect verses already in the service
ServiceManager
-
+ &Edit Item
@@ -4704,12 +4704,12 @@ Changes don't affect verses already in the service
Ui_MainWindow
-
+ &Save
-
+ OpenLP 2.0
@@ -4758,6 +4758,11 @@ Changes don't affect verses already in the service
Show Outline:
+
+
+ Gradient
+
+ SongBookForm
@@ -4770,7 +4775,7 @@ Changes don't affect verses already in the service
ImportWizardForm
-
+ Open OpenSong Bible
@@ -4778,7 +4783,7 @@ Changes don't affect verses already in the service
Ui_MainWindow
-
+ Look && &Feel
@@ -4808,18 +4813,18 @@ Changes don't affect verses already in the service
- Ui_AmendThemeDialog
+ ServiceManager
-
- Gradient
+
+ Move to &bottom
- AlertsTab
+ Ui_BibleImportWizard
-
- Font Size:
+
+ Books Location:
@@ -4832,10 +4837,10 @@ Changes don't affect verses already in the service
- Ui_AmendThemeDialog
+ GeneralTab
-
- Circular
+
+ SongSelect Password:
diff --git a/resources/innosetup/OpenLP-2.0.iss b/resources/innosetup/OpenLP-2.0.iss
index 41e9cd84b..b826fa76f 100644
--- a/resources/innosetup/OpenLP-2.0.iss
+++ b/resources/innosetup/OpenLP-2.0.iss
@@ -22,7 +22,7 @@ DefaultDirName={pf}\{#MyAppName}
DefaultGroupName=OpenLP 2.0
AllowNoIcons=true
LicenseFile=LICENSE.txt
-OutputBaseFilename=OpenLP-1.9.0-bzr737-setup
+OutputBaseFilename=OpenLP-1.9.0-bzr739-setup
Compression=lzma
SolidCompression=true
SetupIconFile=C:\Program Files\Inno Setup 5\Examples\Setup.ico
diff --git a/resources/pyinstaller/hook-openlp.plugins.presentations.presentationplugin.py b/resources/pyinstaller/hook-openlp.plugins.presentations.presentationplugin.py
index 8b7d6b8a2..0ede06f90 100644
--- a/resources/pyinstaller/hook-openlp.plugins.presentations.presentationplugin.py
+++ b/resources/pyinstaller/hook-openlp.plugins.presentations.presentationplugin.py
@@ -1,3 +1,3 @@
-hiddenimports = ['openlp.plugins.presentations.lib.impresscontroller',
+hiddenimports = ['openlp.plugins.presentations.lib.impresscontroller',
'openlp.plugins.presentations.lib.powerpointcontroller',
'openlp.plugins.presentations.lib.pptviewcontroller']
\ No newline at end of file
diff --git a/resources/pyinstaller/hook-openlp.py b/resources/pyinstaller/hook-openlp.py
index bd97e4aec..b77ec8b62 100644
--- a/resources/pyinstaller/hook-openlp.py
+++ b/resources/pyinstaller/hook-openlp.py
@@ -1,4 +1,4 @@
-hiddenimports = ['plugins.songs.songsplugin',
+hiddenimports = ['plugins.songs.songsplugin',
'plugins.bibles.bibleplugin',
'plugins.presentations.presentationplugin',
'plugins.media.mediaplugin',
diff --git a/scripts/get-strings.py b/scripts/get-strings.py
index ed3cdcb41..81b889f50 100755
--- a/scripts/get-strings.py
+++ b/scripts/get-strings.py
@@ -99,6 +99,8 @@ def main():
start_dir = os.path.abspath(u'..')
for root, dirs, files in os.walk(start_dir):
for file in files:
+ if file.startswith(u'hook-') or file.startswith(u'test_'):
+ continue
if file.endswith(u'.py'):
print u'Parsing "%s"' % file
parse_file(start_dir, os.path.join(root, file), strings)