openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #21774
[Merge] lp:~googol/openlp/i18n-2.0 into lp:openlp
Andreas Preikschat has proposed merging lp:~googol/openlp/i18n-2.0 into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~googol/openlp/i18n-2.0/+merge/185625
i18n
--
The attached diff has been truncated due to its size.
https://code.launchpad.net/~googol/openlp/i18n-2.0/+merge/185625
Your team OpenLP Core is requested to review the proposed merge of lp:~googol/openlp/i18n-2.0 into lp:openlp.
=== modified file 'copyright.txt'
=== modified file 'openlp.py'
=== modified file 'openlp/.version'
--- openlp/.version 2013-06-06 06:40:10 +0000
+++ openlp/.version 2013-09-14 11:12:23 +0000
@@ -1,1 +1,5 @@
+<<<<<<< TREE
2.1.0-bzr2234
+=======
+2.0.1
+>>>>>>> MERGE-SOURCE
=== modified file 'openlp/__init__.py'
=== modified file 'openlp/core/__init__.py'
--- openlp/core/__init__.py 2013-08-31 18:17:38 +0000
+++ openlp/core/__init__.py 2013-09-14 11:12:23 +0000
@@ -228,10 +228,18 @@
"""
Setup our logging using log_path
"""
+<<<<<<< TREE
check_directory_exists(log_path, True)
filename = os.path.join(log_path, 'openlp.log')
logfile = logging.FileHandler(filename, 'w')
logfile.setFormatter(logging.Formatter('%(asctime)s %(name)-55s %(levelname)-8s %(message)s'))
+=======
+ check_directory_exists(log_path, True)
+ filename = os.path.join(log_path, u'openlp.log')
+ logfile = logging.FileHandler(filename, u'w')
+ logfile.setFormatter(logging.Formatter(
+ u'%(asctime)s %(name)-55s %(levelname)-8s %(message)s'))
+>>>>>>> MERGE-SOURCE
log.addHandler(logfile)
if log.isEnabledFor(logging.DEBUG):
print('Logging to: %s' % filename)
@@ -281,10 +289,19 @@
application.setApplicationName('OpenLPPortable')
Settings.setDefaultFormat(Settings.IniFormat)
# Get location OpenLPPortable.ini
+<<<<<<< TREE
application_path = AppLocation.get_directory(AppLocation.AppDir)
set_up_logging(os.path.abspath(os.path.join(application_path, '..', '..', 'Other')))
log.info('Running portable')
portable_settings_file = os.path.abspath(os.path.join(application_path, '..', '..', 'Data', 'OpenLP.ini'))
+=======
+ app_path = AppLocation.get_directory(AppLocation.AppDir)
+ set_up_logging(os.path.abspath(os.path.join(app_path, u'..',
+ u'..', u'Other')))
+ log.info(u'Running portable')
+ portable_settings_file = os.path.abspath(os.path.join(app_path, u'..',
+ u'..', u'Data', u'OpenLP.ini'))
+>>>>>>> MERGE-SOURCE
# Make this our settings file
log.info('INI file: %s', portable_settings_file)
Settings.set_filename(portable_settings_file)
@@ -297,11 +314,17 @@
portable_settings.setValue('advanced/is portable', True)
portable_settings.sync()
else:
+<<<<<<< TREE
application.setApplicationName('OpenLP')
set_up_logging(AppLocation.get_directory(AppLocation.CacheDir))
Registry.create()
Registry().register('application', application)
application.setApplicationVersion(get_application_version()['version'])
+=======
+ set_up_logging(AppLocation.get_directory(AppLocation.CacheDir))
+ app.setApplicationName(u'OpenLP')
+ app.setApplicationVersion(get_application_version()[u'version'])
+>>>>>>> MERGE-SOURCE
# Instance check
if application.is_already_running():
sys.exit()
=== modified file 'openlp/core/lib/__init__.py'
--- openlp/core/lib/__init__.py 2013-08-31 18:17:38 +0000
+++ openlp/core/lib/__init__.py 2013-09-14 11:12:23 +0000
@@ -327,18 +327,35 @@
return text
+<<<<<<< TREE
def check_directory_exists(directory, do_not_log=False):
+=======
+def check_directory_exists(dir, do_not_log=False):
+>>>>>>> MERGE-SOURCE
"""
Check a theme directory exists and if not create it
+<<<<<<< TREE
``directory``
The directory to make sure exists
``do_not_log``
To not log anything. This is need for the start up, when the log isn't ready.
+=======
+ ``dir``
+ Theme directory to make sure exists
+
+ ``do_not_log``
+ To not log anything. This is need for the start up, when the log isn't ready.
+>>>>>>> MERGE-SOURCE
"""
+<<<<<<< TREE
if not do_not_log:
log.debug('check_directory_exists %s' % directory)
+=======
+ if not do_not_log:
+ log.debug(u'check_directory_exists %s' % dir)
+>>>>>>> MERGE-SOURCE
try:
if not os.path.exists(directory):
os.makedirs(directory)
@@ -366,6 +383,7 @@
return translate('OpenLP.core.lib', '%s and %s',
'Locale list separator: 2 items') % (stringlist[0], stringlist[1])
else:
+<<<<<<< TREE
merged = translate('OpenLP.core.lib', '%s, and %s',
'Locale list separator: end') % (stringlist[-2], stringlist[-1])
for index in reversed(list(range(1, len(stringlist) - 2))):
@@ -393,3 +411,32 @@
from .renderer import Renderer
from .mediamanageritem import MediaManagerItem
+=======
+ merged = unicode(translate('OpenLP.core.lib', '%1, and %2',
+ u'Locale list separator: end').arg(stringlist[-2], stringlist[-1]))
+ for index in reversed(range(1, len(stringlist) - 2)):
+ merged = unicode(translate('OpenLP.core.lib', '%1, %2',
+ u'Locale list separator: middle').arg(stringlist[index], merged))
+ return unicode(translate('OpenLP.core.lib', '%1, %2',
+ u'Locale list separator: start').arg(stringlist[0], merged))
+
+
+from eventreceiver import Receiver
+from filedialog import FileDialog
+from listwidgetwithdnd import ListWidgetWithDnD
+from formattingtags import FormattingTags
+from spelltextedit import SpellTextEdit
+from settingsmanager import SettingsManager
+from plugin import PluginStatus, StringContent, Plugin
+from pluginmanager import PluginManager
+from settingstab import SettingsTab
+from serviceitem import ServiceItem, ServiceItemType, ItemCapabilities
+from htmlbuilder import build_html, build_lyrics_format_css, \
+ build_lyrics_outline_css
+from toolbar import OpenLPToolbar
+from dockwidget import OpenLPDockWidget
+from imagemanager import ImageManager
+from renderer import Renderer
+from mediamanageritem import MediaManagerItem
+from openlp.core.utils.actions import ActionList
+>>>>>>> MERGE-SOURCE
=== modified file 'openlp/core/lib/db.py'
=== modified file 'openlp/core/lib/dockwidget.py'
=== added file 'openlp/core/lib/eventreceiver.py.OTHER'
--- openlp/core/lib/eventreceiver.py.OTHER 1970-01-01 00:00:00 +0000
+++ openlp/core/lib/eventreceiver.py.OTHER 2013-09-14 11:12:23 +0000
@@ -0,0 +1,293 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2013 Raoul Snyman #
+# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan #
+# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, #
+# Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. #
+# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, #
+# Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Dave Warnock, #
+# Frode Woldsund, Martin Zibricky #
+# --------------------------------------------------------------------------- #
+# 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 #
+###############################################################################
+"""
+Provide event handling code for OpenLP
+"""
+import logging
+
+from PyQt4 import QtCore
+
+log = logging.getLogger(__name__)
+
+class EventReceiver(QtCore.QObject):
+ """
+ Class to allow events to be passed from different parts of the system. This
+ is a private class and should not be used directly but rather via the
+ Receiver class.
+
+ **Mainwindow related and generic signals**
+
+ ``mainwindow_status_text``
+ Changes the bottom status bar text on the mainwindow.
+
+ ``openlp_warning_message``
+ Displays a standalone Warning Message.
+
+ ``openlp_error_message``
+ Displays a standalone Error Message.
+
+ ``openlp_information_message``
+ Displays a standalone Information Message.
+
+ ``cursor_busy``
+ Makes the cursor got to a busy form.
+
+ ``cursor_normal``
+ Resets the cursor to default.
+
+ ``openlp_process_events``
+ Requests the Application to flush the events queue.
+
+ ``openlp_version_check``
+ Version has changed so pop up window.
+
+ ``openlp_stop_wizard``
+ Stops a wizard before completion.
+
+ **Setting related signals**
+
+ ``config_updated``
+ Informs components that the config has changed.
+
+ ``config_screen_changed``
+ The display monitor has been changed.
+
+ **Slidecontroller signals**
+
+ ``slidecontroller_{live|preview}_next``
+ Moves to the next slide.
+
+ ``slidecontroller_{live|preview}_next_noloop``
+ Moves to the next slide without auto advance.
+
+ ``slidecontroller_{live|preview}_previous``
+ Moves to the previous slide.
+
+ ``slidecontroller_{live|preview}_previous_noloop``
+ Moves to the previous slide, without auto advance.
+
+ ``slidecontroller_{live|preview}_set``
+ Moves to a specific slide, by index.
+
+ ``slidecontroller_{live|preview}_started``
+ Broadcasts that an item has been made live/previewed.
+
+ ``slidecontroller_{live|preview}_change``
+ Informs the slidecontroller that a slide change has occurred and to
+ update itself.
+
+ ``slidecontroller_{live|preview}_changed``
+ Broadcasts that the slidecontroller has changed the current slide.
+
+ ``slidecontroller_{live|preview}_blank``
+ Request that the output screen is blanked.
+
+ ``slidecontroller_{live|preview}_unblank``
+ Request that the output screen is unblanked.
+
+ ``slidecontroller_live_spin_delay``
+ Pushes out the loop delay.
+
+ ``slidecontroller_update_slide_limits``
+ Updates the slide_limits variable from the saved settings.
+
+ ``slidecontroller_live_stop_loop``
+ Stop the loop on the main display.
+
+
+ **Servicemanager related signals**
+
+ ``servicemanager_new_service``
+ A new service is being loaded or created.
+
+ ``servicemanager_previous_item``
+ Display the previous item in the service.
+
+ ``servicemanager_preview_live``
+ Requests a Preview item from the Service Manager to update live and add
+ a new item to the preview panel.
+
+ ``servicemanager_next_item``
+ Display the next item in the service.
+
+ ``servicemanager_set_item``
+ Go live on a specific item, by index.
+
+ ``service_item_update``
+ Passes back to the service manager the service item after it has been
+ processed by the plugin.
+
+ **Display signals**
+
+ ``update_display_css``
+ CSS has been updated which needs to be changed on the main display.
+
+ **Live Display signals**
+
+ ``live_display_hide``
+ Hide the live display.
+
+ ``live_display_show``
+ Return the live display.
+
+ ``live_display_active``
+ The live display has been made active.
+
+ ``live_display_blank_check``
+ Check to see if the blank display message is required.
+
+ **Theme related singlas**
+
+ ``theme_update_list``
+ send out message with new themes.
+
+ ``theme_update_global``
+ Tell the components we have a new global theme.
+
+ **Plugin specific signals**
+
+ ``{plugin}_start``
+ Requests a plugin to start a external program. Path and file have to
+ be provided in the message.
+
+ ``{plugin}_first``
+ Requests a plugin to handle a first event.
+
+ ``{plugin}_previous``
+ Requests a plugin to handle a previous event.
+
+ ``{plugin}_next``
+ Requests a plugin to handle a next event.
+
+ ``{plugin}_last``
+ Requests a plugin to handle a last event.
+
+ ``{plugin}_slide``
+ Requests a plugin to handle a go to specific slide event.
+
+ ``{plugin}_stop``
+ Requests a plugin to handle a stop event.
+
+ ``{plugin}_blank``
+ Requests a plugin to handle a blank screen event.
+
+ ``{plugin}_unblank``
+ Requests a plugin to handle an unblank screen event.
+
+ ``{plugin}_edit``
+ Requests a plugin edit a database item with the key as the payload.
+
+ ``{plugin}_edit_clear``
+ Editing has been completed.
+
+ ``{plugin}_load_list``
+ Tells the the plugin to reload the media manager list.
+
+ ``{plugin}_preview``
+ Tells the plugin it's item can be previewed.
+
+ ``{plugin}_add_service_item``
+ Ask the plugin to push the selected items to the service item.
+
+ ``{plugin}_service_load``
+ Ask the plugin to process an individual service item after it has been
+ loaded.
+
+ ``{plugin}_config_updated``
+ The config has changed so tell the plugin about it.
+
+ ``alerts_text``
+ Displays an alert message.
+
+ ``bibles_nobook``
+ Attempt to find book resulted in no match.
+
+ ``remotes_poll_request``
+ Waits for openlp to do something "interesting" and sends a
+ ``remotes_poll_response`` signal when it does.
+
+ """
+ def __init__(self):
+ """
+ Initialise the event receiver, calling the parent constructor.
+ """
+ QtCore.QObject.__init__(self)
+
+ def send_message(self, event, msg=None):
+ """
+ Emit a Qt signal.
+
+ ``event``
+ The event to that was sent.
+
+ ``msg``
+ Defaults to *None*. The message to send with the event.
+ """
+ log.debug(u'Event %s passed with payload %s' % (event, msg))
+ self.emit(QtCore.SIGNAL(event), msg)
+
+
+class Receiver(object):
+ """
+ Class to allow events to be passed from different parts of the system. This
+ is a static wrapper around the ``EventReceiver`` class. As there is only
+ one instance of it in the system the Qt4 signal/slot architecture can send
+ messages across the system.
+
+ To send a message:
+ ``Receiver.send_message(u'<<Message ID>>', data)``
+
+ To receive a Message
+ ``QtCore.QObject.connect(
+ Receiver.get_receiver(),
+ QtCore.SIGNAL(u'<<Message ID>>'),
+ <<ACTION>>
+ )``
+ """
+ __eventreceiver__ = EventReceiver()
+
+ @staticmethod
+ def send_message(event, msg=None):
+ """
+ Sends a message to the messaging system.
+
+ ``event``
+ The event to send.
+
+ ``msg``
+ Defaults to *None*. The message to send with the event.
+ """
+ Receiver.__eventreceiver__.send_message(event, msg)
+
+ @staticmethod
+ def get_receiver():
+ """
+ Get the global ``__eventreceiver__`` instance.
+ """
+ return Receiver.__eventreceiver__
=== added file 'openlp/core/lib/filedialog.py'
--- openlp/core/lib/filedialog.py 1970-01-01 00:00:00 +0000
+++ openlp/core/lib/filedialog.py 2013-09-14 11:12:23 +0000
@@ -0,0 +1,63 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2013 Raoul Snyman #
+# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan #
+# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, #
+# Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. #
+# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, #
+# Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Dave Warnock, #
+# Frode Woldsund, Martin Zibricky #
+# --------------------------------------------------------------------------- #
+# 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 #
+###############################################################################
+
+"""
+Provide a work around for a bug in QFileDialog
+<https://bugs.launchpad.net/openlp/+bug/1209515>
+"""
+import os
+import urllib
+
+from PyQt4 import QtCore, QtGui
+
+from openlp.core.lib.ui import UiStrings
+
+class FileDialog(QtGui.QFileDialog):
+ """
+ Subclass QFileDialog to work round a bug
+ """
+ @staticmethod
+ def getOpenFileNames(parent, title, path, filters):
+ """
+ Reimplement getOpenFileNames to fix the way it returns some file
+ names that url encoded when selecting multiple files/
+ """
+ files = QtGui.QFileDialog.getOpenFileNames(parent, title, path, filters)
+ file_list = QtCore.QStringList()
+ for file in files:
+ file = unicode(file)
+ if not os.path.exists(file):
+ file = urllib.unquote(file)
+ if not os.path.exists(file):
+ QtGui.QMessageBox.information(parent,
+ UiStrings().FileNotFound,
+ UiStrings().FileNotFoundMessage % file)
+ continue
+ file_list.append(QtCore.QString(file))
+ return file_list
\ No newline at end of file
=== modified file 'openlp/core/lib/formattingtags.py'
--- openlp/core/lib/formattingtags.py 2013-08-31 18:17:38 +0000
+++ openlp/core/lib/formattingtags.py 2013-09-14 11:12:23 +0000
@@ -29,9 +29,19 @@
"""
Provide HTML Tag management and Formatting Tag access class
"""
+<<<<<<< TREE
import json
from openlp.core.lib import Settings, translate
+=======
+import cPickle
+import json
+
+from PyQt4 import QtCore
+
+from openlp.core.lib import translate
+from openlp.core.lib.settings import Settings
+>>>>>>> MERGE-SOURCE
class FormattingTags(object):
@@ -63,7 +73,12 @@
if 'temporary' in tag:
del tag['temporary']
# Formatting Tags were also known as display tags.
+<<<<<<< TREE
Settings().setValue('formattingTags/html_tags', json.dumps(tags) if tags else '')
+=======
+ Settings().setValue(u'formattingTags/html_tags',
+ QtCore.QVariant(json.dumps(tags) if tags else u''))
+>>>>>>> MERGE-SOURCE
@staticmethod
def load_tags():
@@ -153,10 +168,40 @@
'end html': '', 'protected': True, 'temporary': False})
FormattingTags.add_html_tags(base_tags)
FormattingTags.add_html_tags(temporary_tags)
+<<<<<<< TREE
user_expands_string = str(Settings().value('formattingTags/html_tags'))
# If we have some user ones added them as well
+=======
+
+ # Formatting Tags were also known as display tags.
+ user_expands = Settings().value(u'formattingTags/html_tags',
+ QtCore.QVariant(u'')).toString()
+ json_loaded = True
+ if not user_expands:
+ user_expands = Settings().value(u'displayTags/html_tags',
+ QtCore.QVariant(u'')).toString()
+ json_loaded = False
+ # cPickle only accepts str not unicode strings
+ user_expands_string = str(user_expands)
+>>>>>>> MERGE-SOURCE
if user_expands_string:
+<<<<<<< TREE
user_tags = json.loads(user_expands_string)
+=======
+ if json_loaded:
+ user_tags = json.loads(user_expands_string)
+ else:
+ user_tags = cPickle.loads(user_expands_string)
+ # move the formatting tags to json and remove old settings
+ Settings().setValue(u'formattingTags/html_tags',
+ QtCore.QVariant(json.dumps(user_tags)))
+ Settings().remove(u'displayTags/html_tags')
+ for tag in user_tags:
+ for element in tag:
+ if isinstance(tag[element], str):
+ tag[element] = tag[element].decode('utf8')
+ # If we have some user ones added them as well
+>>>>>>> MERGE-SOURCE
FormattingTags.add_html_tags(user_tags)
@staticmethod
=== modified file 'openlp/core/lib/htmlbuilder.py'
=== modified file 'openlp/core/lib/imagemanager.py'
=== modified file 'openlp/core/lib/listwidgetwithdnd.py'
=== modified file 'openlp/core/lib/mediamanageritem.py'
--- openlp/core/lib/mediamanageritem.py 2013-08-31 18:17:38 +0000
+++ openlp/core/lib/mediamanageritem.py 2013-09-14 11:12:23 +0000
@@ -35,8 +35,13 @@
from PyQt4 import QtCore, QtGui
+<<<<<<< TREE
from openlp.core.lib import OpenLPToolbar, ServiceItem, StringContent, ListWidgetWithDnD, \
ServiceItemContext, Settings, Registry, UiStrings, translate
+=======
+from openlp.core.lib import FileDialog, SettingsManager, OpenLPToolbar, ServiceItem, \
+ StringContent, build_icon, translate, Receiver, ListWidgetWithDnD
+>>>>>>> MERGE-SOURCE
from openlp.core.lib.searchedit import SearchEdit
from openlp.core.lib.ui import create_widget_action, critical_error_message_box
@@ -305,9 +310,18 @@
"""
Add a file to the list widget to make it available for showing
"""
+<<<<<<< TREE
files = QtGui.QFileDialog.getOpenFileNames(self, self.on_new_prompt,
Settings().value(self.settings_section + '/last directory'), self.on_new_file_masks)
log.info('New files(s) %s', files)
+=======
+ files = FileDialog.getOpenFileNames(
+ self, self.onNewPrompt,
+ SettingsManager.get_last_dir(self.settingsSection),
+ self.onNewFileMasks)
+ files = map(unicode, files)
+ log.info(u'New files(s) %s', unicode(files))
+>>>>>>> MERGE-SOURCE
if files:
self.application.set_busy_cursor()
self.validate_and_load(files)
=== modified file 'openlp/core/lib/plugin.py'
=== modified file 'openlp/core/lib/pluginmanager.py'
=== modified file 'openlp/core/lib/renderer.py'
=== modified file 'openlp/core/lib/screen.py'
=== modified file 'openlp/core/lib/searchedit.py'
=== modified file 'openlp/core/lib/serviceitem.py'
--- openlp/core/lib/serviceitem.py 2013-08-31 18:17:38 +0000
+++ openlp/core/lib/serviceitem.py 2013-09-14 11:12:23 +0000
@@ -37,9 +37,17 @@
import os
import uuid
+<<<<<<< TREE
from PyQt4 import QtGui
from openlp.core.lib import ImageSource, Settings, Registry, build_icon, clean_tags, expand_tags, translate
+=======
+from PyQt4 import QtCore, QtGui
+
+from openlp.core.lib import build_icon, clean_tags, expand_tags, translate, \
+ ImageSource
+from openlp.core.lib.settings import Settings
+>>>>>>> MERGE-SOURCE
log = logging.getLogger(__name__)
@@ -418,6 +426,7 @@
for slide in serviceitem['serviceitem']['data']:
self._raw_frames.append(slide)
elif self.service_item_type == ServiceItemType.Image:
+<<<<<<< TREE
settings_section = serviceitem['serviceitem']['header']['name']
background = QtGui.QColor(Settings().value(settings_section + '/background color'))
if path:
@@ -428,6 +437,14 @@
else:
for text_image in serviceitem['serviceitem']['data']:
self.add_from_image(text_image['path'], text_image['title'], background)
+=======
+ settingsSection = serviceitem[u'serviceitem'][u'header'][u'name']
+ background = QtGui.QColor(Settings().value(settingsSection
+ + u'/background color', QtCore.QVariant(u'#000000')))
+ for text_image in serviceitem[u'serviceitem'][u'data']:
+ filename = os.path.join(path, text_image)
+ self.add_from_image(filename, text_image, background)
+>>>>>>> MERGE-SOURCE
elif self.service_item_type == ServiceItemType.Command:
for text_image in serviceitem['serviceitem']['data']:
if not self.title:
=== added file 'openlp/core/lib/settings.py'
--- openlp/core/lib/settings.py 1970-01-01 00:00:00 +0000
+++ openlp/core/lib/settings.py 2013-09-14 11:12:23 +0000
@@ -0,0 +1,68 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2013 Raoul Snyman #
+# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan #
+# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, #
+# Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. #
+# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, #
+# Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Dave Warnock, #
+# Frode Woldsund, Martin Zibricky #
+# --------------------------------------------------------------------------- #
+# 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 #
+###############################################################################
+"""
+The :mod:``settings`` module provides a thin wrapper for QSettings, which OpenLP
+uses to manage settings persistence.
+"""
+
+import logging
+
+from PyQt4 import QtCore
+
+log = logging.getLogger()
+
+class Settings(QtCore.QSettings):
+ """
+ Class to wrap QSettings.
+
+ * Exposes all the methods of QSettings.
+ * Adds functionality for OpenLP Portable. If the ``defaultFormat`` is set to
+ ``IniFormat``, and the path to the Ini file is set using ``setFilename``,
+ then the Settings constructor (without any arguments) will create a Settings
+ object for accessing settings stored in that Ini file.
+ """
+
+ __filePath = u''
+
+ @staticmethod
+ def setFilename(iniFile):
+ """
+ Sets the complete path to an Ini file to be used by Settings objects.
+
+ Does not affect existing Settings objects.
+ """
+ Settings.__filePath = iniFile
+
+ def __init__(self, *args):
+ if not args and Settings.__filePath and (Settings.defaultFormat() ==
+ Settings.IniFormat):
+ QtCore.QSettings.__init__(self, Settings.__filePath,
+ Settings.IniFormat)
+ else:
+ QtCore.QSettings.__init__(self, *args)
=== renamed file 'openlp/core/lib/settings.py' => 'openlp/core/lib/settings.py.moved'
=== added file 'openlp/core/lib/settingsmanager.py.OTHER'
--- openlp/core/lib/settingsmanager.py.OTHER 1970-01-01 00:00:00 +0000
+++ openlp/core/lib/settingsmanager.py.OTHER 2013-09-14 11:12:23 +0000
@@ -0,0 +1,168 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2013 Raoul Snyman #
+# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan #
+# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, #
+# Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. #
+# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, #
+# Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Dave Warnock, #
+# Frode Woldsund, Martin Zibricky #
+# --------------------------------------------------------------------------- #
+# 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 #
+###############################################################################
+"""
+Provide handling for persisting OpenLP settings. OpenLP uses QSettings to
+manage settings persistence. QSettings provides a single API for saving and
+retrieving settings from the application but writes to disk in an OS dependant
+format.
+"""
+import os
+
+from PyQt4 import QtCore
+
+from openlp.core.lib.settings import Settings
+from openlp.core.utils import AppLocation
+
+class SettingsManager(object):
+ """
+ Class to provide helper functions for the loading and saving of application
+ settings.
+ """
+
+ @staticmethod
+ def get_last_dir(section, num=None):
+ """
+ Read the last directory used for plugin.
+
+ ``section``
+ The section of code calling the method. This is used in the
+ settings key.
+
+ ``num``
+ Defaults to *None*. A further qualifier.
+ """
+ if num:
+ name = u'last directory %d' % num
+ else:
+ name = u'last directory'
+ last_dir = unicode(Settings().value(
+ section + u'/' + name, QtCore.QVariant(u'')).toString())
+ return last_dir
+
+ @staticmethod
+ def set_last_dir(section, directory, num=None):
+ """
+ Save the last directory used for plugin.
+
+ ``section``
+ The section of code calling the method. This is used in the
+ settings key.
+
+ ``directory``
+ The directory being stored in the settings.
+
+ ``num``
+ Defaults to *None*. A further qualifier.
+ """
+ if num:
+ name = u'last directory %d' % num
+ else:
+ name = u'last directory'
+ Settings().setValue(
+ section + u'/' + name, QtCore.QVariant(directory))
+
+ @staticmethod
+ def set_list(section, name, list):
+ """
+ Save a list to application settings.
+
+ ``section``
+ The section of the settings to store this list.
+
+ ``name``
+ The name of the list to save.
+
+ ``list``
+ The list of values to save.
+ """
+ settings = Settings()
+ settings.beginGroup(section)
+ old_count = settings.value(
+ u'%s count' % name, QtCore.QVariant(0)).toInt()[0]
+ new_count = len(list)
+ settings.setValue(u'%s count' % name, QtCore.QVariant(new_count))
+ for counter in range(new_count):
+ settings.setValue(
+ u'%s %d' % (name, counter), QtCore.QVariant(list[counter-1]))
+ if old_count > new_count:
+ # Tidy up any old list items
+ for counter in range(new_count, old_count):
+ settings.remove(u'%s %d' % (name, counter))
+ settings.endGroup()
+
+ @staticmethod
+ def load_list(section, name):
+ """
+ Load a list from the config file.
+
+ ``section``
+ The section of the settings to load the list from.
+
+ ``name``
+ The name of the list.
+ """
+ settings = Settings()
+ settings.beginGroup(section)
+ list_count = settings.value(
+ u'%s count' % name, QtCore.QVariant(0)).toInt()[0]
+ list = []
+ if list_count:
+ for counter in range(list_count):
+ item = unicode(
+ settings.value(u'%s %d' % (name, counter)).toString())
+ if item:
+ list.append(item)
+ settings.endGroup()
+ return list
+
+ @staticmethod
+ def get_files(section=None, extension=None):
+ """
+ Get a list of files from the data files path.
+
+ ``section``
+ Defaults to *None*. The section of code getting the files - used
+ to load from a section's data subdirectory.
+
+ ``extension``
+ Defaults to *None*. The extension to search for.
+ """
+ path = AppLocation.get_data_path()
+ if section:
+ path = os.path.join(path, section)
+ try:
+ files = os.listdir(path)
+ except OSError:
+ return []
+ if extension:
+ return [filename for filename in files
+ if extension == os.path.splitext(filename)[1]]
+ else:
+ # no filtering required
+ return files
=== modified file 'openlp/core/lib/settingstab.py'
=== modified file 'openlp/core/lib/spelltextedit.py'
=== modified file 'openlp/core/lib/theme.py'
=== modified file 'openlp/core/lib/toolbar.py'
=== modified file 'openlp/core/lib/ui.py'
--- openlp/core/lib/ui.py 2013-08-31 18:17:38 +0000
+++ openlp/core/lib/ui.py 2013-09-14 11:12:23 +0000
@@ -39,6 +39,125 @@
log = logging.getLogger(__name__)
+<<<<<<< TREE
+=======
+class UiStrings(object):
+ """
+ Provide standard strings for objects to use.
+ """
+ __instance__ = None
+
+ def __new__(cls):
+ """
+ Override the default object creation method to return a single instance.
+ """
+ if not cls.__instance__:
+ cls.__instance__ = object.__new__(cls)
+ return cls.__instance__
+
+ def __init__(self):
+ """
+ These strings should need a good reason to be retranslated elsewhere.
+ Should some/more/less of these have an & attached?
+ """
+ self.About = translate('OpenLP.Ui', 'About')
+ self.Add = translate('OpenLP.Ui', '&Add')
+ self.Advanced = translate('OpenLP.Ui', 'Advanced')
+ self.AllFiles = translate('OpenLP.Ui', 'All Files')
+ self.Bottom = translate('OpenLP.Ui', 'Bottom')
+ self.Browse = translate('OpenLP.Ui', 'Browse...')
+ self.Cancel = translate('OpenLP.Ui', 'Cancel')
+ self.CCLINumberLabel = translate('OpenLP.Ui', 'CCLI number:')
+ self.CreateService = translate('OpenLP.Ui', 'Create a new service.')
+ self.ConfirmDelete = translate('OpenLP.Ui', 'Confirm Delete')
+ self.Continuous = translate('OpenLP.Ui', 'Continuous')
+ self.Default = unicode(translate('OpenLP.Ui', 'Default'))
+ self.Delete = translate('OpenLP.Ui', '&Delete')
+ self.DisplayStyle = translate('OpenLP.Ui', 'Display style:')
+ self.Duplicate = translate('OpenLP.Ui', 'Duplicate Error')
+ self.Edit = translate('OpenLP.Ui', '&Edit')
+ self.EmptyField = translate('OpenLP.Ui', 'Empty Field')
+ self.Error = translate('OpenLP.Ui', 'Error')
+ self.Export = translate('OpenLP.Ui', 'Export')
+ self.File = translate('OpenLP.Ui', 'File')
+ self.FileNotFound = unicode(translate('OpenLP.Ui',
+ 'File Not Found'))
+ self.FileNotFoundMessage = unicode(translate('OpenLP.Ui',
+ 'File %s not found.\nPlease try selecting it individually.'))
+ self.FontSizePtUnit = translate('OpenLP.Ui', 'pt',
+ 'Abbreviated font pointsize unit')
+ self.Help = translate('OpenLP.Ui', 'Help')
+ self.Hours = translate('OpenLP.Ui', 'h',
+ 'The abbreviated unit for hours')
+ self.IFdSs = translate('OpenLP.Ui', 'Invalid Folder Selected',
+ 'Singular')
+ self.IFSs = translate('OpenLP.Ui', 'Invalid File Selected', 'Singular')
+ self.IFSp = translate('OpenLP.Ui', 'Invalid Files Selected', 'Plural')
+ self.Image = translate('OpenLP.Ui', 'Image')
+ self.Import = translate('OpenLP.Ui', 'Import')
+ self.LayoutStyle = translate('OpenLP.Ui', 'Layout style:')
+ self.Live = translate('OpenLP.Ui', 'Live')
+ self.LiveBGError = translate('OpenLP.Ui', 'Live Background Error')
+ self.LiveToolbar = translate('OpenLP.Ui', 'Live Toolbar')
+ self.Load = translate('OpenLP.Ui', 'Load')
+ self.Minutes = translate('OpenLP.Ui', 'm',
+ 'The abbreviated unit for minutes')
+ self.Middle = translate('OpenLP.Ui', 'Middle')
+ self.New = translate('OpenLP.Ui', 'New')
+ self.NewService = translate('OpenLP.Ui', 'New Service')
+ self.NewTheme = translate('OpenLP.Ui', 'New Theme')
+ self.NextTrack = translate('OpenLP.Ui', 'Next Track')
+ self.NFdSs = translate('OpenLP.Ui', 'No Folder Selected', 'Singular')
+ self.NFSs = translate('OpenLP.Ui', 'No File Selected', 'Singular')
+ self.NFSp = translate('OpenLP.Ui', 'No Files Selected', 'Plural')
+ self.NISs = translate('OpenLP.Ui', 'No Item Selected', 'Singular')
+ self.NISp = translate('OpenLP.Ui', 'No Items Selected', 'Plural')
+ self.OLPV1 = translate('OpenLP.Ui', 'openlp.org 1.x')
+ self.OLPV2 = translate('OpenLP.Ui', 'OpenLP 2.0')
+ self.OpenLPStart = translate('OpenLP.Ui', 'OpenLP is already running. '
+ 'Do you wish to continue?')
+ self.OpenService = translate('OpenLP.Ui', 'Open service.')
+ self.PlaySlidesInLoop = translate('OpenLP.Ui','Play Slides in Loop')
+ self.PlaySlidesToEnd = translate('OpenLP.Ui','Play Slides to End')
+ self.Preview = translate('OpenLP.Ui', 'Preview')
+ self.PrintService = translate('OpenLP.Ui', 'Print Service')
+ self.ReplaceBG = translate('OpenLP.Ui', 'Replace Background')
+ self.ReplaceLiveBG = translate('OpenLP.Ui', 'Replace live background.')
+ self.ResetBG = translate('OpenLP.Ui', 'Reset Background')
+ self.ResetLiveBG = translate('OpenLP.Ui', 'Reset live background.')
+ self.Seconds = translate('OpenLP.Ui', 's',
+ 'The abbreviated unit for seconds')
+ self.SaveAndPreview = translate('OpenLP.Ui', 'Save && Preview')
+ self.Search = translate('OpenLP.Ui', 'Search')
+ self.SearchThemes = translate(
+ 'OpenLP.Ui', 'Search Themes...', 'Search bar place holder text ')
+ self.SelectDelete = translate('OpenLP.Ui', 'You must select an item '
+ 'to delete.')
+ self.SelectEdit = translate('OpenLP.Ui', 'You must select an item to '
+ 'edit.')
+ self.Settings = translate('OpenLP.Ui', 'Settings')
+ self.SaveService = translate('OpenLP.Ui', 'Save Service')
+ self.Service = translate('OpenLP.Ui', 'Service')
+ self.Split = translate('OpenLP.Ui', 'Optional &Split')
+ self.SplitToolTip = translate('OpenLP.Ui', 'Split a slide into two '
+ 'only if it does not fit on the screen as one slide.')
+ self.StartTimeCode = unicode(translate('OpenLP.Ui', 'Start %s'))
+ self.StopPlaySlidesInLoop = translate('OpenLP.Ui',
+ 'Stop Play Slides in Loop')
+ self.StopPlaySlidesToEnd = translate('OpenLP.Ui',
+ 'Stop Play Slides to End')
+ self.Theme = translate('OpenLP.Ui', 'Theme', 'Singular')
+ self.Themes = translate('OpenLP.Ui', 'Themes', 'Plural')
+ self.Tools = translate('OpenLP.Ui', 'Tools')
+ self.Top = translate('OpenLP.Ui', 'Top')
+ self.UnsupportedFile = translate('OpenLP.Ui', 'Unsupported File')
+ self.VersePerSlide = translate('OpenLP.Ui', 'Verse Per Slide')
+ self.VersePerLine = translate('OpenLP.Ui', 'Verse Per Line')
+ self.Version = translate('OpenLP.Ui', 'Version')
+ self.View = translate('OpenLP.Ui', 'View')
+ self.ViewMode = translate('OpenLP.Ui', 'View Mode')
+
+>>>>>>> MERGE-SOURCE
def add_welcome_page(parent, image):
"""
=== modified file 'openlp/core/resources.py'
=== modified file 'openlp/core/theme/__init__.py'
=== modified file 'openlp/core/theme/theme.py'
=== modified file 'openlp/core/ui/__init__.py'
=== modified file 'openlp/core/ui/aboutdialog.py'
--- openlp/core/ui/aboutdialog.py 2013-08-31 18:17:38 +0000
+++ openlp/core/ui/aboutdialog.py 2013-09-14 11:12:23 +0000
@@ -270,6 +270,7 @@
'\n '.join(documentors)))
self.about_notebook.setTabText(self.about_notebook.indexOf(self.credits_tab),
translate('OpenLP.AboutForm', 'Credits'))
+<<<<<<< TREE
copyright_note = translate('OpenLP.AboutForm',
'Copyright \xa9 2004-2013 %s\n'
'Portions copyright \xa9 2004-2013 %s') % ('Raoul Snyman',
@@ -281,6 +282,19 @@
'Philip Ridout, Simon Scudder, Jeffrey Smith, Maikel Stuivenberg, '
'Martin Thompson, Jon Tibble, Dave Warnock, Frode Woldsund, '
'Martin Zibricky, Patrick Zimmermann')
+=======
+ copyright = unicode(translate('OpenLP.AboutForm',
+ 'Copyright \xa9 2004-2013 %s\n'
+ 'Portions copyright \xa9 2004-2013 %s')) % (u'Raoul Snyman',
+ u'Tim Bentley, Gerald Britton, Jonathan Corwin, Samuel Findlay, '
+ u'Michael Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, '
+ u'Armin K\xf6hler, Erik Lundin, Edwin Lunando, Joshua Miller, '
+ u'Brian T. Meyer, Stevan Pettit, Andreas Preikschat, '
+ u'Mattias P\xf5ldaru, Christian Richter, '
+ u'Philip Ridout, Simon Scudder, Jeffrey Smith, Maikel Stuivenberg, '
+ u'Martin Thompson, Jon Tibble, Dave Warnock, Frode Woldsund, '
+ u'Martin Zibricky')
+>>>>>>> MERGE-SOURCE
licence = translate('OpenLP.AboutForm',
'This program is free software; you can redistribute it and/or '
'modify it under the terms of the GNU General Public License as '
=== modified file 'openlp/core/ui/aboutform.py'
=== modified file 'openlp/core/ui/advancedtab.py'
--- openlp/core/ui/advancedtab.py 2013-08-31 18:17:38 +0000
+++ openlp/core/ui/advancedtab.py 2013-09-14 11:12:23 +0000
@@ -507,12 +507,20 @@
self.default_color = new_color.name()
self.default_color_button.setStyleSheet('background-color: %s' % self.default_color)
+<<<<<<< TREE
def on_default_browse_button_clicked(self):
"""
Select an image for the default display screen.
"""
file_filters = '%s;;%s (*.*) (*)' % (get_images_filter(), UiStrings().AllFiles)
filename = QtGui.QFileDialog.getOpenFileName(self, translate('OpenLP.AdvancedTab', 'Open File'), '',
+=======
+ def onDefaultBrowseButtonClicked(self):
+ file_filters = u'%s;;%s (*.*)' % (get_images_filter(),
+ UiStrings().AllFiles)
+ filename = QtGui.QFileDialog.getOpenFileName(self,
+ translate('OpenLP.AdvancedTab', 'Open File'), '',
+>>>>>>> MERGE-SOURCE
file_filters)
if filename:
self.default_file_edit.setText(filename)
=== modified file 'openlp/core/ui/exceptiondialog.py'
=== modified file 'openlp/core/ui/exceptionform.py'
--- openlp/core/ui/exceptionform.py 2013-08-31 18:17:38 +0000
+++ openlp/core/ui/exceptionform.py 2013-09-14 11:12:23 +0000
@@ -234,9 +234,17 @@
Attache files to the bug report e-mail.
"""
files = QtGui.QFileDialog.getOpenFileName(
+<<<<<<< TREE
self, translate('ImagePlugin.ExceptionDialog', 'Select Attachment'),
Settings().value(self.settings_section + '/last directory'), '%s (*.*) (*)' % UiStrings().AllFiles)
log.info('New files(s) %s', str(files))
+=======
+ self,translate('ImagePlugin.ExceptionDialog',
+ 'Select Attachment'),
+ SettingsManager.get_last_dir(u'exceptions'),
+ u'%s (*.*)' % UiStrings().AllFiles)
+ log.info(u'New files(s) %s', unicode(files))
+>>>>>>> MERGE-SOURCE
if files:
self.file_attachment = str(files)
=== modified file 'openlp/core/ui/filerenamedialog.py'
=== modified file 'openlp/core/ui/filerenameform.py'
=== modified file 'openlp/core/ui/firsttimeform.py'
--- openlp/core/ui/firsttimeform.py 2013-08-31 18:17:38 +0000
+++ openlp/core/ui/firsttimeform.py 2013-09-14 11:12:23 +0000
@@ -26,9 +26,16 @@
# with this program; if not, write to the Free Software Foundation, Inc., 59 #
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
###############################################################################
+<<<<<<< TREE
"""
This module contains the first time wizard.
"""
+=======
+"""
+The First Time Wizard
+"""
+import io
+>>>>>>> MERGE-SOURCE
import logging
import os
import sys
@@ -41,9 +48,18 @@
from PyQt4 import QtCore, QtGui
+<<<<<<< TREE
from openlp.core.lib import PluginStatus, Settings, Registry, build_icon, check_directory_exists, translate
from openlp.core.utils import AppLocation, get_web_page
from .firsttimewizard import Ui_FirstTimeWizard, FirstTimePage
+=======
+from openlp.core.lib import translate, PluginStatus, Receiver, build_icon, \
+ check_directory_exists
+from openlp.core.lib.settings import Settings
+from openlp.core.utils import get_web_page, AppLocation, join_url, \
+ get_filesystem_encoding
+from firsttimewizard import Ui_FirstTimeWizard, FirstTimePage
+>>>>>>> MERGE-SOURCE
log = logging.getLogger(__name__)
@@ -53,16 +69,28 @@
This thread downloads the theme screenshots.
"""
def run(self):
+<<<<<<< TREE
"""
Overridden method to run the thread.
"""
themes = self.parent().config.get('themes', 'files')
themes = themes.split(',')
+=======
+ """
+ Run the thread.
+ """
+ themes = self.parent().config.get(u'themes', u'files')
+ themes = themes.split(u',')
+ themes_dir = self.parent().config.get(u'themes', u'directory')
+ tmp_dir = os.path.join(unicode(gettempdir(), get_filesystem_encoding()),
+ u'openlp')
+>>>>>>> MERGE-SOURCE
config = self.parent().config
for theme in themes:
# Stop if the wizard has been cancelled.
if self.parent().was_download_cancelled:
return
+<<<<<<< TREE
title = config.get('theme_%s' % theme, 'title')
filename = config.get('theme_%s' % theme, 'filename')
screenshot = config.get('theme_%s' % theme, 'screenshot')
@@ -70,6 +98,16 @@
os.path.join(gettempdir(), 'openlp', screenshot))
item = QtGui.QListWidgetItem(title, self.parent().themes_list_widget)
item.setData(QtCore.Qt.UserRole, filename)
+=======
+ title = config.get(u'theme_%s' % theme, u'title')
+ filename = config.get(u'theme_%s' % theme, u'filename')
+ screenshot = config.get(u'theme_%s' % theme, u'screenshot')
+ urllib.urlretrieve(join_url(self.parent().baseurl,
+ themes_dir, screenshot),
+ os.path.join(tmp_dir, screenshot))
+ item = QtGui.QListWidgetItem(title, self.parent().themesListWidget)
+ item.setData(QtCore.Qt.UserRole, QtCore.QVariant(filename))
+>>>>>>> MERGE-SOURCE
item.setCheckState(QtCore.Qt.Unchecked)
item.setFlags(item.flags() | QtCore.Qt.ItemIsUserCheckable)
@@ -87,6 +125,7 @@
super(FirstTimeForm, self).__init__(parent)
self.setupUi(self)
self.screens = screens
+<<<<<<< TREE
# check to see if we have web access
self.web = 'http://openlp.org/files/frw/'
self.config = SafeConfigParser()
@@ -102,6 +141,36 @@
self.no_internet_finish_button.clicked.connect(self.on_no_internet_finish_button_clicked)
self.currentIdChanged.connect(self.on_current_id_changed)
Registry().register_function('config_screen_changed', self.update_screen_list_combo)
+=======
+ self.config = SafeConfigParser()
+ # The following url should contain 'download.cfg' or redirect OpenLP
+ # to the right url of 'download.cfg' file.
+ # 'download.cfg' file contains definitions for everything that is
+ # available for download into OpenLP in FirstTimeWizard.
+ self.web = u'http://openlp.org/files/frw/'
+ # Base url for dowloading resource files (songs, themes, bibles).
+ # These files could be hosted on different places and thus the base
+ # url is defined in 'download.cfg' file.
+ self.baseurl = None
+ # Check to see if we have web access
+ self.webAccess = get_web_page(u'%s%s' % (self.web, u'download.cfg'))
+ if self.webAccess:
+ files = self.webAccess.read()
+ self.config.readfp(io.BytesIO(files))
+ self.baseurl = self.config.get(u'general', u'base url')
+ self.updateScreenListCombo()
+ self.downloadCancelled = False
+ self.downloading = unicode(translate('OpenLP.FirstTimeWizard',
+ 'Downloading %s...'))
+ QtCore.QObject.connect(self.cancelButton, QtCore.SIGNAL('clicked()'),
+ self.onCancelButtonClicked)
+ QtCore.QObject.connect(self.noInternetFinishButton,
+ QtCore.SIGNAL('clicked()'), self.onNoInternetFinishButtonClicked)
+ QtCore.QObject.connect(self,
+ QtCore.SIGNAL(u'currentIdChanged(int)'), self.onCurrentIdChanged)
+ QtCore.QObject.connect(Receiver.get_receiver(),
+ QtCore.SIGNAL(u'config_screen_changed'), self.updateScreenListCombo)
+>>>>>>> MERGE-SOURCE
def exec_(self):
"""
@@ -118,11 +187,20 @@
check_directory_exists(os.path.join(gettempdir(), 'openlp'))
self.no_internet_finish_button.setVisible(False)
# Check if this is a re-run of the wizard.
+<<<<<<< TREE
self.has_run_wizard = Settings().value('core/has run wizard')
# Sort out internet access for downloads
if self.web_access:
songs = self.config.get('songs', 'languages')
songs = songs.split(',')
+=======
+ self.hasRunWizard = Settings().value(
+ u'general/has run wizard', QtCore.QVariant(False)).toBool()
+ # Sort out internet access for downloads.
+ if self.webAccess:
+ songs = self.config.get(u'songs', u'languages')
+ songs = songs.split(u',')
+>>>>>>> MERGE-SOURCE
for song in songs:
title = self.config.get('songs_%s' % song, 'title')
filename = self.config.get('songs_%s' % song, 'filename')
@@ -154,16 +232,37 @@
"""
Determine the next page in the Wizard to go to.
"""
+<<<<<<< TREE
self.application.process_events()
+=======
+ Receiver.send_message(u'openlp_process_events')
+ # If we are currently on the plugins page
+>>>>>>> MERGE-SOURCE
if self.currentId() == FirstTimePage.Plugins:
+<<<<<<< TREE
if not self.web_access:
+=======
+ # But we don't have Internet access
+ if not self.webAccess:
+>>>>>>> MERGE-SOURCE
return FirstTimePage.NoInternet
- else:
+ # The songs plugin is enabled
+ elif self.songsCheckBox.isChecked():
return FirstTimePage.Songs
+ # The Bibles plugin is enabled
+ elif self.bibleCheckBox.isChecked():
+ return FirstTimePage.Bibles
+ else:
+ return FirstTimePage.Themes
elif self.currentId() == FirstTimePage.Progress:
return -1
elif self.currentId() == FirstTimePage.NoInternet:
return FirstTimePage.Progress
+ elif self.currentId() == FirstTimePage.Songs:
+ if self.bibleCheckBox.isChecked():
+ return FirstTimePage.Bibles
+ else:
+ return FirstTimePage.Themes
elif self.currentId() == FirstTimePage.Themes:
self.application.set_busy_cursor()
while not self.theme_screenshot_thread.isFinished():
@@ -261,6 +360,7 @@
Download a file given a URL. The file is retrieved in chunks, giving the ability to cancel the download at any
point.
"""
+ log.debug(u'Downloading %s' % url)
block_count = 0
block_size = 4096
url_file = urllib.request.urlopen(url)
@@ -334,15 +434,30 @@
Prepare the UI for the process.
"""
self.max_progress = 0
+<<<<<<< TREE
self.finish_button.setVisible(False)
self.application.process_events()
+=======
+ self.finishButton.setVisible(False)
+ Receiver.send_message(u'openlp_process_events')
+ # Directory name appended to base download url as the name
+ # is found in download.cfg file.
+ songs_dir = unicode(self.config.get(u'songs', u'directory'), u'utf8')
+ bibles_dir = unicode(self.config.get(u'bibles', u'directory'), u'utf8')
+ themes_dir = unicode(self.config.get(u'themes', u'directory'), u'utf8')
+>>>>>>> MERGE-SOURCE
# Loop through the songs list and increase for each selected item
for i in range(self.songs_list_widget.count()):
self.application.process_events()
item = self.songs_list_widget.item(i)
if item.checkState() == QtCore.Qt.Checked:
+<<<<<<< TREE
filename = item.data(QtCore.Qt.UserRole)
size = self._getFileSize('%s%s' % (self.web, filename))
+=======
+ filename = item.data(QtCore.Qt.UserRole).toString()
+ size = self._getFileSize(join_url(self.baseurl, songs_dir, filename))
+>>>>>>> MERGE-SOURCE
self.max_progress += size
# Loop through the Bibles list and increase for each selected item
iterator = QtGui.QTreeWidgetItemIterator(self.bibles_tree_widget)
@@ -350,8 +465,13 @@
self.application.process_events()
item = iterator.value()
if item.parent() and item.checkState(0) == QtCore.Qt.Checked:
+<<<<<<< TREE
filename = item.data(0, QtCore.Qt.UserRole)
size = self._getFileSize('%s%s' % (self.web, filename))
+=======
+ filename = item.data(0, QtCore.Qt.UserRole).toString()
+ size = self._getFileSize(join_url(self.baseurl, bibles_dir, filename))
+>>>>>>> MERGE-SOURCE
self.max_progress += size
iterator += 1
# Loop through the themes list and increase for each selected item
@@ -359,11 +479,17 @@
self.application.process_events()
item = self.themes_list_widget.item(i)
if item.checkState() == QtCore.Qt.Checked:
+<<<<<<< TREE
filename = item.data(QtCore.Qt.UserRole)
size = self._getFileSize('%s%s' % (self.web, filename))
+=======
+ filename = item.data(QtCore.Qt.UserRole).toString()
+ size = self._getFileSize(join_url(self.baseurl, themes_dir, filename))
+>>>>>>> MERGE-SOURCE
self.max_progress += size
if self.max_progress:
# Add on 2 for plugins status setting plus a "finished" point.
+<<<<<<< TREE
self.max_progress += 2
self.progress_bar.setValue(0)
self.progress_bar.setMinimum(0)
@@ -371,6 +497,17 @@
self.progress_page.setTitle(translate('OpenLP.FirstTimeWizard', 'Setting Up And Downloading'))
self.progress_page.setSubTitle(
translate('OpenLP.FirstTimeWizard', 'Please wait while OpenLP is set up and your data is downloaded.'))
+=======
+ self.max_progress += 2
+ self.progressBar.setValue(0)
+ self.progressBar.setMinimum(0)
+ self.progressBar.setMaximum(self.max_progress)
+ self.progressPage.setTitle(translate('OpenLP.FirstTimeWizard',
+ 'Setting Up And Downloading'))
+ self.progressPage.setSubTitle(translate('OpenLP.FirstTimeWizard',
+ 'Please wait while OpenLP is set up '
+ 'and your data is downloaded.'))
+>>>>>>> MERGE-SOURCE
else:
self.progress_bar.setVisible(False)
self.progress_page.setTitle(translate('OpenLP.FirstTimeWizard', 'Setting Up'))
@@ -425,9 +562,21 @@
self._set_plugin_status(self.alert_check_box, 'alerts/status')
if self.web_access:
# Build directories for downloads
+<<<<<<< TREE
songs_destination = os.path.join(gettempdir(), 'openlp')
bibles_destination = AppLocation.get_section_data_path('bibles')
themes_destination = AppLocation.get_section_data_path('themes')
+=======
+ songs_destination = os.path.join(
+ unicode(gettempdir(), get_filesystem_encoding()), u'openlp')
+ bibles_destination = AppLocation.get_section_data_path(u'bibles')
+ themes_destination = AppLocation.get_section_data_path(u'themes')
+ # Directory name appended to base download url as the name
+ # is found in download.cfg file.
+ songs_dir = unicode(self.config.get(u'songs', u'directory'), u'utf8')
+ bibles_dir = unicode(self.config.get(u'bibles', u'directory'), u'utf8')
+ themes_dir = unicode(self.config.get(u'themes', u'directory'), u'utf8')
+>>>>>>> MERGE-SOURCE
# Download songs
for i in range(self.songs_list_widget.count()):
item = self.songs_list_widget.item(i)
@@ -435,8 +584,15 @@
filename = item.data(QtCore.Qt.UserRole)
self._increment_progress_bar(self.downloading % filename, 0)
self.previous_size = 0
+<<<<<<< TREE
destination = os.path.join(songs_destination, str(filename))
self.url_get_file('%s%s' % (self.web, filename), destination)
+=======
+ destination = os.path.join(songs_destination,
+ unicode(filename))
+ self.urlGetFile(join_url(self.baseurl, songs_dir, filename),
+ destination)
+>>>>>>> MERGE-SOURCE
# Download Bibles
bibles_iterator = QtGui.QTreeWidgetItemIterator(
self.bibles_tree_widget)
@@ -446,7 +602,12 @@
bible = item.data(0, QtCore.Qt.UserRole)
self._increment_progress_bar(self.downloading % bible, 0)
self.previous_size = 0
+<<<<<<< TREE
self.url_get_file('%s%s' % (self.web, bible), os.path.join(bibles_destination, bible))
+=======
+ self.urlGetFile(join_url(self.baseurl, bibles_dir, bible),
+ os.path.join(bibles_destination, bible))
+>>>>>>> MERGE-SOURCE
bibles_iterator += 1
# Download themes
for i in range(self.themes_list_widget.count()):
@@ -455,7 +616,12 @@
theme = item.data(QtCore.Qt.UserRole)
self._increment_progress_bar(self.downloading % theme, 0)
self.previous_size = 0
+<<<<<<< TREE
self.url_get_file('%s%s' % (self.web, theme), os.path.join(themes_destination, theme))
+=======
+ self.urlGetFile(join_url(self.baseurl, themes_dir, theme),
+ os.path.join(themes_destination, theme))
+>>>>>>> MERGE-SOURCE
# Set Default Display
if self.display_combo_box.currentIndex() != -1:
Settings().setValue('core/monitor', self.display_combo_box.currentIndex())
=== modified file 'openlp/core/ui/firsttimelanguagedialog.py'
=== modified file 'openlp/core/ui/firsttimelanguageform.py'
=== modified file 'openlp/core/ui/firsttimewizard.py'
--- openlp/core/ui/firsttimewizard.py 2013-08-31 18:17:38 +0000
+++ openlp/core/ui/firsttimewizard.py 2013-09-14 11:12:23 +0000
@@ -38,9 +38,15 @@
class FirstTimePage(object):
+<<<<<<< TREE
"""
An enumeration class with each of the pages of the wizard.
"""
+=======
+ """
+ An enumeration object to make it easy for a developer to determine which page is which by index
+ """
+>>>>>>> MERGE-SOURCE
Welcome = 0
Plugins = 1
NoInternet = 2
=== modified file 'openlp/core/ui/formattingtagdialog.py'
=== modified file 'openlp/core/ui/formattingtagform.py'
--- openlp/core/ui/formattingtagform.py 2013-08-31 18:17:38 +0000
+++ openlp/core/ui/formattingtagform.py 2013-09-14 11:12:23 +0000
@@ -98,7 +98,12 @@
Enable the ``save_push_button`` when any of the selected tag's properties
has been changed.
"""
+<<<<<<< TREE
self.save_push_button.setEnabled(True)
+=======
+ self.savePushButton.setEnabled(True)
+ self.savePushButton.setDefault(True)
+>>>>>>> MERGE-SOURCE
def on_new_clicked(self):
"""
@@ -112,6 +117,7 @@
return
# Add new tag to list
tag = {
+<<<<<<< TREE
'desc': translate('OpenLP.FormattingTagForm', 'New Tag'),
'start tag': '{n}',
'start html': translate('OpenLP.FormattingTagForm', '<HTML here>'),
@@ -119,6 +125,15 @@
'end html': translate('OpenLP.FormattingTagForm', '</and here>'),
'protected': False,
'temporary': False
+=======
+ u'desc': unicode(translate('OpenLP.FormattingTagForm', 'New Tag')),
+ u'start tag': u'{n}',
+ u'start html': unicode(translate('OpenLP.FormattingTagForm', '<HTML here>')),
+ u'end tag': u'{/n}',
+ u'end html': unicode(translate('OpenLP.FormattingTagForm', '</and here>')),
+ u'protected': False,
+ u'temporary': False
+>>>>>>> MERGE-SOURCE
}
FormattingTags.add_html_tags([tag])
FormattingTags.save_html_tags()
=== modified file 'openlp/core/ui/generaltab.py'
--- openlp/core/ui/generaltab.py 2013-08-31 18:17:38 +0000
+++ openlp/core/ui/generaltab.py 2013-09-14 11:12:23 +0000
@@ -74,6 +74,7 @@
self.override_radio_button.setObjectName('override_radio_button')
self.monitor_layout.addWidget(self.override_radio_button, 2, 0, 1, 5)
# Custom position
+<<<<<<< TREE
self.custom_x_label = QtGui.QLabel(self.monitor_group_box)
self.custom_x_label.setObjectName('custom_x_label')
self.monitor_layout.addWidget(self.custom_x_label, 3, 1)
@@ -105,6 +106,39 @@
self.display_on_monitor_check = QtGui.QCheckBox(self.monitor_group_box)
self.display_on_monitor_check.setObjectName('monitor_combo_box')
self.monitor_layout.addWidget(self.display_on_monitor_check, 5, 0, 1, 5)
+=======
+ self.customXLabel = QtGui.QLabel(self.monitorGroupBox)
+ self.customXLabel.setObjectName(u'customXLabel')
+ self.monitorLayout.addWidget(self.customXLabel, 3, 1)
+ self.customXValueEdit = QtGui.QSpinBox(self.monitorGroupBox)
+ self.customXValueEdit.setObjectName(u'customXValueEdit')
+ self.customXValueEdit.setRange(-9999, 9999)
+ self.monitorLayout.addWidget(self.customXValueEdit, 4, 1)
+ self.customYLabel = QtGui.QLabel(self.monitorGroupBox)
+ self.customYLabel.setObjectName(u'customYLabel')
+ self.monitorLayout.addWidget(self.customYLabel, 3, 2)
+ self.customYValueEdit = QtGui.QSpinBox(self.monitorGroupBox)
+ self.customYValueEdit.setObjectName(u'customYValueEdit')
+ self.customYValueEdit.setRange(-9999, 9999)
+ self.monitorLayout.addWidget(self.customYValueEdit, 4, 2)
+ self.customWidthLabel = QtGui.QLabel(self.monitorGroupBox)
+ self.customWidthLabel.setObjectName(u'customWidthLabel')
+ self.monitorLayout.addWidget(self.customWidthLabel, 3, 3)
+ self.customWidthValueEdit = QtGui.QSpinBox(self.monitorGroupBox)
+ self.customWidthValueEdit.setObjectName(u'customWidthValueEdit')
+ self.customWidthValueEdit.setRange(1, 9999)
+ self.monitorLayout.addWidget(self.customWidthValueEdit, 4, 3)
+ self.customHeightLabel = QtGui.QLabel(self.monitorGroupBox)
+ self.customHeightLabel.setObjectName(u'customHeightLabel')
+ self.monitorLayout.addWidget(self.customHeightLabel, 3, 4)
+ self.customHeightValueEdit = QtGui.QSpinBox(self.monitorGroupBox)
+ self.customHeightValueEdit.setObjectName(u'customHeightValueEdit')
+ self.customHeightValueEdit.setRange(1, 9999)
+ self.monitorLayout.addWidget(self.customHeightValueEdit, 4, 4)
+ self.displayOnMonitorCheck = QtGui.QCheckBox(self.monitorGroupBox)
+ self.displayOnMonitorCheck.setObjectName(u'monitorComboBox')
+ self.monitorLayout.addWidget(self.displayOnMonitorCheck, 5, 0, 1, 5)
+>>>>>>> MERGE-SOURCE
# Set up the stretchiness of each column, so that the first column
# less stretchy (and therefore smaller) than the others
self.monitor_layout.setColumnStretch(0, 1)
=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py 2013-08-31 18:17:38 +0000
+++ openlp/core/ui/maindisplay.py 2013-09-14 11:12:23 +0000
@@ -338,9 +338,15 @@
"""
Generates a preview of the image displayed.
"""
+<<<<<<< TREE
log.debug('preview for %s', self.is_live)
was_visible = self.isVisible()
self.application.process_events()
+=======
+ log.debug(u'preview for %s', self.isLive)
+ was_visible = self.isVisible()
+ Receiver.send_message(u'openlp_process_events')
+>>>>>>> MERGE-SOURCE
# We must have a service item to preview.
if self.is_live and hasattr(self, 'service_item'):
# Wait for the fade to finish before geting the preview.
@@ -353,12 +359,20 @@
while not self.web_loaded:
self.application.process_events()
# if was hidden keep it hidden
+<<<<<<< TREE
if self.is_live:
if self.hide_mode:
self.hide_display(self.hide_mode)
# Only continue if the visibility wasn't changed during method call.
elif was_visible == self.isVisible():
+=======
+ if self.isLive:
+ if self.hideMode:
+ self.hideDisplay(self.hideMode)
+ # Only continue if the visibility wasn't changed during method call.
+ elif was_visible == self.isVisible():
+>>>>>>> MERGE-SOURCE
# Single screen active
if self.screens.display_count == 1:
# Only make visible if setting enabled.
=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py 2013-08-31 18:17:38 +0000
+++ openlp/core/ui/mainwindow.py 2013-09-14 11:12:23 +0000
@@ -287,6 +287,7 @@
self.settings_configure_item = create_action(main_window, 'settingsConfigureItem',
icon=':/system/system_settings.png', can_shortcuts=True, category=UiStrings().Settings)
# Give QT Extra Hint that this is the Preferences Menu Item
+<<<<<<< TREE
self.settings_configure_item.setMenuRole(QtGui.QAction.PreferencesRole)
self.settings_import_item = create_action(
main_window, 'settingsImportItem', category=UiStrings().Import, can_shortcuts=True)
@@ -295,6 +296,19 @@
action_list.add_category(UiStrings().Help, CategoryOrder.standard_menu)
self.about_item = create_action(main_window, 'aboutItem', icon=':/system/system_about.png',
can_shortcuts=True, category=UiStrings().Help, triggers=self.on_about_item_clicked)
+=======
+ self.settingsConfigureItem.setMenuRole(QtGui.QAction.PreferencesRole)
+ self.settingsImportItem = create_action(mainWindow,
+ u'settingsImportItem', category=UiStrings().Import)
+ self.settingsExportItem = create_action(mainWindow,
+ u'settingsExportItem', category=UiStrings().Export)
+ action_list.add_category(unicode(UiStrings().Help),
+ CategoryOrder.standardMenu)
+ self.aboutItem = create_action(mainWindow, u'aboutItem',
+ icon=u':/system/system_about.png',
+ shortcuts=[QtGui.QKeySequence(u'Ctrl+F1')],
+ category=UiStrings().Help, triggers=self.onAboutItemClicked)
+>>>>>>> MERGE-SOURCE
# Give QT Extra Hint that this is an About Menu Item
self.about_item.setMenuRole(QtGui.QAction.AboutRole)
if os.name == 'nt':
=== modified file 'openlp/core/ui/media/__init__.py'
=== modified file 'openlp/core/ui/media/mediacontroller.py'
=== modified file 'openlp/core/ui/media/mediaplayer.py'
=== modified file 'openlp/core/ui/media/phononplayer.py'
--- openlp/core/ui/media/phononplayer.py 2013-08-31 18:17:38 +0000
+++ openlp/core/ui/media/phononplayer.py 2013-09-14 11:12:23 +0000
@@ -92,6 +92,7 @@
self.display_name = '&Phonon'
self.parent = parent
self.additional_extensions = ADDITIONAL_EXT
+<<<<<<< TREE
mimetypes.init()
for mimetype in Phonon.BackendCapabilities.availableMimeTypes():
mimetype = str(mimetype)
@@ -99,6 +100,22 @@
self._addToList(self.audio_extensions_list, mimetype)
elif mimetype.startswith('video/'):
self._addToList(self.video_extensions_list, mimetype)
+=======
+ try:
+ mimetypes.init()
+ for mimetype in Phonon.BackendCapabilities.availableMimeTypes():
+ mimetype = unicode(mimetype)
+ if mimetype.startswith(u'audio/'):
+ self._addToList(self.audio_extensions_list, mimetype)
+ elif mimetype.startswith(u'video/'):
+ self._addToList(self.video_extensions_list, mimetype)
+ # Work around for http://bugs.python.org/issue9291
+ except UnicodeDecodeError:
+ log.exception(u'UnicodeDecodeError when trying to read mime types. '
+ 'Setting extensions to all files')
+ self.audio_extensions_list = [u'*.*']
+ self.video_extensions_list = [u'*.*']
+>>>>>>> MERGE-SOURCE
def _addToList(self, mimetype_list, mimetype):
"""
=== modified file 'openlp/core/ui/media/vendor/vlc.py'
--- openlp/core/ui/media/vendor/vlc.py 2013-08-31 18:17:38 +0000
+++ openlp/core/ui/media/vendor/vlc.py 2013-09-14 11:12:23 +0000
@@ -2,7 +2,7 @@
# Python ctypes bindings for VLC
#
-# Copyright (C) 2009-2012 the VideoLAN team
+# Copyright (C) 2009-2013 the VideoLAN team
# $Id: $
#
# Authors: Olivier Aubert <olivier.aubert at liris.cnrs.fr>
=== modified file 'openlp/core/ui/media/vlcplayer.py'
--- openlp/core/ui/media/vlcplayer.py 2013-08-31 18:17:38 +0000
+++ openlp/core/ui/media/vlcplayer.py 2013-09-14 11:12:23 +0000
@@ -70,6 +70,7 @@
AUDIO_EXT = ['*.mp3', '*.wav', '*.wma', '*.ogg']
VIDEO_EXT = [
+<<<<<<< TREE
'*.3gp',
'*.asf', '*.wmv',
'*.au',
@@ -93,6 +94,32 @@
'*.iso',
'*.vob',
'*.webm'
+=======
+ u'*.3gp',
+ u'*.asf', u'*.wmv',
+ u'*.au',
+ u'*.avi',
+ u'*.flv',
+ u'*.mov',
+ u'*.mp4', u'*.m4v',
+ u'*.ogm', u'*.ogv',
+ u'*.mkv', u'*.mka',
+ u'*.ts', u'*.mpg',
+ u'*.mpg', u'*.mp2',
+ u'*.nsc',
+ u'*.nsv',
+ u'*.nut',
+ u'*.ra', u'*.ram', u'*.rm', u'*.rv' ,u'*.rmbv',
+ u'*.a52', u'*.dts', u'*.aac', u'*.flac' ,u'*.dv', u'*.vid',
+ u'*.tta', u'*.tac',
+ u'*.ty',
+ u'*.dts',
+ u'*.xa',
+ u'*.iso',
+ u'*.vob',
+ u'*.webm',
+ u'*.divx'
+>>>>>>> MERGE-SOURCE
]
=== modified file 'openlp/core/ui/media/webkitplayer.py'
--- openlp/core/ui/media/webkitplayer.py 2013-08-31 18:17:38 +0000
+++ openlp/core/ui/media/webkitplayer.py 2013-09-14 11:12:23 +0000
@@ -174,6 +174,7 @@
"""
VIDEO_EXT = [
+<<<<<<< TREE
'*.3gp',
'*.3gpp',
'*.3g2',
@@ -196,11 +197,41 @@
'*.mpg', '*.wmv', '*.mpeg', '*.avi',
'*.swf'
]
+=======
+ u'*.3gp',
+ u'*.3gpp',
+ u'*.3g2',
+ u'*.3gpp2',
+ u'*.aac',
+ u'*.flv',
+ u'*.f4a',
+ u'*.f4b',
+ u'*.f4p',
+ u'*.f4v',
+ u'*.mov',
+ u'*.m4a',
+ u'*.m4b',
+ u'*.m4p',
+ u'*.m4v',
+ u'*.mkv',
+ u'*.mp4',
+ u'*.ogv',
+ u'*.webm',
+ u'*.mpg', u'*.wmv', u'*.mpeg', u'*.avi',
+ u'*.swf'
+ ]
+>>>>>>> MERGE-SOURCE
AUDIO_EXT = [
+<<<<<<< TREE
'*.mp3',
'*.ogg'
]
+=======
+ u'*.mp3',
+ u'*.ogg'
+ ]
+>>>>>>> MERGE-SOURCE
class WebkitPlayer(MediaPlayer):
=== modified file 'openlp/core/ui/mediadockmanager.py'
=== modified file 'openlp/core/ui/plugindialog.py'
=== modified file 'openlp/core/ui/pluginform.py'
=== modified file 'openlp/core/ui/printservicedialog.py'
=== modified file 'openlp/core/ui/printserviceform.py'
=== modified file 'openlp/core/ui/serviceitemeditdialog.py'
=== modified file 'openlp/core/ui/serviceitemeditform.py'
=== modified file 'openlp/core/ui/servicemanager.py'
--- openlp/core/ui/servicemanager.py 2013-09-07 07:52:52 +0000
+++ openlp/core/ui/servicemanager.py 2013-09-14 11:12:23 +0000
@@ -457,10 +457,19 @@
log.debug(temp_file_name)
path_file_name = str(self.file_name())
path, file_name = os.path.split(path_file_name)
+<<<<<<< TREE
base_name = os.path.splitext(file_name)[0]
service_file_name = '%s.osj' % base_name
log.debug('ServiceManager.save_file - %s', path_file_name)
Settings().setValue(self.main_window.service_manager_settings_section + '/last directory', path)
+=======
+ basename = os.path.splitext(file_name)[0]
+ service_file_name = '%s.osj' % basename
+ log.debug(u'ServiceManager.saveFile - %s', path_file_name)
+ SettingsManager.set_last_dir(
+ self.mainwindow.serviceManagerSettingsSection,
+ path)
+>>>>>>> MERGE-SOURCE
service = []
write_list = []
missing_list = []
@@ -511,9 +520,17 @@
for file_item in write_list:
file_size = os.path.getsize(file_item)
total_size += file_size
+<<<<<<< TREE
log.debug('ServiceManager.save_file - ZIP contents size is %i bytes' % total_size)
service_content = json.dumps(service)
# Usual Zip file cannot exceed 2GiB, file with Zip64 cannot be extracted using unzip in UNIX.
+=======
+ log.debug(u'ServiceManager.saveFile - ZIP contents size is %i bytes' %
+ total_size)
+ service_content = json.dumps(service)
+ # Usual Zip file cannot exceed 2GiB, file with Zip64 cannot be
+ # extracted using unzip in UNIX.
+>>>>>>> MERGE-SOURCE
allow_zip_64 = (total_size > 2147483648 + len(service_content))
log.debug('ServiceManager.save_file - allowZip64 is %s' % allow_zip_64)
zip_file = None
@@ -694,12 +711,20 @@
osfile = ucs_file.replace('/', os.path.sep)
if not osfile.startswith('audio'):
osfile = os.path.split(osfile)[1]
+<<<<<<< TREE
log.debug('Extract file: %s', osfile)
zip_info.filename = osfile
zip_file.extract(zip_info, self.servicePath)
if osfile.endswith('osj') or osfile.endswith('osd'):
+=======
+ log.debug(u'Extract file: %s', osfile)
+ zipinfo.filename = osfile
+ zip.extract(zipinfo, self.servicePath)
+ if osfile.endswith(u'osd') or osfile.endswith(u'osj'):
+>>>>>>> MERGE-SOURCE
p_file = os.path.join(self.servicePath, osfile)
if 'p_file' in locals():
+<<<<<<< TREE
file_to = open(p_file, 'r')
if p_file.endswith('osj'):
items = json.load(file_to)
@@ -712,6 +737,17 @@
self.new_file()
self.set_file_name(file_name)
self.main_window.display_progress_bar(len(items))
+=======
+ Receiver.send_message(u'cursor_busy')
+ fileTo = open(p_file, u'r')
+ if p_file.endswith(u'osj'):
+ items = json.load(fileTo)
+ else:
+ items = cPickle.load(fileTo)
+ fileTo.close()
+ self.newFile()
+ self.mainwindow.displayProgressBar(len(items))
+>>>>>>> MERGE-SOURCE
for item in items:
self.main_window.increment_progress_bar()
service_item = ServiceItem()
@@ -828,6 +864,7 @@
if service_item['service_item'].theme is None:
theme_action = self.theme_menu.defaultAction()
else:
+<<<<<<< TREE
theme_action = self.theme_menu.findChild(QtGui.QAction, service_item['service_item'].theme)
if theme_action is not None:
theme_action.setChecked(True)
@@ -845,6 +882,25 @@
self.set_modified()
def on_start_time_form(self):
+=======
+ themeAction = self.themeMenu.findChild(
+ QtGui.QAction, serviceItem[u'service_item'].theme)
+ if themeAction is not None:
+ themeAction.setChecked(True)
+ self.menu.exec_(self.serviceManagerList.mapToGlobal(point))
+
+ def onServiceItemNoteForm(self):
+ item = self.findServiceItem()[0]
+ self.serviceNoteForm.textEdit.setPlainText(
+ self.serviceItems[item][u'service_item'].notes)
+ if self.serviceNoteForm.exec_():
+ self.serviceItems[item][u'service_item'].notes = \
+ unicode(self.serviceNoteForm.textEdit.toPlainText())
+ self.repaintServiceList(item, -1)
+ self.setModified()
+
+ def onStartTimeForm(self):
+>>>>>>> MERGE-SOURCE
"""
Opens a dialog to type in service item notes.
"""
=== modified file 'openlp/core/ui/servicenoteform.py'
=== modified file 'openlp/core/ui/settingsdialog.py'
=== modified file 'openlp/core/ui/settingsform.py'
=== modified file 'openlp/core/ui/shortcutlistdialog.py'
=== modified file 'openlp/core/ui/shortcutlistform.py'
=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py 2013-08-31 18:17:38 +0000
+++ openlp/core/ui/slidecontroller.py 2013-09-14 11:12:23 +0000
@@ -97,6 +97,7 @@
self.ratio = self.screens.current['size'].width() / self.screens.current['size'].height()
except ZeroDivisionError:
self.ratio = 1
+<<<<<<< TREE
self.loop_list = [
'play_slides_menu',
'loop_separator',
@@ -114,6 +115,18 @@
]
self.narrow_menu = [
'hide_menu'
+=======
+ self.imageManager = self.parent().imageManager
+ self.mediaController = self.parent().mediaController
+ self.loopList = [
+ u'playSlidesMenu',
+ u'loopSeparator',
+ u'delaySpinBox'
+ ]
+ self.audioList = [
+ u'audioPauseItem',
+ u'audioTimeLabel'
+>>>>>>> MERGE-SOURCE
]
self.timer_id = 0
self.song_edit = False
@@ -272,13 +285,25 @@
self.audio_pause_item = self.toolbar.add_toolbar_action('audioPauseItem',
icon=':/slides/media_playback_pause.png', text=translate('OpenLP.SlideController', 'Pause Audio'),
tooltip=translate('OpenLP.SlideController', 'Pause audio.'),
+<<<<<<< TREE
checked=False, visible=False, category=self.category, context=QtCore.Qt.WindowShortcut,
can_shortcuts=True, triggers=self.set_audio_pause_clicked)
self.audio_menu = QtGui.QMenu(translate('OpenLP.SlideController', 'Background Audio'), self.toolbar)
self.audio_pause_item.setMenu(self.audio_menu)
self.audio_pause_item.setParent(self.toolbar)
self.toolbar.widgetForAction(self.audio_pause_item).setPopupMode(
+=======
+ checked=False, visible=False, category=self.category,
+ context=QtCore.Qt.WindowShortcut,
+ shortcuts=[], triggers=self.onAudioPauseClicked)
+ self.audioMenu = QtGui.QMenu(
+ translate('OpenLP.SlideController', 'Background Audio'), self.toolbar)
+ self.audioPauseItem.setMenu(self.audioMenu)
+ self.audioPauseItem.setParent(self.toolbar)
+ self.toolbar.widgetForAction(self.audioPauseItem).setPopupMode(
+>>>>>>> MERGE-SOURCE
QtGui.QToolButton.MenuButtonPopup)
+<<<<<<< TREE
self.nextTrackItem = create_action(self, 'nextTrackItem', text=UiStrings().NextTrack,
icon=':/slides/media_playback_next.png',
tooltip=translate('OpenLP.SlideController', 'Go to next audio track.'),
@@ -292,6 +317,33 @@
self.toolbar.add_toolbar_widget(self.audio_time_label)
self.toolbar.set_widget_visible(self.audio_list, False)
self.toolbar.set_widget_visible(['song_menu'], False)
+=======
+ self.nextTrackItem = create_action(self, u'nextTrackItem',
+ text=UiStrings().NextTrack,
+ icon=u':/slides/media_playback_next.png', tooltip=translate(
+ 'OpenLP.SlideController', 'Go to next audio track.'),
+ category=self.category,
+ shortcuts=[], triggers=self.onNextTrackClicked)
+ self.audioMenu.addAction(self.nextTrackItem)
+ self.trackMenu = self.audioMenu.addMenu(
+ translate('OpenLP.SlideController', 'Tracks'))
+ self.audioTimeLabel = QtGui.QLabel(u' 00:00 ', self.toolbar)
+ self.audioTimeLabel.setAlignment(
+ QtCore.Qt.AlignCenter|QtCore.Qt.AlignHCenter)
+ self.audioTimeLabel.setStyleSheet(
+ u'background-color: palette(background); '
+ u'border-top-color: palette(shadow); '
+ u'border-left-color: palette(shadow); '
+ u'border-bottom-color: palette(light); '
+ u'border-right-color: palette(light); '
+ u'border-radius: 3px; border-style: inset; '
+ u'border-width: 1; font-family: monospace; margin: 2px;'
+ )
+ self.audioTimeLabel.setObjectName(u'audioTimeLabel')
+ self.toolbar.addToolbarWidget(self.audioTimeLabel)
+ self.toolbar.setWidgetVisible(self.audioList, False)
+ self.toolbar.setWidgetVisible([u'songMenu'], False)
+>>>>>>> MERGE-SOURCE
# Screen preview area
self.preview_frame = QtGui.QFrame(self.splitter)
self.preview_frame.setGeometry(QtCore.QRect(0, 0, 300, 300 * self.ratio))
@@ -624,19 +676,35 @@
# See bug #791050
self.toolbar.hide()
self.mediabar.hide()
+<<<<<<< TREE
self.song_menu.hide()
self.toolbar.set_widget_visible(self.loop_list, False)
self.toolbar.set_widget_visible(['song_menu'], False)
+=======
+ self.songMenu.hide()
+ self.toolbar.setWidgetVisible([u'songMenu'], False)
+ self.toolbar.setWidgetVisible(self.loopList, False)
+>>>>>>> MERGE-SOURCE
# Reset the button
self.play_slides_once.setChecked(False)
self.play_slides_once.setIcon(build_icon(':/media/media_time.png'))
self.play_slides_loop.setChecked(False)
self.play_slides_loop.setIcon(build_icon(':/media/media_time.png'))
if item.is_text():
+<<<<<<< TREE
if Settings().value(self.main_window.songs_settings_section + '/display songbar') and self.slideList:
self.toolbar.set_widget_visible(['song_menu'], True)
if item.is_capable(ItemCapabilities.CanLoop) and len(item.get_frames()) > 1:
self.toolbar.set_widget_visible(self.loop_list)
+=======
+ if Settings().value(
+ self.parent().songsSettingsSection + u'/display songbar',
+ QtCore.QVariant(True)).toBool() and self.slideList:
+ self.toolbar.setWidgetVisible([u'songMenu'], True)
+ if item.is_capable(ItemCapabilities.CanLoop) and \
+ len(item.get_frames()) > 1:
+ self.toolbar.setWidgetVisible(self.loopList)
+>>>>>>> MERGE-SOURCE
if item.is_media():
self.mediabar.show()
self.previous_item.setVisible(not item.is_media())
=== modified file 'openlp/core/ui/splashscreen.py'
=== modified file 'openlp/core/ui/starttimedialog.py'
=== modified file 'openlp/core/ui/starttimeform.py'
=== modified file 'openlp/core/ui/themeform.py'
--- openlp/core/ui/themeform.py 2013-08-31 18:17:38 +0000
+++ openlp/core/ui/themeform.py 2013-09-14 11:12:23 +0000
@@ -38,8 +38,13 @@
from openlp.core.lib.theme import BackgroundType, BackgroundGradientType
from openlp.core.lib.ui import critical_error_message_box
from openlp.core.ui import ThemeLayoutForm
+<<<<<<< TREE
from openlp.core.utils import get_images_filter, is_not_image_file
from .themewizard import Ui_ThemeWizard
+=======
+from openlp.core.utils import get_images_filter, is_not_image_file
+from themewizard import Ui_ThemeWizard
+>>>>>>> MERGE-SOURCE
log = logging.getLogger(__name__)
@@ -64,6 +69,7 @@
self.updateThemeAllowed = True
self.temp_background_filename = ''
self.themeLayoutForm = ThemeLayoutForm(self)
+<<<<<<< TREE
self.backgroundComboBox.currentIndexChanged.connect(self.onBackgroundComboBoxCurrentIndexChanged)
self.gradientComboBox.currentIndexChanged.connect(self.onGradientComboBoxCurrentIndexChanged)
self.colorButton.clicked.connect(self.onColorButtonClicked)
@@ -90,6 +96,67 @@
self.mainFontComboBox.activated.connect(self.calculateLines)
self.footerFontComboBox.activated.connect(self.updateTheme)
self.footerSizeSpinBox.valueChanged.connect(self.updateTheme)
+=======
+ QtCore.QObject.connect(self.backgroundComboBox,
+ QtCore.SIGNAL(u'currentIndexChanged(int)'),
+ self.onBackgroundComboBoxCurrentIndexChanged)
+ QtCore.QObject.connect(self.gradientComboBox,
+ QtCore.SIGNAL(u'currentIndexChanged(int)'),
+ self.onGradientComboBoxCurrentIndexChanged)
+ QtCore.QObject.connect(self.colorButton,
+ QtCore.SIGNAL(u'clicked()'), self.onColorButtonClicked)
+ QtCore.QObject.connect(self.imageColorButton,
+ QtCore.SIGNAL(u'clicked()'), self.onImageColorButtonClicked)
+ QtCore.QObject.connect(self.gradientStartButton,
+ QtCore.SIGNAL(u'clicked()'), self.onGradientStartButtonClicked)
+ QtCore.QObject.connect(self.gradientEndButton,
+ QtCore.SIGNAL(u'clicked()'), self.onGradientEndButtonClicked)
+ QtCore.QObject.connect(self.imageBrowseButton,
+ QtCore.SIGNAL(u'clicked()'), self.onImageBrowseButtonClicked)
+ QtCore.QObject.connect(self.imageFileEdit,
+ QtCore.SIGNAL(u'editingFinished()'), self.onImageFileEditEditingFinished)
+ QtCore.QObject.connect(self.mainColorButton,
+ QtCore.SIGNAL(u'clicked()'), self.onMainColorButtonClicked)
+ QtCore.QObject.connect(self.outlineColorButton,
+ QtCore.SIGNAL(u'clicked()'), self.onOutlineColorButtonClicked)
+ QtCore.QObject.connect(self.shadowColorButton,
+ QtCore.SIGNAL(u'clicked()'), self.onShadowColorButtonClicked)
+ QtCore.QObject.connect(self.outlineCheckBox,
+ QtCore.SIGNAL(u'stateChanged(int)'),
+ self.onOutlineCheckCheckBoxStateChanged)
+ QtCore.QObject.connect(self.shadowCheckBox,
+ QtCore.SIGNAL(u'stateChanged(int)'),
+ self.onShadowCheckCheckBoxStateChanged)
+ QtCore.QObject.connect(self.footerColorButton,
+ QtCore.SIGNAL(u'clicked()'), self.onFooterColorButtonClicked)
+ QtCore.QObject.connect(self,
+ QtCore.SIGNAL(u'customButtonClicked(int)'),
+ self.onCustom1ButtonClicked)
+ QtCore.QObject.connect(self.mainPositionCheckBox,
+ QtCore.SIGNAL(u'stateChanged(int)'),
+ self.onMainPositionCheckBoxStateChanged)
+ QtCore.QObject.connect(self.footerPositionCheckBox,
+ QtCore.SIGNAL(u'stateChanged(int)'),
+ self.onFooterPositionCheckBoxStateChanged)
+ QtCore.QObject.connect(self,
+ QtCore.SIGNAL(u'currentIdChanged(int)'), self.onCurrentIdChanged)
+ QtCore.QObject.connect(Receiver.get_receiver(),
+ QtCore.SIGNAL(u'theme_line_count'), self.updateLinesText)
+ QtCore.QObject.connect(self.mainSizeSpinBox,
+ QtCore.SIGNAL(u'valueChanged(int)'), self.calculateLines)
+ QtCore.QObject.connect(self.lineSpacingSpinBox,
+ QtCore.SIGNAL(u'valueChanged(int)'), self.calculateLines)
+ QtCore.QObject.connect(self.outlineSizeSpinBox,
+ QtCore.SIGNAL(u'valueChanged(int)'), self.calculateLines)
+ QtCore.QObject.connect(self.shadowSizeSpinBox,
+ QtCore.SIGNAL(u'valueChanged(int)'), self.calculateLines)
+ QtCore.QObject.connect(self.mainFontComboBox,
+ QtCore.SIGNAL(u'activated(int)'), self.calculateLines)
+ QtCore.QObject.connect(self.footerFontComboBox,
+ QtCore.SIGNAL(u'activated(int)'), self.updateTheme)
+ QtCore.QObject.connect(self.footerSizeSpinBox,
+ QtCore.SIGNAL(u'valueChanged(int)'), self.updateTheme)
+>>>>>>> MERGE-SOURCE
def setDefaults(self):
"""
@@ -179,8 +246,15 @@
"""
background_image = BackgroundType.to_string(BackgroundType.Image)
if self.page(self.currentId()) == self.backgroundPage and \
+<<<<<<< TREE
self.theme.background_type == background_image and is_not_image_file(self.theme.background_filename):
QtGui.QMessageBox.critical(self, translate('OpenLP.ThemeWizard', 'Background Image Empty'),
+=======
+ self.theme.background_type == background_image and \
+ is_not_image_file(self.theme.background_filename):
+ QtGui.QMessageBox.critical(self,
+ translate('OpenLP.ThemeWizard', 'Background Image Empty'),
+>>>>>>> MERGE-SOURCE
translate('OpenLP.ThemeWizard', 'You have not selected a '
'background image. Please select one before continuing.'))
return False
@@ -435,19 +509,33 @@
Background Image button pushed.
"""
images_filter = get_images_filter()
+<<<<<<< TREE
images_filter = '%s;;%s (*.*) (*)' % (images_filter, UiStrings().AllFiles)
+=======
+ images_filter = u'%s;;%s (*.*)' % (
+ images_filter, UiStrings().AllFiles)
+>>>>>>> MERGE-SOURCE
filename = QtGui.QFileDialog.getOpenFileName(self,
translate('OpenLP.ThemeWizard', 'Select Image'), '', images_filter)
if filename:
self.theme.background_filename = str(filename)
self.setBackgroundPageValues()
+<<<<<<< TREE
def onImageFileEditEditingFinished(self):
"""
Background image path edited
"""
self.theme.background_filename = str(self.imageFileEdit.text())
+=======
+ def onImageFileEditEditingFinished(self):
+ """
+ Background image path edited
+ """
+ self.theme.background_filename = unicode(self.imageFileEdit.text())
+
+>>>>>>> MERGE-SOURCE
def onMainColorButtonClicked(self):
"""
Set the main colour value
=== modified file 'openlp/core/ui/themelayoutdialog.py'
=== modified file 'openlp/core/ui/themelayoutform.py'
=== modified file 'openlp/core/ui/thememanager.py'
--- openlp/core/ui/thememanager.py 2013-08-31 18:17:38 +0000
+++ openlp/core/ui/thememanager.py 2013-09-14 11:12:23 +0000
@@ -38,10 +38,21 @@
from xml.etree.ElementTree import ElementTree, XML
from PyQt4 import QtCore, QtGui
+<<<<<<< TREE
from openlp.core.lib import ImageSource, OpenLPToolbar, Registry, Settings, UiStrings, get_text_file_string, \
build_icon, translate, check_item_selected, check_directory_exists, create_thumb, validate_thumb
from openlp.core.lib.theme import ThemeXML, BackgroundType, VerticalType, BackgroundGradientType
from openlp.core.lib.ui import critical_error_message_box, create_widget_action
+=======
+from openlp.core.lib import FileDialog, OpenLPToolbar, get_text_file_string, build_icon, \
+ Receiver, SettingsManager, translate, check_item_selected, \
+ check_directory_exists, create_thumb, validate_thumb, ImageSource
+from openlp.core.lib.theme import ThemeXML, BackgroundType, VerticalType, \
+ BackgroundGradientType
+from openlp.core.lib.settings import Settings
+from openlp.core.lib.ui import UiStrings, critical_error_message_box, \
+ create_widget_action
+>>>>>>> MERGE-SOURCE
from openlp.core.theme import Theme
from openlp.core.ui import FileRenameForm, ThemeForm
from openlp.core.utils import AppLocation, delete_file, get_locale_key, get_filesystem_encoding
@@ -374,7 +385,7 @@
Opens a file dialog to select the theme file(s) to import before attempting to extract OpenLP themes from
those files. This process will load both OpenLP version 1 and version 2 themes.
"""
- files = QtGui.QFileDialog.getOpenFileNames(self,
+ files = FileDialog.getOpenFileNames(self,
translate('OpenLP.ThemeManager', 'Select Theme Import File'),
Settings().value(self.settings_section + '/last directory import'),
translate('OpenLP.ThemeManager', 'OpenLP Themes (*.theme *.otz)'))
=== modified file 'openlp/core/ui/themestab.py'
=== modified file 'openlp/core/ui/themewizard.py'
--- openlp/core/ui/themewizard.py 2013-08-31 18:17:38 +0000
+++ openlp/core/ui/themewizard.py 2013-09-14 11:12:23 +0000
@@ -178,10 +178,18 @@
self.lineSpacingLabel = QtGui.QLabel(self.mainAreaPage)
self.lineSpacingLabel.setObjectName('LineSpacingLabel')
self.lineSpacingSpinBox = QtGui.QSpinBox(self.mainAreaPage)
+<<<<<<< TREE
self.lineSpacingSpinBox.setMinimum(-250)
self.lineSpacingSpinBox.setMaximum(250)
self.lineSpacingSpinBox.setObjectName('LineSpacingSpinBox')
self.mainAreaLayout.addRow(self.lineSpacingLabel, self.lineSpacingSpinBox)
+=======
+ self.lineSpacingSpinBox.setMinimum(-250)
+ self.lineSpacingSpinBox.setMaximum(250)
+ self.lineSpacingSpinBox.setObjectName(u'LineSpacingSpinBox')
+ self.mainAreaLayout.addRow(self.lineSpacingLabel,
+ self.lineSpacingSpinBox)
+>>>>>>> MERGE-SOURCE
self.outlineCheckBox = QtGui.QCheckBox(self.mainAreaPage)
self.outlineCheckBox.setObjectName('OutlineCheckBox')
self.outlineLayout = QtGui.QHBoxLayout()
=== modified file 'openlp/core/ui/wizard.py'
=== modified file 'openlp/core/utils/__init__.py'
--- openlp/core/utils/__init__.py 2013-09-09 21:10:40 +0000
+++ openlp/core/utils/__init__.py 2013-09-14 11:12:23 +0000
@@ -37,7 +37,14 @@
import re
from subprocess import Popen, PIPE
import sys
+<<<<<<< TREE
import urllib.request, urllib.error, urllib.parse
+=======
+import urllib2
+import urlparse
+
+from openlp.core.lib.settings import Settings
+>>>>>>> MERGE-SOURCE
from PyQt4 import QtGui, QtCore
@@ -245,6 +252,38 @@
IMAGES_FILTER = '%s %s %s' % (translate('OpenLP', 'Image Files'), visible_formats, actual_formats)
return IMAGES_FILTER
+def is_not_image_file(file_name):
+ """
+ Validate that the file is not an image file.
+
+ ``file_name``
+ File name to be checked.
+ """
+ if not file_name:
+ return True
+ formats = [unicode(fmt).lower()
+ for fmt in QtGui.QImageReader.supportedImageFormats()]
+ file_part, file_extension = os.path.splitext(unicode(file_name))
+ if file_extension[1:].lower() in formats and os.path.exists(file_name):
+ return False
+ return True
+
+def join_url(base, *args):
+ """
+ Join one or more url components with the base url.
+
+ ``base``
+ Base url containing top level domain.
+ e.g. http://www.example.org
+
+ ``args``
+ url components to be appended to the base url.
+ """
+ # Remove leading and trailing slash from components.
+ # Also ensure QString is converted to unicode().
+ args = [unicode(x).strip('/') for x in args]
+ return urlparse.urljoin(base, '/'.join(args))
+
def is_not_image_file(file_name):
"""
=== modified file 'openlp/core/utils/actions.py'
=== modified file 'openlp/core/utils/languagemanager.py'
=== modified file 'openlp/plugins/__init__.py'
=== modified file 'openlp/plugins/alerts/__init__.py'
=== modified file 'openlp/plugins/alerts/alertsplugin.py'
=== modified file 'openlp/plugins/alerts/forms/__init__.py'
=== modified file 'openlp/plugins/alerts/forms/alertdialog.py'
=== modified file 'openlp/plugins/alerts/forms/alertform.py'
=== modified file 'openlp/plugins/alerts/lib/__init__.py'
=== modified file 'openlp/plugins/alerts/lib/alertsmanager.py'
=== modified file 'openlp/plugins/alerts/lib/alertstab.py'
=== modified file 'openlp/plugins/alerts/lib/db.py'
=== modified file 'openlp/plugins/bibles/__init__.py'
=== modified file 'openlp/plugins/bibles/bibleplugin.py'
=== modified file 'openlp/plugins/bibles/forms/__init__.py'
=== modified file 'openlp/plugins/bibles/forms/bibleimportform.py'
=== modified file 'openlp/plugins/bibles/forms/bibleupgradeform.py'
=== modified file 'openlp/plugins/bibles/forms/booknamedialog.py'
=== modified file 'openlp/plugins/bibles/forms/booknameform.py'
=== modified file 'openlp/plugins/bibles/forms/editbibledialog.py'
=== modified file 'openlp/plugins/bibles/forms/editbibleform.py'
=== modified file 'openlp/plugins/bibles/forms/languagedialog.py'
=== modified file 'openlp/plugins/bibles/forms/languageform.py'
=== modified file 'openlp/plugins/bibles/lib/__init__.py'
=== modified file 'openlp/plugins/bibles/lib/biblestab.py'
=== modified file 'openlp/plugins/bibles/lib/csvbible.py'
=== modified file 'openlp/plugins/bibles/lib/db.py'
--- openlp/plugins/bibles/lib/db.py 2013-08-31 18:17:38 +0000
+++ openlp/plugins/bibles/lib/db.py 2013-09-14 11:12:23 +0000
@@ -855,6 +855,26 @@
return None
@staticmethod
+ def get_language_by_id(language_id):
+ """
+ Return a dict containing the language id, name and code by id.
+
+ ``id``
+ The id of the language in the database.
+ """
+ log.debug(u'BiblesResourcesDB.get_language_by_id(%d)', language_id)
+ language = BiblesResourcesDB.run_sql(u'SELECT id, name, code FROM '
+ u'language WHERE id = ?', (language_id,))
+ if language:
+ return {
+ u'id': language[0][0],
+ u'name': unicode(language[0][1]),
+ u'code': unicode(language[0][2])
+ }
+ else:
+ return None
+
+ @staticmethod
def get_language(name):
"""
Return a dict containing the language id, name and code by name or
=== modified file 'openlp/plugins/bibles/lib/http.py'
--- openlp/plugins/bibles/lib/http.py 2013-09-09 21:10:40 +0000
+++ openlp/plugins/bibles/lib/http.py 2013-09-14 11:12:23 +0000
@@ -243,6 +243,8 @@
if not soup:
return None
div = soup.find('div', 'result-text-style-normal')
+ if not div:
+ return None
self._clean_soup(div)
span_list = div.find_all('span', 'text')
log.debug('Span list: %s', span_list)
@@ -377,6 +379,7 @@
log.error('No books found in the Bibleserver response.')
send_error_message('parse')
return None
+<<<<<<< TREE
content = content.find_all('li')
return [book.contents[0].contents[0] for book in content]
@@ -393,6 +396,13 @@
return self._application
application = property(_get_application)
+=======
+ content = content.findAll(u'li')
+ return [
+ book.contents[0].contents[0] for book in content
+ if len(book.contents[0].contents)
+ ]
+>>>>>>> MERGE-SOURCE
class CWExtract(object):
=== modified file 'openlp/plugins/bibles/lib/manager.py'
=== modified file 'openlp/plugins/bibles/lib/mediaitem.py'
=== added file 'openlp/plugins/bibles/lib/openlp1.py.OTHER'
--- openlp/plugins/bibles/lib/openlp1.py.OTHER 1970-01-01 00:00:00 +0000
+++ openlp/plugins/bibles/lib/openlp1.py.OTHER 2013-09-14 11:12:23 +0000
@@ -0,0 +1,118 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2013 Raoul Snyman #
+# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan #
+# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, #
+# Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. #
+# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, #
+# Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Dave Warnock, #
+# Frode Woldsund, Martin Zibricky #
+# --------------------------------------------------------------------------- #
+# 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 #
+###############################################################################
+
+import logging
+import sqlite
+import sys
+
+from openlp.core.lib import Receiver
+from openlp.core.ui.wizard import WizardStrings
+from openlp.plugins.bibles.lib.db import BibleDB, BiblesResourcesDB
+
+log = logging.getLogger(__name__)
+
+class OpenLP1Bible(BibleDB):
+ """
+ This class provides the OpenLPv1 bible importer.
+ """
+ def __init__(self, parent, **kwargs):
+ """
+ Constructor.
+ """
+ log.debug(self.__class__.__name__)
+ BibleDB.__init__(self, parent, **kwargs)
+ self.filename = kwargs[u'filename']
+
+ def do_import(self, bible_name=None):
+ """
+ Imports an openlp.org v1 bible.
+ """
+ connection = None
+ cursor = None
+ try:
+ connection = sqlite.connect(
+ self.filename.encode(sys.getfilesystemencoding()))
+ cursor = connection.cursor()
+ except sqlite.DatabaseError:
+ log.exception(u'File "%s" is encrypted or not a sqlite database, '
+ 'therefore not an openlp.org 1.x database either' % self.filename)
+ # Please add an user error here!
+ # This file is not an openlp.org 1.x bible database.
+ return False
+ #Create the bible language
+ language_id = self.get_language(bible_name)
+ if not language_id:
+ log.exception(u'Importing books from "%s" failed' % self.filename)
+ return False
+ # Create all books.
+ try:
+ cursor.execute(
+ u'SELECT id, testament_id, name, abbreviation FROM book')
+ except sqlite.DatabaseError as error:
+ log.exception(u'DatabaseError: %s' % error)
+ # Please add an user error here!
+ # This file is not an openlp.org 1.x bible database.
+ return False
+ books = cursor.fetchall()
+ self.wizard.progressBar.setMaximum(len(books) + 1)
+ for book in books:
+ if self.stop_import_flag:
+ connection.close()
+ return False
+ book_id = int(book[0])
+ testament_id = int(book[1])
+ name = unicode(book[2], u'cp1252')
+ abbreviation = unicode(book[3], u'cp1252')
+ book_ref_id = self.get_book_ref_id_by_name(name, len(books),
+ language_id)
+ if not book_ref_id:
+ log.exception(u'Importing books from "%s" '\
+ 'failed' % self.filename)
+ return False
+ book_details = BiblesResourcesDB.get_book_by_id(book_ref_id)
+ db_book = self.create_book(name, book_ref_id,
+ book_details[u'testament_id'])
+ # Update the progess bar.
+ self.wizard.incrementProgressBar(WizardStrings.ImportingType % name)
+ # Import the verses for this book.
+ cursor.execute(u'SELECT chapter, verse, text || \'\' AS text FROM '
+ 'verse WHERE book_id=%s' % book_id)
+ verses = cursor.fetchall()
+ for verse in verses:
+ if self.stop_import_flag:
+ connection.close()
+ return False
+ chapter = int(verse[0])
+ verse_number = int(verse[1])
+ text = unicode(verse[2], u'cp1252')
+ self.create_verse(db_book.id, chapter, verse_number, text)
+ Receiver.send_message(u'openlp_process_events')
+ self.session.commit()
+ connection.close()
+ return True
=== modified file 'openlp/plugins/bibles/lib/opensong.py'
=== modified file 'openlp/plugins/bibles/lib/osis.py'
--- openlp/plugins/bibles/lib/osis.py 2013-08-31 18:17:38 +0000
+++ openlp/plugins/bibles/lib/osis.py 2013-09-14 11:12:23 +0000
@@ -33,8 +33,13 @@
import codecs
import re
+<<<<<<< TREE
from openlp.core.lib import translate
from openlp.core.utils import AppLocation
+=======
+from openlp.core.lib import Receiver, translate
+from openlp.core.utils import AppLocation, LanguageManager
+>>>>>>> MERGE-SOURCE
from openlp.plugins.bibles.lib.db import BibleDB, BiblesResourcesDB
log = logging.getLogger(__name__)
@@ -144,10 +149,31 @@
log.exception('Importing books from "%s" failed' % self.filename)
return False
book_details = BiblesResourcesDB.get_book_by_id(book_ref_id)
+<<<<<<< TREE
if not db_book or db_book.name != book_details['name']:
log.debug('New book: "%s"' % book_details['name'])
+=======
+ bible_language = BiblesResourcesDB.get_language_by_id(language_id)
+ if bible_language is not None:
+ # The language of this bible was found, so we can
+ # translate the name of this book
+ custom_translator = LanguageManager.get_translator(
+ bible_language['code'])[0]
+ book_name_localized = unicode(custom_translator.translate(
+ 'BiblesPlugin', book_details[u'name']))
+ else:
+ # The language of this bible was not found, so we just
+ # use the English name for this book
+ book_name_localized = book_details[u'name']
+ if not db_book or db_book.name != book_name_localized:
+ log.debug(u'New book: "%s"' % book_name_localized)
+>>>>>>> MERGE-SOURCE
db_book = self.create_book(
+<<<<<<< TREE
book_details['name'],
+=======
+ book_name_localized,
+>>>>>>> MERGE-SOURCE
book_ref_id,
book_details['testament_id'])
if last_chapter == 0:
@@ -155,8 +181,15 @@
if last_chapter != chapter:
if last_chapter != 0:
self.session.commit()
+<<<<<<< TREE
self.wizard.increment_progress_bar(translate('BiblesPlugin.OsisImport', 'Importing %s %s...',
'Importing <book name> <chapter>...') % (book_details['name'], chapter))
+=======
+ self.wizard.incrementProgressBar(unicode(translate(
+ 'BiblesPlugin.OsisImport', 'Importing %s %s...',
+ 'Importing <book name> <chapter>...')) %
+ (book_name_localized, chapter))
+>>>>>>> MERGE-SOURCE
last_chapter = chapter
# All of this rigmarol below is because the mod2osis tool from the Sword library embeds XML in the
# OSIS but neglects to enclose the verse text (with XML) in <[CDATA[ ]]> tags.
=== modified file 'openlp/plugins/bibles/lib/upgrade.py'
=== modified file 'openlp/plugins/bibles/lib/versereferencelist.py'
=== modified file 'openlp/plugins/custom/__init__.py'
=== modified file 'openlp/plugins/custom/customplugin.py'
=== modified file 'openlp/plugins/custom/forms/__init__.py'
=== modified file 'openlp/plugins/custom/forms/editcustomdialog.py'
=== modified file 'openlp/plugins/custom/forms/editcustomform.py'
=== modified file 'openlp/plugins/custom/forms/editcustomslidedialog.py'
=== modified file 'openlp/plugins/custom/forms/editcustomslideform.py'
=== modified file 'openlp/plugins/custom/lib/__init__.py'
=== modified file 'openlp/plugins/custom/lib/customtab.py'
=== modified file 'openlp/plugins/custom/lib/customxmlhandler.py'
=== modified file 'openlp/plugins/custom/lib/db.py'
=== modified file 'openlp/plugins/custom/lib/mediaitem.py'
=== modified file 'openlp/plugins/images/__init__.py'
=== modified file 'openlp/plugins/images/imageplugin.py'
=== modified file 'openlp/plugins/images/lib/__init__.py'
=== modified file 'openlp/plugins/images/lib/imagetab.py'
=== modified file 'openlp/plugins/images/lib/mediaitem.py'
--- openlp/plugins/images/lib/mediaitem.py 2013-08-31 18:17:38 +0000
+++ openlp/plugins/images/lib/mediaitem.py 2013-09-14 11:12:23 +0000
@@ -67,6 +67,7 @@
def retranslateUi(self):
self.on_new_prompt = translate('ImagePlugin.MediaItem', 'Select Image(s)')
file_formats = get_images_filter()
+<<<<<<< TREE
self.on_new_file_masks = '%s;;%s (*.*) (*)' % (file_formats, UiStrings().AllFiles)
self.addGroupAction.setText(UiStrings().AddGroup)
self.addGroupAction.setToolTip(UiStrings().AddGroup)
@@ -74,6 +75,14 @@
self.replace_action.setToolTip(UiStrings().ReplaceLiveBG)
self.reset_action.setText(UiStrings().ResetBG)
self.reset_action.setToolTip(UiStrings().ResetLiveBG)
+=======
+ self.onNewFileMasks = u'%s;;%s (*.*)' % (file_formats,
+ UiStrings().AllFiles)
+ self.replaceAction.setText(UiStrings().ReplaceBG)
+ self.replaceAction.setToolTip(UiStrings().ReplaceLiveBG)
+ self.resetAction.setText(UiStrings().ResetBG)
+ self.resetAction.setToolTip(UiStrings().ResetLiveBG)
+>>>>>>> MERGE-SOURCE
def required_icons(self):
"""
=== modified file 'openlp/plugins/media/__init__.py'
=== modified file 'openlp/plugins/media/lib/__init__.py'
=== modified file 'openlp/plugins/media/lib/mediaitem.py'
=== modified file 'openlp/plugins/media/lib/mediatab.py'
=== modified file 'openlp/plugins/media/mediaplugin.py'
=== modified file 'openlp/plugins/presentations/__init__.py'
=== modified file 'openlp/plugins/presentations/lib/__init__.py'
=== modified file 'openlp/plugins/presentations/lib/impresscontroller.py'
--- openlp/plugins/presentations/lib/impresscontroller.py 2013-08-31 18:17:38 +0000
+++ openlp/plugins/presentations/lib/impresscontroller.py 2013-09-14 11:12:23 +0000
@@ -44,6 +44,7 @@
if os.name == 'nt':
from win32com.client import Dispatch
import pywintypes
+
# Declare an empty exception to match the exception imported from UNO
class ErrorCodeIOException(Exception):
pass
@@ -77,10 +78,18 @@
"""
Initialise the class
"""
+<<<<<<< TREE
log.debug('Initialising')
super(ImpressController, self).__init__(plugin, 'Impress', ImpressDocument)
self.supports = ['odp']
self.also_supports = ['ppt', 'pps', 'pptx', 'ppsx']
+=======
+ log.debug(u'Initialising')
+ PresentationController.__init__(self, plugin, u'Impress',
+ ImpressDocument)
+ self.supports = [u'odp']
+ self.alsosupports = [u'ppt', u'pps', u'pptx', u'ppsx', u'pptm']
+>>>>>>> MERGE-SOURCE
self.process = None
self.desktop = None
self.manager = None
=== modified file 'openlp/plugins/presentations/lib/mediaitem.py'
--- openlp/plugins/presentations/lib/mediaitem.py 2013-08-31 18:17:38 +0000
+++ openlp/plugins/presentations/lib/mediaitem.py 2013-09-14 11:12:23 +0000
@@ -45,6 +45,7 @@
ERROR_IMAGE = QtGui.QImage(':/general/general_delete.png')
+
class PresentationMediaItem(MediaManagerItem):
"""
This is the Presentation media manager item for Presentation Items. It can present files using Openoffice and
@@ -83,6 +84,7 @@
file_type_string = ''
for controller in self.controllers:
if self.controllers[controller].enabled():
+<<<<<<< TREE
file_types = self.controllers[controller].supports + self.controllers[controller].also_supports
for file_type in file_types:
if file_type not in file_type_string:
@@ -116,6 +118,44 @@
self.display_layout.addRow(self.display_type_label, self.display_type_combo_box)
# Add the Presentation widget to the page layout.
self.page_layout.addWidget(self.presentation_widget)
+=======
+ types = self.controllers[controller].supports + \
+ self.controllers[controller].alsosupports
+ for type_ in types:
+ if fileType.find(type_) == -1:
+ fileType += u'*.%s ' % type_
+ self.plugin.serviceManager.supportedSuffixes(type_)
+ self.onNewFileMasks = unicode(translate('PresentationPlugin.MediaItem',
+ 'Presentations (%s)')) % fileType
+
+ def requiredIcons(self):
+ """
+ Set which icons the media manager tab should show
+ """
+ MediaManagerItem.requiredIcons(self)
+ self.hasFileIcon = True
+ self.hasNewIcon = False
+ self.hasEditIcon = False
+
+ def addEndHeaderBar(self):
+ """
+ Display custom media manager items for presentations
+ """
+ self.presentationWidget = QtGui.QWidget(self)
+ self.presentationWidget.setObjectName(u'presentationWidget')
+ self.displayLayout = QtGui.QFormLayout(self.presentationWidget)
+ self.displayLayout.setMargin(self.displayLayout.spacing())
+ self.displayLayout.setObjectName(u'displayLayout')
+ self.displayTypeLabel = QtGui.QLabel(self.presentationWidget)
+ self.displayTypeLabel.setObjectName(u'displayTypeLabel')
+ self.displayTypeComboBox = create_horizontal_adjusting_combo_box(
+ self.presentationWidget, u'displayTypeComboBox')
+ self.displayTypeLabel.setBuddy(self.displayTypeComboBox)
+ self.displayLayout.addRow(self.displayTypeLabel,
+ self.displayTypeComboBox)
+ # Add the Presentation widget to the page layout
+ self.pageLayout.addWidget(self.presentationWidget)
+>>>>>>> MERGE-SOURCE
def initialise(self):
"""
=== modified file 'openlp/plugins/presentations/lib/messagelistener.py'
=== modified file 'openlp/plugins/presentations/lib/powerpointcontroller.py'
--- openlp/plugins/presentations/lib/powerpointcontroller.py 2013-08-31 18:17:38 +0000
+++ openlp/plugins/presentations/lib/powerpointcontroller.py 2013-09-14 11:12:23 +0000
@@ -46,6 +46,7 @@
log = logging.getLogger(__name__)
+
class PowerpointController(PresentationController):
"""
Class to control interactions with PowerPoint Presentations. It creates the runtime Environment , Loads the and
@@ -57,9 +58,16 @@
"""
Initialise the class
"""
+<<<<<<< TREE
log.debug('Initialising')
super(PowerpointController, self).__init__(plugin, 'Powerpoint', PowerpointDocument)
self.supports = ['ppt', 'pps', 'pptx', 'ppsx']
+=======
+ log.debug(u'Initialising')
+ PresentationController.__init__(self, plugin, u'Powerpoint',
+ PowerpointDocument)
+ self.supports = [u'ppt', u'pps', u'pptx', u'ppsx', u'pptm']
+>>>>>>> MERGE-SOURCE
self.process = None
def check_available(self):
=== modified file 'openlp/plugins/presentations/lib/pptviewcontroller.py'
--- openlp/plugins/presentations/lib/pptviewcontroller.py 2013-08-31 18:17:38 +0000
+++ openlp/plugins/presentations/lib/pptviewcontroller.py 2013-09-14 11:12:23 +0000
@@ -54,8 +54,14 @@
"""
log.debug('Initialising')
self.process = None
+<<<<<<< TREE
super(PptviewController, self).__init__(plugin, 'Powerpoint Viewer', PptviewDocument)
self.supports = ['ppt', 'pps', 'pptx', 'ppsx']
+=======
+ PresentationController.__init__(self, plugin, u'Powerpoint Viewer',
+ PptviewDocument)
+ self.supports = [u'ppt', u'pps', u'pptx', u'ppsx', u'pptm']
+>>>>>>> MERGE-SOURCE
def check_available(self):
"""
=== modified file 'openlp/plugins/presentations/lib/pptviewlib/ppttest.py'
=== modified file 'openlp/plugins/presentations/lib/presentationcontroller.py'
=== modified file 'openlp/plugins/presentations/lib/presentationtab.py'
=== modified file 'openlp/plugins/presentations/presentationplugin.py'
=== modified file 'openlp/plugins/remotes/__init__.py'
=== modified file 'openlp/plugins/remotes/html/index.html'
=== modified file 'openlp/plugins/remotes/html/openlp.js'
=== modified file 'openlp/plugins/remotes/html/stage.html'
=== modified file 'openlp/plugins/remotes/html/stage.js'
=== modified file 'openlp/plugins/remotes/lib/__init__.py'
=== modified file 'openlp/plugins/remotes/lib/httpserver.py'
=== modified file 'openlp/plugins/remotes/lib/remotetab.py'
=== modified file 'openlp/plugins/remotes/remoteplugin.py'
=== modified file 'openlp/plugins/songs/__init__.py'
=== modified file 'openlp/plugins/songs/forms/__init__.py'
=== modified file 'openlp/plugins/songs/forms/authorsdialog.py'
=== modified file 'openlp/plugins/songs/forms/authorsform.py'
=== modified file 'openlp/plugins/songs/forms/editsongdialog.py'
--- openlp/plugins/songs/forms/editsongdialog.py 2013-08-31 18:17:38 +0000
+++ openlp/plugins/songs/forms/editsongdialog.py 2013-09-14 11:12:23 +0000
@@ -270,6 +270,7 @@
self.audio_layout.addLayout(self.audio_buttons_layout)
self.song_tab_widget.addTab(self.audio_tab, '')
# Last few bits
+<<<<<<< TREE
self.dialog_layout.addWidget(self.song_tab_widget)
self.bottom_layout = QtGui.QHBoxLayout()
self.bottom_layout.setObjectName('bottom_layout')
@@ -280,6 +281,19 @@
self.bottom_layout.addWidget(self.button_box)
self.dialog_layout.addLayout(self.bottom_layout)
self.retranslateUi(edit_song_dialog)
+=======
+ self.dialogLayout.addWidget(self.songTabWidget)
+ self.bottomLayout = QtGui.QHBoxLayout()
+ self.bottomLayout.setObjectName(u'bottomLayout')
+ self.warningLabel = QtGui.QLabel(editSongDialog)
+ self.warningLabel.setObjectName(u'warningLabel')
+ self.bottomLayout.addWidget(self.warningLabel)
+ self.buttonBox = create_button_box(editSongDialog, u'buttonBox',
+ [u'cancel', u'save'])
+ self.bottomLayout.addWidget(self.buttonBox)
+ self.dialogLayout.addLayout(self.bottomLayout)
+ self.retranslateUi(editSongDialog)
+>>>>>>> MERGE-SOURCE
def retranslateUi(self, edit_song_dialog):
"""
@@ -318,6 +332,7 @@
translate('SongsPlugin.EditSongForm', 'Theme, Copyright Info && Comments'))
self.song_tab_widget.setTabText(self.song_tab_widget.indexOf(self.audio_tab),
translate('SongsPlugin.EditSongForm', 'Linked Audio'))
+<<<<<<< TREE
self.from_file_button.setText(translate('SongsPlugin.EditSongForm', 'Add &File(s)'))
self.from_media_button.setText(translate('SongsPlugin.EditSongForm', 'Add &Media'))
self.audio_remove_button.setText(translate('SongsPlugin.EditSongForm', '&Remove'))
@@ -329,6 +344,22 @@
def create_combo_box(parent, name):
+=======
+ self.audioAddFromFileButton.setText(
+ translate('SongsPlugin.EditSongForm', 'Add &File(s)'))
+ self.audioAddFromMediaButton.setText(
+ translate('SongsPlugin.EditSongForm', 'Add &Media'))
+ self.audioRemoveButton.setText(
+ translate('SongsPlugin.EditSongForm', '&Remove'))
+ self.audioRemoveAllButton.setText(
+ translate('SongsPlugin.EditSongForm', 'Remove &All'))
+ self.notAlllVersesUsed = translate('SongsPlugin.EditSongForm', '<strong>Warning:</strong>'
+ ' Not all of the verses are in use.')
+ self.noVerseOrder = translate('SongsPlugin.EditSongForm', '<strong>Warning:</strong>'
+ ' You have not entered a verse order.')
+
+def editSongDialogComboBox(parent, name):
+>>>>>>> MERGE-SOURCE
"""
Utility method to generate a standard combo box for this dialog.
=== modified file 'openlp/plugins/songs/forms/editsongform.py'
--- openlp/plugins/songs/forms/editsongform.py 2013-08-31 18:17:38 +0000
+++ openlp/plugins/songs/forms/editsongform.py 2013-09-14 11:12:23 +0000
@@ -38,9 +38,16 @@
from PyQt4 import QtCore, QtGui
+<<<<<<< TREE
from openlp.core.lib import Registry, PluginStatus, MediaType, UiStrings, translate, create_separated_list, \
check_directory_exists
from openlp.core.lib.ui import set_case_insensitive_completer, critical_error_message_box, find_and_set_in_combo_box
+=======
+from openlp.core.lib import FileDialog, PluginStatus, Receiver, MediaType, translate, \
+ create_separated_list, check_directory_exists
+from openlp.core.lib.ui import UiStrings, set_case_insensitive_completer, \
+ critical_error_message_box, find_and_set_in_combo_box
+>>>>>>> MERGE-SOURCE
from openlp.core.utils import AppLocation
from openlp.plugins.songs.lib import VerseType, clean_song
from openlp.plugins.songs.lib.db import Book, Song, Author, Topic, MediaFile
@@ -109,10 +116,62 @@
self.find_verse_split = re.compile('---\[\]---\n', re.UNICODE)
self.whitespace = re.compile(r'\W+', re.UNICODE)
+<<<<<<< TREE
def _load_objects(self, cls, combo, cache):
"""
Generically load a set of objects into a cache and a combobox.
"""
+=======
+ def keyPressEvent(self, event):
+ """
+ Reimplement the keyPressEvent to react on Return/Enter keys. When some
+ combo boxes have focus we do not want dialog's default action be
+ triggered but instead our own.
+
+ ``event``
+ A QtGui.QKeyEvent event.
+ """
+ if event.key() in (QtCore.Qt.Key_Enter, QtCore.Qt.Key_Return):
+ if self.authorsComboBox.hasFocus() and \
+ self.authorsComboBox.currentText():
+ self.onAuthorAddButtonClicked()
+ return
+ if self.topicsComboBox.hasFocus() and \
+ self.topicsComboBox.currentText():
+ self.onTopicAddButtonClicked()
+ return
+ QtGui.QDialog.keyPressEvent(self, event)
+
+ def initialise(self):
+ self.verseEditButton.setEnabled(False)
+ self.verseDeleteButton.setEnabled(False)
+ self.authorRemoveButton.setEnabled(False)
+ self.topicRemoveButton.setEnabled(False)
+
+ def loadAuthors(self):
+ authors = self.manager.get_all_objects(Author,
+ order_by_ref=Author.display_name)
+ self.authorsComboBox.clear()
+ self.authorsComboBox.addItem(u'')
+ self.authors = []
+ for author in authors:
+ row = self.authorsComboBox.count()
+ self.authorsComboBox.addItem(author.display_name)
+ self.authorsComboBox.setItemData(
+ row, QtCore.QVariant(author.id))
+ self.authors.append(author.display_name)
+ set_case_insensitive_completer(self.authors, self.authorsComboBox)
+
+ def loadTopics(self):
+ self.topics = []
+ self.__loadObjects(Topic, self.topicsComboBox, self.topics)
+
+ def loadBooks(self):
+ self.books = []
+ self.__loadObjects(Book, self.songBookComboBox, self.books)
+
+ def __loadObjects(self, cls, combo, cache):
+>>>>>>> MERGE-SOURCE
objects = self.manager.get_all_objects(cls, order_by_ref=cls.name)
combo.clear()
combo.addItem('')
@@ -332,6 +391,7 @@
log.debug('New Song')
self.song = None
self.initialise()
+<<<<<<< TREE
self.song_tab_widget.setCurrentIndex(0)
self.title_edit.clear()
self.alternative_edit.clear()
@@ -352,6 +412,28 @@
self.load_media_files()
self.theme_combo_box.setEditText('')
self.theme_combo_box.setCurrentIndex(0)
+=======
+ self.songTabWidget.setCurrentIndex(0)
+ self.titleEdit.clear()
+ self.alternativeEdit.clear()
+ self.copyrightEdit.clear()
+ self.verseOrderEdit.clear()
+ self.commentsEdit.clear()
+ self.CCLNumberEdit.clear()
+ self.verseListWidget.clear()
+ self.verseListWidget.setRowCount(0)
+ self.authorsListView.clear()
+ self.topicsListView.clear()
+ self.audioListWidget.clear()
+ self.titleEdit.setFocus(QtCore.Qt.OtherFocusReason)
+ self.songBookNumberEdit.clear()
+ self.loadAuthors()
+ self.loadTopics()
+ self.loadBooks()
+ self.loadMediaFiles()
+ self.themeComboBox.setEditText(u'')
+ self.themeComboBox.setCurrentIndex(0)
+>>>>>>> MERGE-SOURCE
# it's a new song to preview is not possible
self.preview_button.setVisible(False)
@@ -383,6 +465,7 @@
self.song_book_combo_box.setEditText('')
self.song_book_combo_box.setCurrentIndex(0)
if self.song.theme_name:
+<<<<<<< TREE
find_and_set_in_combo_box(self.theme_combo_box, str(self.song.theme_name))
else:
# Clear the theme combo box in case it was previously set (bug #1212801)
@@ -392,6 +475,21 @@
self.comments_edit.setPlainText(self.song.comments if self.song.comments else '')
self.ccli_number_edit.setText(self.song.ccli_number if self.song.ccli_number else '')
self.song_book_number_edit.setText(self.song.song_number if self.song.song_number else '')
+=======
+ find_and_set_in_combo_box(
+ self.themeComboBox, unicode(self.song.theme_name))
+ else:
+ self.themeComboBox.setEditText(u'')
+ self.themeComboBox.setCurrentIndex(0)
+ self.copyrightEdit.setText(
+ self.song.copyright if self.song.copyright else u'')
+ self.commentsEdit.setPlainText(
+ self.song.comments if self.song.comments else u'')
+ self.CCLNumberEdit.setText(
+ self.song.ccli_number if self.song.ccli_number else u'')
+ self.songBookNumberEdit.setText(
+ self.song.song_number if self.song.song_number else u'')
+>>>>>>> MERGE-SOURCE
# lazy xml migration for now
self.verse_list_widget.clear()
self.verse_list_widget.setRowCount(0)
@@ -462,9 +560,15 @@
self.audio_list_widget.addItem(media_file)
self.title_edit.setFocus()
# Hide or show the preview button.
+<<<<<<< TREE
self.preview_button.setVisible(preview)
# Check if all verse tags are used.
self.on_verse_order_text_changed(self.verse_order_edit.text())
+=======
+ self.previewButton.setVisible(preview)
+ # Check if all verse tags are used.
+ self.onVerseOrderTextChanged(self.verseOrderEdit.text())
+>>>>>>> MERGE-SOURCE
def tag_rows(self):
"""
@@ -710,6 +814,7 @@
verse = verse.data(QtCore.Qt.UserRole)
if verse not in verses_in_order:
verses_not_used.append(verse)
+<<<<<<< TREE
# Set the label text.
label_text = ''
# No verse order was entered.
@@ -723,6 +828,118 @@
def on_copyright_insert_button_triggered(self):
text = self.copyright_edit.text()
pos = self.copyright_edit.cursorPosition()
+=======
+ label_text = u''
+ if not self.verseOrderEdit.text():
+ label_text = self.noVerseOrder
+ elif verses_not_used:
+ label_text = self.notAlllVersesUsed
+ self.warningLabel.setText(label_text)
+
+ def __extractVerseOrder(self, verse_order):
+ order = []
+ order_names = unicode(verse_order).split()
+ for item in order_names:
+ if len(item) == 1:
+ verse_index = VerseType.from_translated_tag(item, None)
+ if verse_index is not None:
+ order.append(VerseType.Tags[verse_index] + u'1')
+ else:
+ # it matches no verses anyway
+ order.append(u'')
+ else:
+ verse_index = VerseType.from_translated_tag(item[0], None)
+ if verse_index is None:
+ # it matches no verses anyway
+ order.append(u'')
+ else:
+ verse_tag = VerseType.Tags[verse_index]
+ verse_num = item[1:].lower()
+ order.append(verse_tag + verse_num)
+ return order
+
+ def __validateVerseList(self, verse_order, verse_count):
+ verses = []
+ invalid_verses = []
+ verse_names = []
+ order_names = unicode(verse_order).split()
+ order = self.__extractVerseOrder(verse_order)
+ for index in range(verse_count):
+ verse = self.verseListWidget.item(index, 0)
+ verse = unicode(verse.data(QtCore.Qt.UserRole).toString())
+ if verse not in verse_names:
+ verses.append(verse)
+ verse_names.append(u'%s%s' % (
+ VerseType.translated_tag(verse[0]), verse[1:]))
+ for count, item in enumerate(order):
+ if item not in verses:
+ invalid_verses.append(order_names[count])
+ if invalid_verses:
+ valid = create_separated_list(verse_names)
+ if len(invalid_verses) > 1:
+ critical_error_message_box(message=unicode(translate(
+ 'SongsPlugin.EditSongForm', 'The verse order is invalid. '
+ 'There are no verses corresponding to %s. Valid entries '
+ 'are %s.')) % (u', '.join(invalid_verses), valid))
+ else:
+ critical_error_message_box(message=unicode(translate(
+ 'SongsPlugin.EditSongForm', 'The verse order is invalid. '
+ 'There is no verse corresponding to %s. Valid entries '
+ 'are %s.')) % (invalid_verses[0], valid))
+ return len(invalid_verses) == 0
+
+ def __validateSong(self):
+ """
+ Check the validity of the song.
+ """
+ # This checks data in the form *not* self.song. self.song is still
+ # None at this point.
+ log.debug(u'Validate Song')
+ # Lets be nice and assume the data is correct.
+ if not self.titleEdit.text():
+ self.songTabWidget.setCurrentIndex(0)
+ self.titleEdit.setFocus()
+ critical_error_message_box(
+ message=translate('SongsPlugin.EditSongForm',
+ 'You need to type in a song title.'))
+ return False
+ if self.verseListWidget.rowCount() == 0:
+ self.songTabWidget.setCurrentIndex(0)
+ self.verseListWidget.setFocus()
+ critical_error_message_box(
+ message=translate('SongsPlugin.EditSongForm',
+ 'You need to type in at least one verse.'))
+ return False
+ if self.authorsListView.count() == 0:
+ self.songTabWidget.setCurrentIndex(1)
+ self.authorsListView.setFocus()
+ critical_error_message_box(
+ message=translate('SongsPlugin.EditSongForm',
+ 'You need to have an author for this song.'))
+ return False
+ if self.verseOrderEdit.text():
+ result = self.__validateVerseList(self.verseOrderEdit.text(),
+ self.verseListWidget.rowCount())
+ if not result:
+ return False
+ text = unicode(self.songBookComboBox.currentText())
+ if self.songBookComboBox.findText(text, QtCore.Qt.MatchExactly) < 0:
+ if QtGui.QMessageBox.question(self,
+ translate('SongsPlugin.EditSongForm', 'Add Book'),
+ translate('SongsPlugin.EditSongForm', 'This song book does '
+ 'not exist, do you want to add it?'),
+ QtGui.QMessageBox.Yes | QtGui.QMessageBox.No,
+ QtGui.QMessageBox.Yes) == QtGui.QMessageBox.Yes:
+ book = Book.populate(name=text, publisher=u'')
+ self.manager.save_object(book)
+ else:
+ return False
+ return True
+
+ def onCopyrightInsertButtonTriggered(self):
+ text = self.copyrightEdit.text()
+ pos = self.copyrightEdit.cursorPosition()
+>>>>>>> MERGE-SOURCE
sign = SongStrings.CopyrightSymbol
text = text[:pos] + sign + text[pos:]
self.copyright_edit.setText(text)
@@ -759,9 +976,16 @@
"""
Loads file(s) from the filesystem.
"""
+<<<<<<< TREE
filters = '%s (*)' % UiStrings().AllFiles
filenames = QtGui.QFileDialog.getOpenFileNames(self,
translate('SongsPlugin.EditSongForm', 'Open File(s)'), '', filters)
+=======
+ filters = u'%s (*)' % UiStrings().AllFiles
+ filenames = FileDialog.getOpenFileNames(self,
+ translate('SongsPlugin.EditSongForm', 'Open File(s)'),
+ QtCore.QString(), filters)
+>>>>>>> MERGE-SOURCE
for filename in filenames:
item = QtGui.QListWidgetItem(os.path.split(str(filename))[1])
item.setData(QtCore.Qt.UserRole, filename)
@@ -935,6 +1159,7 @@
log.exception('Could not remove directory: %s', save_path)
clean_song(self.manager, self.song)
self.manager.save_object(self.song)
+<<<<<<< TREE
self.media_item.auto_select_id = self.song.id
def _get_plugin_manager(self):
@@ -956,3 +1181,35 @@
return self._theme_manager
theme_manager = property(_get_theme_manager)
+=======
+ self.mediaitem.autoSelectId = self.song.id
+
+ def _processLyrics(self):
+ """
+ Process the lyric data entered by the user into the OpenLP XML format.
+ """
+ # This method must only be run after the self.song = Song() assignment.
+ log.debug(u'_processLyrics')
+ try:
+ sxml = SongXML()
+ multiple = []
+ for i in range(self.verseListWidget.rowCount()):
+ item = self.verseListWidget.item(i, 0)
+ verse_id = unicode(item.data(QtCore.Qt.UserRole).toString())
+ verse_tag = verse_id[0]
+ verse_num = verse_id[1:]
+ sxml.add_verse_to_lyrics(verse_tag, verse_num,
+ unicode(item.text()))
+ if verse_num > u'1' and verse_tag not in multiple:
+ multiple.append(verse_tag)
+ self.song.lyrics = unicode(sxml.extract_xml(), u'utf-8')
+ for verse in multiple:
+ self.song.verse_order = re.sub(u'([' + verse.upper() +
+ verse.lower() + u'])(\W|$)', r'\g<1>1\2',
+ self.song.verse_order)
+ except:
+ log.exception(u'Problem processing song Lyrics \n%s',
+ sxml.dump_xml())
+ raise
+
+>>>>>>> MERGE-SOURCE
=== modified file 'openlp/plugins/songs/forms/editversedialog.py'
=== modified file 'openlp/plugins/songs/forms/editverseform.py'
=== modified file 'openlp/plugins/songs/forms/mediafilesdialog.py'
=== modified file 'openlp/plugins/songs/forms/mediafilesform.py'
=== modified file 'openlp/plugins/songs/forms/songbookdialog.py'
=== modified file 'openlp/plugins/songs/forms/songbookform.py'
=== modified file 'openlp/plugins/songs/forms/songexportform.py'
=== modified file 'openlp/plugins/songs/forms/songimportform.py'
--- openlp/plugins/songs/forms/songimportform.py 2013-08-31 18:17:38 +0000
+++ openlp/plugins/songs/forms/songimportform.py 2013-09-14 11:12:23 +0000
@@ -35,8 +35,14 @@
from PyQt4 import QtCore, QtGui
+<<<<<<< TREE
from openlp.core.lib import Registry, Settings, UiStrings, translate
from openlp.core.lib.ui import critical_error_message_box
+=======
+from openlp.core.lib import FileDialog, Receiver, SettingsManager, translate
+from openlp.core.lib.ui import UiStrings, critical_error_message_box
+from openlp.core.lib.settings import Settings
+>>>>>>> MERGE-SOURCE
from openlp.core.ui.wizard import OpenLPWizard, WizardStrings
from openlp.plugins.songs.lib.importer import SongFormat, SongFormatSelect
@@ -242,10 +248,18 @@
u'SongBeamer Files (*.sng)'
"""
if filters:
+<<<<<<< TREE
filters += ';;'
filters += '%s (*)' % UiStrings().AllFiles
filenames = QtGui.QFileDialog.getOpenFileNames(self, title,
Settings().value(self.plugin.settings_section + '/last directory import'), filters)
+=======
+ filters += u';;'
+ filters += u'%s (*)' % UiStrings().AllFiles
+ filenames = FileDialog.getOpenFileNames(self, title,
+ SettingsManager.get_last_dir(self.plugin.settingsSection, 1),
+ filters)
+>>>>>>> MERGE-SOURCE
if filenames:
listbox.addItems(filenames)
Settings().setValue(self.plugin.settings_section + '/last directory import',
=== modified file 'openlp/plugins/songs/forms/songmaintenancedialog.py'
=== modified file 'openlp/plugins/songs/forms/songmaintenanceform.py'
=== modified file 'openlp/plugins/songs/forms/topicsdialog.py'
=== modified file 'openlp/plugins/songs/forms/topicsform.py'
=== modified file 'openlp/plugins/songs/lib/__init__.py'
--- openlp/plugins/songs/lib/__init__.py 2013-09-10 20:36:46 +0000
+++ openlp/plugins/songs/lib/__init__.py 2013-09-14 11:12:23 +0000
@@ -607,7 +607,23 @@
if curskip > 0:
curskip -= 1
elif not ignorable:
+<<<<<<< TREE
ebytes.append(int(hex, 16))
+=======
+ charcode = int(hex, 16)
+ failed = False
+ while True:
+ try:
+ encoding, default_encoding = get_encoding(font,
+ font_table, default_encoding, failed=failed)
+ if not encoding:
+ return None
+ out.append(chr(charcode).decode(encoding))
+ except UnicodeDecodeError:
+ failed = True
+ else:
+ break
+>>>>>>> MERGE-SOURCE
elif tchar:
if curskip > 0:
curskip -= 1
=== modified file 'openlp/plugins/songs/lib/cclifileimport.py'
=== modified file 'openlp/plugins/songs/lib/db.py'
=== modified file 'openlp/plugins/songs/lib/dreambeamimport.py'
=== modified file 'openlp/plugins/songs/lib/easyslidesimport.py'
=== modified file 'openlp/plugins/songs/lib/ewimport.py'
--- openlp/plugins/songs/lib/ewimport.py 2013-09-07 17:33:36 +0000
+++ openlp/plugins/songs/lib/ewimport.py 2013-09-14 11:12:23 +0000
@@ -141,8 +141,15 @@
except IndexError:
# This is the wrong table
success = False
+<<<<<<< TREE
# There does not appear to be a _reliable_ way of getting the number of songs/records, so loop through the file
# blocks and total the number of records. Store the information in a list so we dont have to do all this again.
+=======
+ # There does not appear to be a _reliable_ way of getting the number
+ # of songs/records, so loop through the file blocks and total the
+ # number of records. Store the information in a list so we dont have
+ # to do all this again.
+>>>>>>> MERGE-SOURCE
cur_block = first_block
total_count = 0
block_list = []
@@ -150,6 +157,7 @@
cur_block_pos = header_size + ((cur_block - 1) * 1024 * block_size)
db_file.seek(cur_block_pos)
cur_block, rec_count = struct.unpack('<h2xh', db_file.read(6))
+<<<<<<< TREE
rec_count = (rec_count + record_size) // record_size
block_list.append((cur_block_pos, rec_count))
total_count += rec_count
@@ -157,6 +165,15 @@
for block in block_list:
cur_block_pos, rec_count = block
db_file.seek(cur_block_pos + 6)
+=======
+ rec_count = (rec_count + record_size) / record_size
+ block_list.append((cur_block_pos, rec_count))
+ total_count += rec_count
+ self.importWizard.progressBar.setMaximum(total_count)
+ for block in block_list:
+ cur_block_pos, rec_count = block
+ db_file.seek(cur_block_pos + 6)
+>>>>>>> MERGE-SOURCE
# Loop through each record within the current block
for i in range(rec_count):
if self.stop_import_flag:
@@ -192,11 +209,19 @@
self.addAuthor(author_name.decode().strip())
if words:
# Format the lyrics
+<<<<<<< TREE
result = strip_rtf(words.decode(), self.encoding)
if result is None:
return
words, self.encoding = result
verse_type = VerseType.tags[VerseType.Verse]
+=======
+ result = strip_rtf(words, self.encoding)
+ if result is None:
+ return
+ words, self.encoding = result
+ verse_type = VerseType.Tags[VerseType.Verse]
+>>>>>>> MERGE-SOURCE
for verse in SLIDE_BREAK_REGEX.split(words):
verse = verse.strip()
if not verse:
=== modified file 'openlp/plugins/songs/lib/foilpresenterimport.py'
--- openlp/plugins/songs/lib/foilpresenterimport.py 2013-08-31 18:17:38 +0000
+++ openlp/plugins/songs/lib/foilpresenterimport.py 2013-09-14 11:12:23 +0000
@@ -220,6 +220,7 @@
xml = xml[38:]
song = Song()
# Values will be set when cleaning the song.
+<<<<<<< TREE
song.search_lyrics = ''
song.verse_order = ''
song.search_title = ''
@@ -227,11 +228,21 @@
# Because "text" seems to be an reserved word, we have to recompile it.
xml = re.compile('<text>').sub('<text_>', xml)
xml = re.compile('</text>').sub('</text_>', xml)
+=======
+ song.search_lyrics = u''
+ song.verse_order = u''
+ song.search_title = u''
+ self.save_song = True
+ # Because "text" seems to be an reserverd word, we have to recompile it.
+ xml = re.compile(u'<text>').sub(u'<text_>', xml)
+ xml = re.compile(u'</text>').sub(u'</text_>', xml)
+>>>>>>> MERGE-SOURCE
song_xml = objectify.fromstring(xml)
self._process_copyright(song_xml, song)
self._process_cclinumber(song_xml, song)
self._process_titles(song_xml, song)
# The verse order is processed with the lyrics!
+<<<<<<< TREE
self._process_lyrics(song_xml, song)
self._process_comments(song_xml, song)
self._process_authors(song_xml, song)
@@ -240,6 +251,16 @@
if self.save_song:
clean_song(self.manager, song)
self.manager.save_object(song)
+=======
+ self._process_lyrics(foilpresenterfolie, song)
+ self._process_comments(foilpresenterfolie, song)
+ self._process_authors(foilpresenterfolie, song)
+ self._process_songbooks(foilpresenterfolie, song)
+ self._process_topics(foilpresenterfolie, song)
+ if self.save_song:
+ clean_song(self.manager, song)
+ self.manager.save_object(song)
+>>>>>>> MERGE-SOURCE
def _child(self, element):
"""
@@ -422,12 +443,21 @@
VerseType.tags[VerseType.Intro]: 1,
VerseType.tags[VerseType.PreChorus]: 1
}
+<<<<<<< TREE
if not hasattr(foilpresenterfolie.strophen, 'strophe'):
self.importer.logError(self._child(foilpresenterfolie.titel),
str(translate('SongsPlugin.FoilPresenterSongImport',
'Invalid Foilpresenter song file. No verses found.')))
self.save_song = False
return
+=======
+ if not hasattr(foilpresenterfolie.strophen, u'strophe'):
+ self.importer.logError(self._child(foilpresenterfolie.titel),
+ unicode(translate('SongsPlugin.FoilPresenterSongImport',
+ 'Invalid Foilpresenter song file. No verses found.')))
+ self.save_song = False
+ return
+>>>>>>> MERGE-SOURCE
for strophe in foilpresenterfolie.strophen.strophe:
text = self._child(strophe.text_) if hasattr(strophe, 'text_') else ''
verse_name = self._child(strophe.key)
=== modified file 'openlp/plugins/songs/lib/importer.py'
=== modified file 'openlp/plugins/songs/lib/mediaitem.py'
=== modified file 'openlp/plugins/songs/lib/mediashoutimport.py'
=== added file 'openlp/plugins/songs/lib/olp1import.py.OTHER'
--- openlp/plugins/songs/lib/olp1import.py.OTHER 1970-01-01 00:00:00 +0000
+++ openlp/plugins/songs/lib/olp1import.py.OTHER 2013-09-14 11:12:23 +0000
@@ -0,0 +1,223 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2013 Raoul Snyman #
+# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan #
+# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, #
+# Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. #
+# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, #
+# Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Dave Warnock, #
+# Frode Woldsund, Martin Zibricky #
+# --------------------------------------------------------------------------- #
+# 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 #
+###############################################################################
+"""
+The :mod:`olp1import` module provides the functionality for importing
+openlp.org 1.x song databases into the current installation database.
+"""
+
+import logging
+from chardet.universaldetector import UniversalDetector
+import sqlite
+import sys
+import os
+
+from openlp.core.lib import translate
+from openlp.plugins.songs.lib import retrieve_windows_encoding
+from songimport import SongImport
+
+log = logging.getLogger(__name__)
+
+class OpenLP1SongImport(SongImport):
+ """
+ The :class:`OpenLP1SongImport` class provides OpenLP with the ability to
+ import song databases from installations of openlp.org 1.x.
+ """
+ lastEncoding = u'windows-1252'
+
+ def __init__(self, manager, **kwargs):
+ """
+ Initialise the import.
+
+ ``manager``
+ The song manager for the running OpenLP installation.
+
+ ``filename``
+ The database providing the data to import.
+ """
+ SongImport.__init__(self, manager, **kwargs)
+ self.availableThemes = \
+ kwargs[u'plugin'].formParent.themeManagerContents.getThemes()
+
+ def doImport(self):
+ """
+ Run the import for an openlp.org 1.x song database.
+ """
+ if not self.importSource.endswith(u'.olp'):
+ self.logError(self.importSource,
+ translate('SongsPlugin.OpenLP1SongImport',
+ 'Not a valid openlp.org 1.x song database.'))
+ return
+ encoding = self.getEncoding()
+ if not encoding:
+ return
+ # Connect to the database.
+ connection = sqlite.connect(self.importSource, mode=0444,
+ encoding=(encoding, 'replace'))
+ cursor = connection.cursor()
+ # Determine if the db supports linking audio to songs.
+ cursor.execute(u'SELECT name FROM sqlite_master '
+ u'WHERE type = \'table\' AND name = \'tracks\'')
+ db_has_tracks = len(cursor.fetchall()) > 0
+ # Determine if the db contains theme information.
+ cursor.execute(u'SELECT name FROM sqlite_master '
+ u'WHERE type = \'table\' AND name = \'settings\'')
+ db_has_themes = len(cursor.fetchall()) > 0
+ # "cache" our list of authors.
+ cursor.execute(u'-- types int, unicode')
+ cursor.execute(u'SELECT authorid, authorname FROM authors')
+ authors = cursor.fetchall()
+ if db_has_tracks:
+ # "cache" our list of tracks.
+ cursor.execute(u'-- types int, unicode')
+ cursor.execute(u'SELECT trackid, fulltrackname FROM tracks')
+ tracks = cursor.fetchall()
+ if db_has_themes:
+ # "cache" our list of themes.
+ themes = {}
+ cursor.execute(u'-- types int, unicode')
+ cursor.execute(u'SELECT settingsid, settingsname FROM settings')
+ for theme_id, theme_name in cursor.fetchall():
+ if theme_name in self.availableThemes:
+ themes[theme_id] = theme_name
+ # Import the songs.
+ cursor.execute(u'-- types int, unicode, unicode, unicode')
+ cursor.execute(u'SELECT songid, songtitle, lyrics || \'\' AS ' \
+ u'lyrics, copyrightinfo FROM songs')
+ songs = cursor.fetchall()
+ self.importWizard.progressBar.setMaximum(len(songs))
+ for song in songs:
+ self.setDefaults()
+ if self.stopImportFlag:
+ break
+ song_id = song[0]
+ self.title = song[1]
+ lyrics = song[2].replace(u'\r\n', u'\n')
+ self.addCopyright(song[3])
+ if db_has_themes:
+ cursor.execute(u'-- types int')
+ cursor.execute(
+ u'SELECT settingsid FROM songs WHERE songid = %s' % song_id)
+ theme_id = cursor.fetchone()[0]
+ self.themeName = themes.get(theme_id, u'')
+ verses = lyrics.split(u'\n\n')
+ for verse in verses:
+ if verse.strip():
+ self.addVerse(verse.strip())
+ cursor.execute(u'-- types int')
+ cursor.execute(u'SELECT authorid FROM songauthors '
+ u'WHERE songid = %s' % song_id)
+ author_ids = cursor.fetchall()
+ for author_id in author_ids:
+ if self.stopImportFlag:
+ break
+ for author in authors:
+ if author[0] == author_id[0]:
+ self.parseAuthor(author[1])
+ break
+ if self.stopImportFlag:
+ break
+ if db_has_tracks:
+ cursor.execute(u'-- types int, int')
+ cursor.execute(u'SELECT trackid, listindex '
+ u'FROM songtracks '
+ u'WHERE songid = %s ORDER BY listindex' % song_id)
+ track_ids = cursor.fetchall()
+ for track_id, listindex in track_ids:
+ if self.stopImportFlag:
+ break
+ for track in tracks:
+ if track[0] == track_id:
+ media_file = self.expandMediaFile(track[1])
+ self.addMediaFile(media_file, listindex)
+ break
+ if self.stopImportFlag:
+ break
+ if not self.finish():
+ self.logError(self.importSource)
+
+ def getEncoding(self):
+ """
+ Detect character encoding of an openlp.org 1.x song database.
+ """
+ # Connect to the database.
+ connection = sqlite.connect(self.importSource.encode(
+ sys.getfilesystemencoding()), mode=0444)
+ cursor = connection.cursor()
+
+ detector = UniversalDetector()
+ # Detect charset by authors.
+ cursor.execute(u'SELECT authorname FROM authors')
+ authors = cursor.fetchall()
+ for author in authors:
+ detector.feed(author[0])
+ if detector.done:
+ detector.close()
+ return detector.result[u'encoding']
+ # Detect charset by songs.
+ cursor.execute(u'SELECT songtitle, copyrightinfo, '
+ u'lyrics || \'\' AS lyrics FROM songs')
+ songs = cursor.fetchall()
+ for index in [0, 1, 2]:
+ for song in songs:
+ detector.feed(song[index])
+ if detector.done:
+ detector.close()
+ return detector.result[u'encoding']
+ # Detect charset by songs.
+ cursor.execute(u'SELECT name FROM sqlite_master '
+ u'WHERE type = \'table\' AND name = \'tracks\'')
+ if cursor.fetchall():
+ cursor.execute(u'SELECT fulltrackname FROM tracks')
+ tracks = cursor.fetchall()
+ for track in tracks:
+ detector.feed(track[0])
+ if detector.done:
+ detector.close()
+ return detector.result[u'encoding']
+ detector.close()
+ return retrieve_windows_encoding(detector.result[u'encoding'])
+
+ def expandMediaFile(self, filename):
+ """
+ When you're on Windows, this function expands the file name to include
+ the path to OpenLP's application data directory. If you are not on
+ Windows, it returns the original file name.
+
+ ``filename``
+ The filename to expand.
+ """
+ if sys.platform != u'win32' and \
+ not os.environ.get(u'ALLUSERSPROFILE') and \
+ not os.environ.get(u'APPDATA'):
+ return filename
+ common_app_data = os.path.join(os.environ[u'ALLUSERSPROFILE'],
+ os.path.split(os.environ[u'APPDATA'])[1])
+ if not common_app_data:
+ return filename
+ return os.path.join(common_app_data, u'openlp.org', 'Audio', filename)
=== modified file 'openlp/plugins/songs/lib/olpimport.py'
=== modified file 'openlp/plugins/songs/lib/oooimport.py'
=== modified file 'openlp/plugins/songs/lib/openlyricsexport.py'
=== modified file 'openlp/plugins/songs/lib/openlyricsimport.py'
=== modified file 'openlp/plugins/songs/lib/opensongimport.py'
--- openlp/plugins/songs/lib/opensongimport.py 2013-08-31 18:17:38 +0000
+++ openlp/plugins/songs/lib/opensongimport.py 2013-09-14 11:12:23 +0000
@@ -45,6 +45,7 @@
Import songs exported from OpenSong
The format is described loosly on the `OpenSong File Format Specification
+<<<<<<< TREE
<http://www.opensong.org/d/manual/song_file_format_specification>`_ page on the OpenSong web site. However, it
doesn't describe the <lyrics> section, so here's an attempt:
@@ -53,6 +54,18 @@
Verses can be expressed in one of 2 ways, either in complete verses, or by line grouping, i.e. grouping all line 1's
of a verse together, all line 2's of a verse together, and so on.
+=======
+ <http://www.opensong.org/d/manual/song_file_format_specification>`_ page on
+ the OpenSong web site. However, it doesn't describe the <lyrics> section,
+ so here's an attempt:
+
+ If the first charachter of a line is a space, then the rest of that line
+ is lyrics. If it is not a space the following applies.
+
+ Verses can be expressed in one of 2 ways, either in complete verses, or by
+ line grouping, i.e. grouping all line 1's of a verse together, all line 2's
+ of a verse together, and so on.
+>>>>>>> MERGE-SOURCE
An example of complete verses::
@@ -165,13 +178,24 @@
if 'lyrics' in fields:
lyrics = str(root.lyrics)
else:
+<<<<<<< TREE
lyrics = ''
for this_line in lyrics.split('\n'):
+=======
+ lyrics = u''
+ for this_line in lyrics.split(u'\n'):
+>>>>>>> MERGE-SOURCE
if not this_line:
continue
+<<<<<<< TREE
# skip this line if it is a comment
if this_line.startswith(';'):
continue
+=======
+ # skip this line if it is a comment
+ if this_line.startswith(u';'):
+ continue
+>>>>>>> MERGE-SOURCE
# skip guitar chords and page and column breaks
if this_line.startswith('.') or this_line.startswith('---') or this_line.startswith('-!!'):
continue
@@ -207,9 +231,15 @@
our_verse_order.append([verse_tag, verse_num, inst])
# Tidy text and remove the ____s from extended words
this_line = self.tidyText(this_line)
+<<<<<<< TREE
this_line = this_line.replace('_', '')
this_line = this_line.replace('|', '\n')
this_line = this_line.strip()
+=======
+ this_line = this_line.replace(u'_', u'')
+ this_line = this_line.replace(u'|', u'\n')
+ this_line = this_line.strip()
+>>>>>>> MERGE-SOURCE
verses[verse_tag][verse_num][inst].append(this_line)
# done parsing
# add verses in original order
=== modified file 'openlp/plugins/songs/lib/powersongimport.py'
=== modified file 'openlp/plugins/songs/lib/sofimport.py'
=== modified file 'openlp/plugins/songs/lib/songbeamerimport.py'
=== modified file 'openlp/plugins/songs/lib/songimport.py'
--- openlp/plugins/songs/lib/songimport.py 2013-08-31 18:17:38 +0000
+++ openlp/plugins/songs/lib/songimport.py 2013-09-14 11:12:23 +0000
@@ -260,10 +260,15 @@
elif int(verse_def[1:]) > self.verseCounts[verse_def[0]]:
self.verseCounts[verse_def[0]] = int(verse_def[1:])
self.verses.append([verse_def, verse_text.rstrip(), lang])
+<<<<<<< TREE
# A verse_def refers to all verses with that name, adding it once adds every instance, so do not add if already
# used.
if verse_def not in self.verseOrderListGenerated:
self.verseOrderListGenerated.append(verse_def)
+=======
+ if verse_def not in self.verseOrderListGenerated:
+ self.verseOrderListGenerated.append(verse_def)
+>>>>>>> MERGE-SOURCE
def repeatVerse(self):
"""
=== modified file 'openlp/plugins/songs/lib/songproimport.py'
--- openlp/plugins/songs/lib/songproimport.py 2013-08-31 18:17:38 +0000
+++ openlp/plugins/songs/lib/songproimport.py 2013-09-14 11:12:23 +0000
@@ -106,11 +106,19 @@
elif tag == 'E':
self.finish()
return
+<<<<<<< TREE
if 'rtf1' in text:
result = strip_rtf(text, self.encoding)
if result is None:
return
text, self.encoding = result
+=======
+ if u'rtf1' in text:
+ result = strip_rtf(text, self.encoding)
+ if result is None:
+ return
+ text, self.encoding = result
+>>>>>>> MERGE-SOURCE
text = text.rstrip()
if not text:
return
=== modified file 'openlp/plugins/songs/lib/songshowplusimport.py'
--- openlp/plugins/songs/lib/songshowplusimport.py 2013-08-31 18:17:38 +0000
+++ openlp/plugins/songs/lib/songshowplusimport.py 2013-09-14 11:12:23 +0000
@@ -30,13 +30,14 @@
The :mod:`songshowplusimport` module provides the functionality for importing
SongShow Plus songs into the OpenLP database.
"""
+import chardet
import os
import logging
import re
import struct
from openlp.core.ui.wizard import WizardStrings
-from openlp.plugins.songs.lib import VerseType
+from openlp.plugins.songs.lib import VerseType, retrieve_windows_encoding
from openlp.plugins.songs.lib.songimport import SongImport
TITLE = 1
@@ -134,39 +135,89 @@
log.debug(length_descriptor_size)
data = song_data.read(length_descriptor).decode()
if block_key == TITLE:
+<<<<<<< TREE
self.title = data
+=======
+ self.title = self.decode(data)
+>>>>>>> MERGE-SOURCE
elif block_key == AUTHOR:
authors = data.split(" / ")
for author in authors:
if author.find(",") !=-1:
authorParts = author.split(", ")
author = authorParts[1] + " " + authorParts[0]
+<<<<<<< TREE
self.parse_author(author)
+=======
+ self.parseAuthor(self.decode(author))
+>>>>>>> MERGE-SOURCE
elif block_key == COPYRIGHT:
+<<<<<<< TREE
self.addCopyright(data)
+=======
+ self.addCopyright(self.decode(data))
+>>>>>>> MERGE-SOURCE
elif block_key == CCLI_NO:
self.ccliNumber = int(data)
elif block_key == VERSE:
+<<<<<<< TREE
self.addVerse(data, "%s%s" % (VerseType.tags[VerseType.Verse], verse_no))
+=======
+ self.addVerse(self.decode(data),
+ "%s%s" % (VerseType.Tags[VerseType.Verse], verse_no))
+>>>>>>> MERGE-SOURCE
elif block_key == CHORUS:
+<<<<<<< TREE
self.addVerse(data, "%s%s" % (VerseType.tags[VerseType.Chorus], verse_no))
+=======
+ self.addVerse(self.decode(data),
+ "%s%s" % (VerseType.Tags[VerseType.Chorus], verse_no))
+>>>>>>> MERGE-SOURCE
elif block_key == BRIDGE:
+<<<<<<< TREE
self.addVerse(data, "%s%s" % (VerseType.tags[VerseType.Bridge], verse_no))
+=======
+ self.addVerse(self.decode(data),
+ "%s%s" % (VerseType.Tags[VerseType.Bridge], verse_no))
+>>>>>>> MERGE-SOURCE
elif block_key == TOPIC:
+<<<<<<< TREE
self.topics.append(data)
+=======
+ self.topics.append(self.decode(data))
+>>>>>>> MERGE-SOURCE
elif block_key == COMMENTS:
+<<<<<<< TREE
self.comments = data
+=======
+ self.comments = self.decode(data)
+>>>>>>> MERGE-SOURCE
elif block_key == VERSE_ORDER:
verse_tag = self.to_openlp_verse_tag(data, True)
if verse_tag:
+<<<<<<< TREE
self.ssp_verse_order_list.append(verse_tag)
+=======
+ if not isinstance(verse_tag, unicode):
+ verse_tag = self.decode(verse_tag)
+ self.sspVerseOrderList.append(verse_tag)
+>>>>>>> MERGE-SOURCE
elif block_key == SONG_BOOK:
+<<<<<<< TREE
self.songBookName = data
+=======
+ self.songBookName = self.decode(data)
+>>>>>>> MERGE-SOURCE
elif block_key == SONG_NUMBER:
self.songNumber = ord(data)
elif block_key == CUSTOM_VERSE:
+<<<<<<< TREE
verse_tag = self.to_openlp_verse_tag(verse_name)
self.addVerse(data, verse_tag)
+=======
+ verse_tag = self.toOpenLPVerseTag(verse_name)
+ self.addVerse(self.decode(data), verse_tag)
+>>>>>>> MERGE-SOURCE
else:
log.debug("Unrecognised blockKey: %s, data: %s" % (block_key, data))
song_data.seek(next_block_starts)
@@ -175,6 +226,7 @@
if not self.finish():
self.logError(file)
+<<<<<<< TREE
def to_openlp_verse_tag(self, verse_name, ignore_unique=False):
# Have we got any digits? If so, verse number is everything from the digits to the end (OpenLP does not have
# concept of part verses, so just ignore any non integers on the end (including floats))
@@ -182,10 +234,30 @@
if match:
verse_type = match.group(1).strip()
verse_number = match.group(2)
+=======
+ def toOpenLPVerseTag(self, verse_name, ignore_unique=False):
+ # have we got any digits?
+ # If so, verse number is everything from the digits
+ # to the end (openlp does not have concept of part verses, so
+ # just ignore any non integers on the end (including floats))
+ match = re.match(u'(\D*)(\d+)', verse_name)
+ if match:
+ verse_type = match.group(1).strip()
+ verse_number = match.group(2)
+>>>>>>> MERGE-SOURCE
else:
+<<<<<<< TREE
# otherwise we assume number 1 and take the whole prefix as the verse tag
+=======
+ # otherwise we assume number 1 and take the whole prefix as
+ # the verse tag
+>>>>>>> MERGE-SOURCE
verse_type = verse_name
+<<<<<<< TREE
verse_number = '1'
+=======
+ verse_number = u'1'
+>>>>>>> MERGE-SOURCE
verse_type = verse_type.lower()
if verse_type == "verse":
verse_tag = VerseType.tags[VerseType.Verse]
@@ -204,3 +276,9 @@
verse_tag = VerseType.tags[VerseType.Other]
verse_number = self.other_list[verse_name]
return verse_tag + verse_number
+
+ def decode(self, data):
+ try:
+ return unicode(data, chardet.detect(data)['encoding'])
+ except:
+ return unicode(data, retrieve_windows_encoding())
=== modified file 'openlp/plugins/songs/lib/songstab.py'
=== modified file 'openlp/plugins/songs/lib/sundayplusimport.py'
--- openlp/plugins/songs/lib/sundayplusimport.py 2013-08-31 18:17:38 +0000
+++ openlp/plugins/songs/lib/sundayplusimport.py 2013-09-14 11:12:23 +0000
@@ -67,7 +67,7 @@
for filename in self.import_source:
if self.stop_import_flag:
return
- song_file = open(filename)
+ song_file = open(filename, 'rb')
self.doImportFile(song_file)
song_file.close()
@@ -95,7 +95,7 @@
# Now we are looking for the name.
if data[i:i + 1] == '#':
name_end = data.find(':', i + 1)
- name = data[i + 1:name_end]
+ name = data[i + 1:name_end].upper()
i = name_end + 1
while data[i:i + 1] == ' ':
i += 1
@@ -120,14 +120,19 @@
end = data.find(')', i) + 1
value = data[i:end]
# If we are in the main group.
+<<<<<<< TREE
if not cell:
if name == 'title':
+=======
+ if cell == False:
+ if name == 'TITLE':
+>>>>>>> MERGE-SOURCE
self.title = self.decode(self.unescape(value))
- elif name == 'Author':
+ elif name == 'AUTHOR':
author = self.decode(self.unescape(value))
if len(author):
self.addAuthor(author)
- elif name == 'Copyright':
+ elif name == 'COPYRIGHT':
self.copyright = self.decode(self.unescape(value))
elif name[0:4] == 'CELL':
self.parse(value, cell = name[4:])
@@ -139,12 +144,12 @@
verse_type = VerseType.tags[VerseType.from_loose_input(value[0])]
if len(value) >= 2 and value[-1] in ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9']:
verse_type = "%s%s" % (verse_type, value[-1])
- elif name == 'Hotkey':
+ elif name == 'HOTKEY':
# Hotkey always appears after MARKER_NAME, so it
# effectively overrides MARKER_NAME, if present.
if len(value) and value in list(HOTKEY_TO_VERSE_TYPE.keys()):
verse_type = HOTKEY_TO_VERSE_TYPE[value]
- if name == 'rtf':
+ if name == 'RTF':
value = self.unescape(value)
result = strip_rtf(value, self.encoding)
if result is None:
=== modified file 'openlp/plugins/songs/lib/test/test_import_file.py'
=== modified file 'openlp/plugins/songs/lib/test/test_importing_lots.py'
=== added file 'openlp/plugins/songs/lib/test/test_opensongimport.py.OTHER'
--- openlp/plugins/songs/lib/test/test_opensongimport.py.OTHER 1970-01-01 00:00:00 +0000
+++ openlp/plugins/songs/lib/test/test_opensongimport.py.OTHER 2013-09-14 11:12:23 +0000
@@ -0,0 +1,131 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2013 Raoul Snyman #
+# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan #
+# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, #
+# Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. #
+# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, #
+# Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith, #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Dave Warnock, #
+# Frode Woldsund, Martin Zibricky #
+# --------------------------------------------------------------------------- #
+# 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 openlp.plugins.songs.lib.opensongimport import OpenSongImport
+from openlp.core.lib.db import Manager
+from openlp.plugins.songs.lib.db import init_schema
+
+import logging
+LOG_FILENAME = 'test.log'
+logging.basicConfig(filename=LOG_FILENAME,level=logging.INFO)
+
+# Stubs to replace the UI functions for raw testing
+class wizard_stub:
+ def __init__(self):
+ self.progressBar=progbar_stub()
+ def incrementProgressBar(self, str):
+ pass
+class progbar_stub:
+ def __init__(self):
+ pass
+ def setMaximum(self, arg):
+ pass
+
+def test():
+ manager = Manager(u'songs', init_schema)
+ o = OpenSongImport(manager, filenames=[u'test.opensong'])
+ o.import_wizard = wizard_stub()
+ o.commit = False
+ o.do_import()
+ o.print_song()
+ assert o.copyright == u'2010 Martin Thompson'
+ assert o.authors == [u'MartiÑ Thómpson', u'Martin2 Thómpson']
+ assert o.title == u'Martins Test'
+ assert o.alternate_title == u''
+ assert o.song_number == u'1'
+ assert [u'C1', u'Chorus 1'] in o.verses
+ assert [u'C2', u'Chorus 2'] in o.verses
+ assert not [u'C3', u'Chorus 3'] in o.verses
+ assert [u'B1', u'Bridge 1\nBridge 1 line 2'] in o.verses
+ assert [u'V1', u'v1 Line 1\nV1 Line 2'] in o.verses
+ assert [u'V2', u'v2 Line 1\nV2 Line 2'] in o.verses
+ assert [u'V3A', u'V3 Line 1\nV3 Line 2'] in o.verses
+ assert [u'RAP1', u'Rap 1 Line 1\nRap 1 Line 2'] in o.verses
+ assert [u'RAP2', u'Rap 2 Line 1\nRap 2 Line 2'] in o.verses
+ assert [u'RAP3', u'Rap 3 Line 1\nRap 3 Line 2'] in o.verses
+ assert [u'X1', u'Unreferenced verse line 1'] in o.verses
+ assert o.verse_order_list == [u'V1', u'C1', u'V2', u'C2', u'V3A', u'B1', u'V1', u'T1', u'RAP1', u'RAP2', u'RAP3']
+ assert o.ccli_number == u'Blah'
+ assert o.topics == [u'TestTheme', u'TestAltTheme']
+
+ o.filenames = [u'test.opensong.zip']
+ o.set_defaults()
+ o.do_import()
+ o.print_song()
+ assert o.copyright == u'2010 Martin Thompson'
+ assert o.authors == [u'MartiÑ Thómpson']
+ assert o.title == u'Martins Test'
+ assert o.alternate_title == u''
+ assert o.song_number == u'1'
+ assert [u'B1', u'Bridge 1\nBridge 1 line 2'] in o.verses
+ assert [u'C1', u'Chorus 1'] in o.verses
+ assert [u'C2', u'Chorus 2'] in o.verses
+ assert not [u'C3', u'Chorus 3'] in o.verses
+ assert [u'V1', u'v1 Line 1\nV1 Line 2'] in o.verses
+ assert [u'V2', u'v2 Line 1\nV2 Line 2'] in o.verses
+ print o.verse_order_list
+ assert o.verse_order_list == [u'V1', u'C1', u'V2', u'C2', u'V3', u'B1', u'V1']
+
+ o.filenames = [u'test2.opensong']
+ o.set_defaults()
+ o.do_import()
+ o.print_song()
+ assert o.copyright == u'2010 Martin Thompson'
+ assert o.authors == [u'Martin Thompson']
+ assert o.title == u'Martins 2nd Test'
+ assert o.alternate_title == u''
+ assert o.song_number == u'2'
+ print o.verses
+ assert [u'B1', u'Bridge 1\nBridge 1 line 2'] in o.verses
+ assert [u'C1', u'Chorus 1'] in o.verses
+ assert [u'C2', u'Chorus 2'] in o.verses
+ assert not [u'C3', u'Chorus 3'] in o.verses
+ assert [u'V1', u'v1 Line 1\nV1 Line 2'] in o.verses
+ assert [u'V2', u'v2 Line 1\nV2 Line 2'] in o.verses
+ print o.verse_order_list
+ assert o.verse_order_list == [u'V1', u'V2', u'B1', u'C1', u'C2']
+
+ o.filenames = [u'test3.opensong']
+ o.set_defaults()
+ o.do_import()
+ o.print_song()
+ assert o.copyright == u'2010'
+ assert o.authors == [u'Martin Thompson']
+ assert o.title == u'Test single verse'
+ assert o.alternate_title == u''
+ assert o.ccli_number == u'123456'
+ assert o.verse_order_list == [u'V1']
+ assert o.topics == [u'Worship: Declaration']
+ print o.verses[0]
+ assert [u'V1', u'Line 1\nLine 2'] in o.verses
+
+ print "Tests passed"
+
+if __name__ == "__main__":
+ test()
=== modified file 'openlp/plugins/songs/lib/ui.py'
=== modified file 'openlp/plugins/songs/lib/upgrade.py'
=== modified file 'openlp/plugins/songs/lib/wowimport.py'
=== modified file 'openlp/plugins/songs/lib/xml.py'
--- openlp/plugins/songs/lib/xml.py 2013-08-31 18:17:38 +0000
+++ openlp/plugins/songs/lib/xml.py 2013-09-14 11:12:23 +0000
@@ -79,6 +79,33 @@
NSMAP = '{' + NAMESPACE + '}' + '%s'
+def valid_XML_char_ordinal(char):
+ """
+ Undertake the filter test.
+
+ ``char``
+ The individual character to be checked.
+ """
+ return (
+ 0x20 <= char <= 0xD7FF
+ or char in (0x9, 0xA, 0xD)
+ or 0xE000 <= char <= 0xFFFD
+ or 0x10000 <= char <= 0x10FFFF
+ )
+
+
+def clean_xml_string(xml):
+ """
+ Filter out invalid characters in xml
+ Source <http://stackoverflow.com/questions/8733233/filtering-out-certain-bytes-in-python>
+
+ ``xml``
+ The actual text to be checked.
+
+ """
+ return ''.join(char for char in xml if valid_XML_char_ordinal(ord(char)))
+
+
class SongXML(object):
"""
This class builds and parses the XML used to describe songs.
@@ -109,8 +136,14 @@
``lang``
The verse's language code (ISO-639). This is not required, but should be added if available.
"""
+<<<<<<< TREE
verse = etree.Element('verse', type=str(type),
label=str(number))
+=======
+ content = clean_xml_string(content)
+ verse = etree.Element(u'verse', type=unicode(type),
+ label=unicode(number))
+>>>>>>> MERGE-SOURCE
if lang:
verse.set('lang', lang)
verse.text = etree.CDATA(content)
=== modified file 'openlp/plugins/songs/lib/zionworximport.py'
=== modified file 'openlp/plugins/songs/songsplugin.py'
=== modified file 'openlp/plugins/songusage/__init__.py'
=== modified file 'openlp/plugins/songusage/forms/__init__.py'
=== modified file 'openlp/plugins/songusage/forms/songusagedeletedialog.py'
=== modified file 'openlp/plugins/songusage/forms/songusagedeleteform.py'
=== modified file 'openlp/plugins/songusage/forms/songusagedetaildialog.py'
=== modified file 'openlp/plugins/songusage/forms/songusagedetailform.py'
=== modified file 'openlp/plugins/songusage/lib/__init__.py'
=== modified file 'openlp/plugins/songusage/lib/db.py'
=== modified file 'openlp/plugins/songusage/lib/upgrade.py'
=== modified file 'openlp/plugins/songusage/songusageplugin.py'
=== modified file 'resources/__init__.py'
=== modified file 'resources/i18n/af.ts'
--- resources/i18n/af.ts 2012-11-24 21:19:46 +0000
+++ resources/i18n/af.ts 2013-09-14 11:12:23 +0000
@@ -175,12 +175,12 @@
<translation>Bybels</translation>
</message>
<message>
- <location filename="openlp/plugins/bibles/lib/http.py" line="600"/>
+ <location filename="openlp/plugins/bibles/lib/http.py" line="604"/>
<source>No Book Found</source>
<translation>Geen Boek Gevind nie</translation>
</message>
<message>
- <location filename="openlp/plugins/bibles/lib/http.py" line="600"/>
+ <location filename="openlp/plugins/bibles/lib/http.py" line="604"/>
<source>No matching book could be found in this Bible. Check that you have spelled the name of the book correctly.</source>
<translation>Geen passende boek kon in hierdie Bybel gevind word nie. Gaan na dat die naam van die boek korrek gespel is.</translation>
</message>
@@ -1045,38 +1045,38 @@
<context>
<name>BiblesPlugin.HTTPBible</name>
<message>
- <location filename="openlp/plugins/bibles/lib/http.py" line="514"/>
+ <location filename="openlp/plugins/bibles/lib/http.py" line="518"/>
<source>Registering Bible and loading books...</source>
<translation>Registreer Bybel en laai boeke...</translation>
</message>
<message>
- <location filename="openlp/plugins/bibles/lib/http.py" line="539"/>
+ <location filename="openlp/plugins/bibles/lib/http.py" line="543"/>
<source>Registering Language...</source>
<translation>Taal registrasie...</translation>
</message>
<message>
- <location filename="openlp/plugins/bibles/lib/http.py" line="555"/>
+ <location filename="openlp/plugins/bibles/lib/http.py" line="559"/>
<source>Importing %s...</source>
<comment>Importing <book name>...</comment>
<translation>Voer %s in...</translation>
</message>
<message>
- <location filename="openlp/plugins/bibles/lib/http.py" line="722"/>
+ <location filename="openlp/plugins/bibles/lib/http.py" line="726"/>
<source>Download Error</source>
<translation>Aflaai Fout</translation>
</message>
<message>
- <location filename="openlp/plugins/bibles/lib/http.py" line="722"/>
+ <location filename="openlp/plugins/bibles/lib/http.py" line="726"/>
<source>There was a problem downloading your verse selection. Please check your Internet connection, and if this error continues to occur please consider reporting a bug.</source>
<translation>Daar was 'n probleem om die vers seleksie af te laai. Gaan die Internet konneksie na en as hierdie probleem voortduur, oorweeg dit asseblief om 'n gogga te rapporteer.</translation>
</message>
<message>
- <location filename="openlp/plugins/bibles/lib/http.py" line="729"/>
+ <location filename="openlp/plugins/bibles/lib/http.py" line="733"/>
<source>Parse Error</source>
<translation>Ontleed Fout</translation>
</message>
<message>
- <location filename="openlp/plugins/bibles/lib/http.py" line="729"/>
+ <location filename="openlp/plugins/bibles/lib/http.py" line="733"/>
<source>There was a problem extracting your verse selection. If this error continues to occur please consider reporting a bug.</source>
<translation>Daar was 'n probleem om die vers seleksie te onttrek. As hierdie probleem voortduur, oorweeg dit asseblief om 'n gogga te rapporteer.</translation>
</message>
@@ -1399,7 +1399,7 @@
<translation>Bepaal enkodering (dit mag 'n paar minuute neem)...</translation>
</message>
<message>
- <location filename="openlp/plugins/bibles/lib/osis.py" line="162"/>
+ <location filename="openlp/plugins/bibles/lib/osis.py" line="174"/>
<source>Importing %s %s...</source>
<comment>Importing <book name> <chapter>...</comment>
<translation>Invoer %s %s...</translation>
@@ -1994,7 +1994,7 @@
<context>
<name>OpenLP</name>
<message>
- <location filename="openlp/core/utils/__init__.py" line="362"/>
+ <location filename="openlp/core/utils/__init__.py" line="363"/>
<source>Image Files</source>
<translation>Beeld Lêers</translation>
</message>
@@ -2039,13 +2039,6 @@
<translation>Hierdie program word versprei in die hoop dat dit nuttig sal wees, maar SONDER ENIGE WAARBORG; sonder die geïmpliseerde waarborg van VERHANDELBAARHEID of GESKIKTHEID VIR 'N SPESIFIEKE DOEL. Sien hieronder vir meer inligting.</translation>
</message>
<message>
- <location filename="openlp/core/ui/aboutdialog.py" line="250"/>
- <source>Copyright © 2004-2012 %s
-Portions copyright © 2004-2012 %s</source>
- <translation>Kopiereg © 2004-2012 %s
-Gedeeltelike kopiereg © 2004-2012 %s</translation>
- </message>
- <message>
<location filename="openlp/core/ui/aboutdialog.py" line="86"/>
<source>OpenLP <version><revision> - Open Source Lyrics Projection
@@ -2213,6 +2206,13 @@
Ons bring hierdie sagteware gratis voort
omdat Hy ons vry gemaak het.</translation>
</message>
+ <message>
+ <location filename="openlp/core/ui/aboutdialog.py" line="250"/>
+ <source>Copyright © 2004-2013 %s
+Portions copyright © 2004-2013 %s</source>
+ <translation>Kopiereg © 2004-2013 %s
+Gedeeltelike kopiereg © 2004-2013 %s</translation>
+ </message>
</context>
<context>
<name>OpenLP.AdvancedTab</name>
@@ -2272,7 +2272,7 @@
<translation>Beeld lêer:</translation>
</message>
<message>
- <location filename="openlp/core/ui/advancedtab.py" line="664"/>
+ <location filename="openlp/core/ui/advancedtab.py" line="667"/>
<source>Open File</source>
<translation>Maak Lêer oop</translation>
</message>
@@ -2302,7 +2302,7 @@
<translation>Verander terug na die verstek OpenLP logo.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="622"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="623"/>
<source>Service %Y-%m-%d %H-%M</source>
<comment>This may not contain any of the following characters: /\?*|<>[]":+
See http://docs.python.org/library/datetime.html#strftime-strptime-behavior for more information.</comment>
@@ -2399,7 +2399,7 @@
<translation>Werk om X11 Venster Bestuurder</translation>
</message>
<message>
- <location filename="openlp/core/ui/advancedtab.py" line="635"/>
+ <location filename="openlp/core/ui/advancedtab.py" line="638"/>
<source>Syntax error.</source>
<translation>Sintaks fout.</translation>
</message>
@@ -2454,27 +2454,27 @@
<translation><strong>WAARSKUWING:</strong> Nuwe data lêer ligging bevat OpenLP data lêers. Hierdie lêers SAL vervang word gedurende kopiëring.</translation>
</message>
<message>
- <location filename="openlp/core/ui/advancedtab.py" line="525"/>
+ <location filename="openlp/core/ui/advancedtab.py" line="528"/>
<source>Data Directory Error</source>
<translation>Data Lêer Fout</translation>
</message>
<message>
- <location filename="openlp/core/ui/advancedtab.py" line="677"/>
+ <location filename="openlp/core/ui/advancedtab.py" line="680"/>
<source>Select Data Directory Location</source>
<translation>Selekteer Data Lêer Ligging</translation>
</message>
<message>
- <location filename="openlp/core/ui/advancedtab.py" line="690"/>
+ <location filename="openlp/core/ui/advancedtab.py" line="693"/>
<source>Confirm Data Directory Change</source>
<translation>Bevestig Data Lêer Verandering</translation>
</message>
<message>
- <location filename="openlp/core/ui/advancedtab.py" line="717"/>
+ <location filename="openlp/core/ui/advancedtab.py" line="720"/>
<source>Reset Data Directory</source>
<translation>Herstel Data Lêer</translation>
</message>
<message>
- <location filename="openlp/core/ui/advancedtab.py" line="717"/>
+ <location filename="openlp/core/ui/advancedtab.py" line="720"/>
<source>Are you sure you want to change the location of the OpenLP data directory to the default location?
This location will be used after OpenLP is closed.</source>
@@ -2483,12 +2483,12 @@
Hierdie ligging sal gebruik word nadat OpenLP toegemaak is.</translation>
</message>
<message>
- <location filename="openlp/core/ui/advancedtab.py" line="753"/>
+ <location filename="openlp/core/ui/advancedtab.py" line="756"/>
<source>Overwrite Existing Data</source>
<translation>Oorskryf Bestaande Data</translation>
</message>
<message>
- <location filename="openlp/core/ui/advancedtab.py" line="525"/>
+ <location filename="openlp/core/ui/advancedtab.py" line="528"/>
<source>OpenLP data directory was not found
%s
@@ -2507,7 +2507,7 @@
Kliek "Nee" om die laai van OpenLP te staak, en jou toe te laat om die probleem op te los. Kliek "Ja" om die data gids na die verstek ligging te herstel.</translation>
</message>
<message>
- <location filename="openlp/core/ui/advancedtab.py" line="690"/>
+ <location filename="openlp/core/ui/advancedtab.py" line="693"/>
<source>Are you sure you want to change the location of the OpenLP data directory to:
%s
@@ -2520,7 +2520,7 @@
Die data gids sal verander word wanneer OpenLP toe gemaak word.</translation>
</message>
<message>
- <location filename="openlp/core/ui/advancedtab.py" line="753"/>
+ <location filename="openlp/core/ui/advancedtab.py" line="756"/>
<source>WARNING:
The location you have selected
@@ -2699,192 +2699,192 @@
<context>
<name>OpenLP.FirstTimeWizard</name>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="212"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="216"/>
<source>Songs</source>
<translation>Liedere</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="199"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="203"/>
<source>First Time Wizard</source>
<translation>Eerste Keer Gids</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="201"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="205"/>
<source>Welcome to the First Time Wizard</source>
<translation>Welkom by die Eerste Keer Gids</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="208"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="212"/>
<source>Activate required Plugins</source>
<translation>Aktiveer nodige Miniprogramme</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="210"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="214"/>
<source>Select the Plugins you wish to use. </source>
<translation>Kies die Miniprogramme wat gebruik moet word.</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="215"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="219"/>
<source>Bible</source>
<translation>Bybel</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="216"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="220"/>
<source>Images</source>
<translation>Beelde</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="221"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="225"/>
<source>Presentations</source>
<translation>Aanbiedinge</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="223"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="227"/>
<source>Media (Audio and Video)</source>
<translation>Media (Klank en Video)</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="225"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="229"/>
<source>Allow remote access</source>
<translation>Laat afgeleë toegang toe</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="227"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="231"/>
<source>Monitor Song Usage</source>
<translation>Monitor Lied-Gebruik</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="229"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="233"/>
<source>Allow Alerts</source>
<translation>Laat Waarskuwings Toe</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="259"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="263"/>
<source>Default Settings</source>
<translation>Verstek Instellings</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimeform.py" line="97"/>
+ <location filename="openlp/core/ui/firsttimeform.py" line="116"/>
<source>Downloading %s...</source>
<translation>Aflaai %s...</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimeform.py" line="409"/>
+ <location filename="openlp/core/ui/firsttimeform.py" line="447"/>
<source>Download complete. Click the finish button to start OpenLP.</source>
<translation>Aflaai voltooi. Klik op die klaar knoppie om OpenLP te begin.</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimeform.py" line="430"/>
+ <location filename="openlp/core/ui/firsttimeform.py" line="468"/>
<source>Enabling selected plugins...</source>
<translation>Skakel geselekteerde miniprogramme aan...</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="231"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="235"/>
<source>No Internet Connection</source>
<translation>Geen Internet Verbinding</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="233"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="237"/>
<source>Unable to detect an Internet connection.</source>
<translation>Nie in staat om 'n Internet verbinding op te spoor nie.</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="247"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="251"/>
<source>Sample Songs</source>
<translation>Voorbeeld Liedere</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="249"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="253"/>
<source>Select and download public domain songs.</source>
<translation>Kies en laai liedere vanaf die publieke domein.</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="251"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="255"/>
<source>Sample Bibles</source>
<translation>Voorbeeld Bybels</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="253"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="257"/>
<source>Select and download free Bibles.</source>
<translation>Kies en laai gratis Bybels af.</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="255"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="259"/>
<source>Sample Themes</source>
<translation>Voorbeeld Temas</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="257"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="261"/>
<source>Select and download sample themes.</source>
<translation>Kies en laai voorbeeld temas af.</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="261"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="265"/>
<source>Set up default settings to be used by OpenLP.</source>
<translation>Stel verstek instellings wat deur OpenLP gebruik moet word.</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="263"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="267"/>
<source>Default output display:</source>
<translation>Verstek uitgaande vertoning:</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="265"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="269"/>
<source>Select default theme:</source>
<translation>Kies verstek tema:</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="267"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="271"/>
<source>Starting configuration process...</source>
<translation>Konfigurasie proses begin...</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="205"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="209"/>
<source>This wizard will help you to configure OpenLP for initial use. Click the next button below to start.</source>
<translation>Hierdie gids sal bystand verleen in die proses om OpenLP op te stel vir eerste gebruik. Klik die volgende knoppie hieronder om die seleksie proses te begin.</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimeform.py" line="383"/>
+ <location filename="openlp/core/ui/firsttimeform.py" line="421"/>
<source>Setting Up And Downloading</source>
<translation>Opstel en Afliaai</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimeform.py" line="385"/>
+ <location filename="openlp/core/ui/firsttimeform.py" line="423"/>
<source>Please wait while OpenLP is set up and your data is downloaded.</source>
<translation>Wag asseblief terwyl OpenLP opgestel en die data afgelaai word.</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimeform.py" line="390"/>
+ <location filename="openlp/core/ui/firsttimeform.py" line="428"/>
<source>Setting Up</source>
<translation>Opstel</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimeform.py" line="417"/>
+ <location filename="openlp/core/ui/firsttimeform.py" line="455"/>
<source>Click the finish button to start OpenLP.</source>
<translation>Kliek die voltooi knoppie om OpenLP te begin.</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimeform.py" line="405"/>
+ <location filename="openlp/core/ui/firsttimeform.py" line="443"/>
<source>Download complete. Click the finish button to return to OpenLP.</source>
<translation>Aflaai voltooi. Klik op die klaar knoppie om na OpenLP terug te keer.</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimeform.py" line="414"/>
+ <location filename="openlp/core/ui/firsttimeform.py" line="452"/>
<source>Click the finish button to return to OpenLP.</source>
<translation>Kliek die voltooi knoppie om na OpenLP terug te keer.</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="213"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="217"/>
<source>Custom Slides</source>
<translation>Aangepasde Skyfies</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="269"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="273"/>
<source>Finish</source>
<translation>Eindig</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="236"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="240"/>
<source>No Internet connection was found. The First Time Wizard needs an Internet connection in order to be able to download sample songs, Bibles and themes. Click the Finish button now to start OpenLP with initial settings and no sample data.
To re-run the First Time Wizard and import this sample data at a later time, check your Internet connection and re-run this wizard by selecting "Tools/Re-run First Time Wizard" from OpenLP.</source>
@@ -2893,7 +2893,7 @@
Om weer die Eerste Keer Gids te gebruik en hierdie voorbeeld data om 'n latere stadium in te voer, gaan jou Internet konneksie na en begin weer hierdie gids deur "Gereedskap/Eerste Keer Gids" vanaf OpenLP te begin.</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="244"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="248"/>
<source>
To cancel the First Time Wizard completely (and not start OpenLP), click the Cancel button now.</source>
@@ -2943,32 +2943,32 @@
<context>
<name>OpenLP.FormattingTagForm</name>
<message>
- <location filename="openlp/core/ui/formattingtagform.py" line="167"/>
+ <location filename="openlp/core/ui/formattingtagform.py" line="168"/>
<source>Update Error</source>
<translation>Opdateer Fout</translation>
</message>
<message>
- <location filename="openlp/core/ui/formattingtagform.py" line="119"/>
+ <location filename="openlp/core/ui/formattingtagform.py" line="120"/>
<source>Tag "n" already defined.</source>
<translation>Etiket "n" alreeds gedefinieër.</translation>
</message>
<message>
- <location filename="openlp/core/ui/formattingtagform.py" line="126"/>
+ <location filename="openlp/core/ui/formattingtagform.py" line="127"/>
<source>New Tag</source>
<translation>Nuwe Etiket</translation>
</message>
<message>
- <location filename="openlp/core/ui/formattingtagform.py" line="128"/>
+ <location filename="openlp/core/ui/formattingtagform.py" line="129"/>
<source><HTML here></source>
<translation><HTML hier></translation>
</message>
<message>
- <location filename="openlp/core/ui/formattingtagform.py" line="130"/>
+ <location filename="openlp/core/ui/formattingtagform.py" line="131"/>
<source></and here></source>
<translation></en hier></translation>
</message>
<message>
- <location filename="openlp/core/ui/formattingtagform.py" line="167"/>
+ <location filename="openlp/core/ui/formattingtagform.py" line="168"/>
<source>Tag %s already defined.</source>
<translation>Etiket %s alreeds gedefinieër.</translation>
</message>
@@ -2976,82 +2976,82 @@
<context>
<name>OpenLP.FormattingTags</name>
<message>
- <location filename="openlp/core/lib/formattingtags.py" line="89"/>
+ <location filename="openlp/core/lib/formattingtags.py" line="90"/>
<source>Red</source>
<translation>Rooi</translation>
</message>
<message>
- <location filename="openlp/core/lib/formattingtags.py" line="94"/>
+ <location filename="openlp/core/lib/formattingtags.py" line="95"/>
<source>Black</source>
<translation>Swart</translation>
</message>
<message>
- <location filename="openlp/core/lib/formattingtags.py" line="99"/>
+ <location filename="openlp/core/lib/formattingtags.py" line="100"/>
<source>Blue</source>
<translation>Blou</translation>
</message>
<message>
- <location filename="openlp/core/lib/formattingtags.py" line="104"/>
+ <location filename="openlp/core/lib/formattingtags.py" line="105"/>
<source>Yellow</source>
<translation>Geel</translation>
</message>
<message>
- <location filename="openlp/core/lib/formattingtags.py" line="109"/>
+ <location filename="openlp/core/lib/formattingtags.py" line="110"/>
<source>Green</source>
<translation>Groen</translation>
</message>
<message>
- <location filename="openlp/core/lib/formattingtags.py" line="114"/>
+ <location filename="openlp/core/lib/formattingtags.py" line="115"/>
<source>Pink</source>
<translation>Pienk</translation>
</message>
<message>
- <location filename="openlp/core/lib/formattingtags.py" line="119"/>
+ <location filename="openlp/core/lib/formattingtags.py" line="120"/>
<source>Orange</source>
<translation>Oranje</translation>
</message>
<message>
- <location filename="openlp/core/lib/formattingtags.py" line="124"/>
+ <location filename="openlp/core/lib/formattingtags.py" line="125"/>
<source>Purple</source>
<translation>Pers</translation>
</message>
<message>
- <location filename="openlp/core/lib/formattingtags.py" line="129"/>
+ <location filename="openlp/core/lib/formattingtags.py" line="130"/>
<source>White</source>
<translation>Wit</translation>
</message>
<message>
- <location filename="openlp/core/lib/formattingtags.py" line="134"/>
+ <location filename="openlp/core/lib/formattingtags.py" line="135"/>
<source>Superscript</source>
<translation>Bo-skrif</translation>
</message>
<message>
- <location filename="openlp/core/lib/formattingtags.py" line="139"/>
+ <location filename="openlp/core/lib/formattingtags.py" line="140"/>
<source>Subscript</source>
<translation>Onder-skrif</translation>
</message>
<message>
- <location filename="openlp/core/lib/formattingtags.py" line="144"/>
+ <location filename="openlp/core/lib/formattingtags.py" line="145"/>
<source>Paragraph</source>
<translation>Paragraaf</translation>
</message>
<message>
- <location filename="openlp/core/lib/formattingtags.py" line="149"/>
+ <location filename="openlp/core/lib/formattingtags.py" line="150"/>
<source>Bold</source>
<translation>Vetdruk</translation>
</message>
<message>
- <location filename="openlp/core/lib/formattingtags.py" line="153"/>
+ <location filename="openlp/core/lib/formattingtags.py" line="154"/>
<source>Italics</source>
<translation>Italiaans</translation>
</message>
<message>
- <location filename="openlp/core/lib/formattingtags.py" line="157"/>
+ <location filename="openlp/core/lib/formattingtags.py" line="158"/>
<source>Underline</source>
<translation>Onderlyn</translation>
</message>
<message>
- <location filename="openlp/core/lib/formattingtags.py" line="163"/>
+ <location filename="openlp/core/lib/formattingtags.py" line="164"/>
<source>Break</source>
<translation>Breek</translation>
</message>
@@ -3230,7 +3230,7 @@
<context>
<name>OpenLP.MainDisplay</name>
<message>
- <location filename="openlp/core/ui/maindisplay.py" line="200"/>
+ <location filename="openlp/core/ui/maindisplay.py" line="203"/>
<source>OpenLP Display</source>
<translation>OpenLP Vertooning</translation>
</message>
@@ -3542,7 +3542,7 @@
<translation>Die Hoof Skerm is afgeskakel</translation>
</message>
<message>
- <location filename="openlp/core/ui/mainwindow.py" line="1277"/>
+ <location filename="openlp/core/ui/mainwindow.py" line="1283"/>
<source>Default Theme: %s</source>
<translation>Verstek Tema: %s</translation>
</message>
@@ -3558,12 +3558,12 @@
<translation>Konfigureer Kor&tpaaie...</translation>
</message>
<message>
- <location filename="openlp/core/ui/mainwindow.py" line="1185"/>
+ <location filename="openlp/core/ui/mainwindow.py" line="1191"/>
<source>Close OpenLP</source>
<translation>Mook OpenLP toe</translation>
</message>
<message>
- <location filename="openlp/core/ui/mainwindow.py" line="1185"/>
+ <location filename="openlp/core/ui/mainwindow.py" line="1191"/>
<source>Are you sure you want to close OpenLP?</source>
<translation>Maak OpenLP sekerlik toe?</translation>
</message>
@@ -3637,13 +3637,13 @@
Her-gebruik van hierdie gids mag veranderinge aan die huidige OpenLP konfigurasie aanbring en kan moontlik liedere byvoeg by die bestaande liedere lys en kan ook die verstek tema verander.</translation>
</message>
<message>
- <location filename="openlp/core/ui/mainwindow.py" line="1438"/>
+ <location filename="openlp/core/ui/mainwindow.py" line="1444"/>
<source>Clear List</source>
<comment>Clear List of recent files</comment>
<translation>Maak Lys Skoon</translation>
</message>
<message>
- <location filename="openlp/core/ui/mainwindow.py" line="1438"/>
+ <location filename="openlp/core/ui/mainwindow.py" line="1444"/>
<source>Clear the list of recent files.</source>
<translation>Maak die lys van onlangse lêers skoon.</translation>
</message>
@@ -3696,32 +3696,32 @@
<translation>OpenLP Uitvoer Verstelling Lêers (*.conf)</translation>
</message>
<message>
- <location filename="openlp/core/ui/mainwindow.py" line="1025"/>
+ <location filename="openlp/core/ui/mainwindow.py" line="1031"/>
<source>Import settings</source>
<translation>Voer verstellings in</translation>
</message>
<message>
- <location filename="openlp/core/ui/mainwindow.py" line="1025"/>
+ <location filename="openlp/core/ui/mainwindow.py" line="1031"/>
<source>OpenLP will now close. Imported settings will be applied the next time you start OpenLP.</source>
<translation>OpenLP sal nou toe maak. Ingevoerde verstellings sal toegepas word die volgende keer as OpenLP begin word.</translation>
</message>
<message>
- <location filename="openlp/core/ui/mainwindow.py" line="1040"/>
+ <location filename="openlp/core/ui/mainwindow.py" line="1046"/>
<source>Export Settings File</source>
<translation>Voer Verstellings Lêer Uit</translation>
</message>
<message>
- <location filename="openlp/core/ui/mainwindow.py" line="1040"/>
+ <location filename="openlp/core/ui/mainwindow.py" line="1046"/>
<source>OpenLP Export Settings File (*.conf)</source>
<translation>OpenLP Uitvoer Verstellings Lêer (*.conf)</translation>
</message>
<message>
- <location filename="openlp/core/ui/mainwindow.py" line="1531"/>
+ <location filename="openlp/core/ui/mainwindow.py" line="1537"/>
<source>New Data Directory Error</source>
<translation>Nuwe Data Lêer Fout</translation>
</message>
<message>
- <location filename="openlp/core/ui/mainwindow.py" line="999"/>
+ <location filename="openlp/core/ui/mainwindow.py" line="990"/>
<source>The file you selected does appear to be a valid OpenLP settings file.
Section [%s] is not valid
@@ -3734,12 +3734,12 @@
Verwerking is getermineer en verandering was gemaak nie.</translation>
</message>
<message>
- <location filename="openlp/core/ui/mainwindow.py" line="1521"/>
+ <location filename="openlp/core/ui/mainwindow.py" line="1527"/>
<source>Copying OpenLP data to new data directory location - %s - Please wait for copy to finish</source>
<translation>OpenLP data word na 'n nuwe data gids - %s - gekopiër. Wag asseblief totdat dit voltooi is.</translation>
</message>
<message>
- <location filename="openlp/core/ui/mainwindow.py" line="1531"/>
+ <location filename="openlp/core/ui/mainwindow.py" line="1537"/>
<source>OpenLP Data directory copy failed
%s</source>
@@ -3787,63 +3787,63 @@
<translation>&Voeg by die geselekteerde Diens item</translation>
</message>
<message>
- <location filename="openlp/core/lib/mediamanageritem.py" line="491"/>
+ <location filename="openlp/core/lib/mediamanageritem.py" line="492"/>
<source>You must select one or more items to preview.</source>
<translation>Kies een of meer items vir die voorskou.</translation>
</message>
<message>
- <location filename="openlp/core/lib/mediamanageritem.py" line="509"/>
+ <location filename="openlp/core/lib/mediamanageritem.py" line="510"/>
<source>You must select one or more items to send live.</source>
<translation>Kies een of meer items vir regstreekse uitsending.</translation>
</message>
<message>
- <location filename="openlp/core/lib/mediamanageritem.py" line="562"/>
+ <location filename="openlp/core/lib/mediamanageritem.py" line="563"/>
<source>You must select one or more items.</source>
<translation>Kies een of meer items.</translation>
</message>
<message>
- <location filename="openlp/core/lib/mediamanageritem.py" line="569"/>
+ <location filename="openlp/core/lib/mediamanageritem.py" line="570"/>
<source>You must select an existing service item to add to.</source>
<translation>'n Bestaande diens item moet geselekteer word om by by te voeg.</translation>
</message>
<message>
- <location filename="openlp/core/lib/mediamanageritem.py" line="578"/>
+ <location filename="openlp/core/lib/mediamanageritem.py" line="579"/>
<source>Invalid Service Item</source>
<translation>Ongeldige Diens Item</translation>
</message>
<message>
- <location filename="openlp/core/lib/mediamanageritem.py" line="578"/>
+ <location filename="openlp/core/lib/mediamanageritem.py" line="579"/>
<source>You must select a %s service item.</source>
<translation>Kies 'n %s diens item.</translation>
</message>
<message>
- <location filename="openlp/core/lib/mediamanageritem.py" line="536"/>
+ <location filename="openlp/core/lib/mediamanageritem.py" line="537"/>
<source>You must select one or more items to add.</source>
<translation>Kies een of meer items om by te voeg.</translation>
</message>
<message>
- <location filename="openlp/core/lib/mediamanageritem.py" line="608"/>
+ <location filename="openlp/core/lib/mediamanageritem.py" line="609"/>
<source>No Search Results</source>
<translation>Geen Soek Resultate</translation>
</message>
<message>
- <location filename="openlp/core/lib/mediamanageritem.py" line="364"/>
+ <location filename="openlp/core/lib/mediamanageritem.py" line="365"/>
<source>Invalid File Type</source>
<translation>Ongeldige Lêer Tipe</translation>
</message>
<message>
- <location filename="openlp/core/lib/mediamanageritem.py" line="364"/>
+ <location filename="openlp/core/lib/mediamanageritem.py" line="365"/>
<source>Invalid File %s.
Suffix not supported</source>
<translation>Ongeldige Lêer %s. Agtervoegsel nie ondersteun nie</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/lib/mediaitem.py" line="166"/>
+ <location filename="openlp/plugins/songs/lib/mediaitem.py" line="129"/>
<source>&Clone</source>
<translation>&Kloon</translation>
</message>
<message>
- <location filename="openlp/core/lib/mediamanageritem.py" line="407"/>
+ <location filename="openlp/core/lib/mediamanageritem.py" line="408"/>
<source>Duplicate files were found on import and were ignored.</source>
<translation>Duplikaat lêers gevind tydens invoer en is geïgnoreer.</translation>
</message>
@@ -3851,12 +3851,12 @@
<context>
<name>OpenLP.OpenLyricsImportError</name>
<message>
- <location filename="openlp/plugins/songs/lib/xml.py" line="733"/>
+ <location filename="openlp/plugins/songs/lib/xml.py" line="761"/>
<source><lyrics> tag is missing.</source>
<translation><lyrics> etiket is vermis.</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/lib/xml.py" line="740"/>
+ <location filename="openlp/plugins/songs/lib/xml.py" line="768"/>
<source><verse> tag is missing.</source>
<translation><verse> etiket is vermis.</translation>
</message>
@@ -4011,12 +4011,12 @@
<context>
<name>OpenLP.ServiceItem</name>
<message>
- <location filename="openlp/core/lib/serviceitem.py" line="484"/>
+ <location filename="openlp/core/lib/serviceitem.py" line="490"/>
<source><strong>Start</strong>: %s</source>
<translation><strong>Begin</strong>: %s</translation>
</message>
<message>
- <location filename="openlp/core/lib/serviceitem.py" line="488"/>
+ <location filename="openlp/core/lib/serviceitem.py" line="494"/>
<source><strong>Length</strong>: %s</source>
<translation><strong>Durasie</strong>: %s</translation>
</message>
@@ -4032,184 +4032,184 @@
<context>
<name>OpenLP.ServiceManager</name>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="183"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="184"/>
<source>Move to &top</source>
<translation>Skuif boon&toe</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="183"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="184"/>
<source>Move item to the top of the service.</source>
<translation>Skuif item tot heel bo in die diens.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="189"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="190"/>
<source>Move &up</source>
<translation>Sk&uif op</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="189"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="190"/>
<source>Move item up one position in the service.</source>
<translation>Skuif item een posisie boontoe in die diens.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="210"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="211"/>
<source>Move &down</source>
<translation>Skuif &af</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="196"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="197"/>
<source>Move item down one position in the service.</source>
<translation>Skuif item een posisie af in die diens.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="203"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="204"/>
<source>Move to &bottom</source>
<translation>Skuif &tot heel onder</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="203"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="204"/>
<source>Move item to the end of the service.</source>
<translation>Skuif item tot aan die einde van die diens.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="223"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="224"/>
<source>&Delete From Service</source>
<translation>Wis uit vanaf die &Diens</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="223"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="224"/>
<source>Delete the selected item from the service.</source>
<translation>Wis geselekteerde item van die diens af.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="288"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="289"/>
<source>&Add New Item</source>
<translation>&Voeg Nuwe Item By</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="291"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="292"/>
<source>&Add to Selected Item</source>
<translation>&Voeg by Geselekteerde Item</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="296"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="297"/>
<source>&Edit Item</source>
<translation>R&edigeer Item</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="299"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="300"/>
<source>&Reorder Item</source>
<translation>Ve&rander Item orde</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="303"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="304"/>
<source>&Notes</source>
<translation>&Notas</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="319"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="320"/>
<source>&Change Item Theme</source>
<translation>&Verander Item Tema</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="635"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="636"/>
<source>OpenLP Service Files (*.osz)</source>
<translation>OpenLP Diens Lêers (*.osz)</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="664"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="665"/>
<source>File is not a valid service.
The content encoding is not UTF-8.</source>
<translation>Lêer is nie 'n geldige diens nie.
Die inhoud enkodering is nie UTF-8 nie.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="706"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="710"/>
<source>File is not a valid service.</source>
<translation>Lêer is nie 'n geldige diens nie.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="1313"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="1317"/>
<source>Missing Display Handler</source>
<translation>Vermisde Vertoon Hanteerder</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="1261"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="1265"/>
<source>Your item cannot be displayed as there is no handler to display it</source>
<translation>Die item kan nie vertoon word nie omdat daar nie 'n hanteerder is om dit te vertoon nie</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="1313"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="1317"/>
<source>Your item cannot be displayed as the plugin required to display it is missing or inactive</source>
<translation>Die item kan nie vertoon word nie omdat die mini-program wat dit moet vertoon vermis of onaktief is</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="232"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="233"/>
<source>&Expand all</source>
<translation>Br&ei alles uit</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="232"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="233"/>
<source>Expand all the service items.</source>
<translation>Brei al die diens items uit.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="238"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="239"/>
<source>&Collapse all</source>
<translation>Sto&rt alles ineen</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="238"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="239"/>
<source>Collapse all the service items.</source>
<translation>Stort al die diens items ineen.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="421"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="422"/>
<source>Open File</source>
<translation>Maak Lêer oop</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="210"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="211"/>
<source>Moves the selection down the window.</source>
<translation>Skuif die geselekteerde afwaarts in die venster.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="216"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="217"/>
<source>Move up</source>
<translation>Skuif op</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="216"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="217"/>
<source>Moves the selection up the window.</source>
<translation>Skuif die geselekteerde opwaarts in die venster.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="246"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="247"/>
<source>Go Live</source>
<translation>Gaan Regstreeks</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="246"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="247"/>
<source>Send the selected item to Live.</source>
<translation>Stuur die geselekteerde item Regstreeks.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="307"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="308"/>
<source>&Start Time</source>
<translation>&Begin Tyd</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="313"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="314"/>
<source>Show &Preview</source>
<translation>Wys &Voorskou</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="438"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="439"/>
<source>Modified Service</source>
<translation>Redigeer Diens</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="438"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="439"/>
<source>The current service has been modified. Would you like to save this service?</source>
<translation>Die huidige diens was verander. Stoor hierdie diens?</translation>
</message>
@@ -4229,87 +4229,87 @@
<translation>Speel tyd:</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="343"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="344"/>
<source>Untitled Service</source>
<translation>Ongetitelde Diens</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="712"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="716"/>
<source>File could not be opened because it is corrupt.</source>
<translation>Lêer kon nie oopgemaak word nie omdat dit korrup is.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="718"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="722"/>
<source>Empty File</source>
<translation>Leë Lêer</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="718"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="722"/>
<source>This service file does not contain any data.</source>
<translation>Die diens lêer het geen data inhoud nie.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="725"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="729"/>
<source>Corrupt File</source>
<translation>Korrupte Lêer</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="132"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="133"/>
<source>Load an existing service.</source>
<translation>Laai 'n bestaande diens.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="136"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="137"/>
<source>Save this service.</source>
<translation>Stoor die diens.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="146"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="147"/>
<source>Select a theme for the service.</source>
<translation>Kies 'n tema vir die diens.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="725"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="729"/>
<source>This file is either corrupt or it is not an OpenLP 2.0 service file.</source>
<translation>Die lêer is óf korrup óf is nie 'n OpenLP 2.0 diens lêer nie.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="1066"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="1070"/>
<source>Slide theme</source>
<translation>Skyfie tema</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="1070"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="1074"/>
<source>Notes</source>
<translation>Notas</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="1061"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="1065"/>
<source>Edit</source>
<translation>Redigeer</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="1061"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="1065"/>
<source>Service copy only</source>
<translation>Slegs diens kopie.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="577"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="578"/>
<source>Error Saving File</source>
<translation>Fout gedurende Lêer Stooring</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="577"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="578"/>
<source>There was an error saving your file.</source>
<translation>Daar was 'n probleem om die lêer te stoor.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="507"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="508"/>
<source>Service File(s) Missing</source>
<translation>Diens Lêer(s) Vermis</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="509"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="510"/>
<source>The following file(s) in the service are missing:
<byte value="x9"/>%s
@@ -4323,7 +4323,7 @@
<context>
<name>OpenLP.ServiceNoteForm</name>
<message>
- <location filename="openlp/core/ui/servicenoteform.py" line="65"/>
+ <location filename="openlp/core/ui/servicenoteform.py" line="66"/>
<source>Service Item Notes</source>
<translation>Diens Item Notas</translation>
</message>
@@ -4407,27 +4407,27 @@
<context>
<name>OpenLP.SlideController</name>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="202"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="201"/>
<source>Hide</source>
<translation>Verskuil</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="281"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="280"/>
<source>Go To</source>
<translation>Gaan Na</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="205"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="204"/>
<source>Blank Screen</source>
<translation>Blanko Skerm</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="210"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="209"/>
<source>Blank to Theme</source>
<translation>Blanko na Tema</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="215"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="214"/>
<source>Show Desktop</source>
<translation>Wys Werkskerm</translation>
</message>
@@ -4447,37 +4447,37 @@
<translation>Ontsnap Item</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="178"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="177"/>
<source>Move to previous.</source>
<translation>Skuif terug.</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="187"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="186"/>
<source>Move to next.</source>
<translation>Skuif volgende.</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="231"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="230"/>
<source>Play Slides</source>
<translation>Speel Skyfies</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="255"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="254"/>
<source>Delay between slides in seconds.</source>
<translation>Vertraging tussen skyfies in sekondes.</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="259"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="258"/>
<source>Move to live.</source>
<translation>Skuif na regstreeks.</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="263"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="262"/>
<source>Add to Service.</source>
<translation>Voeg by Diens.</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="268"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="267"/>
<source>Edit and reload song preview.</source>
<translation>Redigeer en herlaai lied voorskou.</translation>
</message>
@@ -4487,7 +4487,7 @@
<translation>Begin media speel.</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="285"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="284"/>
<source>Pause audio.</source>
<translation>Stop oudio.</translation>
</message>
@@ -4547,32 +4547,32 @@
<translation>Gaan na "Ander"</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="178"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="177"/>
<source>Previous Slide</source>
<translation>Vorige Skyfie</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="187"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="186"/>
<source>Next Slide</source>
<translation>Volgende Skyfie</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="285"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="284"/>
<source>Pause Audio</source>
<translation>Hou Oudio</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="292"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="291"/>
<source>Background Audio</source>
<translation>Agtergrond Oudio</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="298"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="297"/>
<source>Go to next audio track.</source>
<translation>Gaan na die volgende oudio snit.</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="305"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="304"/>
<source>Tracks</source>
<translation>Snitte</translation>
</message>
@@ -5075,7 +5075,7 @@
<translation>Tema naam:</translation>
</message>
<message>
- <location filename="openlp/core/ui/themeform.py" line="329"/>
+ <location filename="openlp/core/ui/themeform.py" line="331"/>
<source>Edit Theme - %s</source>
<translation>Redigeer Tema - %s</translation>
</message>
@@ -5135,42 +5135,42 @@
<translation>Skou die tema en stoor dit.</translation>
</message>
<message>
- <location filename="openlp/core/ui/themeform.py" line="209"/>
+ <location filename="openlp/core/ui/themeform.py" line="211"/>
<source>(approximately %d lines per slide)</source>
<translation>(ongeveer %d lyne per skyfie)</translation>
</message>
<message>
- <location filename="openlp/core/ui/themeform.py" line="237"/>
+ <location filename="openlp/core/ui/themeform.py" line="239"/>
<source>Background Image Empty</source>
<translation>Leë Agtergrond Beeld</translation>
</message>
<message>
- <location filename="openlp/core/ui/themeform.py" line="237"/>
+ <location filename="openlp/core/ui/themeform.py" line="239"/>
<source>You have not selected a background image. Please select one before continuing.</source>
<translation>'n Agtergrond beeld is nie gekies nie. Kies asseblief een voor jy aangaan.</translation>
</message>
<message>
- <location filename="openlp/core/ui/themeform.py" line="541"/>
+ <location filename="openlp/core/ui/themeform.py" line="543"/>
<source>Select Image</source>
<translation>Selekteer Beeld</translation>
</message>
<message>
- <location filename="openlp/core/ui/themeform.py" line="623"/>
+ <location filename="openlp/core/ui/themeform.py" line="631"/>
<source>Theme Name Missing</source>
<translation>Tema Naam Vermis</translation>
</message>
<message>
- <location filename="openlp/core/ui/themeform.py" line="623"/>
+ <location filename="openlp/core/ui/themeform.py" line="631"/>
<source>There is no name for this theme. Please enter one.</source>
<translation>Daar is geen naam vir hierdie tema nie. Voer asseblief een in.</translation>
</message>
<message>
- <location filename="openlp/core/ui/themeform.py" line="629"/>
+ <location filename="openlp/core/ui/themeform.py" line="637"/>
<source>Theme Name Invalid</source>
<translation>Tema Naam Ongeldig</translation>
</message>
<message>
- <location filename="openlp/core/ui/themeform.py" line="629"/>
+ <location filename="openlp/core/ui/themeform.py" line="637"/>
<source>Invalid theme name. Please enter one.</source>
<translation>Ongeldige tema naam. Voer asseblief een in.</translation>
</message>
@@ -5296,185 +5296,185 @@
<translation>Uitvoer</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="80"/>
+ <location filename="openlp/core/lib/ui.py" line="84"/>
<source>pt</source>
<comment>Abbreviated font pointsize unit</comment>
<translation>pt</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="89"/>
+ <location filename="openlp/core/lib/ui.py" line="93"/>
<source>Image</source>
<translation>Beeld</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="90"/>
+ <location filename="openlp/core/lib/ui.py" line="94"/>
<source>Import</source>
<translation>Voer in</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="92"/>
+ <location filename="openlp/core/lib/ui.py" line="96"/>
<source>Live</source>
<translation>Regstreeks</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="93"/>
+ <location filename="openlp/core/lib/ui.py" line="97"/>
<source>Live Background Error</source>
<translation>Regstreekse Agtergrond Fout</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="95"/>
+ <location filename="openlp/core/lib/ui.py" line="99"/>
<source>Load</source>
<translation>Laai</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="98"/>
+ <location filename="openlp/core/lib/ui.py" line="102"/>
<source>Middle</source>
<translation>Middel</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="99"/>
+ <location filename="openlp/core/lib/ui.py" line="103"/>
<source>New</source>
<translation>Nuwe</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="100"/>
+ <location filename="openlp/core/lib/ui.py" line="104"/>
<source>New Service</source>
<translation>Nuwe Diens</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="101"/>
+ <location filename="openlp/core/lib/ui.py" line="105"/>
<source>New Theme</source>
<translation>Nuwe Tema</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="104"/>
+ <location filename="openlp/core/lib/ui.py" line="108"/>
<source>No File Selected</source>
<comment>Singular</comment>
<translation>Geen Lêer Geselekteer nie</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="105"/>
+ <location filename="openlp/core/lib/ui.py" line="109"/>
<source>No Files Selected</source>
<comment>Plural</comment>
<translation>Geen Leêrs Geselekteer nie</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="106"/>
+ <location filename="openlp/core/lib/ui.py" line="110"/>
<source>No Item Selected</source>
<comment>Singular</comment>
<translation>Geen Item Geselekteer nie</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="107"/>
+ <location filename="openlp/core/lib/ui.py" line="111"/>
<source>No Items Selected</source>
<comment>Plural</comment>
<translation>Geen items geselekteer nie</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="108"/>
+ <location filename="openlp/core/lib/ui.py" line="112"/>
<source>openlp.org 1.x</source>
<translation>openlp.org 1.x</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="109"/>
+ <location filename="openlp/core/lib/ui.py" line="113"/>
<source>OpenLP 2.0</source>
<translation>OpenLP 2.0</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="115"/>
+ <location filename="openlp/core/lib/ui.py" line="119"/>
<source>Preview</source>
<translation>Voorskou</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="117"/>
+ <location filename="openlp/core/lib/ui.py" line="121"/>
<source>Replace Background</source>
<translation>Vervang Agtergrond</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="119"/>
+ <location filename="openlp/core/lib/ui.py" line="123"/>
<source>Reset Background</source>
<translation>Herstel Agtergrond</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="121"/>
+ <location filename="openlp/core/lib/ui.py" line="125"/>
<source>s</source>
<comment>The abbreviated unit for seconds</comment>
<translation>s</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="123"/>
+ <location filename="openlp/core/lib/ui.py" line="127"/>
<source>Save && Preview</source>
<translation>Stoor && Voorskou</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="124"/>
+ <location filename="openlp/core/lib/ui.py" line="128"/>
<source>Search</source>
<translation>Soek</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="127"/>
+ <location filename="openlp/core/lib/ui.py" line="131"/>
<source>You must select an item to delete.</source>
<translation>Kies 'n item om uit te wis.</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="129"/>
+ <location filename="openlp/core/lib/ui.py" line="133"/>
<source>You must select an item to edit.</source>
<translation>Selekteer 'n item om te regideer.</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="132"/>
+ <location filename="openlp/core/lib/ui.py" line="136"/>
<source>Save Service</source>
<translation>Stoor Diens</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="133"/>
- <source>Service</source>
- <translation>Diens</translation>
- </message>
- <message>
<location filename="openlp/core/lib/ui.py" line="137"/>
+ <source>Service</source>
+ <translation>Diens</translation>
+ </message>
+ <message>
+ <location filename="openlp/core/lib/ui.py" line="141"/>
<source>Start %s</source>
<translation>Begin %s</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="142"/>
+ <location filename="openlp/core/lib/ui.py" line="146"/>
<source>Theme</source>
<comment>Singular</comment>
<translation>Tema</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="143"/>
+ <location filename="openlp/core/lib/ui.py" line="147"/>
<source>Themes</source>
<comment>Plural</comment>
<translation>Temas</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="145"/>
+ <location filename="openlp/core/lib/ui.py" line="149"/>
<source>Top</source>
<translation>Bo</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="149"/>
+ <location filename="openlp/core/lib/ui.py" line="153"/>
<source>Version</source>
<translation>Weergawe</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="305"/>
+ <location filename="openlp/core/lib/ui.py" line="309"/>
<source>Delete the selected item.</source>
<translation>Wis die geselekteerde item uit.</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="309"/>
+ <location filename="openlp/core/lib/ui.py" line="313"/>
<source>Move selection up one position.</source>
<translation>Skuif die seleksie een posisie op.</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="313"/>
+ <location filename="openlp/core/lib/ui.py" line="317"/>
<source>Move selection down one position.</source>
<translation>Skuif die seleksie een posisie af.</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="466"/>
+ <location filename="openlp/core/lib/ui.py" line="470"/>
<source>&Vertical Align:</source>
<translation>&Vertikale Sporing:</translation>
</message>
@@ -5627,64 +5627,64 @@
<translation>Lêer</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="82"/>
+ <location filename="openlp/core/lib/ui.py" line="86"/>
<source>Help</source>
<translation>Hulp</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="83"/>
+ <location filename="openlp/core/lib/ui.py" line="87"/>
<source>h</source>
<comment>The abbreviated unit for hours</comment>
<translation>h</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="91"/>
+ <location filename="openlp/core/lib/ui.py" line="95"/>
<source>Layout style:</source>
<translation>Uitleg styl:</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="94"/>
+ <location filename="openlp/core/lib/ui.py" line="98"/>
<source>Live Toolbar</source>
<translation>Regstreekse Gereedskapsbalk</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="96"/>
+ <location filename="openlp/core/lib/ui.py" line="100"/>
<source>m</source>
<comment>The abbreviated unit for minutes</comment>
<translation>m</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="110"/>
+ <location filename="openlp/core/lib/ui.py" line="114"/>
<source>OpenLP is already running. Do you wish to continue?</source>
<translation>OpenLP is reeds ana die gang. Gaan voort?</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="131"/>
+ <location filename="openlp/core/lib/ui.py" line="135"/>
<source>Settings</source>
<translation>Verstellings</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="144"/>
+ <location filename="openlp/core/lib/ui.py" line="148"/>
<source>Tools</source>
<translation>Gereedskap</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="146"/>
+ <location filename="openlp/core/lib/ui.py" line="150"/>
<source>Unsupported File</source>
<translation>Lêer nie Ondersteun nie</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="147"/>
+ <location filename="openlp/core/lib/ui.py" line="151"/>
<source>Verse Per Slide</source>
<translation>Vers Per Skyfie</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="148"/>
+ <location filename="openlp/core/lib/ui.py" line="152"/>
<source>Verse Per Line</source>
<translation>Vers Per Lyn</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="150"/>
+ <location filename="openlp/core/lib/ui.py" line="154"/>
<source>View</source>
<translation>Vertoon</translation>
</message>
@@ -5699,32 +5699,32 @@
<translation>XML sintaks fout</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="151"/>
+ <location filename="openlp/core/lib/ui.py" line="155"/>
<source>View Mode</source>
<translation>Vertoon Modus</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="112"/>
+ <location filename="openlp/core/lib/ui.py" line="116"/>
<source>Open service.</source>
<translation>Maak 'n diens oop.</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="116"/>
+ <location filename="openlp/core/lib/ui.py" line="120"/>
<source>Print Service</source>
<translation>Druk Diens uit</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="118"/>
+ <location filename="openlp/core/lib/ui.py" line="122"/>
<source>Replace live background.</source>
<translation>Vervang regstreekse agtergrond.</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="120"/>
+ <location filename="openlp/core/lib/ui.py" line="124"/>
<source>Reset live background.</source>
<translation>Herstel regstreekse agtergrond.</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="135"/>
+ <location filename="openlp/core/lib/ui.py" line="139"/>
<source>Split a slide into two only if it does not fit on the screen as one slide.</source>
<translation>Verdeel 'n skyfie slegs in twee wanneer dit nie op die skerm as 'n enkele skyfie sal pas nie.</translation>
</message>
@@ -5739,61 +5739,61 @@
<translation>Bevesting Uitwissing</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="113"/>
+ <location filename="openlp/core/lib/ui.py" line="117"/>
<source>Play Slides in Loop</source>
<translation>Speel Skyfies in Herhaling</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="114"/>
+ <location filename="openlp/core/lib/ui.py" line="118"/>
<source>Play Slides to End</source>
<translation>Speel Skyfies tot Einde</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="138"/>
+ <location filename="openlp/core/lib/ui.py" line="142"/>
<source>Stop Play Slides in Loop</source>
<translation>Staak Skyfies in Herhaling</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="140"/>
+ <location filename="openlp/core/lib/ui.py" line="144"/>
<source>Stop Play Slides to End</source>
<translation>Staak Skyfies tot Einde</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="102"/>
+ <location filename="openlp/core/lib/ui.py" line="106"/>
<source>Next Track</source>
<translation>Volgende Snit</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="125"/>
+ <location filename="openlp/core/lib/ui.py" line="129"/>
<source>Search Themes...</source>
<comment>Search bar place holder text </comment>
<translation>Soek Temas...</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="134"/>
+ <location filename="openlp/core/lib/ui.py" line="138"/>
<source>Optional &Split</source>
<translation>Op&sionele Verdeling</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="85"/>
+ <location filename="openlp/core/lib/ui.py" line="89"/>
<source>Invalid Folder Selected</source>
<comment>Singular</comment>
<translation>Ongeldige Gids Geselekteer</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="87"/>
+ <location filename="openlp/core/lib/ui.py" line="91"/>
<source>Invalid File Selected</source>
<comment>Singular</comment>
<translation>Ongeldige Lêer Geselekteer</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="88"/>
+ <location filename="openlp/core/lib/ui.py" line="92"/>
<source>Invalid Files Selected</source>
<comment>Plural</comment>
<translation>Ongeldige Lêer Geselekteer</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="103"/>
+ <location filename="openlp/core/lib/ui.py" line="107"/>
<source>No Folder Selected</source>
<comment>Singular</comment>
<translation>Geen Gids Geselekteer nie</translation>
@@ -5820,29 +5820,40 @@
<source>Importing Songs</source>
<translation>Voer Liedere In</translation>
</message>
+ <message>
+ <location filename="openlp/core/lib/ui.py" line="80"/>
+ <source>File Not Found</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="openlp/core/lib/ui.py" line="82"/>
+ <source>File %s not found.
+Please try selecting it individually.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>OpenLP.core.lib</name>
<message>
- <location filename="openlp/core/lib/__init__.py" line="370"/>
+ <location filename="openlp/core/lib/__init__.py" line="374"/>
<source>%1 and %2</source>
<comment>Locale list separator: 2 items</comment>
<translation>%1 en %2</translation>
</message>
<message>
- <location filename="openlp/core/lib/__init__.py" line="373"/>
+ <location filename="openlp/core/lib/__init__.py" line="377"/>
<source>%1, and %2</source>
<comment>Locale list separator: end</comment>
<translation>%1, en %2</translation>
</message>
<message>
- <location filename="openlp/core/lib/__init__.py" line="376"/>
+ <location filename="openlp/core/lib/__init__.py" line="380"/>
<source>%1, %2</source>
<comment>Locale list separator: middle</comment>
<translation>%1, %2</translation>
</message>
<message>
- <location filename="openlp/core/lib/__init__.py" line="378"/>
+ <location filename="openlp/core/lib/__init__.py" line="382"/>
<source>%1, %2</source>
<comment>Locale list separator: start</comment>
<translation>%1, %2</translation>
@@ -5902,52 +5913,52 @@
<context>
<name>PresentationPlugin.MediaItem</name>
<message>
- <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="75"/>
+ <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="76"/>
<source>Select Presentation(s)</source>
<translation>Selekteer Aanbieding(e)</translation>
</message>
<message>
- <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="77"/>
+ <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="78"/>
<source>Automatic</source>
<translation>Outomaties</translation>
</message>
<message>
- <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="79"/>
+ <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="80"/>
<source>Present using:</source>
<translation>Bied aan met:</translation>
</message>
<message>
- <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="194"/>
+ <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="195"/>
<source>File Exists</source>
<translation>Lêer Bestaan Reeds</translation>
</message>
<message>
- <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="194"/>
+ <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="195"/>
<source>A presentation with that filename already exists.</source>
<translation>'n Aanbieding met daardie lêernaam bestaan reeds.</translation>
</message>
<message>
- <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="223"/>
+ <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="224"/>
<source>This type of presentation is not supported.</source>
<translation>Hierdie tipe aanbieding word nie ondersteun nie.</translation>
</message>
<message>
- <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="95"/>
+ <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="96"/>
<source>Presentations (%s)</source>
<translation>Aanbiedinge (%s)</translation>
</message>
<message>
- <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="317"/>
+ <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="318"/>
<source>Missing Presentation</source>
<translation>Vermisde Aanbieding</translation>
</message>
<message>
- <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="306"/>
+ <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="307"/>
<source>The presentation %s is incomplete, please reload.</source>
<translation>Die aanbieding %s is onvolledig, herlaai asseblief.</translation>
</message>
<message>
- <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="317"/>
+ <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="318"/>
<source>The presentation %s no longer exists.</source>
<translation>Die aanbieding %s bestaan nie meer nie.</translation>
</message>
@@ -6565,12 +6576,12 @@
<context>
<name>SongsPlugin.EasyWorshipSongImport</name>
<message>
- <location filename="openlp/plugins/songs/lib/ewimport.py" line="168"/>
+ <location filename="openlp/plugins/songs/lib/ewimport.py" line="176"/>
<source>Administered by %s</source>
<translation>Toegedien deur %s</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/lib/ewimport.py" line="220"/>
+ <location filename="openlp/plugins/songs/lib/ewimport.py" line="231"/>
<source>
[above are Song Tags with notes imported from
EasyWorship]</source>
@@ -6595,205 +6606,210 @@
<context>
<name>SongsPlugin.EditSongForm</name>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="295"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="294"/>
<source>Song Editor</source>
<translation>Lied Redigeerder</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="297"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="296"/>
<source>&Title:</source>
<translation>&Titel:</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="299"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="298"/>
<source>Alt&ernate title:</source>
<translation>Alt&ernatiewe titel:</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="301"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="300"/>
<source>&Lyrics:</source>
<translation>&Lirieke:</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="303"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="302"/>
<source>&Verse order:</source>
<translation>&Vers orde:</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="307"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="306"/>
<source>Ed&it All</source>
<translation>Red&igeer Alles</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="310"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="309"/>
<source>Title && Lyrics</source>
<translation>Titel && Lirieke</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="314"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="313"/>
<source>&Add to Song</source>
<translation>&Voeg by Lied</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="354"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="353"/>
<source>&Remove</source>
<translation>Ve&rwyder</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="318"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="317"/>
<source>&Manage Authors, Topics, Song Books</source>
<translation>&Bestuur Skrywers, Onderwerpe en Lied Boeke</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="321"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="320"/>
<source>A&dd to Song</source>
<translation>Voeg by Lie&d</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="323"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="322"/>
<source>R&emove</source>
<translation>V&erwyder</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="326"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="325"/>
<source>Book:</source>
<translation>Boek:</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="328"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="327"/>
<source>Number:</source>
<translation>Nommer:</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="330"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="329"/>
<source>Authors, Topics && Song Book</source>
<translation>Skrywers, Onderwerpe && Lied Boek</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="335"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="334"/>
<source>New &Theme</source>
<translation>Nuwe &Tema</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="337"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="336"/>
<source>Copyright Information</source>
<translation>Kopiereg Informasie</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="341"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="340"/>
<source>Comments</source>
<translation>Kommentaar</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="343"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="342"/>
<source>Theme, Copyright Info && Comments</source>
<translation>Tema, Kopiereg Informasie && Kommentaar</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongform.py" line="357"/>
+ <location filename="openlp/plugins/songs/forms/editsongform.py" line="384"/>
<source>Add Author</source>
<translation>Voeg Skrywer By</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongform.py" line="357"/>
+ <location filename="openlp/plugins/songs/forms/editsongform.py" line="384"/>
<source>This author does not exist, do you want to add them?</source>
<translation>Hierdie skrywer bestaan nie, moet die skrywer bygevoeg word?</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongform.py" line="380"/>
+ <location filename="openlp/plugins/songs/forms/editsongform.py" line="407"/>
<source>This author is already in the list.</source>
<translation>Hierdie skrywer is alreeds in die lys.</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongform.py" line="387"/>
+ <location filename="openlp/plugins/songs/forms/editsongform.py" line="414"/>
<source>You have not selected a valid author. Either select an author from the list, or type in a new author and click the "Add Author to Song" button to add the new author.</source>
<translation>Die geselekteerde skrywer is ongeldig. Kies 'n skrywer vanaf die lys of voer 'n nuwe skrywer in en kliek op die "Voeg Skrywer by Lied" knoppie om die skrywer by te voeg.</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongform.py" line="415"/>
+ <location filename="openlp/plugins/songs/forms/editsongform.py" line="442"/>
<source>Add Topic</source>
<translation>Voeg Onderwerp by</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongform.py" line="415"/>
+ <location filename="openlp/plugins/songs/forms/editsongform.py" line="442"/>
<source>This topic does not exist, do you want to add it?</source>
<translation>Die onderwerp bestaan nie. Voeg dit by?</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongform.py" line="436"/>
+ <location filename="openlp/plugins/songs/forms/editsongform.py" line="463"/>
<source>This topic is already in the list.</source>
<translation>Die onderwerp is reeds in die lys.</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongform.py" line="446"/>
+ <location filename="openlp/plugins/songs/forms/editsongform.py" line="473"/>
<source>You have not selected a valid topic. Either select a topic from the list, or type in a new topic and click the "Add Topic to Song" button to add the new topic.</source>
<translation>Geselekteerde onderwerp is ongeldig. Kies 'n onderwerp vanaf die lys of voer 'n nuwe onderwerp in en kliek die "Voeg Onderwerp by Lied" knoppie om die onderwerp by te voeg.</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongform.py" line="656"/>
+ <location filename="openlp/plugins/songs/forms/editsongform.py" line="688"/>
<source>You need to type in a song title.</source>
<translation>Tik 'n lied titel in.</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongform.py" line="663"/>
+ <location filename="openlp/plugins/songs/forms/editsongform.py" line="695"/>
<source>You need to type in at least one verse.</source>
<translation>Ten minste een vers moet ingevoer word.</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongform.py" line="639"/>
+ <location filename="openlp/plugins/songs/forms/editsongform.py" line="671"/>
<source>The verse order is invalid. There is no verse corresponding to %s. Valid entries are %s.</source>
<translation>Die vers orde is ongeldig. Daar is geen vers wat ooreenstem met %s nie. Geldige opsies is %s.</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongform.py" line="681"/>
+ <location filename="openlp/plugins/songs/forms/editsongform.py" line="713"/>
<source>Add Book</source>
<translation>Voeg Boek by</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongform.py" line="681"/>
+ <location filename="openlp/plugins/songs/forms/editsongform.py" line="713"/>
<source>This song book does not exist, do you want to add it?</source>
<translation>Die lied boek bestaan nie. Voeg dit by?</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongform.py" line="670"/>
+ <location filename="openlp/plugins/songs/forms/editsongform.py" line="702"/>
<source>You need to have an author for this song.</source>
<translation>Daar word 'n outeur benodig vir hierdie lied.</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="347"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="346"/>
<source>Linked Audio</source>
<translation>Geskakelde Oudio</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="350"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="349"/>
<source>Add &File(s)</source>
<translation>&Voeg Leêr(s) By</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="352"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="351"/>
<source>Add &Media</source>
<translation>Voeg &Media By</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="356"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="355"/>
<source>Remove &All</source>
<translation>Verwyder &Alles</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongform.py" line="733"/>
+ <location filename="openlp/plugins/songs/forms/editsongform.py" line="765"/>
<source>Open File(s)</source>
<translation>Maak Lêer(s) Oop</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="358"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="357"/>
<source><strong>Warning:</strong> Not all of the verses are in use.</source>
<translation><strong>Waarskuwing:</strong> Nie al die verse is in gebruik nie.</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongform.py" line="634"/>
+ <location filename="openlp/plugins/songs/forms/editsongform.py" line="666"/>
<source>The verse order is invalid. There are no verses corresponding to %s. Valid entries are %s.</source>
<translation>Die vers orde is ongeldig. Daar is geen verse wat ooreenstem met %s nie. Geldige inskrywings is %s.</translation>
</message>
+ <message>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="359"/>
+ <source><strong>Warning:</strong> You have not entered a verse order.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>SongsPlugin.EditVerseForm</name>
@@ -6876,7 +6892,7 @@
<translation>Geen Stoor Ligging gespesifiseer nie</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/songexportform.py" line="278"/>
+ <location filename="openlp/plugins/songs/forms/songexportform.py" line="277"/>
<source>Starting export...</source>
<translation>Uitvoer begin...</translation>
</message>
@@ -6886,7 +6902,7 @@
<translation>'n Lêer gids moet gespesifiseer word.</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/songexportform.py" line="369"/>
+ <location filename="openlp/plugins/songs/forms/songexportform.py" line="368"/>
<source>Select Destination Folder</source>
<translation>Kies Bestemming Lêer gids</translation>
</message>
@@ -6902,6 +6918,14 @@
</message>
</context>
<context>
+ <name>SongsPlugin.FoilPresenterSongImport</name>
+ <message>
+ <location filename="openlp/plugins/songs/lib/foilpresenterimport.py" line="432"/>
+ <source>Invalid Foilpresenter song file. No verses found.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>SongsPlugin.ImportWizardForm</name>
<message>
<location filename="openlp/plugins/songs/lib/importer.py" line="216"/>
@@ -7090,27 +7114,27 @@
<context>
<name>SongsPlugin.MediaItem</name>
<message>
- <location filename="openlp/plugins/songs/lib/mediaitem.py" line="192"/>
+ <location filename="openlp/plugins/songs/lib/mediaitem.py" line="155"/>
<source>Titles</source>
<translation>Titels</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/lib/mediaitem.py" line="192"/>
+ <location filename="openlp/plugins/songs/lib/mediaitem.py" line="155"/>
<source>Lyrics</source>
<translation>Lirieke</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/lib/mediaitem.py" line="557"/>
+ <location filename="openlp/plugins/songs/lib/mediaitem.py" line="520"/>
<source>CCLI License: </source>
<translation>CCLI Lisensie:</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/lib/mediaitem.py" line="192"/>
+ <location filename="openlp/plugins/songs/lib/mediaitem.py" line="155"/>
<source>Entire Song</source>
<translation>Volledige Lied</translation>
</message>
<message numerus="yes">
- <location filename="openlp/plugins/songs/lib/mediaitem.py" line="439"/>
+ <location filename="openlp/plugins/songs/lib/mediaitem.py" line="402"/>
<source>Are you sure you want to delete the %n selected song(s)?</source>
<translation>
<numerusform>Wis regtig die %n geselekteerde lied uit?</numerusform>
@@ -7118,38 +7142,38 @@
</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/lib/mediaitem.py" line="188"/>
+ <location filename="openlp/plugins/songs/lib/mediaitem.py" line="151"/>
<source>Maintain the lists of authors, topics and books.</source>
<translation>Onderhou die lys van skrywers, onderwerpe en boeke.</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/lib/mediaitem.py" line="484"/>
+ <location filename="openlp/plugins/songs/lib/mediaitem.py" line="447"/>
<source>copy</source>
<comment>For song cloning</comment>
<translation>kopieër</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/lib/mediaitem.py" line="192"/>
+ <location filename="openlp/plugins/songs/lib/mediaitem.py" line="155"/>
<source>Search Titles...</source>
<translation>Soek Titels...</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/lib/mediaitem.py" line="192"/>
+ <location filename="openlp/plugins/songs/lib/mediaitem.py" line="155"/>
<source>Search Entire Song...</source>
<translation>Soek deur hele Lied...</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/lib/mediaitem.py" line="192"/>
+ <location filename="openlp/plugins/songs/lib/mediaitem.py" line="155"/>
<source>Search Lyrics...</source>
<translation>Soek Lirieke...</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/lib/mediaitem.py" line="192"/>
+ <location filename="openlp/plugins/songs/lib/mediaitem.py" line="155"/>
<source>Search Authors...</source>
<translation>Soek Outeure...</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/lib/mediaitem.py" line="192"/>
+ <location filename="openlp/plugins/songs/lib/mediaitem.py" line="155"/>
<source>Search Song Books...</source>
<translation>Soek Lied Boeke...</translation>
</message>
@@ -7245,12 +7269,12 @@
<context>
<name>SongsPlugin.SongExportForm</name>
<message>
- <location filename="openlp/plugins/songs/forms/songexportform.py" line="299"/>
+ <location filename="openlp/plugins/songs/forms/songexportform.py" line="298"/>
<source>Your song export failed.</source>
<translation>Die lied uitvoer het misluk.</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/songexportform.py" line="294"/>
+ <location filename="openlp/plugins/songs/forms/songexportform.py" line="293"/>
<source>Finished export. To import these files use the <strong>OpenLyrics</strong> importer.</source>
<translation>Uitvoer voltooi. Om hierdie lêers in te voer, gebruik die <strong>OpenLyrics</strong> invoerder.</translation>
</message>
=== modified file 'resources/i18n/cs.ts'
--- resources/i18n/cs.ts 2012-11-24 21:19:46 +0000
+++ resources/i18n/cs.ts 2013-09-14 11:12:23 +0000
@@ -175,12 +175,12 @@
<translation>Bible</translation>
</message>
<message>
- <location filename="openlp/plugins/bibles/lib/http.py" line="600"/>
+ <location filename="openlp/plugins/bibles/lib/http.py" line="604"/>
<source>No Book Found</source>
<translation>Kniha nenalezena</translation>
</message>
<message>
- <location filename="openlp/plugins/bibles/lib/http.py" line="600"/>
+ <location filename="openlp/plugins/bibles/lib/http.py" line="604"/>
<source>No matching book could be found in this Bible. Check that you have spelled the name of the book correctly.</source>
<translation>V Bibli nebyla nalezena odpovídající kniha. Prověřte, že název knihy byl zadán správně.</translation>
</message>
@@ -1044,38 +1044,38 @@
<context>
<name>BiblesPlugin.HTTPBible</name>
<message>
- <location filename="openlp/plugins/bibles/lib/http.py" line="514"/>
+ <location filename="openlp/plugins/bibles/lib/http.py" line="518"/>
<source>Registering Bible and loading books...</source>
<translation>Registruji Bibli a stahuji knihy...</translation>
</message>
<message>
- <location filename="openlp/plugins/bibles/lib/http.py" line="539"/>
+ <location filename="openlp/plugins/bibles/lib/http.py" line="543"/>
<source>Registering Language...</source>
<translation>Registruji jazyk...</translation>
</message>
<message>
- <location filename="openlp/plugins/bibles/lib/http.py" line="555"/>
+ <location filename="openlp/plugins/bibles/lib/http.py" line="559"/>
<source>Importing %s...</source>
<comment>Importing <book name>...</comment>
<translation>Importuji %s...</translation>
</message>
<message>
- <location filename="openlp/plugins/bibles/lib/http.py" line="722"/>
+ <location filename="openlp/plugins/bibles/lib/http.py" line="726"/>
<source>Download Error</source>
<translation>Chyba stahování</translation>
</message>
<message>
- <location filename="openlp/plugins/bibles/lib/http.py" line="722"/>
+ <location filename="openlp/plugins/bibles/lib/http.py" line="726"/>
<source>There was a problem downloading your verse selection. Please check your Internet connection, and if this error continues to occur please consider reporting a bug.</source>
<translation>Při stahování výběru veršů se vyskytl problém. Prosím prověřte své internetové připojení. Pokud se tato chyba stále objevuje, zvašte prosím nahlášení chyby.</translation>
</message>
<message>
- <location filename="openlp/plugins/bibles/lib/http.py" line="729"/>
+ <location filename="openlp/plugins/bibles/lib/http.py" line="733"/>
<source>Parse Error</source>
<translation>Chyba zpracování</translation>
</message>
<message>
- <location filename="openlp/plugins/bibles/lib/http.py" line="729"/>
+ <location filename="openlp/plugins/bibles/lib/http.py" line="733"/>
<source>There was a problem extracting your verse selection. If this error continues to occur please consider reporting a bug.</source>
<translation>Při rozbalování výběru veršů se vyskytl problém. Pokud se tato chyba stále objevuje, zvašte prosím nahlášení chyby.</translation>
</message>
@@ -1397,7 +1397,7 @@
<translation>Zjištuji kódování (může trvat několik minut)...</translation>
</message>
<message>
- <location filename="openlp/plugins/bibles/lib/osis.py" line="162"/>
+ <location filename="openlp/plugins/bibles/lib/osis.py" line="174"/>
<source>Importing %s %s...</source>
<comment>Importing <book name> <chapter>...</comment>
<translation>Importuji %s %s...</translation>
@@ -1991,7 +1991,7 @@
<context>
<name>OpenLP</name>
<message>
- <location filename="openlp/core/utils/__init__.py" line="362"/>
+ <location filename="openlp/core/utils/__init__.py" line="363"/>
<source>Image Files</source>
<translation>Soubory s obrázky</translation>
</message>
@@ -2038,13 +2038,6 @@
<translation>Tato aplikace je šířena v naději, že bude užitečná, avšak BEZ JAKÉKOLI ZÁRUKY; neposkytují se ani odvozené záruky PRODEJNOSTI anebo VHODNOSTI PRO URČITÝ ÚČEL. Další podrobnosti viz níže.</translation>
</message>
<message>
- <location filename="openlp/core/ui/aboutdialog.py" line="250"/>
- <source>Copyright © 2004-2012 %s
-Portions copyright © 2004-2012 %s</source>
- <translation>Autorská práva © 2004-2012 %s
-Částečná autorská práva © 2004-2012 %s</translation>
- </message>
- <message>
<location filename="openlp/core/ui/aboutdialog.py" line="86"/>
<source>OpenLP <version><revision> - Open Source Lyrics Projection
@@ -2211,6 +2204,13 @@
Přinášíme tuto aplikaci zdarma, protože
On nás učinil svobodnými.</translation>
</message>
+ <message>
+ <location filename="openlp/core/ui/aboutdialog.py" line="250"/>
+ <source>Copyright © 2004-2013 %s
+Portions copyright © 2004-2013 %s</source>
+ <translation>Autorská práva © 2004-2013 %s
+Částečná autorská práva © 2004-2013 %s</translation>
+ </message>
</context>
<context>
<name>OpenLP.AdvancedTab</name>
@@ -2270,7 +2270,7 @@
<translation>Soubor s obrázkem:</translation>
</message>
<message>
- <location filename="openlp/core/ui/advancedtab.py" line="664"/>
+ <location filename="openlp/core/ui/advancedtab.py" line="667"/>
<source>Open File</source>
<translation>Otevřít soubor</translation>
</message>
@@ -2300,7 +2300,7 @@
<translation>Vrátit na výchozí OpenLP logo.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="622"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="623"/>
<source>Service %Y-%m-%d %H-%M</source>
<comment>This may not contain any of the following characters: /\?*|<>[]":+
See http://docs.python.org/library/datetime.html#strftime-strptime-behavior for more information.</comment>
@@ -2397,7 +2397,7 @@
<translation>Obejít správce oken X11</translation>
</message>
<message>
- <location filename="openlp/core/ui/advancedtab.py" line="635"/>
+ <location filename="openlp/core/ui/advancedtab.py" line="638"/>
<source>Syntax error.</source>
<translation>Chyba syntaxe.</translation>
</message>
@@ -2452,27 +2452,27 @@
<translation><strong>VAROVÁNÍ:</strong> Nové umístnění datové složky už obsahuje datové soubory OpenLP. Tyto soubory BUDOU nahrazeny během kopírování.</translation>
</message>
<message>
- <location filename="openlp/core/ui/advancedtab.py" line="525"/>
+ <location filename="openlp/core/ui/advancedtab.py" line="528"/>
<source>Data Directory Error</source>
<translation>Chyba datové složky</translation>
</message>
<message>
- <location filename="openlp/core/ui/advancedtab.py" line="677"/>
+ <location filename="openlp/core/ui/advancedtab.py" line="680"/>
<source>Select Data Directory Location</source>
<translation>Vybrat umístění datové složky</translation>
</message>
<message>
- <location filename="openlp/core/ui/advancedtab.py" line="690"/>
+ <location filename="openlp/core/ui/advancedtab.py" line="693"/>
<source>Confirm Data Directory Change</source>
<translation>Potvrdit změnu datové složky</translation>
</message>
<message>
- <location filename="openlp/core/ui/advancedtab.py" line="717"/>
+ <location filename="openlp/core/ui/advancedtab.py" line="720"/>
<source>Reset Data Directory</source>
<translation>Obnovit datovou složku</translation>
</message>
<message>
- <location filename="openlp/core/ui/advancedtab.py" line="717"/>
+ <location filename="openlp/core/ui/advancedtab.py" line="720"/>
<source>Are you sure you want to change the location of the OpenLP data directory to the default location?
This location will be used after OpenLP is closed.</source>
@@ -2481,12 +2481,12 @@
Toto umístění se použije po zavření aplikace OpenLP.</translation>
</message>
<message>
- <location filename="openlp/core/ui/advancedtab.py" line="753"/>
+ <location filename="openlp/core/ui/advancedtab.py" line="756"/>
<source>Overwrite Existing Data</source>
<translation>Přepsat existující data</translation>
</message>
<message>
- <location filename="openlp/core/ui/advancedtab.py" line="525"/>
+ <location filename="openlp/core/ui/advancedtab.py" line="528"/>
<source>OpenLP data directory was not found
%s
@@ -2507,7 +2507,7 @@
Klepněte na "Ano", aby se datová složka nastavila na výchozí umístění.</translation>
</message>
<message>
- <location filename="openlp/core/ui/advancedtab.py" line="690"/>
+ <location filename="openlp/core/ui/advancedtab.py" line="693"/>
<source>Are you sure you want to change the location of the OpenLP data directory to:
%s
@@ -2520,7 +2520,7 @@
Toto umístění se použije po zavření aplikace OpenLP.</translation>
</message>
<message>
- <location filename="openlp/core/ui/advancedtab.py" line="753"/>
+ <location filename="openlp/core/ui/advancedtab.py" line="756"/>
<source>WARNING:
The location you have selected
@@ -2699,199 +2699,199 @@
<context>
<name>OpenLP.FirstTimeWizard</name>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="212"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="216"/>
<source>Songs</source>
<translation>Písně</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="199"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="203"/>
<source>First Time Wizard</source>
<translation>Průvodce prvním spuštění</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="201"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="205"/>
<source>Welcome to the First Time Wizard</source>
<translation>Vítejte v průvodci prvním spuštění</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="208"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="212"/>
<source>Activate required Plugins</source>
<translation>Zapnout požadované moduly</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="210"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="214"/>
<source>Select the Plugins you wish to use. </source>
<translation>Vyberte moduly, které chcete používat.</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="215"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="219"/>
<source>Bible</source>
<translation>Bible</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="216"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="220"/>
<source>Images</source>
<translation>Obrázky</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="221"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="225"/>
<source>Presentations</source>
<translation>Prezentace</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="223"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="227"/>
<source>Media (Audio and Video)</source>
<translation>Média (audio a video)</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="225"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="229"/>
<source>Allow remote access</source>
<translation>Povolit vzdálený přístup</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="227"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="231"/>
<source>Monitor Song Usage</source>
<translation>Sledovat užívání písní</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="229"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="233"/>
<source>Allow Alerts</source>
<translation>Povolit upozornění</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="259"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="263"/>
<source>Default Settings</source>
<translation>Výchozí nastavení</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimeform.py" line="97"/>
+ <location filename="openlp/core/ui/firsttimeform.py" line="116"/>
<source>Downloading %s...</source>
<translation>Stahuji %s...</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimeform.py" line="409"/>
+ <location filename="openlp/core/ui/firsttimeform.py" line="447"/>
<source>Download complete. Click the finish button to start OpenLP.</source>
<translation>Stahování dokončeno. Klepnutím na tlačítko konec se spustí aplikace OpenLP.</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimeform.py" line="430"/>
+ <location filename="openlp/core/ui/firsttimeform.py" line="468"/>
<source>Enabling selected plugins...</source>
<translation>Zapínám vybrané moduly...</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="231"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="235"/>
<source>No Internet Connection</source>
<translation>Žádné připojení k Internetu</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="233"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="237"/>
<source>Unable to detect an Internet connection.</source>
<translation>Nezdařila se detekce internetového připojení.</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="247"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="251"/>
<source>Sample Songs</source>
<translation>Ukázky písní</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="249"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="253"/>
<source>Select and download public domain songs.</source>
<translation>Vybrat a stáhnout písně s nechráněnými autorskými právy.</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="251"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="255"/>
<source>Sample Bibles</source>
<translation>Ukázky Biblí</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="253"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="257"/>
<source>Select and download free Bibles.</source>
<translation>Vybrat a stáhnout volně dostupné Bible.</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="255"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="259"/>
<source>Sample Themes</source>
<translation>Ukázky motivů</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="257"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="261"/>
<source>Select and download sample themes.</source>
<translation>Vybrat a stáhnout ukázky motivů.</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="261"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="265"/>
<source>Set up default settings to be used by OpenLP.</source>
<translation>Nastavit výchozí nastavení pro aplikaci OpenLP.</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="263"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="267"/>
<source>Default output display:</source>
<translation>Výchozí výstup zobrazit na:</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="265"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="269"/>
<source>Select default theme:</source>
<translation>Vybrat výchozí motiv:</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="267"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="271"/>
<source>Starting configuration process...</source>
<translation>Spouštím průběh nastavení...</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="205"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="209"/>
<source>This wizard will help you to configure OpenLP for initial use. Click the next button below to start.</source>
<translation>Tento průvodce pomáhá nastavit OpenLP pro první použití. Pro start klepněte níže na tlačítko další.</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimeform.py" line="383"/>
+ <location filename="openlp/core/ui/firsttimeform.py" line="421"/>
<source>Setting Up And Downloading</source>
<translation>Nastavuji a stahuji</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimeform.py" line="385"/>
+ <location filename="openlp/core/ui/firsttimeform.py" line="423"/>
<source>Please wait while OpenLP is set up and your data is downloaded.</source>
<translation>Čekejte prosím, než bude aplikace OpenLP nastavena a data stáhnuta.</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimeform.py" line="390"/>
+ <location filename="openlp/core/ui/firsttimeform.py" line="428"/>
<source>Setting Up</source>
<translation>Nastavuji</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimeform.py" line="417"/>
+ <location filename="openlp/core/ui/firsttimeform.py" line="455"/>
<source>Click the finish button to start OpenLP.</source>
<translation>Klepnutím na tlačítko konec se spustí aplikace OpenLP.</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimeform.py" line="405"/>
+ <location filename="openlp/core/ui/firsttimeform.py" line="443"/>
<source>Download complete. Click the finish button to return to OpenLP.</source>
<translation>Stahování dokončeno. Klepnutím na tlačítko konec dojde k návratu do aplikace OpenLP.</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimeform.py" line="414"/>
+ <location filename="openlp/core/ui/firsttimeform.py" line="452"/>
<source>Click the finish button to return to OpenLP.</source>
<translation>Klepnutím na tlačítko konec dojde k návratu do aplikace OpenLP.</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="213"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="217"/>
<source>Custom Slides</source>
<translation>Uživatelské snímky</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="269"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="273"/>
<source>Finish</source>
<translation>Konec</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="236"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="240"/>
<source>No Internet connection was found. The First Time Wizard needs an Internet connection in order to be able to download sample songs, Bibles and themes. Click the Finish button now to start OpenLP with initial settings and no sample data.
To re-run the First Time Wizard and import this sample data at a later time, check your Internet connection and re-run this wizard by selecting "Tools/Re-run First Time Wizard" from OpenLP.</source>
<translation>Internetové připojení není dostupné. Průvodce prvním spuštění potřebuje internetové připojení pro stažení ukázek písní, Biblí a motivů. Klepněte na tlačiko Konec pro spuštění aplikace OpenLP ve výchozím nastavení a bez ukázkových dat.</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="244"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="248"/>
<source>
To cancel the First Time Wizard completely (and not start OpenLP), click the Cancel button now.</source>
@@ -2939,32 +2939,32 @@
<context>
<name>OpenLP.FormattingTagForm</name>
<message>
- <location filename="openlp/core/ui/formattingtagform.py" line="167"/>
+ <location filename="openlp/core/ui/formattingtagform.py" line="168"/>
<source>Update Error</source>
<translation>Chyba aktualizace</translation>
</message>
<message>
- <location filename="openlp/core/ui/formattingtagform.py" line="119"/>
+ <location filename="openlp/core/ui/formattingtagform.py" line="120"/>
<source>Tag "n" already defined.</source>
<translation>Značka "n" je už definovaná.</translation>
</message>
<message>
- <location filename="openlp/core/ui/formattingtagform.py" line="126"/>
+ <location filename="openlp/core/ui/formattingtagform.py" line="127"/>
<source>New Tag</source>
<translation>Nová značka</translation>
</message>
<message>
- <location filename="openlp/core/ui/formattingtagform.py" line="128"/>
+ <location filename="openlp/core/ui/formattingtagform.py" line="129"/>
<source><HTML here></source>
<translation><HTML zde></translation>
</message>
<message>
- <location filename="openlp/core/ui/formattingtagform.py" line="130"/>
+ <location filename="openlp/core/ui/formattingtagform.py" line="131"/>
<source></and here></source>
<translation></and zde></translation>
</message>
<message>
- <location filename="openlp/core/ui/formattingtagform.py" line="167"/>
+ <location filename="openlp/core/ui/formattingtagform.py" line="168"/>
<source>Tag %s already defined.</source>
<translation>Značka %s je už definovaná.</translation>
</message>
@@ -2972,82 +2972,82 @@
<context>
<name>OpenLP.FormattingTags</name>
<message>
- <location filename="openlp/core/lib/formattingtags.py" line="89"/>
+ <location filename="openlp/core/lib/formattingtags.py" line="90"/>
<source>Red</source>
<translation>Červená</translation>
</message>
<message>
- <location filename="openlp/core/lib/formattingtags.py" line="94"/>
+ <location filename="openlp/core/lib/formattingtags.py" line="95"/>
<source>Black</source>
<translation>Černá</translation>
</message>
<message>
- <location filename="openlp/core/lib/formattingtags.py" line="99"/>
+ <location filename="openlp/core/lib/formattingtags.py" line="100"/>
<source>Blue</source>
<translation>Modrá</translation>
</message>
<message>
- <location filename="openlp/core/lib/formattingtags.py" line="104"/>
+ <location filename="openlp/core/lib/formattingtags.py" line="105"/>
<source>Yellow</source>
<translation>Žlutá</translation>
</message>
<message>
- <location filename="openlp/core/lib/formattingtags.py" line="109"/>
+ <location filename="openlp/core/lib/formattingtags.py" line="110"/>
<source>Green</source>
<translation>Zelená</translation>
</message>
<message>
- <location filename="openlp/core/lib/formattingtags.py" line="114"/>
+ <location filename="openlp/core/lib/formattingtags.py" line="115"/>
<source>Pink</source>
<translation>Růžová</translation>
</message>
<message>
- <location filename="openlp/core/lib/formattingtags.py" line="119"/>
+ <location filename="openlp/core/lib/formattingtags.py" line="120"/>
<source>Orange</source>
<translation>Oranžová</translation>
</message>
<message>
- <location filename="openlp/core/lib/formattingtags.py" line="124"/>
+ <location filename="openlp/core/lib/formattingtags.py" line="125"/>
<source>Purple</source>
<translation>Fialová</translation>
</message>
<message>
- <location filename="openlp/core/lib/formattingtags.py" line="129"/>
+ <location filename="openlp/core/lib/formattingtags.py" line="130"/>
<source>White</source>
<translation>Bílá</translation>
</message>
<message>
- <location filename="openlp/core/lib/formattingtags.py" line="134"/>
+ <location filename="openlp/core/lib/formattingtags.py" line="135"/>
<source>Superscript</source>
<translation>Horní index</translation>
</message>
<message>
- <location filename="openlp/core/lib/formattingtags.py" line="139"/>
+ <location filename="openlp/core/lib/formattingtags.py" line="140"/>
<source>Subscript</source>
<translation>Dolní index</translation>
</message>
<message>
- <location filename="openlp/core/lib/formattingtags.py" line="144"/>
+ <location filename="openlp/core/lib/formattingtags.py" line="145"/>
<source>Paragraph</source>
<translation>Odstavec</translation>
</message>
<message>
- <location filename="openlp/core/lib/formattingtags.py" line="149"/>
+ <location filename="openlp/core/lib/formattingtags.py" line="150"/>
<source>Bold</source>
<translation>Tučné</translation>
</message>
<message>
- <location filename="openlp/core/lib/formattingtags.py" line="153"/>
+ <location filename="openlp/core/lib/formattingtags.py" line="154"/>
<source>Italics</source>
<translation>Kurzíva</translation>
</message>
<message>
- <location filename="openlp/core/lib/formattingtags.py" line="157"/>
+ <location filename="openlp/core/lib/formattingtags.py" line="158"/>
<source>Underline</source>
<translation>Podtržené</translation>
</message>
<message>
- <location filename="openlp/core/lib/formattingtags.py" line="163"/>
+ <location filename="openlp/core/lib/formattingtags.py" line="164"/>
<source>Break</source>
<translation>Zalomení</translation>
</message>
@@ -3226,7 +3226,7 @@
<context>
<name>OpenLP.MainDisplay</name>
<message>
- <location filename="openlp/core/ui/maindisplay.py" line="200"/>
+ <location filename="openlp/core/ui/maindisplay.py" line="203"/>
<source>OpenLP Display</source>
<translation>Zobrazení OpenLP</translation>
</message>
@@ -3538,7 +3538,7 @@
<translation>Hlavní zobrazení nastaveno na prázdný snímek</translation>
</message>
<message>
- <location filename="openlp/core/ui/mainwindow.py" line="1277"/>
+ <location filename="openlp/core/ui/mainwindow.py" line="1283"/>
<source>Default Theme: %s</source>
<translation>Výchozí motiv: %s</translation>
</message>
@@ -3554,12 +3554,12 @@
<translation>Nastavuji &zkratky...</translation>
</message>
<message>
- <location filename="openlp/core/ui/mainwindow.py" line="1185"/>
+ <location filename="openlp/core/ui/mainwindow.py" line="1191"/>
<source>Close OpenLP</source>
<translation>Zavřít OpenLP</translation>
</message>
<message>
- <location filename="openlp/core/ui/mainwindow.py" line="1185"/>
+ <location filename="openlp/core/ui/mainwindow.py" line="1191"/>
<source>Are you sure you want to close OpenLP?</source>
<translation>Chcete opravdu zavřít aplikaci OpenLP?</translation>
</message>
@@ -3633,13 +3633,13 @@
Znovu spuštěním tohoto průvodce může dojít ke změně současného nastavení aplikace OpenLP a pravděpodobně budou přidány písně k existujícímu seznamu a změněn výchozí motiv. </translation>
</message>
<message>
- <location filename="openlp/core/ui/mainwindow.py" line="1438"/>
+ <location filename="openlp/core/ui/mainwindow.py" line="1444"/>
<source>Clear List</source>
<comment>Clear List of recent files</comment>
<translation>Vyprázdnit seznam</translation>
</message>
<message>
- <location filename="openlp/core/ui/mainwindow.py" line="1438"/>
+ <location filename="openlp/core/ui/mainwindow.py" line="1444"/>
<source>Clear the list of recent files.</source>
<translation>Vyprázdnit seznam nedávných souborů.</translation>
</message>
@@ -3692,32 +3692,32 @@
<translation>Soubory exportovaného nastavení OpenLP (*.conf)</translation>
</message>
<message>
- <location filename="openlp/core/ui/mainwindow.py" line="1025"/>
+ <location filename="openlp/core/ui/mainwindow.py" line="1031"/>
<source>Import settings</source>
<translation>Import nastavení</translation>
</message>
<message>
- <location filename="openlp/core/ui/mainwindow.py" line="1025"/>
+ <location filename="openlp/core/ui/mainwindow.py" line="1031"/>
<source>OpenLP will now close. Imported settings will be applied the next time you start OpenLP.</source>
<translation>Aplikace OpenLP se nyní zavře. Importovaná nastavení se použijí při příštim spuštění.</translation>
</message>
<message>
- <location filename="openlp/core/ui/mainwindow.py" line="1040"/>
+ <location filename="openlp/core/ui/mainwindow.py" line="1046"/>
<source>Export Settings File</source>
<translation>Soubor exportovaného nastavení</translation>
</message>
<message>
- <location filename="openlp/core/ui/mainwindow.py" line="1040"/>
+ <location filename="openlp/core/ui/mainwindow.py" line="1046"/>
<source>OpenLP Export Settings File (*.conf)</source>
<translation>Soubor exportovaného nastavení OpenLP (*.conf)</translation>
</message>
<message>
- <location filename="openlp/core/ui/mainwindow.py" line="1531"/>
+ <location filename="openlp/core/ui/mainwindow.py" line="1537"/>
<source>New Data Directory Error</source>
<translation>Chyba nové datové složky</translation>
</message>
<message>
- <location filename="openlp/core/ui/mainwindow.py" line="999"/>
+ <location filename="openlp/core/ui/mainwindow.py" line="990"/>
<source>The file you selected does appear to be a valid OpenLP settings file.
Section [%s] is not valid
@@ -3730,12 +3730,12 @@
Zpracování bylo přerušeno a žádná změna se neprovedla.</translation>
</message>
<message>
- <location filename="openlp/core/ui/mainwindow.py" line="1521"/>
+ <location filename="openlp/core/ui/mainwindow.py" line="1527"/>
<source>Copying OpenLP data to new data directory location - %s - Please wait for copy to finish</source>
<translation>Kopíruji OpenLP data do nového umístění datové složky - %s - Počkejte prosím na dokončení kopírování</translation>
</message>
<message>
- <location filename="openlp/core/ui/mainwindow.py" line="1531"/>
+ <location filename="openlp/core/ui/mainwindow.py" line="1537"/>
<source>OpenLP Data directory copy failed
%s</source>
@@ -3783,64 +3783,64 @@
<translation>&Přidat k vybrané Položce Služby</translation>
</message>
<message>
- <location filename="openlp/core/lib/mediamanageritem.py" line="491"/>
+ <location filename="openlp/core/lib/mediamanageritem.py" line="492"/>
<source>You must select one or more items to preview.</source>
<translation>Pro náhled je třeba vybrat jednu nebo více položek.</translation>
</message>
<message>
- <location filename="openlp/core/lib/mediamanageritem.py" line="509"/>
+ <location filename="openlp/core/lib/mediamanageritem.py" line="510"/>
<source>You must select one or more items to send live.</source>
<translation>Pro zobrazení naživo je potřeba vybrat jednu nebo více položek.</translation>
</message>
<message>
- <location filename="openlp/core/lib/mediamanageritem.py" line="562"/>
+ <location filename="openlp/core/lib/mediamanageritem.py" line="563"/>
<source>You must select one or more items.</source>
<translation>Je třeba vybrat jednu nebo více položek.</translation>
</message>
<message>
- <location filename="openlp/core/lib/mediamanageritem.py" line="569"/>
+ <location filename="openlp/core/lib/mediamanageritem.py" line="570"/>
<source>You must select an existing service item to add to.</source>
<translation>K přidání Je třeba vybrat existující položku služby.</translation>
</message>
<message>
- <location filename="openlp/core/lib/mediamanageritem.py" line="578"/>
+ <location filename="openlp/core/lib/mediamanageritem.py" line="579"/>
<source>Invalid Service Item</source>
<translation>Neplatná Položka služby</translation>
</message>
<message>
- <location filename="openlp/core/lib/mediamanageritem.py" line="578"/>
+ <location filename="openlp/core/lib/mediamanageritem.py" line="579"/>
<source>You must select a %s service item.</source>
<translation>Je třeba vybrat %s položku služby.</translation>
</message>
<message>
- <location filename="openlp/core/lib/mediamanageritem.py" line="536"/>
+ <location filename="openlp/core/lib/mediamanageritem.py" line="537"/>
<source>You must select one or more items to add.</source>
<translation>Pro přidání Je třeba vybrat jednu nebo více položek.</translation>
</message>
<message>
- <location filename="openlp/core/lib/mediamanageritem.py" line="608"/>
+ <location filename="openlp/core/lib/mediamanageritem.py" line="609"/>
<source>No Search Results</source>
<translation>Žádné výsledky hledání</translation>
</message>
<message>
- <location filename="openlp/core/lib/mediamanageritem.py" line="364"/>
+ <location filename="openlp/core/lib/mediamanageritem.py" line="365"/>
<source>Invalid File Type</source>
<translation>Neplatný typ souboru</translation>
</message>
<message>
- <location filename="openlp/core/lib/mediamanageritem.py" line="364"/>
+ <location filename="openlp/core/lib/mediamanageritem.py" line="365"/>
<source>Invalid File %s.
Suffix not supported</source>
<translation>Neplatný soubor %s.
Přípona není podporována</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/lib/mediaitem.py" line="166"/>
+ <location filename="openlp/plugins/songs/lib/mediaitem.py" line="129"/>
<source>&Clone</source>
<translation>&Klonovat</translation>
</message>
<message>
- <location filename="openlp/core/lib/mediamanageritem.py" line="407"/>
+ <location filename="openlp/core/lib/mediamanageritem.py" line="408"/>
<source>Duplicate files were found on import and were ignored.</source>
<translation>Při importu byly nalezeny duplicitní soubory a byly ignorovány.</translation>
</message>
@@ -3848,12 +3848,12 @@
<context>
<name>OpenLP.OpenLyricsImportError</name>
<message>
- <location filename="openlp/plugins/songs/lib/xml.py" line="733"/>
+ <location filename="openlp/plugins/songs/lib/xml.py" line="761"/>
<source><lyrics> tag is missing.</source>
<translation>Chybějící značka <lyrics>.</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/lib/xml.py" line="740"/>
+ <location filename="openlp/plugins/songs/lib/xml.py" line="768"/>
<source><verse> tag is missing.</source>
<translation>Chybějící značka <verse>.</translation>
</message>
@@ -4008,12 +4008,12 @@
<context>
<name>OpenLP.ServiceItem</name>
<message>
- <location filename="openlp/core/lib/serviceitem.py" line="484"/>
+ <location filename="openlp/core/lib/serviceitem.py" line="490"/>
<source><strong>Start</strong>: %s</source>
<translation><strong>Začátek</strong>: %s</translation>
</message>
<message>
- <location filename="openlp/core/lib/serviceitem.py" line="488"/>
+ <location filename="openlp/core/lib/serviceitem.py" line="494"/>
<source><strong>Length</strong>: %s</source>
<translation><strong>Délka</strong>: %s</translation>
</message>
@@ -4029,184 +4029,184 @@
<context>
<name>OpenLP.ServiceManager</name>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="183"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="184"/>
<source>Move to &top</source>
<translation>Přesun &nahoru</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="183"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="184"/>
<source>Move item to the top of the service.</source>
<translation>Přesun položky ve službě úplně nahoru.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="189"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="190"/>
<source>Move &up</source>
<translation>Přesun &výše</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="189"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="190"/>
<source>Move item up one position in the service.</source>
<translation>Přesun položky ve službě o jednu pozici výše.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="210"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="211"/>
<source>Move &down</source>
<translation>P?esun &níže</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="196"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="197"/>
<source>Move item down one position in the service.</source>
<translation>P?esun položky ve služb? o jednu pozici níže.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="203"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="204"/>
<source>Move to &bottom</source>
<translation>Přesun &dolu</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="203"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="204"/>
<source>Move item to the end of the service.</source>
<translation>Přesun položky ve službě úplně dolů.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="223"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="224"/>
<source>&Delete From Service</source>
<translation>&Smazat ze služby</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="223"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="224"/>
<source>Delete the selected item from the service.</source>
<translation>Smazat vybranou položku ze služby.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="288"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="289"/>
<source>&Add New Item</source>
<translation>&Přidat novou položku</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="291"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="292"/>
<source>&Add to Selected Item</source>
<translation>&Přidat k vybrané položce</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="296"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="297"/>
<source>&Edit Item</source>
<translation>&Upravit položku</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="299"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="300"/>
<source>&Reorder Item</source>
<translation>&Změnit pořadí položky</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="303"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="304"/>
<source>&Notes</source>
<translation>&Poznámky</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="319"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="320"/>
<source>&Change Item Theme</source>
<translation>&Změnit motiv položky</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="635"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="636"/>
<source>OpenLP Service Files (*.osz)</source>
<translation>Soubory služby OpenLP (*.osz)</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="664"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="665"/>
<source>File is not a valid service.
The content encoding is not UTF-8.</source>
<translation>Soubor není platná služba.
Obsah souboru není v kódování UTF-8.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="706"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="710"/>
<source>File is not a valid service.</source>
<translation>Soubor není platná služba.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="1313"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="1317"/>
<source>Missing Display Handler</source>
<translation>Chybějící obsluha zobrazení</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="1261"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="1265"/>
<source>Your item cannot be displayed as there is no handler to display it</source>
<translation>Položku není možno zobrazit, protože chybí obsluha pro její zobrazení</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="1313"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="1317"/>
<source>Your item cannot be displayed as the plugin required to display it is missing or inactive</source>
<translation>Položku není možno zobrazit, protože modul potřebný pro zobrazení položky chybí nebo je neaktivní</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="232"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="233"/>
<source>&Expand all</source>
<translation>&Rozvinou vše</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="232"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="233"/>
<source>Expand all the service items.</source>
<translation>Rozvinout všechny položky služby.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="238"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="239"/>
<source>&Collapse all</source>
<translation>&Svinout vše</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="238"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="239"/>
<source>Collapse all the service items.</source>
<translation>Svinout všechny položky služby.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="421"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="422"/>
<source>Open File</source>
<translation>Otevřít soubor</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="210"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="211"/>
<source>Moves the selection down the window.</source>
<translation>Přesune výběr v rámci okna dolu.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="216"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="217"/>
<source>Move up</source>
<translation>Přesun nahoru</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="216"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="217"/>
<source>Moves the selection up the window.</source>
<translation>Přesune výběr v rámci okna nahoru.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="246"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="247"/>
<source>Go Live</source>
<translation>Zobrazit naživo</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="246"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="247"/>
<source>Send the selected item to Live.</source>
<translation>Zobrazí vybranou položku naživo.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="307"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="308"/>
<source>&Start Time</source>
<translation>&Spustit čas</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="313"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="314"/>
<source>Show &Preview</source>
<translation>Zobrazit &náhled</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="438"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="439"/>
<source>Modified Service</source>
<translation>Změněná služba</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="438"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="439"/>
<source>The current service has been modified. Would you like to save this service?</source>
<translation>Současná služba byla změněna. Přejete si službu uložit?</translation>
</message>
@@ -4226,87 +4226,87 @@
<translation>Čas přehrávání: </translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="343"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="344"/>
<source>Untitled Service</source>
<translation>Prázdná služba</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="712"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="716"/>
<source>File could not be opened because it is corrupt.</source>
<translation>Soubor se nepodařilo otevřít, protože je poškozený.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="718"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="722"/>
<source>Empty File</source>
<translation>Prázdný soubor</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="718"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="722"/>
<source>This service file does not contain any data.</source>
<translation>Tento soubor služby neobsahuje žádná data.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="725"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="729"/>
<source>Corrupt File</source>
<translation>Poškozený soubor</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="132"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="133"/>
<source>Load an existing service.</source>
<translation>Načíst existující službu.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="136"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="137"/>
<source>Save this service.</source>
<translation>Uložit tuto službu.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="146"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="147"/>
<source>Select a theme for the service.</source>
<translation>Vybrat motiv pro službu.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="725"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="729"/>
<source>This file is either corrupt or it is not an OpenLP 2.0 service file.</source>
<translation>Soubor je buďto poškozen nebo se nejedná o soubor se službou z aplikace OpenLP 2.0.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="1066"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="1070"/>
<source>Slide theme</source>
<translation>Motiv snímku</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="1070"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="1074"/>
<source>Notes</source>
<translation>Poznámky </translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="1061"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="1065"/>
<source>Edit</source>
<translation>Upravit</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="1061"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="1065"/>
<source>Service copy only</source>
<translation>Kopírovat jen službu</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="577"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="578"/>
<source>Error Saving File</source>
<translation>Chyba při ukládání souboru</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="577"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="578"/>
<source>There was an error saving your file.</source>
<translation>Vznikla chyba při ukládání souboru.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="507"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="508"/>
<source>Service File(s) Missing</source>
<translation>Chybějící soubor(y) služby</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="509"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="510"/>
<source>The following file(s) in the service are missing:
<byte value="x9"/>%s
@@ -4320,7 +4320,7 @@
<context>
<name>OpenLP.ServiceNoteForm</name>
<message>
- <location filename="openlp/core/ui/servicenoteform.py" line="65"/>
+ <location filename="openlp/core/ui/servicenoteform.py" line="66"/>
<source>Service Item Notes</source>
<translation>Poznámky položky služby</translation>
</message>
@@ -4404,27 +4404,27 @@
<context>
<name>OpenLP.SlideController</name>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="202"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="201"/>
<source>Hide</source>
<translation>Skrýt</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="281"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="280"/>
<source>Go To</source>
<translation>Přejít na</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="205"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="204"/>
<source>Blank Screen</source>
<translation>Prázdná obrazovka</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="210"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="209"/>
<source>Blank to Theme</source>
<translation>Prázdný motiv</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="215"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="214"/>
<source>Show Desktop</source>
<translation>Zobrazit plochu</translation>
</message>
@@ -4444,37 +4444,37 @@
<translation>Zrušit položku</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="178"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="177"/>
<source>Move to previous.</source>
<translation>Přesun na předchozí.</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="187"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="186"/>
<source>Move to next.</source>
<translation>Přeson na další.</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="231"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="230"/>
<source>Play Slides</source>
<translation>Přehrát snímky</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="255"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="254"/>
<source>Delay between slides in seconds.</source>
<translation>Zpoždění mezi s nímky v sekundách.</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="259"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="258"/>
<source>Move to live.</source>
<translation>Přesun naživo.</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="263"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="262"/>
<source>Add to Service.</source>
<translation>Přidat ke službě.</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="268"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="267"/>
<source>Edit and reload song preview.</source>
<translation>Upravit a znovu načíst náhled písně.</translation>
</message>
@@ -4484,7 +4484,7 @@
<translation>Spustit přehrávání média.</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="285"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="284"/>
<source>Pause audio.</source>
<translation>Pozastavit zvuk.</translation>
</message>
@@ -4544,32 +4544,32 @@
<translation>Přejít na "Ostatní"</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="178"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="177"/>
<source>Previous Slide</source>
<translation>Předchozí snímek</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="187"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="186"/>
<source>Next Slide</source>
<translation>Další snímek</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="285"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="284"/>
<source>Pause Audio</source>
<translation>Pozastavit zvuk</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="292"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="291"/>
<source>Background Audio</source>
<translation>Zvuk na pozadí</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="298"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="297"/>
<source>Go to next audio track.</source>
<translation>Přejít na další zvukovou stopu.</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="305"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="304"/>
<source>Tracks</source>
<translation>Stopy</translation>
</message>
@@ -5072,7 +5072,7 @@
<translation>Název motivu:</translation>
</message>
<message>
- <location filename="openlp/core/ui/themeform.py" line="329"/>
+ <location filename="openlp/core/ui/themeform.py" line="331"/>
<source>Edit Theme - %s</source>
<translation>Upravit motiv - %s</translation>
</message>
@@ -5132,42 +5132,42 @@
<translation>Náhled motivu a motiv uložit. </translation>
</message>
<message>
- <location filename="openlp/core/ui/themeform.py" line="209"/>
+ <location filename="openlp/core/ui/themeform.py" line="211"/>
<source>(approximately %d lines per slide)</source>
<translation>(přibližně %d řádek na snímek)</translation>
</message>
<message>
- <location filename="openlp/core/ui/themeform.py" line="237"/>
+ <location filename="openlp/core/ui/themeform.py" line="239"/>
<source>Background Image Empty</source>
<translation>Prázdný obrázek pozadí</translation>
</message>
<message>
- <location filename="openlp/core/ui/themeform.py" line="237"/>
+ <location filename="openlp/core/ui/themeform.py" line="239"/>
<source>You have not selected a background image. Please select one before continuing.</source>
<translation>Nebyl vybrán obrázek pozadí. Před pokračování prosím jeden vyberte.</translation>
</message>
<message>
- <location filename="openlp/core/ui/themeform.py" line="541"/>
+ <location filename="openlp/core/ui/themeform.py" line="543"/>
<source>Select Image</source>
<translation>Vybrat obrázek</translation>
</message>
<message>
- <location filename="openlp/core/ui/themeform.py" line="623"/>
+ <location filename="openlp/core/ui/themeform.py" line="631"/>
<source>Theme Name Missing</source>
<translation>Chybí název motivu</translation>
</message>
<message>
- <location filename="openlp/core/ui/themeform.py" line="623"/>
+ <location filename="openlp/core/ui/themeform.py" line="631"/>
<source>There is no name for this theme. Please enter one.</source>
<translation>Není vyplněn název motivu. Prosím zadejte ho.</translation>
</message>
<message>
- <location filename="openlp/core/ui/themeform.py" line="629"/>
+ <location filename="openlp/core/ui/themeform.py" line="637"/>
<source>Theme Name Invalid</source>
<translation>Neplatný název motivu</translation>
</message>
<message>
- <location filename="openlp/core/ui/themeform.py" line="629"/>
+ <location filename="openlp/core/ui/themeform.py" line="637"/>
<source>Invalid theme name. Please enter one.</source>
<translation>Neplatný název motivu. Prosím zadejte nový.</translation>
</message>
@@ -5293,185 +5293,185 @@
<translation>Export</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="80"/>
+ <location filename="openlp/core/lib/ui.py" line="84"/>
<source>pt</source>
<comment>Abbreviated font pointsize unit</comment>
<translation>pt</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="89"/>
+ <location filename="openlp/core/lib/ui.py" line="93"/>
<source>Image</source>
<translation>Obrázek</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="90"/>
+ <location filename="openlp/core/lib/ui.py" line="94"/>
<source>Import</source>
<translation>Import</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="92"/>
+ <location filename="openlp/core/lib/ui.py" line="96"/>
<source>Live</source>
<translation>Naživo</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="93"/>
+ <location filename="openlp/core/lib/ui.py" line="97"/>
<source>Live Background Error</source>
<translation>Chyba v pozadí naživo</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="95"/>
+ <location filename="openlp/core/lib/ui.py" line="99"/>
<source>Load</source>
<translation>Načíst</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="98"/>
+ <location filename="openlp/core/lib/ui.py" line="102"/>
<source>Middle</source>
<translation>Uprostřed</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="99"/>
+ <location filename="openlp/core/lib/ui.py" line="103"/>
<source>New</source>
<translation>Nový</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="100"/>
+ <location filename="openlp/core/lib/ui.py" line="104"/>
<source>New Service</source>
<translation>Nová služba</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="101"/>
+ <location filename="openlp/core/lib/ui.py" line="105"/>
<source>New Theme</source>
<translation>Nový motiv</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="104"/>
+ <location filename="openlp/core/lib/ui.py" line="108"/>
<source>No File Selected</source>
<comment>Singular</comment>
<translation>Nevybrán žádný soubor</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="105"/>
+ <location filename="openlp/core/lib/ui.py" line="109"/>
<source>No Files Selected</source>
<comment>Plural</comment>
<translation>Nevybrány žádné soubory</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="106"/>
+ <location filename="openlp/core/lib/ui.py" line="110"/>
<source>No Item Selected</source>
<comment>Singular</comment>
<translation>Nevybrána žádná položka</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="107"/>
+ <location filename="openlp/core/lib/ui.py" line="111"/>
<source>No Items Selected</source>
<comment>Plural</comment>
<translation>Nevybrány žádné položky</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="108"/>
+ <location filename="openlp/core/lib/ui.py" line="112"/>
<source>openlp.org 1.x</source>
<translation>openlp.org 1.x</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="109"/>
+ <location filename="openlp/core/lib/ui.py" line="113"/>
<source>OpenLP 2.0</source>
<translation>OpenLP 2.0</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="115"/>
+ <location filename="openlp/core/lib/ui.py" line="119"/>
<source>Preview</source>
<translation>Náhled</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="117"/>
+ <location filename="openlp/core/lib/ui.py" line="121"/>
<source>Replace Background</source>
<translation>Nahradit pozadí</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="119"/>
+ <location filename="openlp/core/lib/ui.py" line="123"/>
<source>Reset Background</source>
<translation>Obnovit pozadí</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="121"/>
+ <location filename="openlp/core/lib/ui.py" line="125"/>
<source>s</source>
<comment>The abbreviated unit for seconds</comment>
<translation>s</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="123"/>
+ <location filename="openlp/core/lib/ui.py" line="127"/>
<source>Save && Preview</source>
<translation>Uložit a náhled</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="124"/>
+ <location filename="openlp/core/lib/ui.py" line="128"/>
<source>Search</source>
<translation>Hledat</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="127"/>
+ <location filename="openlp/core/lib/ui.py" line="131"/>
<source>You must select an item to delete.</source>
<translation>Je třeba vybrat nějakou položku ke smazání.</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="129"/>
+ <location filename="openlp/core/lib/ui.py" line="133"/>
<source>You must select an item to edit.</source>
<translation>Je třeba vybrat nějakou položku k úpravám.</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="132"/>
+ <location filename="openlp/core/lib/ui.py" line="136"/>
<source>Save Service</source>
<translation>Uložit službu</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="133"/>
- <source>Service</source>
- <translation>Služba</translation>
- </message>
- <message>
<location filename="openlp/core/lib/ui.py" line="137"/>
+ <source>Service</source>
+ <translation>Služba</translation>
+ </message>
+ <message>
+ <location filename="openlp/core/lib/ui.py" line="141"/>
<source>Start %s</source>
<translation>Spustit %s</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="142"/>
+ <location filename="openlp/core/lib/ui.py" line="146"/>
<source>Theme</source>
<comment>Singular</comment>
<translation>Motiv</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="143"/>
+ <location filename="openlp/core/lib/ui.py" line="147"/>
<source>Themes</source>
<comment>Plural</comment>
<translation>Motivy</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="145"/>
+ <location filename="openlp/core/lib/ui.py" line="149"/>
<source>Top</source>
<translation>Nahoře</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="149"/>
+ <location filename="openlp/core/lib/ui.py" line="153"/>
<source>Version</source>
<translation>Verze</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="305"/>
+ <location filename="openlp/core/lib/ui.py" line="309"/>
<source>Delete the selected item.</source>
<translation>Smazat vybranou položku.</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="309"/>
+ <location filename="openlp/core/lib/ui.py" line="313"/>
<source>Move selection up one position.</source>
<translation>Přesun výběru o jednu pozici výše.</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="313"/>
+ <location filename="openlp/core/lib/ui.py" line="317"/>
<source>Move selection down one position.</source>
<translation>Přesun výběru o jednu pozici níže.</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="466"/>
+ <location filename="openlp/core/lib/ui.py" line="470"/>
<source>&Vertical Align:</source>
<translation>&Svislé zarovnání:</translation>
</message>
@@ -5624,64 +5624,64 @@
<translation>Soubor</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="82"/>
+ <location filename="openlp/core/lib/ui.py" line="86"/>
<source>Help</source>
<translation>Nápověda</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="83"/>
+ <location filename="openlp/core/lib/ui.py" line="87"/>
<source>h</source>
<comment>The abbreviated unit for hours</comment>
<translation>hod</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="91"/>
+ <location filename="openlp/core/lib/ui.py" line="95"/>
<source>Layout style:</source>
<translation>Styl rozvržení:</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="94"/>
+ <location filename="openlp/core/lib/ui.py" line="98"/>
<source>Live Toolbar</source>
<translation>Nástrojová lišta naživo</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="96"/>
+ <location filename="openlp/core/lib/ui.py" line="100"/>
<source>m</source>
<comment>The abbreviated unit for minutes</comment>
<translation>min</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="110"/>
+ <location filename="openlp/core/lib/ui.py" line="114"/>
<source>OpenLP is already running. Do you wish to continue?</source>
<translation>Aplikace OpenLP je už spuštěna. Přejete si pokračovat?</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="131"/>
+ <location filename="openlp/core/lib/ui.py" line="135"/>
<source>Settings</source>
<translation>Nastavení</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="144"/>
+ <location filename="openlp/core/lib/ui.py" line="148"/>
<source>Tools</source>
<translation>Nástroje</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="146"/>
+ <location filename="openlp/core/lib/ui.py" line="150"/>
<source>Unsupported File</source>
<translation>Nepodporovaný soubor</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="147"/>
+ <location filename="openlp/core/lib/ui.py" line="151"/>
<source>Verse Per Slide</source>
<translation>Verš na snímek</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="148"/>
+ <location filename="openlp/core/lib/ui.py" line="152"/>
<source>Verse Per Line</source>
<translation>Verš na jeden řádek</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="150"/>
+ <location filename="openlp/core/lib/ui.py" line="154"/>
<source>View</source>
<translation>Zobrazit</translation>
</message>
@@ -5696,32 +5696,32 @@
<translation>Chyba v syntaxi XML</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="151"/>
+ <location filename="openlp/core/lib/ui.py" line="155"/>
<source>View Mode</source>
<translation>Režim zobrazení</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="112"/>
+ <location filename="openlp/core/lib/ui.py" line="116"/>
<source>Open service.</source>
<translation>Otevřít službu.</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="116"/>
+ <location filename="openlp/core/lib/ui.py" line="120"/>
<source>Print Service</source>
<translation>Tisk služby</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="118"/>
+ <location filename="openlp/core/lib/ui.py" line="122"/>
<source>Replace live background.</source>
<translation>Nahradit pozadí naživo.</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="120"/>
+ <location filename="openlp/core/lib/ui.py" line="124"/>
<source>Reset live background.</source>
<translation>Obnovit pozadí naživo.</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="135"/>
+ <location filename="openlp/core/lib/ui.py" line="139"/>
<source>Split a slide into two only if it does not fit on the screen as one slide.</source>
<translation>Rozdělit snímek na dva jen v případě, že se nevejde na obrazovku jako jeden snímek.</translation>
</message>
@@ -5736,61 +5736,61 @@
<translation>Potvrdit smazání</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="113"/>
+ <location filename="openlp/core/lib/ui.py" line="117"/>
<source>Play Slides in Loop</source>
<translation>Přehrát snímky ve smyčce</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="114"/>
+ <location filename="openlp/core/lib/ui.py" line="118"/>
<source>Play Slides to End</source>
<translation>Přehrát snímky ke konci</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="138"/>
+ <location filename="openlp/core/lib/ui.py" line="142"/>
<source>Stop Play Slides in Loop</source>
<translation>Zastavit přehrávání snímků ve smyčce</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="140"/>
+ <location filename="openlp/core/lib/ui.py" line="144"/>
<source>Stop Play Slides to End</source>
<translation>Zastavit přehrávání snímků ke konci</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="102"/>
+ <location filename="openlp/core/lib/ui.py" line="106"/>
<source>Next Track</source>
<translation>Další stopa</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="125"/>
+ <location filename="openlp/core/lib/ui.py" line="129"/>
<source>Search Themes...</source>
<comment>Search bar place holder text </comment>
<translation>Hledat motiv...</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="134"/>
+ <location filename="openlp/core/lib/ui.py" line="138"/>
<source>Optional &Split</source>
<translation>Volitelné &rozdělení</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="85"/>
+ <location filename="openlp/core/lib/ui.py" line="89"/>
<source>Invalid Folder Selected</source>
<comment>Singular</comment>
<translation>Vybraná neplatná složka</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="87"/>
+ <location filename="openlp/core/lib/ui.py" line="91"/>
<source>Invalid File Selected</source>
<comment>Singular</comment>
<translation>Vybraný neplatný soubor</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="88"/>
+ <location filename="openlp/core/lib/ui.py" line="92"/>
<source>Invalid Files Selected</source>
<comment>Plural</comment>
<translation>Vybrané neplatné soubory</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="103"/>
+ <location filename="openlp/core/lib/ui.py" line="107"/>
<source>No Folder Selected</source>
<comment>Singular</comment>
<translation>Nevybraná žádná složka</translation>
@@ -5817,29 +5817,40 @@
<source>Importing Songs</source>
<translation>Import písní</translation>
</message>
+ <message>
+ <location filename="openlp/core/lib/ui.py" line="80"/>
+ <source>File Not Found</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="openlp/core/lib/ui.py" line="82"/>
+ <source>File %s not found.
+Please try selecting it individually.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>OpenLP.core.lib</name>
<message>
- <location filename="openlp/core/lib/__init__.py" line="370"/>
+ <location filename="openlp/core/lib/__init__.py" line="374"/>
<source>%1 and %2</source>
<comment>Locale list separator: 2 items</comment>
<translation>%1 a %2</translation>
</message>
<message>
- <location filename="openlp/core/lib/__init__.py" line="373"/>
+ <location filename="openlp/core/lib/__init__.py" line="377"/>
<source>%1, and %2</source>
<comment>Locale list separator: end</comment>
<translation>%1 and %2</translation>
</message>
<message>
- <location filename="openlp/core/lib/__init__.py" line="376"/>
+ <location filename="openlp/core/lib/__init__.py" line="380"/>
<source>%1, %2</source>
<comment>Locale list separator: middle</comment>
<translation>%1, %2</translation>
</message>
<message>
- <location filename="openlp/core/lib/__init__.py" line="378"/>
+ <location filename="openlp/core/lib/__init__.py" line="382"/>
<source>%1, %2</source>
<comment>Locale list separator: start</comment>
<translation>%1, %2</translation>
@@ -5899,52 +5910,52 @@
<context>
<name>PresentationPlugin.MediaItem</name>
<message>
- <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="75"/>
+ <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="76"/>
<source>Select Presentation(s)</source>
<translation>Vybrat prezentace</translation>
</message>
<message>
- <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="77"/>
+ <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="78"/>
<source>Automatic</source>
<translation>Automaticky</translation>
</message>
<message>
- <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="79"/>
+ <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="80"/>
<source>Present using:</source>
<translation>Nyní používající:</translation>
</message>
<message>
- <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="194"/>
+ <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="195"/>
<source>File Exists</source>
<translation>Soubor existuje</translation>
</message>
<message>
- <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="194"/>
+ <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="195"/>
<source>A presentation with that filename already exists.</source>
<translation>Prezentace s tímto názvem souboru už existuje.</translation>
</message>
<message>
- <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="223"/>
+ <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="224"/>
<source>This type of presentation is not supported.</source>
<translation>Tento typ prezentace není podporován.</translation>
</message>
<message>
- <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="95"/>
+ <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="96"/>
<source>Presentations (%s)</source>
<translation>Prezentace (%s)</translation>
</message>
<message>
- <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="317"/>
+ <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="318"/>
<source>Missing Presentation</source>
<translation>Chybějící prezentace</translation>
</message>
<message>
- <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="306"/>
+ <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="307"/>
<source>The presentation %s is incomplete, please reload.</source>
<translation>Prezentace %s není kompletní. Načtěte ji znovu.</translation>
</message>
<message>
- <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="317"/>
+ <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="318"/>
<source>The presentation %s no longer exists.</source>
<translation>Prezentace %s už neexistuje.</translation>
</message>
@@ -6561,12 +6572,12 @@
<context>
<name>SongsPlugin.EasyWorshipSongImport</name>
<message>
- <location filename="openlp/plugins/songs/lib/ewimport.py" line="168"/>
+ <location filename="openlp/plugins/songs/lib/ewimport.py" line="176"/>
<source>Administered by %s</source>
<translation>Spravuje %s</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/lib/ewimport.py" line="220"/>
+ <location filename="openlp/plugins/songs/lib/ewimport.py" line="231"/>
<source>
[above are Song Tags with notes imported from
EasyWorship]</source>
@@ -6591,205 +6602,210 @@
<context>
<name>SongsPlugin.EditSongForm</name>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="295"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="294"/>
<source>Song Editor</source>
<translation>Editor písně</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="297"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="296"/>
<source>&Title:</source>
<translation>&Název:</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="299"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="298"/>
<source>Alt&ernate title:</source>
<translation>&Jiný název:</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="301"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="300"/>
<source>&Lyrics:</source>
<translation>&Text písně:</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="303"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="302"/>
<source>&Verse order:</source>
<translation>&Pořadí veršů:</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="307"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="306"/>
<source>Ed&it All</source>
<translation>&Upravit vše</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="310"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="309"/>
<source>Title && Lyrics</source>
<translation>Název a text písně</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="314"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="313"/>
<source>&Add to Song</source>
<translation>&Přidat k písni</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="354"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="353"/>
<source>&Remove</source>
<translation>&Odstranit</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="318"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="317"/>
<source>&Manage Authors, Topics, Song Books</source>
<translation>&Správa autorů, témat a zpěvníků</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="321"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="320"/>
<source>A&dd to Song</source>
<translation>&Přidat k písni</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="323"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="322"/>
<source>R&emove</source>
<translation>&Odstranit</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="326"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="325"/>
<source>Book:</source>
<translation>Zpěvník:</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="328"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="327"/>
<source>Number:</source>
<translation>Číslo:</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="330"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="329"/>
<source>Authors, Topics && Song Book</source>
<translation>Autoři, témata a zpěvníky</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="335"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="334"/>
<source>New &Theme</source>
<translation>Nový &motiv</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="337"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="336"/>
<source>Copyright Information</source>
<translation>Informace o autorském právu</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="341"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="340"/>
<source>Comments</source>
<translation>Komentáře</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="343"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="342"/>
<source>Theme, Copyright Info && Comments</source>
<translation>Motiv, autorská práva a komentáře</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongform.py" line="357"/>
+ <location filename="openlp/plugins/songs/forms/editsongform.py" line="384"/>
<source>Add Author</source>
<translation>Přidat autora</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongform.py" line="357"/>
+ <location filename="openlp/plugins/songs/forms/editsongform.py" line="384"/>
<source>This author does not exist, do you want to add them?</source>
<translation>Tento autor neexistuje. Chcete ho přidat?</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongform.py" line="380"/>
+ <location filename="openlp/plugins/songs/forms/editsongform.py" line="407"/>
<source>This author is already in the list.</source>
<translation>Tento autor je už v seznamu.</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongform.py" line="387"/>
+ <location filename="openlp/plugins/songs/forms/editsongform.py" line="414"/>
<source>You have not selected a valid author. Either select an author from the list, or type in a new author and click the "Add Author to Song" button to add the new author.</source>
<translation>Není vybrán platný autor. Buďto vyberte autora ze seznamu nebo zadejte nového autora a pro přidání nového autora klepněte na tlačítko "Přidat autora k písni".</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongform.py" line="415"/>
+ <location filename="openlp/plugins/songs/forms/editsongform.py" line="442"/>
<source>Add Topic</source>
<translation>Přidat téma</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongform.py" line="415"/>
+ <location filename="openlp/plugins/songs/forms/editsongform.py" line="442"/>
<source>This topic does not exist, do you want to add it?</source>
<translation>Toto téma neexistuje. Chcete ho přidat?</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongform.py" line="436"/>
+ <location filename="openlp/plugins/songs/forms/editsongform.py" line="463"/>
<source>This topic is already in the list.</source>
<translation>Toto téma je už v seznamu.</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongform.py" line="446"/>
+ <location filename="openlp/plugins/songs/forms/editsongform.py" line="473"/>
<source>You have not selected a valid topic. Either select a topic from the list, or type in a new topic and click the "Add Topic to Song" button to add the new topic.</source>
<translation>Není vybráno platné téma. Buďto vyberte téma ze seznamu nebo zadejte nové téma a pro přidání nového tématu klepněte na tlačítko "Přidat téma k písni".</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongform.py" line="656"/>
+ <location filename="openlp/plugins/songs/forms/editsongform.py" line="688"/>
<source>You need to type in a song title.</source>
<translation>Je potřeba zadat název písne.</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongform.py" line="663"/>
+ <location filename="openlp/plugins/songs/forms/editsongform.py" line="695"/>
<source>You need to type in at least one verse.</source>
<translation>Je potřeba zadat alespoň jednu sloku.</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongform.py" line="639"/>
+ <location filename="openlp/plugins/songs/forms/editsongform.py" line="671"/>
<source>The verse order is invalid. There is no verse corresponding to %s. Valid entries are %s.</source>
<translation>Pořadí částí písně není platné. Část odpovídající %s neexistuje. Platné položky jsou %s.</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongform.py" line="681"/>
+ <location filename="openlp/plugins/songs/forms/editsongform.py" line="713"/>
<source>Add Book</source>
<translation>Přidat zpěvník</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongform.py" line="681"/>
+ <location filename="openlp/plugins/songs/forms/editsongform.py" line="713"/>
<source>This song book does not exist, do you want to add it?</source>
<translation>Tento zpěvník neexistuje. Chcete ho přidat?</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongform.py" line="670"/>
+ <location filename="openlp/plugins/songs/forms/editsongform.py" line="702"/>
<source>You need to have an author for this song.</source>
<translation>Pro tuto píseň je potřeba zadat autora.</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="347"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="346"/>
<source>Linked Audio</source>
<translation>Připojený zvuk</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="350"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="349"/>
<source>Add &File(s)</source>
<translation>Přidat &soubor(y)</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="352"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="351"/>
<source>Add &Media</source>
<translation>Přidat &Médium</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="356"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="355"/>
<source>Remove &All</source>
<translation>Odstranit &Vše</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongform.py" line="733"/>
+ <location filename="openlp/plugins/songs/forms/editsongform.py" line="765"/>
<source>Open File(s)</source>
<translation>Otevřít soubor(y)</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="358"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="357"/>
<source><strong>Warning:</strong> Not all of the verses are in use.</source>
<translation><strong>Varování:</strong> Nejsou použity všechny sloky.</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongform.py" line="634"/>
+ <location filename="openlp/plugins/songs/forms/editsongform.py" line="666"/>
<source>The verse order is invalid. There are no verses corresponding to %s. Valid entries are %s.</source>
<translation>Pořadí částí písně není platné. Část odpovídající %s neexistuje. Platné položky jsou %s.</translation>
</message>
+ <message>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="359"/>
+ <source><strong>Warning:</strong> You have not entered a verse order.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>SongsPlugin.EditVerseForm</name>
@@ -6872,7 +6888,7 @@
<translation>Není zadáno umístění pro uložení</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/songexportform.py" line="278"/>
+ <location filename="openlp/plugins/songs/forms/songexportform.py" line="277"/>
<source>Starting export...</source>
<translation>Spouštím export...</translation>
</message>
@@ -6882,7 +6898,7 @@
<translation>Je potřeba zadat složku.</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/songexportform.py" line="369"/>
+ <location filename="openlp/plugins/songs/forms/songexportform.py" line="368"/>
<source>Select Destination Folder</source>
<translation>Vybrat cílovou složku</translation>
</message>
@@ -6898,6 +6914,14 @@
</message>
</context>
<context>
+ <name>SongsPlugin.FoilPresenterSongImport</name>
+ <message>
+ <location filename="openlp/plugins/songs/lib/foilpresenterimport.py" line="432"/>
+ <source>Invalid Foilpresenter song file. No verses found.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>SongsPlugin.ImportWizardForm</name>
<message>
<location filename="openlp/plugins/songs/lib/importer.py" line="216"/>
@@ -7086,27 +7110,27 @@
<context>
<name>SongsPlugin.MediaItem</name>
<message>
- <location filename="openlp/plugins/songs/lib/mediaitem.py" line="192"/>
+ <location filename="openlp/plugins/songs/lib/mediaitem.py" line="155"/>
<source>Titles</source>
<translation>Názvy</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/lib/mediaitem.py" line="192"/>
+ <location filename="openlp/plugins/songs/lib/mediaitem.py" line="155"/>
<source>Lyrics</source>
<translation>Text písně</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/lib/mediaitem.py" line="557"/>
+ <location filename="openlp/plugins/songs/lib/mediaitem.py" line="520"/>
<source>CCLI License: </source>
<translation>CCLI Licence:</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/lib/mediaitem.py" line="192"/>
+ <location filename="openlp/plugins/songs/lib/mediaitem.py" line="155"/>
<source>Entire Song</source>
<translation>Celá píseň</translation>
</message>
<message numerus="yes">
- <location filename="openlp/plugins/songs/lib/mediaitem.py" line="439"/>
+ <location filename="openlp/plugins/songs/lib/mediaitem.py" line="402"/>
<source>Are you sure you want to delete the %n selected song(s)?</source>
<translation>
<numerusform>Jste si jisti, že chcete smazat %n vybranou píseň?</numerusform>
@@ -7115,38 +7139,38 @@
</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/lib/mediaitem.py" line="188"/>
+ <location filename="openlp/plugins/songs/lib/mediaitem.py" line="151"/>
<source>Maintain the lists of authors, topics and books.</source>
<translation>Spravovat seznamy autorů, témat a zpěvníků.</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/lib/mediaitem.py" line="484"/>
+ <location filename="openlp/plugins/songs/lib/mediaitem.py" line="447"/>
<source>copy</source>
<comment>For song cloning</comment>
<translation>kopírovat</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/lib/mediaitem.py" line="192"/>
+ <location filename="openlp/plugins/songs/lib/mediaitem.py" line="155"/>
<source>Search Titles...</source>
<translation>Hledat název...</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/lib/mediaitem.py" line="192"/>
+ <location filename="openlp/plugins/songs/lib/mediaitem.py" line="155"/>
<source>Search Entire Song...</source>
<translation>Hledat celou píseň...</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/lib/mediaitem.py" line="192"/>
+ <location filename="openlp/plugins/songs/lib/mediaitem.py" line="155"/>
<source>Search Lyrics...</source>
<translation>Hledat text písně...</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/lib/mediaitem.py" line="192"/>
+ <location filename="openlp/plugins/songs/lib/mediaitem.py" line="155"/>
<source>Search Authors...</source>
<translation>Hledat autory...</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/lib/mediaitem.py" line="192"/>
+ <location filename="openlp/plugins/songs/lib/mediaitem.py" line="155"/>
<source>Search Song Books...</source>
<translation>Hledat zpěvníky...</translation>
</message>
@@ -7242,12 +7266,12 @@
<context>
<name>SongsPlugin.SongExportForm</name>
<message>
- <location filename="openlp/plugins/songs/forms/songexportform.py" line="299"/>
+ <location filename="openlp/plugins/songs/forms/songexportform.py" line="298"/>
<source>Your song export failed.</source>
<translation>Export písně selhal.</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/songexportform.py" line="294"/>
+ <location filename="openlp/plugins/songs/forms/songexportform.py" line="293"/>
<source>Finished export. To import these files use the <strong>OpenLyrics</strong> importer.</source>
<translation>Export dokončen. Pro import těchto souborů použijte import z <strong>OpenLyrics</strong>.</translation>
</message>
=== modified file 'resources/i18n/da.ts'
--- resources/i18n/da.ts 2012-11-24 21:19:46 +0000
+++ resources/i18n/da.ts 2013-09-14 11:12:23 +0000
@@ -33,7 +33,7 @@
<message>
<location filename="openlp/plugins/alerts/alertsplugin.py" line="175"/>
<source><strong>Alerts Plugin</strong><br />The alert plugin controls the displaying of nursery alerts on the display screen.</source>
- <translation><strong>Meddelelser-udvidelse</strong><br />Meddelelsesudvidelsen kontrollerer visningen af beskeder fra søndagsskolen på skærmen.</translation>
+ <translation><strong>Meddelelse-udvidelse</strong><br />Meddelelsesudvidelsen kontrollerer visningen af beskeder fra børnekirken/søndagsskolen på skærmen.</translation>
</message>
</context>
<context>
@@ -175,12 +175,12 @@
<translation>Bibler</translation>
</message>
<message>
- <location filename="openlp/plugins/bibles/lib/http.py" line="600"/>
+ <location filename="openlp/plugins/bibles/lib/http.py" line="604"/>
<source>No Book Found</source>
<translation>Ingen bog fundet</translation>
</message>
<message>
- <location filename="openlp/plugins/bibles/lib/http.py" line="600"/>
+ <location filename="openlp/plugins/bibles/lib/http.py" line="604"/>
<source>No matching book could be found in this Bible. Check that you have spelled the name of the book correctly.</source>
<translation>Ingen matchende bog kunne findes i denne bibel. Tjek om du har stavet bogens navn rigtigt.</translation>
</message>
@@ -1044,38 +1044,38 @@
<context>
<name>BiblesPlugin.HTTPBible</name>
<message>
- <location filename="openlp/plugins/bibles/lib/http.py" line="514"/>
+ <location filename="openlp/plugins/bibles/lib/http.py" line="518"/>
<source>Registering Bible and loading books...</source>
<translation>Registrerer bibelen og indlæser bøger...</translation>
</message>
<message>
- <location filename="openlp/plugins/bibles/lib/http.py" line="539"/>
+ <location filename="openlp/plugins/bibles/lib/http.py" line="543"/>
<source>Registering Language...</source>
<translation>Registrerer sprog...</translation>
</message>
<message>
- <location filename="openlp/plugins/bibles/lib/http.py" line="555"/>
+ <location filename="openlp/plugins/bibles/lib/http.py" line="559"/>
<source>Importing %s...</source>
<comment>Importing <book name>...</comment>
<translation>Importerer %s...</translation>
</message>
<message>
- <location filename="openlp/plugins/bibles/lib/http.py" line="722"/>
+ <location filename="openlp/plugins/bibles/lib/http.py" line="726"/>
<source>Download Error</source>
<translation>Hentningsfejl</translation>
</message>
<message>
- <location filename="openlp/plugins/bibles/lib/http.py" line="722"/>
+ <location filename="openlp/plugins/bibles/lib/http.py" line="726"/>
<source>There was a problem downloading your verse selection. Please check your Internet connection, and if this error continues to occur please consider reporting a bug.</source>
<translation>Der opstod en fejl ved hentningen af dit valg af vers. Efterse din internetforbindelse, og hvis fejlen fortsat opstår så overvej at rapportere fejlen.</translation>
</message>
<message>
- <location filename="openlp/plugins/bibles/lib/http.py" line="729"/>
+ <location filename="openlp/plugins/bibles/lib/http.py" line="733"/>
<source>Parse Error</source>
<translation>Fortolkningfejl</translation>
</message>
<message>
- <location filename="openlp/plugins/bibles/lib/http.py" line="729"/>
+ <location filename="openlp/plugins/bibles/lib/http.py" line="733"/>
<source>There was a problem extracting your verse selection. If this error continues to occur please consider reporting a bug.</source>
<translation>Der opstod et problem med at udpakke dit valg af vers. Hvis denne fejl fortsætter med at opstå, så overvej at rapportere fejlen.</translation>
</message>
@@ -1398,7 +1398,7 @@
<translation>Bestemmer indkodning (dette kan tage et par minutter)...</translation>
</message>
<message>
- <location filename="openlp/plugins/bibles/lib/osis.py" line="162"/>
+ <location filename="openlp/plugins/bibles/lib/osis.py" line="174"/>
<source>Importing %s %s...</source>
<comment>Importing <book name> <chapter>...</comment>
<translation>Importerer %s %s...</translation>
@@ -1992,7 +1992,7 @@
<context>
<name>OpenLP</name>
<message>
- <location filename="openlp/core/utils/__init__.py" line="362"/>
+ <location filename="openlp/core/utils/__init__.py" line="363"/>
<source>Image Files</source>
<translation>Billedfiler</translation>
</message>
@@ -2039,13 +2039,6 @@
<translation>Dette program udgives i håbet om at det vil være brugbart, men UDEN NOGEN GARANTI; endda uden den forudsatte garanti om SALGSEGNETHED eller EGNETHED TIL ET BESTEMT FORMÅL. Se herunder for flere detaljer.</translation>
</message>
<message>
- <location filename="openlp/core/ui/aboutdialog.py" line="250"/>
- <source>Copyright © 2004-2012 %s
-Portions copyright © 2004-2012 %s</source>
- <translation>Ophavsret © 2004-2012 %s
-Delvis ophavsret © 2004-2012 %s</translation>
- </message>
- <message>
<location filename="openlp/core/ui/aboutdialog.py" line="86"/>
<source>OpenLP <version><revision> - Open Source Lyrics Projection
@@ -2065,7 +2058,7 @@
<message>
<location filename="openlp/core/ui/aboutdialog.py" line="647"/>
<source>Volunteer</source>
- <translation>Slut dig til os</translation>
+ <translation>Giv en hånd</translation>
</message>
<message>
<location filename="openlp/core/ui/aboutdialog.py" line="156"/>
@@ -2212,6 +2205,13 @@
os fra synd. Vi giver dette program til
dig kvit og frit fordi han har sat os fri.</translation>
</message>
+ <message>
+ <location filename="openlp/core/ui/aboutdialog.py" line="250"/>
+ <source>Copyright © 2004-2013 %s
+Portions copyright © 2004-2013 %s</source>
+ <translation>Ophavsret © 2004-2013 %s
+Delvis ophavsret © 2004-2013 %s</translation>
+ </message>
</context>
<context>
<name>OpenLP.AdvancedTab</name>
@@ -2243,7 +2243,7 @@
<message>
<location filename="openlp/core/ui/advancedtab.py" line="358"/>
<source>Enable application exit confirmation</source>
- <translation>Benyt bekræftigelse under lukning af programmet</translation>
+ <translation>Benyt bekræftigelse før lukning af programmet</translation>
</message>
<message>
<location filename="openlp/core/ui/advancedtab.py" line="394"/>
@@ -2271,7 +2271,7 @@
<translation>Billedfil:</translation>
</message>
<message>
- <location filename="openlp/core/ui/advancedtab.py" line="664"/>
+ <location filename="openlp/core/ui/advancedtab.py" line="667"/>
<source>Open File</source>
<translation>Åbn fil</translation>
</message>
@@ -2301,7 +2301,7 @@
<translation>Vend tilbage til standard OpenLP logoet.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="622"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="623"/>
<source>Service %Y-%m-%d %H-%M</source>
<comment>This may not contain any of the following characters: /\?*|<>[]":+
See http://docs.python.org/library/datetime.html#strftime-strptime-behavior for more information.</comment>
@@ -2375,7 +2375,7 @@
<message>
<location filename="openlp/core/ui/advancedtab.py" line="386"/>
<source>Consult the OpenLP manual for usage.</source>
- <translation>Se OpenLP-manualen for info om brug.</translation>
+ <translation>Se OpenLP-manualen for hjælp til brug.</translation>
</message>
<message>
<location filename="openlp/core/ui/advancedtab.py" line="388"/>
@@ -2398,7 +2398,7 @@
<translation>Omgå X11 vindueshåndtering</translation>
</message>
<message>
- <location filename="openlp/core/ui/advancedtab.py" line="635"/>
+ <location filename="openlp/core/ui/advancedtab.py" line="638"/>
<source>Syntax error.</source>
<translation>Syntaksfejl.</translation>
</message>
@@ -2453,27 +2453,27 @@
<translation><strong>ADVARSEL:</strong> Den nye datamappe indeholder OpenLP datafiler. Disse filer vil blive slettet under en kopiering.</translation>
</message>
<message>
- <location filename="openlp/core/ui/advancedtab.py" line="525"/>
+ <location filename="openlp/core/ui/advancedtab.py" line="528"/>
<source>Data Directory Error</source>
<translation>Fejl i datamappe</translation>
</message>
<message>
- <location filename="openlp/core/ui/advancedtab.py" line="677"/>
+ <location filename="openlp/core/ui/advancedtab.py" line="680"/>
<source>Select Data Directory Location</source>
<translation>Vælg placeringen af datamappen</translation>
</message>
<message>
- <location filename="openlp/core/ui/advancedtab.py" line="690"/>
+ <location filename="openlp/core/ui/advancedtab.py" line="693"/>
<source>Confirm Data Directory Change</source>
<translation>Bekræft ændringen af datamappen</translation>
</message>
<message>
- <location filename="openlp/core/ui/advancedtab.py" line="717"/>
+ <location filename="openlp/core/ui/advancedtab.py" line="720"/>
<source>Reset Data Directory</source>
<translation>Nulstil datamappe</translation>
</message>
<message>
- <location filename="openlp/core/ui/advancedtab.py" line="717"/>
+ <location filename="openlp/core/ui/advancedtab.py" line="720"/>
<source>Are you sure you want to change the location of the OpenLP data directory to the default location?
This location will be used after OpenLP is closed.</source>
@@ -2482,12 +2482,12 @@
Denne placering vil blive benyttet når OpenLP lukkes.</translation>
</message>
<message>
- <location filename="openlp/core/ui/advancedtab.py" line="753"/>
+ <location filename="openlp/core/ui/advancedtab.py" line="756"/>
<source>Overwrite Existing Data</source>
<translation>Overskriv eksisterende data</translation>
</message>
<message>
- <location filename="openlp/core/ui/advancedtab.py" line="525"/>
+ <location filename="openlp/core/ui/advancedtab.py" line="528"/>
<source>OpenLP data directory was not found
%s
@@ -2508,7 +2508,7 @@
Klik "Ja" for at nulstille datamappen til dens standardplacering.</translation>
</message>
<message>
- <location filename="openlp/core/ui/advancedtab.py" line="690"/>
+ <location filename="openlp/core/ui/advancedtab.py" line="693"/>
<source>Are you sure you want to change the location of the OpenLP data directory to:
%s
@@ -2521,7 +2521,7 @@
Datamappen vil blive ændret når OpenLP lukkes.</translation>
</message>
<message>
- <location filename="openlp/core/ui/advancedtab.py" line="753"/>
+ <location filename="openlp/core/ui/advancedtab.py" line="756"/>
<source>WARNING:
The location you have selected
@@ -2548,7 +2548,7 @@
<message>
<location filename="openlp/core/ui/exceptiondialog.py" line="92"/>
<source>Oops! OpenLP hit a problem, and couldn't recover. The text in the box below contains information that might be helpful to the OpenLP developers, so please e-mail it to bugs@xxxxxxxxxx, along with a detailed description of what you were doing when the problem occurred.</source>
- <translation>Ups! OpenLP stødte ind i et problem, og kunne ikke gendanne. Teksten i kassen herunder indeholder information som kan være nyttig for OpenLP-udviklerne, så send venligst en e-mail til bugs@xxxxxxxxxx sammen med en detaljeret beskrivelse af, hvad du foretog dig da problemet opstod.</translation>
+ <translation>Ups! OpenLP stødte ind i et problem og kunne ikke gendanne. Teksten i kassen herunder indeholder information som kan være nyttig for OpenLP-udviklerne, så send venligst en e-mail til bugs@xxxxxxxxxx sammen med en detaljeret beskrivelse af, hvad du foretog dig da problemet opstod.</translation>
</message>
<message>
<location filename="openlp/core/ui/exceptiondialog.py" line="98"/>
@@ -2659,7 +2659,7 @@
%s
--- Biblioteksudgaver ---
%s
-Inholdet i fejlrapporten bedes skrives på engelsk, da udviklerne er fra mange forskellige nationaliteter.</translation>
+Inholdet i fejlrapporten bedes skrives på engelsk, da udviklerne af OpenLP er fra mange forskellige nationaliteter.</translation>
</message>
</context>
<context>
@@ -2701,192 +2701,192 @@
<context>
<name>OpenLP.FirstTimeWizard</name>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="212"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="216"/>
<source>Songs</source>
<translation>Sange</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="199"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="203"/>
<source>First Time Wizard</source>
<translation>Velkomstguide</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="201"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="205"/>
<source>Welcome to the First Time Wizard</source>
<translation>Velkommen til velkomstguiden</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="208"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="212"/>
<source>Activate required Plugins</source>
<translation>Aktivér påkrævede udvidelser</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="210"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="214"/>
<source>Select the Plugins you wish to use. </source>
<translation>Vælg de udvidelser du ønsker at benytte. </translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="215"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="219"/>
<source>Bible</source>
<translation>Bibel</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="216"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="220"/>
<source>Images</source>
<translation>Billeder</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="221"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="225"/>
<source>Presentations</source>
<translation>Præsentationer</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="223"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="227"/>
<source>Media (Audio and Video)</source>
<translation>Medier (lyd og video)</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="225"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="229"/>
<source>Allow remote access</source>
<translation>Tillad fjernadgang</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="227"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="231"/>
<source>Monitor Song Usage</source>
<translation>Overvåg sangforbrug</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="229"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="233"/>
<source>Allow Alerts</source>
<translation>Vis meddelelser</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="259"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="263"/>
<source>Default Settings</source>
<translation>Standardindstillinger</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimeform.py" line="97"/>
+ <location filename="openlp/core/ui/firsttimeform.py" line="116"/>
<source>Downloading %s...</source>
<translation>Henter %s...</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimeform.py" line="409"/>
+ <location filename="openlp/core/ui/firsttimeform.py" line="447"/>
<source>Download complete. Click the finish button to start OpenLP.</source>
<translation>Hentning færdig. Klik på færdig-knappen for at starte OpenLP.</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimeform.py" line="430"/>
+ <location filename="openlp/core/ui/firsttimeform.py" line="468"/>
<source>Enabling selected plugins...</source>
<translation>Aktiverer valgte udvidelser...</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="231"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="235"/>
<source>No Internet Connection</source>
<translation>Ingen internetforbindelse</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="233"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="237"/>
<source>Unable to detect an Internet connection.</source>
<translation>Kunne ikke detektere en internetforbindelse.</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="247"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="251"/>
<source>Sample Songs</source>
<translation>Eksempler på sange</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="249"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="253"/>
<source>Select and download public domain songs.</source>
<translation>Vælg og hent offentligt tilgængelige sange.</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="251"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="255"/>
<source>Sample Bibles</source>
<translation>Eksempler på bibler</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="253"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="257"/>
<source>Select and download free Bibles.</source>
<translation>Vælg og hent gratis bibler.</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="255"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="259"/>
<source>Sample Themes</source>
<translation>Eksempler på temaer</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="257"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="261"/>
<source>Select and download sample themes.</source>
<translation>Vælg og hent eksempler på temaer.</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="261"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="265"/>
<source>Set up default settings to be used by OpenLP.</source>
<translation>Indstil standardindstillingerne som skal benyttes af OpenLP.</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="263"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="267"/>
<source>Default output display:</source>
<translation>Standard output skærm:</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="265"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="269"/>
<source>Select default theme:</source>
<translation>Vælg standardtema:</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="267"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="271"/>
<source>Starting configuration process...</source>
<translation>Starter konfigureringsproces...</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="205"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="209"/>
<source>This wizard will help you to configure OpenLP for initial use. Click the next button below to start.</source>
<translation>Denne guide vil hjælpe dig med at konfigurere OpenLP til brug for første gang. Tryk på næste-knappen herunder for at begynde.</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimeform.py" line="383"/>
+ <location filename="openlp/core/ui/firsttimeform.py" line="421"/>
<source>Setting Up And Downloading</source>
<translation>Sætter op og henter</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimeform.py" line="385"/>
+ <location filename="openlp/core/ui/firsttimeform.py" line="423"/>
<source>Please wait while OpenLP is set up and your data is downloaded.</source>
<translation>Vent venligst på at OpenLP indstilles og dine data hentes.</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimeform.py" line="390"/>
+ <location filename="openlp/core/ui/firsttimeform.py" line="428"/>
<source>Setting Up</source>
<translation>Sætter op</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimeform.py" line="417"/>
+ <location filename="openlp/core/ui/firsttimeform.py" line="455"/>
<source>Click the finish button to start OpenLP.</source>
<translation>Klik på færdig-knappen for at starte OpenLP.</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimeform.py" line="405"/>
+ <location filename="openlp/core/ui/firsttimeform.py" line="443"/>
<source>Download complete. Click the finish button to return to OpenLP.</source>
<translation>Hentning færdig. Klik på færdig-knappen for at vende tilbage til OpenLP.</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimeform.py" line="414"/>
+ <location filename="openlp/core/ui/firsttimeform.py" line="452"/>
<source>Click the finish button to return to OpenLP.</source>
<translation>Klik på færdig-knappen for at vende tilbage til OpenLP.</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="213"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="217"/>
<source>Custom Slides</source>
<translation>Brugerdefinerede dias</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="269"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="273"/>
<source>Finish</source>
<translation>Færdig</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="236"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="240"/>
<source>No Internet connection was found. The First Time Wizard needs an Internet connection in order to be able to download sample songs, Bibles and themes. Click the Finish button now to start OpenLP with initial settings and no sample data.
To re-run the First Time Wizard and import this sample data at a later time, check your Internet connection and re-run this wizard by selecting "Tools/Re-run First Time Wizard" from OpenLP.</source>
@@ -2895,7 +2895,7 @@
For at køre velkomstguiden igen og importere disse eksempeldata på et senere tidspunkt, skal du tjekke din internetforbindelse og køre denne guide igen ved at vælge "Værktøjer/Kør velkomstguide igen" fra OpenLP.</translation>
</message>
<message>
- <location filename="openlp/core/ui/firsttimewizard.py" line="244"/>
+ <location filename="openlp/core/ui/firsttimewizard.py" line="248"/>
<source>
To cancel the First Time Wizard completely (and not start OpenLP), click the Cancel button now.</source>
@@ -2945,32 +2945,32 @@
<context>
<name>OpenLP.FormattingTagForm</name>
<message>
- <location filename="openlp/core/ui/formattingtagform.py" line="167"/>
+ <location filename="openlp/core/ui/formattingtagform.py" line="168"/>
<source>Update Error</source>
<translation>Opdateringsfejl</translation>
</message>
<message>
- <location filename="openlp/core/ui/formattingtagform.py" line="119"/>
+ <location filename="openlp/core/ui/formattingtagform.py" line="120"/>
<source>Tag "n" already defined.</source>
<translation>Mærke "n" er allerede defineret.</translation>
</message>
<message>
- <location filename="openlp/core/ui/formattingtagform.py" line="126"/>
+ <location filename="openlp/core/ui/formattingtagform.py" line="127"/>
<source>New Tag</source>
<translation>Nyt mærke</translation>
</message>
<message>
- <location filename="openlp/core/ui/formattingtagform.py" line="128"/>
+ <location filename="openlp/core/ui/formattingtagform.py" line="129"/>
<source><HTML here></source>
<translation><HTML her></translation>
</message>
<message>
- <location filename="openlp/core/ui/formattingtagform.py" line="130"/>
+ <location filename="openlp/core/ui/formattingtagform.py" line="131"/>
<source></and here></source>
<translation></and her></translation>
</message>
<message>
- <location filename="openlp/core/ui/formattingtagform.py" line="167"/>
+ <location filename="openlp/core/ui/formattingtagform.py" line="168"/>
<source>Tag %s already defined.</source>
<translation>Mærke %s er allerede defineret.</translation>
</message>
@@ -2978,82 +2978,82 @@
<context>
<name>OpenLP.FormattingTags</name>
<message>
- <location filename="openlp/core/lib/formattingtags.py" line="89"/>
+ <location filename="openlp/core/lib/formattingtags.py" line="90"/>
<source>Red</source>
<translation>Rød</translation>
</message>
<message>
- <location filename="openlp/core/lib/formattingtags.py" line="94"/>
+ <location filename="openlp/core/lib/formattingtags.py" line="95"/>
<source>Black</source>
<translation>Sort</translation>
</message>
<message>
- <location filename="openlp/core/lib/formattingtags.py" line="99"/>
+ <location filename="openlp/core/lib/formattingtags.py" line="100"/>
<source>Blue</source>
<translation>Blå</translation>
</message>
<message>
- <location filename="openlp/core/lib/formattingtags.py" line="104"/>
+ <location filename="openlp/core/lib/formattingtags.py" line="105"/>
<source>Yellow</source>
<translation>Gul</translation>
</message>
<message>
- <location filename="openlp/core/lib/formattingtags.py" line="109"/>
+ <location filename="openlp/core/lib/formattingtags.py" line="110"/>
<source>Green</source>
<translation>Grøn</translation>
</message>
<message>
- <location filename="openlp/core/lib/formattingtags.py" line="114"/>
+ <location filename="openlp/core/lib/formattingtags.py" line="115"/>
<source>Pink</source>
<translation>Lyserød</translation>
</message>
<message>
- <location filename="openlp/core/lib/formattingtags.py" line="119"/>
+ <location filename="openlp/core/lib/formattingtags.py" line="120"/>
<source>Orange</source>
<translation>Orange</translation>
</message>
<message>
- <location filename="openlp/core/lib/formattingtags.py" line="124"/>
+ <location filename="openlp/core/lib/formattingtags.py" line="125"/>
<source>Purple</source>
<translation>Lilla</translation>
</message>
<message>
- <location filename="openlp/core/lib/formattingtags.py" line="129"/>
+ <location filename="openlp/core/lib/formattingtags.py" line="130"/>
<source>White</source>
<translation>Hvid</translation>
</message>
<message>
- <location filename="openlp/core/lib/formattingtags.py" line="134"/>
+ <location filename="openlp/core/lib/formattingtags.py" line="135"/>
<source>Superscript</source>
<translation>Hævet skrift</translation>
</message>
<message>
- <location filename="openlp/core/lib/formattingtags.py" line="139"/>
+ <location filename="openlp/core/lib/formattingtags.py" line="140"/>
<source>Subscript</source>
<translation>Sænket skrift</translation>
</message>
<message>
- <location filename="openlp/core/lib/formattingtags.py" line="144"/>
+ <location filename="openlp/core/lib/formattingtags.py" line="145"/>
<source>Paragraph</source>
<translation>Afsnit</translation>
</message>
<message>
- <location filename="openlp/core/lib/formattingtags.py" line="149"/>
+ <location filename="openlp/core/lib/formattingtags.py" line="150"/>
<source>Bold</source>
<translation>Fed</translation>
</message>
<message>
- <location filename="openlp/core/lib/formattingtags.py" line="153"/>
+ <location filename="openlp/core/lib/formattingtags.py" line="154"/>
<source>Italics</source>
<translation>Kursiv</translation>
</message>
<message>
- <location filename="openlp/core/lib/formattingtags.py" line="157"/>
+ <location filename="openlp/core/lib/formattingtags.py" line="158"/>
<source>Underline</source>
<translation>Understreget</translation>
</message>
<message>
- <location filename="openlp/core/lib/formattingtags.py" line="163"/>
+ <location filename="openlp/core/lib/formattingtags.py" line="164"/>
<source>Break</source>
<translation>Linjeskift</translation>
</message>
@@ -3078,7 +3078,7 @@
<message>
<location filename="openlp/core/ui/generaltab.py" line="223"/>
<source>Display if a single screen</source>
- <translation>Vis selv på en enkelt skærm</translation>
+ <translation>Vis også hvis der kun er en enkelt skærm</translation>
</message>
<message>
<location filename="openlp/core/ui/generaltab.py" line="225"/>
@@ -3123,7 +3123,7 @@
<message>
<location filename="openlp/core/ui/generaltab.py" line="246"/>
<source>CCLI Details</source>
- <translation>CCLI detaljer</translation>
+ <translation>CCLI-detaljer</translation>
</message>
<message>
<location filename="openlp/core/ui/generaltab.py" line="249"/>
@@ -3232,7 +3232,7 @@
<context>
<name>OpenLP.MainDisplay</name>
<message>
- <location filename="openlp/core/ui/maindisplay.py" line="200"/>
+ <location filename="openlp/core/ui/maindisplay.py" line="203"/>
<source>OpenLP Display</source>
<translation>OpenLP-visning</translation>
</message>
@@ -3544,7 +3544,7 @@
<translation>Hovedvisningen er mørkelagt</translation>
</message>
<message>
- <location filename="openlp/core/ui/mainwindow.py" line="1277"/>
+ <location filename="openlp/core/ui/mainwindow.py" line="1283"/>
<source>Default Theme: %s</source>
<translation>Standard tema: %s</translation>
</message>
@@ -3560,12 +3560,12 @@
<translation>Konfigurér g&enveje...</translation>
</message>
<message>
- <location filename="openlp/core/ui/mainwindow.py" line="1185"/>
+ <location filename="openlp/core/ui/mainwindow.py" line="1191"/>
<source>Close OpenLP</source>
<translation>Luk OpenLP</translation>
</message>
<message>
- <location filename="openlp/core/ui/mainwindow.py" line="1185"/>
+ <location filename="openlp/core/ui/mainwindow.py" line="1191"/>
<source>Are you sure you want to close OpenLP?</source>
<translation>Er du sikker på at du vil lukke OpenLP?</translation>
</message>
@@ -3639,13 +3639,13 @@
At køre velkomstguiden igen kan medføre ændringer i din nuværende OpenLP konfiguration og muligvis tilføje sange til din eksisterende sangliste og ændre dit standard-tema.</translation>
</message>
<message>
- <location filename="openlp/core/ui/mainwindow.py" line="1438"/>
+ <location filename="openlp/core/ui/mainwindow.py" line="1444"/>
<source>Clear List</source>
<comment>Clear List of recent files</comment>
<translation>Ryd liste</translation>
</message>
<message>
- <location filename="openlp/core/ui/mainwindow.py" line="1438"/>
+ <location filename="openlp/core/ui/mainwindow.py" line="1444"/>
<source>Clear the list of recent files.</source>
<translation>Ryd liste over seneste filer.</translation>
</message>
@@ -3698,32 +3698,32 @@
<translation>Eksporterede OpenLP-indstillingsfiler (*.conf)</translation>
</message>
<message>
- <location filename="openlp/core/ui/mainwindow.py" line="1025"/>
+ <location filename="openlp/core/ui/mainwindow.py" line="1031"/>
<source>Import settings</source>
<translation>Importér indstillinger</translation>
</message>
<message>
- <location filename="openlp/core/ui/mainwindow.py" line="1025"/>
+ <location filename="openlp/core/ui/mainwindow.py" line="1031"/>
<source>OpenLP will now close. Imported settings will be applied the next time you start OpenLP.</source>
<translation>OpenLP lukker nu ned. Importerede indstillinger vil blive anvendt næste gang du starter OpenLP.</translation>
</message>
<message>
- <location filename="openlp/core/ui/mainwindow.py" line="1040"/>
+ <location filename="openlp/core/ui/mainwindow.py" line="1046"/>
<source>Export Settings File</source>
<translation>Eksportér indstillingsfil</translation>
</message>
<message>
- <location filename="openlp/core/ui/mainwindow.py" line="1040"/>
+ <location filename="openlp/core/ui/mainwindow.py" line="1046"/>
<source>OpenLP Export Settings File (*.conf)</source>
<translation>OpenLP-eksporteret indstillingsfil (*.conf)</translation>
</message>
<message>
- <location filename="openlp/core/ui/mainwindow.py" line="1531"/>
+ <location filename="openlp/core/ui/mainwindow.py" line="1537"/>
<source>New Data Directory Error</source>
<translation>Fejl ved ny datamappe</translation>
</message>
<message>
- <location filename="openlp/core/ui/mainwindow.py" line="999"/>
+ <location filename="openlp/core/ui/mainwindow.py" line="990"/>
<source>The file you selected does appear to be a valid OpenLP settings file.
Section [%s] is not valid
@@ -3736,12 +3736,12 @@
Behandlingen er blevet termineret og ingen ændringer er blevet foretaget.</translation>
</message>
<message>
- <location filename="openlp/core/ui/mainwindow.py" line="1521"/>
+ <location filename="openlp/core/ui/mainwindow.py" line="1527"/>
<source>Copying OpenLP data to new data directory location - %s - Please wait for copy to finish</source>
<translation>Kopierer OpenLP data til en ny datamappeplacering - %s - Vent venligst til at kopieringen er færdig</translation>
</message>
<message>
- <location filename="openlp/core/ui/mainwindow.py" line="1531"/>
+ <location filename="openlp/core/ui/mainwindow.py" line="1537"/>
<source>OpenLP Data directory copy failed
%s</source>
@@ -3789,64 +3789,64 @@
<translation>&Tilføj til valgte programpunkt</translation>
</message>
<message>
- <location filename="openlp/core/lib/mediamanageritem.py" line="491"/>
+ <location filename="openlp/core/lib/mediamanageritem.py" line="492"/>
<source>You must select one or more items to preview.</source>
<translation>Du er nødt vælge et eller flere punkter for at forhåndsvise.</translation>
</message>
<message>
- <location filename="openlp/core/lib/mediamanageritem.py" line="509"/>
+ <location filename="openlp/core/lib/mediamanageritem.py" line="510"/>
<source>You must select one or more items to send live.</source>
<translation>Du er nødt til at vælge et eller flere punkter for at fremvise.</translation>
</message>
<message>
- <location filename="openlp/core/lib/mediamanageritem.py" line="562"/>
+ <location filename="openlp/core/lib/mediamanageritem.py" line="563"/>
<source>You must select one or more items.</source>
<translation>Du skal vælge et, eller flere punkter.</translation>
</message>
<message>
- <location filename="openlp/core/lib/mediamanageritem.py" line="569"/>
+ <location filename="openlp/core/lib/mediamanageritem.py" line="570"/>
<source>You must select an existing service item to add to.</source>
<translation>Du er nødt til at vælge et eksisterende programpunkt for at tilføje.</translation>
</message>
<message>
- <location filename="openlp/core/lib/mediamanageritem.py" line="578"/>
+ <location filename="openlp/core/lib/mediamanageritem.py" line="579"/>
<source>Invalid Service Item</source>
<translation>Ugyldigt programpunkt</translation>
</message>
<message>
- <location filename="openlp/core/lib/mediamanageritem.py" line="578"/>
+ <location filename="openlp/core/lib/mediamanageritem.py" line="579"/>
<source>You must select a %s service item.</source>
<translation>Du er nødt til at vælge et %s programpunkt.</translation>
</message>
<message>
- <location filename="openlp/core/lib/mediamanageritem.py" line="536"/>
+ <location filename="openlp/core/lib/mediamanageritem.py" line="537"/>
<source>You must select one or more items to add.</source>
<translation>Du er nødt til at vælge et eller flere punkter for at tilføje.</translation>
</message>
<message>
- <location filename="openlp/core/lib/mediamanageritem.py" line="608"/>
+ <location filename="openlp/core/lib/mediamanageritem.py" line="609"/>
<source>No Search Results</source>
<translation>Ingen søgeresultater</translation>
</message>
<message>
- <location filename="openlp/core/lib/mediamanageritem.py" line="364"/>
+ <location filename="openlp/core/lib/mediamanageritem.py" line="365"/>
<source>Invalid File Type</source>
<translation>Ugyldig filtype</translation>
</message>
<message>
- <location filename="openlp/core/lib/mediamanageritem.py" line="364"/>
+ <location filename="openlp/core/lib/mediamanageritem.py" line="365"/>
<source>Invalid File %s.
Suffix not supported</source>
<translation>Ugyldig fil %s.
Endelsen er ikke understøttet</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/lib/mediaitem.py" line="166"/>
+ <location filename="openlp/plugins/songs/lib/mediaitem.py" line="129"/>
<source>&Clone</source>
<translation>&Klon</translation>
</message>
<message>
- <location filename="openlp/core/lib/mediamanageritem.py" line="407"/>
+ <location filename="openlp/core/lib/mediamanageritem.py" line="408"/>
<source>Duplicate files were found on import and were ignored.</source>
<translation>Duplikerede filer blev fundet ved importeringen og blev ignoreret.</translation>
</message>
@@ -3854,12 +3854,12 @@
<context>
<name>OpenLP.OpenLyricsImportError</name>
<message>
- <location filename="openlp/plugins/songs/lib/xml.py" line="733"/>
+ <location filename="openlp/plugins/songs/lib/xml.py" line="761"/>
<source><lyrics> tag is missing.</source>
<translation><lyrics>-mærke mangler.</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/lib/xml.py" line="740"/>
+ <location filename="openlp/plugins/songs/lib/xml.py" line="768"/>
<source><verse> tag is missing.</source>
<translation><verse>-mærke mangler.</translation>
</message>
@@ -4014,12 +4014,12 @@
<context>
<name>OpenLP.ServiceItem</name>
<message>
- <location filename="openlp/core/lib/serviceitem.py" line="484"/>
+ <location filename="openlp/core/lib/serviceitem.py" line="490"/>
<source><strong>Start</strong>: %s</source>
<translation><strong>Start</strong>: %s</translation>
</message>
<message>
- <location filename="openlp/core/lib/serviceitem.py" line="488"/>
+ <location filename="openlp/core/lib/serviceitem.py" line="494"/>
<source><strong>Length</strong>: %s</source>
<translation><strong>Varighed</strong>: %s</translation>
</message>
@@ -4035,184 +4035,184 @@
<context>
<name>OpenLP.ServiceManager</name>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="183"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="184"/>
<source>Move to &top</source>
<translation>Flyt til &top</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="183"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="184"/>
<source>Move item to the top of the service.</source>
<translation>Flyt punkt til toppen af programmet.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="189"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="190"/>
<source>Move &up</source>
<translation>Flyt &op</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="189"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="190"/>
<source>Move item up one position in the service.</source>
<translation>Flyt punkt en placering op i programmet.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="210"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="211"/>
<source>Move &down</source>
<translation>Flyt &ned</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="196"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="197"/>
<source>Move item down one position in the service.</source>
<translation>Flyt punkt en placering ned i programmet.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="203"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="204"/>
<source>Move to &bottom</source>
<translation>Flyt til &bunden</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="203"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="204"/>
<source>Move item to the end of the service.</source>
<translation>Flyt punkt til slutningen af programmet.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="223"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="224"/>
<source>&Delete From Service</source>
<translation>&Slet fra programmet</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="223"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="224"/>
<source>Delete the selected item from the service.</source>
<translation>Slet det valgte punkt fra programmet.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="288"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="289"/>
<source>&Add New Item</source>
<translation>&Tilføj nyt punkt</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="291"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="292"/>
<source>&Add to Selected Item</source>
<translation>&Tilføj til det valgte punkt</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="296"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="297"/>
<source>&Edit Item</source>
<translation>&Redigér punkt</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="299"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="300"/>
<source>&Reorder Item</source>
<translation>&Omrokér punkt</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="303"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="304"/>
<source>&Notes</source>
<translation>&Noter</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="319"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="320"/>
<source>&Change Item Theme</source>
<translation>&Ændr tema for punkt</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="635"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="636"/>
<source>OpenLP Service Files (*.osz)</source>
<translation>OpenLP-programfiler (*.osz)</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="664"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="665"/>
<source>File is not a valid service.
The content encoding is not UTF-8.</source>
<translation>Fil er ikke et gyldigt program.
Indholdet er ikke UTF-8.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="706"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="710"/>
<source>File is not a valid service.</source>
<translation>Fil er ikke et gyldigt program.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="1313"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="1317"/>
<source>Missing Display Handler</source>
<translation>Mangler visningsmodul</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="1261"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="1265"/>
<source>Your item cannot be displayed as there is no handler to display it</source>
<translation>Dit punkt kan ikke blive vist da der ikke er noget modul til at vise det</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="1313"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="1317"/>
<source>Your item cannot be displayed as the plugin required to display it is missing or inactive</source>
<translation>Dit punkt kan ikke vises da udvidelsesmodulet der skal vise det enten mangler, eller er inaktiv</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="232"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="233"/>
<source>&Expand all</source>
<translation>&Udvid alle</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="232"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="233"/>
<source>Expand all the service items.</source>
<translation>Udvid alle programpunkterne.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="238"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="239"/>
<source>&Collapse all</source>
<translation>&Sammenfold alle</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="238"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="239"/>
<source>Collapse all the service items.</source>
<translation>Sammenfold alle programpunkterne.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="421"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="422"/>
<source>Open File</source>
<translation>Åbn fil</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="210"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="211"/>
<source>Moves the selection down the window.</source>
<translation>Flytter markeringen ned i vinduet.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="216"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="217"/>
<source>Move up</source>
<translation>Flyt op</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="216"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="217"/>
<source>Moves the selection up the window.</source>
<translation>Flytter markeringen op i vinduet.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="246"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="247"/>
<source>Go Live</source>
<translation>Fremvis</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="246"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="247"/>
<source>Send the selected item to Live.</source>
<translation>Fremvis det valgte punkt.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="307"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="308"/>
<source>&Start Time</source>
<translation>&Starttid</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="313"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="314"/>
<source>Show &Preview</source>
<translation>&Forhåndsvis</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="438"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="439"/>
<source>Modified Service</source>
<translation>Ændret program</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="438"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="439"/>
<source>The current service has been modified. Would you like to save this service?</source>
<translation>Det nuværende program er blevet ændret. Vil du gemme dette program?</translation>
</message>
@@ -4232,87 +4232,87 @@
<translation>Afspilningstid:</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="343"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="344"/>
<source>Untitled Service</source>
<translation>Unavngivet program</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="712"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="716"/>
<source>File could not be opened because it is corrupt.</source>
<translation>Fil kunne ikke åbnes da den er defekt.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="718"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="722"/>
<source>Empty File</source>
<translation>Tom fil</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="718"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="722"/>
<source>This service file does not contain any data.</source>
<translation>Denne programfil indeholder ingen data.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="725"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="729"/>
<source>Corrupt File</source>
<translation>Defekt fil</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="132"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="133"/>
<source>Load an existing service.</source>
<translation>Indlæs et eksisterende program.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="136"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="137"/>
<source>Save this service.</source>
<translation>Gem dette program.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="146"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="147"/>
<source>Select a theme for the service.</source>
<translation>Vælg et tema for dette program.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="725"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="729"/>
<source>This file is either corrupt or it is not an OpenLP 2.0 service file.</source>
<translation>Denne fil er enten defekt, eller også er det ikke en OpenLP 2.0 programfil.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="1066"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="1070"/>
<source>Slide theme</source>
<translation>Diastema</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="1070"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="1074"/>
<source>Notes</source>
<translation>Noter</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="1061"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="1065"/>
<source>Edit</source>
<translation>Redigér</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="1061"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="1065"/>
<source>Service copy only</source>
<translation>Bare kopi i programmet</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="577"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="578"/>
<source>Error Saving File</source>
<translation>Fejl ved lagring af fil</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="577"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="578"/>
<source>There was an error saving your file.</source>
<translation>Der opstod en fejl ved lagring af din fil.</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="507"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="508"/>
<source>Service File(s) Missing</source>
<translation>Programfil(er) mangler</translation>
</message>
<message>
- <location filename="openlp/core/ui/servicemanager.py" line="509"/>
+ <location filename="openlp/core/ui/servicemanager.py" line="510"/>
<source>The following file(s) in the service are missing:
<byte value="x9"/>%s
@@ -4326,7 +4326,7 @@
<context>
<name>OpenLP.ServiceNoteForm</name>
<message>
- <location filename="openlp/core/ui/servicenoteform.py" line="65"/>
+ <location filename="openlp/core/ui/servicenoteform.py" line="66"/>
<source>Service Item Notes</source>
<translation>Noter til programpunkter</translation>
</message>
@@ -4410,27 +4410,27 @@
<context>
<name>OpenLP.SlideController</name>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="202"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="201"/>
<source>Hide</source>
<translation>Gem</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="281"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="280"/>
<source>Go To</source>
<translation>Gå til</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="205"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="204"/>
<source>Blank Screen</source>
<translation>Blank skærm</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="210"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="209"/>
<source>Blank to Theme</source>
<translation>Vis temabaggrund</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="215"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="214"/>
<source>Show Desktop</source>
<translation>Vis skrivebord</translation>
</message>
@@ -4450,37 +4450,37 @@
<translation>Forlad punkt</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="178"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="177"/>
<source>Move to previous.</source>
<translation>Gå til forrige.</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="187"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="186"/>
<source>Move to next.</source>
<translation>Gå til næste.</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="231"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="230"/>
<source>Play Slides</source>
<translation>Afspil dias</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="255"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="254"/>
<source>Delay between slides in seconds.</source>
<translation>Forsinkelse mellem dias i sekunder.</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="259"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="258"/>
<source>Move to live.</source>
<translation>Fremvis.</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="263"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="262"/>
<source>Add to Service.</source>
<translation>Tilføj til program.</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="268"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="267"/>
<source>Edit and reload song preview.</source>
<translation>Redigér og genindlæs forhåndsvisning af sang.</translation>
</message>
@@ -4490,7 +4490,7 @@
<translation>Start afspilning af medie.</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="285"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="284"/>
<source>Pause audio.</source>
<translation>Sæt lyd på pause.</translation>
</message>
@@ -4550,32 +4550,32 @@
<translation>Gå til "Anden"</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="178"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="177"/>
<source>Previous Slide</source>
<translation>Forrige dias</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="187"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="186"/>
<source>Next Slide</source>
<translation>Næste dias</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="285"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="284"/>
<source>Pause Audio</source>
<translation>Sæt lyd på pause</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="292"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="291"/>
<source>Background Audio</source>
<translation>Baggrundslyd</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="298"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="297"/>
<source>Go to next audio track.</source>
<translation>Gå til næste lydspor.</translation>
</message>
<message>
- <location filename="openlp/core/ui/slidecontroller.py" line="305"/>
+ <location filename="openlp/core/ui/slidecontroller.py" line="304"/>
<source>Tracks</source>
<translation>Spor</translation>
</message>
@@ -4746,7 +4746,7 @@
<message>
<location filename="openlp/core/ui/thememanager.py" line="801"/>
<source>Theme %s is used in the %s plugin.</source>
- <translation>Temaet %s bruges i tilføjelsen %s.</translation>
+ <translation>Temaet %s bruges i %s-udvidelsen.</translation>
</message>
<message>
<location filename="openlp/core/ui/thememanager.py" line="380"/>
@@ -4945,7 +4945,7 @@
<message>
<location filename="openlp/core/ui/themewizard.py" line="470"/>
<source>Define the font and display characteristics for the Display text</source>
- <translation>Definér skrifttypen og visningskarakteristik for visningsteksten</translation>
+ <translation>Bestem skrifttypen og andre detaljer for visningsteksten</translation>
</message>
<message>
<location filename="openlp/core/ui/themewizard.py" line="495"/>
@@ -4965,7 +4965,7 @@
<message>
<location filename="openlp/core/ui/themewizard.py" line="480"/>
<source>&Outline:</source>
- <translation>&Disposition:</translation>
+ <translation>&Kant:</translation>
</message>
<message>
<location filename="openlp/core/ui/themewizard.py" line="484"/>
@@ -4990,7 +4990,7 @@
<message>
<location filename="openlp/core/ui/themewizard.py" line="492"/>
<source>Define the font and display characteristics for the Footer text</source>
- <translation>Definér skrifttypen og visningskarakteristik for teksten i sidefoden</translation>
+ <translation>Bestem skrifttypen og andre detaljer for teksten i sidefoden</translation>
</message>
<message>
<location filename="openlp/core/ui/themewizard.py" line="499"/>
@@ -5000,7 +5000,7 @@
<message>
<location filename="openlp/core/ui/themewizard.py" line="501"/>
<source>Allows additional display formatting information to be defined</source>
- <translation>Tillader yderligere indstillingsmuligheder for hvordan teksten skal vises</translation>
+ <translation>Yderligere indstillingsmuligheder for hvordan teksten skal vises</translation>
</message>
<message>
<location filename="openlp/core/ui/themewizard.py" line="504"/>
@@ -5078,7 +5078,7 @@
<translation>Temanavn:</translation>
</message>
<message>
- <location filename="openlp/core/ui/themeform.py" line="329"/>
+ <location filename="openlp/core/ui/themeform.py" line="331"/>
<source>Edit Theme - %s</source>
<translation>Redigér tema - %s</translation>
</message>
@@ -5130,50 +5130,50 @@
<message>
<location filename="openlp/core/ui/themewizard.py" line="555"/>
<source>Preview and Save</source>
- <translation>Forhåndsvis og gem</translation>
+ <translation>Gennemse og gem</translation>
</message>
<message>
<location filename="openlp/core/ui/themewizard.py" line="557"/>
<source>Preview the theme and save it.</source>
- <translation>Forhåndsvis temaet og gem det.</translation>
+ <translation>Gennemse temaet og gem det.</translation>
</message>
<message>
- <location filename="openlp/core/ui/themeform.py" line="209"/>
+ <location filename="openlp/core/ui/themeform.py" line="211"/>
<source>(approximately %d lines per slide)</source>
<translation>(omkring %d linjer per dias)</translation>
</message>
<message>
- <location filename="openlp/core/ui/themeform.py" line="237"/>
+ <location filename="openlp/core/ui/themeform.py" line="239"/>
<source>Background Image Empty</source>
<translation>Baggrundsbillede er tomt</translation>
</message>
<message>
- <location filename="openlp/core/ui/themeform.py" line="237"/>
+ <location filename="openlp/core/ui/themeform.py" line="239"/>
<source>You have not selected a background image. Please select one before continuing.</source>
<translation>Du har ikke valgt et baggrundsbillede. Vælg venligst et før du fortsætter.</translation>
</message>
<message>
- <location filename="openlp/core/ui/themeform.py" line="541"/>
+ <location filename="openlp/core/ui/themeform.py" line="543"/>
<source>Select Image</source>
<translation>Vælg billede</translation>
</message>
<message>
- <location filename="openlp/core/ui/themeform.py" line="623"/>
+ <location filename="openlp/core/ui/themeform.py" line="631"/>
<source>Theme Name Missing</source>
<translation>Temanavn mangler</translation>
</message>
<message>
- <location filename="openlp/core/ui/themeform.py" line="623"/>
+ <location filename="openlp/core/ui/themeform.py" line="631"/>
<source>There is no name for this theme. Please enter one.</source>
<translation>Der er ikke givet noget navn til dette tema. Indtast venligst et.</translation>
</message>
<message>
- <location filename="openlp/core/ui/themeform.py" line="629"/>
+ <location filename="openlp/core/ui/themeform.py" line="637"/>
<source>Theme Name Invalid</source>
<translation>Temanavn ugyldigt</translation>
</message>
<message>
- <location filename="openlp/core/ui/themeform.py" line="629"/>
+ <location filename="openlp/core/ui/themeform.py" line="637"/>
<source>Invalid theme name. Please enter one.</source>
<translation>Ugyldigt temanavn. Indtast venligst et nyt.</translation>
</message>
@@ -5198,7 +5198,7 @@
<message>
<location filename="openlp/core/ui/themestab.py" line="120"/>
<source>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.</source>
- <translation>Benyt temaer fra hver sang i databasen. Hvis en sang ikke er forbundet med et tema, så benyt programmets tema. Hvis programmet ikke har et tema, benyt så det globale tema.</translation>
+ <translation>Benytter hver enkelte sangs individuelle tema. Hvis en sang ikke er forbundet med et tema benyttes programmets tema. Hvis programmet ikke har et tema tilknyttet, da benyttes det globale tema.</translation>
</message>
<message>
<location filename="openlp/core/ui/themestab.py" line="125"/>
@@ -5208,7 +5208,7 @@
<message>
<location filename="openlp/core/ui/themestab.py" line="127"/>
<source>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.</source>
- <translation>Benyt temaet fra programmet, hvorved de individuelle sanges temaer tilsidesættes. Hvis programmet ikke har et tema, så benyt det globale tema.</translation>
+ <translation>Benytter programmets tema, hvorved de individuelle sanges temaer tilsidesættes. Hvis programmet ikke har et tema tilknyttet, da benyttes det globale tema.</translation>
</message>
<message>
<location filename="openlp/core/ui/themestab.py" line="131"/>
@@ -5218,7 +5218,7 @@
<message>
<location filename="openlp/core/ui/themestab.py" line="133"/>
<source>Use the global theme, overriding any themes associated with either the service or the songs.</source>
- <translation>Benyt det globale tema, hvormed alle temaer tilknyttet til enten programmet eller sangene tilsidesættes.</translation>
+ <translation>Benytter det globale tema, hvormed alle temaer tilknyttet enten programmet eller de individuelle sange tilsidesættes.</translation>
</message>
<message>
<location filename="openlp/core/ui/themestab.py" line="43"/>
@@ -5271,7 +5271,7 @@
<message>
<location filename="openlp/core/lib/ui.py" line="67"/>
<source>CCLI number:</source>
- <translation>CCLI nummer:</translation>
+ <translation>CCLI-nummer:</translation>
</message>
<message>
<location filename="openlp/core/lib/ui.py" line="68"/>
@@ -5299,185 +5299,185 @@
<translation>Eksportér</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="80"/>
+ <location filename="openlp/core/lib/ui.py" line="84"/>
<source>pt</source>
<comment>Abbreviated font pointsize unit</comment>
<translation>pkt</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="89"/>
+ <location filename="openlp/core/lib/ui.py" line="93"/>
<source>Image</source>
<translation>Billede</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="90"/>
+ <location filename="openlp/core/lib/ui.py" line="94"/>
<source>Import</source>
<translation>Importér</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="92"/>
+ <location filename="openlp/core/lib/ui.py" line="96"/>
<source>Live</source>
<translation>Fremvisning</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="93"/>
+ <location filename="openlp/core/lib/ui.py" line="97"/>
<source>Live Background Error</source>
<translation>Fejl med fremvisningsbaggrund</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="95"/>
+ <location filename="openlp/core/lib/ui.py" line="99"/>
<source>Load</source>
<translation>Indlæs</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="98"/>
+ <location filename="openlp/core/lib/ui.py" line="102"/>
<source>Middle</source>
<translation>Midt</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="99"/>
+ <location filename="openlp/core/lib/ui.py" line="103"/>
<source>New</source>
<translation>Ny</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="100"/>
+ <location filename="openlp/core/lib/ui.py" line="104"/>
<source>New Service</source>
<translation>Nyt program</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="101"/>
+ <location filename="openlp/core/lib/ui.py" line="105"/>
<source>New Theme</source>
<translation>Nyt tema</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="104"/>
+ <location filename="openlp/core/lib/ui.py" line="108"/>
<source>No File Selected</source>
<comment>Singular</comment>
<translation>Ingen fil valgt</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="105"/>
+ <location filename="openlp/core/lib/ui.py" line="109"/>
<source>No Files Selected</source>
<comment>Plural</comment>
<translation>Ingen filer valgt</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="106"/>
+ <location filename="openlp/core/lib/ui.py" line="110"/>
<source>No Item Selected</source>
<comment>Singular</comment>
<translation>Intet punkt valgt</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="107"/>
+ <location filename="openlp/core/lib/ui.py" line="111"/>
<source>No Items Selected</source>
<comment>Plural</comment>
<translation>Ingen punkter valgt</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="108"/>
+ <location filename="openlp/core/lib/ui.py" line="112"/>
<source>openlp.org 1.x</source>
<translation>openlp.org 1.x</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="109"/>
+ <location filename="openlp/core/lib/ui.py" line="113"/>
<source>OpenLP 2.0</source>
<translation>OpenLP 2.0</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="115"/>
+ <location filename="openlp/core/lib/ui.py" line="119"/>
<source>Preview</source>
<translation>Forhåndsvisning</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="117"/>
+ <location filename="openlp/core/lib/ui.py" line="121"/>
<source>Replace Background</source>
<translation>Erstat baggrund</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="119"/>
+ <location filename="openlp/core/lib/ui.py" line="123"/>
<source>Reset Background</source>
<translation>Nulstil baggrund</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="121"/>
+ <location filename="openlp/core/lib/ui.py" line="125"/>
<source>s</source>
<comment>The abbreviated unit for seconds</comment>
<translation>s</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="123"/>
+ <location filename="openlp/core/lib/ui.py" line="127"/>
<source>Save && Preview</source>
<translation>Gem && forhåndsvis</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="124"/>
+ <location filename="openlp/core/lib/ui.py" line="128"/>
<source>Search</source>
<translation>Søg</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="127"/>
+ <location filename="openlp/core/lib/ui.py" line="131"/>
<source>You must select an item to delete.</source>
<translation>Vælg et punkt der skal slettes.</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="129"/>
+ <location filename="openlp/core/lib/ui.py" line="133"/>
<source>You must select an item to edit.</source>
<translation>Vælg et punkt der skal redigeres.</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="132"/>
+ <location filename="openlp/core/lib/ui.py" line="136"/>
<source>Save Service</source>
<translation>Gem program</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="133"/>
- <source>Service</source>
- <translation>Program</translation>
- </message>
- <message>
<location filename="openlp/core/lib/ui.py" line="137"/>
+ <source>Service</source>
+ <translation>Program</translation>
+ </message>
+ <message>
+ <location filename="openlp/core/lib/ui.py" line="141"/>
<source>Start %s</source>
<translation>Begynd %s</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="142"/>
+ <location filename="openlp/core/lib/ui.py" line="146"/>
<source>Theme</source>
<comment>Singular</comment>
<translation>Tema</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="143"/>
+ <location filename="openlp/core/lib/ui.py" line="147"/>
<source>Themes</source>
<comment>Plural</comment>
<translation>Temaer</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="145"/>
+ <location filename="openlp/core/lib/ui.py" line="149"/>
<source>Top</source>
<translation>Top</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="149"/>
+ <location filename="openlp/core/lib/ui.py" line="153"/>
<source>Version</source>
<translation>Udgave</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="305"/>
+ <location filename="openlp/core/lib/ui.py" line="309"/>
<source>Delete the selected item.</source>
<translation>Slet det valgte punkt.</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="309"/>
+ <location filename="openlp/core/lib/ui.py" line="313"/>
<source>Move selection up one position.</source>
<translation>Flyt markering en position op.</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="313"/>
+ <location filename="openlp/core/lib/ui.py" line="317"/>
<source>Move selection down one position.</source>
<translation>Flyt markering en position ned.</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="466"/>
+ <location filename="openlp/core/lib/ui.py" line="470"/>
<source>&Vertical Align:</source>
<translation>&Justér lodret:</translation>
</message>
@@ -5630,64 +5630,64 @@
<translation>Fil</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="82"/>
+ <location filename="openlp/core/lib/ui.py" line="86"/>
<source>Help</source>
<translation>Hjælp</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="83"/>
+ <location filename="openlp/core/lib/ui.py" line="87"/>
<source>h</source>
<comment>The abbreviated unit for hours</comment>
<translation>t</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="91"/>
+ <location filename="openlp/core/lib/ui.py" line="95"/>
<source>Layout style:</source>
<translation>Layoutstil:</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="94"/>
+ <location filename="openlp/core/lib/ui.py" line="98"/>
<source>Live Toolbar</source>
<translation>Værktøjslinje for fremvisning</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="96"/>
+ <location filename="openlp/core/lib/ui.py" line="100"/>
<source>m</source>
<comment>The abbreviated unit for minutes</comment>
<translation>m</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="110"/>
+ <location filename="openlp/core/lib/ui.py" line="114"/>
<source>OpenLP is already running. Do you wish to continue?</source>
<translation>OpenLP kører allerede. Vil du fortsætte?</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="131"/>
+ <location filename="openlp/core/lib/ui.py" line="135"/>
<source>Settings</source>
<translation>Indstillinger</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="144"/>
+ <location filename="openlp/core/lib/ui.py" line="148"/>
<source>Tools</source>
<translation>Værktøjer</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="146"/>
+ <location filename="openlp/core/lib/ui.py" line="150"/>
<source>Unsupported File</source>
<translation>Ikke understøttet fil</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="147"/>
+ <location filename="openlp/core/lib/ui.py" line="151"/>
<source>Verse Per Slide</source>
<translation>Vers per dias</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="148"/>
+ <location filename="openlp/core/lib/ui.py" line="152"/>
<source>Verse Per Line</source>
<translation>Vers per linje</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="150"/>
+ <location filename="openlp/core/lib/ui.py" line="154"/>
<source>View</source>
<translation>Vis</translation>
</message>
@@ -5702,32 +5702,32 @@
<translation>XML syntaksfejl</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="151"/>
+ <location filename="openlp/core/lib/ui.py" line="155"/>
<source>View Mode</source>
<translation>Visningstilstand</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="112"/>
+ <location filename="openlp/core/lib/ui.py" line="116"/>
<source>Open service.</source>
<translation>Åbn program.</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="116"/>
+ <location filename="openlp/core/lib/ui.py" line="120"/>
<source>Print Service</source>
<translation>Udskriv program</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="118"/>
+ <location filename="openlp/core/lib/ui.py" line="122"/>
<source>Replace live background.</source>
<translation>Erstat fremvisningsbaggrund.</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="120"/>
+ <location filename="openlp/core/lib/ui.py" line="124"/>
<source>Reset live background.</source>
<translation>Nulstil fremvisningsbaggrund.</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="135"/>
+ <location filename="openlp/core/lib/ui.py" line="139"/>
<source>Split a slide into two only if it does not fit on the screen as one slide.</source>
<translation>Del kun et dias op i to, hvis det ikke kan passe ind på skærmen som ét dias.</translation>
</message>
@@ -5742,61 +5742,61 @@
<translation>Bekræft sletning</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="113"/>
+ <location filename="openlp/core/lib/ui.py" line="117"/>
<source>Play Slides in Loop</source>
<translation>Afspil dias i løkke</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="114"/>
+ <location filename="openlp/core/lib/ui.py" line="118"/>
<source>Play Slides to End</source>
<translation>Afspil dias til slut</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="138"/>
+ <location filename="openlp/core/lib/ui.py" line="142"/>
<source>Stop Play Slides in Loop</source>
<translation>Stop afspilning af dias i løkke</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="140"/>
+ <location filename="openlp/core/lib/ui.py" line="144"/>
<source>Stop Play Slides to End</source>
<translation>Stop afspilning af dias til slut</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="102"/>
+ <location filename="openlp/core/lib/ui.py" line="106"/>
<source>Next Track</source>
<translation>Næste spor</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="125"/>
+ <location filename="openlp/core/lib/ui.py" line="129"/>
<source>Search Themes...</source>
<comment>Search bar place holder text </comment>
<translation>Søg efter temaer...</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="134"/>
+ <location filename="openlp/core/lib/ui.py" line="138"/>
<source>Optional &Split</source>
<translation>Valgfri &opdeling</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="85"/>
+ <location filename="openlp/core/lib/ui.py" line="89"/>
<source>Invalid Folder Selected</source>
<comment>Singular</comment>
<translation>Ugyldig mappe valgt</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="87"/>
+ <location filename="openlp/core/lib/ui.py" line="91"/>
<source>Invalid File Selected</source>
<comment>Singular</comment>
<translation>Ugyldigt fil valgt</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="88"/>
+ <location filename="openlp/core/lib/ui.py" line="92"/>
<source>Invalid Files Selected</source>
<comment>Plural</comment>
<translation>Ugyldige filer valgt</translation>
</message>
<message>
- <location filename="openlp/core/lib/ui.py" line="103"/>
+ <location filename="openlp/core/lib/ui.py" line="107"/>
<source>No Folder Selected</source>
<comment>Singular</comment>
<translation>Ingen mappe valgt</translation>
@@ -5823,29 +5823,41 @@
<source>Importing Songs</source>
<translation>Importerer sange</translation>
</message>
+ <message>
+ <location filename="openlp/core/lib/ui.py" line="80"/>
+ <source>File Not Found</source>
+ <translation>Fil ikke fundet</translation>
+ </message>
+ <message>
+ <location filename="openlp/core/lib/ui.py" line="82"/>
+ <source>File %s not found.
+Please try selecting it individually.</source>
+ <translation>Filen %s kunne ikke findes.
+Prøv at vælg den individuelt.</translation>
+ </message>
</context>
<context>
<name>OpenLP.core.lib</name>
<message>
- <location filename="openlp/core/lib/__init__.py" line="370"/>
+ <location filename="openlp/core/lib/__init__.py" line="374"/>
<source>%1 and %2</source>
<comment>Locale list separator: 2 items</comment>
<translation>%1 og %2</translation>
</message>
<message>
- <location filename="openlp/core/lib/__init__.py" line="373"/>
+ <location filename="openlp/core/lib/__init__.py" line="377"/>
<source>%1, and %2</source>
<comment>Locale list separator: end</comment>
<translation>%1, og %2</translation>
</message>
<message>
- <location filename="openlp/core/lib/__init__.py" line="376"/>
+ <location filename="openlp/core/lib/__init__.py" line="380"/>
<source>%1, %2</source>
<comment>Locale list separator: middle</comment>
<translation>%1, %2</translation>
</message>
<message>
- <location filename="openlp/core/lib/__init__.py" line="378"/>
+ <location filename="openlp/core/lib/__init__.py" line="382"/>
<source>%1, %2</source>
<comment>Locale list separator: start</comment>
<translation>%1, %2</translation>
@@ -5905,52 +5917,52 @@
<context>
<name>PresentationPlugin.MediaItem</name>
<message>
- <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="75"/>
+ <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="76"/>
<source>Select Presentation(s)</source>
<translation>Vælg præsentation(er)</translation>
</message>
<message>
- <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="77"/>
+ <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="78"/>
<source>Automatic</source>
<translation>Automatisk</translation>
</message>
<message>
- <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="79"/>
+ <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="80"/>
<source>Present using:</source>
<translation>Præsentér med:</translation>
</message>
<message>
- <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="194"/>
+ <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="195"/>
<source>File Exists</source>
<translation>Fil eksisterer</translation>
</message>
<message>
- <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="194"/>
+ <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="195"/>
<source>A presentation with that filename already exists.</source>
<translation>En præsentation med dette filnavn eksisterer allerede.</translation>
</message>
<message>
- <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="223"/>
+ <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="224"/>
<source>This type of presentation is not supported.</source>
<translation>Denne type præsentation er ikke understøttet.</translation>
</message>
<message>
- <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="95"/>
+ <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="96"/>
<source>Presentations (%s)</source>
<translation>Præsentationer (%s)</translation>
</message>
<message>
- <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="317"/>
+ <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="318"/>
<source>Missing Presentation</source>
<translation>Manglende præsentation</translation>
</message>
<message>
- <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="306"/>
+ <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="307"/>
<source>The presentation %s is incomplete, please reload.</source>
<translation>Præsentationen %s er ufuldstændig. Vær venlig at genindlæse den.</translation>
</message>
<message>
- <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="317"/>
+ <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="318"/>
<source>The presentation %s no longer exists.</source>
<translation>Præsentationen %s eksisterer ikke længere.</translation>
</message>
@@ -6137,12 +6149,12 @@
<message>
<location filename="openlp/plugins/remotes/lib/remotetab.py" line="116"/>
<source>Remote URL:</source>
- <translation>Fjern URL:</translation>
+ <translation>Fjern-URL:</translation>
</message>
<message>
<location filename="openlp/plugins/remotes/lib/remotetab.py" line="118"/>
<source>Stage view URL:</source>
- <translation>Scenevisnings URL:</translation>
+ <translation>Scenevisning-URL:</translation>
</message>
<message>
<location filename="openlp/plugins/remotes/lib/remotetab.py" line="120"/>
@@ -6289,7 +6301,7 @@
<message>
<location filename="openlp/plugins/songusage/forms/songusagedetaildialog.py" line="91"/>
<source>Select Date Range</source>
- <translation>Vælg datoomfang</translation>
+ <translation>Angiv tidsinterval</translation>
</message>
<message>
<location filename="openlp/plugins/songusage/forms/songusagedetaildialog.py" line="94"/>
@@ -6299,7 +6311,7 @@
<message>
<location filename="openlp/plugins/songusage/forms/songusagedetaildialog.py" line="96"/>
<source>Report Location</source>
- <translation>Rapportér lokation</translation>
+ <translation>Placering af rapport</translation>
</message>
<message>
<location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="80"/>
@@ -6567,12 +6579,12 @@
<context>
<name>SongsPlugin.EasyWorshipSongImport</name>
<message>
- <location filename="openlp/plugins/songs/lib/ewimport.py" line="168"/>
+ <location filename="openlp/plugins/songs/lib/ewimport.py" line="176"/>
<source>Administered by %s</source>
<translation>Administreret af %s</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/lib/ewimport.py" line="220"/>
+ <location filename="openlp/plugins/songs/lib/ewimport.py" line="231"/>
<source>
[above are Song Tags with notes imported from
EasyWorship]</source>
@@ -6597,205 +6609,210 @@
<context>
<name>SongsPlugin.EditSongForm</name>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="295"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="294"/>
<source>Song Editor</source>
<translation>Sangredigering</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="297"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="296"/>
<source>&Title:</source>
<translation>&Titel:</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="299"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="298"/>
<source>Alt&ernate title:</source>
<translation>Alt&ernativ titel:</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="301"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="300"/>
<source>&Lyrics:</source>
<translation>&Sangtekst:</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="303"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="302"/>
<source>&Verse order:</source>
<translation>&Rækkefølge af vers:</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="307"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="306"/>
<source>Ed&it All</source>
<translation>Re&digér alle</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="310"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="309"/>
<source>Title && Lyrics</source>
<translation>Titel && sangtekst</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="314"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="313"/>
<source>&Add to Song</source>
<translation>&Tilføj til sang</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="354"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="353"/>
<source>&Remove</source>
<translation>&Fjern</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="318"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="317"/>
<source>&Manage Authors, Topics, Song Books</source>
<translation>&Administrér forfattere, emner, sangbøger</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="321"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="320"/>
<source>A&dd to Song</source>
<translation>T&ilføj til sang</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="323"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="322"/>
<source>R&emove</source>
<translation>F&jern</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="326"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="325"/>
<source>Book:</source>
<translation>Bog:</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="328"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="327"/>
<source>Number:</source>
<translation>Nummer:</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="330"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="329"/>
<source>Authors, Topics && Song Book</source>
<translation>Forfattere, emner && sangbøger</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="335"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="334"/>
<source>New &Theme</source>
<translation>Nyt &tema</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="337"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="336"/>
<source>Copyright Information</source>
<translation>Information om ophavsret</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="341"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="340"/>
<source>Comments</source>
<translation>Kommentarer</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="343"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="342"/>
<source>Theme, Copyright Info && Comments</source>
<translation>Tema, ophavsret && kommentarer</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongform.py" line="357"/>
+ <location filename="openlp/plugins/songs/forms/editsongform.py" line="384"/>
<source>Add Author</source>
<translation>Tilføj forfatter</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongform.py" line="357"/>
+ <location filename="openlp/plugins/songs/forms/editsongform.py" line="384"/>
<source>This author does not exist, do you want to add them?</source>
<translation>Denne forfatter eksisterer ikke. Vil du tilføje dem?</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongform.py" line="380"/>
+ <location filename="openlp/plugins/songs/forms/editsongform.py" line="407"/>
<source>This author is already in the list.</source>
<translation>Denne forfatter er allerede på listen.</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongform.py" line="387"/>
+ <location filename="openlp/plugins/songs/forms/editsongform.py" line="414"/>
<source>You have not selected a valid author. Either select an author from the list, or type in a new author and click the "Add Author to Song" button to add the new author.</source>
<translation>Du har ikke valgt en gyldig forfatter. Vælg enten en forfatter fra listen, eller indtast en ny forfatter og klik på "Tilføj forfatter til sang"-knappen for at tilføje den nye forfatter.</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongform.py" line="415"/>
+ <location filename="openlp/plugins/songs/forms/editsongform.py" line="442"/>
<source>Add Topic</source>
<translation>Tilføj emne</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongform.py" line="415"/>
+ <location filename="openlp/plugins/songs/forms/editsongform.py" line="442"/>
<source>This topic does not exist, do you want to add it?</source>
<translation>Dette emne eksisterer ikke. Vil du tilføje det?</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongform.py" line="436"/>
+ <location filename="openlp/plugins/songs/forms/editsongform.py" line="463"/>
<source>This topic is already in the list.</source>
<translation>Dette emne er allerede på listen.</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongform.py" line="446"/>
+ <location filename="openlp/plugins/songs/forms/editsongform.py" line="473"/>
<source>You have not selected a valid topic. Either select a topic from the list, or type in a new topic and click the "Add Topic to Song" button to add the new topic.</source>
<translation>Du har ikke valgt et gyldigt emne. Vælg enten et emne fra listen, eller indtast et nyt emne og klik på "Tilføj emne til sang"-knappen for at tilføje det nye emne.</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongform.py" line="656"/>
+ <location filename="openlp/plugins/songs/forms/editsongform.py" line="688"/>
<source>You need to type in a song title.</source>
<translation>Vælg først en sangtitel.</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongform.py" line="663"/>
+ <location filename="openlp/plugins/songs/forms/editsongform.py" line="695"/>
<source>You need to type in at least one verse.</source>
<translation>Skriv mindst ét vers.</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongform.py" line="639"/>
+ <location filename="openlp/plugins/songs/forms/editsongform.py" line="671"/>
<source>The verse order is invalid. There is no verse corresponding to %s. Valid entries are %s.</source>
<translation>Rækkefølgen af vers er ikke gyldig. Der ikke noget vers som svarer til %s. Gyldige elementer er %s.</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongform.py" line="681"/>
+ <location filename="openlp/plugins/songs/forms/editsongform.py" line="713"/>
<source>Add Book</source>
<translation>Tilføj bog</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongform.py" line="681"/>
+ <location filename="openlp/plugins/songs/forms/editsongform.py" line="713"/>
<source>This song book does not exist, do you want to add it?</source>
<translation>Denne sangbog eksisterer ikke. Ønsker du at tilføje den?</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongform.py" line="670"/>
+ <location filename="openlp/plugins/songs/forms/editsongform.py" line="702"/>
<source>You need to have an author for this song.</source>
<translation>Du mangler en forfatter til denne sang.</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="347"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="346"/>
<source>Linked Audio</source>
<translation>Sammenkædet lydspor</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="350"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="349"/>
<source>Add &File(s)</source>
<translation>Tilføj &fil(er)</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="352"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="351"/>
<source>Add &Media</source>
<translation>Tilføj &medier</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="356"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="355"/>
<source>Remove &All</source>
<translation>Fjern &alt</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongform.py" line="733"/>
+ <location filename="openlp/plugins/songs/forms/editsongform.py" line="765"/>
<source>Open File(s)</source>
<translation>Åbn fil(er)</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="358"/>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="357"/>
<source><strong>Warning:</strong> Not all of the verses are in use.</source>
<translation><strong>Advarsel:</strong> Ikke alle versene er i brug.</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/editsongform.py" line="634"/>
+ <location filename="openlp/plugins/songs/forms/editsongform.py" line="666"/>
<source>The verse order is invalid. There are no verses corresponding to %s. Valid entries are %s.</source>
<translation>Denne rækkefølge af vers er ikke gyldig. Der er ikke nogen vers der svarer til %s. Gyldige elementer er %s.</translation>
</message>
+ <message>
+ <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="359"/>
+ <source><strong>Warning:</strong> You have not entered a verse order.</source>
+ <translation><strong>Advarsel:</strong> Du har ikke indtastet en rækkefølge for versene.</translation>
+ </message>
</context>
<context>
<name>SongsPlugin.EditVerseForm</name>
@@ -6878,7 +6895,7 @@
<translation>Ingen placering angivet til at gemme </translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/songexportform.py" line="278"/>
+ <location filename="openlp/plugins/songs/forms/songexportform.py" line="277"/>
<source>Starting export...</source>
<translation>Påbegynder eksportering...</translation>
</message>
@@ -6888,7 +6905,7 @@
<translation>Du er nødt til at vælge en mappe.</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/songexportform.py" line="369"/>
+ <location filename="openlp/plugins/songs/forms/songexportform.py" line="368"/>
<source>Select Destination Folder</source>
<translation>Vælg en destinationsmappe</translation>
</message>
@@ -6904,6 +6921,14 @@
</message>
</context>
<context>
+ <name>SongsPlugin.FoilPresenterSongImport</name>
+ <message>
+ <location filename="openlp/plugins/songs/lib/foilpresenterimport.py" line="432"/>
+ <source>Invalid Foilpresenter song file. No verses found.</source>
+ <translation>Ugyldig Foilpresenter sang-fil. Kunne ikke finde nogen vers.</translation>
+ </message>
+</context>
+<context>
<name>SongsPlugin.ImportWizardForm</name>
<message>
<location filename="openlp/plugins/songs/lib/importer.py" line="216"/>
@@ -7092,27 +7117,27 @@
<context>
<name>SongsPlugin.MediaItem</name>
<message>
- <location filename="openlp/plugins/songs/lib/mediaitem.py" line="192"/>
+ <location filename="openlp/plugins/songs/lib/mediaitem.py" line="155"/>
<source>Titles</source>
<translation>Titler</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/lib/mediaitem.py" line="192"/>
+ <location filename="openlp/plugins/songs/lib/mediaitem.py" line="155"/>
<source>Lyrics</source>
<translation>Sangtekst</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/lib/mediaitem.py" line="557"/>
+ <location filename="openlp/plugins/songs/lib/mediaitem.py" line="520"/>
<source>CCLI License: </source>
- <translation>CCLI Licens: </translation>
+ <translation>CCLI-licens: </translation>
</message>
<message>
- <location filename="openlp/plugins/songs/lib/mediaitem.py" line="192"/>
+ <location filename="openlp/plugins/songs/lib/mediaitem.py" line="155"/>
<source>Entire Song</source>
<translation>Hele sang</translation>
</message>
<message numerus="yes">
- <location filename="openlp/plugins/songs/lib/mediaitem.py" line="439"/>
+ <location filename="openlp/plugins/songs/lib/mediaitem.py" line="402"/>
<source>Are you sure you want to delete the %n selected song(s)?</source>
<translation>
<numerusform>Er du sikker på at du vil slette den %n valgte sang?</numerusform>
@@ -7120,38 +7145,38 @@
</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/lib/mediaitem.py" line="188"/>
+ <location filename="openlp/plugins/songs/lib/mediaitem.py" line="151"/>
<source>Maintain the lists of authors, topics and books.</source>
<translation>Vedligehold listen over forfattere, emner og bøger.</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/lib/mediaitem.py" line="484"/>
+ <location filename="openlp/plugins/songs/lib/mediaitem.py" line="447"/>
<source>copy</source>
<comment>For song cloning</comment>
<translation>kopi</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/lib/mediaitem.py" line="192"/>
+ <location filename="openlp/plugins/songs/lib/mediaitem.py" line="155"/>
<source>Search Titles...</source>
<translation>Søg blandt titler...</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/lib/mediaitem.py" line="192"/>
+ <location filename="openlp/plugins/songs/lib/mediaitem.py" line="155"/>
<source>Search Entire Song...</source>
<translation>Søg hele sang...</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/lib/mediaitem.py" line="192"/>
+ <location filename="openlp/plugins/songs/lib/mediaitem.py" line="155"/>
<source>Search Lyrics...</source>
<translation>Søg sangtekster...</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/lib/mediaitem.py" line="192"/>
+ <location filename="openlp/plugins/songs/lib/mediaitem.py" line="155"/>
<source>Search Authors...</source>
<translation>Søg forfattere...</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/lib/mediaitem.py" line="192"/>
+ <location filename="openlp/plugins/songs/lib/mediaitem.py" line="155"/>
<source>Search Song Books...</source>
<translation>Søg sangbøger...</translation>
</message>
@@ -7247,12 +7272,12 @@
<context>
<name>SongsPlugin.SongExportForm</name>
<message>
- <location filename="openlp/plugins/songs/forms/songexportform.py" line="299"/>
+ <location filename="openlp/plugins/songs/forms/songexportform.py" line="298"/>
<source>Your song export failed.</source>
<translation>Din sangeksportering slog fejl.</translation>
</message>
<message>
- <location filename="openlp/plugins/songs/forms/songexportform.py" line="294"/>
+ <location filename="openlp/plugins/songs/forms/songexportform.py" line="293"/>
<source>Finished export. To import these files use the <strong>OpenLyrics</strong> importer.</source>
<translation>Ekporteringen er færdig. Benyt <strong>OpenLyrics</strong>-importøren for at importere disse filer.</translation>
</message>
=== modified file 'resources/i18n/de.ts'
--- resources/i18n/de.ts 2012-11-24 21:19:46 +0000
+++ resources/i18n/de.ts 2013-09-14 11:12:23 +0000
@@ -175,12 +175,12 @@
<translation>Bibeln</translation>
</message>
<message>
- <location filename="openlp/plugins/bibles/lib/http.py" line="600"/>
+ <location filename="openlp/plugins/bibles/lib/http.py" line="604"/>
<source>No Book Found</source>
<translation>Kein Buch gefunden</translation>
</message>
<message>
- <location filename="openlp/plugins/bibles/lib/http.py" line="600"/>
+ <location filename="openlp/plugins/bibles/lib/http.py" line="604"/>
<source>No matching book could be found in this Bible. Check that you have spelled the name of the book correctly.</source>
<translation>Es konnte kein passendes Buch gefunden werden. Überprüfen Sie bitte die Schreibweise.</translation>
</message>
@@ -1045,38 +1045,38 @@
<context>
<name>BiblesPlugin.HTTPBible</name>
<message>
- <location filename="openlp/plugins/bibles/lib/http.py" line="514"/>
+ <location filename="openlp/plugins/bibles/lib/http.py" line="518"/>
<source>Registering Bible and loading books...</source>
<translation>Registriere Bibel und lade Bücher...</translation>
</message>
<message>
- <location filename="openlp/plugins/bibles/lib/http.py" line="539"/>
+ <location filename="openlp/plugins/bibles/lib/http.py" line="543"/>
<source>Registering Language...</source>
<translation>Registriere Sprache...</translation>
</message>
<message>
- <location filename="openlp/plugins/bibles/lib/http.py" line="555"/>
+ <location filename="openlp/plugins/bibles/lib/http.py" line="559"/>
<source>Importing %s...</source>
<comment>Importing <book name>...</comment>
<translation>Importiere »%s«...</translation>
</message>
<message>
- <location filename="openlp/plugins/bibles/lib/http.py" line="722"/>
+ <location filename="openlp/plugins/bibles/lib/http.py" line="726"/>
<source>Download Error</source>
<translation>Download Fehler</translation>
</message>
<message>
- <location filename="openlp/plugins/bibles/lib/http.py" line="722"/>
+ <location filename="openlp/plugins/bibles/lib/http.py" line="726"/>
<source>There was a problem downloading your verse selection. Please check your Internet connection, and if this error continues to occur please consider reporting a bug.</source>
<translation>Beim Herunterladen des Bibeltextes ist ein Fehler aufgetreten. Bitte überprüfen Sie Ihre Internetverbindung. Wenden Sie sich bitte an den OpenLP Support, sollte dieser Fehler weiterhin auftreten.</translation>
</message>
<message>
- <location filename="openlp/plugins/bibles/lib/http.py" line="729"/>
+ <location filename="openlp/plugins/bibles/lib/http.py" line="733"/>
<source>Parse Error</source>
<translation>Formatfehler</translation>
</message>
<message>
- <location filename="openlp/plugins/bibles/lib/http.py" line="729"/>
+ <location filename="openlp/plugins/bibles/lib/http.py" line="733"/>
<source>There was a problem extracting your verse selection. If this error continues to occur please consider reporting a bug.</source>
<translation>Beim Auslesen des Bibeltextes ist ein Fehler aufgetreten. Wenden Sie sich bitte an den OpenLP Support, sollte dieser Fehler wiederholt auftritt.</translation>
</message>
@@ -1399,7 +1399,7 @@
<translation>Kodierung wird ermittelt (dies kann etwas dauern)...</translation>
</message>
<message>
- <location filename="openlp/plugins/bibles/lib/osis.py" line="162"/>
+ <location filename="openlp/plugins/bibles/lib/osis.py" line="174"/>
<source>Importing %s %s...</source>
<comment>Importing <book name> <chapter>...</comment>
<translation>%s %s wird importiert...</translation>
@@ -1993,7 +1993,7 @@
<context>
<name>OpenLP</name>
<message>
- <location filename="openlp/core/utils/__init__.py" line="362"/>
+ <location filename="openlp/core/utils/__init__.py" line="363"/>
<source>Image Files</source>
<translation>Bilddateien</translation>
</message>
@@ -2040,13 +2040,6 @@
<translation>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.</translation>
</message>
<message>
- <location filename="openlp/core/ui/aboutdialog.py" line="250"/>
- <source>Copyright © 2004-2012 %s
-Portions copyright © 2004-2012 %s</source>
- <translation>Copyright © 2004-2012 %s
-Anteiliges Copyright © 2004-2012 %s</translation>
- </message>
- <message>
<loca
