diff --git a/openlp.pyw b/openlp.pyw
index fb96ef17c..074cd489f 100755
--- a/openlp.pyw
+++ b/openlp.pyw
@@ -47,7 +47,6 @@ QMainWindow::separator
QDockWidget::title
{
- /*background: palette(dark);*/
border: 1px solid palette(dark);
padding-left: 5px;
padding-top: 2px;
diff --git a/openlp/.version b/openlp/.version
index 8fdcf3869..ae8249b9a 100644
--- a/openlp/.version
+++ b/openlp/.version
@@ -1 +1 @@
-1.9.2
+1.9.2-bzr987
\ No newline at end of file
diff --git a/openlp/core/lib/db.py b/openlp/core/lib/db.py
index f97a74dc8..972d849a3 100644
--- a/openlp/core/lib/db.py
+++ b/openlp/core/lib/db.py
@@ -199,7 +199,7 @@ class Manager(object):
Any parameters to order the returned objects by. Defaults to None.
"""
query = self.session.query(object_class)
- if filter_clause:
+ if filter_clause is not None:
query = query.filter(filter_clause)
if order_by_ref is not None:
return query.order_by(order_by_ref).all()
@@ -237,7 +237,7 @@ class Manager(object):
"""
try:
query = self.session.query(object_class)
- if filter_clause:
+ if filter_clause is not None:
query = query.filter(filter_clause)
query.delete(synchronize_session=False)
self.session.commit()
diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index 6f1a1f6c1..b3b392e84 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -652,8 +652,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
version_text = unicode(translate('OpenLP.MainWindow',
'Version %s of OpenLP is now available for download (you are '
'currently running version %s). \n\nYou can download the latest '
- 'version from '
- 'http://openlp.org/.'))
+ 'version from http://openlp.org/.'))
QtGui.QMessageBox.question(self,
translate('OpenLP.MainWindow', 'OpenLP Version Updated'),
version_text % (version, self.applicationVersion[u'full']))
diff --git a/openlp/core/utils/__init__.py b/openlp/core/utils/__init__.py
index d2db95e40..e728fb544 100644
--- a/openlp/core/utils/__init__.py
+++ b/openlp/core/utils/__init__.py
@@ -70,6 +70,8 @@ class VersionThread(QtCore.QThread):
remote_version[u'release'] = int(match.group(3))
if len(match.groups()) > 3 and match.group(4):
remote_version[u'revision'] = int(match.group(4))
+ else:
+ return
match = self.version_splitter.match(self.app_version[u'full'])
if match:
local_version[u'major'] = int(match.group(1))
@@ -77,6 +79,8 @@ class VersionThread(QtCore.QThread):
local_version[u'release'] = int(match.group(3))
if len(match.groups()) > 3 and match.group(4):
local_version[u'revision'] = int(match.group(4))
+ else:
+ return
if remote_version[u'major'] > local_version[u'major'] or \
remote_version[u'minor'] > local_version[u'minor'] or \
remote_version[u'release'] > local_version[u'release']:
@@ -147,10 +151,10 @@ class AppLocation(object):
return plugin_path
elif dir_type == AppLocation.VersionDir:
if hasattr(sys, u'frozen') and sys.frozen == 1:
- plugin_path = os.path.abspath(os.path.split(sys.argv[0])[0])
+ version_path = os.path.abspath(os.path.split(sys.argv[0])[0])
else:
- plugin_path = os.path.split(openlp.__file__)[0]
- return plugin_path
+ version_path = os.path.split(openlp.__file__)[0]
+ return version_path
elif dir_type == AppLocation.CacheDir:
if sys.platform == u'win32':
path = os.path.join(os.getenv(u'APPDATA'), u'openlp')
@@ -206,11 +210,14 @@ def check_latest_version(current_version):
else:
req = urllib2.Request(u'http://www.openlp.org/files/version.txt')
req.add_header(u'User-Agent', u'OpenLP/%s' % current_version[u'full'])
+ remote_version = None
try:
- version_string = unicode(urllib2.urlopen(req, None).read()).strip()
+ remote_version = unicode(urllib2.urlopen(req, None).read()).strip()
except IOError, e:
if hasattr(e, u'reason'):
log.exception(u'Reason for failure: %s', e.reason)
+ if remote_version:
+ version_string = remote_version
return version_string
def add_actions(target, actions):
diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py
index 1c5243af4..c08e62ef5 100644
--- a/openlp/plugins/bibles/lib/mediaitem.py
+++ b/openlp/plugins/bibles/lib/mediaitem.py
@@ -59,10 +59,10 @@ class BibleMediaItem(MediaManagerItem):
self.pluginNameVisible = translate('BiblesPlugin.MediaItem', 'Bible')
self.IconPath = u'songs/song'
self.ListViewWithDnD_class = BibleListView
- self.lastReference = []
MediaManagerItem.__init__(self, parent, icon, title)
- # place to store the search results
+ # place to store the search results for both bibles
self.search_results = {}
+ self.dual_search_results = {}
QtCore.QObject.connect(Receiver.get_receiver(),
QtCore.SIGNAL(u'bibles_load_list'), self.reloadBibles)
@@ -344,7 +344,7 @@ class BibleMediaItem(MediaManagerItem):
self.QuickMessage.setText(text)
self.AdvancedMessage.setText(text)
Receiver.send_message(u'openlp_process_events')
- #minor delay to get the events processed
+ # minor delay to get the events processed
time.sleep(0.1)
def loadBibles(self):
@@ -387,7 +387,7 @@ class BibleMediaItem(MediaManagerItem):
QtGui.QMessageBox.critical(self,
translate('BiblesPlugin.MediaItem', 'No Book Found'),
translate('BiblesPlugin.MediaItem',
- 'No matching book could be found in this Bible.'))
+ 'No matching book could be found in this Bible.'))
def onAdvancedVersionComboBox(self):
self.initialiseBible(
@@ -401,9 +401,10 @@ class BibleMediaItem(MediaManagerItem):
self.AdvancedBookComboBox.itemData(item).toInt()[0])
def onImportClick(self):
- self.bibleimportform = ImportWizardForm(self,
- self.parent.manager, self.parent)
- self.bibleimportform.exec_()
+ if not hasattr(self, u'import_wizard'):
+ self.import_wizard = ImportWizardForm(self, self.parent.manager,
+ self.parent)
+ self.import_wizard.exec_()
self.reloadBibles()
def onAdvancedFromVerse(self):
@@ -423,6 +424,7 @@ class BibleMediaItem(MediaManagerItem):
def onAdvancedSearchButton(self):
log.debug(u'Advanced Search Button pressed')
bible = unicode(self.AdvancedVersionComboBox.currentText())
+ dual_bible = unicode(self.AdvancedSecondBibleComboBox.currentText())
book = unicode(self.AdvancedBookComboBox.currentText())
chapter_from = int(self.AdvancedFromChapter.currentText())
chapter_to = int(self.AdvancedToChapter.currentText())
@@ -431,11 +433,12 @@ class BibleMediaItem(MediaManagerItem):
versetext = u'%s %s:%s-%s:%s' % (book, chapter_from, verse_from,
chapter_to, verse_to)
self.search_results = self.parent.manager.get_verses(bible, versetext)
+ if dual_bible:
+ self.dual_search_results = self.parent.manager.get_verses(
+ dual_bible, versetext)
if self.ClearAdvancedSearchComboBox.currentIndex() == 0:
self.listView.clear()
- self.lastReference = []
- self.lastReference.append(versetext)
- self.displayResults(bible)
+ self.displayResults(bible, dual_bible)
def onAdvancedFromChapter(self):
bible = unicode(self.AdvancedVersionComboBox.currentText())
@@ -450,70 +453,55 @@ class BibleMediaItem(MediaManagerItem):
def onQuickSearchButton(self):
log.debug(u'Quick Search Button pressed')
bible = unicode(self.QuickVersionComboBox.currentText())
+ dual_bible = unicode(self.QuickSecondBibleComboBox.currentText())
text = unicode(self.QuickSearchEdit.text())
if self.ClearQuickSearchComboBox.currentIndex() == 0:
self.listView.clear()
- self.lastReference = []
- self.lastReference.append(text)
self.search_results = self.parent.manager.get_verses(bible, text)
+ if dual_bible:
+ self.dual_search_results = self.parent.manager.get_verses(
+ dual_bible, text)
if self.search_results:
- self.displayResults(bible)
+ self.displayResults(bible, dual_bible)
def generateSlideData(self, service_item, item=None):
+ '''
+ Generates and formats the slides for the service item.
+ '''
log.debug(u'generating slide data')
items = self.listView.selectedIndexes()
if len(items) == 0:
return False
- old_chapter = u''
- raw_slides = []
- raw_footer = []
bible_text = u''
+ old_chapter = u''
+ raw_footer = []
+ raw_slides = []
service_item.add_capability(ItemCapabilities.AllowsPreview)
service_item.add_capability(ItemCapabilities.AllowsLoop)
service_item.add_capability(ItemCapabilities.AllowsAdditions)
- #If we want to use a 2nd translation / version
- bible2 = u''
- if self.SearchTabWidget.currentIndex() == 0:
- bible2 = unicode(self.QuickSecondBibleComboBox.currentText())
- else:
- bible2 = unicode(self.AdvancedSecondBibleComboBox.currentText())
- if bible2:
- bible2_verses = []
- for scripture in self.lastReference:
- bible2_verses.extend(self.parent.manager.get_verses(bible2,
- scripture))
- bible2_version = self.parent.manager.get_meta_data(bible2,
- u'Version')
- bible2_copyright = self.parent.manager.get_meta_data(bible2,
- u'Copyright')
- bible2_permission = self.parent.manager.get_meta_data(bible2,
- u'Permissions')
- if bible2_version:
- bible2_version = bible2_version.value
- else:
- bible2_version = u''
- if bible2_copyright:
- bible2_copyright = bible2_copyright.value
- else:
- bible2_copyright = u''
- if bible2_permission:
- bible2_permission = bible2_permission.value
- else:
- bible2_permission = u''
- # Let's loop through the main lot, and assemble our verses
+ # 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)
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')
+ bible = self._decodeQtObject(reference, 'bible')
version = self._decodeQtObject(reference, 'version')
copyright = self._decodeQtObject(reference, 'copyright')
#permission = self._decodeQtObject(reference, 'permission')
+ text = self._decodeQtObject(reference, 'text')
+ dual_bible = self._decodeQtObject(reference, 'dual_bible')
+ if dual_bible:
+ dual_version = self._decodeQtObject(reference,
+ 'dual_version')
+ dual_copyright = self._decodeQtObject(reference,
+ 'dual_copyright')
+ #dual_permission = self._decodeQtObject(reference,
+ # 'dual_permission')
+ dual_text = self._decodeQtObject(reference, 'dual_text')
if self.parent.settings_tab.display_style == 1:
verse_text = self.formatVerse(old_chapter, chapter, verse,
u'(', u')')
@@ -528,46 +516,68 @@ class BibleMediaItem(MediaManagerItem):
u'', u'')
old_chapter = chapter
footer = u'%s (%s %s)' % (book, version, copyright)
- #If not found add to footer
+ # If not found add to footer
if footer not in raw_footer:
raw_footer.append(footer)
- if bible2:
- footer = u'%s (%s %s)' % (book, bible2_version,
- bible2_copyright)
- #If not found add second version and copyright to footer
+ if dual_bible:
+ footer = u'%s (%s %s)' % (book, dual_version,
+ dual_copyright)
+ # If not found add second version and copyright to footer.
if footer not in raw_footer:
raw_footer.append(footer)
bible_text = u'%s %s \n\n %s %s' % (verse_text, text,
- verse_text, bible2_verses[item.row()].text)
+ verse_text, dual_text)
raw_slides.append(bible_text)
bible_text = u''
else:
- #Paragraph style force new line per verse
+ # If we are 'Verse Per Line' then force a new line.
if self.parent.settings_tab.layout_style == 1:
text = text + u'\n\n'
bible_text = u'%s %s %s' % (bible_text, verse_text, text)
- #if we are verse per slide then create slide
+ # If we are 'Verse Per Slide' then create a new slide.
if self.parent.settings_tab.layout_style == 0:
raw_slides.append(bible_text)
bible_text = u''
- if not service_item.title:
- service_item.title = u'%s %s' % (book, verse_text)
- elif service_item.title.find(
- translate('BiblesPlugin.MediaItem', 'etc')) == -1:
- service_item.title = u'%s, %s' % (service_item.title,
- translate('BiblesPlugin.MediaItem', 'etc'))
+ # If we are not 'Verse Per Slide' we have to make sure, that we
+ # add more verses.
+ else:
+ if item.row() < len(items) - 1:
+ bitem = items[item.row() + 1]
+ reference = bitem.data(QtCore.Qt.UserRole)
+ if isinstance(reference, QtCore.QVariant):
+ reference = reference.toPyObject()
+ bible_new = self._decodeQtObject(reference, 'bible')
+ dual_bible_new = self._decodeQtObject(reference, 'dual_bible')
+ if dual_bible_new:
+ raw_slides.append(bible_text)
+ bible_text = u''
+ elif bible != bible_new:
+ raw_slides.append(bible_text)
+ bible_text = u''
+ else:
+ raw_slides.append(bible_text)
+ bible_text = u''
+ # service item title
+ if not service_item.title:
+ if dual_bible:
+ service_item.title = u'%s (%s, %s) %s' % (book, version,
+ dual_version, verse_text)
+ else:
+ service_item.title = u'%s (%s) %s' % (book, version, verse_text)
+ elif service_item.title.find(
+ translate('BiblesPlugin.MediaItem', 'etc')) == -1:
+ service_item.title = u'%s, %s' % (service_item.title,
+ translate('BiblesPlugin.MediaItem', 'etc'))
+ # item theme
if len(self.parent.settings_tab.bible_theme) == 0:
service_item.theme = None
else:
service_item.theme = self.parent.settings_tab.bible_theme
- #if we are verse per slide we have already been added
- if self.parent.settings_tab.layout_style != 0 and not bible2:
- raw_slides.append(bible_text)
for slide in raw_slides:
service_item.add_from_text(slide[:30], slide)
if service_item.raw_footer:
- for foot in raw_footer:
- service_item.raw_footer.append(foot)
+ for footer in raw_footer:
+ service_item.raw_footer.append(footer)
else:
service_item.raw_footer = raw_footer
return True
@@ -599,8 +609,8 @@ class BibleMediaItem(MediaManagerItem):
row, QtCore.QVariant(book[u'chapters']))
if first:
first = False
- self.initialiseChapterVerse(
- bible, book[u'name'], book[u'chapters'])
+ self.initialiseChapterVerse(bible, book[u'name'],
+ book[u'chapters'])
def initialiseChapterVerse(self, bible, book, chapters):
log.debug(u'initialiseChapterVerse %s, %s', bible, book)
@@ -624,32 +634,69 @@ class BibleMediaItem(MediaManagerItem):
for i in range(int(range_from), int(range_to) + 1):
combo.addItem(unicode(i))
- def displayResults(self, bible):
+ def displayResults(self, bible, dual_bible=None):
+ '''
+ Displays the search results in the media manager. All data needed for further
+ action is saved for/in each row.
+ '''
version = self.parent.manager.get_meta_data(bible, u'Version')
copyright = self.parent.manager.get_meta_data(bible, u'Copyright')
- permission = self.parent.manager.get_meta_data(bible, u'Permissions')
- if not permission:
- permission = u''
- else:
- permission = permission.value
+ #permission = self.parent.manager.get_meta_data(bible, u'Permissions')
+ if dual_bible:
+ dual_version = self.parent.manager.get_meta_data(dual_bible,
+ u'Version')
+ dual_copyright = self.parent.manager.get_meta_data(dual_bible,
+ u'Copyright')
+ dual_permission = self.parent.manager.get_meta_data(dual_bible,
+ u'Permissions')
+ if dual_permission:
+ dual_permission = dual_permission.value
+ else:
+ dual_permission = u''
+ # We count the number of rows which are maybe already present.
+ start_count = self.listView.count()
for count, verse in enumerate(self.search_results):
- bible_text = u' %s %d:%d (%s)' % \
- (verse.book.name, verse.chapter, verse.verse, bible)
+ if dual_bible:
+ vdict = {
+ 'book':QtCore.QVariant(verse.book.name),
+ 'chapter':QtCore.QVariant(verse.chapter),
+ 'verse':QtCore.QVariant(verse.verse),
+ 'bible':QtCore.QVariant(bible),
+ 'version':QtCore.QVariant(version.value),
+ 'copyright':QtCore.QVariant(copyright.value),
+ #'permission':QtCore.QVariant(permission.value),
+ 'text':QtCore.QVariant(verse.text),
+ 'dual_bible':QtCore.QVariant(dual_bible),
+ 'dual_version':QtCore.QVariant(dual_version.value),
+ 'dual_copyright':QtCore.QVariant(dual_copyright.value),
+ #'dual_permission':QtCore.QVariant(dual_permission),
+ 'dual_text':QtCore.QVariant(
+ self.dual_search_results[count].text)
+ }
+ bible_text = u' %s %d:%d (%s, %s)' % (verse.book.name,
+ verse.chapter, verse.verse, version.value, dual_version.value)
+ else:
+ vdict = {
+ 'book':QtCore.QVariant(verse.book.name),
+ 'chapter':QtCore.QVariant(verse.chapter),
+ 'verse':QtCore.QVariant(verse.verse),
+ 'bible':QtCore.QVariant(bible),
+ 'version':QtCore.QVariant(version.value),
+ 'copyright':QtCore.QVariant(copyright.value),
+ #'permission':QtCore.QVariant(permission.value),
+ 'text':QtCore.QVariant(verse.text),
+ 'dual_bible':QtCore.QVariant(dual_bible)
+ }
+ bible_text = u' %s %d:%d (%s)' % (verse.book.name,
+ verse.chapter, verse.verse, version.value)
+ # set the row title
bible_verse = QtGui.QListWidgetItem(bible_text)
#bible_verse.setData(QtCore.Qt.UserRole,
# QtCore.QVariant(bible_text))
- vdict = {
- 'bible': QtCore.QVariant(bible),
- 'version': QtCore.QVariant(version.value),
- 'copyright': QtCore.QVariant(copyright.value),
- 'permission': QtCore.QVariant(permission),
- 'book': QtCore.QVariant(verse.book.name),
- 'chapter': QtCore.QVariant(verse.chapter),
- 'verse': QtCore.QVariant(verse.verse),
- 'text': QtCore.QVariant(verse.text)
- }
bible_verse.setData(QtCore.Qt.UserRole, QtCore.QVariant(vdict))
self.listView.addItem(bible_verse)
- row = self.listView.setCurrentRow(count)
+ row = self.listView.setCurrentRow(count + start_count)
if row:
row.setSelected(True)
+ self.search_results = {}
+ self.dual_search_results = {}
diff --git a/openlp/plugins/custom/forms/editcustomdialog.py b/openlp/plugins/custom/forms/editcustomdialog.py
index 241f96237..20b7a2bee 100644
--- a/openlp/plugins/custom/forms/editcustomdialog.py
+++ b/openlp/plugins/custom/forms/editcustomdialog.py
@@ -142,7 +142,7 @@ class Ui_CustomEditDialog(object):
customEditDialog.setWindowTitle(
translate('CustomPlugin.EditCustomForm', 'Edit Custom Slides'))
self.upButton.setToolTip(
- translate('CustomPlugin.EditCustomForm', 'Move slide up once '
+ translate('CustomPlugin.EditCustomForm', 'Move slide up one '
'position.'))
self.downButton.setToolTip(
translate('CustomPlugin.EditCustomForm', 'Move slide down one '
diff --git a/openlp/plugins/songs/forms/songimportform.py b/openlp/plugins/songs/forms/songimportform.py
index 9524e8981..b997238a9 100644
--- a/openlp/plugins/songs/forms/songimportform.py
+++ b/openlp/plugins/songs/forms/songimportform.py
@@ -25,59 +25,76 @@
###############################################################################
import logging
+import os
from PyQt4 import QtCore, QtGui
from songimportwizard import Ui_SongImportWizard
from openlp.core.lib import Receiver, SettingsManager, translate
#from openlp.core.utils import AppLocation
-from openlp.plugins.songs.lib import SongFormat
+from openlp.plugins.songs.lib.importer import SongFormat
log = logging.getLogger(__name__)
class ImportWizardForm(QtGui.QWizard, Ui_SongImportWizard):
"""
- This is the Bible Import Wizard, which allows easy importing of Bibles
- into OpenLP from other formats like OSIS, CSV and OpenSong.
+ This is the Song Import Wizard, which allows easy importing of Songs
+ into OpenLP from other formats like OpenLyrics, OpenSong and CCLI.
"""
- log.info(u'BibleImportForm loaded')
+ log.info(u'SongImportForm loaded')
- def __init__(self, parent, manager, songsplugin):
+ def __init__(self, parent, plugin):
"""
Instantiate the wizard, and run any extra setup we need to.
``parent``
The QWidget-derived parent of the wizard.
- ``config``
- The configuration object for storing and retrieving settings.
-
- ``manager``
- The Bible manager.
-
- ``bibleplugin``
- The Bible plugin.
+ ``plugin``
+ The songs plugin.
"""
QtGui.QWizard.__init__(self, parent)
self.setupUi(self)
self.registerFields()
self.finishButton = self.button(QtGui.QWizard.FinishButton)
self.cancelButton = self.button(QtGui.QWizard.CancelButton)
- self.manager = manager
- self.songsplugin = songsplugin
- #self.manager.set_process_dialog(self)
-# QtCore.QObject.connect(self.OsisFileButton,
-# QtCore.SIGNAL(u'clicked()'),
-# self.onOsisFileButtonClicked)
-# QtCore.QObject.connect(self.BooksFileButton,
-# QtCore.SIGNAL(u'clicked()'),
-# self.onBooksFileButtonClicked)
-# QtCore.QObject.connect(self.CsvVersesFileButton,
-# QtCore.SIGNAL(u'clicked()'),
-# self.onCsvVersesFileButtonClicked)
-# QtCore.QObject.connect(self.OpenSongBrowseButton,
-# QtCore.SIGNAL(u'clicked()'),
-# self.onOpenSongBrowseButtonClicked)
+ self.plugin = plugin
+ QtCore.QObject.connect(self.openLP2BrowseButton,
+ QtCore.SIGNAL(u'clicked()'),
+ self.onOpenLP2BrowseButtonClicked)
+ QtCore.QObject.connect(self.openLP1BrowseButton,
+ QtCore.SIGNAL(u'clicked()'),
+ self.onOpenLP1BrowseButtonClicked)
+ QtCore.QObject.connect(self.openLyricsAddButton,
+ QtCore.SIGNAL(u'clicked()'),
+ self.onOpenLyricsAddButtonClicked)
+ QtCore.QObject.connect(self.openLyricsRemoveButton,
+ QtCore.SIGNAL(u'clicked()'),
+ self.onOpenLyricsRemoveButtonClicked)
+ QtCore.QObject.connect(self.openSongAddButton,
+ QtCore.SIGNAL(u'clicked()'),
+ self.onOpenSongAddButtonClicked)
+ QtCore.QObject.connect(self.openSongRemoveButton,
+ QtCore.SIGNAL(u'clicked()'),
+ self.onOpenSongRemoveButtonClicked)
+ QtCore.QObject.connect(self.wordsOfWorshipAddButton,
+ QtCore.SIGNAL(u'clicked()'),
+ self.onWordsOfWorshipAddButtonClicked)
+ QtCore.QObject.connect(self.wordsOfWorshipRemoveButton,
+ QtCore.SIGNAL(u'clicked()'),
+ self.onWordsOfWorshipRemoveButtonClicked)
+ QtCore.QObject.connect(self.songsOfFellowshipAddButton,
+ QtCore.SIGNAL(u'clicked()'),
+ self.onSongsOfFellowshipAddButtonClicked)
+ QtCore.QObject.connect(self.songsOfFellowshipRemoveButton,
+ QtCore.SIGNAL(u'clicked()'),
+ self.onSongsOfFellowshipRemoveButtonClicked)
+ QtCore.QObject.connect(self.genericAddButton,
+ QtCore.SIGNAL(u'clicked()'),
+ self.onGenericAddButtonClicked)
+ QtCore.QObject.connect(self.genericRemoveButton,
+ QtCore.SIGNAL(u'clicked()'),
+ self.onGenericRemoveButtonClicked)
QtCore.QObject.connect(self.cancelButton,
QtCore.SIGNAL(u'clicked(bool)'),
self.onCancelButtonClicked)
@@ -101,154 +118,294 @@ class ImportWizardForm(QtGui.QWizard, Ui_SongImportWizard):
return True
elif self.currentId() == 1:
# Select page
- source_format = self.field(u'source_format').toInt()[0]
- if source_format == SongFormat.OpenLyrics:
- if self.OpenLyricsFileListWidget.count() == 0:
+ source_format = self.formatComboBox.currentIndex()
+ if source_format == SongFormat.OpenLP2:
+ if self.openLP2FilenameEdit.text().isEmpty():
+ QtGui.QMessageBox.critical(self,
+ translate('SongsPlugin.ImportWizardForm',
+ 'No OpenLP 2.0 Song Database Selected'),
+ translate('SongsPlugin.ImportWizardForm',
+ 'You need to select an OpenLP 2.0 song database '
+ 'file to import from.'))
+ self.openLP2BrowseButton.setFocus()
+ return False
+ elif source_format == SongFormat.OpenLP1:
+ if self.openSongFilenameEdit.text().isEmpty():
+ QtGui.QMessageBox.critical(self,
+ translate('SongsPlugin.ImportWizardForm',
+ 'No openlp.org 1.x Song Database Selected'),
+ translate('SongsPlugin.ImportWizardForm',
+ 'You need to select an openlp.org 1.x song '
+ 'database file to import from.'))
+ self.openLP1BrowseButton.setFocus()
+ return False
+ elif source_format == SongFormat.OpenLyrics:
+ if self.openLyricsFileListWidget.count() == 0:
QtGui.QMessageBox.critical(self,
translate('SongsPlugin.ImportWizardForm',
'No OpenLyrics Files Selected'),
translate('SongsPlugin.ImportWizardForm',
'You need to add at least one OpenLyrics '
'song file to import from.'))
- self.OpenLyricsAddButton.setFocus()
+ self.openLyricsAddButton.setFocus()
return False
elif source_format == SongFormat.OpenSong:
- if self.OpenSongFileListWidget.count() == 0:
+ if self.openSongFileListWidget.count() == 0:
QtGui.QMessageBox.critical(self,
translate('SongsPlugin.ImportWizardForm',
'No OpenSong Files Selected'),
translate('SongsPlugin.ImportWizardForm',
'You need to add at least one OpenSong '
'song file to import from.'))
- self.OpenSongAddButton.setFocus()
+ self.openSongAddButton.setFocus()
+ return False
+ elif source_format == SongFormat.WordsOfWorship:
+ if self.wordsOfWorshipListWidget.count() == 0:
+ QtGui.QMessageBox.critical(self,
+ translate('SongsPlugin.ImportWizardForm',
+ 'No Words of Worship Files Selected'),
+ translate('SongsPlugin.ImportWizardForm',
+ 'You need to add at least one Words of Worship '
+ 'file to import from.'))
+ self.wordsOfWorshipAddButton.setFocus()
return False
elif source_format == SongFormat.CCLI:
- if self.CCLIFileListWidget.count() == 0:
+ if self.ccliFileListWidget.count() == 0:
QtGui.QMessageBox.critical(self,
translate('SongsPlugin.ImportWizardForm',
'No CCLI Files Selected'),
translate('SongsPlugin.ImportWizardForm',
'You need to add at least one CCLI file '
'to import from.'))
- self.CCLIAddButton.setFocus()
+ self.ccliAddButton.setFocus()
return False
- elif source_format == SongFormat.CSV:
- if self.CSVFilenameEdit.text().isEmpty():
+ elif source_format == SongFormat.SongsOfFellowship:
+ if self.songsOfFellowshipFileListWidget.count() == 0:
QtGui.QMessageBox.critical(self,
translate('SongsPlugin.ImportWizardForm',
- 'No CSV File Selected'),
+ 'No Songs of Fellowship File Selected'),
translate('SongsPlugin.ImportWizardForm',
- 'You need to specify a CSV file to import from.'))
- self.CSVFilenameEdit.setFocus()
+ 'You need to add at least one Songs of Fellowship '
+ 'file to import from.'))
+ self.songsOfFellowshipAddButton.setFocus()
+ return False
+ elif source_format == SongFormat.Generic:
+ if self.genericFileListWidget.count() == 0:
+ QtGui.QMessageBox.critical(self,
+ translate('SongsPlugin.ImportWizardForm',
+ 'No Document/Presentation Selected'),
+ translate('SongsPlugin.ImportWizardForm',
+ 'You need to add at least one document or '
+ 'presentation file to import from.'))
+ self.genericAddButton.setFocus()
return False
return True
elif self.currentId() == 2:
# Progress page
return True
+ def getFileName(self, title, editbox):
+ filename = QtGui.QFileDialog.getOpenFileName(self, title,
+ SettingsManager.get_last_dir(self.plugin.settingsSection, 1))
+ if filename:
+ editbox.setText(filename)
+ SettingsManager.set_last_dir(
+ self.plugin.settingsSection,
+ os.path.split(unicode(filename))[0], 1)
+
+ def getFiles(self, title, listbox):
+ filenames = QtGui.QFileDialog.getOpenFileNames(self, title,
+ SettingsManager.get_last_dir(self.plugin.settingsSection, 1))
+ if filenames:
+ listbox.addItems(filenames)
+ SettingsManager.set_last_dir(
+ self.plugin.settingsSection,
+ os.path.split(unicode(filenames[0]))[0], 1)
+
+ def getListOfFiles(self, listbox):
+ files = []
+ for row in range(0, listbox.count()):
+ files.append(unicode(listbox.item(row).text()))
+ return files
+
+ def removeSelectedItems(self, listbox):
+ for item in listbox.selectedItems():
+ item = listbox.takeItem(listbox.row(item))
+ del item
+
+ def onOpenLP2BrowseButtonClicked(self):
+ self.getFileName(
+ translate('SongsPlugin.ImportWizardForm',
+ 'Select OpenLP 2.0 Database File'),
+ self.openLP2FilenameEdit
+ )
+
+ def onOpenLP1BrowseButtonClicked(self):
+ self.getFileName(
+ translate('SongsPlugin.ImportWizardForm',
+ 'Select openlp.org 1.x Database File'),
+ self.openLP1FilenameEdit
+ )
+
+ def onOpenLyricsAddButtonClicked(self):
+ self.getFiles(
+ translate('SongsPlugin.ImportWizardForm',
+ 'Select OpenLyrics Files'),
+ self.openLyricsFileListWidget
+ )
+
+ def onOpenLyricsRemoveButtonClicked(self):
+ self.removeSelectedItems(self.openLyricsFileListWidget)
+
+ def onOpenSongAddButtonClicked(self):
+ self.getFiles(
+ translate('SongsPlugin.ImportWizardForm',
+ 'Select Open Song Files'),
+ self.openSongFileListWidget
+ )
+
+ def onOpenSongRemoveButtonClicked(self):
+ self.removeSelectedItems(self.openSongFileListWidget)
+
+ def onWordsOfWorshipAddButtonClicked(self):
+ self.getFiles(
+ translate('SongsPlugin.ImportWizardForm',
+ 'Select Words of Worship Files'),
+ self.wordsOfWorshipFileListWidget
+ )
+
+ def onWordsOfWorshipRemoveButtonClicked(self):
+ self.removeSelectedItems(self.wordsOfWorshipFileListWidget)
+
+ def onSongsOfFellowshipAddButtonClicked(self):
+ self.getFiles(
+ translate('SongsPlugin.ImportWizardForm',
+ 'Select Songs of Fellowship Files'),
+ self.songsOfFellowshipFileListWidget
+ )
+
+ def onSongsOfFellowshipRemoveButtonClicked(self):
+ self.removeSelectedItems(self.songsOfFellowshipFileListWidget)
+
+ def onGenericAddButtonClicked(self):
+ self.getFiles(
+ translate('SongsPlugin.ImportWizardForm',
+ 'Select Document/Presentation Files'),
+ self.genericFileListWidget
+ )
+
+ def onGenericRemoveButtonClicked(self):
+ self.removeSelectedItems(self.genericFileListWidget)
+
def onCancelButtonClicked(self, checked):
"""
Stop the import on pressing the cancel button.
"""
log.debug('Cancel button pressed!')
if self.currentId() == 3:
- Receiver.send_message(u'openlp_stop_song_import')
+ Receiver.send_message(u'song_stop_import')
def onCurrentIdChanged(self, id):
- if id == 3:
+ if id == 2:
self.preImport()
self.performImport()
self.postImport()
def registerFields(self):
- self.SourcePage.registerField(u'source_format', self.FormatComboBox)
+ pass
def setDefaults(self):
- self.setField(u'source_format', QtCore.QVariant(0))
- self.OpenLyricsFileListWidget.clear()
- self.OpenSongFileListWidget.clear()
- self.CCLIFileListWidget.clear()
- self.CSVFilenameEdit.setText(u'')
+ self.formatComboBox.setCurrentIndex(0)
+ self.openLP2FilenameEdit.setText(u'')
+ self.openLP1FilenameEdit.setText(u'')
+ self.openLyricsFileListWidget.clear()
+ self.openSongFileListWidget.clear()
+ self.wordsOfWorshipFileListWidget.clear()
+ self.ccliFileListWidget.clear()
+ self.songsOfFellowshipFileListWidget.clear()
+ self.genericFileListWidget.clear()
+ #self.csvFilenameEdit.setText(u'')
- def getFileName(self, title, editbox):
- filename = QtGui.QFileDialog.getOpenFileName(self, title,
- SettingsManager.get_last_dir(self.songsplugin.settingsSection, 1))
- if filename:
- editbox.setText(filename)
- SettingsManager.set_last_dir(self.songsplugin.settingsSection,
- filename, 1)
-
- def incrementProgressBar(self, status_text):
+ def incrementProgressBar(self, status_text, increment=1):
log.debug(u'IncrementBar %s', status_text)
- self.ImportProgressLabel.setText(status_text)
- self.ImportProgressBar.setValue(self.ImportProgressBar.value() + 1)
- Receiver.send_message(u'process_events')
+ if status_text:
+ self.importProgressLabel.setText(status_text)
+ if increment > 0:
+ self.importProgressBar.setValue(self.importProgressBar.value() +
+ increment)
+ Receiver.send_message(u'openlp_process_events')
def preImport(self):
self.finishButton.setVisible(False)
- self.ImportProgressBar.setMinimum(0)
- self.ImportProgressBar.setMaximum(1188)
- self.ImportProgressBar.setValue(0)
- self.ImportProgressLabel.setText(
+ self.importProgressBar.setMinimum(0)
+ self.importProgressBar.setMaximum(1188)
+ self.importProgressBar.setValue(0)
+ self.importProgressLabel.setText(
translate('SongsPlugin.ImportWizardForm', 'Starting import...'))
- Receiver.send_message(u'process_events')
+ Receiver.send_message(u'openlp_process_events')
def performImport(self):
- pass
-# source_format = self.field(u'source_format').toInt()[0]
-# importer = None
-# if bible_type == BibleFormat.OSIS:
-# # Import an OSIS bible
-# importer = self.manager.import_bible(BibleFormat.OSIS,
-# name=license_version,
-# filename=unicode(self.field(u'osis_location').toString())
-# )
-# elif bible_type == BibleFormat.CSV:
-# # Import a CSV bible
-# importer = self.manager.import_bible(BibleFormat.CSV,
-# name=license_version,
-# booksfile=unicode(self.field(u'csv_booksfile').toString()),
-# versefile=unicode(self.field(u'csv_versefile').toString())
-# )
-# elif bible_type == BibleFormat.OpenSong:
-# # Import an OpenSong bible
-# importer = self.manager.import_bible(BibleFormat.OpenSong,
-# name=license_version,
-# filename=unicode(self.field(u'opensong_file').toString())
-# )
-# elif bible_type == BibleFormat.WebDownload:
-# # Import a bible from the web
-# self.ImportProgressBar.setMaximum(1)
-# download_location = self.field(u'web_location').toInt()[0]
-# bible_version = self.BibleComboBox.currentText()
-# if not isinstance(bible_version, unicode):
-# bible_version = unicode(bible_version, u'utf8')
-# if download_location == WebDownload.Crosswalk:
-# bible = self.web_bible_list[WebDownload.Crosswalk][bible_version]
-# elif download_location == WebDownload.BibleGateway:
-# bible = self.web_bible_list[WebDownload.BibleGateway][bible_version]
-# importer = self.manager.import_bible(
-# BibleFormat.WebDownload,
-# name=license_version,
-# download_source=WebDownload.get_name(download_location),
-# download_name=bible,
-# proxy_server=unicode(self.field(u'proxy_server').toString()),
-# proxy_username=unicode(self.field(u'proxy_username').toString()),
-# proxy_password=unicode(self.field(u'proxy_password').toString())
-# )
-# success = importer.do_import()
-# if success:
-# self.manager.save_meta_data(license_version, license_version,
-# license_copyright, license_permission)
-# self.manager.reload_bibles()
-# self.ImportProgressLabel.setText(translate('SongsPlugin.SongImportForm', 'Finished import.'))
-# else:
-# self.ImportProgressLabel.setText(
-# translate('SongsPlugin.SongImportForm', 'Your Bible import failed.'))
-# importer.delete()
+ """
+ Perform the actual import. This method pulls in the correct importer
+ class, and then runs the ``do_import`` method of the importer to do
+ the actual importing.
+ """
+ source_format = self.formatComboBox.currentIndex()
+ importer = None
+ if source_format == SongFormat.OpenLP2:
+ # Import an OpenLP 2.0 database
+ importer = self.plugin.importSongs(SongFormat.OpenLP2,
+ filename=unicode(self.openLP2FilenameEdit.text())
+ )
+ #elif source_format == SongFormat.OpenLP1:
+ # # Import an openlp.org database
+ # importer = self.plugin.importSongs(SongFormat.OpenLP1,
+ # filename=unicode(self.field(u'openlp1_filename').toString())
+ # )
+ elif source_format == SongFormat.OpenLyrics:
+ # Import OpenLyrics songs
+ importer = self.plugin.importSongs(SongFormat.OpenLyrics,
+ filenames=self.getListOfFiles(self.openLyricsFileListWidget)
+ )
+ elif source_format == SongFormat.OpenSong:
+ # Import OpenSong songs
+ importer = self.plugin.importSongs(SongFormat.OpenSong,
+ filenames=self.getListOfFiles(self.openSongFileListWidget)
+ )
+ elif source_format == SongFormat.WordsOfWorship:
+ # Import Words Of Worship songs
+ importer = self.plugin.importSongs(SongFormat.WordsOfWorship,
+ filenames=self.getListOfFiles(
+ self.wordsOfWorshipFileListWidget)
+ )
+ elif source_format == SongFormat.CCLI:
+ # Import Words Of Worship songs
+ importer = self.plugin.importSongs(SongFormat.CCLI,
+ filenames=self.getListOfFiles(self.ccliFileListWidget)
+ )
+ elif source_format == SongFormat.SongsOfFellowship:
+ # Import a Songs of Fellowship RTF file
+ importer = self.plugin.importSongs(SongFormat.SongsOfFellowship,
+ filenames=self.getListOfFiles(
+ self.songsOfFellowshipFileListWidget)
+ )
+ elif source_format == SongFormat.Generic:
+ # Import a generic document or presentatoin
+ importer = self.plugin.importSongs(SongFormat.Generic,
+ filenames=self.getListOfFiles(self.genericFileListWidget)
+ )
+ success = importer.do_import()
+ if success:
+ # reload songs
+ self.importProgressLabel.setText(
+ translate('SongsPlugin.SongImportForm', 'Finished import.'))
+ else:
+ self.importProgressLabel.setText(
+ translate('SongsPlugin.SongImportForm',
+ 'Your song import failed.'))
def postImport(self):
- self.ImportProgressBar.setValue(self.ImportProgressBar.maximum())
+ self.importProgressBar.setValue(self.importProgressBar.maximum())
self.finishButton.setVisible(True)
self.cancelButton.setVisible(False)
- Receiver.send_message(u'process_events')
+ Receiver.send_message(u'openlp_process_events')
diff --git a/openlp/plugins/songs/forms/songimportwizard.py b/openlp/plugins/songs/forms/songimportwizard.py
index 4008526c1..f1898d107 100644
--- a/openlp/plugins/songs/forms/songimportwizard.py
+++ b/openlp/plugins/songs/forms/songimportwizard.py
@@ -29,247 +29,425 @@ from PyQt4 import QtCore, QtGui
from openlp.core.lib import build_icon, translate
class Ui_SongImportWizard(object):
- def setupUi(self, SongImportWizard):
- SongImportWizard.setObjectName(u'SongImportWizard')
- SongImportWizard.resize(550, 386)
- SongImportWizard.setModal(True)
- SongImportWizard.setWizardStyle(QtGui.QWizard.ModernStyle)
- SongImportWizard.setOptions(
+ def setupUi(self, songImportWizard):
+ openIcon = build_icon(u':/general/general_open.png')
+ deleteIcon = build_icon(u':/general/general_delete.png')
+ songImportWizard.setObjectName(u'songImportWizard')
+ songImportWizard.resize(550, 386)
+ songImportWizard.setModal(True)
+ songImportWizard.setWizardStyle(QtGui.QWizard.ModernStyle)
+ songImportWizard.setOptions(
QtGui.QWizard.IndependentPages |
QtGui.QWizard.NoBackButtonOnStartPage |
QtGui.QWizard.NoBackButtonOnLastPage)
- self.WelcomePage = QtGui.QWizardPage()
- self.WelcomePage.setObjectName(u'WelcomePage')
- self.WelcomePage.setPixmap(QtGui.QWizard.WatermarkPixmap,
+ self.welcomePage = QtGui.QWizardPage()
+ self.welcomePage.setObjectName(u'welcomePage')
+ self.welcomePage.setPixmap(QtGui.QWizard.WatermarkPixmap,
QtGui.QPixmap(u':/wizards/wizard_importsong.bmp'))
- self.WelcomeLayout = QtGui.QHBoxLayout(self.WelcomePage)
- self.WelcomeLayout.setSpacing(8)
- self.WelcomeLayout.setMargin(0)
- self.WelcomeLayout.setObjectName(u'WelcomeLayout')
- self.WelcomeTextLayout = QtGui.QVBoxLayout()
- self.WelcomeTextLayout.setSpacing(8)
- self.WelcomeTextLayout.setObjectName(u'WelcomeTextLayout')
- self.TitleLabel = QtGui.QLabel(self.WelcomePage)
- self.TitleLabel.setObjectName(u'TitleLabel')
- self.WelcomeTextLayout.addWidget(self.TitleLabel)
- self.WelcomeTopSpacer = QtGui.QSpacerItem(20, 40,
+ self.welcomeLayout = QtGui.QHBoxLayout(self.welcomePage)
+ self.welcomeLayout.setSpacing(8)
+ self.welcomeLayout.setMargin(0)
+ self.welcomeLayout.setObjectName(u'welcomeLayout')
+ self.welcomeTextLayout = QtGui.QVBoxLayout()
+ self.welcomeTextLayout.setSpacing(8)
+ self.welcomeTextLayout.setObjectName(u'welcomeTextLayout')
+ self.titleLabel = QtGui.QLabel(self.welcomePage)
+ self.titleLabel.setObjectName(u'TitleLabel')
+ self.welcomeTextLayout.addWidget(self.titleLabel)
+ self.welcomeTopSpacer = QtGui.QSpacerItem(20, 40,
QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed)
- self.WelcomeTextLayout.addItem(self.WelcomeTopSpacer)
- self.InformationLabel = QtGui.QLabel(self.WelcomePage)
- self.InformationLabel.setWordWrap(True)
- self.InformationLabel.setMargin(10)
- self.InformationLabel.setObjectName(u'InformationLabel')
- self.WelcomeTextLayout.addWidget(self.InformationLabel)
- self.WelcomeBottomSpacer = QtGui.QSpacerItem(20, 40,
+ self.welcomeTextLayout.addItem(self.welcomeTopSpacer)
+ self.informationLabel = QtGui.QLabel(self.welcomePage)
+ self.informationLabel.setWordWrap(True)
+ self.informationLabel.setMargin(10)
+ self.informationLabel.setObjectName(u'InformationLabel')
+ self.welcomeTextLayout.addWidget(self.informationLabel)
+ self.welcomeBottomSpacer = QtGui.QSpacerItem(20, 40,
QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
- self.WelcomeTextLayout.addItem(self.WelcomeBottomSpacer)
- self.WelcomeLayout.addLayout(self.WelcomeTextLayout)
- SongImportWizard.addPage(self.WelcomePage)
- self.SourcePage = QtGui.QWizardPage()
- self.SourcePage.setObjectName(u'SourcePage')
- self.SourceLayout = QtGui.QVBoxLayout(self.SourcePage)
- self.SourceLayout.setSpacing(8)
- self.SourceLayout.setMargin(20)
- self.SourceLayout.setObjectName(u'SourceLayout')
- self.FormatLayout = QtGui.QHBoxLayout()
- self.FormatLayout.setSpacing(8)
- self.FormatLayout.setObjectName(u'FormatLayout')
- self.FormatLabel = QtGui.QLabel(self.SourcePage)
- self.FormatLabel.setObjectName(u'FormatLabel')
- self.FormatLayout.addWidget(self.FormatLabel)
- self.FormatComboBox = QtGui.QComboBox(self.SourcePage)
+ self.welcomeTextLayout.addItem(self.welcomeBottomSpacer)
+ self.welcomeLayout.addLayout(self.welcomeTextLayout)
+ songImportWizard.addPage(self.welcomePage)
+ self.sourcePage = QtGui.QWizardPage()
+ self.sourcePage.setObjectName(u'SourcePage')
+ self.sourceLayout = QtGui.QVBoxLayout(self.sourcePage)
+ self.sourceLayout.setSpacing(8)
+ self.sourceLayout.setMargin(20)
+ self.sourceLayout.setObjectName(u'SourceLayout')
+ self.formatLayout = QtGui.QHBoxLayout()
+ self.formatLayout.setSpacing(8)
+ self.formatLayout.setObjectName(u'FormatLayout')
+ self.formatLabel = QtGui.QLabel(self.sourcePage)
+ self.formatLabel.setObjectName(u'FormatLabel')
+ self.formatLayout.addWidget(self.formatLabel)
+ self.formatComboBox = QtGui.QComboBox(self.sourcePage)
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding,
QtGui.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(
- self.FormatComboBox.sizePolicy().hasHeightForWidth())
- self.FormatComboBox.setSizePolicy(sizePolicy)
- self.FormatComboBox.setObjectName(u'FormatComboBox')
- self.FormatComboBox.addItem(u'')
- self.FormatComboBox.addItem(u'')
- self.FormatComboBox.addItem(u'')
- self.FormatComboBox.addItem(u'')
- self.FormatLayout.addWidget(self.FormatComboBox)
- self.FormatSpacer = QtGui.QSpacerItem(40, 20,
+ self.formatComboBox.sizePolicy().hasHeightForWidth())
+ self.formatComboBox.setSizePolicy(sizePolicy)
+ self.formatComboBox.setObjectName(u'formatComboBox')
+ self.formatComboBox.addItem(u'')
+ self.formatComboBox.addItem(u'')
+ self.formatComboBox.addItem(u'')
+ self.formatComboBox.addItem(u'')
+ self.formatComboBox.addItem(u'')
+ self.formatComboBox.addItem(u'')
+ self.formatComboBox.addItem(u'')
+ self.formatComboBox.addItem(u'')
+# self.formatComboBox.addItem(u'')
+ self.formatLayout.addWidget(self.formatComboBox)
+ self.formatSpacer = QtGui.QSpacerItem(40, 20,
QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
- self.FormatLayout.addItem(self.FormatSpacer)
- self.SourceLayout.addLayout(self.FormatLayout)
- self.FormatStackedWidget = QtGui.QStackedWidget(self.SourcePage)
- self.FormatStackedWidget.setObjectName(u'FormatStackedWidget')
- self.OpenLyricsPage = QtGui.QWidget()
- self.OpenLyricsPage.setObjectName(u'OpenLyricsPage')
- self.OpenLyricsLayout = QtGui.QVBoxLayout(self.OpenLyricsPage)
- self.OpenLyricsLayout.setSpacing(8)
- self.OpenLyricsLayout.setMargin(0)
- self.OpenLyricsLayout.setObjectName(u'OpenLyricsLayout')
- self.OpenLyricsFileListWidget = QtGui.QListWidget(self.OpenLyricsPage)
- self.OpenLyricsFileListWidget.setObjectName(u'OpenLyricsFileListWidget')
- self.OpenLyricsLayout.addWidget(self.OpenLyricsFileListWidget)
- self.OpenLyricsButtonLayout = QtGui.QHBoxLayout()
- self.OpenLyricsButtonLayout.setSpacing(8)
- self.OpenLyricsButtonLayout.setObjectName(u'OpenLyricsButtonLayout')
- self.OpenLyricsAddButton = QtGui.QPushButton(self.OpenLyricsPage)
- openIcon = build_icon(u':/general/general_open.png')
- self.OpenLyricsAddButton.setIcon(openIcon)
- self.OpenLyricsAddButton.setObjectName(u'OpenLyricsAddButton')
- self.OpenLyricsButtonLayout.addWidget(self.OpenLyricsAddButton)
- self.OpenLyricsButtonSpacer = QtGui.QSpacerItem(40, 20,
+ self.formatLayout.addItem(self.formatSpacer)
+ self.sourceLayout.addLayout(self.formatLayout)
+ self.formatStackedWidget = QtGui.QStackedWidget(self.sourcePage)
+ self.formatStackedWidget.setObjectName(u'FormatStackedWidget')
+ # OpenLP 2.0
+ self.openLP2Page = QtGui.QWidget()
+ self.openLP2Page.setObjectName(u'openLP2Page')
+ self.openLP2Layout = QtGui.QFormLayout(self.openLP2Page)
+ self.openLP2Layout.setMargin(0)
+ self.openLP2Layout.setSpacing(8)
+ self.openLP2Layout.setObjectName(u'openLP2Layout')
+ self.openLP2FilenameLabel = QtGui.QLabel(self.openLP2Page)
+ self.openLP2FilenameLabel.setObjectName(u'openLP2FilenameLabel')
+ self.openLP2Layout.setWidget(0, QtGui.QFormLayout.LabelRole,
+ self.openLP2FilenameLabel)
+ self.openLP2FileLayout = QtGui.QHBoxLayout()
+ self.openLP2FileLayout.setSpacing(8)
+ self.openLP2FileLayout.setObjectName(u'openLP2FileLayout')
+ self.openLP2FilenameEdit = QtGui.QLineEdit(self.openLP2Page)
+ self.openLP2FilenameEdit.setObjectName(u'openLP2FilenameEdit')
+ self.openLP2FileLayout.addWidget(self.openLP2FilenameEdit)
+ self.openLP2BrowseButton = QtGui.QToolButton(self.openLP2Page)
+ self.openLP2BrowseButton.setIcon(openIcon)
+ self.openLP2BrowseButton.setObjectName(u'openLP2BrowseButton')
+ self.openLP2FileLayout.addWidget(self.openLP2BrowseButton)
+ self.openLP2Layout.setLayout(0, QtGui.QFormLayout.FieldRole,
+ self.openLP2FileLayout)
+ self.formatStackedWidget.addWidget(self.openLP2Page)
+ # openlp.org 1.x
+ self.openLP1Page = QtGui.QWidget()
+ self.openLP1Page.setObjectName(u'openLP1Page')
+ self.openLP1Layout = QtGui.QFormLayout(self.openLP1Page)
+ self.openLP1Layout.setMargin(0)
+ self.openLP1Layout.setSpacing(8)
+ self.openLP1Layout.setObjectName(u'openLP1Layout')
+ self.openLP1FilenameLabel = QtGui.QLabel(self.openLP1Page)
+ self.openLP1FilenameLabel.setObjectName(u'openLP1FilenameLabel')
+ self.openLP1Layout.setWidget(0, QtGui.QFormLayout.LabelRole,
+ self.openLP1FilenameLabel)
+ self.openLP1FileLayout = QtGui.QHBoxLayout()
+ self.openLP1FileLayout.setSpacing(8)
+ self.openLP1FileLayout.setObjectName(u'openLP1FileLayout')
+ self.openLP1FilenameEdit = QtGui.QLineEdit(self.openLP1Page)
+ self.openLP1FilenameEdit.setObjectName(u'openLP1FilenameEdit')
+ self.openLP1FileLayout.addWidget(self.openLP1FilenameEdit)
+ self.openLP1BrowseButton = QtGui.QToolButton(self.openLP1Page)
+ self.openLP1BrowseButton.setIcon(openIcon)
+ self.openLP1BrowseButton.setObjectName(u'openLP1BrowseButton')
+ self.openLP1FileLayout.addWidget(self.openLP1BrowseButton)
+ self.openLP1Layout.setLayout(0, QtGui.QFormLayout.FieldRole,
+ self.openLP1FileLayout)
+ self.formatStackedWidget.addWidget(self.openLP1Page)
+ # OpenLyrics
+ self.openLyricsPage = QtGui.QWidget()
+ self.openLyricsPage.setObjectName(u'OpenLyricsPage')
+ self.openLyricsLayout = QtGui.QVBoxLayout(self.openLyricsPage)
+ self.openLyricsLayout.setSpacing(8)
+ self.openLyricsLayout.setMargin(0)
+ self.openLyricsLayout.setObjectName(u'OpenLyricsLayout')
+ self.openLyricsFileListWidget = QtGui.QListWidget(self.openLyricsPage)
+ self.openLyricsFileListWidget.setSelectionMode(
+ QtGui.QAbstractItemView.ExtendedSelection)
+ self.openLyricsFileListWidget.setObjectName(u'OpenLyricsFileListWidget')
+ self.openLyricsLayout.addWidget(self.openLyricsFileListWidget)
+ self.openLyricsButtonLayout = QtGui.QHBoxLayout()
+ self.openLyricsButtonLayout.setSpacing(8)
+ self.openLyricsButtonLayout.setObjectName(u'OpenLyricsButtonLayout')
+ self.openLyricsAddButton = QtGui.QPushButton(self.openLyricsPage)
+ self.openLyricsAddButton.setIcon(openIcon)
+ self.openLyricsAddButton.setObjectName(u'OpenLyricsAddButton')
+ self.openLyricsButtonLayout.addWidget(self.openLyricsAddButton)
+ self.openLyricsButtonSpacer = QtGui.QSpacerItem(40, 20,
QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
- self.OpenLyricsButtonLayout.addItem(self.OpenLyricsButtonSpacer)
- self.OpenLyricsRemoveButton = QtGui.QPushButton(self.OpenLyricsPage)
- deleteIcon = build_icon(u':/general/general_delete.png')
- self.OpenLyricsRemoveButton.setIcon(deleteIcon)
- self.OpenLyricsRemoveButton.setObjectName(u'OpenLyricsRemoveButton')
- self.OpenLyricsButtonLayout.addWidget(self.OpenLyricsRemoveButton)
- self.OpenLyricsLayout.addLayout(self.OpenLyricsButtonLayout)
- self.FormatStackedWidget.addWidget(self.OpenLyricsPage)
- self.OpenSongPage = QtGui.QWidget()
- self.OpenSongPage.setObjectName(u'OpenSongPage')
- self.OpenSongLayout = QtGui.QVBoxLayout(self.OpenSongPage)
- self.OpenSongLayout.setSpacing(8)
- self.OpenSongLayout.setMargin(0)
- self.OpenSongLayout.setObjectName(u'OpenSongLayout')
- self.OpenSongFileListWidget = QtGui.QListWidget(self.OpenSongPage)
- self.OpenSongFileListWidget.setObjectName(u'OpenSongFileListWidget')
- self.OpenSongLayout.addWidget(self.OpenSongFileListWidget)
- self.OpenSongButtonLayout = QtGui.QHBoxLayout()
- self.OpenSongButtonLayout.setSpacing(8)
- self.OpenSongButtonLayout.setObjectName(u'OpenSongButtonLayout')
- self.OpenSongAddButton = QtGui.QPushButton(self.OpenSongPage)
- self.OpenSongAddButton.setIcon(openIcon)
- self.OpenSongAddButton.setObjectName(u'OpenSongAddButton')
- self.OpenSongButtonLayout.addWidget(self.OpenSongAddButton)
- self.OpenSongButtonSpacer = QtGui.QSpacerItem(40, 20,
+ self.openLyricsButtonLayout.addItem(self.openLyricsButtonSpacer)
+ self.openLyricsRemoveButton = QtGui.QPushButton(self.openLyricsPage)
+ self.openLyricsRemoveButton.setIcon(deleteIcon)
+ self.openLyricsRemoveButton.setObjectName(u'OpenLyricsRemoveButton')
+ self.openLyricsButtonLayout.addWidget(self.openLyricsRemoveButton)
+ self.openLyricsLayout.addLayout(self.openLyricsButtonLayout)
+ self.formatStackedWidget.addWidget(self.openLyricsPage)
+ # Open Song
+ self.openSongPage = QtGui.QWidget()
+ self.openSongPage.setObjectName(u'OpenSongPage')
+ self.openSongLayout = QtGui.QVBoxLayout(self.openSongPage)
+ self.openSongLayout.setSpacing(8)
+ self.openSongLayout.setMargin(0)
+ self.openSongLayout.setObjectName(u'OpenSongLayout')
+ self.openSongFileListWidget = QtGui.QListWidget(self.openSongPage)
+ self.openSongFileListWidget.setSelectionMode(
+ QtGui.QAbstractItemView.ExtendedSelection)
+ self.openSongFileListWidget.setObjectName(u'OpenSongFileListWidget')
+ self.openSongLayout.addWidget(self.openSongFileListWidget)
+ self.openSongButtonLayout = QtGui.QHBoxLayout()
+ self.openSongButtonLayout.setSpacing(8)
+ self.openSongButtonLayout.setObjectName(u'OpenSongButtonLayout')
+ self.openSongAddButton = QtGui.QPushButton(self.openSongPage)
+ self.openSongAddButton.setIcon(openIcon)
+ self.openSongAddButton.setObjectName(u'OpenSongAddButton')
+ self.openSongButtonLayout.addWidget(self.openSongAddButton)
+ self.openSongButtonSpacer = QtGui.QSpacerItem(40, 20,
QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
- self.OpenSongButtonLayout.addItem(self.OpenSongButtonSpacer)
- self.OpenSongRemoveButton = QtGui.QPushButton(self.OpenSongPage)
- self.OpenSongRemoveButton.setIcon(deleteIcon)
- self.OpenSongRemoveButton.setObjectName(u'OpenSongRemoveButton')
- self.OpenSongButtonLayout.addWidget(self.OpenSongRemoveButton)
- self.OpenSongLayout.addLayout(self.OpenSongButtonLayout)
- self.FormatStackedWidget.addWidget(self.OpenSongPage)
- self.CCLIPage = QtGui.QWidget()
- self.CCLIPage.setObjectName(u'CCLIPage')
- self.CCLILayout = QtGui.QVBoxLayout(self.CCLIPage)
- self.CCLILayout.setSpacing(8)
- self.CCLILayout.setMargin(0)
- self.CCLILayout.setObjectName(u'CCLILayout')
- self.CCLIFileListWidget = QtGui.QListWidget(self.CCLIPage)
- self.CCLIFileListWidget.setObjectName(u'CCLIFileListWidget')
- self.CCLILayout.addWidget(self.CCLIFileListWidget)
- self.CCLIButtonLayout = QtGui.QHBoxLayout()
- self.CCLIButtonLayout.setSpacing(8)
- self.CCLIButtonLayout.setObjectName(u'CCLIButtonLayout')
- self.CCLIAddButton = QtGui.QPushButton(self.CCLIPage)
- self.CCLIAddButton.setIcon(openIcon)
- self.CCLIAddButton.setObjectName(u'CCLIAddButton')
- self.CCLIButtonLayout.addWidget(self.CCLIAddButton)
- self.CCLIButtonSpacer = QtGui.QSpacerItem(40, 20,
+ self.openSongButtonLayout.addItem(self.openSongButtonSpacer)
+ self.openSongRemoveButton = QtGui.QPushButton(self.openSongPage)
+ self.openSongRemoveButton.setIcon(deleteIcon)
+ self.openSongRemoveButton.setObjectName(u'OpenSongRemoveButton')
+ self.openSongButtonLayout.addWidget(self.openSongRemoveButton)
+ self.openSongLayout.addLayout(self.openSongButtonLayout)
+ self.formatStackedWidget.addWidget(self.openSongPage)
+ # Words of Worship
+ self.wordsOfWorshipPage = QtGui.QWidget()
+ self.wordsOfWorshipPage.setObjectName(u'wordsOfWorshipPage')
+ self.wordsOfWorshipLayout = QtGui.QVBoxLayout(self.wordsOfWorshipPage)
+ self.wordsOfWorshipLayout.setSpacing(8)
+ self.wordsOfWorshipLayout.setMargin(0)
+ self.wordsOfWorshipLayout.setObjectName(u'wordsOfWorshipLayout')
+ self.wordsOfWorshipFileListWidget = QtGui.QListWidget(self.wordsOfWorshipPage)
+ self.wordsOfWorshipFileListWidget.setSelectionMode(
+ QtGui.QAbstractItemView.ExtendedSelection)
+ self.wordsOfWorshipFileListWidget.setObjectName(u'wordsOfWorshipFileListWidget')
+ self.wordsOfWorshipLayout.addWidget(self.wordsOfWorshipFileListWidget)
+ self.wordsOfWorshipButtonLayout = QtGui.QHBoxLayout()
+ self.wordsOfWorshipButtonLayout.setSpacing(8)
+ self.wordsOfWorshipButtonLayout.setObjectName(u'wordsOfWorshipButtonLayout')
+ self.wordsOfWorshipAddButton = QtGui.QPushButton(self.wordsOfWorshipPage)
+ self.wordsOfWorshipAddButton.setIcon(openIcon)
+ self.wordsOfWorshipAddButton.setObjectName(u'wordsOfWorshipAddButton')
+ self.wordsOfWorshipButtonLayout.addWidget(self.wordsOfWorshipAddButton)
+ self.wordsOfWorshipButtonSpacer = QtGui.QSpacerItem(40, 20,
QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
- self.CCLIButtonLayout.addItem(self.CCLIButtonSpacer)
- self.CCLIRemoveButton = QtGui.QPushButton(self.CCLIPage)
- self.CCLIRemoveButton.setIcon(deleteIcon)
- self.CCLIRemoveButton.setObjectName(u'CCLIRemoveButton')
- self.CCLIButtonLayout.addWidget(self.CCLIRemoveButton)
- self.CCLILayout.addLayout(self.CCLIButtonLayout)
- self.FormatStackedWidget.addWidget(self.CCLIPage)
- self.CSVPage = QtGui.QWidget()
- self.CSVPage.setObjectName(u'CSVPage')
- self.CSVLayout = QtGui.QFormLayout(self.CSVPage)
- self.CSVLayout.setMargin(0)
- self.CSVLayout.setSpacing(8)
- self.CSVLayout.setObjectName(u'CSVLayout')
- self.CSVFilenameLabel = QtGui.QLabel(self.CSVPage)
- self.CSVFilenameLabel.setObjectName(u'CSVFilenameLabel')
- self.CSVLayout.setWidget(0, QtGui.QFormLayout.LabelRole,
- self.CSVFilenameLabel)
- self.CSVFileLayout = QtGui.QHBoxLayout()
- self.CSVFileLayout.setSpacing(8)
- self.CSVFileLayout.setObjectName(u'CSVFileLayout')
- self.CSVFilenameEdit = QtGui.QLineEdit(self.CSVPage)
- self.CSVFilenameEdit.setObjectName(u'CSVFilenameEdit')
- self.CSVFileLayout.addWidget(self.CSVFilenameEdit)
- self.CSVBrowseButton = QtGui.QToolButton(self.CSVPage)
- self.CSVBrowseButton.setIcon(openIcon)
- self.CSVBrowseButton.setObjectName(u'CSVBrowseButton')
- self.CSVFileLayout.addWidget(self.CSVBrowseButton)
- self.CSVLayout.setLayout(0, QtGui.QFormLayout.FieldRole,
- self.CSVFileLayout)
- self.FormatStackedWidget.addWidget(self.CSVPage)
- self.SourceLayout.addWidget(self.FormatStackedWidget)
- SongImportWizard.addPage(self.SourcePage)
- self.ImportPage = QtGui.QWizardPage()
- self.ImportPage.setObjectName(u'ImportPage')
- self.ImportLayout = QtGui.QVBoxLayout(self.ImportPage)
- self.ImportLayout.setSpacing(8)
- self.ImportLayout.setMargin(50)
- self.ImportLayout.setObjectName(u'ImportLayout')
- self.ImportProgressLabel = QtGui.QLabel(self.ImportPage)
- self.ImportProgressLabel.setObjectName(u'ImportProgressLabel')
- self.ImportLayout.addWidget(self.ImportProgressLabel)
- self.ImportProgressBar = QtGui.QProgressBar(self.ImportPage)
- self.ImportProgressBar.setProperty(u'value', 0)
- self.ImportProgressBar.setInvertedAppearance(False)
- self.ImportProgressBar.setObjectName(u'ImportProgressBar')
- self.ImportLayout.addWidget(self.ImportProgressBar)
- SongImportWizard.addPage(self.ImportPage)
- self.retranslateUi(SongImportWizard)
- self.FormatStackedWidget.setCurrentIndex(0)
- QtCore.QObject.connect(self.FormatComboBox,
+ self.wordsOfWorshipButtonLayout.addItem(self.wordsOfWorshipButtonSpacer)
+ self.wordsOfWorshipRemoveButton = QtGui.QPushButton(self.wordsOfWorshipPage)
+ self.wordsOfWorshipRemoveButton.setIcon(deleteIcon)
+ self.wordsOfWorshipRemoveButton.setObjectName(u'wordsOfWorshipRemoveButton')
+ self.wordsOfWorshipButtonLayout.addWidget(self.wordsOfWorshipRemoveButton)
+ self.wordsOfWorshipLayout.addLayout(self.wordsOfWorshipButtonLayout)
+ self.formatStackedWidget.addWidget(self.wordsOfWorshipPage)
+ # CCLI File import
+ self.ccliPage = QtGui.QWidget()
+ self.ccliPage.setObjectName(u'ccliPage')
+ self.ccliLayout = QtGui.QVBoxLayout(self.ccliPage)
+ self.ccliLayout.setSpacing(8)
+ self.ccliLayout.setMargin(0)
+ self.ccliLayout.setObjectName(u'ccliLayout')
+ self.ccliFileListWidget = QtGui.QListWidget(self.ccliPage)
+ self.ccliFileListWidget.setSelectionMode(
+ QtGui.QAbstractItemView.ExtendedSelection)
+ self.ccliFileListWidget.setObjectName(u'ccliFileListWidget')
+ self.ccliLayout.addWidget(self.ccliFileListWidget)
+ self.ccliButtonLayout = QtGui.QHBoxLayout()
+ self.ccliButtonLayout.setSpacing(8)
+ self.ccliButtonLayout.setObjectName(u'ccliButtonLayout')
+ self.ccliAddButton = QtGui.QPushButton(self.ccliPage)
+ self.ccliAddButton.setIcon(openIcon)
+ self.ccliAddButton.setObjectName(u'ccliAddButton')
+ self.ccliButtonLayout.addWidget(self.ccliAddButton)
+ self.ccliButtonSpacer = QtGui.QSpacerItem(40, 20,
+ QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+ self.ccliButtonLayout.addItem(self.ccliButtonSpacer)
+ self.ccliRemoveButton = QtGui.QPushButton(self.ccliPage)
+ self.ccliRemoveButton.setIcon(deleteIcon)
+ self.ccliRemoveButton.setObjectName(u'ccliRemoveButton')
+ self.ccliButtonLayout.addWidget(self.ccliRemoveButton)
+ self.ccliLayout.addLayout(self.ccliButtonLayout)
+ self.formatStackedWidget.addWidget(self.ccliPage)
+ # Songs of Fellowship
+ self.songsOfFellowshipPage = QtGui.QWidget()
+ self.songsOfFellowshipPage.setObjectName(u'songsOfFellowshipPage')
+ self.songsOfFellowshipLayout = QtGui.QVBoxLayout(self.songsOfFellowshipPage)
+ self.songsOfFellowshipLayout.setMargin(0)
+ self.songsOfFellowshipLayout.setSpacing(8)
+ self.songsOfFellowshipLayout.setObjectName(u'songsOfFellowshipLayout')
+ self.songsOfFellowshipFileListWidget = QtGui.QListWidget(self.songsOfFellowshipPage)
+ self.songsOfFellowshipFileListWidget.setSelectionMode(
+ QtGui.QAbstractItemView.ExtendedSelection)
+ self.songsOfFellowshipFileListWidget.setObjectName(u'songsOfFellowshipFileListWidget')
+ self.songsOfFellowshipLayout.addWidget(self.songsOfFellowshipFileListWidget)
+ self.songsOfFellowshipButtonLayout = QtGui.QHBoxLayout()
+ self.songsOfFellowshipButtonLayout.setSpacing(8)
+ self.songsOfFellowshipButtonLayout.setObjectName(u'songsOfFellowshipButtonLayout')
+ self.songsOfFellowshipAddButton = QtGui.QPushButton(self.songsOfFellowshipPage)
+ self.songsOfFellowshipAddButton.setIcon(openIcon)
+ self.songsOfFellowshipAddButton.setObjectName(u'songsOfFellowshipAddButton')
+ self.songsOfFellowshipButtonLayout.addWidget(self.songsOfFellowshipAddButton)
+ self.songsOfFellowshipButtonSpacer = QtGui.QSpacerItem(40, 20,
+ QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+ self.songsOfFellowshipButtonLayout.addItem(self.songsOfFellowshipButtonSpacer)
+ self.songsOfFellowshipRemoveButton = QtGui.QPushButton(self.songsOfFellowshipPage)
+ self.songsOfFellowshipRemoveButton.setIcon(deleteIcon)
+ self.songsOfFellowshipRemoveButton.setObjectName(u'songsOfFellowshipRemoveButton')
+ self.songsOfFellowshipButtonLayout.addWidget(self.songsOfFellowshipRemoveButton)
+ self.songsOfFellowshipLayout.addLayout(self.songsOfFellowshipButtonLayout)
+ self.formatStackedWidget.addWidget(self.songsOfFellowshipPage)
+ # Generic Document/Presentation import
+ self.genericPage = QtGui.QWidget()
+ self.genericPage.setObjectName(u'genericPage')
+ self.genericLayout = QtGui.QVBoxLayout(self.genericPage)
+ self.genericLayout.setMargin(0)
+ self.genericLayout.setSpacing(8)
+ self.genericLayout.setObjectName(u'genericLayout')
+ self.genericFileListWidget = QtGui.QListWidget(self.genericPage)
+ self.genericFileListWidget.setSelectionMode(
+ QtGui.QAbstractItemView.ExtendedSelection)
+ self.genericFileListWidget.setObjectName(u'genericFileListWidget')
+ self.genericLayout.addWidget(self.genericFileListWidget)
+ self.genericButtonLayout = QtGui.QHBoxLayout()
+ self.genericButtonLayout.setSpacing(8)
+ self.genericButtonLayout.setObjectName(u'genericButtonLayout')
+ self.genericAddButton = QtGui.QPushButton(self.genericPage)
+ self.genericAddButton.setIcon(openIcon)
+ self.genericAddButton.setObjectName(u'genericAddButton')
+ self.genericButtonLayout.addWidget(self.genericAddButton)
+ self.genericButtonSpacer = QtGui.QSpacerItem(40, 20,
+ QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+ self.genericButtonLayout.addItem(self.genericButtonSpacer)
+ self.genericRemoveButton = QtGui.QPushButton(self.genericPage)
+ self.genericRemoveButton.setIcon(deleteIcon)
+ self.genericRemoveButton.setObjectName(u'genericRemoveButton')
+ self.genericButtonLayout.addWidget(self.genericRemoveButton)
+ self.genericLayout.addLayout(self.genericButtonLayout)
+ self.formatStackedWidget.addWidget(self.genericPage)
+# Commented out for future use.
+# self.csvPage = QtGui.QWidget()
+# self.csvPage.setObjectName(u'CSVPage')
+# self.csvLayout = QtGui.QFormLayout(self.csvPage)
+# self.csvLayout.setMargin(0)
+# self.csvLayout.setSpacing(8)
+# self.csvLayout.setObjectName(u'CSVLayout')
+# self.csvFilenameLabel = QtGui.QLabel(self.csvPage)
+# self.csvFilenameLabel.setObjectName(u'CSVFilenameLabel')
+# self.csvLayout.setWidget(0, QtGui.QFormLayout.LabelRole,
+# self.csvFilenameLabel)
+# self.csvFileLayout = QtGui.QHBoxLayout()
+# self.csvFileLayout.setSpacing(8)
+# self.csvFileLayout.setObjectName(u'CSVFileLayout')
+# self.csvFilenameEdit = QtGui.QLineEdit(self.csvPage)
+# self.csvFilenameEdit.setObjectName(u'CSVFilenameEdit')
+# self.csvFileLayout.addWidget(self.csvFilenameEdit)
+# self.csvBrowseButton = QtGui.QToolButton(self.csvPage)
+# self.csvBrowseButton.setIcon(openIcon)
+# self.csvBrowseButton.setObjectName(u'CSVBrowseButton')
+# self.csvFileLayout.addWidget(self.csvBrowseButton)
+# self.csvLayout.setLayout(0, QtGui.QFormLayout.FieldRole,
+# self.csvFileLayout)
+# self.formatStackedWidget.addWidget(self.csvPage)
+ self.sourceLayout.addWidget(self.formatStackedWidget)
+ songImportWizard.addPage(self.sourcePage)
+ self.importPage = QtGui.QWizardPage()
+ self.importPage.setObjectName(u'importPage')
+ self.importLayout = QtGui.QVBoxLayout(self.importPage)
+ self.importLayout.setSpacing(8)
+ self.importLayout.setMargin(50)
+ self.importLayout.setObjectName(u'importLayout')
+ self.importProgressLabel = QtGui.QLabel(self.importPage)
+ self.importProgressLabel.setObjectName(u'importProgressLabel')
+ self.importLayout.addWidget(self.importProgressLabel)
+ self.importProgressBar = QtGui.QProgressBar(self.importPage)
+ self.importProgressBar.setProperty(u'value', 0)
+ self.importProgressBar.setInvertedAppearance(False)
+ self.importProgressBar.setObjectName(u'importProgressBar')
+ self.importLayout.addWidget(self.importProgressBar)
+ songImportWizard.addPage(self.importPage)
+ self.retranslateUi(songImportWizard)
+ self.formatStackedWidget.setCurrentIndex(0)
+ QtCore.QObject.connect(self.formatComboBox,
QtCore.SIGNAL(u'currentIndexChanged(int)'),
- self.FormatStackedWidget.setCurrentIndex)
- QtCore.QMetaObject.connectSlotsByName(SongImportWizard)
+ self.formatStackedWidget.setCurrentIndex)
+ QtCore.QMetaObject.connectSlotsByName(songImportWizard)
- def retranslateUi(self, SongImportWizard):
- SongImportWizard.setWindowTitle(
+ def retranslateUi(self, songImportWizard):
+ songImportWizard.setWindowTitle(
translate('SongsPlugin.ImportWizardForm', 'Song Import Wizard'))
- self.TitleLabel.setText(
+ self.titleLabel.setText(
u'%s' % \
translate('SongsPlugin.ImportWizardForm',
'Welcome to the Song Import Wizard'))
- self.InformationLabel.setText(
+ self.informationLabel.setText(
translate('SongsPlugin.ImportWizardForm',
'This wizard will help you to import songs from a variety of '
'formats. Click the next button below to start the process by '
'selecting a format to import from.'))
- self.SourcePage.setTitle(
+ self.sourcePage.setTitle(
translate('SongsPlugin.ImportWizardForm', 'Select Import Source'))
- self.SourcePage.setSubTitle(
+ self.sourcePage.setSubTitle(
translate('SongsPlugin.ImportWizardForm',
'Select the import format, and where to import from.'))
- self.FormatLabel.setText(
+ self.formatLabel.setText(
translate('SongsPlugin.ImportWizardForm', 'Format:'))
- self.FormatComboBox.setItemText(0,
+ self.formatComboBox.setItemText(0,
+ translate('SongsPlugin.ImportWizardForm', 'OpenLP 2.0'))
+ self.formatComboBox.setItemText(1,
+ translate('SongsPlugin.ImportWizardForm', 'openlp.org 1.x'))
+ self.formatComboBox.setItemText(2,
translate('SongsPlugin.ImportWizardForm', 'OpenLyrics'))
- self.FormatComboBox.setItemText(1,
+ self.formatComboBox.setItemText(3,
translate('SongsPlugin.ImportWizardForm', 'OpenSong'))
- self.FormatComboBox.setItemText(2,
- translate('SongsPlugin.ImportWizardForm', 'CCLI'))
- self.FormatComboBox.setItemText(3,
- translate('SongsPlugin.ImportWizardForm', 'CSV'))
- self.OpenLyricsAddButton.setText(
- translate('SongsPlugin.ImportWizardForm', 'Add Files...'))
- self.OpenLyricsRemoveButton.setText(
- translate('SongsPlugin.ImportWizardForm', 'Remove File(s)'))
- self.OpenSongAddButton.setText(
- translate('SongsPlugin.ImportWizardForm', 'Add Files...'))
- self.OpenSongRemoveButton.setText(
- translate('SongsPlugin.ImportWizardForm', 'Remove File(s)'))
- self.CCLIAddButton.setText(
- translate('SongsPlugin.ImportWizardForm', 'Add Files...'))
- self.CCLIRemoveButton.setText(
- translate('SongsPlugin.ImportWizardForm', 'Remove File(s)'))
- self.CSVFilenameLabel.setText(
+ self.formatComboBox.setItemText(4,
+ translate('SongsPlugin.ImportWizardForm', 'Words of Worship'))
+ self.formatComboBox.setItemText(5,
+ translate('SongsPlugin.ImportWizardForm', 'CCLI/SongSelect'))
+ self.formatComboBox.setItemText(6,
+ translate('SongsPlugin.ImportWizardForm', 'Songs of Fellowship'))
+ self.formatComboBox.setItemText(7,
+ translate('SongsPlugin.ImportWizardForm',
+ 'Generic Document/Presentation'))
+# self.formatComboBox.setItemText(8,
+# translate('SongsPlugin.ImportWizardForm', 'CSV'))
+ self.openLP2FilenameLabel.setText(
translate('SongsPlugin.ImportWizardForm', 'Filename:'))
- self.CSVBrowseButton.setText(
+ self.openLP2BrowseButton.setText(
translate('SongsPlugin.ImportWizardForm', 'Browse...'))
- self.ImportPage.setTitle(
+ self.openLP1FilenameLabel.setText(
+ translate('SongsPlugin.ImportWizardForm', 'Filename:'))
+ self.openLP1BrowseButton.setText(
+ translate('SongsPlugin.ImportWizardForm', 'Browse...'))
+ self.openLyricsAddButton.setText(
+ translate('SongsPlugin.ImportWizardForm', 'Add Files...'))
+ self.openLyricsRemoveButton.setText(
+ translate('SongsPlugin.ImportWizardForm', 'Remove File(s)'))
+ self.openSongAddButton.setText(
+ translate('SongsPlugin.ImportWizardForm', 'Add Files...'))
+ self.openSongRemoveButton.setText(
+ translate('SongsPlugin.ImportWizardForm', 'Remove File(s)'))
+ self.wordsOfWorshipAddButton.setText(
+ translate('SongsPlugin.ImportWizardForm', 'Add Files...'))
+ self.wordsOfWorshipRemoveButton.setText(
+ translate('SongsPlugin.ImportWizardForm', 'Remove File(s)'))
+ self.ccliAddButton.setText(
+ translate('SongsPlugin.ImportWizardForm', 'Add Files...'))
+ self.ccliRemoveButton.setText(
+ translate('SongsPlugin.ImportWizardForm', 'Remove File(s)'))
+ self.songsOfFellowshipAddButton.setText(
+ translate('SongsPlugin.ImportWizardForm', 'Add Files...'))
+ self.songsOfFellowshipRemoveButton.setText(
+ translate('SongsPlugin.ImportWizardForm', 'Remove File(s)'))
+ self.genericAddButton.setText(
+ translate('SongsPlugin.ImportWizardForm', 'Add Files...'))
+ self.genericRemoveButton.setText(
+ translate('SongsPlugin.ImportWizardForm', 'Remove File(s)'))
+# self.csvFilenameLabel.setText(
+# translate('SongsPlugin.ImportWizardForm', 'Filename:'))
+# self.csvBrowseButton.setText(
+# translate('SongsPlugin.ImportWizardForm', 'Browse...'))
+ self.importPage.setTitle(
translate('SongsPlugin.ImportWizardForm', 'Importing'))
- self.ImportPage.setSubTitle(
+ self.importPage.setSubTitle(
translate('SongsPlugin.ImportWizardForm',
'Please wait while your songs are imported.'))
- self.ImportProgressLabel.setText(
+ self.importProgressLabel.setText(
translate('SongsPlugin.ImportWizardForm', 'Ready.'))
- self.ImportProgressBar.setFormat(
+ self.importProgressBar.setFormat(
translate('SongsPlugin.ImportWizardForm', '%p%'))
diff --git a/openlp/plugins/songs/forms/songmaintenanceform.py b/openlp/plugins/songs/forms/songmaintenanceform.py
index 83dba85a2..3ba7494c1 100644
--- a/openlp/plugins/songs/forms/songmaintenanceform.py
+++ b/openlp/plugins/songs/forms/songmaintenanceform.py
@@ -88,9 +88,8 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
item = self.songmanager.get_object(item_class, item_id)
if item and len(item.songs) == 0:
if QtGui.QMessageBox.warning(self, dlg_title, del_text,
- QtGui.QMessageBox.StandardButtons(
- QtGui.QMessageBox.No | QtGui.QMessageBox.Yes)
- ) == QtGui.QMessageBox.Yes:
+ QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.No |
+ QtGui.QMessageBox.Yes)) == QtGui.QMessageBox.Yes:
self.songmanager.delete_object(item_class, item.id)
reset_func()
else:
diff --git a/openlp/plugins/songs/lib/__init__.py b/openlp/plugins/songs/lib/__init__.py
index b8f4d9a05..351d50071 100644
--- a/openlp/plugins/songs/lib/__init__.py
+++ b/openlp/plugins/songs/lib/__init__.py
@@ -26,52 +26,6 @@
from openlp.core.lib import translate
-#from openlp.plugins.songs.lib import OpenLyricsSong, OpenSongSong, CCLISong, \
-# CSVSong
-
-class SongFormat(object):
- """
- This is a special enumeration class that holds the various types of songs,
- plus a few helper functions to facilitate generic handling of song types
- for importing.
- """
- Unknown = -1
- OpenLyrics = 0
- OpenSong = 1
- CCLI = 2
- CSV = 3
-
- @staticmethod
- def get_class(format):
- """
- Return the appropriate imeplementation class.
-
- ``format``
- The song format.
- """
-# if format == SongFormat.OpenLyrics:
-# return OpenLyricsSong
-# elif format == SongFormat.OpenSong:
-# return OpenSongSong
-# elif format == SongFormat.CCLI:
-# return CCLISong
-# elif format == SongFormat.CSV:
-# return CSVSong
-# else:
- return None
-
- @staticmethod
- def list():
- """
- Return a list of the supported song formats.
- """
- return [
- SongFormat.OpenLyrics,
- SongFormat.OpenSong,
- SongFormat.CCLI,
- SongFormat.CSV
- ]
-
class VerseType(object):
"""
VerseType provides an enumeration for the tags that may be associated
@@ -138,14 +92,7 @@ class VerseType(object):
unicode(VerseType.to_string(VerseType.Other)).lower():
return VerseType.Other
+
from xml import LyricsXML, SongXMLBuilder, SongXMLParser
from songstab import SongsTab
from mediaitem import SongMediaItem
-from songimport import SongImport
-from opensongimport import OpenSongImport
-from olpimport import OpenLPSongImport
-try:
- from sofimport import SofImport
- from oooimport import OooImport
-except ImportError:
- pass
diff --git a/openlp/plugins/songs/lib/importer.py b/openlp/plugins/songs/lib/importer.py
new file mode 100644
index 000000000..7410a5184
--- /dev/null
+++ b/openlp/plugins/songs/lib/importer.py
@@ -0,0 +1,87 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2010 Raoul Snyman #
+# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
+# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
+# Carsten Tinggaard, Frode Woldsund #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it #
+# under the terms of the GNU General Public License as published by the Free #
+# Software Foundation; version 2 of the License. #
+# #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for #
+# more details. #
+# #
+# You should have received a copy of the GNU General Public License along #
+# with this program; if not, write to the Free Software Foundation, Inc., 59 #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+###############################################################################
+
+from opensongimport import OpenSongImport
+from olpimport import OpenLPSongImport
+try:
+ from sofimport import SofImport
+ from oooimport import OooImport
+except ImportError:
+ pass
+
+class SongFormat(object):
+ """
+ This is a special enumeration class that holds the various types of songs,
+ plus a few helper functions to facilitate generic handling of song types
+ for importing.
+ """
+ Unknown = -1
+ OpenLP2 = 0
+ OpenLP1 = 1
+ OpenLyrics = 2
+ OpenSong = 3
+ WordsOfWorship = 4
+ CCLI = 5
+ SongsOfFellowship = 6
+ Generic = 7
+ CSV = 8
+
+ @staticmethod
+ def get_class(format):
+ """
+ Return the appropriate imeplementation class.
+
+ ``format``
+ The song format.
+ """
+ if format == SongFormat.OpenLP2:
+ return OpenLPSongImport
+ elif format == SongFormat.OpenSong:
+ return OpenSongImport
+ elif format == SongFormat.SongsOfFellowship:
+ return SofImport
+ elif format == SongFormat.Generic:
+ return OooImport
+# else:
+ return None
+
+ @staticmethod
+ def list():
+ """
+ Return a list of the supported song formats.
+ """
+ return [
+ SongFormat.OpenLP2,
+ SongFormat.OpenLP1,
+ SongFormat.OpenLyrics,
+ SongFormat.OpenSong,
+ SongFormat.WordsOfWorship,
+ SongFormat.CCLI,
+ SongFormat.SongsOfFellowship,
+ SongFormat.Generic
+ ]
+
+__all__ = [u'SongFormat']
diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py
index f90136601..85ba1cf06 100644
--- a/openlp/plugins/songs/lib/mediaitem.py
+++ b/openlp/plugins/songs/lib/mediaitem.py
@@ -236,9 +236,10 @@ class SongMediaItem(MediaManagerItem):
self.onSearchTextButtonClick()
def onImportClick(self):
- songimportform = ImportWizardForm(self, self.parent.manager,
- self.parent)
- songimportform.exec_()
+ if not hasattr(self, u'import_wizard'):
+ self.import_wizard = ImportWizardForm(self, self.parent)
+ self.import_wizard.exec_()
+ Receiver.send_message(u'songs_load_list')
def onNewClick(self):
self.edit_song_form.newSong()
diff --git a/openlp/plugins/songs/lib/olpimport.py b/openlp/plugins/songs/lib/olpimport.py
index eb19b67ee..a4c15718e 100644
--- a/openlp/plugins/songs/lib/olpimport.py
+++ b/openlp/plugins/songs/lib/olpimport.py
@@ -36,6 +36,7 @@ from sqlalchemy.orm.exc import UnmappedClassError
from openlp.core.lib.db import BaseModel
from openlp.plugins.songs.lib.db import Author, Book, Song, Topic #, MediaFile
+from songimport import SongImport
log = logging.getLogger(__name__)
@@ -69,12 +70,12 @@ class OldTopic(BaseModel):
"""
pass
-class OpenLPSongImport(object):
+class OpenLPSongImport(SongImport):
"""
The :class:`OpenLPSongImport` class provides OpenLP with the ability to
import song databases from other installations of OpenLP.
"""
- def __init__(self, master_manager, source_db):
+ def __init__(self, master_manager, **kwargs):
"""
Initialise the import.
@@ -84,11 +85,13 @@ class OpenLPSongImport(object):
``source_db``
The database providing the data to import.
"""
+ SongImport.__init__(self, master_manager)
self.master_manager = master_manager
- self.import_source = source_db
+ self.import_source = u'sqlite:///%s' % kwargs[u'filename']
+ log.debug(self.import_source)
self.source_session = None
- def import_source_v2_db(self):
+ def do_import(self):
"""
Run the import for an OpenLP version 2 song database.
"""
diff --git a/openlp/plugins/songs/lib/songimport.py b/openlp/plugins/songs/lib/songimport.py
index 0456e1e06..81c2d08e2 100644
--- a/openlp/plugins/songs/lib/songimport.py
+++ b/openlp/plugins/songs/lib/songimport.py
@@ -27,8 +27,9 @@
import re
from openlp.core.lib import translate
-from openlp.plugins.songs.lib import SongXMLBuilder, VerseType
+from openlp.plugins.songs.lib import VerseType
from openlp.plugins.songs.lib.db import Song, Author, Topic, Book
+from openlp.plugins.songs.lib.xml import SongXMLBuilder
class SongImport(object):
"""
@@ -39,14 +40,14 @@ class SongImport(object):
as necessary
"""
- def __init__(self, song_manager):
+ def __init__(self, manager):
"""
Initialise and create defaults for properties
song_manager is an instance of a SongManager, through which all
database access is performed
"""
- self.manager = song_manager
+ self.manager = manager
self.title = u''
self.song_number = u''
self.alternate_title = u''
@@ -67,6 +68,9 @@ class SongImport(object):
self.copyright_symbol = unicode(translate(
'SongsPlugin.SongImport', '\xa9'))
+ def register(self, import_wizard):
+ self.import_wizard = import_wizard
+
@staticmethod
def process_songs_text(manager, text):
songs = []
diff --git a/openlp/plugins/songs/songsplugin.py b/openlp/plugins/songs/songsplugin.py
index c09e7a1bb..0064be23a 100644
--- a/openlp/plugins/songs/songsplugin.py
+++ b/openlp/plugins/songs/songsplugin.py
@@ -28,18 +28,11 @@ import logging
from PyQt4 import QtCore, QtGui
-from openlp.core.lib import Plugin, build_icon, Receiver, translate
+from openlp.core.lib import Plugin, build_icon, translate
from openlp.core.lib.db import Manager
-from openlp.plugins.songs.lib import OpenLPSongImport, SongMediaItem, SongsTab
+from openlp.plugins.songs.lib import SongMediaItem, SongsTab
from openlp.plugins.songs.lib.db import init_schema, Song
-
-try:
- from openlp.plugins.songs.lib import SofImport, OooImport
- OOo_available = True
-except ImportError:
- OOo_available = False
-
-from openlp.plugins.songs.lib import OpenSongImport
+from openlp.plugins.songs.lib.importer import SongFormat
log = logging.getLogger(__name__)
@@ -99,76 +92,6 @@ class SongsPlugin(Plugin):
# Signals and slots
QtCore.QObject.connect(self.SongImportItem,
QtCore.SIGNAL(u'triggered()'), self.onSongImportItemClicked)
- if OOo_available:
- # Songs of Fellowship import menu item - will be removed and the
- # functionality will be contained within the import wizard
- self.ImportSofItem = QtGui.QAction(import_menu)
- self.ImportSofItem.setObjectName(u'ImportSofItem')
- self.ImportSofItem.setText(
- translate('SongsPlugin',
- 'Songs of Fellowship (temp menu item)'))
- self.ImportSofItem.setToolTip(
- translate('SongsPlugin',
- 'Import songs from the VOLS1_2.RTF, sof3words' \
- + '.rtf and sof4words.rtf supplied with the music books'))
- self.ImportSofItem.setStatusTip(
- translate('SongsPlugin',
- 'Import songs from the VOLS1_2.RTF, sof3words' \
- + '.rtf and sof4words.rtf supplied with the music books'))
- import_menu.addAction(self.ImportSofItem)
- # OpenOffice.org import menu item - will be removed and the
- # functionality will be contained within the import wizard
- self.ImportOooItem = QtGui.QAction(import_menu)
- self.ImportOooItem.setObjectName(u'ImportOooItem')
- self.ImportOooItem.setText(
- translate('SongsPlugin',
- 'Generic Document/Presentation Import '
- '(temp menu item)'))
- self.ImportOooItem.setToolTip(
- translate('SongsPlugin',
- 'Import songs from '
- 'Word/Writer/Powerpoint/Impress'))
- self.ImportOooItem.setStatusTip(
- translate('SongsPlugin',
- 'Import songs from '
- 'Word/Writer/Powerpoint/Impress'))
- import_menu.addAction(self.ImportOooItem)
- # Signals and slots
- QtCore.QObject.connect(self.ImportSofItem,
- QtCore.SIGNAL(u'triggered()'), self.onImportSofItemClick)
- QtCore.QObject.connect(self.ImportOooItem,
- QtCore.SIGNAL(u'triggered()'), self.onImportOooItemClick)
- # OpenSong import menu item - will be removed and the
- # functionality will be contained within the import wizard
- self.ImportOpenSongItem = QtGui.QAction(import_menu)
- self.ImportOpenSongItem.setObjectName(u'ImportOpenSongItem')
- self.ImportOpenSongItem.setText(
- translate('SongsPlugin',
- 'OpenSong (temp menu item)'))
- self.ImportOpenSongItem.setToolTip(
- translate('SongsPlugin',
- 'Import songs from OpenSong files' +
- '(either raw text or ZIPfiles)'))
- self.ImportOpenSongItem.setStatusTip(
- translate('SongsPlugin',
- 'Import songs from OpenSong files' +
- '(either raw text or ZIPfiles)'))
- import_menu.addAction(self.ImportOpenSongItem)
- QtCore.QObject.connect(self.ImportOpenSongItem,
- QtCore.SIGNAL(u'triggered()'), self.onImportOpenSongItemClick)
- # OpenLP v2 import menu item - ditto above regarding refactoring into
- # an import wizard
- self.ImportOpenLPSongItem = QtGui.QAction(import_menu)
- self.ImportOpenLPSongItem.setObjectName(u'ImportOpenLPSongItem')
- self.ImportOpenLPSongItem.setText(translate('SongsPlugin',
- 'OpenLP v2 Songs (temporary)'))
- self.ImportOpenLPSongItem.setToolTip(translate('SongsPlugin',
- 'Import an OpenLP v2 song database'))
- self.ImportOpenLPSongItem.setStatusTip(translate('SongsPlugin',
- 'Import an OpenLP v2 song database'))
- import_menu.addAction(self.ImportOpenLPSongItem)
- QtCore.QObject.connect(self.ImportOpenLPSongItem,
- QtCore.SIGNAL(u'triggered()'), self.onImportOpenLPSongItemClick)
def addExportMenuItem(self, export_menu):
"""
@@ -186,68 +109,6 @@ class SongsPlugin(Plugin):
if self.mediaItem:
self.mediaItem.onImportClick()
- def onImportSofItemClick(self):
- filenames = QtGui.QFileDialog.getOpenFileNames(
- None, translate('SongsPlugin',
- 'Open Songs of Fellowship file'),
- u'', u'Songs of Fellowship file (*.rtf *.RTF)')
- try:
- for filename in filenames:
- sofimport = SofImport(self.manager)
- sofimport.import_sof(unicode(filename))
- except:
- log.exception('Could not import SoF file')
- QtGui.QMessageBox.critical(None,
- translate('SongsPlugin', 'Import Error'),
- translate('SongsPlugin', 'Error importing Songs of '
- 'Fellowship file.\nOpenOffice.org must be installed'
- ' and you must be using an unedited copy of the RTF'
- ' included with the Songs of Fellowship Music Editions'))
- Receiver.send_message(u'songs_load_list')
-
- def onImportOpenSongItemClick(self):
- filenames = QtGui.QFileDialog.getOpenFileNames(
- None, translate('SongsPlugin',
- 'Open OpenSong file'),
- u'', u'All files (*.*)')
- try:
- for filename in filenames:
- importer = OpenSongImport(self.manager)
- importer.do_import(unicode(filename))
- except:
- log.exception('Could not import OpenSong file')
- QtGui.QMessageBox.critical(None,
- translate('SongsPlugin', 'Import Error'),
- translate('SongsPlugin', 'Error importing OpenSong file'))
- Receiver.send_message(u'songs_load_list')
-
- def onImportOpenLPSongItemClick(self):
- filenames = QtGui.QFileDialog.getOpenFileNames(None,
- translate('SongsPlugin', 'Select OpenLP database(s) to import...'),
- u'', u'OpenLP databases (*.sqlite);;All Files (*)')
- try:
- for filename in filenames:
- db_url = u'sqlite:///%s' % filename
- importer = OpenLPSongImport(self.manager, db_url)
- importer.import_source_v2_db()
- QtGui.QMessageBox.information(None, translate('SongsPlugin',
- 'Database(s) imported'), translate('SongsPlugin', 'Your '
- 'OpenLP v2 song databases have been successfully imported'))
- except:
- log.exception(u'Failed to import OpenLP v2 database(s)')
- QtGui.QMessageBox.critical(None, translate('SongsPlugin',
- 'Import Error'), translate('SongsPlugin',
- 'Error importing OpenLP v2 database(s)'))
- Receiver.send_message(u'songs_load_list')
-
- def onImportOooItemClick(self):
- filenames = QtGui.QFileDialog.getOpenFileNames(
- None, translate('SongsPlugin', 'Open documents or presentations'),
- '', u'All Files(*.*)')
- oooimport = OooImport(self.manager)
- oooimport.import_docs(filenames)
- Receiver.send_message(u'songs_load_list')
-
def about(self):
about_text = translate('SongsPlugin', 'Songs Plugin'
'
The songs plugin provides the ability to display and '
@@ -280,3 +141,9 @@ class SongsPlugin(Plugin):
for song in songsUsingTheme:
song.theme_name = newTheme
self.custommanager.save_object(song)
+
+ def importSongs(self, format, **kwargs):
+ class_ = SongFormat.get_class(format)
+ importer = class_(self.manager, **kwargs)
+ importer.register(self.mediaItem.import_wizard)
+ return importer
diff --git a/resources/i18n/openlp_af.ts b/resources/i18n/openlp_af.ts
index b41fe2f51..47853ca2e 100644
--- a/resources/i18n/openlp_af.ts
+++ b/resources/i18n/openlp_af.ts
@@ -3,17 +3,17 @@
AlertsPlugin
-
+
W&aarskuwing
-
+
-
+
@@ -21,57 +21,57 @@
AlertsPlugin.AlertForm
-
+
Waarskuwing Boodskap
-
+
-
+
-
+
&Nuwe
-
+
&Stoor
-
+
-
+
-
+
-
+
-
+
-
+
@@ -79,7 +79,7 @@
AlertsPlugin.AlertsManager
-
+
@@ -87,77 +87,77 @@
AlertsPlugin.AlertsTab
-
+
Waarskuwings
-
+
Skrif
-
+
-
+
-
+
-
+
-
+
pt
-
+
Waarskuwing tydgrens:
-
+
s
-
+
Ligging:
-
+
Voorskou
-
+
OpenLP 2.0
-
+
-
+
Middel
-
+
Onder
@@ -165,12 +165,12 @@
BiblesPlugin
-
+
&Bybel
-
+
@@ -178,91 +178,112 @@
BiblesPlugin.BibleDB
-
+
-
+
+
+ BiblesPlugin.BibleManager
+
+
+
+
+
+
+
+
+
+
+
BiblesPlugin.BiblesTab
-
+
Bybels
-
+
Vers Vertoning
-
+
Vertoon net nuwe hoofstuk nommers
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -270,167 +291,167 @@ Changes do not affect verses already in the service.
BiblesPlugin.ImportWizardForm
-
+
Bybel Invoer Gids
-
+
Welkom by die Bybel Invoer Gids
-
+
Hierdie gids sal u help om Bybels van 'n verskeidenheid vormate in te voer. Kliek die volgende knoppie hieronder om die proses te begin en 'n formaat te kies om in te voer.
-
+
Selekteer Invoer Bron
-
+
Selekteer die invoer formaat en van waar af om in te voer.
-
+
Formaat:
-
+
OSIS
-
+
KGW
-
+
OpenSong
-
+
Web Aflaai
-
+
-
+
-
+
-
+
-
+
Ligging:
-
+
Cosswalk
-
+
BibleGateway
-
+
Bybel:
-
+
Aflaai Opsies
-
+
Bediener:
-
+
Gebruikersnaam:
-
+
Wagwoord:
-
+
Tussenganger Bediener (Opsioneel)
-
+
Lisensie Besonderhede
-
+
Stel hierdie Bybel se lisensie besonderhede op.
-
+
-
+
Kopiereg:
-
+
Toestemming:
-
+
Invoer
-
+
Wag asseblief terwyl u Bybel ingevoer word.
-
+
Gereed.
-
+
Ongeldige Bybel Ligging
-
+
@@ -445,87 +466,87 @@ Changes do not affect verses already in the service.
-
+
Ongeldige Vers Lêer
-
+
-
+
Ongeldige OpenSong Bybel
-
+
-
+
Weergawe Naam is Leeg
-
+
-
+
Leë Kopiereg
-
+
Stel Kopiereg op vir die spesifieke Bybel! Bybels in die Publieke Omgewing moet so gemerk word.
-
+
Bybel Bestaan
-
+
Dié Bybel bestaan reeds! Voer asseblief 'n ander Bybel in of wis die eerste een uit.
-
+
-
+
-
+
-
+
Maak OpenSong Bybel Oop
-
+
Invoer begin...
-
+
Invoer voltooi.
-
+
U Bybel invoer het misluk.
@@ -533,112 +554,112 @@ Changes do not affect verses already in the service.
BiblesPlugin.MediaItem
-
+
Bybel
-
+
Vinnig
-
+
Gevorderd
-
+
Weergawe:
-
+
Dubbel:
-
+
-
+
Vind:
-
+
Soek
-
+
&Resultate:
-
+
Boek:
-
+
Hoofstuk:
-
+
Vers:
-
+
Vanaf:
-
+
Aan:
-
+
Soek Vers
-
+
Teks Soektog
-
+
-
+
Behou
-
+
Geeb Boek Gevind nie
-
+
Geen bypassende boek kon in dié Bybel gevind word nie.
-
+
-
+
@@ -646,7 +667,7 @@ Changes do not affect verses already in the service.
BiblesPlugin.Opensong
-
+
Invoer
@@ -662,17 +683,17 @@ Changes do not affect verses already in the service.
CustomPlugin.CustomTab
-
+
-
+
Aangepasde Vertoning
-
+
@@ -680,112 +701,112 @@ Changes do not affect verses already in the service.
CustomPlugin.EditCustomForm
-
+
Redigeer Aangepaste Skyfies
-
-
+
+
-
+
-
+
-
+
Voeg Nuwe By
-
+
-
+
Redigeer
-
+
-
+
Redigeer Alles
-
+
-
+
Stoor
-
+
-
+
-
+
-
+
-
+
Maak skoon die redigeer area
-
+
-
+
-
+
-
+
-
+
Stoor && Voorskou
-
+
Fout
@@ -808,17 +829,17 @@ Changes do not affect verses already in the service.
CustomPlugin.MediaItem
-
+
-
+
-
+
@@ -826,78 +847,55 @@ Changes do not affect verses already in the service.
ImagePlugin
-
+
-
- ImagePlugin.ImageTab
-
-
-
- Beelde
-
-
-
-
- Beeld Verstellings
-
-
-
-
-
-
-
-
-
- sec
-
-
ImagePlugin.MediaItem
-
+
Beeld
-
+
Selekteer beeld(e)
-
+
-
+
-
+
-
+
-
+
Beeld(e)
-
+
-
+
@@ -913,27 +911,27 @@ Changes do not affect verses already in the service.
MediaPlugin.MediaItem
-
+
Media
-
+
Selekteer Media
-
+
-
+
-
+
@@ -941,7 +939,7 @@ Changes do not affect verses already in the service.
OpenLP
-
+
@@ -949,12 +947,12 @@ Changes do not affect verses already in the service.
OpenLP.AboutForm
-
+
Aangaande OpenLP
-
+
-
+
Aangaande
-
+
-
+
Krediete
-
+
-
+
Lisensie
-
+
Dra By
-
+
Maak toe
-
+
@@ -1166,27 +1173,27 @@ This General Public License does not permit incorporating your program into prop
OpenLP.AdvancedTab
-
+
Gevorderd
-
+
-
+
-
+
-
+
@@ -1194,317 +1201,317 @@ This General Public License does not permit incorporating your program into prop
OpenLP.AmendThemeForm
-
+
Tema Onderhoud
-
+
-
+
-
+
Deursigtigheid
-
+
Deursigtig
-
+
Tipe:
-
+
Soliede Kleur
-
+
Gradiënt
-
+
Beeld
-
+
Beeld:
-
+
-
+
Horisontaal
-
+
Vertikaal
-
+
Sirkelvormig
-
+
-
+
Hoof Skrif
-
+
Skrif:
-
+
-
+
Grootte:
-
+
pt
-
+
-
+
-
+
Normaal
-
+
Vetgedruk
-
+
Kursief
-
+
Bold/Italics
-
+
-
+
Vertoon Ligging
-
+
-
+
-
+
-
+
Wydte:
-
+
Hoogte:
-
+
px
-
+
-
+
Voetnota Skriftipe
-
+
-
+
Buitelyn
-
+
-
+
-
+
-
+
Skaduwee
-
+
-
+
-
+
-
+
Belyning
-
+
-
+
Links
-
+
Regs
-
+
Middel
-
+
-
+
-
+
Middel
-
+
Onder
-
+
Skyfie Verandering
-
+
-
+
-
+
Voorskou
-
+
-
+
-
+
-
+
-
+
@@ -1512,117 +1519,127 @@ This General Public License does not permit incorporating your program into prop
OpenLP.GeneralTab
-
+
Algemeen
-
+
Monitors
-
+
Selekteer monitor vir uitgaande vertoning:
-
+
-
+
Program Aanskakel
-
+
Vertoon leë skerm waarskuwing
-
+
Maak vanself die laaste diens oop
-
+
Wys die spatsel skerm
-
+
Program Verstellings
-
-
- Bevestig om Diens te stoor voor 'n Nuwe een begin word
-
-
-
-
- Sien Voorskou van Volgende Lied vanaf Diens Bestuurder
-
-
-
-
- CCLI Inligting
-
-
-
-
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ CCLI Inligting
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
Skerm
-
+
primêre
@@ -1630,12 +1647,12 @@ This General Public License does not permit incorporating your program into prop
OpenLP.LanguageManager
-
+
-
+
@@ -1643,414 +1660,414 @@ This General Public License does not permit incorporating your program into prop
OpenLP.MainWindow
-
+
OpenLP 2.0
-
+
Engels
-
+
&Lêer
-
+
&Invoer
-
+
&Uitvoer
-
+
&Bekyk
-
+
M&odus
-
+
&Gereedskap
-
+
Ver&stellings
-
+
Taa&l
-
+
&Hulp
-
+
Media Bestuurder
-
+
Diens Bestuurder
-
+
Tema Bestuurder
-
+
&Nuwe
-
+
Nuwe Diens
-
+
-
+
Ctrl+N
-
+
Maak &Oop
-
+
Maak Diens Oop
-
+
-
+
Ctrl+O
-
+
&Stoor
-
+
Stoor Diens
-
+
-
+
Ctrl+S
-
+
Stoor &As...
-
+
Stoor Diens As
-
+
-
+
-
+
&Uitgang
-
+
Sluit OpenLP Af
-
+
Alt+F4
-
+
&Tema
-
+
-
+
&Media Bestuurder
-
+
Wissel Media Bestuurder
-
+
-
+
F8
-
+
&Tema Bestuurder
-
+
Wissel Tema Bestuurder
-
+
-
+
F10
-
+
&Diens Bestuurder
-
+
Wissel Diens Bestuurder
-
+
-
+
F9
-
+
&Voorskou Paneel
-
+
Wissel Voorskou Paneel
-
+
-
+
F11
-
+
-
+
-
+
-
+
F12
-
+
In&prop Lys
-
+
Lys die Inproppe
-
+
Alt+F7
-
+
&Gebruikers Gids
-
+
&Aangaande
-
+
Meer inligting aangaande OpenLP
-
+
Ctrl+F1
-
+
&Aanlyn Hulp
-
+
&Web Tuiste
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
&Regstreeks
-
+
-
+
-
+
OpenLP Weergawe is Opdateer
-
+
OpenLP Hoof Vertoning Blanko
-
+
Die Hoof Skerm is blanko
-
+
-
+
-
+
@@ -2058,157 +2075,157 @@ You can download the latest version from <a href="http://openlp.org/&quo
OpenLP.MediaManagerItem
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
Wis geselekteerde item uit
-
+
-
+
Voorskou die geselekteerde item
-
+
Stuur die geselekteerde item na regstreekse vertoning
-
+
-
+
Voeg die geselekteerde item(s) by die diens
-
+
-
+
-
+
-
+
&Vertoon Regstreeks
-
+
&Voeg by Diens
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2216,57 +2233,57 @@ You can download the latest version from <a href="http://openlp.org/&quo
OpenLP.PluginForm
-
+
Inprop Lys
-
+
Inprop Besonderhede
-
+
Weergawe:
-
+
TeksEtiket
-
+
Aangaande:
-
+
Status:
-
+
Aktief
-
+
Onaktief
-
+
-
+
-
+
@@ -2274,22 +2291,22 @@ You can download the latest version from <a href="http://openlp.org/&quo
OpenLP.ServiceItemEditForm
-
+
-
+
-
+
-
+
@@ -2297,12 +2314,12 @@ You can download the latest version from <a href="http://openlp.org/&quo
OpenLP.ServiceManager
-
+
Nuwe Diens
-
+
Skep 'n nuwe diens
@@ -2312,7 +2329,7 @@ You can download the latest version from <a href="http://openlp.org/&quo
Maak Diens Oop
-
+
Laai 'n bestaande diens
@@ -2322,107 +2339,107 @@ You can download the latest version from <a href="http://openlp.org/&quo
Stoor Diens
-
+
Stoor hierdie diens
-
+
Tema:
-
+
Selekteer 'n tema vir die diens
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
R&edigeer Item
-
+
-
+
&Notas
-
+
Vers V&oorsig
-
+
&Lewendige Vers
-
+
&Verander Item Tema
@@ -2432,7 +2449,7 @@ You can download the latest version from <a href="http://openlp.org/&quo
-
+
@@ -2447,28 +2464,28 @@ You can download the latest version from <a href="http://openlp.org/&quo
-
+
Fout
-
+
-
+
-
+
-
+
@@ -2476,7 +2493,7 @@ The content encoding is not UTF-8.
OpenLP.ServiceNoteForm
-
+
Diens Item Notas
@@ -2484,7 +2501,7 @@ The content encoding is not UTF-8.
OpenLP.SettingsForm
-
+
@@ -2492,77 +2509,77 @@ The content encoding is not UTF-8.
OpenLP.SlideController
-
+
Regstreeks
-
+
Voorskou
-
+
Verskuif na eerste
-
+
Beweeg na vorige
-
+
Verskuif na volgende
-
+
Verskuif na laaste posisie
-
+
-
+
Verskuif na regstreekse skerm
-
+
Redigeer en sien weer 'n voorskou van die Lied
-
+
Begin aaneenlopende lus
-
+
Stop deurlopende lus
-
+
s
-
+
Vertraging in sekondes tussen skyfies
-
+
Begin media speel
-
+
Gaan na Vers
@@ -2575,67 +2592,67 @@ The content encoding is not UTF-8.
Nuwe Tema
-
+
-
+
Wysig Tema
-
+
-
+
Wis Tema Uit
-
+
-
+
Tema Invoer
-
+
-
+
Voer Tema Uit
-
+
-
+
-
+
-
+
-
+
@@ -2645,22 +2662,22 @@ The content encoding is not UTF-8.
-
+
-
+
-
+
-
+
@@ -2670,7 +2687,7 @@ The content encoding is not UTF-8.
Fout
-
+
@@ -2749,47 +2766,47 @@ The content encoding is not UTF-8.
OpenLP.ThemesTab
-
+
Temas
-
+
-
+
-
+
-
+
Gebruik die tema van elke lied in die lied-databasis. As 'n lied nie 'n geassosieërde tema het nie, gebruik die diens se tema. As die diens nie 'n tema het nie, gebruik dan die globale tema.
-
+
-
+
Gebruik die tema van die diens en verplaas enige van die individuele liedere se temas. As die diens nie 'n tema het nie, gebruik dan die globale tema.
-
+
-
+
Gebruik die globale tema om enige temas wat met die diens of liedere geassosieer is te vervang.
@@ -2797,7 +2814,7 @@ The content encoding is not UTF-8.
PresentationPlugin
-
+
@@ -2805,17 +2822,17 @@ The content encoding is not UTF-8.
PresentationPlugin.MediaItem
-
+
Aanbieding
-
+
Selekteer Aanbieding(e)
-
+
@@ -2835,17 +2852,17 @@ The content encoding is not UTF-8.
'n Voorstelling met daardie lêernaam bestaan reeds.
-
+
-
+
-
+
@@ -2853,22 +2870,22 @@ The content encoding is not UTF-8.
PresentationPlugin.PresentationTab
-
+
Aanbiedinge
-
+
Beskikbare Beheerders
-
+
-
+ Gevorderd
-
+
@@ -2876,30 +2893,30 @@ The content encoding is not UTF-8.
RemotePlugin
-
-
+
+
RemotePlugin.RemoteTab
-
+
Afstandbehere
-
+
-
+
-
+
@@ -2907,27 +2924,27 @@ The content encoding is not UTF-8.
SongUsagePlugin
-
+
-
+
-
+
-
+
-
+
@@ -2942,7 +2959,7 @@ The content encoding is not UTF-8.
-
+
@@ -2950,154 +2967,63 @@ The content encoding is not UTF-8.
SongUsagePlugin.SongUsageDeleteForm
-
+
+
+
+
+
+
-
+
-
-
-
-
-
SongUsagePlugin.SongUsageDetailForm
-
-
- Uitvoer Lêer Ligging
-
-
-
+
-
+
-
+
aan
-
+
Rapporteer Ligging
+
+
+
+ Uitvoer Lêer Ligging
+
SongsPlugin
-
+
&Lied
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -3105,32 +3031,32 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
SongsPlugin.AuthorsForm
-
+
Skrywer Onderhoud
-
+
Vertoon naam:
-
+
Voornaam:
-
+
Van:
-
+
Fout
-
+
U moet die naam van die skrywer invul.
@@ -3140,7 +3066,7 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
U moet ten minste die skrywer se naam invoer.
-
+
@@ -3148,152 +3074,167 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
SongsPlugin.EditSongForm
-
+
Lied Redigeerder
-
+
-
+
+
+
+
+
+
-
+
+
+
+
+
+
-
+
R&edigeer
-
+
-
+
-
+
Titel && Lirieke
-
+
Skrywers
-
+
&Voeg by Lied
-
+
&Verwyder
-
+
-
+
Onderwerp
-
+
Voeg by Lie&d
-
+
V&erwyder
-
+
Lied Boek
-
+
-
+
Tema
-
+
-
+
Kopiereg Informasie
-
+
-
+
+
+
+
+
+
Kommentaar
-
+
Tema, Kopiereg Informasie && Kommentaar
-
+
Stoor && Voorskou
-
+
-
+
-
+
Fout
-
+
-
+
-
+
@@ -3323,75 +3264,60 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
SongsPlugin.EditVerseForm
-
+
Redigeer Vers
-
+
-
+
@@ -3399,137 +3325,232 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
SongsPlugin.ImportWizardForm
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Invoer begin...
-
+
-
+
-
+
-
+
Selekteer Invoer Bron
-
+
Selekteer die invoer formaat en van waar af om in te voer.
-
+
Formaat:
-
+
+
+ OpenLP 2.0
+
+
+
+
+
+
+
+
-
+
OpenSong
-
-
+
+
-
-
- KGW
-
-
-
-
+
+
-
-
+
+
-
+
+
+
+
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
Invoer
-
+
-
+
Gereed.
-
+
@@ -3537,110 +3558,110 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
SongsPlugin.MediaItem
-
+
Lied
-
+
Lied Onderhoud
-
+
Handhaaf die lys van skrywers, onderwerpe en boeke
-
+
Soek:
-
+
Tipe:
-
+
-
+
Soek
-
+
Titels
-
+
-
+
Skrywers
-
+
-
+
-
-
- CCLI Lisensie:
-
-
-
+
-
+
-
+
+
+
+
+ CCLI Lisensie:
+
SongsPlugin.SongBookForm
-
+
-
+
-
+
-
+
Fout
-
+
@@ -3648,160 +3669,173 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
SongsPlugin.SongImport
-
+
-
+
+
+ SongsPlugin.SongImportForm
+
+
+
+ Invoer voltooi.
+
+
+
+
+
+
+
SongsPlugin.SongMaintenanceForm
-
+
Lied Onderhoud
-
+
Skrywers
-
+
Onderwerpe
-
+
-
+
-
+
R&edigeer
-
+
-
+
Fout
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
Wis Skrywer Uit
-
+
Is u seker u wil die geselekteerde skrywer uitwis?
-
+
-
+
Geen skrywer geselekteer nie!
-
+
Wis Onderwerp Uit
-
+
Is u seker u wil die geselekteerde onderwerp uitwis?
-
+
-
+
Geen onderwerp geselekteer nie!
-
+
Wis Boek Uit
-
+
Is jy seker jy wil die geselekteerde boek uitwis?
-
+
-
+
Geen boek geselekteer nie!
@@ -3809,22 +3843,22 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
SongsPlugin.SongsTab
-
+
Liedere
-
+
Liedere Modus
-
+
-
+
@@ -3832,22 +3866,22 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
SongsPlugin.TopicsForm
-
+
Onderwerp Onderhoud
-
+
Onderwerp naam:
-
+
Fout
-
+
U moet 'n onderwerp naam invoer!
@@ -3855,37 +3889,37 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
SongsPlugin.VerseType
-
+
Vers
-
+
Koor
-
+
Brug
-
+
Voor-Refrein
-
+
Inleiding
-
+
Slot
-
+
Ander
diff --git a/resources/i18n/openlp_de.ts b/resources/i18n/openlp_de.ts
index 022a1a412..d805db01c 100644
--- a/resources/i18n/openlp_de.ts
+++ b/resources/i18n/openlp_de.ts
@@ -1,654 +1,675 @@
-
+
AlertsPlugin
-
+
- &Hinweis
+ &Hinweis
-
+
-
+
-
+
-
+
AlertsPlugin.AlertForm
-
+
- Hinweis
+ Hinweis
-
+
-
+
-
+
-
+
-
+
&Neu
-
+
&Speichern
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
AlertsPlugin.AlertsManager
-
+
-
+
AlertsPlugin.AlertsTab
-
+
- Hinweise
+ Hinweise
-
+
- Schrift
+ Schrift
-
+
- pt
+ pt
-
+
- Anzeigedauer:
+ Anzeigedauer:
-
+
- s
+ s
-
+
-
+
-
+
Vorschau
-
+
Oben
-
+
Unten
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- OpenLP 2.0
+ OpenLP 2.0
-
+
- Mittig
+ Mittig
BiblesPlugin
-
+
- &Bibel
+ &Bibel
-
+
-
+
BiblesPlugin.BibleDB
-
+
-
+
-
+
-
+
+
+
+
+ BiblesPlugin.BibleManager
+
+
+
+
+
+
+
+
+
BiblesPlugin.BiblesTab
-
+
- Bibeln
+ Bibeln
-
+
- Bibelstellenanzeige
+ Bibelstellenanzeige
-
+
- Zeige nur neue Kapitelnummern
+ Zeige nur neue Kapitelnummern
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
BiblesPlugin.ImportWizardForm
-
+
- Bibel Import Assistent
+ Bibel Import Assistent
-
+
- Willkommen beim Bibel Import Assistenten
+ Willkommen beim Bibel Import Assistenten
-
+
- Dieser Assistent hilft ihnen beim Importieren von Bibeln aus verschiedenen Formaten. Klicken Sie auf Weiter, um den Assistenten zu starten.
+ Dieser Assistent hilft ihnen beim Importieren von Bibeln aus verschiedenen Formaten. Klicken Sie auf Weiter, um den Assistenten zu starten.
-
+
- Importquelle auswählen
+ Importquelle auswählen
-
+
- Wähle das Import Format und woher der Import erfolgen soll.
+ Wähle das Import Format und woher der Import erfolgen soll.
-
+
- Format:
+ Format:
-
+
- OSIS
+ OSIS
-
+
- CSV
+ CSV
-
+
- OpenSong
+ OpenSong
-
+
- Internetdownload
+ Internetdownload
-
+
-
+
-
+
- Crosswalk
+ Crosswalk
-
+
- BibleGateway
+ BibleGateway
-
+
- Bibel:
+ Bibel:
-
+
- Download Optionen
+ Download Optionen
-
+
- Server:
+ Server:
-
+
- Benutzername:
+ Benutzername:
-
+
- Passwort:
+ Passwort:
-
+
- Proxy-Server (optional)
+ Proxy-Server (optional)
-
+
- Lizenz-Details
+ Lizenz-Details
-
+
- Die Lizenzinformationen der Bibelübersetzung angeben.
+ Die Lizenzinformationen der Bibelübersetzung angeben.
-
+
- Copyright:
+ Copyright:
-
+
- Berechtigung:
+ Berechtigung:
-
+
-
+
-
+
- Bitte warten Sie während Ihre Bibel importiert wird.
+ Bitte warten Sie während Ihre Bibel importiert wird.
-
+
- Fertig.
+ Fertig.
-
+
- Ungültige Bibelstelle
+ Ungültige Bibelstelle
-
+
-
+
- Ungültige Bücherdatei
+ Ungültige Bücherdatei
-
+
-
+
- Ungültige Liedtext Datei
+ Ungültige Liedtext Datei
-
+
-
+
-
+
- Ungültige OpenSong-Bibel
+ Ungültige OpenSong-Bibel
-
+
-
+
-
+
- Leerer Übersetzungsname
+ Leerer Übersetzungsname
-
+
-
+
-
+
- Das Copyright wurde nicht angegeben
+ Das Copyright wurde nicht angegeben
-
+
- Sie müssen das Copyright der Bibel angeben. Bei Bibeln, die keinem Copyright mehr unterlegen, geben Sie bitte "Public Domain" ein.
+ Sie müssen das Copyright der Bibel angeben. Bei Bibeln, die keinem Copyright mehr unterlegen, geben Sie bitte "Public Domain" ein.
-
+
- Diese Bibelübersetzung ist bereits vorhanden
+ Diese Bibelübersetzung ist bereits vorhanden
-
+
- Diese Bibel ist bereits vorhanden! Bitte importieren Sie eine andere Bibel oder löschen Sie die bereits vorhandene.
+ Diese Bibel ist bereits vorhanden! Bitte importieren Sie eine andere Bibel oder löschen Sie die bereits vorhandene.
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- Öffne OpenSong-Bibel
+ Öffne OpenSong-Bibel
-
+
- Starte import ...
+ Starte import ...
+
+
+
+
+ Importvorgang abgeschlossen.
-
- Importvorgang abgeschlossen.
-
-
-
- Der Bibelimportvorgang ist fehlgeschlagen.
+ Der Bibelimportvorgang ist fehlgeschlagen.
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
BiblesPlugin.MediaItem
-
+
- Bibel
+ Bibel
-
+
- Schnellsuche
+ Schnellsuche
-
+
- Erweitert
+ Erweitert
-
+
- Version:
+ Version:
-
+
- Parallel:
+ Parallel:
-
+
- Suchen:
+ Suchen:
-
+
- Suche
+ Suche
-
+
- Ergebnisse:
+ Ergebnisse:
-
+
- Buch:
+ Buch:
-
+
- Kapitel:
+ Kapitel:
-
+
- Vers:
+ Vers:
-
+
- Von:
+ Von:
-
+
- Bis:
+ Bis:
-
+
- Stelle suchen
+ Stelle suchen
-
+
- Textsuche
+ Textsuche
-
+
-
+
-
+
- Behalten
+ Behalten
-
+
- Kein Buch gefunden
+ Kein Buch gefunden
-
+
- Das Buch wurde in dieser Bibelausgabe nicht gefunden.
+ Das Buch wurde in dieser Bibelausgabe nicht gefunden.
-
+
-
+
-
+
-
+
-
+
-
+
BiblesPlugin.Opensong
-
+
-
+
@@ -656,250 +677,227 @@ Changes do not affect verses already in the service.
-
+
CustomPlugin.CustomTab
-
+
- Sonderfolien
+ Sonderfolien
-
+
- Sonderfolie Anzeige
+ Sonderfolie Anzeige
-
+
-
+
CustomPlugin.EditCustomForm
-
+
- Sonderfolien bearbeiten
+ Sonderfolien bearbeiten
-
+
-
+
-
+
- Neues anfügen
+ Neues anfügen
-
+
- Bearbeiten
+ Bearbeiten
-
+
-
+
-
+
- Speichern
+ Speichern
-
+
- Löschen
+ Löschen
-
+
-
+
-
+
- Aufräumen des Bearbeiten Bereiches
+ Aufräumen des Bearbeiten Bereiches
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- Speichern && Vorschau
+ Speichern && Vorschau
-
+
- Fehler
+ Fehler
-
-
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
CustomPlugin.MediaItem
-
+
- Sonderfolien
+ Sonderfolien
-
+
-
+
-
+
-
+
ImagePlugin
-
+
-
-
-
-
- ImagePlugin.ImageTab
-
-
-
- Bilder
-
-
-
-
- Bildeinstellungen
-
-
-
-
- sek
-
-
-
-
-
+
ImagePlugin.MediaItem
-
+
- Bild
+ Bild
-
+
- Bild(er) auswählen
+ Bild(er) auswählen
-
+
-
+
-
+
-
+
-
+
- Bild(er)
+ Bild(er)
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -907,54 +905,54 @@ Changes do not affect verses already in the service.
-
+
MediaPlugin.MediaItem
-
+
- Medien
+ Medien
-
+
- Medien auswählen
+ Medien auswählen
-
+
-
+
-
+
-
+
-
+
-
+
OpenLP
-
+
-
+
OpenLP.AboutForm
-
+
- Über OpenLP
+ Über OpenLP
-
+
-
+
-
+
- Über
+ Über
-
+
-
+
-
+
- Credits
+ Credits
-
+
-
+
-
+
- Lizenz
+ Lizenz
-
+
- Mitwirken
+ Mitwirken
-
+
- Schließen
+ Schließen
-
+
-
+
OpenLP.AdvancedTab
-
+
-
-
-
-
-
-
+
-
-
+
+
-
-
-
+
+
+
+
+
+
+
+
-
+
OpenLP.AmendThemeForm
-
+
- Designverwaltung
+ Designverwaltung
-
+
-
+
-
+
-
+
-
+
- Fest
+ Fest
-
+
- Durchsichtig
+ Durchsichtig
-
+
- Art:
+ Art:
-
+
- Füllfarbe
+ Füllfarbe
-
+
- Farbverlauf
+ Farbverlauf
-
+
- Bild
+ Bild
-
+
- Bild:
+ Bild:
-
+
-
+
-
+
- Horizontal
+ Horizontal
-
+
- Vertikal
+ Vertikal
-
+
- Radial
+ Radial
-
+
-
+
-
+
- Hauptschriftart
+ Hauptschriftart
-
+
- Schriftart:
+ Schriftart:
-
+
- Farbe:
+ Farbe:
-
+
- Größe:
+ Größe:
-
+
- pt
+ pt
-
+
-
+
-
+
-
+
-
+
- Normal
+ Normal
-
+
- Fett
+ Fett
-
+
- Kursiv
+ Kursiv
-
+
- Fett/Kursiv
+ Fett/Kursiv
-
+
-
+
-
+
- Anzeige Ort
+ Anzeige Ort
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- Breite:
+ Breite:
-
+
- Höhe:
+ Höhe:
-
+
- px
+ px
-
+
-
+
-
+
- Schriftart der Fußzeile
+ Schriftart der Fußzeile
-
+
-
+
-
+
- Rand
+ Rand
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- Schatten
+ Schatten
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- Ausrichtung
+ Ausrichtung
-
+
-
+
-
+
- Links
+ Links
-
+
- Rechts
+ Rechts
-
+
- Mitte
+ Mitte
-
+
-
+
-
+
- Oben
+ Oben
-
+
- Mittig
+ Mittig
-
+
- Unten
+ Unten
-
+
- Folienübergang
+ Folienübergang
-
+
-
+
-
+
-
+
-
+
- Vorschau
+ Vorschau
-
+
-
+
-
+
-
-
-
-
-
-
+
-
-
+
+
-
+
+
+
+
+
+
-
+
OpenLP.GeneralTab
-
+
- Allgemein
+ Allgemein
-
+
- Monitore
+ Monitore
-
+
- Projektionsbildschirm:
+ Projektionsbildschirm:
-
+
-
+
-
+
- Programmstart
+ Programmstart
-
+
- Warnung anzeigen, wenn die Projektion deaktiviert wurde
+ Warnung anzeigen, wenn die Projektion deaktiviert wurde
-
+
- Zuletzt benutzten Ablauf beim Start laden
+ Zuletzt benutzten Ablauf beim Start laden
-
+
- Zeige den Startbildschirm
+ Zeige den Startbildschirm
-
+
- Anwendungseinstellungen
+ Anwendungseinstellungen
-
-
- Auffordern den Ablauf zu speichern, bevor ein neuer gestartet wird
+
+
+
-
-
- Vorschau des nächsten Lieds
-
-
-
-
- CCLI-Details
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ CCLI-Details
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Bildschirm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Bildschirm
+
+
+
- Hauptbildschirm
+ Hauptbildschirm
OpenLP.LanguageManager
-
+
-
+
-
+
-
+
OpenLP.MainWindow
-
+
- OpenLP 2.0
+ OpenLP 2.0
-
+
- Deutsch
+ Deutsch
-
+
- &Datei
+ &Datei
-
+
- &Importieren
+ &Importieren
-
+
- &Exportieren
+ &Exportieren
-
+
- &Ansicht
+ &Ansicht
-
+
- M&odus
+ M&odus
-
+
- &Extras
+ &Extras
-
+
- Ein&stellungen
-
-
-
-
- &Sprache
+ Ein&stellungen
+
+ &Sprache
+
+
+
- &Hilfe
+ &Hilfe
-
+
- Medienmanager
+ Medienmanager
-
+
- Ablaufverwaltung
+ Ablaufverwaltung
-
+
- Designmanager
+ Designmanager
-
+
- &Neu
+ &Neu
+
+
+
+
+ Neuer Ablauf
+
+
+
+
+
+
+
+
+
+ Strg+N
+
+
+
+
+ &Öffnen
+
+
+
+
+ Öffnen Ablauf
+
+
+
+
+
+
+
+
+
+ Strg+O
+
+
+
+
+ &Speichern
+
+
+
+
+ Ablauf speichern
+
+
+
+
+
+
+
+
+
+ Strg+S
+
+
+
+
+ Speichern &als...
+
+
+
+
+ Speicher Gottesdienst unter
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ &Beenden
+
+
+
+
+ OpenLP beenden
+
+
+
+
+ Alt+F4
+
+
+
+
+ &Design
+
+
+
+
+
+
+
+
+
+ &Medienmanager
+
+
+
+
+ Medienmanager ein/ausblenden
-
- Neuer Ablauf
+
+
-
-
+
+ F8
-
- Strg+N
-
-
-
-
- &Öffnen
+
+ &Designmanager
-
- Öffnen Ablauf
+
+ Designverwaltung ein/ausblenden
-
-
+
+
-
- Strg+O
-
-
-
-
- &Speichern
+
+ F10
-
- Ablauf speichern
+
+ Ablauf&sverwaltung
-
-
+
+ Ablaufmanager ein/ausblenden
-
- Strg+S
+
+
-
-
- Speichern &als...
+
+
+ F9
-
-
- Speicher Gottesdienst unter
+
+
+ &Vorschaubereich
-
-
-
+
+
+ Vorschaubereich ein/ausblenden
-
-
-
+
+
+
-
-
- &Beenden
+
+
+ F11
-
-
- OpenLP beenden
+
+
+
-
-
- Alt+F4
+
+
+
-
-
- &Design
+
+
+
-
-
-
+
+
+ F12
-
-
- &Medienmanager
+
+
+ &Plugin-Liste
-
-
- Medienmanager ein/ausblenden
+
+
+ Plugins auflisten
+
+
+
+
+ Alt+F7
+
+
+
+
+ Ben&utzerhandbuch
+
+
+
+
+ &Über
-
-
+
+ Mehr Informationen über OpenLP
-
- F8
+
+ Strg+F1
-
- &Designmanager
+
+ &Online Hilfe
-
- Designverwaltung ein/ausblenden
+
+ &Webseite
-
-
+
+
-
- F10
+
+
-
-
- Ablauf&sverwaltung
+
+
+
-
-
- Ablaufmanager ein/ausblenden
+
+
+
-
-
-
-
-
-
-
- F9
-
-
-
-
- &Vorschaubereich
+
+
+
-
- Vorschaubereich ein/ausblenden
+
+
-
-
+
+
-
-
- F11
+
+
+
-
-
+
+
-
-
-
+
+
+ &Live
-
-
-
-
-
-
- F12
-
-
-
-
- &Plugin-Liste
-
-
-
-
- Plugins auflisten
-
-
-
-
- Alt+F7
-
-
-
-
- Ben&utzerhandbuch
-
-
-
-
- &Über
-
-
-
-
- Mehr Informationen über OpenLP
-
-
-
-
- Strg+F1
-
-
-
-
- &Online Hilfe
-
-
-
-
- &Webseite
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- &Live
-
-
-
-
+
-
+
-
+
-
+
- OpenLP-Version aktualisiert
+ OpenLP-Version aktualisiert
-
+
- Hauptbildschirm abgedunkelt
+ Hauptbildschirm abgedunkelt
-
+
- Die Projektion ist momentan nicht aktiv
+ Die Projektion ist momentan nicht aktiv
-
+
- Änderungen am Ablauf speichern?
+ Änderungen am Ablauf speichern?
-
+
-
+
-
+
-
+
OpenLP.MediaManagerItem
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- Markiertes Element löschen
+ Markiertes Element löschen
-
+
-
+
-
+
- Zeige das auswählte Element in der Vorschau an
+ Zeige das auswählte Element in der Vorschau an
-
+
- Ausgewähltes Element Live anzeigen
+ Ausgewähltes Element Live anzeigen
-
+
-
+
-
+
- Füge Element(e) zum Ablauf hinzu
+ Füge Element(e) zum Ablauf hinzu
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- &Zeige Live
+ &Zeige Live
-
+
- &Zum Ablauf hinzufügen
+ &Zum Ablauf hinzufügen
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- Sie müssen mindestens ein Element markieren
+ Sie müssen mindestens ein Element markieren
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
OpenLP.PluginForm
-
+
- Plugin-Liste
+ Plugin-Liste
-
+
- Plugin-Details
+ Plugin-Details
-
+
- Version:
+ Version:
-
+
- Text Beschriftung
+ Text Beschriftung
-
+
- Über:
+ Über:
-
+
- Status:
+ Status:
-
+
- Aktiv
+ Aktiv
-
+
- Inaktiv
+ Inaktiv
-
+
-
+
-
+
-
+
-
+
-
+
OpenLP.ServiceItemEditForm
-
+
-
-
-
-
-
-
+
-
- Löschen
+
+
+
+ Löschen
+
+
+
-
+
OpenLP.ServiceManager
-
+
- Neuer Ablauf
+ Neuer Ablauf
-
+
- Erstelle neuen Ablauf
+ Erstelle neuen Ablauf
- Öffnen Ablauf
+ Öffnen Ablauf
-
+
- Öffne Ablauf
+ Öffne Ablauf
- Ablauf speichern
+ Ablauf speichern
-
+
- Ablauf speichern
+ Ablauf speichern
-
+
- Design:
+ Design:
-
+
- Design für den Ablauf auswählen
+ Design für den Ablauf auswählen
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- &Bearbeite Element
+ &Bearbeite Element
-
+
-
+
-
+
- &Notizen
+ &Notizen
-
+
- Vers in der &Vorschau zeigen
+ Vers in der &Vorschau zeigen
-
+
- Vers &Live zeigen
+ Vers &Live zeigen
-
+
- &Design des Elements ändern
+ &Design des Elements ändern
- Änderungen am Ablauf speichern?
+ Änderungen am Ablauf speichern?
-
+
-
+
-
+
-
+
-
+
- Fehler
+ Fehler
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
OpenLP.ServiceNoteForm
-
+
- Elementnotiz
+ Elementnotiz
OpenLP.SettingsForm
-
+
-
+
OpenLP.SlideController
-
+
- Live
+ Live
-
+
- Vorschau
+ Vorschau
-
+
- Ganz nach vorn verschieben
+ Ganz nach vorn verschieben
-
+
- Vorherige Folie anzeigen
+ Vorherige Folie anzeigen
-
+
- Verschiebe zum Nächsten
+ Verschiebe zum Nächsten
-
+
- Zur letzten Folie
+ Zur letzten Folie
-
+
-
+
-
+
- Verschieben zur Live Ansicht
+ Verschieben zur Live Ansicht
-
+
- Lied bearbeiten und wieder anzeigen
+ Lied bearbeiten und wieder anzeigen
-
+
- Endlosschleife starten
+ Endlosschleife starten
-
+
- Endlosschleife beenden
-
-
-
-
- s
+ Endlosschleife beenden
+
+ s
+
+
+
- Pause zwischen den Folien in Sekunden
+ Pause zwischen den Folien in Sekunden
-
+
- Abspielen
+ Abspielen
-
+
- Springe zu
+ Springe zu
@@ -2572,1322 +2589,1339 @@ The content encoding is not UTF-8.
- Neues Design
+ Neues Design
-
+
-
+
-
+
- Design bearbeiten
+ Design bearbeiten
-
+
-
+
-
+
- Design löschen
+ Design löschen
-
+
-
+
-
+
- Design importieren
+ Design importieren
-
+
-
+
-
+
- Design exportieren
+ Design exportieren
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- Fehler
+ Fehler
-
+
-
+
-
+
-
+
-
+
- Speichere Design - (%s)
+ Speichere Design - (%s)
-
+
-
+
-
+
-
+
- Wähle Datei für Design Import
+ Wähle Datei für Design Import
-
+
-
+
-
+
- Design existiert
+ Design existiert
-
+
OpenLP.ThemesTab
-
+
- Designs
+ Designs
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- Das im jeweiligen Lied eingestellte Design verwenden. Wenn für ein Lied kein Design festgelegt ist, wird das Ablaufdesign verwendet. Wenn dort auch kein Design festgelegt wurde, wird das Standarddesign benutzt.
+ Das im jeweiligen Lied eingestellte Design verwenden. Wenn für ein Lied kein Design festgelegt ist, wird das Ablaufdesign verwendet. Wenn dort auch kein Design festgelegt wurde, wird das Standarddesign benutzt.
-
+
-
+
-
+
- Nutze das dem Ablauf zugewiesene Design, das im Lied eingestellte Design wird ignoriert. Wenn dem Ablauf kein Design zugeordnet ist, dann wird das Standarddesign verwendet.
+ Nutze das dem Ablauf zugewiesene Design, das im Lied eingestellte Design wird ignoriert. Wenn dem Ablauf kein Design zugeordnet ist, dann wird das Standarddesign verwendet.
-
+
-
+
-
+
- Das Standarddesign immer verwenden, unabhängig vom Lieddesign oder Ablaufdesign
+ Das Standarddesign immer verwenden, unabhängig vom Lieddesign oder Ablaufdesign
PresentationPlugin
-
+
-
+
PresentationPlugin.MediaItem
-
+
- Präsentation
+ Präsentation
-
+
- Präsentation(en) auswählen
+ Präsentation(en) auswählen
-
+
-
+
- Anzeigen mit:
+ Anzeigen mit:
- Eine Präsentation mit diesem Dateinamen existiert bereits.
+ Eine Präsentation mit diesem Dateinamen existiert bereits.
-
+
-
+
-
+
-
+
-
+
-
+
-
+
PresentationPlugin.PresentationTab
-
+
- Präsentationen
+ Präsentationen
-
+
- Verfügbare Präsentationsprogramme:
+ Verfügbare Präsentationsprogramme:
-
+
-
+
-
+
-
+
RemotePlugin
-
-
-
+
+
+
RemotePlugin.RemoteTab
-
+
- Fernprojektion
+ Fernprojektion
-
+
-
+
-
+
-
+
-
+
-
+
SongUsagePlugin
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
SongUsagePlugin.SongUsageDeleteForm
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
SongUsagePlugin.SongUsageDetailForm
-
-
- Ablageort für Aufnahme wählen
-
-
-
+
-
+
-
+
-
+
-
+
- zu
+ zu
-
+
- Speicherort für die Statistiken
+ Speicherort für die Statistiken
+
+
+
+
+ Ablageort für Aufnahme wählen
SongsPlugin
-
+
&Lied
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
SongsPlugin.AuthorsForm
-
+
- Autorenverwaltung
+ Autorenverwaltung
-
+
- Anzeige Name:
+ Anzeige Name:
-
+
- Vorname:
+ Vorname:
-
+
- Nachname:
+ Nachname:
-
+
- Fehler
+ Fehler
-
+
- Sie müssen den Vornamen des Autors angeben.
+ Sie müssen den Vornamen des Autors angeben.
- Sie müssen den Nachnamen des Autors eingeben.
+ Sie müssen den Nachnamen des Autors eingeben.
-
+
-
+
SongsPlugin.EditSongForm
-
+
- Lied bearbeiten
+ Lied bearbeiten
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- &Bearbeiten
+ &Bearbeiten
-
+
-
+
-
+
-
+
-
+
- Titel && Liedtext
+ Titel && Liedtext
-
+
- Autoren
+ Autoren
-
+
- Zum Lied &hinzufügen
+ Zum Lied &hinzufügen
-
+
- Entfe&rnen
+ Entfe&rnen
-
+
- Thema
+ Thema
-
+
- Zum Lied &hinzufügen
+ Zum Lied &hinzufügen
-
+
- &Entfernen
+ &Entfernen
-
+
- Liederbuch
+ Liederbuch
-
+
- Design
+ Design
-
+
-
+
-
+
- Copyright Angaben
+ Copyright Angaben
-
+
-
+
-
+
- Kommentare
+ Kommentare
-
+
- Design, Copyrightinformationen && Kommentare
+ Design, Copyrightinformationen && Kommentare
-
+
- Speichern && Vorschau
+ Speichern && Vorschau
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- Fehler
+ Fehler
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
SongsPlugin.EditVerseForm
-
+
- Bearbeite Vers
+ Bearbeite Vers
-
+
-
+
-
+
-
+
SongsPlugin.ImportWizardForm
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
+
- Starte import ...
+ Starte import ...
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- Importquelle auswählen
+ Importquelle auswählen
-
+
- Wähle das Import Format und woher der Import erfolgen soll.
+ Wähle das Import Format und woher der Import erfolgen soll.
-
+
- Format:
+ Format:
-
+
-
+
-
+
- OpenSong
+ OpenSong
-
-
-
-
-
-
-
- CSV
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+ Fertig.
+
+
+
+
+
+
+
+
+
-
-
- Fertig.
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ OpenLP 2.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
SongsPlugin.MediaItem
-
+
- Lied
+ Lied
-
+
- Liedverwaltung
+ Liedverwaltung
-
+
- Autoren, Designs und Bücher verwalten
+ Autoren, Designs und Bücher verwalten
-
+
- Suche:
+ Suche:
-
+
- Art:
+ Art:
-
+
-
+
-
+
- Suche
+ Suche
-
+
- Titel
+ Titel
-
+
- Liedtext
+ Liedtext
-
+
- Autoren
+ Autoren
-
+
-
+
-
+
-
+
-
+
- CCLI-Lizenz:
+ CCLI-Lizenz:
-
+
-
+
-
+
-
+
-
+
-
+
SongsPlugin.SongBookForm
-
-
-
-
-
+
+
+
+
+
-
+
-
+
- Fehler
+ Fehler
-
+
-
+
-
+
-
+
SongsPlugin.SongImport
-
+
-
+
-
+
+
+
+
+
+ SongsPlugin.SongImportForm
+
+
+
+ Importvorgang abgeschlossen.
+
+
+
+
SongsPlugin.SongMaintenanceForm
-
+
- Liedverwaltung
+ Liedverwaltung
-
+
- Autoren
+ Autoren
-
+
- Themen
+ Themen
-
+
-
+
-
+
- &Bearbeiten
+ &Bearbeiten
-
+
-
+
-
+
- Fehler
+ Fehler
-
+
- Lösche Autor
+ Lösche Autor
-
+
- Sind Sie sicher, dass Sie den ausgewählten Autor löschen wollen?
+ Sind Sie sicher, dass Sie den ausgewählten Autor löschen wollen?
-
+
- Sie haben keinen Autor ausgewählt!
+ Sie haben keinen Autor ausgewählt!
-
+
- Lösche Thema
+ Lösche Thema
-
+
- Soll der gewählte Eintrag wirklich gelöscht werden?
+ Soll der gewählte Eintrag wirklich gelöscht werden?
-
+
- Kein Thema ausgewählt!
+ Kein Thema ausgewählt!
-
+
- Buch löschen
+ Buch löschen
-
+
- Sind Sie sicher, dass das markierte Buch wirklich gelöscht werden soll?
+ Sind Sie sicher, dass das markierte Buch wirklich gelöscht werden soll?
-
+
- Kein Buch ausgewählt!
+ Kein Buch ausgewählt!
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
SongsPlugin.SongsTab
-
+
- Lieder
+ Lieder
-
+
- Liedermodus
+ Liedermodus
-
+
-
+
-
+
-
+
SongsPlugin.TopicsForm
-
+
- Themenverwaltung
+ Themenverwaltung
-
+
- Thema:
+ Thema:
-
+
- Fehler
+ Fehler
-
+
- Sie müssen dem Thema einen Namen geben!
+ Sie müssen dem Thema einen Namen geben!
SongsPlugin.VerseType
-
+
- Vers
+ Vers
-
+
- Refrain
+ Refrain
-
+
- Bridge
+ Bridge
-
+
- Vor-Refrain
+ Vor-Refrain
-
+
- Intro
+ Intro
-
+
- Coda (Schluss)
+ Coda (Schluss)
-
+
- Weitere
+ Weitere
diff --git a/resources/i18n/openlp_en.ts b/resources/i18n/openlp_en.ts
index 665eb1e95..3d538ab1b 100644
--- a/resources/i18n/openlp_en.ts
+++ b/resources/i18n/openlp_en.ts
@@ -3,17 +3,17 @@
AlertsPlugin
-
+
-
+
-
+
@@ -21,57 +21,57 @@
AlertsPlugin.AlertForm
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -79,7 +79,7 @@
AlertsPlugin.AlertsManager
-
+
@@ -87,77 +87,77 @@
AlertsPlugin.AlertsTab
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -165,12 +165,12 @@
BiblesPlugin
-
+
-
+
@@ -178,91 +178,112 @@
BiblesPlugin.BibleDB
-
+
-
+
+
+ BiblesPlugin.BibleManager
+
+
+
+
+
+
+
+
+
+
+
BiblesPlugin.BiblesTab
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -270,167 +291,167 @@ Changes do not affect verses already in the service.
BiblesPlugin.ImportWizardForm
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -445,87 +466,87 @@ Changes do not affect verses already in the service.
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -533,112 +554,112 @@ Changes do not affect verses already in the service.
BiblesPlugin.MediaItem
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -646,7 +667,7 @@ Changes do not affect verses already in the service.
BiblesPlugin.Opensong
-
+
@@ -662,17 +683,17 @@ Changes do not affect verses already in the service.
CustomPlugin.CustomTab
-
+
-
+
-
+
@@ -680,112 +701,112 @@ Changes do not affect verses already in the service.
CustomPlugin.EditCustomForm
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -808,17 +829,17 @@ Changes do not affect verses already in the service.
CustomPlugin.MediaItem
-
+
-
+
-
+
@@ -826,78 +847,55 @@ Changes do not affect verses already in the service.
ImagePlugin
-
+
-
- ImagePlugin.ImageTab
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
ImagePlugin.MediaItem
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -913,27 +911,27 @@ Changes do not affect verses already in the service.
MediaPlugin.MediaItem
-
+
-
+
-
+
-
+
-
+
@@ -941,7 +939,7 @@ Changes do not affect verses already in the service.
OpenLP
-
+
@@ -949,12 +947,12 @@ Changes do not affect verses already in the service.
OpenLP.AboutForm
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -1166,27 +1173,27 @@ This General Public License does not permit incorporating your program into prop
OpenLP.AdvancedTab
-
+
-
+
-
+
-
+
-
+
@@ -1194,317 +1201,317 @@ This General Public License does not permit incorporating your program into prop
OpenLP.AmendThemeForm
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -1512,117 +1519,127 @@ This General Public License does not permit incorporating your program into prop
OpenLP.GeneralTab
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -1630,12 +1647,12 @@ This General Public License does not permit incorporating your program into prop
OpenLP.LanguageManager
-
+
-
+
@@ -1643,414 +1660,414 @@ This General Public License does not permit incorporating your program into prop
OpenLP.MainWindow
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2058,157 +2075,157 @@ You can download the latest version from <a href="http://openlp.org/&quo
OpenLP.MediaManagerItem
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2216,57 +2233,57 @@ You can download the latest version from <a href="http://openlp.org/&quo
OpenLP.PluginForm
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2274,22 +2291,22 @@ You can download the latest version from <a href="http://openlp.org/&quo
OpenLP.ServiceItemEditForm
-
+
-
+
-
+
-
+
@@ -2297,12 +2314,12 @@ You can download the latest version from <a href="http://openlp.org/&quo
OpenLP.ServiceManager
-
+
-
+
@@ -2312,7 +2329,7 @@ You can download the latest version from <a href="http://openlp.org/&quo
-
+
@@ -2322,107 +2339,107 @@ You can download the latest version from <a href="http://openlp.org/&quo
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2432,7 +2449,7 @@ You can download the latest version from <a href="http://openlp.org/&quo
-
+
@@ -2447,28 +2464,28 @@ You can download the latest version from <a href="http://openlp.org/&quo
-
+
-
+
-
+
-
+
-
+
@@ -2476,7 +2493,7 @@ The content encoding is not UTF-8.
OpenLP.ServiceNoteForm
-
+
@@ -2484,7 +2501,7 @@ The content encoding is not UTF-8.
OpenLP.SettingsForm
-
+
@@ -2492,77 +2509,77 @@ The content encoding is not UTF-8.
OpenLP.SlideController
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2575,67 +2592,67 @@ The content encoding is not UTF-8.
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2645,22 +2662,22 @@ The content encoding is not UTF-8.
-
+
-
+
-
+
-
+
@@ -2670,7 +2687,7 @@ The content encoding is not UTF-8.
-
+
@@ -2749,47 +2766,47 @@ The content encoding is not UTF-8.
OpenLP.ThemesTab
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2797,7 +2814,7 @@ The content encoding is not UTF-8.
PresentationPlugin
-
+
@@ -2805,17 +2822,17 @@ The content encoding is not UTF-8.
PresentationPlugin.MediaItem
-
+
-
+
-
+
@@ -2835,17 +2852,17 @@ The content encoding is not UTF-8.
-
+
-
+
-
+
@@ -2853,22 +2870,22 @@ The content encoding is not UTF-8.
PresentationPlugin.PresentationTab
-
+
-
+
-
+
-
+
@@ -2876,30 +2893,30 @@ The content encoding is not UTF-8.
RemotePlugin
-
-
+
+
RemotePlugin.RemoteTab
-
+
-
+
-
+
-
+
@@ -2907,27 +2924,27 @@ The content encoding is not UTF-8.
SongUsagePlugin
-
+
-
+
-
+
-
+
-
+
@@ -2942,7 +2959,7 @@ The content encoding is not UTF-8.
-
+
@@ -2950,154 +2967,63 @@ The content encoding is not UTF-8.
SongUsagePlugin.SongUsageDeleteForm
-
+
+
+
+
+
+
-
+
-
-
-
-
-
SongUsagePlugin.SongUsageDetailForm
-
-
-
-
-
-
+
-
+
-
+
-
+
+
+
+
+
+
SongsPlugin
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -3105,32 +3031,32 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
SongsPlugin.AuthorsForm
-
+
-
+
-
+
-
+
-
+
-
+
@@ -3140,7 +3066,7 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
-
+
@@ -3148,152 +3074,167 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
SongsPlugin.EditSongForm
-
+
-
+
-
+
+
+
+
+
+
-
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -3323,75 +3264,60 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
SongsPlugin.EditVerseForm
-
+
-
+
-
+
@@ -3399,137 +3325,232 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
SongsPlugin.ImportWizardForm
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
@@ -3537,110 +3558,110 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
SongsPlugin.MediaItem
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
+
-
+
-
+
+
+
+
+
+
SongsPlugin.SongBookForm
-
+
-
+
-
+
-
+
-
+
@@ -3648,160 +3669,173 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
SongsPlugin.SongImport
-
+
-
+
+
+ SongsPlugin.SongImportForm
+
+
+
+
+
+
+
+
+
+
+
SongsPlugin.SongMaintenanceForm
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -3809,22 +3843,22 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
SongsPlugin.SongsTab
-
+
-
+
-
+
-
+
@@ -3832,22 +3866,22 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
SongsPlugin.TopicsForm
-
+
-
+
-
+
-
+
@@ -3855,37 +3889,37 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
SongsPlugin.VerseType
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/resources/i18n/openlp_en_GB.ts b/resources/i18n/openlp_en_GB.ts
index fe066d402..3503a2e29 100644
--- a/resources/i18n/openlp_en_GB.ts
+++ b/resources/i18n/openlp_en_GB.ts
@@ -3,17 +3,17 @@
AlertsPlugin
-
+
&Alert
-
+
-
+
@@ -21,57 +21,57 @@
AlertsPlugin.AlertForm
-
+
Alert Message
-
+
-
+
-
+
&New
-
+
&Save
-
+
-
+
-
+
-
+
-
+
-
+
@@ -79,7 +79,7 @@
AlertsPlugin.AlertsManager
-
+
@@ -87,77 +87,77 @@
AlertsPlugin.AlertsTab
-
+
Alerts
-
+
Font
-
+
-
+
-
+
-
+
-
+
pt
-
+
Alert timeout:
-
+
s
-
+
Location:
-
+
Preview
-
+
OpenLP 2.0
-
+
Top
-
+
Middle
-
+
Bottom
@@ -165,12 +165,12 @@
BiblesPlugin
-
+
&Bible
-
+
@@ -178,91 +178,112 @@
BiblesPlugin.BibleDB
-
+
-
+
+
+ BiblesPlugin.BibleManager
+
+
+
+
+
+
+
+
+
+
+
BiblesPlugin.BiblesTab
-
+
Bibles
-
+
Verse Display
-
+
Only show new chapter numbers
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -270,167 +291,167 @@ Changes do not affect verses already in the service.
BiblesPlugin.ImportWizardForm
-
+
Bible Import Wizard
-
+
Welcome to the Bible Import Wizard
-
+
This wizard will help you to import Bibles from a variety of formats. Click the next button below to start the process by selecting a format to import from.
-
+
Select Import Source
-
+
Select the import format, and where to import from.
-
+
Format:
-
+
OSIS
-
+
CSV
-
+
OpenSong
-
+
Web Download
-
+
-
+
-
+
-
+
-
+
Location:
-
+
Crosswalk
-
+
BibleGateway
-
+
Bible:
-
+
Download Options
-
+
Server:
-
+
Username:
-
+
Password:
-
+
Proxy Server (Optional)
-
+
License Details
-
+
Set up the Bible's license details.
-
+
-
+
Copyright:
-
+
Permission:
-
+
Importing
-
+
Please wait while your Bible is imported.
-
+
Ready.
-
+
Invalid Bible Location
-
+
@@ -445,87 +466,87 @@ Changes do not affect verses already in the service.
-
+
Invalid Verse File
-
+
-
+
Invalid OpenSong Bible
-
+
-
+
Empty Version Name
-
+
-
+
Empty Copyright
-
+
You need to set a copyright for your Bible! Bibles in the Public Domain need to be marked as such.
-
+
Bible Exists
-
+
-
+
-
+
-
+
-
+
Open OpenSong Bible
-
+
Starting import...
-
+
Finished import.
-
+
Your Bible import failed.
@@ -533,112 +554,112 @@ Changes do not affect verses already in the service.
BiblesPlugin.MediaItem
-
+
Bible
-
+
Quick
-
+
Advanced
-
+
Version:
-
+
Dual:
-
+
-
+
Find:
-
+
Search
-
+
Results:
-
+
Book:
-
+
Chapter:
-
+
Verse:
-
+
From:
-
+
To:
-
+
Verse Search
-
+
Text Search
-
+
Clear
-
+
Keep
-
+
No Book Found
-
+
No matching book could be found in this Bible.
-
+
-
+
@@ -646,7 +667,7 @@ Changes do not affect verses already in the service.
BiblesPlugin.Opensong
-
+
Importing
@@ -662,17 +683,17 @@ Changes do not affect verses already in the service.
CustomPlugin.CustomTab
-
+
Custom
-
+
Custom Display
-
+
@@ -680,112 +701,112 @@ Changes do not affect verses already in the service.
CustomPlugin.EditCustomForm
-
+
Edit Custom Slides
-
-
+
+
-
+
-
+
-
+
Add New
-
+
-
+
Edit
-
+
-
+
Edit All
-
+
-
+
Save
-
+
-
+
Delete
-
+
-
+
Clear
-
+
Clear edit area
-
+
-
+
-
+
-
+
-
+
Save && Preview
-
+
Error
@@ -808,17 +829,17 @@ Changes do not affect verses already in the service.
CustomPlugin.MediaItem
-
+
Custom
-
+
-
+
@@ -826,78 +847,55 @@ Changes do not affect verses already in the service.
ImagePlugin
-
+
-
- ImagePlugin.ImageTab
-
-
-
- Images
-
-
-
-
- Image Settings
-
-
-
-
-
-
-
-
-
- sec
-
-
ImagePlugin.MediaItem
-
+
Image
-
+
Select Image(s)
-
+
-
+
-
+
-
+
-
+
Image(s)
-
+
-
+
@@ -913,27 +911,27 @@ Changes do not affect verses already in the service.
MediaPlugin.MediaItem
-
+
Media
-
+
Select Media
-
+
-
+
-
+
@@ -941,7 +939,7 @@ Changes do not affect verses already in the service.
OpenLP
-
+
@@ -949,12 +947,12 @@ Changes do not affect verses already in the service.
OpenLP.AboutForm
-
+
About OpenLP
-
+
-
+
About
-
+
-
+
Credits
-
+
-
+
License
-
+
Contribute
-
+
Close
-
+
@@ -1166,27 +1173,27 @@ This General Public License does not permit incorporating your program into prop
OpenLP.AdvancedTab
-
+
Advanced
-
+
-
+
-
+
-
+
@@ -1194,317 +1201,317 @@ This General Public License does not permit incorporating your program into prop
OpenLP.AmendThemeForm
-
+
Theme Maintenance
-
+
-
+
-
+
Opaque
-
+
Transparent
-
+
Type:
-
+
Solid Color
-
+
Gradient
-
+
Image
-
+
Image:
-
+
-
+
Horizontal
-
+
Vertical
-
+
-
+
-
+
Main Font
-
+
Font:
-
+
-
+
Size:
-
+
pt
-
+
-
+
-
+
Normal
-
+
Bold
-
+
Italics
-
+
Bold/Italics
-
+
-
+
Display Location
-
+
-
+
-
+
-
+
Width:
-
+
Height:
-
+
px
-
+
-
+
Footer Font
-
+
-
+
Outline
-
+
-
+
-
+
-
+
Shadow
-
+
-
+
-
+
-
+
Alignment
-
+
-
+
Left
-
+
Right
-
+
Center
-
+
-
+
Top
-
+
Middle
-
+
Bottom
-
+
Slide Transition
-
+
-
+
-
+
Preview
-
+
-
+
-
+
-
+
-
+
@@ -1512,117 +1519,127 @@ This General Public License does not permit incorporating your program into prop
OpenLP.GeneralTab
-
+
General
-
+
Monitors
-
+
Select monitor for output display:
-
+
-
+
Application Startup
-
+
Show blank screen warning
-
+
Automatically open the last service
-
+
Show the splash screen
-
+
Application Settings
-
-
- Prompt to save Service before starting New
-
-
-
-
- Preview Next Song from Service Manager
-
-
-
-
- CCLI Details
-
-
-
-
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ CCLI Details
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
Screen
-
+
primary
@@ -1630,12 +1647,12 @@ This General Public License does not permit incorporating your program into prop
OpenLP.LanguageManager
-
+
-
+
@@ -1643,414 +1660,414 @@ This General Public License does not permit incorporating your program into prop
OpenLP.MainWindow
-
+
OpenLP 2.0
-
+
English
-
+
&File
-
+
&Import
-
+
&Export
-
+
&View
-
+
M&ode
-
+
&Tools
-
+
&Settings
-
+
&Language
-
+
&Help
-
+
Media Manager
-
+
Service Manager
-
+
Theme Manager
-
+
&New
-
+
New Service
-
+
-
+
Ctrl+N
-
+
&Open
-
+
Open Service
-
+
-
+
Ctrl+O
-
+
&Save
-
+
Save Service
-
+
-
+
Ctrl+S
-
+
Save &As...
-
+
Save Service As
-
+
-
+
-
+
E&xit
-
+
Quit OpenLP
-
+
Alt+F4
-
+
&Theme
-
+
-
+
&Media Manager
-
+
Toggle Media Manager
-
+
-
+
F8
-
+
&Theme Manager
-
+
Toggle Theme Manager
-
+
-
+
F10
-
+
&Service Manager
-
+
Toggle Service Manager
-
+
-
+
F9
-
+
&Preview Panel
-
+
Toggle Preview Panel
-
+
-
+
F11
-
+
-
+
-
+
-
+
F12
-
+
&Plugin List
-
+
List the Plugins
-
+
Alt+F7
-
+
&User Guide
-
+
&About
-
+
More information about OpenLP
-
+
Ctrl+F1
-
+
&Online Help
-
+
&Web Site
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
&Live
-
+
-
+
-
+
OpenLP Version Updated
-
+
OpenLP Main Display Blanked
-
+
The Main Display has been blanked out
-
+
Save Changes to Service?
-
+
-
+
@@ -2058,157 +2075,157 @@ You can download the latest version from <a href="http://openlp.org/&quo
OpenLP.MediaManagerItem
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
Delete the selected item
-
+
-
+
Preview the selected item
-
+
Send the selected item live
-
+
-
+
Add the selected item(s) to the service
-
+
-
+
-
+
-
+
&Show Live
-
+
&Add to Service
-
+
-
+
-
+
-
+
-
+
-
+
You must select one or more items
-
+
-
+
-
+
-
+
@@ -2216,57 +2233,57 @@ You can download the latest version from <a href="http://openlp.org/&quo
OpenLP.PluginForm
-
+
Plugin List
-
+
Plugin Details
-
+
Version:
-
+
TextLabel
-
+
About:
-
+
Status:
-
+
Active
-
+
Inactive
-
+
-
+
-
+
@@ -2274,22 +2291,22 @@ You can download the latest version from <a href="http://openlp.org/&quo
OpenLP.ServiceItemEditForm
-
+
-
+
-
+
Delete
-
+
@@ -2297,12 +2314,12 @@ You can download the latest version from <a href="http://openlp.org/&quo
OpenLP.ServiceManager
-
+
New Service
-
+
Create a new service
@@ -2312,7 +2329,7 @@ You can download the latest version from <a href="http://openlp.org/&quo
Open Service
-
+
Load an existing service
@@ -2322,107 +2339,107 @@ You can download the latest version from <a href="http://openlp.org/&quo
Save Service
-
+
Save this service
-
+
Theme:
-
+
Select a theme for the service
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
&Edit Item
-
+
-
+
&Notes
-
+
&Preview Verse
-
+
&Live Verse
-
+
&Change Item Theme
@@ -2432,7 +2449,7 @@ You can download the latest version from <a href="http://openlp.org/&quo
Save Changes to Service?
-
+
@@ -2447,28 +2464,28 @@ You can download the latest version from <a href="http://openlp.org/&quo
-
+
Error
-
+
-
+
-
+
-
+
@@ -2476,7 +2493,7 @@ The content encoding is not UTF-8.
OpenLP.ServiceNoteForm
-
+
Service Item Notes
@@ -2484,7 +2501,7 @@ The content encoding is not UTF-8.
OpenLP.SettingsForm
-
+
@@ -2492,77 +2509,77 @@ The content encoding is not UTF-8.
OpenLP.SlideController
-
+
Live
-
+
Preview
-
+
Move to first
-
+
Move to previous
-
+
Move to next
-
+
Move to last
-
+
-
+
Move to live
-
+
Edit and re-preview Song
-
+
Start continuous loop
-
+
Stop continuous loop
-
+
s
-
+
Delay between slides in seconds
-
+
Start playing media
-
+
Go to Verse
@@ -2575,67 +2592,67 @@ The content encoding is not UTF-8.
New Theme
-
+
-
+
Edit Theme
-
+
-
+
Delete Theme
-
+
-
+
Import Theme
-
+
-
+
Export Theme
-
+
-
+
-
+
-
+
-
+
@@ -2645,22 +2662,22 @@ The content encoding is not UTF-8.
-
+
-
+
-
+
-
+
@@ -2670,7 +2687,7 @@ The content encoding is not UTF-8.
Error
-
+
@@ -2749,47 +2766,47 @@ The content encoding is not UTF-8.
OpenLP.ThemesTab
-
+
Themes
-
+
-
+
-
+
-
+
Use the theme from each song in the database. If a song doesn't have a theme associated with it, then use the service's theme. If the service doesn't have a theme, then use the global theme.
-
+
-
+
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.
-
+
-
+
Use the global theme, overriding any themes associated with either the service or the songs.
@@ -2797,7 +2814,7 @@ The content encoding is not UTF-8.
PresentationPlugin
-
+
@@ -2805,17 +2822,17 @@ The content encoding is not UTF-8.
PresentationPlugin.MediaItem
-
+
Presentation
-
+
Select Presentation(s)
-
+
@@ -2835,17 +2852,17 @@ The content encoding is not UTF-8.
A presentation with that filename already exists.
-
+
-
+
-
+
@@ -2853,22 +2870,22 @@ The content encoding is not UTF-8.
PresentationPlugin.PresentationTab
-
+
Presentations
-
+
Available Controllers
-
+
-
+ Advanced
-
+
@@ -2876,30 +2893,30 @@ The content encoding is not UTF-8.
RemotePlugin
-
-
+
+
RemotePlugin.RemoteTab
-
+
Remotes
-
+
-
+
-
+
@@ -2907,27 +2924,27 @@ The content encoding is not UTF-8.
SongUsagePlugin
-
+
-
+
-
+
-
+
-
+
@@ -2942,7 +2959,7 @@ The content encoding is not UTF-8.
-
+
@@ -2950,154 +2967,63 @@ The content encoding is not UTF-8.
SongUsagePlugin.SongUsageDeleteForm
-
+
+
+
+
+
+
-
+
-
-
-
-
-
SongUsagePlugin.SongUsageDetailForm
-
-
- Output File Location
-
-
-
+
-
+
-
+
to
-
+
Report Location
+
+
+
+ Output File Location
+
SongsPlugin
-
+
&Song
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -3105,32 +3031,32 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
SongsPlugin.AuthorsForm
-
+
Author Maintenance
-
+
Display name:
-
+
First name:
-
+
Last name:
-
+
Error
-
+
You need to type in the first name of the author.
@@ -3140,7 +3066,7 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
You need to type in the last name of the author.
-
+
@@ -3148,152 +3074,167 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
SongsPlugin.EditSongForm
-
+
Song Editor
-
+
-
+
+
+
+
+
+
-
+
+
+
+
+
+
-
+
&Edit
-
+
-
+
-
+
Title && Lyrics
-
+
Authors
-
+
&Add to Song
-
+
&Remove
-
+
-
+
Topic
-
+
A&dd to Song
-
+
R&emove
-
+
Song Book
-
+
-
+
Theme
-
+
-
+
Copyright Information
-
+
-
+
+
+
+
+
+
Comments
-
+
Theme, Copyright Info && Comments
-
+
Save && Preview
-
+
-
+
-
+
Error
-
+
-
+
-
+
@@ -3323,75 +3264,60 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
SongsPlugin.EditVerseForm
-
+
Edit Verse
-
+
-
+
@@ -3399,137 +3325,232 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
SongsPlugin.ImportWizardForm
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Starting import...
-
+
-
+
-
+
-
+
Select Import Source
-
+
Select the import format, and where to import from.
-
+
Format:
-
+
+
+ OpenLP 2.0
+
+
+
+
+
+
+
+
-
+
OpenSong
-
-
+
+
-
-
- CSV
-
-
-
-
+
+
-
-
+
+
-
+
+
+
+
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
Importing
-
+
-
+
Ready.
-
+
@@ -3537,110 +3558,110 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
SongsPlugin.MediaItem
-
+
Song
-
+
Song Maintenance
-
+
Maintain the lists of authors, topics and books
-
+
Search:
-
+
Type:
-
+
Clear
-
+
Search
-
+
-
+
Lyrics
-
+
Authors
-
+
-
+
-
-
- CCLI Licence:
-
-
-
+
-
+
-
+
+
+
+
+ CCLI Licence:
+
SongsPlugin.SongBookForm
-
+
-
+
-
+
-
+
Error
-
+
@@ -3648,160 +3669,173 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
SongsPlugin.SongImport
-
+
-
+
+
+ SongsPlugin.SongImportForm
+
+
+
+ Finished import.
+
+
+
+
+
+
+
SongsPlugin.SongMaintenanceForm
-
+
Song Maintenance
-
+
Authors
-
+
Topics
-
+
-
+
-
+
&Edit
-
+
-
+
Error
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
Delete Author
-
+
-
+
-
+
-
+
Delete Topic
-
+
Are you sure you want to delete the selected topic?
-
+
-
+
No topic selected!
-
+
Delete Book
-
+
Are you sure you want to delete the selected book?
-
+
-
+
@@ -3809,22 +3843,22 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
SongsPlugin.SongsTab
-
+
Songs
-
+
Songs Mode
-
+
-
+
@@ -3832,22 +3866,22 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
SongsPlugin.TopicsForm
-
+
Topic Maintenance
-
+
Topic name:
-
+
Error
-
+
@@ -3855,37 +3889,37 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
SongsPlugin.VerseType
-
+
Verse
-
+
Chorus
-
+
Bridge
-
+
Pre-Chorus
-
+
Intro
-
+
Ending
-
+
Other
diff --git a/resources/i18n/openlp_en_ZA.ts b/resources/i18n/openlp_en_ZA.ts
index 158671e38..24faf3bc9 100644
--- a/resources/i18n/openlp_en_ZA.ts
+++ b/resources/i18n/openlp_en_ZA.ts
@@ -3,652 +3,682 @@
AlertsPlugin
-
+
-
+ &Alert
-
+
-
+ Show an alert message.
-
+
-
+ <strong>Alerts Plugin</strong><br />The alert plugin controls the displaying of nursery alerts on the display screen
AlertsPlugin.AlertForm
-
+
Alert Message
-
+
-
+ Alert &text:
-
+
-
+ &Parameter(s):
-
+
&New
-
+
-
+ &Save
-
+
-
+ &Delete
-
+
-
+ Displ&ay
-
+
-
+ Display && Cl&ose
-
+
-
+ &Close
-
+
-
+ New Alert
-
+
-
+ You haven't specified any text for your alert. Please type in some text before clicking New.
AlertsPlugin.AlertsManager
-
+
-
+ Alert message created and displayed.
AlertsPlugin.AlertsTab
-
+
-
+ Alerts
-
+
- Font
+ Font
-
+
-
+ Font name:
-
+
-
+ Font color:
-
+
-
+ Background color:
-
+
-
+ Font size:
-
+
pt
-
+
-
+ Alert timeout:
-
+
-
+ s
-
+
Location:
-
+
-
+ Preview
-
+
-
+ OpenLP 2.0
-
+
-
+ Top
-
+
Middle
-
+
-
+ Bottom
BiblesPlugin
-
+
-
+ &Bible
-
+
-
+ <strong>Bible Plugin</strong><br />The Bible plugin provides the ability to display bible verses from different sources during the service.
BiblesPlugin.BibleDB
-
+
-
+ Book not found
-
+
-
+ The book you requested could not be found in this Bible. Please check your spelling and that this is a complete Bible not just one testament.
+
+
+
+ BiblesPlugin.BibleManager
+
+
+
+ Scripture Reference Error
+
+
+
+
+ Your scripture reference is either not supported by OpenLP or invalid. Please make sure your reference conforms to one of the following patterns:
+
+Book Chapter
+Book Chapter-Chapter
+Book Chapter:Verse-Verse
+Book Chapter:Verse-Verse,Verse-Verse
+Book Chapter:Verse-Verse,Chapter:Verse-Verse
+Book Chapter:Verse-Chapter:Verse
+
BiblesPlugin.BiblesTab
-
+
Bibles
-
+
Verse Display
-
+
Only show new chapter numbers
-
+
-
+ Layout style:
-
+
-
+ Display style:
-
+
-
+ Bible theme:
-
+
-
+ Verse Per Slide
-
+
-
+ Verse Per Line
-
+
-
+ Continuous
-
+
-
+ No Brackets
-
+
-
+ ( And )
-
+
-
+ { And }
-
+
-
+ [ And ]
-
+
-
+ Note:
+Changes do not affect verses already in the service.
-
+
-
+ Display dual Bible verses
BiblesPlugin.ImportWizardForm
-
+
- Bible Import Wizard
+ Bible Import Wizard
-
+
-
+ Welcome to the Bible Import Wizard
-
+
- This wizard will help you to import Bibles from a variety of formats. Click the next button below to start the process by selecting a format to import from.
+ This wizard will help you to import Bibles from a variety of formats. Click the next button below to start the process by selecting a format to import from.
-
+
- Select Import Source
+ Select Import Source
-
+
-
+ Select the import format, and where to import from.
-
+
- Format:
+ Format:
-
+
- OSIS
+ OSIS
-
+
- CSV
+ CSV
-
+
- OpenSong
+ OpenSong
-
+
- Web Download
+ Web Download
-
+
-
+ File location:
-
+
-
+ Books location:
-
+
-
+ Verse location:
-
+
-
+ Bible filename:
-
+
- Location:
+ Location:
-
+
- Crosswalk
+ Crosswalk
-
+
- BibleGateway
+ BibleGateway
-
+
- Bible:
+ Bible:
-
+
- Download Options
+ Download Options
-
+
- Server:
+ Server:
-
+
- Username:
+ Username:
-
+
-
+ Password:
-
+
-
+ Proxy Server (Optional)
-
+
- License Details
+ License Details
-
+
- Set up the Bible's license details.
+ Set up the Bible's license details.
-
+
-
+ Version name:
-
+
- Copyright:
+ Copyright:
-
+
- Permission:
+ Permission:
-
+
-
+ Importing
-
+
-
+ Please wait while your Bible is imported.
-
+
-
+ Ready.
-
+
- Invalid Bible Location
+ Invalid Bible Location
-
+
-
+ You need to specify a file to import your Bible from.
-
+ Invalid Books File
-
+ You need to specify a file with books of the Bible to use in the import.
-
+
-
+ Invalid Verse File
-
+
-
+ You need to specify a file of Bible verses to import.
-
+
- Invalid OpenSong Bible
+ Invalid OpenSong Bible
-
+
-
+ You need to specify an OpenSong Bible file to import.
-
+
- Empty Version Name
+ Empty Version Name
-
+
-
+ You need to specify a version name for your Bible.
-
+
- Empty Copyright
+ Empty Copyright
-
+
- You need to set a copyright for your Bible! Bibles in the Public Domain need to be marked as such.
+ You need to set a copyright for your Bible! Bibles in the Public Domain need to be marked as such.
-
+
- Bible Exists
+ Bible Exists
-
+
- This Bible already exists! Please import a different Bible or first delete the existing one.
+ This Bible already exists! Please import a different Bible or first delete the existing one.
-
+
-
+ Open OSIS File
-
+
-
+ Open Books CSV File
-
+
-
+ Open Verses CSV File
-
+
-
+ Open OpenSong Bible
-
+
- Starting import...
+ Starting import...
+
+
+
+
+ Finished import.
-
- Finished import.
-
-
-
- Your Bible import failed.
+ Your Bible import failed.
BiblesPlugin.MediaItem
-
+
- Bible
+ Bible
-
+
- Quick
+ Quick
-
+
-
+ Advanced
-
+
-
+ Version:
-
+
- Dual:
+ Dual:
-
+
-
+ Search type:
-
+
- Find:
+ Find:
-
+
- Search
+ Search
-
+
- Results:
+ Results:
-
+
- Book:
+ Book:
-
+
- Chapter:
+ Chapter:
-
+
-
+ Verse:
-
+
- From:
+ From:
-
+
-
+ To:
-
+
- Verse Search
+ Verse Search
-
+
- Text Search
+ Text Search
-
+
-
+ Clear
-
+
- Keep
+ Keep
-
+
-
+ No Book Found
-
+
- No matching book could be found in this Bible.
+ No matching book could be found in this Bible.
-
+
-
+ etc
-
+
-
+ Bible not fully loaded.
BiblesPlugin.Opensong
-
+
-
+ Importing
@@ -656,250 +686,227 @@ Changes do not affect verses already in the service.
-
+ <strong>Custom Plugin</strong><br />The custom plugin provides the ability to set up custom text slides that can be displayed on the screen the same way songs are. This plugin provides greater freedom over the songs plugin.
CustomPlugin.CustomTab
-
+
- Custom
+ Custom
-
+
- Custom Display
+ Custom Display
-
+
-
+ Display footer
CustomPlugin.EditCustomForm
-
+
- Edit Custom Slides
+ Edit Custom Slides
-
-
-
-
-
-
+
-
+ Move slide down one position.
-
+
-
+ &Title:
-
+
-
+ Add New
-
+
-
+ Add a new slide at bottom.
-
+
-
+ Edit
-
+
-
+ Edit the selected slide.
-
+
-
+ Edit All
-
+
-
+ Edit all the slides at once.
-
+
- Save
+ Save
-
+
-
+ Save the slide currently being edited.
-
+
-
+ Delete
-
+
-
+ Delete the selected slide.
-
+
-
+ Clear
-
+
-
+ Clear edit area
-
+
-
+ Split Slide
-
+
-
+ Split a slide into two by inserting a slide splitter.
-
+
-
+ The&me:
-
+
-
+ &Credits:
-
+
-
+ Save && Preview
-
+
- Error
+ Error
-
+ You need to type in a title.
-
+ You need to add at least one slide
+ You have one or more unsaved slides, please either save your slide(s) or clear your changes.
+
+
+
+
CustomPlugin.MediaItem
-
+
- Custom
+ Custom
-
+
-
+ You haven't selected an item to edit.
-
+
-
+ You haven't selected an item to delete.
ImagePlugin
-
+
-
-
-
-
- ImagePlugin.ImageTab
-
-
-
-
-
-
-
-
- Image Settings
-
-
-
-
-
-
-
-
-
- sec
+ <strong>Image Plugin</strong><br />The image plugin provides displaying of images.<br />One of the distinguishing features of this plugin is the ability to group a number of images together in the service manager, making the displaying of multiple images easier. This plugin can also make use of OpenLP's "timed looping" feature to create a slide show that runs automatically. In addition to this, images from the plugin can be used to override the current theme's background, which renders text-based items like songs with the selected image as a background instead of the background provided by the theme.
ImagePlugin.MediaItem
-
+
-
+ Image
-
+
- Select Image(s)
+ Select Image(s)
-
+
-
+ All Files
-
+
-
+ Replace Live Background
-
+
-
+ Replace Background
-
+
-
+ You must select an image to delete.
-
+
-
+ Image(s)
-
+
-
+ You must select an image to replace the background with.
-
+
-
+ You must select a media file to replace the background with.
@@ -907,54 +914,54 @@ Changes do not affect verses already in the service.
-
+ <strong>Media Plugin</strong><br />The media plugin provides playback of audio and video.
MediaPlugin.MediaItem
-
+
-
+ Media
-
+
-
+ Select Media
-
+
-
+ Replace Live Background
-
+
-
+ Replace Background
-
+
-
+ You must select a media file to delete.
OpenLP
-
+
-
+ Image Files
OpenLP.AboutForm
-
+
-
+ About OpenLP
-
+
-
+ OpenLP <version><revision> - Open Source Lyrics Projection
+
+OpenLP is free church presentation software, or lyrics projection software, used to display slides of songs, Bible verses, videos, images, and even presentations (if OpenOffice.org, PowerPoint or PowerPoint Viewer is installed) for church worship using a computer and a data projector.
+
+Find out more about OpenLP: http://openlp.org/
+
+OpenLP is written and maintained by volunteers. If you would like to see more free Christian software being written, please consider contributing by using the button below.
-
+
-
+ About
-
-
-
-
-
-
+
-
+ Credits
-
+
-
+ Copyright © 2004-2010 Raoul Snyman
+Portions copyright © 2004-2010 Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carsten Tinggaard
+
+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See below for more details.
+
+
+GNU GENERAL PUBLIC LICENSE
+Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
+
+Preamble
+
+The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.
+
+To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.
+
+We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.
+
+Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations.
+
+Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all.
+
+The precise terms and conditions for copying, distribution and modification follow.
+
+GNU GENERAL PUBLIC LICENSE
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.
+
+1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:
+
+a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.
+
+b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.
+
+c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
+
+3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:
+
+a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
+
+b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
+
+c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
+
+If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.
+
+4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.
+
+5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.
+
+6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.
+
+7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.
+
+This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.
+
+9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version', you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.
+
+10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.
+
+NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.
+
+To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found.
+
+<one line to give the program's name and a brief idea of what it does.>
+Copyright (C) <year> <name of author>
+
+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this when it starts in an interactive mode:
+
+Gnomovision version 69, Copyright (C) year name of author
+Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type "show w".
+This is free software, and you are welcome to redistribute it under certain conditions; type "show c" for details.
+
+The hypothetical commands "show w" and "show c" should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than "show w" and "show c"; they could even be mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names:
+
+Yoyodyne, Inc., hereby disclaims all copyright interest in the program "Gnomovision" (which makes passes at compilers) written by James Hacker.
+
+<signature of Ty Coon>, 1 April 1989
+Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License.
-
+
- License
+ License
-
+
-
+ Contribute
-
+
- Close
+ Close
-
+
-
+ build %s
+
+
+
+
+ Project Lead
+ Raoul "superfly" Snyman
+
+Developers
+ Tim "TRB143" Bentley
+ Jonathan "gushie" Corwin
+ Michael "cocooncrash" Gorven
+ Scott "sguerrieri" Guerrieri
+ Raoul "superfly" Snyman
+ Martin "mijiti" Thompson
+ Jon "Meths" Tibble
+
+Contributors
+ Meinert "m2j" Jordan
+ Andreas "googol" Preikschat
+ Christian "crichter" Richter
+ Philip "Phill" Ridout
+ Maikel Stuivenberg
+ Carsten "catini" Tingaard
+ Frode "frodus" Woldsund
+
+Testers
+ Philip "Phill" Ridout
+ Wesley "wrst" Stout (lead)
+
+Packagers
+ Thomas "tabthorpe" Abthorpe (FreeBSD)
+ Tim "TRB143" Bentley (Fedora)
+ Michael "cocooncrash" Gorven (Ubuntu)
+ Matthias "matthub" Hub (Mac OS X)
+ Raoul "superfly" Snyman (Windows, Ubuntu)
+
+Built With
+ Python: http://www.python.org/
+ Qt4: http://qt.nokia.com/
+ PyQt4: http://www.riverbankcomputing.co.uk/software/pyqt/intro
+ Oxygen Icons: http://oxygen-icons.org/
+
OpenLP.AdvancedTab
-
+
-
-
-
-
-
-
+ Advanced
-
-
+
+ UI Settings
-
-
-
+
+
+ Number of recent files to display:
+
+ Remember active media manager tab on startup
+
+
+
-
+ Double-click to send items straight to live (requires restart)
OpenLP.AmendThemeForm
-
+
- Theme Maintenance
+ Theme Maintenance
-
+
-
+ Theme &name:
-
+
-
+ &Visibility:
-
+
- Opaque
+ Opaque
-
+
Transparent
-
+
Type:
-
+
Solid Colour
-
+
-
+
-
+ Image
-
+
-
+
-
+
Horizontal
-
+
Vertical
-
+
Circular
-
+
-
+
Main Font
-
+
-
+
-
+
-
+
pt
-
+
-
+
-
+
Normal
-
+
Bold
-
+
Italics
-
+
-
+
-
+
-
+
-
+
-
+
-
+
Width:
-
+
Height:
-
+
px
-
+
-
+
Footer Font
-
+
-
+
Outline
-
+
-
+
-
+
-
+
Shadow
-
+
-
+
-
+
-
+
Alignment
-
+
-
+
-
+
Right
-
+
Centre
-
+
-
+
-
+ Top
-
+
Middle
-
+
-
+ Bottom
-
+
Slide Transition
-
+
-
+
-
+
-
+ Preview
-
+
-
+ All Files
-
+
-
+
-
+
-
+
@@ -1512,130 +1701,140 @@ This General Public License does not permit incorporating your program into prop
OpenLP.GeneralTab
-
+
-
+
-
+
Select monitor for output display:
-
+
-
+
Application Startup
-
+
Show blank screen warning
-
+
Automatically open the last service
-
+
-
+
Application Settings
-
-
- Prompt to save the service before starting new
-
-
-
-
- Preview Next Song from Service Manager
-
-
-
+
CCLI Details
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
primary
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
OpenLP.LanguageManager
-
+
-
+
@@ -1643,414 +1842,414 @@ This General Public License does not permit incorporating your program into prop
OpenLP.MainWindow
-
+
-
+ OpenLP 2.0
-
+
English
-
+
&File
-
+
&Import
-
+
&Export
-
+
&View
-
+
-
+
-
+
&Settings
-
+
-
+
-
+
Media Manager
-
+
Service Manager
-
+
-
+
&New
-
+
-
+
-
+
Ctrl+N
-
+
&Open
-
+
Open Service
-
+
-
+
Ctrl+O
-
+
-
+ &Save
-
+
-
+
-
+
Ctrl+S
-
+
-
+
-
+
-
+
-
+
-
+
Quit OpenLP
-
+
Alt+F4
-
+
-
+
-
+
-
+
-
+
-
+
F8
-
+
-
+
Toggle Theme Manager
-
+
-
+
-
+
&Service Manager
-
+
Toggle Service Manager.
-
+
-
+
F9
-
+
&Preview Panel
-
+
Toggle Preview Panel
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
List the plugins
-
+
Alt+F7
-
+
&User Guide
-
+
-
+
-
+
Ctrl+F1
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
&Live
-
+
-
+
-
+
OpenLP Version Updated
-
+
-
+
The Main Display has been blanked out
-
+
Save Changes to Service?
-
+
-
+
@@ -2058,157 +2257,157 @@ You can download the latest version from <a href="http://openlp.org/&quo
OpenLP.MediaManagerItem
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
Delete the selected item
-
+
-
+
-
+
Send the selected item live.
-
+
-
+
Add the selected item(s) to the service.
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
You must select one or more items
-
+
-
+
-
+
-
+
@@ -2216,57 +2415,57 @@ You can download the latest version from <a href="http://openlp.org/&quo
OpenLP.PluginForm
-
+
-
+
Plugin Details
-
+
-
+ Version:
-
+
-
+
-
+
Status:
-
+
Active
-
+
-
+
-
+
-
+
@@ -2274,22 +2473,22 @@ You can download the latest version from <a href="http://openlp.org/&quo
OpenLP.ServiceItemEditForm
-
+
-
+
-
+
-
+ Delete
-
+
@@ -2297,12 +2496,12 @@ You can download the latest version from <a href="http://openlp.org/&quo
OpenLP.ServiceManager
-
+
-
+
Create a new service
@@ -2312,7 +2511,7 @@ You can download the latest version from <a href="http://openlp.org/&quo
Open Service
-
+
@@ -2322,107 +2521,107 @@ You can download the latest version from <a href="http://openlp.org/&quo
-
+
Save this service
-
+
Theme:
-
+
Select a theme for the service.
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
&Live Verse
-
+
&Change Item Theme
@@ -2432,7 +2631,7 @@ You can download the latest version from <a href="http://openlp.org/&quo
Save Changes to Service?
-
+
@@ -2447,28 +2646,28 @@ You can download the latest version from <a href="http://openlp.org/&quo
-
+
Error
-
+
-
+
-
+
-
+
@@ -2476,7 +2675,7 @@ The content encoding is not UTF-8.
OpenLP.ServiceNoteForm
-
+
Service Item Notes
@@ -2484,7 +2683,7 @@ The content encoding is not UTF-8.
OpenLP.SettingsForm
-
+
@@ -2492,77 +2691,77 @@ The content encoding is not UTF-8.
OpenLP.SlideController
-
+
Live
-
+
-
+ Preview
-
+
-
+
Move to previous
-
+
Move to next slide.
-
+
Move to last
-
+
-
+
Move to live
-
+
Edit and re-preview Song.
-
+
Start continuous loop
-
+
-
+
-
+ s
-
+
Delay between slides in seconds.
-
+
Start playing media
-
+
Go to Verse
@@ -2575,67 +2774,67 @@ The content encoding is not UTF-8.
-
+
-
+
Edit Theme
-
+
-
+
Delete Theme
-
+
-
+
Import Theme
-
+
-
+
Export Theme
-
+
-
+
-
+
-
+
-
+
@@ -2645,22 +2844,22 @@ The content encoding is not UTF-8.
-
+
-
+
-
+
-
+
@@ -2670,7 +2869,7 @@ The content encoding is not UTF-8.
Error
-
+
@@ -2749,47 +2948,47 @@ The content encoding is not UTF-8.
OpenLP.ThemesTab
-
+
Themes
-
+
-
+
-
+
-
+
Use the theme from each song in the database. If a song doesn't have a theme associated with it, then use the service's theme. If the service doesn't have a theme, then use the global theme.
-
+
-
+
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.
-
+
-
+
Use the global theme, overriding any themes associated with either the service or the songs.
@@ -2797,7 +2996,7 @@ The content encoding is not UTF-8.
PresentationPlugin
-
+
@@ -2805,17 +3004,17 @@ The content encoding is not UTF-8.
PresentationPlugin.MediaItem
-
+
Presentation
-
+
-
+
@@ -2835,17 +3034,17 @@ The content encoding is not UTF-8.
-
+
-
+
-
+
@@ -2853,22 +3052,22 @@ The content encoding is not UTF-8.
PresentationPlugin.PresentationTab
-
+
-
+
Available Controllers
-
+
-
+ Advanced
-
+
@@ -2876,30 +3075,30 @@ The content encoding is not UTF-8.
RemotePlugin
-
-
+
+
RemotePlugin.RemoteTab
-
+
Remotes
-
+
-
+
-
+
@@ -2907,27 +3106,27 @@ The content encoding is not UTF-8.
SongUsagePlugin
-
+
-
+
-
+
-
+
-
+
@@ -2942,7 +3141,7 @@ The content encoding is not UTF-8.
-
+
@@ -2950,17 +3149,17 @@ The content encoding is not UTF-8.
SongUsagePlugin.SongUsageDeleteForm
-
+
-
+
-
+
@@ -2968,27 +3167,27 @@ The content encoding is not UTF-8.
SongUsagePlugin.SongUsageDetailForm
-
+
Output File Location
-
+
-
+
-
+
-
+
Report Location
@@ -2996,108 +3195,17 @@ The content encoding is not UTF-8.
SongsPlugin
-
+
&Song
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -3105,32 +3213,32 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
SongsPlugin.AuthorsForm
-
+
Author Maintenance
-
+
-
+
First name:
-
+
Last name:
-
+
Error
-
+
You need to type in the first name of the author.
@@ -3140,7 +3248,7 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
-
+
@@ -3148,152 +3256,152 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
SongsPlugin.EditSongForm
-
+
Song Editor
-
+
-
+ &Title:
-
+
-
+
-
+
-
+
-
+
-
+ &Delete
-
+
Title && Lyrics
-
+
Authors
-
+
-
+
&Remove
-
+
-
+
Topic
-
+
-
+
-
+
-
+
-
+
Theme
-
+
-
+
Copyright Information
-
+
-
+
-
+
-
+
-
+ Save && Preview
-
+
-
+
-
+
Error
-
+
-
+
-
+
@@ -3323,57 +3431,57 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -3381,17 +3489,17 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
SongsPlugin.EditVerseForm
-
+
Edit Verse
-
+
-
+
@@ -3399,220 +3507,315 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
SongsPlugin.ImportWizardForm
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
+
Starting import...
-
+
-
+
-
+
-
+
Select Import Source
-
+
-
+ Select the import format, and where to import from.
-
+
Format:
-
+
-
+
OpenSong
-
-
-
-
-
-
-
- CSV
-
-
-
+
-
+
-
+
-
+
-
+
-
+ Importing
-
+
-
+
+ Ready.
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ OpenLP 2.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
SongsPlugin.MediaItem
-
+
Song
-
+
-
+
Maintain the lists of authors, topics and books
-
+
Search:
-
+
Type:
-
+
-
+ Clear
-
+
Search
-
+
Titles
-
+
Lyrics
-
+
Authors
-
+
-
+
-
+
CCLI License:
-
+
-
+
-
+
@@ -3620,27 +3823,27 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
SongsPlugin.SongBookForm
-
+
-
+
-
+
-
+
Error
-
+
@@ -3648,160 +3851,173 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
SongsPlugin.SongImport
-
+
-
+
+
+ SongsPlugin.SongImportForm
+
+
+
+ Finished import.
+
+
+
+
+
+
+
SongsPlugin.SongMaintenanceForm
-
+
-
+
Authors
-
+
-
+
-
+
-
+
-
+
-
+ &Delete
-
+
Error
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
Are you sure you want to delete the selected author?
-
+
-
+
No author selected!
-
+
Delete Topic
-
+
-
+
-
+
-
+
Delete Book
-
+
Are you sure you want to delete the selected book?
-
+
-
+
No book selected!
@@ -3809,22 +4025,22 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
SongsPlugin.SongsTab
-
+
-
+
-
+
-
+
@@ -3832,22 +4048,22 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
SongsPlugin.TopicsForm
-
+
-
+
Topic name:
-
+
Error
-
+
You need to type in a topic name!
@@ -3855,37 +4071,37 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
SongsPlugin.VerseType
-
+
-
+
-
+
Bridge
-
+
Pre-Chorus
-
+
Intro
-
+
Ending
-
+
Other
diff --git a/resources/i18n/openlp_es.ts b/resources/i18n/openlp_es.ts
index 213fd8568..93d04b1c4 100644
--- a/resources/i18n/openlp_es.ts
+++ b/resources/i18n/openlp_es.ts
@@ -3,17 +3,17 @@
AlertsPlugin
-
+
&Alerta
-
+
-
+
@@ -21,57 +21,57 @@
AlertsPlugin.AlertForm
-
+
Mensaje de Alerta
-
+
-
+
-
+
&Nuevo
-
+
&Guardar
-
+
-
+
-
+
-
+
-
+
-
+
@@ -79,7 +79,7 @@
AlertsPlugin.AlertsManager
-
+
@@ -87,77 +87,77 @@
AlertsPlugin.AlertsTab
-
+
Alertas
-
+
Tipo de Letra
-
+
-
+
-
+
-
+
-
+
pt
-
+
Espera:
-
+
s
-
+
Ubicación:
-
+
Vista Previa
-
+
OpenLP 2.0
-
+
-
+
Medio
-
+
@@ -165,12 +165,12 @@
BiblesPlugin
-
+
&Biblia
-
+
@@ -178,91 +178,112 @@
BiblesPlugin.BibleDB
-
+
-
+
+
+ BiblesPlugin.BibleManager
+
+
+
+
+
+
+
+
+
+
+
BiblesPlugin.BiblesTab
-
+
Biblias
-
+
Visualización de versículos
-
+
Solo mostrar los números de capítulos nuevos
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -270,167 +291,167 @@ Changes do not affect verses already in the service.
BiblesPlugin.ImportWizardForm
-
+
Asistente de Importación de Biblias
-
+
Bienvenido al Asistente de Importación de Biblias
-
+
Este asistente le ayudará a importar Biblias en una variedad de formatos. Haga clic en el botón siguiente para empezar el proceso seleccionando un formato a importar.
-
+
Seleccione Origen de Importación
-
+
Seleccione el formato y el lugar del cual importar.
-
+
Formato:
-
+
OSIS
-
+
CSV
-
+
OpenSong
-
+
Descarga Web
-
+
-
+
-
+
-
+
-
+
Ubicación:
-
+
Crosswalk
-
+
BibleGateway
-
+
Biblia:
-
+
Opciones de Descarga
-
+
Servidor:
-
+
Usuario:
-
+
Contraseña:
-
+
Servidor Proxy (Opcional)
-
+
Detalles de Licencia
-
+
Establezca los detalles de licencia de la Biblia.
-
+
-
+
Derechos de autor:
-
+
Permisos:
-
+
Importando
-
+
Por favor, espere mientras que la Biblia es importada.
-
+
Listo.
-
+
Ubicación de Biblia no válida
-
+
@@ -445,87 +466,87 @@ Changes do not affect verses already in the service.
-
+
Archivo de Versículo No Válido
-
+
-
+
Biblia OpenSong No Válida
-
+
-
+
Nombre de Versión Vacío
-
+
-
+
Derechos de autor en blanco
-
+
¡Tiene que establecer los derechos de autor de la Biblia! Biblias de Dominio Público deben ser marcados como tales.
-
+
Ya existe la Biblia
-
+
¡La Biblia ya existe! Por favor, importe una diferente o borre la anterior.
-
+
-
+
-
+
-
+
Abrir Biblia OpenSong
-
+
Iniciando importación...
-
+
Importación finalizada.
-
+
La importación de su Biblia falló.
@@ -533,112 +554,112 @@ Changes do not affect verses already in the service.
BiblesPlugin.MediaItem
-
+
Biblia
-
+
Rápida
-
+
Avanzado
-
+
Versión:
-
+
Paralela:
-
+
-
+
Encontrar:
-
+
Buscar
-
+
Resultados:
-
+
Libro:
-
+
Capítulo:
-
+
Versículo:
-
+
Desde:
-
+
Hasta:
-
+
Búsqueda de versículo
-
+
Búsqueda de texto
-
+
Limpiar
-
+
Conservar
-
+
No se encontró el libro
-
+
No se encuentra un libro que concuerde, en esta Biblia.
-
+
-
+
@@ -646,7 +667,7 @@ Changes do not affect verses already in the service.
BiblesPlugin.Opensong
-
+
Importando
@@ -662,17 +683,17 @@ Changes do not affect verses already in the service.
CustomPlugin.CustomTab
-
+
-
+
Presentación Personalizada
-
+
@@ -680,112 +701,112 @@ Changes do not affect verses already in the service.
CustomPlugin.EditCustomForm
-
+
Editar Diapositivas Personalizadas
-
-
+
+
-
+
-
+
-
+
Agregar Nueva
-
+
-
+
Editar
-
+
-
+
Editar Todo
-
+
-
+
Guardar
-
+
-
+
Eliminar
-
+
-
+
Limpiar
-
+
Limpiar el área de edición
-
+
-
+
-
+
-
+
-
+
Guardar && Vista Previa
-
+
Error
@@ -808,17 +829,17 @@ Changes do not affect verses already in the service.
CustomPlugin.MediaItem
-
+
-
+
-
+
@@ -826,78 +847,55 @@ Changes do not affect verses already in the service.
ImagePlugin
-
+
-
- ImagePlugin.ImageTab
-
-
-
- Imágenes
-
-
-
-
- Preferencias de Imagen
-
-
-
-
-
-
-
-
-
- seg
-
-
ImagePlugin.MediaItem
-
+
Imagen
-
+
Seleccionar Imagen(es)
-
+
-
+
-
+
-
+
-
+
Imagen(es)
-
+
-
+
@@ -913,27 +911,27 @@ Changes do not affect verses already in the service.
MediaPlugin.MediaItem
-
+
Medios
-
+
Seleccionar Medios
-
+
-
+
-
+
@@ -941,7 +939,7 @@ Changes do not affect verses already in the service.
OpenLP
-
+
@@ -949,12 +947,12 @@ Changes do not affect verses already in the service.
OpenLP.AboutForm
-
+
Acerca de OpenLP
-
+
-
+
Acerca De
-
+
-
+
Créditos
-
+
-
+
Licencia
-
+
Contribuir
-
+
Cerrar
-
+
@@ -1166,27 +1173,27 @@ This General Public License does not permit incorporating your program into prop
OpenLP.AdvancedTab
-
+
Avanzado
-
+
-
+
-
+
-
+
@@ -1194,317 +1201,317 @@ This General Public License does not permit incorporating your program into prop
OpenLP.AmendThemeForm
-
+
Mantenimiento de Temas
-
+
-
+
-
+
Opaco
-
+
Transparente
-
+
Tipo:
-
+
Color Sólido
-
+
Gradiente
-
+
Imagen
-
+
Imagen:
-
+
-
+
Horizontal
-
+
Vertical
-
+
Circular
-
+
-
+
Tipo de Letra Principal
-
+
Fuente:
-
+
-
+
Tamaño:
-
+
pt
-
+
-
+
-
+
Normal
-
+
Negrita
-
+
Cursiva
-
+
Negrita/Cursiva
-
+
-
+
Ubicación en la pantalla
-
+
-
+
-
+
-
+
Ancho:
-
+
Altura:
-
+
px
-
+
-
+
Fuente de Pie de Página
-
+
-
+
Contorno
-
+
-
+
-
+
-
+
Sombra
-
+
-
+
-
+
-
+
Alineación
-
+
-
+
Izquierda
-
+
Derecha
-
+
Centro
-
+
-
+
-
+
Medio
-
+
-
+
Transición de Diapositiva
-
+
-
+
-
+
Vista Previa
-
+
-
+
-
+
-
+
-
+
@@ -1512,117 +1519,127 @@ This General Public License does not permit incorporating your program into prop
OpenLP.GeneralTab
-
+
General
-
+
Monitores
-
+
Seleccionar monitor para visualizar la salida:
-
+
-
+
Inicio de la Aplicación
-
+
Mostrar advertencia de pantalla en blanco
-
+
Abrir automáticamente el último servicio
-
+
Mostrar pantalla de bienvenida
-
+
Configuración del Programa
-
-
- Pedir salvar el Servicio al crear uno Nuevo
-
-
-
-
- Vista Previa de la Siguiente Canción en el Servicio
-
-
-
-
- Detalles de CCLI
-
-
-
-
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Detalles de CCLI
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
Pantalla
-
+
primario
@@ -1630,12 +1647,12 @@ This General Public License does not permit incorporating your program into prop
OpenLP.LanguageManager
-
+
-
+
@@ -1643,414 +1660,414 @@ This General Public License does not permit incorporating your program into prop
OpenLP.MainWindow
-
+
OpenLP 2.0
-
+
Ingles
-
+
&Archivo
-
+
&Importar
-
+
&Exportar
-
+
&Ver
-
+
M&odo
-
+
&Herramientas
-
+
&Preferencias
-
+
&Idioma
-
+
&Ayuda
-
+
Gestor de Medios
-
+
Gestor de Servicio
-
+
Gestor de Temas
-
+
&Nuevo
-
+
Servicio Nuevo
-
+
-
+
Ctrl+N
-
+
&Abrir
-
+
Abrir Servicio
-
+
-
+
Ctrl+O
-
+
&Guardar
-
+
Guardar Servicio
-
+
-
+
Crtl+G
-
+
Guardar &Como...
-
+
Guardar Servicio Como
-
+
-
+
-
+
&Salir
-
+
Salir de OpenLP
-
+
Alt+F4
-
+
&Tema
-
+
-
+
Gestor de &Medios
-
+
Alternar Gestor de Medios
-
+
-
+
F8
-
+
Gestor de &Temas
-
+
Alternar Gestor de Temas
-
+
-
+
F10
-
+
Gestor de &Servicio
-
+
Alternar Gestor de Servicio
-
+
-
+
F9
-
+
&Panel de Vista Previa
-
+
Alternar Panel de Vista Previa
-
+
-
+
F11
-
+
-
+
-
+
-
+
F12
-
+
Lista de &Plugins
-
+
Lista de Plugins
-
+
Alt+F7
-
+
Guía de &Usuario
-
+
&Acerca De
-
+
Más información acerca de OpenLP
-
+
Ctrl+F1
-
+
&Ayuda En Línea
-
+
Sitio &Web
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
En &vivo
-
+
-
+
-
+
Versión de OpenLP Actualizada
-
+
Pantalla Principal de OpenLP en Blanco
-
+
La Pantalla Principal esta en negro
-
+
-
+
-
+
@@ -2058,157 +2075,157 @@ You can download the latest version from <a href="http://openlp.org/&quo
OpenLP.MediaManagerItem
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
Borrar el ítem seleccionado
-
+
-
+
Vista Previa del ítem seleccionado
-
+
Enviar en vivo el ítem seleccionado
-
+
-
+
Agregar el elemento(s) seleccionado al servicio
-
+
-
+
-
+
-
+
Mo&star En Vivo
-
+
&Agregar al Servicio
-
+
-
+
-
+
-
+
-
+
-
+
Usted debe seleccionar uno o más elementos
-
+
-
+
-
+
-
+
@@ -2216,57 +2233,57 @@ You can download the latest version from <a href="http://openlp.org/&quo
OpenLP.PluginForm
-
+
Lista de Plugins
-
+
Detalles de Plugin
-
+
Versión:
-
+
TextLabel
-
+
Acerca de:
-
+
Estado:
-
+
Activo
-
+
Inactivo
-
+
-
+
-
+
@@ -2274,22 +2291,22 @@ You can download the latest version from <a href="http://openlp.org/&quo
OpenLP.ServiceItemEditForm
-
+
-
+
-
+
Eliminar
-
+
@@ -2297,12 +2314,12 @@ You can download the latest version from <a href="http://openlp.org/&quo
OpenLP.ServiceManager
-
+
Servicio Nuevo
-
+
Crear un servicio nuevo
@@ -2312,7 +2329,7 @@ You can download the latest version from <a href="http://openlp.org/&quo
Abrir Servicio
-
+
Abrir un servicio existente
@@ -2322,107 +2339,107 @@ You can download the latest version from <a href="http://openlp.org/&quo
Guardar Servicio
-
+
Guardar este servicio
-
+
Tema:
-
+
Seleccione un tema para el servicio
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
&Editar Ítem
-
+
-
+
&Notas
-
+
&Previzualizar Verso
-
+
Verso En &Vivo
-
+
&Cambiar Tema de Ítem
@@ -2432,7 +2449,7 @@ You can download the latest version from <a href="http://openlp.org/&quo
-
+
@@ -2447,28 +2464,28 @@ You can download the latest version from <a href="http://openlp.org/&quo
-
+
Error
-
+
-
+
-
+
-
+
@@ -2476,7 +2493,7 @@ The content encoding is not UTF-8.
OpenLP.ServiceNoteForm
-
+
Notas de Elemento de Servicio
@@ -2484,7 +2501,7 @@ The content encoding is not UTF-8.
OpenLP.SettingsForm
-
+
@@ -2492,77 +2509,77 @@ The content encoding is not UTF-8.
OpenLP.SlideController
-
+
En vivo
-
+
Vista Previa
-
+
Ir al principio
-
+
Regresar al anterior
-
+
Ir al siguiente
-
+
Mover al final
-
+
-
+
Proyectar en vivo
-
+
Editar y re-visualizar Canción
-
+
Iniciar bucle continuo
-
+
Detener el bucle
-
+
s
-
+
Espera entre diapositivas en segundos
-
+
Iniciar la reproducción de medios
-
+
Ir al Verso
@@ -2575,67 +2592,67 @@ The content encoding is not UTF-8.
Tema Nuevo
-
+
-
+
Editar Tema
-
+
-
+
Eliminar Tema
-
+
-
+
Importar Tema
-
+
-
+
Exportar Tema
-
+
-
+
-
+
-
+
-
+
@@ -2645,22 +2662,22 @@ The content encoding is not UTF-8.
-
+
-
+
-
+
-
+
@@ -2670,7 +2687,7 @@ The content encoding is not UTF-8.
Error
-
+
@@ -2749,47 +2766,47 @@ The content encoding is not UTF-8.
OpenLP.ThemesTab
-
+
Temas
-
+
-
+
-
+
-
+
Utilice el tema de cada canción en la base de datos. Si una canción no tiene un tema asociado, utilizar el tema del servicio. Si el servicio no tiene un tema, utilizar el tema global.
-
+
-
+
Utilizar el tema del servicio, ignorando el tema de las canciones individuales. Si el servicio no tiene un tema, utilizar el tema global.
-
+
-
+
Utilice el tema global, ignorado los temas asociados con el servicio o con las canciones.
@@ -2797,7 +2814,7 @@ The content encoding is not UTF-8.
PresentationPlugin
-
+
@@ -2805,17 +2822,17 @@ The content encoding is not UTF-8.
PresentationPlugin.MediaItem
-
+
Presentación
-
+
Seleccionar Presentación(es)
-
+
@@ -2835,17 +2852,17 @@ The content encoding is not UTF-8.
Ya existe una presentación con ese nombre.
-
+
-
+
-
+
@@ -2853,22 +2870,22 @@ The content encoding is not UTF-8.
PresentationPlugin.PresentationTab
-
+
Presentaciones
-
+
Controladores Disponibles
-
+
-
+ Avanzado
-
+
@@ -2876,30 +2893,30 @@ The content encoding is not UTF-8.
RemotePlugin
-
-
+
+
RemotePlugin.RemoteTab
-
+
Remotas
-
+
-
+
-
+
@@ -2907,27 +2924,27 @@ The content encoding is not UTF-8.
SongUsagePlugin
-
+
-
+
-
+
-
+
-
+
@@ -2942,7 +2959,7 @@ The content encoding is not UTF-8.
-
+
@@ -2950,154 +2967,63 @@ The content encoding is not UTF-8.
SongUsagePlugin.SongUsageDeleteForm
-
+
+
+
+
+
+
-
+
-
-
-
-
-
SongUsagePlugin.SongUsageDetailForm
-
-
- Archivo de Salida
-
-
-
+
-
+
-
+
hasta
-
+
Ubicación de Reporte
+
+
+
+ Archivo de Salida
+
SongsPlugin
-
+
&Canción
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -3105,32 +3031,32 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
SongsPlugin.AuthorsForm
-
+
Mantenimiento de Autores
-
+
Mostrar:
-
+
Nombre:
-
+
Apellido:
-
+
Error
-
+
Tiene que escribir el nombre del autor.
@@ -3140,7 +3066,7 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
Debe ingresar el apellido del autor.
-
+
@@ -3148,152 +3074,167 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
SongsPlugin.EditSongForm
-
+
Editor de Canción
-
+
-
+
+
+
+
+
+
-
+
+
+
+
+
+
-
+
&Editar
-
+
-
+
-
+
Título && Letra
-
+
Autores
-
+
&Agregar a Canción
-
+
&Quitar
-
+
-
+
Categoría
-
+
A&gregar a Canción
-
+
&Quitar
-
+
Himnario
-
+
-
+
Tema
-
+
-
+
Información de Derechos de Autor
-
+
-
+
+
+
+
+
+
Comentarios
-
+
Tema, Derechos de Autor && Comentarios
-
+
Guardar && Vista Previa
-
+
-
+
-
+
Error
-
+
-
+
-
+
@@ -3323,75 +3264,60 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
SongsPlugin.EditVerseForm
-
+
Editar Verso
-
+
-
+
@@ -3399,137 +3325,232 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
SongsPlugin.ImportWizardForm
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Iniciando importación...
-
+
-
+
-
+
-
+
Seleccione Origen de Importación
-
+
Seleccione el formato y el lugar del cual importar.
-
+
Formato:
-
+
+
+ OpenLP 2.0
+
+
+
+
+
+
+
+
-
+
OpenSong
-
-
+
+
-
-
- CSV
-
-
-
-
+
+
-
-
+
+
-
+
+
+
+
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
Importando
-
+
-
+
Listo.
-
+
@@ -3537,110 +3558,110 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
SongsPlugin.MediaItem
-
+
Canción
-
+
-
+
Administrar la lista de autores, categorías y libros
-
+
Buscar:
-
+
Tipo:
-
+
Limpiar
-
+
Buscar
-
+
Títulos
-
+
Letra
-
+
Autores
-
+
-
+
-
-
- Licencia CCLI:
-
-
-
+
-
+
-
+
+
+
+
+ Licencia CCLI:
+
SongsPlugin.SongBookForm
-
+
-
+
-
+
-
+
Error
-
+
@@ -3648,160 +3669,173 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
SongsPlugin.SongImport
-
+
-
+
+
+ SongsPlugin.SongImportForm
+
+
+
+ Importación finalizada.
+
+
+
+
+
+
+
SongsPlugin.SongMaintenanceForm
-
+
-
+
Autores
-
+
Categoría
-
+
-
+
-
+
&Editar
-
+
-
+
Error
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
Borrar Autor
-
+
¿Está seguro que desea eliminar el autor seleccionado?
-
+
-
+
¡Ningún autor seleccionado!
-
+
Borrar Categoría
-
+
¿Está seguro que desea eliminar la categoría seleccionada?
-
+
-
+
¡No seleccionó la categoría!
-
+
Eliminar Libro
-
+
¿Está seguro de que quiere eliminar el libro seleccionado?
-
+
-
+
¡Ningún libro seleccionado!
@@ -3809,22 +3843,22 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
SongsPlugin.SongsTab
-
+
Canciones
-
+
Modo de canciones
-
+
-
+
@@ -3832,22 +3866,22 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
SongsPlugin.TopicsForm
-
+
Mantenimiento de Categorías
-
+
Categoría:
-
+
Error
-
+
¡Usted tiene que escribir un nombre para la categoría!
@@ -3855,37 +3889,37 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
SongsPlugin.VerseType
-
+
Verso
-
+
Coro
-
+
Puente
-
+
Pre-Coro
-
+
Intro
-
+
Final
-
+
Otro
diff --git a/resources/i18n/openlp_et.ts b/resources/i18n/openlp_et.ts
index 8a0658d97..d37314bdb 100644
--- a/resources/i18n/openlp_et.ts
+++ b/resources/i18n/openlp_et.ts
@@ -3,17 +3,17 @@
AlertsPlugin
-
+
-
+
-
+
@@ -21,57 +21,57 @@
AlertsPlugin.AlertForm
-
+
-
+
-
+
-
+
&Uus
-
+
&Salvesta
-
+
-
+
-
+
-
+
-
+
-
+
@@ -79,7 +79,7 @@
AlertsPlugin.AlertsManager
-
+
@@ -87,77 +87,77 @@
AlertsPlugin.AlertsTab
-
+
-
+
-
+
pt
-
+
-
+
s
-
+
-
+
Eelvaade
-
+
Üleval
-
+
All
-
+
Keskel
-
+
-
+
-
+
-
+
-
+
OpenLP 2.0
@@ -165,12 +165,12 @@
BiblesPlugin
-
+
-
+
@@ -178,91 +178,112 @@
BiblesPlugin.BibleDB
-
+
-
+
+
+ BiblesPlugin.BibleManager
+
+
+
+
+
+
+
+
+
+
+
BiblesPlugin.BiblesTab
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -270,162 +291,162 @@ Changes do not affect verses already in the service.
BiblesPlugin.ImportWizardForm
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -440,92 +461,92 @@ Changes do not affect verses already in the service.
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -533,112 +554,112 @@ Changes do not affect verses already in the service.
BiblesPlugin.MediaItem
-
+
-
+
-
+
-
+
Versioon:
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -646,7 +667,7 @@ Changes do not affect verses already in the service.
BiblesPlugin.Opensong
-
+
@@ -662,17 +683,17 @@ Changes do not affect verses already in the service.
CustomPlugin.CustomTab
-
+
-
+
-
+
@@ -680,112 +701,107 @@ Changes do not affect verses already in the service.
CustomPlugin.EditCustomForm
-
+
Kohandatud slaidide muutmine
-
+
Uue lisamine
-
+
Muuda
-
+
Kõigi muutmine
-
+
Salvesta
-
+
Kustuta
-
+
Puhasta
-
+
Muutmise ala puhastamine
-
+
Tükelda slaid
-
+
Salvesta && eelvaatle
-
+
Viga
-
-
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -804,21 +820,26 @@ Changes do not affect verses already in the service.
+
+
+
+
+
CustomPlugin.MediaItem
-
+
-
+
-
+
@@ -826,78 +847,55 @@ Changes do not affect verses already in the service.
ImagePlugin
-
+
-
- ImagePlugin.ImageTab
-
-
-
- Pildid
-
-
-
-
- Pildi sätted
-
-
-
-
- s
-
-
-
-
-
-
-
ImagePlugin.MediaItem
-
+
Pilt
-
+
Pildi (piltide) valimine
-
+
-
+
Ekraani tausta asendamine
-
+
Pilt(pildid)
-
+
-
+
-
+
-
+
@@ -913,27 +911,27 @@ Changes do not affect verses already in the service.
MediaPlugin.MediaItem
-
+
Meedia
-
+
Meedia valimine
-
+
-
+
-
+
@@ -941,7 +939,7 @@ Changes do not affect verses already in the service.
OpenLP
-
+
@@ -949,12 +947,12 @@ Changes do not affect verses already in the service.
OpenLP.AboutForm
-
+
OpenLP-st lähemalt
-
+
-
+
Programmist
-
-
- Projekti juht
- Raoul "superfly" Snyman
-
-Arendajad
- Tim "TRB143" Bentley
- Jonathan "gushie" Corwin
- Michael "cocooncrash" Gorven
- Scott "sguerrieri" Guerrieri
- Raoul "superfly" Snyman
- Martin "mijiti" Thompson
- Jon "Meths" Tibble
-
-Kaastöölised
- Meinert "m2j" Jordan
- Christian "crichter" Richter
- Maikel Stuivenberg
- Carsten "catini" Tingaard
-
-Testijad
- Philip "Phill" Ridout
- Wesley "wrst" Stout (juht)
-
-Pakendajad
- Thomas "tabthorpe" Abthorpe (FreeBSD)
- Tim "TRB143" Bentley (Fedora)
- Michael "cocooncrash" Gorven (Ubuntu)
- Matthias "matthub" Hub (Mac OS X)
- Raoul "superfly" Snyman (Windows)
-
-
-
+
Autorid
-
+
-
+
Litsents
-
+
Aita kaasa
-
+
Sulge
-
+
+
+
+
+
+
OpenLP.AdvancedTab
-
+
-
+
-
+
-
+
-
+
@@ -1227,317 +1207,317 @@ This General Public License does not permit incorporating your program into prop
OpenLP.AmendThemeForm
-
+
Kujunduste haldus
-
+
-
+
-
+
Läbipaistmatu
-
+
Läbipaistev
-
+
Liik:
-
+
Ühtlane värv
-
+
Üleminek
-
+
Pilt
-
+
Pilt:
-
+
-
+
Horisontaalne
-
+
Vertikaalne
-
+
Ümmargune
-
+
-
+
Peamine kirjastiil
-
+
Kirjastiil:
-
+
-
+
Suurus:
-
+
pt
-
+
-
+
-
+
Tavaline
-
+
Rasvane
-
+
Kursiiv
-
+
Rasvane/kaldkiri
-
+
-
+
Kuva asukoht
-
+
-
+
-
+
-
+
Laius:
-
+
Kõrgus:
-
+
px
-
+
-
+
Jaluse kirjatüüp
-
+
-
+
Välisjoon
-
+
-
+
-
+
-
+
Vari
-
+
-
+
-
+
-
+
Joondus
-
+
-
+
Vasakul
-
+
Paremal
-
+
Keskel
-
+
-
+
Üleval
-
+
Keskel
-
+
All
-
+
Slaidide üleminek
-
+
-
+
-
+
Eelvaade
-
+
-
+
-
+
-
+
-
+
@@ -1545,130 +1525,140 @@ This General Public License does not permit incorporating your program into prop
OpenLP.GeneralTab
-
+
Vali väljundkuva monitor:
-
+
Kuvatakse, kui on ainult üks ekraan
-
+
Rakenduse käivitumine
-
+
Kuvatakse tühja ekraani hoiatust
-
+
Automaatselt avatakse viimane teenistus
-
+
Käivitumisel kuvatakse logo
-
+
Rakenduse sätted
-
-
- Uue teenistuse loomise pakutakse vana salvestamist
-
-
-
-
- Teenistuse haldurist kuvatakse järgmise laulu eelvaade
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
Üldine
-
+
Monitorid
-
+
Ekraan
-
+
peamine
-
+
CCLI andmed
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
OpenLP.LanguageManager
-
+
Keel
-
+
@@ -1676,414 +1666,414 @@ This General Public License does not permit incorporating your program into prop
OpenLP.MainWindow
-
+
Eesti
-
+
OpenLP 2.0
-
+
&Fail
-
+
&Impordi
-
+
&Ekspordi
-
+
&Vaade
-
+
&Režiim
-
+
&Tööriistad
-
+
&Sätted
-
+
&Keel
-
+
A&bi
-
+
Meediahaldur
-
+
Teenistuse haldur
-
+
Kujunduse haldur
-
+
&Uus
-
+
Uus teenistus
-
+
-
+
Ctrl+N
-
+
&Ava
-
+
Teenistuse avamine
-
+
-
+
Ctrl+O
-
+
&Salvesta
-
+
Salvesta teenistus
-
+
-
+
Ctrl+S
-
+
Salvesta &kui...
-
+
Salvesta teenistus kui
-
+
-
+
-
+
&Välju
-
+
Lahku OpenLPst
-
+
Alt+F4
-
+
&Kujundus
-
+
-
+
&Meediahaldur
-
+
Meediahalduri lüliti
-
+
-
+
F8
-
+
&Kujunduse haldur
-
+
Kujunduse halduri lüliti
-
+
-
+
F10
-
+
&Teenistuse haldur
-
+
Teenistuse halduri lüliti
-
+
-
+
F9
-
+
&Eelvaatluspaneel
-
+
Eelvaatluspaneeli lüliti
-
+
-
+
F11
-
+
-
+
-
+
-
+
F12
-
+
&Pluginate loend
-
+
Pluginate loend
-
+
Alt+F7
-
+
&Kasutajajuhend
-
+
&Lähemalt
-
+
Lähem teave OpenLP kohta
-
+
Ctrl+F1
-
+
&Abi veebis
-
+
&Veebileht
-
+
&Isetuvastus
-
+
-
+
-
+
Lisa &tööriist...
-
+
-
+
-
+
-
+
-
+
-
+
&Otse
-
+
-
+
-
+
OpenLP uuendus
-
+
OpenLP peakuva on tühi
-
+
Peakuva on tühi
-
+
Kas salvestada teenistusse tehtud muudatused?
-
+
-
+
@@ -2091,157 +2081,157 @@ You can download the latest version from <a href="http://openlp.org/&quo
OpenLP.MediaManagerItem
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
Valitud elemendi kustutamine
-
+
-
+
Valitud kirje eelvaatlus
-
+
Valitud kirje saatmine ekraanile
-
+
-
+
Valitud kirje(te) lisamine teenistusse
-
+
-
+
-
+
-
+
&Kuva ekraanil
-
+
&Lisa teenistusele
-
+
&Lisa valitud teenistuse elemendile
-
+
Ühtegi elementi pole valitud
-
+
-
+
-
+
Pead valima vähemalt ühe elemendi.
-
+
Ühtegi elementi pole valitud
-
+
Pead valima vähemalt ühe elemendi
-
+
Ühtegi teenistuse elementi pole valitud
-
+
Pead valima olemasoleva teenistuse, millele lisada.
-
+
Vigane teenistuse element
-
+
@@ -2249,57 +2239,57 @@ You can download the latest version from <a href="http://openlp.org/&quo
OpenLP.PluginForm
-
+
Pluginate loend
-
+
Plugina andmed
-
+
Versioon:
-
+
TekstiPealdis
-
+
Kirjeldus:
-
+
Olek:
-
+
Aktiivne
-
+
Pole aktiivne
-
+
-
+
-
+
@@ -2307,22 +2297,22 @@ You can download the latest version from <a href="http://openlp.org/&quo
OpenLP.ServiceItemEditForm
-
+
-
+
Üles
-
+
Kustuta
-
+
Alla
@@ -2330,12 +2320,12 @@ You can download the latest version from <a href="http://openlp.org/&quo
OpenLP.ServiceManager
-
+
Uus teenistus
-
+
Uue teenistuse loomine
@@ -2345,7 +2335,7 @@ You can download the latest version from <a href="http://openlp.org/&quo
Teenistuse avamine
-
+
Välise teenistuse laadimine
@@ -2355,82 +2345,82 @@ You can download the latest version from <a href="http://openlp.org/&quo
Salvesta teenistus
-
+
Selle teenistuse salvestamine
-
+
Kujundus:
-
+
-
+
Liiguta ü&lemiseks
-
+
Liiguta &üles
-
+
Liiguta &alla
-
+
Liiguta &alumiseks
-
+
&Kustuta teenistusest
-
+
&Lisa uus element
-
+
&Lisa valitud elemendile
-
+
&Muuda kirjet
-
+
-
+
&Märkmed
-
+
&Salmi eelvaatlus
-
+
&Otsesalm
-
+
@@ -2440,7 +2430,7 @@ You can download the latest version from <a href="http://openlp.org/&quo
Kas salvestada teenistusse tehtud muudatused?
-
+
See teenistus pole salvestatud, kas tahad selle uue avamist salvestada?
@@ -2455,53 +2445,53 @@ You can download the latest version from <a href="http://openlp.org/&quo
See teenistus pole salvestatud, kas tahad enne uue avamist muudatused salvestada?
-
+
Viga
-
+
-
+
-
+
-
+
Seda elementi pole võimalik näidata ekraanil, kuna puudub seda käsitsev programm
-
+
-
+
-
+
-
+
-
+
@@ -2509,7 +2499,7 @@ The content encoding is not UTF-8.
OpenLP.ServiceNoteForm
-
+
Teenistuse elemendi märkmed
@@ -2517,7 +2507,7 @@ The content encoding is not UTF-8.
OpenLP.SettingsForm
-
+
@@ -2525,77 +2515,77 @@ The content encoding is not UTF-8.
OpenLP.SlideController
-
+
Ekraan
-
+
Eelvaade
-
+
Liikumine esimesele
-
+
Eelmisele liikumine
-
+
Liikumine järgmisele
-
+
Liikumine viimasele
-
+
-
+
Tõsta ekraanile
-
+
Muuda ja kuva laulu eelvaade uuesti
-
+
Katkematu korduse alustamine
-
+
Katkematu korduse lõpetamine
-
+
s
-
+
Viivitus slaidide vahel sekundites
-
+
Meediaesituse alustamine
-
+
Liikumine salmile
@@ -2608,67 +2598,67 @@ The content encoding is not UTF-8.
Uus kujundus
-
+
-
+
Kujunduse muutmine
-
+
-
+
Teema kustutamine
-
+
-
+
Teema importimine
-
+
-
+
Kujunduse eksportimine
-
+
-
+
-
+
-
+
-
+
@@ -2678,22 +2668,22 @@ The content encoding is not UTF-8.
-
+
-
+
-
+
-
+
@@ -2703,7 +2693,7 @@ The content encoding is not UTF-8.
Viga
-
+
Vaikimisi kujundust pole võimalik kustutada.
@@ -2782,47 +2772,47 @@ The content encoding is not UTF-8.
OpenLP.ThemesTab
-
+
Kujundused
-
+
-
+
-
+
-
+
Iga laulu jaoks kasutatakse andmebaasis sellele määratud kujundust. Kui laulul kujundus puudub, kasutatakse teenistuse teemat. Kui teenistusel kujundus puudub, siis kasutatakse üleüldist teemat.
-
+
-
+
Kasutatakse teenistuse kujundust, eirates laulude kujundusi. Kui teenistusel kujundust pole, kasutatakse globaalset.
-
+
-
+
Kasutatakse globaalset kujundust, eirates nii teenistuse kui laulu kujundust.
@@ -2830,7 +2820,7 @@ The content encoding is not UTF-8.
PresentationPlugin
-
+
@@ -2843,17 +2833,17 @@ The content encoding is not UTF-8.
-
+
-
+
-
+
@@ -2863,12 +2853,12 @@ The content encoding is not UTF-8.
-
+
-
+
@@ -2878,7 +2868,7 @@ The content encoding is not UTF-8.
-
+
@@ -2886,22 +2876,22 @@ The content encoding is not UTF-8.
PresentationPlugin.PresentationTab
-
+
-
+
-
+
-
+
@@ -2909,30 +2899,30 @@ The content encoding is not UTF-8.
RemotePlugin
-
-
+
+
RemotePlugin.RemoteTab
-
+
-
+
-
+
-
+
@@ -2940,27 +2930,27 @@ The content encoding is not UTF-8.
SongUsagePlugin
-
+
-
+
-
+
-
+
-
+
@@ -2975,7 +2965,7 @@ The content encoding is not UTF-8.
-
+
@@ -2983,17 +2973,17 @@ The content encoding is not UTF-8.
SongUsagePlugin.SongUsageDeleteForm
-
+
-
+
-
+
@@ -3001,27 +2991,27 @@ The content encoding is not UTF-8.
SongUsagePlugin.SongUsageDetailForm
-
+
-
+
-
+
-
+
-
+
@@ -3029,108 +3019,17 @@ The content encoding is not UTF-8.
SongsPlugin
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -3138,32 +3037,32 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
SongsPlugin.AuthorsForm
-
+
Autorite haldus
-
+
Kuvatav nimi:
-
+
Eesnimi:
-
+
Perekonnanimi:
-
+
Viga
-
+
Pead sisestama autori eesnime.
@@ -3173,7 +3072,7 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
Pead sisestama autori perekonnanime.
-
+
@@ -3181,117 +3080,117 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
SongsPlugin.EditSongForm
-
+
Lauluredaktor
-
+
-
+
-
+
-
+
&Muuda
-
+
-
+
&Kustuta
-
+
Pealkiri && laulusõnad
-
+
Autorid
-
+
&Lisa laulule
-
+
&Eemalda
-
+
Teema
-
+
L&isa laulule
-
+
&Eemalda
-
+
Laulik
-
+
Kujundus
-
+
Autoriõiguse andmed
-
+
Kommentaarid
-
+
Kujundus, autoriõigus && kommentaarid
-
+
-
+
-
+
-
+
@@ -3316,77 +3215,77 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
-
+
-
+
-
+
-
+
-
+
-
+
-
+
Viga
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -3396,17 +3295,17 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
-
+
-
+
-
+
@@ -3414,17 +3313,17 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
SongsPlugin.EditVerseForm
-
+
-
+
-
+
@@ -3432,220 +3331,315 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
SongsPlugin.ImportWizardForm
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
SongsPlugin.MediaItem
-
+
-
+
-
+
-
+
Liik:
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -3653,27 +3647,27 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
SongsPlugin.SongBookForm
-
+
-
+
-
+
Viga
-
+
-
+
@@ -3681,160 +3675,173 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
SongsPlugin.SongImport
-
+
-
+
+
+ SongsPlugin.SongImportForm
+
+
+
+
+
+
+
+
+
+
+
SongsPlugin.SongMaintenanceForm
-
+
Laulude haldus
-
+
Autorid
-
+
Teemad
-
+
-
+
&Muuda
-
+
&Kustuta
-
+
-
+
-
+
-
+
Viga
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -3842,22 +3849,22 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
SongsPlugin.SongsTab
-
+
-
+
-
+
-
+
@@ -3865,22 +3872,22 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
SongsPlugin.TopicsForm
-
+
-
+
-
+
Viga
-
+
@@ -3888,37 +3895,37 @@ OpenOffice.org must be installed and you must be using an unedited copy of the R
SongsPlugin.VerseType
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/resources/i18n/openlp_hu.ts b/resources/i18n/openlp_hu.ts
index 1ed312f74..ba662fc28 100644
--- a/resources/i18n/openlp_hu.ts
+++ b/resources/i18n/openlp_hu.ts
@@ -3,17 +3,17 @@
AlertsPlugin
-
+
&Figyelmeztetés
-
+
-
+
@@ -21,57 +21,57 @@
AlertsPlugin.AlertForm
-
+
Figyelmeztetés
-
+
Figyelmeztető &szöveg:
-
+
&Paraméterek:
-
+
&Új
-
+
-
+
&Törlés
-
+
&Megjelenítés
-
+
M&egjelenítés és bezárás
-
+
&Bezárás
-
+
-
+
@@ -79,7 +79,7 @@
AlertsPlugin.AlertsManager
-
+
@@ -87,77 +87,77 @@
AlertsPlugin.AlertsTab
-
+
Figyelmeztetések
-
+
Betűkészlet
-
+
-
+
-
+
-
+
-
+
-
+
Figyelmeztetés késleltetése:
-
+
mp
-
+
Hely:
-
+
Előnézet
-
+
-
+
-
+
Középre
-
+
@@ -165,12 +165,12 @@
BiblesPlugin
-
+
&Biblia
-
+
@@ -178,91 +178,112 @@
BiblesPlugin.BibleDB
-
+
-
+
+
+ BiblesPlugin.BibleManager
+
+
+
+
+
+
+
+
+
+
+
BiblesPlugin.BiblesTab
-
+
Bibliák
-
+
Vers megjelenítés
-
+
Csak az új fejezetszámok megjelenítése
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -270,167 +291,167 @@ Changes do not affect verses already in the service.
BiblesPlugin.ImportWizardForm
-
+
Bibliaimportáló tündér
-
+
Üdvözlet a Bibliaimportáló tündérben
-
+
A tündérrel különféle formátumú Bibliákat lehet importálni. Az alább található Tovább gombra való kattintással indítható a folyamat első lépése a formátum kiválasztásával.
-
+
Válassza ki az importálandó forrást
-
+
Válassza ki a importálandó forrást és a helyet, ahonnan importálja.
-
+
Formátum:
-
+
OSIS
-
+
-
+
-
+
Web letöltés
-
+
-
+
-
+
-
+
-
+
Hely:
-
+
-
+
-
+
Biblia:
-
+
Letöltési beállítások
-
+
Szerver:
-
+
Felhasználói név:
-
+
Jelszó:
-
+
Proxy szerver (választható)
-
+
Licenc részletek
-
+
Állítsa be a Biblia licenc részleteit.
-
+
-
+
Copyright:
-
+
Engedély:
-
+
Importálás
-
+
Kérem, várjon, míg a Biblia importálás alatt áll.
-
+
Kész.
-
+
Érvénytelen a Biblia elérési útvonala
-
+
Meg kell adni egy fájlt, amelyből a Bibliát importálni lehet.
@@ -445,87 +466,87 @@ Changes do not affect verses already in the service.
Meg kell adni egy fájlt a bibliai könyvekről az importáláshoz.
-
+
Érvénytelen versszak fájl
-
+
Meg kell adni egy fájlt a bibliai versekről az importáláshoz.
-
+
Érvénytelen OpenSong Biblia
-
+
Meg kell adni egy OpenSong Biblia fájlt az importáláshoz.
-
+
Üres verziónév
-
+
Meg kell adni a Biblia verziószámát.
-
+
Üres a szerzői jog
-
+
Meg kell adni a szerzői jogokat! A közkincs Bibliákat meg kell jelölni ilyennek.
-
+
Biblia létezik
-
+
Ez a Biblia már létezik! Kérem, importáljon egy másik Bibliát vagy előbb törölje a meglévőt.
-
+
OSIS fájl megnyitása
-
+
Könyv CSV fájl megnyitása
-
+
Versszak CSV fájl megnyitása
-
+
OpenSong Biblia megnyitása
-
+
Importálás indítása...
-
+
Az importálás befejeződött.
-
+
A Biblia importálása nem sikerült.
@@ -533,112 +554,112 @@ Changes do not affect verses already in the service.
BiblesPlugin.MediaItem
-
+
Biblia
-
+
Gyors
-
+
Haladó
-
+
Verzió:
-
+
Második:
-
+
-
+
Keresés:
-
+
Keresés
-
+
Eredmények:
-
+
Könyv:
-
+
Fejezet:
-
+
Vers:
-
+
Innentől:
-
+
Idáig:
-
+
Vers keresése
-
+
Szöveg keresése
-
+
-
+
Megtartása
-
+
Nincs ilyen könyv
-
+
Nem található ilyen könyv ebben a Bibliában.
-
+
-
+
@@ -646,7 +667,7 @@ Changes do not affect verses already in the service.
BiblesPlugin.Opensong
-
+
Importálás
@@ -662,17 +683,17 @@ Changes do not affect verses already in the service.
CustomPlugin.CustomTab
-