diff --git a/openlp.pyw b/openlp.pyw
index 17743903f..8cc7a16a6 100755
--- a/openlp.pyw
+++ b/openlp.pyw
@@ -5,8 +5,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -264,4 +264,4 @@ if __name__ == u'__main__':
"""
Instantiate and run the application.
"""
- main()
+ main()
\ No newline at end of file
diff --git a/openlp/__init__.py b/openlp/__init__.py
index f22f0ef70..b88547df6 100644
--- a/openlp/__init__.py
+++ b/openlp/__init__.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -25,4 +25,4 @@
###############################################################################
"""
The :mod:`openlp` module contains all the project produced OpenLP functionality
-"""
+"""
\ No newline at end of file
diff --git a/openlp/core/__init__.py b/openlp/core/__init__.py
index a6cfa60c7..17db85184 100644
--- a/openlp/core/__init__.py
+++ b/openlp/core/__init__.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -28,4 +28,4 @@ The :mod:`core` module provides all core application functions
All the core functions of the OpenLP application including the GUI, settings,
logging and a plugin framework are contained within the openlp.core module.
-"""
+"""
\ No newline at end of file
diff --git a/openlp/core/lib/__init__.py b/openlp/core/lib/__init__.py
index 956b6c787..99255c6ee 100644
--- a/openlp/core/lib/__init__.py
+++ b/openlp/core/lib/__init__.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -325,4 +325,4 @@ from dockwidget import OpenLPDockWidget
from renderer import Renderer
from rendermanager import RenderManager
from mediamanageritem import MediaManagerItem
-from baselistwithdnd import BaseListWithDnD
+from baselistwithdnd import BaseListWithDnD
\ No newline at end of file
diff --git a/openlp/core/lib/baselistwithdnd.py b/openlp/core/lib/baselistwithdnd.py
index 2ad500e9e..86535f6e7 100644
--- a/openlp/core/lib/baselistwithdnd.py
+++ b/openlp/core/lib/baselistwithdnd.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -52,4 +52,4 @@ class BaseListWithDnD(QtGui.QListWidget):
mimeData = QtCore.QMimeData()
drag.setMimeData(mimeData)
mimeData.setText(self.PluginName)
- drag.start(QtCore.Qt.CopyAction)
+ drag.start(QtCore.Qt.CopyAction)
\ No newline at end of file
diff --git a/openlp/core/lib/db.py b/openlp/core/lib/db.py
index 8afa02111..c2e1243ce 100644
--- a/openlp/core/lib/db.py
+++ b/openlp/core/lib/db.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -295,4 +295,4 @@ class Manager(object):
if self.is_dirty:
engine = create_engine(self.db_url)
if self.db_url.startswith(u'sqlite'):
- engine.execute("vacuum")
+ engine.execute("vacuum")
\ No newline at end of file
diff --git a/openlp/core/lib/dockwidget.py b/openlp/core/lib/dockwidget.py
index 15fd74ebc..a66d9e8e3 100644
--- a/openlp/core/lib/dockwidget.py
+++ b/openlp/core/lib/dockwidget.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -46,4 +46,4 @@ class OpenLPDockWidget(QtGui.QDockWidget):
if name:
self.setObjectName(name)
self.setFloating(False)
- log.debug(u'Init done')
+ log.debug(u'Init done')
\ No newline at end of file
diff --git a/openlp/core/lib/eventreceiver.py b/openlp/core/lib/eventreceiver.py
index 1080cd2f5..4f69c519f 100644
--- a/openlp/core/lib/eventreceiver.py
+++ b/openlp/core/lib/eventreceiver.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -278,4 +278,4 @@ class Receiver(object):
"""
Get the global ``eventreceiver`` instance.
"""
- return Receiver.eventreceiver
+ return Receiver.eventreceiver
\ No newline at end of file
diff --git a/openlp/core/lib/htmlbuilder.py b/openlp/core/lib/htmlbuilder.py
index 9bbaa65d1..0a26382f8 100644
--- a/openlp/core/lib/htmlbuilder.py
+++ b/openlp/core/lib/htmlbuilder.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -641,4 +641,4 @@ def build_alert_css(alertTab, width):
align = u'top'
alert = style % (width, align, alertTab.font_face, alertTab.font_size,
alertTab.font_color, alertTab.bg_color)
- return alert
+ return alert
\ No newline at end of file
diff --git a/openlp/core/lib/imagemanager.py b/openlp/core/lib/imagemanager.py
index 14de141fc..0be1a01c8 100644
--- a/openlp/core/lib/imagemanager.py
+++ b/openlp/core/lib/imagemanager.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -165,4 +165,4 @@ class ImageManager(QtCore.QObject):
image = self._cache[key]
if image.dirty:
image.image_bytes = image_to_byte(image.image)
- image.dirty = False
+ image.dirty = False
\ No newline at end of file
diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py
index acf24ae22..50e43afd0 100644
--- a/openlp/core/lib/mediamanageritem.py
+++ b/openlp/core/lib/mediamanageritem.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -544,4 +544,4 @@ class MediaManagerItem(QtGui.QWidget):
Method to add processing when a service has been loaded and
individual service items need to be processed by the plugins
"""
- pass
+ pass
\ No newline at end of file
diff --git a/openlp/core/lib/plugin.py b/openlp/core/lib/plugin.py
index f73b58735..8bc5fdb96 100644
--- a/openlp/core/lib/plugin.py
+++ b/openlp/core/lib/plugin.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -314,4 +314,4 @@ class Plugin(QtCore.QObject):
"""
Called to define all translatable texts of the plugin
"""
- pass
+ pass
\ No newline at end of file
diff --git a/openlp/core/lib/pluginmanager.py b/openlp/core/lib/pluginmanager.py
index 362d8c197..8081cbf71 100644
--- a/openlp/core/lib/pluginmanager.py
+++ b/openlp/core/lib/pluginmanager.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -221,4 +221,4 @@ class PluginManager(object):
for plugin in self.plugins:
if plugin.isActive():
plugin.finalise()
- log.info(u'Finalisation Complete for %s ' % plugin.name)
+ log.info(u'Finalisation Complete for %s ' % plugin.name)
\ No newline at end of file
diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index 68839f16d..fe118b76b 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -144,4 +144,4 @@ class Renderer(object):
html_text = html_text[:len(html_text)-4]
formatted.append(html_text)
log.debug(u'format_slide - End')
- return formatted
+ return formatted
\ No newline at end of file
diff --git a/openlp/core/lib/rendermanager.py b/openlp/core/lib/rendermanager.py
index fc7ba38b8..5896ca4e6 100644
--- a/openlp/core/lib/rendermanager.py
+++ b/openlp/core/lib/rendermanager.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -214,7 +214,7 @@ class RenderManager(object):
if self.force_page:
verse = verse + verse + verse
else:
- self.image_manager.del_image(self.theme_data.theme_name)
+ self.image_manager.del_image(theme_data.theme_name)
footer = []
footer.append(u'Arky Arky (Unknown)' )
footer.append(u'Public Domain')
@@ -261,4 +261,4 @@ class RenderManager(object):
log.debug(u'calculate default %d, %d, %f',
self.width, self.height, self.screen_ratio )
# 90% is start of footer
- self.footer_start = int(self.height * 0.90)
+ self.footer_start = int(self.height * 0.90)
\ No newline at end of file
diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py
index 9b4a035a5..271d3107e 100644
--- a/openlp/core/lib/serviceitem.py
+++ b/openlp/core/lib/serviceitem.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -397,4 +397,4 @@ class ServiceItem(object):
"""
Returns the path of the raw frame
"""
- return self._raw_frames[row][u'path']
+ return self._raw_frames[row][u'path']
\ No newline at end of file
diff --git a/openlp/core/lib/settingsmanager.py b/openlp/core/lib/settingsmanager.py
index 8d249d2cd..d13108b2e 100644
--- a/openlp/core/lib/settingsmanager.py
+++ b/openlp/core/lib/settingsmanager.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -178,4 +178,4 @@ class SettingsManager(object):
if extension == os.path.splitext(filename)[1]]
else:
# no filtering required
- return files
+ return files
\ No newline at end of file
diff --git a/openlp/core/lib/settingstab.py b/openlp/core/lib/settingstab.py
index 048751006..518080368 100644
--- a/openlp/core/lib/settingstab.py
+++ b/openlp/core/lib/settingstab.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -95,4 +95,4 @@ class SettingsTab(QtGui.QWidget):
Indicates if called before or after updates.
"""
- pass
+ pass
\ No newline at end of file
diff --git a/openlp/core/lib/spelltextedit.py b/openlp/core/lib/spelltextedit.py
index 76271b6a7..ebd4046c0 100644
--- a/openlp/core/lib/spelltextedit.py
+++ b/openlp/core/lib/spelltextedit.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -158,4 +158,4 @@ class SpellAction(QtGui.QAction):
def __init__(self, *args):
QtGui.QAction.__init__(self, *args)
self.triggered.connect(lambda x: self.correct.emit(
- unicode(self.text())))
+ unicode(self.text())))
\ No newline at end of file
diff --git a/openlp/core/lib/theme.py b/openlp/core/lib/theme.py
index 130eb817d..1e4a9854e 100644
--- a/openlp/core/lib/theme.py
+++ b/openlp/core/lib/theme.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -598,4 +598,4 @@ class ThemeXML(object):
self.font_footer_shadow_size)
self.add_display(self.display_horizontal_align,
self.display_vertical_align,
- self.display_slide_transition)
+ self.display_slide_transition)
\ No newline at end of file
diff --git a/openlp/core/lib/toolbar.py b/openlp/core/lib/toolbar.py
index a98edab9a..e37dc6f22 100644
--- a/openlp/core/lib/toolbar.py
+++ b/openlp/core/lib/toolbar.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -154,4 +154,4 @@ class OpenLPToolbar(QtGui.QToolBar):
push_button.setCheckable(True)
push_button.setFlat(True)
self.addWidget(push_button)
- return push_button
+ return push_button
\ No newline at end of file
diff --git a/openlp/core/theme/__init__.py b/openlp/core/theme/__init__.py
index 4ffcb2813..350b550a2 100644
--- a/openlp/core/theme/__init__.py
+++ b/openlp/core/theme/__init__.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -24,4 +24,4 @@
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
###############################################################################
-from openlp.core.theme.theme import Theme
+from openlp.core.theme.theme import Theme
\ No newline at end of file
diff --git a/openlp/core/theme/theme.py b/openlp/core/theme/theme.py
index 52dda1631..f3dabca5e 100644
--- a/openlp/core/theme/theme.py
+++ b/openlp/core/theme/theme.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -222,4 +222,4 @@ class Theme(object):
for key in dir(self):
if key[0:1] != u'_':
theme_strings.append(u'%30s : %s' % (key, getattr(self, key)))
- return u'\n'.join(theme_strings)
+ return u'\n'.join(theme_strings)
\ No newline at end of file
diff --git a/openlp/core/ui/__init__.py b/openlp/core/ui/__init__.py
index 377999553..c806730c8 100644
--- a/openlp/core/ui/__init__.py
+++ b/openlp/core/ui/__init__.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -58,4 +58,4 @@ from thememanager import ThemeManager
__all__ = ['SplashScreen', 'AboutForm', 'SettingsForm',
'MainDisplay', 'SlideController', 'ServiceManager', 'ThemeManager',
- 'MediaDockManager', 'ServiceItemEditForm']
+ 'MediaDockManager', 'ServiceItemEditForm']
\ No newline at end of file
diff --git a/openlp/core/ui/aboutdialog.py b/openlp/core/ui/aboutdialog.py
index 401560cf0..430ca406d 100644
--- a/openlp/core/ui/aboutdialog.py
+++ b/openlp/core/ui/aboutdialog.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -182,8 +182,8 @@ class Ui_AboutDialog(object):
self.aboutNotebook.indexOf(self.creditsTab),
translate('OpenLP.AboutForm', 'Credits'))
self.licenseTextEdit.setPlainText(translate('OpenLP.AboutForm',
- 'Copyright \xa9 2004-2010 Raoul Snyman\n'
- 'Portions copyright \xa9 2004-2010 '
+ 'Copyright \xa9 2004-2011 Raoul Snyman\n'
+ 'Portions copyright \xa9 2004-2011 '
'Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri, '
'Christian Richter, Maikel Stuivenberg, Martin Thompson, Jon '
'Tibble, Carsten Tinggaard\n'
@@ -575,5 +575,4 @@ class Ui_AboutDialog(object):
translate('OpenLP.AboutForm', 'License'))
self.contributeButton.setText(translate('OpenLP.AboutForm',
'Contribute'))
- self.closeButton.setText(translate('OpenLP.AboutForm', 'Close'))
-
+ self.closeButton.setText(translate('OpenLP.AboutForm', 'Close'))
\ No newline at end of file
diff --git a/openlp/core/ui/aboutform.py b/openlp/core/ui/aboutform.py
index 3b49ff274..f3fcc18a8 100644
--- a/openlp/core/ui/aboutform.py
+++ b/openlp/core/ui/aboutform.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -61,4 +61,4 @@ class AboutForm(QtGui.QDialog, Ui_AboutDialog):
import webbrowser
url = u'http://www.openlp.org/en/documentation/introduction/' \
+ u'contributing.html'
- webbrowser.open_new(url)
+ webbrowser.open_new(url)
\ No newline at end of file
diff --git a/openlp/core/ui/advancedtab.py b/openlp/core/ui/advancedtab.py
index df3add595..0a8547837 100644
--- a/openlp/core/ui/advancedtab.py
+++ b/openlp/core/ui/advancedtab.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -204,4 +204,4 @@ class AdvancedTab(SettingsTab):
"""
self.sharedLabel.setEnabled(checked)
self.sharedTextEdit.setEnabled(checked)
- self.sharedPushButton.setEnabled(checked)
+ self.sharedPushButton.setEnabled(checked)
\ No newline at end of file
diff --git a/openlp/core/ui/exceptiondialog.py b/openlp/core/ui/exceptiondialog.py
index 03bbde764..eaed502b3 100644
--- a/openlp/core/ui/exceptiondialog.py
+++ b/openlp/core/ui/exceptiondialog.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -98,4 +98,4 @@ class Ui_ExceptionDialog(object):
self.sendReportButton.setText(translate('OpenLP.ExceptionDialog',
'Send E-Mail'))
self.saveReportButton.setText(translate('OpenLP.ExceptionDialog',
- 'Save to File'))
+ 'Save to File'))
\ No newline at end of file
diff --git a/openlp/core/ui/exceptionform.py b/openlp/core/ui/exceptionform.py
index 3e05ad73a..90a54e12e 100644
--- a/openlp/core/ui/exceptionform.py
+++ b/openlp/core/ui/exceptionform.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -144,4 +144,4 @@ class ExceptionForm(QtGui.QDialog, Ui_ExceptionDialog):
exception = line.split(u'\n')[-1].split(u':')[0]
subject = u'Bug report: %s in %s' % (exception, source)
mailto(address=u'bugs@openlp.org', subject=subject,
- body=body % content)
+ body=body % content)
\ No newline at end of file
diff --git a/openlp/core/ui/filerenamedialog.py b/openlp/core/ui/filerenamedialog.py
index 600027940..47d301dd9 100644
--- a/openlp/core/ui/filerenamedialog.py
+++ b/openlp/core/ui/filerenamedialog.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -53,7 +53,5 @@ class Ui_FileRenameDialog(object):
QtCore.QMetaObject.connectSlotsByName(FileRenameDialog)
def retranslateUi(self, FileRenameDialog):
- FileRenameDialog.setWindowTitle(translate('OpenLP.FileRenameForm',
- 'File Rename'))
self.fileRenameLabel.setText(translate('OpenLP.FileRenameForm',
- 'New File Name:'))
+ 'New File Name:'))
\ No newline at end of file
diff --git a/openlp/core/ui/filerenameform.py b/openlp/core/ui/filerenameform.py
index 2a7f7bd7d..9ff310030 100644
--- a/openlp/core/ui/filerenameform.py
+++ b/openlp/core/ui/filerenameform.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -28,6 +28,8 @@ from PyQt4 import QtCore, QtGui
from filerenamedialog import Ui_FileRenameDialog
+from openlp.core.lib import translate
+
class FileRenameForm(QtGui.QDialog, Ui_FileRenameDialog):
"""
The exception dialog
@@ -39,3 +41,15 @@ class FileRenameForm(QtGui.QDialog, Ui_FileRenameDialog):
self.accept)
QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(u'rejected()'),
self.reject)
+
+ def exec_(self, copy=False):
+ """
+ Run the Dialog with correct heading.
+ """
+ if copy:
+ self.setWindowTitle(translate('OpenLP.FileRenameForm',
+ 'File Copy'))
+ else:
+ self.setWindowTitle(translate('OpenLP.FileRenameForm',
+ 'File Rename'))
+ return QtGui.QDialog.exec_(self)
\ No newline at end of file
diff --git a/openlp/core/ui/generaltab.py b/openlp/core/ui/generaltab.py
index b8894fe9a..8c56648c8 100644
--- a/openlp/core/ui/generaltab.py
+++ b/openlp/core/ui/generaltab.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -312,6 +312,18 @@ class GeneralTab(SettingsTab):
# Signals and slots
QtCore.QObject.connect(self.overrideCheckBox,
QtCore.SIGNAL(u'toggled(bool)'), self.onOverrideCheckBoxToggled)
+ QtCore.QObject.connect(self.customHeightValueEdit,
+ QtCore.SIGNAL(u'textEdited(const QString&)'),
+ self.onDisplayPositionChanged)
+ QtCore.QObject.connect(self.customWidthValueEdit,
+ QtCore.SIGNAL(u'textEdited(const QString&)'),
+ self.onDisplayPositionChanged)
+ QtCore.QObject.connect(self.customYValueEdit,
+ QtCore.SIGNAL(u'textEdited(const QString&)'),
+ self.onDisplayPositionChanged)
+ QtCore.QObject.connect(self.customXValueEdit,
+ QtCore.SIGNAL(u'textEdited(const QString&)'),
+ self.onDisplayPositionChanged)
def retranslateUi(self):
"""
@@ -503,10 +515,19 @@ class GeneralTab(SettingsTab):
def onOverrideCheckBoxToggled(self, checked):
"""
- Toggle screen state depending on check box state
+ Toggle screen state depending on check box state.
+
+ ``checked``
+ The state of the check box (boolean).
"""
self.customXValueEdit.setEnabled(checked)
self.customYValueEdit.setEnabled(checked)
self.customHeightValueEdit.setEnabled(checked)
self.customWidthValueEdit.setEnabled(checked)
self.overrideChanged = True
+
+ def onDisplayPositionChanged(self):
+ """
+ Called when the width, height, x position or y position has changed.
+ """
+ self.overrideChanged = True
\ No newline at end of file
diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py
index 69eb9305d..2028e7f30 100644
--- a/openlp/core/ui/maindisplay.py
+++ b/openlp/core/ui/maindisplay.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -541,4 +541,3 @@ class AudioPlayer(QtCore.QObject):
"""
log.debug(u'AudioPlayer Reached end of media playlist')
self.mediaObject.clearQueue()
-
diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index ed06877e5..50953dc08 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -1009,4 +1009,4 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
self.recentFiles.insert(0, QtCore.QString(filename))
while self.recentFiles.count() > maxRecentFiles:
# Don't care what API says takeLast works, removeLast doesn't!
- self.recentFiles.takeLast()
+ self.recentFiles.takeLast()
\ No newline at end of file
diff --git a/openlp/core/ui/mediadockmanager.py b/openlp/core/ui/mediadockmanager.py
index c49d7fab3..ced3850ec 100644
--- a/openlp/core/ui/mediadockmanager.py
+++ b/openlp/core/ui/mediadockmanager.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -85,4 +85,4 @@ class MediaDockManager(object):
if self.media_dock.widget(dock_index).settingsSection == \
media_item.plugin.name.lower():
self.media_dock.widget(dock_index).hide()
- self.media_dock.removeItem(dock_index)
+ self.media_dock.removeItem(dock_index)
\ No newline at end of file
diff --git a/openlp/core/ui/plugindialog.py b/openlp/core/ui/plugindialog.py
index 45305d75c..63d7ae014 100644
--- a/openlp/core/ui/plugindialog.py
+++ b/openlp/core/ui/plugindialog.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -114,4 +114,3 @@ class Ui_PluginViewDialog(object):
translate('OpenLP.PluginForm', 'Active'))
self.statusComboBox.setItemText(1,
translate('OpenLP.PluginForm', 'Inactive'))
-
diff --git a/openlp/core/ui/pluginform.py b/openlp/core/ui/pluginform.py
index 3d3a814a0..dfefef476 100644
--- a/openlp/core/ui/pluginform.py
+++ b/openlp/core/ui/pluginform.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -79,7 +79,7 @@ class PluginForm(QtGui.QDialog, Ui_PluginViewDialog):
status_text = unicode(
translate('OpenLP.PluginForm', '%s (Disabled)'))
name_string = plugin.getString(StringContent.Name)
- item.setText(status_text % name_string[u'plural'])
+ item.setText(status_text % name_string[u'singular'])
# If the plugin has an icon, set it!
if plugin.icon:
item.setIcon(plugin.icon)
@@ -107,12 +107,12 @@ class PluginForm(QtGui.QDialog, Ui_PluginViewDialog):
if self.pluginListWidget.currentItem() is None:
self._clearDetails()
return
- plugin_name_plural = \
+ plugin_name_singular = \
self.pluginListWidget.currentItem().text().split(u' ')[0]
self.activePlugin = None
for plugin in self.parent.pluginManager.plugins:
name_string = plugin.getString(StringContent.Name)
- if name_string[u'plural'] == plugin_name_plural:
+ if name_string[u'singular'] == plugin_name_singular:
self.activePlugin = plugin
break
if self.activePlugin:
@@ -142,4 +142,4 @@ class PluginForm(QtGui.QDialog, Ui_PluginViewDialog):
translate('OpenLP.PluginForm', '%s (Disabled)'))
name_string = self.activePlugin.getString(StringContent.Name)
self.pluginListWidget.currentItem().setText(
- status_text % name_string[u'plural'])
+ status_text % name_string[u'singular'])
\ No newline at end of file
diff --git a/openlp/core/ui/screen.py b/openlp/core/ui/screen.py
index 1d4ad8c48..430426fd5 100644
--- a/openlp/core/ui/screen.py
+++ b/openlp/core/ui/screen.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -99,4 +99,4 @@ class ScreenList(object):
user wants to use the correct screen attributes
"""
log.debug(u'reset_current_display')
- self.set_current_display(self.current_display)
+ self.set_current_display(self.current_display)
\ No newline at end of file
diff --git a/openlp/core/ui/serviceitemeditdialog.py b/openlp/core/ui/serviceitemeditdialog.py
index 215cc6146..19639a7c2 100644
--- a/openlp/core/ui/serviceitemeditdialog.py
+++ b/openlp/core/ui/serviceitemeditdialog.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -82,4 +82,4 @@ class Ui_ServiceItemEditDialog(object):
serviceItemEditDialog.setWindowTitle(
translate('OpenLP.ServiceItemEditForm', 'Reorder Service Item'))
self.deleteButton.setText(translate('OpenLP.ServiceItemEditForm',
- 'Delete'))
+ 'Delete'))
\ No newline at end of file
diff --git a/openlp/core/ui/serviceitemeditform.py b/openlp/core/ui/serviceitemeditform.py
index e57474315..6516fa40f 100644
--- a/openlp/core/ui/serviceitemeditform.py
+++ b/openlp/core/ui/serviceitemeditform.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -122,4 +122,4 @@ class ServiceItemEditForm(QtGui.QDialog, Ui_ServiceItemEditDialog):
self.itemList.remove(self.itemList[row])
self.itemList.insert(row + 1, temp)
self.loadData()
- self.listWidget.setCurrentRow(row + 1)
+ self.listWidget.setCurrentRow(row + 1)
\ No newline at end of file
diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py
index 32e46dffb..e2c1a765b 100644
--- a/openlp/core/ui/servicemanager.py
+++ b/openlp/core/ui/servicemanager.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -1119,4 +1119,4 @@ class ServiceManager(QtGui.QWidget):
data_item[u'notes'] = unicode(service_item.notes)
data_item[u'selected'] = (item == curitem)
data.append(data_item)
- Receiver.send_message(u'servicemanager_list_response', data)
+ Receiver.send_message(u'servicemanager_list_response', data)
\ No newline at end of file
diff --git a/openlp/core/ui/servicenotedialog.py b/openlp/core/ui/servicenotedialog.py
index 899db64be..eb3aba9d4 100644
--- a/openlp/core/ui/servicenotedialog.py
+++ b/openlp/core/ui/servicenotedialog.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -50,4 +50,4 @@ class Ui_ServiceNoteEdit(object):
def retranslateUi(self, serviceNoteEdit):
serviceNoteEdit.setWindowTitle(
- translate('OpenLP.ServiceNoteForm', 'Service Item Notes'))
+ translate('OpenLP.ServiceNoteForm', 'Service Item Notes'))
\ No newline at end of file
diff --git a/openlp/core/ui/servicenoteform.py b/openlp/core/ui/servicenoteform.py
index a453c863e..de689e842 100644
--- a/openlp/core/ui/servicenoteform.py
+++ b/openlp/core/ui/servicenoteform.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -41,4 +41,4 @@ class ServiceNoteForm(QtGui.QDialog, Ui_ServiceNoteEdit):
QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(u'accepted()'),
self.accept)
QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(u'rejected()'),
- self.reject)
+ self.reject)
\ No newline at end of file
diff --git a/openlp/core/ui/settingsdialog.py b/openlp/core/ui/settingsdialog.py
index 93b4e6141..d4bc8e110 100644
--- a/openlp/core/ui/settingsdialog.py
+++ b/openlp/core/ui/settingsdialog.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -65,4 +65,4 @@ class Ui_SettingsDialog(object):
def retranslateUi(self, settingsDialog):
settingsDialog.setWindowTitle(translate('OpenLP.SettingsForm',
- 'Configure OpenLP'))
+ 'Configure OpenLP'))
\ No newline at end of file
diff --git a/openlp/core/ui/settingsform.py b/openlp/core/ui/settingsform.py
index d1cf19622..86e3c6150 100644
--- a/openlp/core/ui/settingsform.py
+++ b/openlp/core/ui/settingsform.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -98,4 +98,4 @@ class SettingsForm(QtGui.QDialog, Ui_SettingsDialog):
Run any post-setup code for the tabs on the form
"""
for tabIndex in range(0, self.settingsTabWidget.count()):
- self.settingsTabWidget.widget(tabIndex).postSetUp()
+ self.settingsTabWidget.widget(tabIndex).postSetUp()
\ No newline at end of file
diff --git a/openlp/core/ui/shortcutlistdialog.py b/openlp/core/ui/shortcutlistdialog.py
index d64f4e2fc..f66772d9b 100644
--- a/openlp/core/ui/shortcutlistdialog.py
+++ b/openlp/core/ui/shortcutlistdialog.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -111,4 +111,3 @@ class Ui_ShortcutListDialog(object):
translate('OpenLP.ShortcutListDialog', 'Custom:'))
self.shortcutPushButton.setText(
translate('OpenLP.ShortcutListDialog', 'None'))
-
diff --git a/openlp/core/ui/shortcutlistform.py b/openlp/core/ui/shortcutlistform.py
index e83c2cc7d..0d9a4bab3 100644
--- a/openlp/core/ui/shortcutlistform.py
+++ b/openlp/core/ui/shortcutlistform.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -107,4 +107,3 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
def onShortcutPushButtonClicked(self, toggled):
self.captureShortcut = toggled
-
diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py
index 8cf0752e2..be1fcd44a 100644
--- a/openlp/core/ui/slidecontroller.py
+++ b/openlp/core/ui/slidecontroller.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -1033,4 +1033,4 @@ class SlideController(QtGui.QWidget):
self.mediaObject.clearQueue()
self.video.hide()
self.SlidePreview.clear()
- self.SlidePreview.show()
+ self.SlidePreview.show()
\ No newline at end of file
diff --git a/openlp/core/ui/splashscreen.py b/openlp/core/ui/splashscreen.py
index 95fdba841..53546a6dd 100644
--- a/openlp/core/ui/splashscreen.py
+++ b/openlp/core/ui/splashscreen.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -55,4 +55,4 @@ class SplashScreen(object):
self.splash_screen.show()
def finish(self, widget):
- self.splash_screen.finish(widget)
+ self.splash_screen.finish(widget)
\ No newline at end of file
diff --git a/openlp/core/ui/themeform.py b/openlp/core/ui/themeform.py
index 95d4527c1..1160d7645 100644
--- a/openlp/core/ui/themeform.py
+++ b/openlp/core/ui/themeform.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -573,4 +573,4 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
QtGui.QColor(field), self)
if new_color.isValid():
field = new_color.name()
- return field
+ return field
\ No newline at end of file
diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py
index 0b0d8281d..82d7c4b0e 100644
--- a/openlp/core/ui/thememanager.py
+++ b/openlp/core/ui/thememanager.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -223,15 +223,17 @@ class ThemeManager(QtGui.QWidget):
"""
Renames an existing theme to a new name
"""
- item = self.themeListWidget.currentItem()
- oldThemeName = unicode(item.data(QtCore.Qt.UserRole).toString())
- self.fileRenameForm.fileNameEdit.setText(oldThemeName)
- self.saveThemeName = u''
- if self.fileRenameForm.exec_():
- newThemeName = unicode(self.fileRenameForm.fileNameEdit.text())
- oldThemeData = self.getThemeData(oldThemeName)
- self.deleteTheme(oldThemeName)
- self.cloneThemeData(oldThemeData, newThemeName)
+ action = unicode(translate('OpenLP.ThemeManager', 'Rename'))
+ if self._validate_theme_action(action, False):
+ item = self.themeListWidget.currentItem()
+ oldThemeName = unicode(item.data(QtCore.Qt.UserRole).toString())
+ self.fileRenameForm.fileNameEdit.setText(oldThemeName)
+ self.saveThemeName = oldThemeName
+ if self.fileRenameForm.exec_():
+ newThemeName = unicode(self.fileRenameForm.fileNameEdit.text())
+ oldThemeData = self.getThemeData(oldThemeName)
+ self.deleteTheme(oldThemeName)
+ self.cloneThemeData(oldThemeData, newThemeName)
def onCopyTheme(self):
"""
@@ -241,7 +243,7 @@ class ThemeManager(QtGui.QWidget):
oldThemeName = unicode(item.data(QtCore.Qt.UserRole).toString())
self.fileRenameForm.fileNameEdit.setText(oldThemeName)
self.saveThemeName = u''
- if self.fileRenameForm.exec_():
+ if self.fileRenameForm.exec_(True):
newThemeName = unicode(self.fileRenameForm.fileNameEdit.text())
themeData = self.getThemeData(oldThemeName)
self.cloneThemeData(themeData, newThemeName)
@@ -286,47 +288,13 @@ class ThemeManager(QtGui.QWidget):
"""
Delete a theme
"""
- self.global_theme = unicode(QtCore.QSettings().value(
- self.settingsSection + u'/global theme',
- QtCore.QVariant(u'')).toString())
- if check_item_selected(self.themeListWidget,
- translate('OpenLP.ThemeManager',
- 'You must select a theme to delete.')):
+ action = unicode(translate('OpenLP.ThemeManager', 'Delete'))
+ if self._validate_theme_action(action):
item = self.themeListWidget.currentItem()
theme = unicode(item.text())
- # confirm deletion
- answer = QtGui.QMessageBox.question(self,
- translate('OpenLP.ThemeManager', 'Delete Confirmation'),
- unicode(translate('OpenLP.ThemeManager', 'Delete %s theme?'))
- % theme,
- QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Yes |
- QtGui.QMessageBox.No), QtGui.QMessageBox.No)
- if answer == QtGui.QMessageBox.No:
- return
- # should be the same unless default
- if theme != unicode(item.data(QtCore.Qt.UserRole).toString()):
- QtGui.QMessageBox.critical(self,
- translate('OpenLP.ThemeManager', 'Error'),
- translate('OpenLP.ThemeManager',
- 'You are unable to delete the default theme.'))
- else:
- for plugin in self.parent.pluginManager.plugins:
- if plugin.usesTheme(theme):
- QtGui.QMessageBox.critical(self,
- translate('OpenLP.ThemeManager', 'Error'),
- unicode(translate('OpenLP.ThemeManager',
- 'Theme %s is used in the %s plugin.')) % \
- (theme, plugin.name))
- return
- if unicode(self.serviceComboBox.currentText()) == theme:
- QtGui.QMessageBox.critical(self,
- translate('OpenLP.ThemeManager', 'Error'),
- unicode(translate('OpenLP.ThemeManager',
- 'Theme %s is used by the service manager.')) % theme)
- return
- row = self.themeListWidget.row(item)
- self.themeListWidget.takeItem(row)
- self.deleteTheme(theme)
+ row = self.themeListWidget.row(item)
+ self.themeListWidget.takeItem(row)
+ self.deleteTheme(theme)
def deleteTheme(self, theme):
"""
@@ -668,7 +636,6 @@ class ThemeManager(QtGui.QWidget):
plugin.renameTheme(self.saveThemeName, name)
if unicode(self.serviceComboBox.currentText()) == name:
editedServiceTheme = True
- self.deleteTheme(self.saveThemeName)
if result == QtGui.QMessageBox.Yes:
# Save the theme, overwriting the existing theme if necessary.
if imageTo and self.oldBackgroundImage and \
@@ -782,3 +749,50 @@ class ThemeManager(QtGui.QWidget):
theme.parse(themeXml)
theme.extend_image_filename(path)
return theme
+
+ def _validate_theme_action(self, action, testPlugin=True):
+ """
+ Check to see if theme has been selected and the destructive action
+ is allowed.
+ """
+ self.global_theme = unicode(QtCore.QSettings().value(
+ self.settingsSection + u'/global theme',
+ QtCore.QVariant(u'')).toString())
+ if check_item_selected(self.themeListWidget,
+ unicode(translate('OpenLP.ThemeManager',
+ 'You must select a theme to %s.')) % action):
+ item = self.themeListWidget.currentItem()
+ theme = unicode(item.text())
+ # confirm deletion
+ answer = QtGui.QMessageBox.question(self,
+ unicode(translate('OpenLP.ThemeManager', '%s Confirmation'))
+ % action,
+ unicode(translate('OpenLP.ThemeManager', '%s %s theme?'))
+ % (action, theme),
+ QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Yes |
+ QtGui.QMessageBox.No), QtGui.QMessageBox.No)
+ if answer == QtGui.QMessageBox.No:
+ return False
+ # should be the same unless default
+ if theme != unicode(item.data(QtCore.Qt.UserRole).toString()):
+ QtGui.QMessageBox.critical(self,
+ translate('OpenLP.ThemeManager', 'Error'),
+ translate('OpenLP.ThemeManager',
+ 'You are unable to delete the default theme.'))
+ else:
+ if testPlugin:
+ for plugin in self.parent.pluginManager.plugins:
+ if plugin.usesTheme(theme):
+ QtGui.QMessageBox.critical(self,
+ translate('OpenLP.ThemeManager', 'Error'),
+ unicode(translate('OpenLP.ThemeManager',
+ 'Theme %s is used in the %s plugin.')) % \
+ (theme, plugin.name))
+ return False
+ if unicode(self.serviceComboBox.currentText()) == theme:
+ QtGui.QMessageBox.critical(self,
+ translate('OpenLP.ThemeManager', 'Error'),
+ unicode(translate('OpenLP.ThemeManager',
+ 'Theme %s is used by the service manager.')) % theme)
+ return False
+ return True
\ No newline at end of file
diff --git a/openlp/core/ui/themestab.py b/openlp/core/ui/themestab.py
index 294d521dc..21df94d9d 100644
--- a/openlp/core/ui/themestab.py
+++ b/openlp/core/ui/themestab.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -212,4 +212,4 @@ class ThemesTab(SettingsTab):
if not preview.isNull():
preview = preview.scaled(300, 255, QtCore.Qt.KeepAspectRatio,
QtCore.Qt.SmoothTransformation)
- self.DefaultListView.setPixmap(preview)
+ self.DefaultListView.setPixmap(preview)
\ No newline at end of file
diff --git a/openlp/core/ui/themewizard.py b/openlp/core/ui/themewizard.py
index e7561cccf..8b89f802c 100644
--- a/openlp/core/ui/themewizard.py
+++ b/openlp/core/ui/themewizard.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
diff --git a/openlp/core/utils/__init__.py b/openlp/core/utils/__init__.py
index 23f77291c..ff354b1c6 100644
--- a/openlp/core/utils/__init__.py
+++ b/openlp/core/utils/__init__.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -279,4 +279,4 @@ from languagemanager import LanguageManager
from actions import ActionList
__all__ = [u'AppLocation', u'check_latest_version', u'add_actions',
- u'get_filesystem_encoding', u'LanguageManager', u'ActionList']
+ u'get_filesystem_encoding', u'LanguageManager', u'ActionList']
\ No newline at end of file
diff --git a/openlp/core/utils/actions.py b/openlp/core/utils/actions.py
index 31afe93d1..4434c416e 100644
--- a/openlp/core/utils/actions.py
+++ b/openlp/core/utils/actions.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -181,4 +181,4 @@ class ActionList(object):
if weight is None:
self.categories[category].actions.append(action)
else:
- self.categories[category].actions.add(action, weight)
+ self.categories[category].actions.add(action, weight)
\ No newline at end of file
diff --git a/openlp/core/utils/languagemanager.py b/openlp/core/utils/languagemanager.py
index 187834beb..76c584bb3 100644
--- a/openlp/core/utils/languagemanager.py
+++ b/openlp/core/utils/languagemanager.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -143,4 +143,4 @@ class LanguageManager(object):
"""
if not LanguageManager.__qm_list__:
LanguageManager.init_qm_list()
- return LanguageManager.__qm_list__
+ return LanguageManager.__qm_list__
\ No newline at end of file
diff --git a/openlp/plugins/__init__.py b/openlp/plugins/__init__.py
index 258707016..7bf441119 100644
--- a/openlp/plugins/__init__.py
+++ b/openlp/plugins/__init__.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -25,4 +25,4 @@
###############################################################################
"""
The :mod:`plugins` module provides all the project produced plugins
-"""
+"""
\ No newline at end of file
diff --git a/openlp/plugins/alerts/__init__.py b/openlp/plugins/alerts/__init__.py
index bb06bffb0..dafae0885 100644
--- a/openlp/plugins/alerts/__init__.py
+++ b/openlp/plugins/alerts/__init__.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -26,4 +26,4 @@
"""
The :mod:`alerts` module provides the Alerts plugin for producing impromptu
on-screen announcements during a service.
-"""
+"""
\ No newline at end of file
diff --git a/openlp/plugins/alerts/alertsplugin.py b/openlp/plugins/alerts/alertsplugin.py
index fbd51a13a..277a3903a 100644
--- a/openlp/plugins/alerts/alertsplugin.py
+++ b/openlp/plugins/alerts/alertsplugin.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -40,7 +40,7 @@ class AlertsPlugin(Plugin):
log.info(u'Alerts Plugin loaded')
def __init__(self, plugin_helpers):
- Plugin.__init__(self, u'Alerts', u'1.9.3', plugin_helpers)
+ Plugin.__init__(self, u'Alerts', u'1.9.4', plugin_helpers)
self.weight = -3
self.icon = build_icon(u':/plugins/plugin_alerts.png')
self.alertsmanager = AlertsManager(self)
@@ -120,4 +120,4 @@ class AlertsPlugin(Plugin):
## Name for MediaDockManager, SettingsManager ##
self.textStrings[StringContent.VisibleName] = {
u'title': translate('AlertsPlugin', 'Alerts')
- }
+ }
\ No newline at end of file
diff --git a/openlp/plugins/alerts/forms/__init__.py b/openlp/plugins/alerts/forms/__init__.py
index 0eb49be15..da7ae6683 100644
--- a/openlp/plugins/alerts/forms/__init__.py
+++ b/openlp/plugins/alerts/forms/__init__.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -24,4 +24,4 @@
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
###############################################################################
-from alertform import AlertForm
+from alertform import AlertForm
\ No newline at end of file
diff --git a/openlp/plugins/alerts/forms/alertdialog.py b/openlp/plugins/alerts/forms/alertdialog.py
index 24cc4317b..ac0a5ebc8 100644
--- a/openlp/plugins/alerts/forms/alertdialog.py
+++ b/openlp/plugins/alerts/forms/alertdialog.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -140,4 +140,4 @@ class Ui_AlertDialog(object):
self.DisplayCloseButton.setText(
translate('AlertsPlugin.AlertForm', 'Display && Cl&ose'))
self.CloseButton.setText(
- translate('AlertsPlugin.AlertForm', '&Close'))
+ translate('AlertsPlugin.AlertForm', '&Close'))
\ No newline at end of file
diff --git a/openlp/plugins/alerts/forms/alertform.py b/openlp/plugins/alerts/forms/alertform.py
index cf9c86c27..8e0d808a0 100644
--- a/openlp/plugins/alerts/forms/alertform.py
+++ b/openlp/plugins/alerts/forms/alertform.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -193,4 +193,4 @@ class AlertForm(QtGui.QDialog, Ui_AlertDialog):
text = text.replace(u'<>', unicode(self.ParameterEdit.text()))
self.parent.alertsmanager.displayAlert(text)
return True
- return False
+ return False
\ No newline at end of file
diff --git a/openlp/plugins/alerts/lib/__init__.py b/openlp/plugins/alerts/lib/__init__.py
index 722ee0c3d..f6a535b1b 100644
--- a/openlp/plugins/alerts/lib/__init__.py
+++ b/openlp/plugins/alerts/lib/__init__.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -25,4 +25,4 @@
###############################################################################
from alertsmanager import AlertsManager
-from alertstab import AlertsTab
+from alertstab import AlertsTab
\ No newline at end of file
diff --git a/openlp/plugins/alerts/lib/alertsmanager.py b/openlp/plugins/alerts/lib/alertsmanager.py
index 0f2eb4ec7..6fe0ae132 100644
--- a/openlp/plugins/alerts/lib/alertsmanager.py
+++ b/openlp/plugins/alerts/lib/alertsmanager.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -103,4 +103,4 @@ class AlertsManager(QtCore.QObject):
self.parent.liveController.display.alert(u'')
self.killTimer(self.timer_id)
self.timer_id = 0
- self.generateAlert()
+ self.generateAlert()
\ No newline at end of file
diff --git a/openlp/plugins/alerts/lib/alertstab.py b/openlp/plugins/alerts/lib/alertstab.py
index 625287603..4186627d8 100644
--- a/openlp/plugins/alerts/lib/alertstab.py
+++ b/openlp/plugins/alerts/lib/alertstab.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -294,4 +294,4 @@ class AlertsTab(SettingsTab):
font.setPointSize(self.font_size)
self.FontPreview.setFont(font)
self.FontPreview.setStyleSheet(u'background-color: %s; color: %s' %
- (self.bg_color, self.font_color))
+ (self.bg_color, self.font_color))
\ No newline at end of file
diff --git a/openlp/plugins/alerts/lib/db.py b/openlp/plugins/alerts/lib/db.py
index e71007c28..e324bc838 100644
--- a/openlp/plugins/alerts/lib/db.py
+++ b/openlp/plugins/alerts/lib/db.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -55,4 +55,4 @@ def init_schema(url):
mapper(AlertItem, alerts_table)
metadata.create_all(checkfirst=True)
- return session
+ return session
\ No newline at end of file
diff --git a/openlp/plugins/bibles/__init__.py b/openlp/plugins/bibles/__init__.py
index a1e8f5a51..59cd2afec 100644
--- a/openlp/plugins/bibles/__init__.py
+++ b/openlp/plugins/bibles/__init__.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -26,4 +26,4 @@
"""
The :mod:`bibles` module provides the Bible plugin to enable OpenLP to display
scripture.
-"""
+"""
\ No newline at end of file
diff --git a/openlp/plugins/bibles/bibleplugin.py b/openlp/plugins/bibles/bibleplugin.py
index 42976cde6..3e8dc82ee 100644
--- a/openlp/plugins/bibles/bibleplugin.py
+++ b/openlp/plugins/bibles/bibleplugin.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -37,7 +37,7 @@ class BiblePlugin(Plugin):
log.info(u'Bible Plugin loaded')
def __init__(self, plugin_helpers):
- Plugin.__init__(self, u'Bibles', u'1.9.3', plugin_helpers)
+ Plugin.__init__(self, u'Bibles', u'1.9.4', plugin_helpers)
self.weight = -9
self.icon_path = u':/plugins/plugin_bibles.png'
self.icon = build_icon(self.icon_path)
@@ -175,4 +175,4 @@ class BiblePlugin(Plugin):
u'title': translate('BiblesPlugin', 'Service'),
u'tooltip': translate('BiblesPlugin',
'Add the selected Bible to the service')
- }
+ }
\ No newline at end of file
diff --git a/openlp/plugins/bibles/forms/__init__.py b/openlp/plugins/bibles/forms/__init__.py
index e5d0317c5..1365dc5e0 100644
--- a/openlp/plugins/bibles/forms/__init__.py
+++ b/openlp/plugins/bibles/forms/__init__.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -53,4 +53,4 @@ from the .ui files later if necessary.
from bibleimportform import BibleImportForm
-__all__ = ['BibleImportForm']
+__all__ = ['BibleImportForm']
\ No newline at end of file
diff --git a/openlp/plugins/bibles/forms/bibleimportform.py b/openlp/plugins/bibles/forms/bibleimportform.py
index 9aaf2c312..b01a10ffb 100644
--- a/openlp/plugins/bibles/forms/bibleimportform.py
+++ b/openlp/plugins/bibles/forms/bibleimportform.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -534,4 +534,4 @@ class BibleImportForm(QtGui.QWizard, Ui_BibleImportWizard):
self.importProgressBar.setValue(self.importProgressBar.maximum())
self.finishButton.setVisible(True)
self.cancelButton.setVisible(False)
- Receiver.send_message(u'openlp_process_events')
+ Receiver.send_message(u'openlp_process_events')
\ No newline at end of file
diff --git a/openlp/plugins/bibles/forms/bibleimportwizard.py b/openlp/plugins/bibles/forms/bibleimportwizard.py
index 1cb5109b6..af6bae842 100644
--- a/openlp/plugins/bibles/forms/bibleimportwizard.py
+++ b/openlp/plugins/bibles/forms/bibleimportwizard.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
diff --git a/openlp/plugins/bibles/lib/__init__.py b/openlp/plugins/bibles/lib/__init__.py
index 7975bfed7..31c7e4f3f 100644
--- a/openlp/plugins/bibles/lib/__init__.py
+++ b/openlp/plugins/bibles/lib/__init__.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -222,4 +222,4 @@ class SearchResults(object):
from manager import BibleManager
from biblestab import BiblesTab
-from mediaitem import BibleMediaItem
+from mediaitem import BibleMediaItem
\ No newline at end of file
diff --git a/openlp/plugins/bibles/lib/biblestab.py b/openlp/plugins/bibles/lib/biblestab.py
index a52c31fb7..c4815f2aa 100644
--- a/openlp/plugins/bibles/lib/biblestab.py
+++ b/openlp/plugins/bibles/lib/biblestab.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -251,4 +251,4 @@ class BiblesTab(SettingsTab):
# Not Found.
index = 0
self.bible_theme = u''
- self.BibleThemeComboBox.setCurrentIndex(index)
+ self.BibleThemeComboBox.setCurrentIndex(index)
\ No newline at end of file
diff --git a/openlp/plugins/bibles/lib/csvbible.py b/openlp/plugins/bibles/lib/csvbible.py
index 62571642e..d9144a34e 100644
--- a/openlp/plugins/bibles/lib/csvbible.py
+++ b/openlp/plugins/bibles/lib/csvbible.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -109,4 +109,4 @@ class CSVBible(BibleDB):
if self.stop_import_flag:
return False
else:
- return success
+ return success
\ No newline at end of file
diff --git a/openlp/plugins/bibles/lib/db.py b/openlp/plugins/bibles/lib/db.py
index cdc81d408..0ff2d999e 100644
--- a/openlp/plugins/bibles/lib/db.py
+++ b/openlp/plugins/bibles/lib/db.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -435,4 +435,4 @@ class BibleDB(QtCore.QObject, Manager):
log.debug(books)
log.debug(u'...............................Verses ')
verses = self.session.query(Verse).all()
- log.debug(verses)
+ log.debug(verses)
\ No newline at end of file
diff --git a/openlp/plugins/bibles/lib/http.py b/openlp/plugins/bibles/lib/http.py
index 79d3f311f..07416b965 100644
--- a/openlp/plugins/bibles/lib/http.py
+++ b/openlp/plugins/bibles/lib/http.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -522,4 +522,4 @@ class HTTPBible(BibleDB):
``chapter``
The chapter whose verses are being counted.
"""
- return HTTPBooks.get_verse_count(book, chapter)
+ return HTTPBooks.get_verse_count(book, chapter)
\ No newline at end of file
diff --git a/openlp/plugins/bibles/lib/manager.py b/openlp/plugins/bibles/lib/manager.py
index 93f301713..9dc70e85a 100644
--- a/openlp/plugins/bibles/lib/manager.py
+++ b/openlp/plugins/bibles/lib/manager.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -357,4 +357,3 @@ class BibleManager(object):
BibleFormat.set_availability(BibleFormat.OpenLP1, has_openlp1)
__all__ = [u'BibleFormat']
-
diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py
index dfed1697d..20fa9e1f6 100644
--- a/openlp/plugins/bibles/lib/mediaitem.py
+++ b/openlp/plugins/bibles/lib/mediaitem.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -921,4 +921,4 @@ class BibleMediaItem(MediaManagerItem):
verse_text = u'{su}[' + verse_text + u']{/su}'
else:
verse_text = u'{su}' + verse_text + u'{/su}'
- return verse_text
+ return verse_text
\ No newline at end of file
diff --git a/openlp/plugins/bibles/lib/openlp1.py b/openlp/plugins/bibles/lib/openlp1.py
index ba9476fca..41f4a2836 100644
--- a/openlp/plugins/bibles/lib/openlp1.py
+++ b/openlp/plugins/bibles/lib/openlp1.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -90,4 +90,4 @@ class OpenLP1Bible(BibleDB):
Receiver.send_message(u'openlp_process_events')
self.session.commit()
connection.close()
- return True
+ return True
\ No newline at end of file
diff --git a/openlp/plugins/bibles/lib/opensong.py b/openlp/plugins/bibles/lib/opensong.py
index 98b3b6a85..5b2488996 100644
--- a/openlp/plugins/bibles/lib/opensong.py
+++ b/openlp/plugins/bibles/lib/opensong.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -97,4 +97,4 @@ class OpenSongBible(BibleDB):
if self.stop_import_flag:
return False
else:
- return success
+ return success
\ No newline at end of file
diff --git a/openlp/plugins/bibles/lib/osis.py b/openlp/plugins/bibles/lib/osis.py
index f39a4ab0f..5b359240f 100644
--- a/openlp/plugins/bibles/lib/osis.py
+++ b/openlp/plugins/bibles/lib/osis.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -180,4 +180,4 @@ class OSISBible(BibleDB):
if self.stop_import_flag:
return False
else:
- return success
+ return success
\ No newline at end of file
diff --git a/openlp/plugins/custom/__init__.py b/openlp/plugins/custom/__init__.py
index 2bbf2a58b..fb86201a3 100644
--- a/openlp/plugins/custom/__init__.py
+++ b/openlp/plugins/custom/__init__.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -27,4 +27,4 @@
The :mod:`custom` module provides the Custom plugin which allows custom,
themed, text based items to be displayed without having to misuse another item
type.
-"""
+"""
\ No newline at end of file
diff --git a/openlp/plugins/custom/customplugin.py b/openlp/plugins/custom/customplugin.py
index ad170ea12..9580077a8 100644
--- a/openlp/plugins/custom/customplugin.py
+++ b/openlp/plugins/custom/customplugin.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -47,7 +47,7 @@ class CustomPlugin(Plugin):
log.info(u'Custom Plugin loaded')
def __init__(self, plugin_helpers):
- Plugin.__init__(self, u'Custom', u'1.9.3', plugin_helpers)
+ Plugin.__init__(self, u'Custom', u'1.9.4', plugin_helpers)
self.weight = -5
self.manager = Manager(u'custom', init_schema)
self.edit_custom_form = EditCustomForm(self.manager)
@@ -167,4 +167,4 @@ class CustomPlugin(Plugin):
"""
log.info(u'Custom Finalising')
self.manager.finalise()
- Plugin.finalise(self)
+ Plugin.finalise(self)
\ No newline at end of file
diff --git a/openlp/plugins/custom/forms/__init__.py b/openlp/plugins/custom/forms/__init__.py
index f31745e14..60f1395fb 100644
--- a/openlp/plugins/custom/forms/__init__.py
+++ b/openlp/plugins/custom/forms/__init__.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -25,4 +25,4 @@
###############################################################################
from editcustomform import EditCustomForm
-from editcustomslideform import EditCustomSlideForm
+from editcustomslideform import EditCustomSlideForm
\ No newline at end of file
diff --git a/openlp/plugins/custom/forms/editcustomdialog.py b/openlp/plugins/custom/forms/editcustomdialog.py
index 1b16c6236..266673daf 100644
--- a/openlp/plugins/custom/forms/editcustomdialog.py
+++ b/openlp/plugins/custom/forms/editcustomdialog.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -152,4 +152,4 @@ class Ui_CustomEditDialog(object):
self.themeLabel.setText(
translate('CustomPlugin.EditCustomForm', 'The&me:'))
self.creditLabel.setText(
- translate('CustomPlugin.EditCustomForm', '&Credits:'))
+ translate('CustomPlugin.EditCustomForm', '&Credits:'))
\ No newline at end of file
diff --git a/openlp/plugins/custom/forms/editcustomform.py b/openlp/plugins/custom/forms/editcustomform.py
index 359cc9eae..2f005828a 100644
--- a/openlp/plugins/custom/forms/editcustomform.py
+++ b/openlp/plugins/custom/forms/editcustomform.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -265,4 +265,4 @@ class EditCustomForm(QtGui.QDialog, Ui_CustomEditDialog):
if self.slideListView.count() == 0:
return False, translate('CustomPlugin.EditCustomForm',
'You need to add at least one slide')
- return True, u''
+ return True, u''
\ No newline at end of file
diff --git a/openlp/plugins/custom/forms/editcustomslidedialog.py b/openlp/plugins/custom/forms/editcustomslidedialog.py
index ce4cf6e29..d16dc67f0 100644
--- a/openlp/plugins/custom/forms/editcustomslidedialog.py
+++ b/openlp/plugins/custom/forms/editcustomslidedialog.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -56,4 +56,4 @@ class Ui_CustomSlideEditDialog(object):
translate('CustomPlugin.EditCustomForm', 'Split Slide'))
self.splitButton.setToolTip(
translate('CustomPlugin.EditCustomForm', 'Split a slide into two '
- 'by inserting a slide splitter.'))
+ 'by inserting a slide splitter.'))
\ No newline at end of file
diff --git a/openlp/plugins/custom/forms/editcustomslideform.py b/openlp/plugins/custom/forms/editcustomslideform.py
index 72c7dbb4a..c8b74a387 100644
--- a/openlp/plugins/custom/forms/editcustomslideform.py
+++ b/openlp/plugins/custom/forms/editcustomslideform.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -72,4 +72,4 @@ class EditCustomSlideForm(QtGui.QDialog, Ui_CustomSlideEditDialog):
if self.slideTextEdit.textCursor().columnNumber() != 0:
self.slideTextEdit.insertPlainText(u'\n')
self.slideTextEdit.insertPlainText(u'[---]\n' )
- self.slideTextEdit.setFocus()
+ self.slideTextEdit.setFocus()
\ No newline at end of file
diff --git a/openlp/plugins/custom/lib/__init__.py b/openlp/plugins/custom/lib/__init__.py
index 15e764dcd..d3d8312d7 100644
--- a/openlp/plugins/custom/lib/__init__.py
+++ b/openlp/plugins/custom/lib/__init__.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -26,4 +26,4 @@
from customxmlhandler import CustomXMLBuilder, CustomXMLParser
from mediaitem import CustomMediaItem
-from customtab import CustomTab
+from customtab import CustomTab
\ No newline at end of file
diff --git a/openlp/plugins/custom/lib/customtab.py b/openlp/plugins/custom/lib/customtab.py
index 461d6af59..5063ee995 100644
--- a/openlp/plugins/custom/lib/customtab.py
+++ b/openlp/plugins/custom/lib/customtab.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -76,4 +76,4 @@ class CustomTab(SettingsTab):
def save(self):
QtCore.QSettings().setValue(self.settingsSection + u'/display footer',
- QtCore.QVariant(self.displayFooter))
+ QtCore.QVariant(self.displayFooter))
\ No newline at end of file
diff --git a/openlp/plugins/custom/lib/customxmlhandler.py b/openlp/plugins/custom/lib/customxmlhandler.py
index 14ca23ee0..1171ce6bd 100644
--- a/openlp/plugins/custom/lib/customxmlhandler.py
+++ b/openlp/plugins/custom/lib/customxmlhandler.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -153,4 +153,4 @@ class CustomXMLParser(object):
"""
Debugging aid to dump XML so that we can see what we have.
"""
- return dump(self.custom_xml)
+ return dump(self.custom_xml)
\ No newline at end of file
diff --git a/openlp/plugins/custom/lib/db.py b/openlp/plugins/custom/lib/db.py
index 1977a4188..1fbc04980 100644
--- a/openlp/plugins/custom/lib/db.py
+++ b/openlp/plugins/custom/lib/db.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -59,4 +59,4 @@ def init_schema(url):
mapper(CustomSlide, custom_slide_table)
metadata.create_all(checkfirst=True)
- return session
+ return session
\ No newline at end of file
diff --git a/openlp/plugins/custom/lib/mediaitem.py b/openlp/plugins/custom/lib/mediaitem.py
index 5d9d49a25..304773ea5 100644
--- a/openlp/plugins/custom/lib/mediaitem.py
+++ b/openlp/plugins/custom/lib/mediaitem.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -182,4 +182,4 @@ class CustomMediaItem(MediaManagerItem):
else:
raw_footer.append(u'')
service_item.raw_footer = raw_footer
- return True
+ return True
\ No newline at end of file
diff --git a/openlp/plugins/images/__init__.py b/openlp/plugins/images/__init__.py
index a98ed8ed1..6ea473c72 100644
--- a/openlp/plugins/images/__init__.py
+++ b/openlp/plugins/images/__init__.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -26,4 +26,4 @@
"""
The :mod:`images` module provides the Images plugin. The Images plugin
provides the facility to display images from OpenLP.
-"""
+"""
\ No newline at end of file
diff --git a/openlp/plugins/images/imageplugin.py b/openlp/plugins/images/imageplugin.py
index a1e539799..4bd7783ee 100644
--- a/openlp/plugins/images/imageplugin.py
+++ b/openlp/plugins/images/imageplugin.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
diff --git a/openlp/plugins/images/lib/__init__.py b/openlp/plugins/images/lib/__init__.py
index fb7b0a249..6ff2a295b 100644
--- a/openlp/plugins/images/lib/__init__.py
+++ b/openlp/plugins/images/lib/__init__.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -24,4 +24,4 @@
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
###############################################################################
-from mediaitem import ImageMediaItem
+from mediaitem import ImageMediaItem
\ No newline at end of file
diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py
index 0774787f5..fabad8e8c 100644
--- a/openlp/plugins/images/lib/mediaitem.py
+++ b/openlp/plugins/images/lib/mediaitem.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -195,4 +195,4 @@ class ImageMediaItem(MediaManagerItem):
self.resetButton.setVisible(True)
def onPreviewClick(self):
- MediaManagerItem.onPreviewClick(self)
+ MediaManagerItem.onPreviewClick(self)
\ No newline at end of file
diff --git a/openlp/plugins/media/__init__.py b/openlp/plugins/media/__init__.py
index d45371e8d..7be6e5ea9 100644
--- a/openlp/plugins/media/__init__.py
+++ b/openlp/plugins/media/__init__.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -28,4 +28,4 @@ The :mod:`media` module provides the Media plugin which allows OpenLP to
display videos. The media supported depends not only on the Python support
but also extensively on the codecs installed on the underlying operating system
being picked up and usable by Python.
-"""
+"""
\ No newline at end of file
diff --git a/openlp/plugins/media/lib/__init__.py b/openlp/plugins/media/lib/__init__.py
index 8d3ba2fe4..59d7642df 100644
--- a/openlp/plugins/media/lib/__init__.py
+++ b/openlp/plugins/media/lib/__init__.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -27,4 +27,4 @@
from mediaitem import MediaMediaItem
from mediatab import MediaTab
-__all__ = ['MediaMediaItem']
+__all__ = ['MediaMediaItem']
\ No newline at end of file
diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py
index 11e00628e..e2309ea76 100644
--- a/openlp/plugins/media/lib/mediaitem.py
+++ b/openlp/plugins/media/lib/mediaitem.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -159,4 +159,4 @@ class MediaMediaItem(MediaManagerItem):
img = QtGui.QPixmap(u':/media/media_video.png').toImage()
item_name.setIcon(build_icon(img))
item_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(file))
- self.listView.addItem(item_name)
+ self.listView.addItem(item_name)
\ No newline at end of file
diff --git a/openlp/plugins/media/lib/mediatab.py b/openlp/plugins/media/lib/mediatab.py
index e67da62df..2fc372070 100644
--- a/openlp/plugins/media/lib/mediatab.py
+++ b/openlp/plugins/media/lib/mediatab.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -79,4 +79,4 @@ class MediaTab(SettingsTab):
if oldUsePhonon != self.usePhonon:
QtCore.QSettings().setValue(self.settingsSection + u'/use phonon',
QtCore.QVariant(self.usePhonon))
- Receiver.send_message(u'config_screen_changed')
+ Receiver.send_message(u'config_screen_changed')
\ No newline at end of file
diff --git a/openlp/plugins/media/mediaplugin.py b/openlp/plugins/media/mediaplugin.py
index 7660e8514..2f5b78b8e 100644
--- a/openlp/plugins/media/mediaplugin.py
+++ b/openlp/plugins/media/mediaplugin.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -38,7 +38,7 @@ class MediaPlugin(Plugin):
log.info(u'%s MediaPlugin loaded', __name__)
def __init__(self, plugin_helpers):
- Plugin.__init__(self, u'Media', u'1.9.3', plugin_helpers)
+ Plugin.__init__(self, u'Media', u'1.9.4', plugin_helpers)
self.weight = -6
self.icon_path = u':/plugins/plugin_media.png'
self.icon = build_icon(self.icon_path)
@@ -142,4 +142,4 @@ class MediaPlugin(Plugin):
u'title': translate('MediaPlugin', 'Service'),
u'tooltip': translate('MediaPlugin',
'Add the selected Media to the service')
- }
+ }
\ No newline at end of file
diff --git a/openlp/plugins/presentations/__init__.py b/openlp/plugins/presentations/__init__.py
index 4e492fa0c..317281c23 100644
--- a/openlp/plugins/presentations/__init__.py
+++ b/openlp/plugins/presentations/__init__.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -26,4 +26,4 @@
"""
The :mod:`presentations` module provides the Presentations plugin which allows
OpenLP to show presentations from most popular presentation packages.
-"""
+"""
\ No newline at end of file
diff --git a/openlp/plugins/presentations/lib/__init__.py b/openlp/plugins/presentations/lib/__init__.py
index e64169b92..2e46cf486 100644
--- a/openlp/plugins/presentations/lib/__init__.py
+++ b/openlp/plugins/presentations/lib/__init__.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -27,4 +27,4 @@
from presentationcontroller import PresentationController
from messagelistener import MessageListener
from mediaitem import PresentationMediaItem
-from presentationtab import PresentationTab
+from presentationtab import PresentationTab
\ No newline at end of file
diff --git a/openlp/plugins/presentations/lib/impresscontroller.py b/openlp/plugins/presentations/lib/impresscontroller.py
index 8f8e06734..6ec90c853 100644
--- a/openlp/plugins/presentations/lib/impresscontroller.py
+++ b/openlp/plugins/presentations/lib/impresscontroller.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -478,4 +478,4 @@ class ImpressDocument(PresentationDocument):
shape = notes.getByIndex(idx)
if shape.supportsService("com.sun.star.drawing.Text"):
text += shape.getString() + '\n'
- return text
+ return text
\ No newline at end of file
diff --git a/openlp/plugins/presentations/lib/mediaitem.py b/openlp/plugins/presentations/lib/mediaitem.py
index 8e3a2fc36..4b1067e8e 100644
--- a/openlp/plugins/presentations/lib/mediaitem.py
+++ b/openlp/plugins/presentations/lib/mediaitem.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -293,4 +293,4 @@ class PresentationMediaItem(MediaManagerItem):
if self.controllers[controller].enabled():
if filetype in self.controllers[controller].alsosupports:
return controller
- return None
+ return None
\ No newline at end of file
diff --git a/openlp/plugins/presentations/lib/messagelistener.py b/openlp/plugins/presentations/lib/messagelistener.py
index 535744369..566fc5706 100644
--- a/openlp/plugins/presentations/lib/messagelistener.py
+++ b/openlp/plugins/presentations/lib/messagelistener.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -367,4 +367,4 @@ class MessageListener(object):
to check which slide is currently displayed so the slidecontroller
view can be updated
"""
- self.live_handler.poll()
+ self.live_handler.poll()
\ No newline at end of file
diff --git a/openlp/plugins/presentations/lib/powerpointcontroller.py b/openlp/plugins/presentations/lib/powerpointcontroller.py
index 58bb6b3d6..012f8534a 100644
--- a/openlp/plugins/presentations/lib/powerpointcontroller.py
+++ b/openlp/plugins/presentations/lib/powerpointcontroller.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -312,4 +312,4 @@ class PowerpointDocument(PresentationDocument):
shape = shapes(idx + 1)
if shape.HasTextFrame:
text += shape.TextFrame.TextRange.Text + '\n'
- return text
+ return text
\ No newline at end of file
diff --git a/openlp/plugins/presentations/lib/pptviewcontroller.py b/openlp/plugins/presentations/lib/pptviewcontroller.py
index 281e647de..4c8e7bf95 100644
--- a/openlp/plugins/presentations/lib/pptviewcontroller.py
+++ b/openlp/plugins/presentations/lib/pptviewcontroller.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -247,4 +247,4 @@ class PptviewDocument(PresentationDocument):
"""
Triggers the previous slide on the running presentation
"""
- self.controller.process.PrevStep(self.pptid)
+ self.controller.process.PrevStep(self.pptid)
\ No newline at end of file
diff --git a/openlp/plugins/presentations/lib/pptviewlib/ppttest.py b/openlp/plugins/presentations/lib/pptviewlib/ppttest.py
index 304c942f0..de0be3e73 100644
--- a/openlp/plugins/presentations/lib/pptviewlib/ppttest.py
+++ b/openlp/plugins/presentations/lib/pptviewlib/ppttest.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
diff --git a/openlp/plugins/presentations/lib/presentationcontroller.py b/openlp/plugins/presentations/lib/presentationcontroller.py
index 5bd0719e9..42f7b654a 100644
--- a/openlp/plugins/presentations/lib/presentationcontroller.py
+++ b/openlp/plugins/presentations/lib/presentationcontroller.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -440,4 +440,4 @@ class PresentationDocument(object):
``slide_no``
The slide the notes are required for, starting at 1
"""
- return ''
+ return ''
\ No newline at end of file
diff --git a/openlp/plugins/presentations/lib/presentationtab.py b/openlp/plugins/presentations/lib/presentationtab.py
index d1ebb570c..cd4dd7901 100644
--- a/openlp/plugins/presentations/lib/presentationtab.py
+++ b/openlp/plugins/presentations/lib/presentationtab.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -160,4 +160,4 @@ class PresentationTab(SettingsTab):
QtCore.QVariant(self.OverrideAppCheckBox.checkState()))
changed = True
if changed:
- Receiver.send_message(u'mediaitem_presentation_rebuild')
+ Receiver.send_message(u'mediaitem_presentation_rebuild')
\ No newline at end of file
diff --git a/openlp/plugins/presentations/presentationplugin.py b/openlp/plugins/presentations/presentationplugin.py
index 300314bde..9c4a64866 100644
--- a/openlp/plugins/presentations/presentationplugin.py
+++ b/openlp/plugins/presentations/presentationplugin.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -51,7 +51,7 @@ class PresentationPlugin(Plugin):
"""
log.debug(u'Initialised')
self.controllers = {}
- Plugin.__init__(self, u'Presentations', u'1.9.3', plugin_helpers)
+ Plugin.__init__(self, u'Presentations', u'1.9.4', plugin_helpers)
self.weight = -8
self.icon_path = u':/plugins/plugin_presentations.png'
self.icon = build_icon(self.icon_path)
@@ -189,4 +189,4 @@ class PresentationPlugin(Plugin):
u'title': translate('PresentationPlugin', 'Service'),
u'tooltip': translate('PresentationPlugin',
'Add the selected Presentation to the service')
- }
+ }
\ No newline at end of file
diff --git a/openlp/plugins/remotes/__init__.py b/openlp/plugins/remotes/__init__.py
index 3c35beb4c..4e619fb67 100644
--- a/openlp/plugins/remotes/__init__.py
+++ b/openlp/plugins/remotes/__init__.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -26,4 +26,4 @@
"""
The :mod:`remotes` plugin allows OpenLP to be controlled from another machine
over a network connection.
-"""
+"""
\ No newline at end of file
diff --git a/openlp/plugins/remotes/html/openlp.js b/openlp/plugins/remotes/html/openlp.js
index 03e846376..0c7105a68 100644
--- a/openlp/plugins/remotes/html/openlp.js
+++ b/openlp/plugins/remotes/html/openlp.js
@@ -206,8 +206,12 @@ OpenLP.Namespace.create("OpenLP.Remote", {
},
sendLiveSet: function (e)
{
- var id = OpenLP.Events.getElement(e).parent().attr("value");
- OpenLP.Remote.sendEvent("slidecontroller_live_set", id);
+ var tr = OpenLP.Events.getElement(e).parent();
+ if (tr[0].tagName != "TR")
+ {
+ tr = tr.parent();
+ }
+ OpenLP.Remote.sendEvent("slidecontroller_live_set", tr.attr("value"));
return false;
},
sendSetItem: function (e)
diff --git a/openlp/plugins/remotes/lib/__init__.py b/openlp/plugins/remotes/lib/__init__.py
index 829afe759..b6f952242 100644
--- a/openlp/plugins/remotes/lib/__init__.py
+++ b/openlp/plugins/remotes/lib/__init__.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -25,4 +25,4 @@
###############################################################################
from remotetab import RemoteTab
-from httpserver import HttpServer
+from httpserver import HttpServer
\ No newline at end of file
diff --git a/openlp/plugins/remotes/lib/httpserver.py b/openlp/plugins/remotes/lib/httpserver.py
index f1796101f..6ec9476a8 100644
--- a/openlp/plugins/remotes/lib/httpserver.py
+++ b/openlp/plugins/remotes/lib/httpserver.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -347,4 +347,4 @@ class HttpConnection(object):
log.debug(u'close socket')
self.socket.close()
self.socket = None
- self.parent.close_connection(self)
+ self.parent.close_connection(self)
\ No newline at end of file
diff --git a/openlp/plugins/remotes/lib/remotetab.py b/openlp/plugins/remotes/lib/remotetab.py
index 123aa291d..e81cc99ae 100644
--- a/openlp/plugins/remotes/lib/remotetab.py
+++ b/openlp/plugins/remotes/lib/remotetab.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -78,4 +78,4 @@ class RemoteTab(SettingsTab):
QtCore.QSettings().setValue(self.settingsSection + u'/port',
QtCore.QVariant(self.portSpinBox.value()))
QtCore.QSettings().setValue(self.settingsSection + u'/ip address',
- QtCore.QVariant(self.addressEdit.text()))
+ QtCore.QVariant(self.addressEdit.text()))
\ No newline at end of file
diff --git a/openlp/plugins/remotes/remoteplugin.py b/openlp/plugins/remotes/remoteplugin.py
index fe2776802..419a51a72 100644
--- a/openlp/plugins/remotes/remoteplugin.py
+++ b/openlp/plugins/remotes/remoteplugin.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -38,7 +38,7 @@ class RemotesPlugin(Plugin):
"""
remotes constructor
"""
- Plugin.__init__(self, u'Remotes', u'1.9.3', plugin_helpers)
+ Plugin.__init__(self, u'Remotes', u'1.9.4', plugin_helpers)
self.icon = build_icon(u':/plugins/plugin_remote.png')
self.weight = -1
self.server = None
@@ -89,5 +89,5 @@ class RemotesPlugin(Plugin):
}
## Name for MediaDockManager, SettingsManager ##
self.textStrings[StringContent.VisibleName] = {
- u'title': translate('RemotePlugin', 'Remotes')
+ u'title': translate('RemotePlugin', 'Remote')
}
\ No newline at end of file
diff --git a/openlp/plugins/songs/__init__.py b/openlp/plugins/songs/__init__.py
index 7631351e0..c95d29c46 100644
--- a/openlp/plugins/songs/__init__.py
+++ b/openlp/plugins/songs/__init__.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -26,4 +26,4 @@
"""
The :mod:`songs` module provides the Songs plugin. The Songs plugin provides
the main lyric projection function of OpenLP.
-"""
+"""
\ No newline at end of file
diff --git a/openlp/plugins/songs/forms/__init__.py b/openlp/plugins/songs/forms/__init__.py
index 511d82747..160a014ac 100644
--- a/openlp/plugins/songs/forms/__init__.py
+++ b/openlp/plugins/songs/forms/__init__.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -57,4 +57,4 @@ from songbookform import SongBookForm
from editverseform import EditVerseForm
from editsongform import EditSongForm
from songmaintenanceform import SongMaintenanceForm
-from songimportform import SongImportForm
+from songimportform import SongImportForm
\ No newline at end of file
diff --git a/openlp/plugins/songs/forms/authorsdialog.py b/openlp/plugins/songs/forms/authorsdialog.py
index 8141703b0..1c5191702 100644
--- a/openlp/plugins/songs/forms/authorsdialog.py
+++ b/openlp/plugins/songs/forms/authorsdialog.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -83,4 +83,4 @@ class Ui_AuthorsDialog(object):
self.FirstNameLabel.setText(
translate('SongsPlugin.AuthorsForm', 'First name:'))
self.LastNameLabel.setText(
- translate('SongsPlugin.AuthorsForm', 'Last name:'))
+ translate('SongsPlugin.AuthorsForm', 'Last name:'))
\ No newline at end of file
diff --git a/openlp/plugins/songs/forms/authorsform.py b/openlp/plugins/songs/forms/authorsform.py
index 1dacd82cc..6777d2f49 100644
--- a/openlp/plugins/songs/forms/authorsform.py
+++ b/openlp/plugins/songs/forms/authorsform.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -108,4 +108,4 @@ class AuthorsForm(QtGui.QDialog, Ui_AuthorsDialog):
self.DisplayEdit.setFocus()
return False
else:
- return QtGui.QDialog.accept(self)
+ return QtGui.QDialog.accept(self)
\ No newline at end of file
diff --git a/openlp/plugins/songs/forms/editsongdialog.py b/openlp/plugins/songs/forms/editsongdialog.py
index 66ade5bcd..7765b1a26 100644
--- a/openlp/plugins/songs/forms/editsongdialog.py
+++ b/openlp/plugins/songs/forms/editsongdialog.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -470,4 +470,4 @@ class Ui_EditSongDialog(object):
self.SongTabWidget.setTabText(
self.SongTabWidget.indexOf(self.ThemeTab),
translate('SongsPlugin.EditSongForm',
- 'Theme, Copyright Info && Comments'))
+ 'Theme, Copyright Info && Comments'))
\ No newline at end of file
diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py
index ad4182d54..929dfd839 100644
--- a/openlp/plugins/songs/forms/editsongform.py
+++ b/openlp/plugins/songs/forms/editsongform.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -753,4 +753,4 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
def processTitle(self):
log.debug(u'processTitle')
self.song.search_title = re.sub(r'[\'"`,;:(){}?]+', u'',
- unicode(self.song.search_title)).lower()
+ unicode(self.song.search_title)).lower()
\ No newline at end of file
diff --git a/openlp/plugins/songs/forms/editversedialog.py b/openlp/plugins/songs/forms/editversedialog.py
index 43dc8b96d..f83579044 100644
--- a/openlp/plugins/songs/forms/editversedialog.py
+++ b/openlp/plugins/songs/forms/editversedialog.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -104,4 +104,4 @@ class Ui_EditVerseDialog(object):
self.verseTypeComboBox.setItemText(6,
VerseType.to_string(VerseType.Other))
self.insertButton.setText(
- translate('SongsPlugin.EditVerseForm', '&Insert'))
+ translate('SongsPlugin.EditVerseForm', '&Insert'))
\ No newline at end of file
diff --git a/openlp/plugins/songs/forms/editverseform.py b/openlp/plugins/songs/forms/editverseform.py
index 8f5f04194..a1a301b61 100644
--- a/openlp/plugins/songs/forms/editverseform.py
+++ b/openlp/plugins/songs/forms/editverseform.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -172,4 +172,4 @@ class EditVerseForm(QtGui.QDialog, Ui_EditVerseDialog):
translate('SongsPlugin.EditSongForm',
'You need to type some text in to the verse.'))
return False
- QtGui.QDialog.accept(self)
+ QtGui.QDialog.accept(self)
\ No newline at end of file
diff --git a/openlp/plugins/songs/forms/songbookdialog.py b/openlp/plugins/songs/forms/songbookdialog.py
index 5a02674b3..8166453a2 100644
--- a/openlp/plugins/songs/forms/songbookdialog.py
+++ b/openlp/plugins/songs/forms/songbookdialog.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -74,4 +74,4 @@ class Ui_SongBookDialog(object):
translate('SongsPlugin.SongBookForm', 'Song Book Maintenance'))
self.NameLabel.setText(translate('SongsPlugin.SongBookForm', '&Name:'))
self.PublisherLabel.setText(
- translate('SongsPlugin.SongBookForm', '&Publisher:'))
+ translate('SongsPlugin.SongBookForm', '&Publisher:'))
\ No newline at end of file
diff --git a/openlp/plugins/songs/forms/songbookform.py b/openlp/plugins/songs/forms/songbookform.py
index bdec26dfe..23c8c6533 100644
--- a/openlp/plugins/songs/forms/songbookform.py
+++ b/openlp/plugins/songs/forms/songbookform.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -56,4 +56,4 @@ class SongBookForm(QtGui.QDialog, Ui_SongBookDialog):
self.NameEdit.setFocus()
return False
else:
- return QtGui.QDialog.accept(self)
+ return QtGui.QDialog.accept(self)
\ No newline at end of file
diff --git a/openlp/plugins/songs/forms/songimportform.py b/openlp/plugins/songs/forms/songimportform.py
index 81acea00f..e49334b7a 100644
--- a/openlp/plugins/songs/forms/songimportform.py
+++ b/openlp/plugins/songs/forms/songimportform.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -540,4 +540,4 @@ class SongImportForm(QtGui.QWizard, Ui_SongImportWizard):
self.importProgressBar.setValue(self.importProgressBar.maximum())
self.finishButton.setVisible(True)
self.cancelButton.setVisible(False)
- Receiver.send_message(u'openlp_process_events')
+ Receiver.send_message(u'openlp_process_events')
\ No newline at end of file
diff --git a/openlp/plugins/songs/forms/songimportwizard.py b/openlp/plugins/songs/forms/songimportwizard.py
index aafff1051..809427037 100644
--- a/openlp/plugins/songs/forms/songimportwizard.py
+++ b/openlp/plugins/songs/forms/songimportwizard.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -376,4 +376,4 @@ class Ui_SongImportWizard(object):
setattr(self, prefix + u'DisabledLayout', disabledLayout)
setattr(self, prefix + u'DisabledLabel', disabledLabel)
setattr(self, prefix + u'ImportWidget', importWidget)
- return importWidget
+ return importWidget
\ No newline at end of file
diff --git a/openlp/plugins/songs/forms/songmaintenancedialog.py b/openlp/plugins/songs/forms/songmaintenancedialog.py
index 909294707..87d99e853 100644
--- a/openlp/plugins/songs/forms/songmaintenancedialog.py
+++ b/openlp/plugins/songs/forms/songmaintenancedialog.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -236,4 +236,4 @@ class Ui_SongMaintenanceDialog(object):
self.BookEditButton.setText(
translate('SongsPlugin.SongMaintenanceForm', '&Edit'))
self.BookDeleteButton.setText(
- translate('SongsPlugin.SongMaintenanceForm', '&Delete'))
+ translate('SongsPlugin.SongMaintenanceForm', '&Delete'))
\ No newline at end of file
diff --git a/openlp/plugins/songs/forms/songmaintenanceform.py b/openlp/plugins/songs/forms/songmaintenanceform.py
index f004ef026..0fcdc6ab1 100644
--- a/openlp/plugins/songs/forms/songmaintenanceform.py
+++ b/openlp/plugins/songs/forms/songmaintenanceform.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -498,4 +498,4 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
translate('SongsPlugin.SongMaintenanceForm',
'This book cannot be deleted, it is currently '
'assigned to at least one song.'),
- translate('SongsPlugin.SongMaintenanceForm', 'No book selected!'))
+ translate('SongsPlugin.SongMaintenanceForm', 'No book selected!'))
\ No newline at end of file
diff --git a/openlp/plugins/songs/forms/topicsdialog.py b/openlp/plugins/songs/forms/topicsdialog.py
index fbb149aa8..2c1144631 100644
--- a/openlp/plugins/songs/forms/topicsdialog.py
+++ b/openlp/plugins/songs/forms/topicsdialog.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -65,4 +65,4 @@ class Ui_TopicsDialog(object):
TopicsDialog.setWindowTitle(
translate('SongsPlugin.TopicsForm', 'Topic Maintenance'))
self.NameLabel.setText(
- translate('SongsPlugin.TopicsForm', 'Topic name:'))
+ translate('SongsPlugin.TopicsForm', 'Topic name:'))
\ No newline at end of file
diff --git a/openlp/plugins/songs/forms/topicsform.py b/openlp/plugins/songs/forms/topicsform.py
index c45228527..f15f0bba5 100644
--- a/openlp/plugins/songs/forms/topicsform.py
+++ b/openlp/plugins/songs/forms/topicsform.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -55,4 +55,4 @@ class TopicsForm(QtGui.QDialog, Ui_TopicsDialog):
self.NameEdit.setFocus()
return False
else:
- return QtGui.QDialog.accept(self)
+ return QtGui.QDialog.accept(self)
\ No newline at end of file
diff --git a/openlp/plugins/songs/lib/__init__.py b/openlp/plugins/songs/lib/__init__.py
index 5ca5d5a0f..5093d6180 100644
--- a/openlp/plugins/songs/lib/__init__.py
+++ b/openlp/plugins/songs/lib/__init__.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -125,4 +125,4 @@ class VerseType(object):
from xml import LyricsXML, SongXMLBuilder, SongXMLParser, OpenLyricsParser
from songstab import SongsTab
-from mediaitem import SongMediaItem
+from mediaitem import SongMediaItem
\ No newline at end of file
diff --git a/openlp/plugins/songs/lib/cclifileimport.py b/openlp/plugins/songs/lib/cclifileimport.py
index 88b9a8569..79a7260bb 100644
--- a/openlp/plugins/songs/lib/cclifileimport.py
+++ b/openlp/plugins/songs/lib/cclifileimport.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund, Derek Scotney #
@@ -337,4 +337,4 @@ class CCLIFileImport(SongImport):
self.copyright = song_copyright
self.ccli_number = song_ccli
self.comments = song_comments
- self.finish()
+ self.finish()
\ No newline at end of file
diff --git a/openlp/plugins/songs/lib/db.py b/openlp/plugins/songs/lib/db.py
index 987d1dd79..fc3aa06d1 100644
--- a/openlp/plugins/songs/lib/db.py
+++ b/openlp/plugins/songs/lib/db.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -181,4 +181,4 @@ def init_schema(url):
mapper(Topic, topics_table)
metadata.create_all(checkfirst=True)
- return session
+ return session
\ No newline at end of file
diff --git a/openlp/plugins/songs/lib/ewimport.py b/openlp/plugins/songs/lib/ewimport.py
index 6b9b675c5..cb46eb798 100644
--- a/openlp/plugins/songs/lib/ewimport.py
+++ b/openlp/plugins/songs/lib/ewimport.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund, Jeffrey Smith #
@@ -347,4 +347,4 @@ class EasyWorshipSongImport(SongImport):
return u''
return self.memo_file.read(blob_size)
else:
- return 0
+ return 0
\ No newline at end of file
diff --git a/openlp/plugins/songs/lib/importer.py b/openlp/plugins/songs/lib/importer.py
index 63d19b95c..b82e14c12 100644
--- a/openlp/plugins/songs/lib/importer.py
+++ b/openlp/plugins/songs/lib/importer.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -126,4 +126,4 @@ SongFormat.set_availability(SongFormat.OpenLP1, has_openlp1)
SongFormat.set_availability(SongFormat.SongsOfFellowship, has_sof)
SongFormat.set_availability(SongFormat.Generic, has_ooo)
-__all__ = [u'SongFormat']
+__all__ = [u'SongFormat']
\ No newline at end of file
diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py
index e42cb7fa3..3be60dec4 100644
--- a/openlp/plugins/songs/lib/mediaitem.py
+++ b/openlp/plugins/songs/lib/mediaitem.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -457,4 +457,4 @@ class SongMediaItem(MediaManagerItem):
"""
Locale aware collation of song titles
"""
- return locale.strcoll(unicode(song_1.title), unicode(song_2.title))
+ return locale.strcoll(unicode(song_1.title), unicode(song_2.title))
\ No newline at end of file
diff --git a/openlp/plugins/songs/lib/olp1import.py b/openlp/plugins/songs/lib/olp1import.py
index 7c01a4c19..69714e773 100644
--- a/openlp/plugins/songs/lib/olp1import.py
+++ b/openlp/plugins/songs/lib/olp1import.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -245,4 +245,4 @@ class OpenLP1SongImport(SongImport):
if not chosen_encoding[1]:
return None
return filter(lambda item: item[1] == chosen_encoding[0],
- encodings)[0][0]
+ encodings)[0][0]
\ No newline at end of file
diff --git a/openlp/plugins/songs/lib/olpimport.py b/openlp/plugins/songs/lib/olpimport.py
index 662a94f5b..b0175d45f 100644
--- a/openlp/plugins/songs/lib/olpimport.py
+++ b/openlp/plugins/songs/lib/olpimport.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -220,4 +220,4 @@ class OpenLPSongImport(SongImport):
if self.stop_import_flag:
return False
engine.dispose()
- return True
+ return True
\ No newline at end of file
diff --git a/openlp/plugins/songs/lib/oooimport.py b/openlp/plugins/songs/lib/oooimport.py
index 727af2c7b..b467eab65 100644
--- a/openlp/plugins/songs/lib/oooimport.py
+++ b/openlp/plugins/songs/lib/oooimport.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -232,4 +232,4 @@ class OooImport(SongImport):
text += paratext + u'\n'
songs = SongImport.process_songs_text(self.manager, text)
for song in songs:
- song.finish()
+ song.finish()
\ No newline at end of file
diff --git a/openlp/plugins/songs/lib/opensongimport.py b/openlp/plugins/songs/lib/opensongimport.py
index 767fc012a..3341754c2 100644
--- a/openlp/plugins/songs/lib/opensongimport.py
+++ b/openlp/plugins/songs/lib/opensongimport.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -306,4 +306,4 @@ class OpenSongImport(SongImport):
log.info(u'Got order %s but not in versetags, dropping this'
u'item from presentation order', tag)
else:
- self.verse_order_list.append(tag)
+ self.verse_order_list.append(tag)
\ No newline at end of file
diff --git a/openlp/plugins/songs/lib/sofimport.py b/openlp/plugins/songs/lib/sofimport.py
index 320e5c88a..3e6ee8c3a 100644
--- a/openlp/plugins/songs/lib/sofimport.py
+++ b/openlp/plugins/songs/lib/sofimport.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -550,4 +550,4 @@ class SofImport(OooImport):
return 6
if song_number == 1119:
return 7
- return None
+ return None
\ No newline at end of file
diff --git a/openlp/plugins/songs/lib/songbeamerimport.py b/openlp/plugins/songs/lib/songbeamerimport.py
index f45fcc268..29884b80c 100644
--- a/openlp/plugins/songs/lib/songbeamerimport.py
+++ b/openlp/plugins/songs/lib/songbeamerimport.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -90,6 +90,7 @@ class SongBeamerImport(SongImport):
len(self.import_source))
for file in self.import_source:
# TODO: check that it is a valid SongBeamer file
+ self.set_defaults()
self.current_verse = u''
self.current_verse_type = u'V'
read_verses = False
@@ -105,6 +106,8 @@ class SongBeamerImport(SongImport):
infile.close()
else:
return False
+ self.title = self.file_name.split('.sng')[0]
+ read_verses = False
for line in self.songData:
# Just make sure that the line is of the type 'Unicode'.
line = unicode(line).strip()
@@ -129,7 +132,8 @@ class SongBeamerImport(SongImport):
if self.current_verse:
self.replace_html_tags()
self.add_verse(self.current_verse, self.current_verse_type)
- self.finish()
+ if self.check_complete():
+ self.finish()
self.import_wizard.incrementProgressBar(u'%s %s...' %
(translate('SongsPlugin.SongBeamerImport', 'Importing'),
self.file_name))
@@ -288,4 +292,4 @@ class SongBeamerImport(SongImport):
self.current_verse_type += marks[1]
return True
else:
- return False
+ return False
\ No newline at end of file
diff --git a/openlp/plugins/songs/lib/songimport.py b/openlp/plugins/songs/lib/songimport.py
index f305b90c7..3a21a5b50 100644
--- a/openlp/plugins/songs/lib/songimport.py
+++ b/openlp/plugins/songs/lib/songimport.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -364,4 +364,4 @@ class SongImport(QtCore.QObject):
if self.theme_name:
print u'THEME: ' + self.theme_name
if self.ccli_number:
- print u'CCLI: ' + self.ccli_number
+ print u'CCLI: ' + self.ccli_number
\ No newline at end of file
diff --git a/openlp/plugins/songs/lib/songstab.py b/openlp/plugins/songs/lib/songstab.py
index 1ffb5bba6..25c7ba6df 100644
--- a/openlp/plugins/songs/lib/songstab.py
+++ b/openlp/plugins/songs/lib/songstab.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -72,7 +72,7 @@ class SongsTab(SettingsTab):
QtCore.QObject.connect(self.SongUpdateOnEditCheckBox,
QtCore.SIGNAL(u'stateChanged(int)'),
self.onSongUpdateOnEditCheckBoxChanged)
- QtCore.QObject.connect(self.SongBarActiveCheckBox,
+ QtCore.QObject.connect(self.SongAddFromServiceCheckBox,
QtCore.SIGNAL(u'stateChanged(int)'),
self.onSongAddFromServiceCheckBoxChanged)
@@ -139,4 +139,4 @@ class SongsTab(SettingsTab):
QtCore.QVariant(self.update_edit))
settings.setValue(u'add song from service',
QtCore.QVariant(self.update_load))
- settings.endGroup()
+ settings.endGroup()
\ No newline at end of file
diff --git a/openlp/plugins/songs/lib/wowimport.py b/openlp/plugins/songs/lib/wowimport.py
index 2f20cf20d..42b66ccb7 100644
--- a/openlp/plugins/songs/lib/wowimport.py
+++ b/openlp/plugins/songs/lib/wowimport.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -169,4 +169,3 @@ class WowImport(SongImport):
self.import_wizard.incrementProgressBar(
"Importing %s" % (self.file_name))
return True
-
diff --git a/openlp/plugins/songs/lib/xml.py b/openlp/plugins/songs/lib/xml.py
index 9d98737dc..f00711bb6 100644
--- a/openlp/plugins/songs/lib/xml.py
+++ b/openlp/plugins/songs/lib/xml.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -396,4 +396,4 @@ class OpenLyricsParser(object):
new_author = Author.populate(first_name=name.rsplit(u' ', 1)[0],
last_name=name.rsplit(u' ', 1)[1], display_name=name)
self.manager.save_object(new_author)
- song.authors.append(new_author)
+ song.authors.append(new_author)
\ No newline at end of file
diff --git a/openlp/plugins/songs/songsplugin.py b/openlp/plugins/songs/songsplugin.py
index b55b05988..a44188c87 100644
--- a/openlp/plugins/songs/songsplugin.py
+++ b/openlp/plugins/songs/songsplugin.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -51,7 +51,7 @@ class SongsPlugin(Plugin):
"""
Create and set up the Songs plugin.
"""
- Plugin.__init__(self, u'Songs', u'1.9.3', plugin_helpers)
+ Plugin.__init__(self, u'Songs', u'1.9.4', plugin_helpers)
self.weight = -10
self.manager = Manager(u'songs', init_schema)
self.icon_path = u':/plugins/plugin_songs.png'
@@ -265,5 +265,4 @@ class SongsPlugin(Plugin):
log.info(u'Songs Finalising')
self.manager.finalise()
self.toolsReindexItem.setVisible(False)
- Plugin.finalise(self)
-
+ Plugin.finalise(self)
\ No newline at end of file
diff --git a/openlp/plugins/songusage/__init__.py b/openlp/plugins/songusage/__init__.py
index 68caa18e6..7f532aada 100644
--- a/openlp/plugins/songusage/__init__.py
+++ b/openlp/plugins/songusage/__init__.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -27,4 +27,4 @@
The :mod:`songusage` module contains the Song Usage plugin. The Song Usage
plugin provides auditing capabilities for reporting the songs you are using to
copyright license organisations.
-"""
+"""
\ No newline at end of file
diff --git a/openlp/plugins/songusage/forms/__init__.py b/openlp/plugins/songusage/forms/__init__.py
index b551d7168..ef99bce89 100644
--- a/openlp/plugins/songusage/forms/__init__.py
+++ b/openlp/plugins/songusage/forms/__init__.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -25,4 +25,4 @@
###############################################################################
from songusagedeleteform import SongUsageDeleteForm
-from songusagedetailform import SongUsageDetailForm
+from songusagedetailform import SongUsageDetailForm
\ No newline at end of file
diff --git a/openlp/plugins/songusage/forms/songusagedeletedialog.py b/openlp/plugins/songusage/forms/songusagedeletedialog.py
index c29142ab8..af85ad5a9 100644
--- a/openlp/plugins/songusage/forms/songusagedeletedialog.py
+++ b/openlp/plugins/songusage/forms/songusagedeletedialog.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -61,4 +61,4 @@ class Ui_SongUsageDeleteDialog(object):
def retranslateUi(self, songUsageDeleteDialog):
songUsageDeleteDialog.setWindowTitle(
translate('SongUsagePlugin.SongUsageDeleteForm',
- 'Delete Song Usage Data'))
+ 'Delete Song Usage Data'))
\ No newline at end of file
diff --git a/openlp/plugins/songusage/forms/songusagedeleteform.py b/openlp/plugins/songusage/forms/songusagedeleteform.py
index 45e4e91a9..f83ec8c82 100644
--- a/openlp/plugins/songusage/forms/songusagedeleteform.py
+++ b/openlp/plugins/songusage/forms/songusagedeleteform.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -55,4 +55,4 @@ class SongUsageDeleteForm(QtGui.QDialog, Ui_SongUsageDeleteDialog):
deleteDate = self.deleteCalendar.selectedDate().toPyDate()
self.manager.delete_all_objects(SongUsageItem,
SongUsageItem.usagedate <= deleteDate)
- self.close()
+ self.close()
\ No newline at end of file
diff --git a/openlp/plugins/songusage/forms/songusagedetaildialog.py b/openlp/plugins/songusage/forms/songusagedetaildialog.py
index 0eff17783..9383e147d 100644
--- a/openlp/plugins/songusage/forms/songusagedetaildialog.py
+++ b/openlp/plugins/songusage/forms/songusagedetaildialog.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -96,4 +96,4 @@ class Ui_SongUsageDetailDialog(object):
translate('SongUsagePlugin.SongUsageDetailForm', 'to'))
self.fileGroupBox.setTitle(
translate('SongUsagePlugin.SongUsageDetailForm',
- 'Report Location'))
+ 'Report Location'))
\ No newline at end of file
diff --git a/openlp/plugins/songusage/forms/songusagedetailform.py b/openlp/plugins/songusage/forms/songusagedetailform.py
index 18aa1797f..c9c357a84 100644
--- a/openlp/plugins/songusage/forms/songusagedetailform.py
+++ b/openlp/plugins/songusage/forms/songusagedetailform.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -95,4 +95,4 @@ class SongUsageDetailForm(QtGui.QDialog, Ui_SongUsageDetailDialog):
finally:
if file:
file.close()
- self.close()
+ self.close()
\ No newline at end of file
diff --git a/openlp/plugins/songusage/lib/__init__.py b/openlp/plugins/songusage/lib/__init__.py
index d23d36e5f..c981e023b 100644
--- a/openlp/plugins/songusage/lib/__init__.py
+++ b/openlp/plugins/songusage/lib/__init__.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -25,4 +25,4 @@
###############################################################################
"""
The :mod:`lib` module contains the library functions for the songusage plugin.
-"""
+"""
\ No newline at end of file
diff --git a/openlp/plugins/songusage/lib/db.py b/openlp/plugins/songusage/lib/db.py
index 0865d8682..80079bf85 100644
--- a/openlp/plugins/songusage/lib/db.py
+++ b/openlp/plugins/songusage/lib/db.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -61,4 +61,4 @@ def init_schema(url):
mapper(SongUsageItem, songusage_table)
metadata.create_all(checkfirst=True)
- return session
+ return session
\ No newline at end of file
diff --git a/openlp/plugins/songusage/songusageplugin.py b/openlp/plugins/songusage/songusageplugin.py
index a4081a10c..4a95b00f7 100644
--- a/openlp/plugins/songusage/songusageplugin.py
+++ b/openlp/plugins/songusage/songusageplugin.py
@@ -4,8 +4,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -42,7 +42,7 @@ class SongUsagePlugin(Plugin):
log.info(u'SongUsage Plugin loaded')
def __init__(self, plugin_helpers):
- Plugin.__init__(self, u'SongUsage', u'1.9.3', plugin_helpers)
+ Plugin.__init__(self, u'SongUsage', u'1.9.4', plugin_helpers)
self.weight = -4
self.icon = build_icon(u':/plugins/plugin_songusage.png')
self.manager = None
@@ -181,4 +181,4 @@ class SongUsagePlugin(Plugin):
## Name for MediaDockManager, SettingsManager ##
self.textStrings[StringContent.VisibleName] = {
u'title': translate('SongUsagePlugin', 'SongUsage')
- }
+ }
\ No newline at end of file
diff --git a/resources/i18n/af.ts b/resources/i18n/af.ts
index 72fbe938b..fdbacc00c 100644
--- a/resources/i18n/af.ts
+++ b/resources/i18n/af.ts
@@ -14,12 +14,12 @@ Do you want to continue anyway?
-
+
-
+
@@ -1809,13 +1809,13 @@ Final Credit
OpenLP.ExceptionForm
-
+
-
+
-
+
-
+
-
+
-
+
Monitors
Monitors
-
+
Select monitor for output display:
Selekteer monitor vir uitgaande vertoning:
-
+
Display if a single screen
Vertoon as dit 'n enkel skerm is
-
+
Application Startup
Applikasie Aanskakel
-
+
Show blank screen warning
Vertoon leë skerm waarskuwing
-
+
Automatically open the last service
Maak vanself die laaste diens oop
-
+
Show the splash screen
Wys die spatsel skerm
-
+
Application Settings
Program Verstellings
-
+
Prompt to save before starting a new service
Vra om te stoor voordat 'n nuwe diens begin word
-
+
Automatically preview next item in service
Wys voorskou van volgende item in diens automaties
-
+
Slide loop delay:
Skyfie herhaal vertraging:
-
+
sec
sek
-
+
CCLI Details
CCLI Inligting
-
+
CCLI number:
CCLI nommer:
-
+
SongSelect username:
SongSelect gebruikersnaam:
-
+
SongSelect password:
SongSelect wagwoord:
-
+
Display Position
Vertoon Posisie
-
+
X
X
-
+
Y
Y
-
+
Height
Hoogte
-
+
Width
Wydte
-
+
Override display position
Oorskryf vertoon posisie
-
+
Screen
Skerm
-
+
primary
primêre
@@ -3043,104 +3048,94 @@ Die inhoud enkodering is nie UTF-8 nie.
Stel in As &Globale Standaard
-
+
%s (default)
%s (standaard)
-
+
You must select a theme to edit.
Kies 'n tema om te redigeer.
-
- You must select a theme to delete.
- Kies 'n tema om uit te wis.
-
-
-
- Delete Confirmation
- Uitwis Bevestiging
-
-
-
+
Error
Fout
-
+
You are unable to delete the default theme.
Die standaard tema kan nie uitgewis word nie.
-
+
You have not selected a theme.
Geen tema is geselekteer nie.
-
+
Save Theme - (%s)
Stoor Tema - (%s)
-
+
Theme Exported
Tema Uitvoer
-
+
Your theme has been successfully exported.
Die tema was suksesvol uitgevoer.
-
+
Theme Export Failed
Tema Uitvoer het Misluk
-
+
Your theme could not be exported due to an error.
Die tema kon nie uitgevoer word nie weens 'n fout.
-
+
Select Theme Import File
Kies Tema Invoer Lêer
-
+
Theme (*.*)
Tema (*.*)
-
+
File is not a valid theme.
The content encoding is not UTF-8.
Lêer is nie 'n geldige tema nie.
Die inhoud enkodering is nie UTF-8 nie.
-
+
File is not a valid theme.
Lêer is nie 'n geldige tema nie.
-
+
Theme Exists
Tema Bestaan Reeds
-
+
A theme with this name already exists. Would you like to overwrite it?
'n Tema met hierdie naam bestaan alreeds. Kan dit oorskryf word?
-
+
Theme %s is used in the %s plugin.
Tema %s is in gebruik deur die %s mini-program.
-
+
Theme %s is used by the service manager.
Tema %s is in gebruik deur die diens bestuurder.
@@ -3160,285 +3155,305 @@ Die inhoud enkodering is nie UTF-8 nie.
-
- Delete %s theme?
+
+ Rename
+
+
+
+
+ Delete
+ Wis uit
+
+
+
+ You must select a theme to %s.
+
+
+
+
+ %s Confirmation
+
+
+
+
+ %s %s theme?
OpenLP.ThemeWizard
-
+
Theme Wizard
-
+
Welcome to the Theme Wizard
-
+
This wizard will help you to create and edit your themes . Click the next button below to start the process by setting up your background.
-
+
Set Up Background
-
+
Set up your theme's background according to the parameters below.
-
+
Background type:
-
+
Solid Color
Soliede Kleur
-
+
Gradient
Gradiënt
-
+
Image
Beeld
-
+
Color:
Kleur:
-
+
Gradient:
Gradiënt:
-
+
Horizontal
Horisontaal
-
+
Vertical
Vertikaal
-
+
Circular
Sirkelvormig
-
+
Top Left - Bottom Right
-
+
Bottom Left - Top Right
-
+
Image:
Beeld:
-
+
Main Area Font Details
-
+
Define the font and display characteristics for the Display text
-
+
Font:
Skrif:
-
+
Size:
Grootte:
-
+
pt
pt
-
+
(%d lines per slide)
-
+
Line Spacing:
-
+
&Outline:
-
+
&Shadow:
-
+
Bold
Vetgedruk
-
+
Italic
-
+
Footer Area Font Details
-
+
Define the font and display characteristics for the Footer text
-
+
Text Formatting Details
-
+
Allows additional display formatting information to be defined
-
+
Horizontal Align:
-
+
Left
Links
-
+
Right
Regs
-
+
Center
Middel
-
+
Vertical Align:
-
+
Top
Bo
-
+
Middle
Middel
-
+
Bottom
Onder
-
+
Transitions
-
+
Output Area Locations
-
+
Allows you to change and move the main and footer areas.
-
+
&Main Area
-
+
&Use default location
-
+
X position:
X posisie:
-
+
px
px
-
+
Y position:
Y posisie:
-
+
Width:
Wydte:
-
+
Height:
Hoogte:
-
+
Footer Area
-
+
Use default location
Gebruik verstek ligging
-
+
Save and Preview
-
+
View the theme and save it replacing the current one or change the name to create a new theme
-
+
Theme name:
@@ -3628,12 +3643,12 @@ Die inhoud enkodering is nie UTF-8 nie.
<strong>Afgeleë Mini-program</strong><br/>Die afgeleë mini-program verskaf die vermoë om boodskappe na 'n lopende weergawe van OpenLP op 'n ander rekenaar te stuur deur 'n web-blaaier of deur die afgeleë PPK (API).
-
+
Remote
-
+
Remotes
Afstandbehere
@@ -3904,142 +3919,142 @@ Die inhoud enkodering is nie UTF-8 nie.
SongsPlugin.EditSongForm
-
+
Song Editor
Lied Redigeerder
-
+
&Title:
&Titel:
-
+
Alt&ernate title:
Alt&ernatiewe titel:
-
+
&Lyrics:
&Lirieke:
-
+
&Verse order:
&Vers orde:
-
+
&Add
&Voeg by
-
+
&Edit
R&edigeer
-
+
Ed&it All
Red&igeer Alles
-
+
&Delete
&Wis Uit
-
+
Title && Lyrics
Titel && Lirieke
-
+
Authors
Skrywers
-
+
&Add to Song
&Voeg by Lied
-
+
&Remove
Ve&rwyder
-
+
&Manage Authors, Topics, Song Books
&Bestuur Skrywers, Onderwerpe en Lied Boeke
-
+
Topic
Onderwerp
-
+
A&dd to Song
Voeg by Lie&d
-
+
R&emove
V&erwyder
-
+
Song Book
Lied Boek
-
+
Book:
Boek:
-
+
Number:
Nommer:
-
+
Authors, Topics && Song Book
Skrywers, Onderwerpe && Lied Boek
-
+
Theme
Tema
-
+
New &Theme
Nuwe &Tema
-
+
Copyright Information
Kopiereg Informasie
-
+
©
©
-
+
CCLI number:
CCLI nommer:
-
+
Comments
Kommentaar
-
+
Theme, Copyright Info && Comments
Tema, Kopiereg Informasie && Kommentaar
@@ -4927,17 +4942,17 @@ Usually you are fine with the preselected choise.
SongsPlugin.VerseType
-
+
Verse
Vers
-
+
Chorus
Koor
-
+
Bridge
Brug
@@ -4947,22 +4962,22 @@ Usually you are fine with the preselected choise.
Voor-Refrein
-
+
Intro
Inleiding
-
+
Ending
Slot
-
+
Other
Ander
-
+
PreChorus
diff --git a/resources/i18n/de.ts b/resources/i18n/de.ts
index 29c1344ae..4b544af0f 100644
--- a/resources/i18n/de.ts
+++ b/resources/i18n/de.ts
@@ -14,12 +14,12 @@ Do you want to continue anyway?
-
+
No Placeholder found
-
+
The alert text does not contain '<>'.
Do want to continue anyway?
@@ -1820,13 +1820,13 @@ Bitte senden Sie eine E-Mail an: bugs@openlp.org mit einer auführlichen Beschre
OpenLP.ExceptionForm
-
+
Platform: %s
-
+
**OpenLP Bug Report**
Version: %s
@@ -1840,17 +1840,17 @@ Version: %s
-
+
Save Crash Report
-
+
Text files (*.txt *.log *.text)
-
+
*OpenLP Bug Report*
Version: %s
@@ -1870,15 +1870,20 @@ Version: %s
OpenLP.FileRenameForm
-
+
File Rename
-
+
New File Name:
+
+
+ File Copy
+
+
OpenLP.GeneralTab
@@ -1888,122 +1893,122 @@ Version: %s
Allgemein
-
+
Monitors
Monitore
-
+
Select monitor for output display:
Projektionsbildschirm:
-
+
Display if a single screen
Anzeige, bei nur einem Bildschirm
-
+
Application Startup
Programmstart
-
+
Show blank screen warning
Warnung anzeigen, wenn die Projektion deaktiviert wurde
-
+
Automatically open the last service
Zuletzt benutzten Ablauf beim Start laden
-
+
Show the splash screen
Zeige den Startbildschirm
-
+
Application Settings
Anwendungseinstellungen
-
+
Prompt to save before starting a new service
Aufforderung zum Speichern, bevor ein ein neuer Ablauf gestartet wird
-
+
Automatically preview next item in service
Automatische Vorschau des nächsten Elementes im Ablauf
-
+
Slide loop delay:
Pause während Schleifen:
-
+
sec
sek
-
+
CCLI Details
CCLI-Details
-
+
CCLI number:
CCLI Nummer:
-
+
SongSelect username:
SongSelect Benutzername:
-
+
SongSelect password:
SongSelect Passwort:
-
+
Display Position
Position der Anzeige
-
+
X
X
-
+
Y
Y
-
+
Height
Höhe
-
+
Width
Breite
-
+
Override display position
Position der Anzeige überschreiben
-
+
Screen
Bildschirm
-
+
primary
Hauptbildschirm
@@ -3054,104 +3059,94 @@ Der Inhalt wurde nicht in UTF-8 kodiert.
Setze als &globalen Standard
-
+
%s (default)
%s (Standard)
-
+
You must select a theme to edit.
Bitte wählen Sie ein Design zum Bearbeiten aus.
-
- You must select a theme to delete.
- Bitte wählen Sie ein Design zum Löschen aus.
-
-
-
- Delete Confirmation
- Löschen Bestätigen
-
-
-
+
Error
Fehler
-
+
You are unable to delete the default theme.
Es ist nicht möglich das Standard Design zu entfernen.
-
+
You have not selected a theme.
Sie haben kein Design ausgewählt.
-
+
Save Theme - (%s)
Speichere Design - (%s)
-
+
Theme Exported
Design exportiert
-
+
Your theme has been successfully exported.
Das Design wurde erfolgreich exportiert.
-
+
Theme Export Failed
Design Export fehlgeschlagen
-
+
Your theme could not be exported due to an error.
Dieses Design konnte aufgrund eines Fehlers nicht exportiert werden.
-
+
Select Theme Import File
Wähle Datei für Design Import
-
+
Theme (*.*)
Design (*.*)
-
+
File is not a valid theme.
The content encoding is not UTF-8.
Dies ist kein gültiges Design.
Die Datei ist nicht in UTF-8 kodiert.
-
+
File is not a valid theme.
Diese Datei beinhaltet kein gültiges Design.
-
+
Theme Exists
Design existiert
-
+
A theme with this name already exists. Would you like to overwrite it?
Ein Design mit diesem Namen existiert bereits. Soll es überschrieben werden?
-
+
Theme %s is used in the %s plugin.
Design %s wird in der %s Erweiterung benutzt.
-
+
Theme %s is used by the service manager.
Design %s wird in der Ablaufverwaltung benutzt.
@@ -3171,285 +3166,305 @@ Die Datei ist nicht in UTF-8 kodiert.
-
- Delete %s theme?
+
+ Rename
+
+
+
+
+ Delete
+ Löschen
+
+
+
+ You must select a theme to %s.
+
+
+
+
+ %s Confirmation
+
+
+
+
+ %s %s theme?
OpenLP.ThemeWizard
-
+
Theme Wizard
-
+
Welcome to the Theme Wizard
-
+
This wizard will help you to create and edit your themes . Click the next button below to start the process by setting up your background.
-
+
Set Up Background
-
+
Set up your theme's background according to the parameters below.
-
+
Background type:
-
+
Solid Color
Füllfarbe
-
+
Gradient
Farbverlauf
-
+
Image
Bild
-
+
Color:
Farbe:
-
+
Gradient:
Übergang:
-
+
Horizontal
Horizontal
-
+
Vertical
Vertikal
-
+
Circular
Radial
-
+
Top Left - Bottom Right
-
+
Bottom Left - Top Right
-
+
Image:
Bild:
-
+
Main Area Font Details
-
+
Define the font and display characteristics for the Display text
-
+
Font:
Schriftart:
-
+
Size:
Größe:
-
+
pt
pt
-
+
(%d lines per slide)
-
+
Line Spacing:
-
+
&Outline:
-
+
&Shadow:
-
+
Bold
Fett
-
+
Italic
-
+
Footer Area Font Details
-
+
Define the font and display characteristics for the Footer text
-
+
Text Formatting Details
-
+
Allows additional display formatting information to be defined
-
+
Horizontal Align:
-
+
Left
Links
-
+
Right
Rechts
-
+
Center
Mitte
-
+
Vertical Align:
-
+
Top
Oben
-
+
Middle
Mittig
-
+
Bottom
Unten
-
+
Transitions
-
+
Output Area Locations
-
+
Allows you to change and move the main and footer areas.
-
+
&Main Area
-
+
&Use default location
-
+
X position:
X position:
-
+
px
px
-
+
Y position:
Y position:
-
+
Width:
Breite:
-
+
Height:
Höhe:
-
+
Footer Area
-
+
Use default location
Benutze Standard Pfad
-
+
Save and Preview
-
+
View the theme and save it replacing the current one or change the name to create a new theme
-
+
Theme name:
@@ -3639,12 +3654,12 @@ Die Datei ist nicht in UTF-8 kodiert.
<strong>Erweiterung Fernprojektion</strong><br/>Die Erweiterung Fernprojektion ermöglicht es eine laufende Version von OpenLP von einem anderen Computer über einen Web-Browser oder über die Fernprojektions Oberfläche zu steuern.
-
+
Remote
-
+
Remotes
Fernprojektion
@@ -3915,109 +3930,109 @@ Die Datei ist nicht in UTF-8 kodiert.
SongsPlugin.EditSongForm
-
+
Song Editor
Lied bearbeiten
-
+
&Title:
&Titel:
-
+
&Lyrics:
Noten:
-
+
&Add
Hinzufügen
-
+
&Edit
&Bearbeiten
-
+
Ed&it All
Alles Bearbeiten
-
+
&Delete
Löschen
-
+
Title && Lyrics
Titel && Liedtext
-
+
Authors
Autoren
-
+
&Add to Song
Zum Lied &hinzufügen
-
+
&Remove
Entfe&rnen
-
+
Topic
Thema
-
+
A&dd to Song
Zum Lied &hinzufügen
-
+
R&emove
&Entfernen
-
+
Song Book
Liederbuch
-
+
Theme
Design
-
+
New &Theme
Neues Design
-
+
Copyright Information
Kopierrecht Informationen
-
+
©
©
-
+
Comments
Kommentare
-
+
Theme, Copyright Info && Comments
- Design, Copyrightinformationen && Kommentare
+ Design, Copyright && Kommentare
@@ -4105,27 +4120,27 @@ Die Datei ist nicht in UTF-8 kodiert.
%s wurde nirgends in der Versfolge verwendet. Wollen Sie das Lied trotzdem so abspeichern?
-
+
Alt&ernate title:
Alt&ernativer Titel:
-
+
&Verse order:
&Versfolge:
-
+
&Manage Authors, Topics, Song Books
Verwalte Autoren, Themen, Liederbücher
-
+
Authors, Topics && Song Book
Autoren, Themen && Liederbücher
-
+
CCLI number:
CCLI-Nummer:
@@ -4140,12 +4155,12 @@ Die Datei ist nicht in UTF-8 kodiert.
Dieses Thema ist bereits vorhanden.
-
+
Book:
Buch:
-
+
Number:
Nummer:
@@ -4938,17 +4953,17 @@ Usually you are fine with the preselected choise.
SongsPlugin.VerseType
-
+
Verse
Vers
-
+
Chorus
Refrain
-
+
Bridge
Bridge
@@ -4958,22 +4973,22 @@ Usually you are fine with the preselected choise.
Vor-Refrain
-
+
Intro
Intro
-
+
Ending
Schluss
-
+
Other
Weitere
-
+
PreChorus
diff --git a/resources/i18n/en.ts b/resources/i18n/en.ts
index e7f1f6f57..72da457d4 100644
--- a/resources/i18n/en.ts
+++ b/resources/i18n/en.ts
@@ -14,12 +14,12 @@ Do you want to continue anyway?
-
+
No Placeholder found
-
+
The alert text does not contain '<>'.
Do want to continue anyway?
@@ -1674,13 +1674,13 @@ Final Credit
OpenLP.ExceptionForm
-
+
Platform: %s
-
+
**OpenLP Bug Report**
Version: %s
@@ -1694,17 +1694,17 @@ Version: %s
-
+
Save Crash Report
-
+
Text files (*.txt *.log *.text)
-
+
*OpenLP Bug Report*
Version: %s
@@ -1724,15 +1724,20 @@ Version: %s
OpenLP.FileRenameForm
-
+
File Rename
-
+
New File Name:
+
+
+ File Copy
+
+
OpenLP.GeneralTab
@@ -1742,122 +1747,122 @@ Version: %s
-
+
Monitors
-
+
Select monitor for output display:
-
+
Display if a single screen
-
+
Application Startup
-
+
Show blank screen warning
-
+
Automatically open the last service
-
+
Show the splash screen
-
+
Application Settings
-
+
Prompt to save before starting a new service
-
+
Automatically preview next item in service
-
+
Slide loop delay:
-
+
sec
-
+
CCLI Details
-
+
CCLI number:
-
+
SongSelect username:
-
+
SongSelect password:
-
+
Display Position
-
+
X
-
+
Y
-
+
Height
-
+
Width
-
+
Override display position
-
+
Screen
-
+
primary
@@ -2905,103 +2910,93 @@ The content encoding is not UTF-8.
-
+
%s (default)
-
+
You must select a theme to edit.
-
- You must select a theme to delete.
-
-
-
-
- Delete Confirmation
-
-
-
-
+
Error
-
+
You are unable to delete the default theme.
-
+
Theme %s is used in the %s plugin.
-
+
Theme %s is used by the service manager.
-
+
You have not selected a theme.
-
+
Save Theme - (%s)
-
+
Theme Exported
-
+
Your theme has been successfully exported.
-
+
Theme Export Failed
-
+
Your theme could not be exported due to an error.
-
+
Select Theme Import File
-
+
Theme (*.*)
-
+
File is not a valid theme.
The content encoding is not UTF-8.
-
+
File is not a valid theme.
-
+
Theme Exists
-
+
A theme with this name already exists. Would you like to overwrite it?
@@ -3021,285 +3016,305 @@ The content encoding is not UTF-8.
-
- Delete %s theme?
+
+ Rename
+
+
+
+
+ Delete
+
+
+
+
+ You must select a theme to %s.
+
+
+
+
+ %s Confirmation
+
+
+
+
+ %s %s theme?
OpenLP.ThemeWizard
-
+
Theme Wizard
-
+
Welcome to the Theme Wizard
-
+
This wizard will help you to create and edit your themes . Click the next button below to start the process by setting up your background.
-
+
Set Up Background
-
+
Set up your theme's background according to the parameters below.
-
+
Background type:
-
+
Solid Color
-
+
Gradient
-
+
Image
-
+
Color:
-
+
Gradient:
-
+
Horizontal
-
+
Vertical
-
+
Circular
-
+
Top Left - Bottom Right
-
+
Bottom Left - Top Right
-
+
Image:
-
+
Main Area Font Details
-
+
Define the font and display characteristics for the Display text
-
+
Font:
-
+
Size:
-
+
pt
-
+
(%d lines per slide)
-
+
Line Spacing:
-
+
&Outline:
-
+
&Shadow:
-
+
Bold
-
+
Italic
-
+
Footer Area Font Details
-
+
Define the font and display characteristics for the Footer text
-
+
Text Formatting Details
-
+
Allows additional display formatting information to be defined
-
+
Horizontal Align:
-
+
Left
-
+
Right
-
+
Center
-
+
Vertical Align:
-
+
Top
-
+
Middle
-
+
Bottom
-
+
Transitions
-
+
Output Area Locations
-
+
Allows you to change and move the main and footer areas.
-
+
&Main Area
-
+
&Use default location
-
+
X position:
-
+
px
-
+
Y position:
-
+
Width:
-
+
Height:
-
+
Footer Area
-
+
Use default location
-
+
Save and Preview
-
+
View the theme and save it replacing the current one or change the name to create a new theme
-
+
Theme name:
@@ -3489,12 +3504,12 @@ The content encoding is not UTF-8.
-
+
Remote
-
+
Remotes
@@ -3765,142 +3780,142 @@ The content encoding is not UTF-8.
SongsPlugin.EditSongForm
-
+
Song Editor
-
+
&Title:
-
+
Alt&ernate title:
-
+
&Lyrics:
-
+
&Verse order:
-
+
&Add
-
+
&Edit
-
+
Ed&it All
-
+
&Delete
-
+
Title && Lyrics
-
+
Authors
-
+
&Add to Song
-
+
&Remove
-
+
&Manage Authors, Topics, Song Books
-
+
Topic
-
+
A&dd to Song
-
+
R&emove
-
+
Song Book
-
+
Book:
-
+
Number:
-
+
Authors, Topics && Song Book
-
+
Theme
-
+
New &Theme
-
+
Copyright Information
-
+
©
-
+
CCLI number:
-
+
Comments
-
+
Theme, Copyright Info && Comments
@@ -4788,17 +4803,17 @@ Usually you are fine with the preselected choise.
SongsPlugin.VerseType
-
+
Verse
-
+
Chorus
-
+
Bridge
@@ -4808,22 +4823,22 @@ Usually you are fine with the preselected choise.
-
+
Intro
-
+
Ending
-
+
Other
-
+
PreChorus
diff --git a/resources/i18n/en_GB.ts b/resources/i18n/en_GB.ts
index 7bf01decf..473d192d0 100644
--- a/resources/i18n/en_GB.ts
+++ b/resources/i18n/en_GB.ts
@@ -14,12 +14,12 @@ Do you want to continue anyway?
-
+
No Placeholder found
-
+
The alert text does not contain '<>'.
Do want to continue anyway?
@@ -1811,13 +1811,13 @@ Final Credit
OpenLP.ExceptionForm
-
+
Platform: %s
-
+
**OpenLP Bug Report**
Version: %s
@@ -1831,17 +1831,17 @@ Version: %s
-
+
Save Crash Report
-
+
Text files (*.txt *.log *.text)
-
+
*OpenLP Bug Report*
Version: %s
@@ -1861,15 +1861,20 @@ Version: %s
OpenLP.FileRenameForm
-
+
File Rename
-
+
New File Name:
+
+
+ File Copy
+
+
OpenLP.GeneralTab
@@ -1879,122 +1884,122 @@ Version: %s
General
-
+
Monitors
Monitors
-
+
Select monitor for output display:
Select monitor for output display:
-
+
Display if a single screen
Display if a single screen
-
+
Application Startup
Application Startup
-
+
Show blank screen warning
Show blank screen warning
-
+
Automatically open the last service
Automatically open the last service
-
+
Show the splash screen
Show the splash screen
-
+
Application Settings
Application Settings
-
+
Prompt to save before starting a new service
Prompt to save before starting a new service
-
+
Automatically preview next item in service
Automatically preview next item in service
-
+
Slide loop delay:
Slide loop delay:
-
+
sec
sec
-
+
CCLI Details
CCLI Details
-
+
CCLI number:
CCLI number:
-
+
SongSelect username:
SongSelect username:
-
+
SongSelect password:
SongSelect password:
-
+
Display Position
Display Position
-
+
X
X
-
+
Y
Y
-
+
Height
Height
-
+
Width
Width
-
+
Override display position
Override display position
-
+
Screen
Screen
-
+
primary
primary
@@ -3044,104 +3049,94 @@ The content encoding is not UTF-8.
Set As &Global Default
-
+
%s (default)
%s (default)
-
+
You must select a theme to edit.
You must select a theme to edit.
-
- You must select a theme to delete.
- You must select a theme to delete.
-
-
-
- Delete Confirmation
- Delete Confirmation
-
-
-
+
Error
Error
-
+
You are unable to delete the default theme.
You are unable to delete the default theme.
-
+
You have not selected a theme.
You have not selected a theme.
-
+
Save Theme - (%s)
Save Theme - (%s)
-
+
Theme Exported
Theme Exported
-
+
Your theme has been successfully exported.
Your theme has been successfully exported.
-
+
Theme Export Failed
Theme Export Failed
-
+
Your theme could not be exported due to an error.
Your theme could not be exported due to an error.
-
+
Select Theme Import File
Select Theme Import File
-
+
Theme (*.*)
Theme (*.*)
-
+
File is not a valid theme.
The content encoding is not UTF-8.
File is not a valid theme.
The content encoding is not UTF-8.
-
+
File is not a valid theme.
File is not a valid theme.
-
+
Theme Exists
Theme Exists
-
+
A theme with this name already exists. Would you like to overwrite it?
A theme with this name already exists. Would you like to overwrite it?
-
+
Theme %s is used in the %s plugin.
Theme %s is used in the %s plugin.
-
+
Theme %s is used by the service manager.
Theme %s is used by the service manager.
@@ -3161,285 +3156,305 @@ The content encoding is not UTF-8.
-
- Delete %s theme?
+
+ Rename
+
+
+
+
+ Delete
+ Delete
+
+
+
+ You must select a theme to %s.
+
+
+
+
+ %s Confirmation
+
+
+
+
+ %s %s theme?
OpenLP.ThemeWizard
-
+
Theme Wizard
-
+
Welcome to the Theme Wizard
-
+
This wizard will help you to create and edit your themes . Click the next button below to start the process by setting up your background.
-
+
Set Up Background
-
+
Set up your theme's background according to the parameters below.
-
+
Background type:
-
+
Solid Color
Solid Colour
-
+
Gradient
Gradient
-
+
Image
Image
-
+
Color:
Colour:
-
+
Gradient:
Gradient:
-
+
Horizontal
Horizontal
-
+
Vertical
Vertical
-
+
Circular
Circular
-
+
Top Left - Bottom Right
-
+
Bottom Left - Top Right
-
+
Image:
Image:
-
+
Main Area Font Details
-
+
Define the font and display characteristics for the Display text
-
+
Font:
Font:
-
+
Size:
Size:
-
+
pt
pt
-
+
(%d lines per slide)
-
+
Line Spacing:
-
+
&Outline:
-
+
&Shadow:
-
+
Bold
Bold
-
+
Italic
-
+
Footer Area Font Details
-
+
Define the font and display characteristics for the Footer text
-
+
Text Formatting Details
-
+
Allows additional display formatting information to be defined
-
+
Horizontal Align:
-
+
Left
Left
-
+
Right
Right
-
+
Center
Centre
-
+
Vertical Align:
-
+
Top
Top
-
+
Middle
Middle
-
+
Bottom
Bottom
-
+
Transitions
-
+
Output Area Locations
-
+
Allows you to change and move the main and footer areas.
-
+
&Main Area
-
+
&Use default location
-
+
X position:
X position:
-
+
px
px
-
+
Y position:
Y position:
-
+
Width:
Width:
-
+
Height:
Height:
-
+
Footer Area
-
+
Use default location
Use default location
-
+
Save and Preview
-
+
View the theme and save it replacing the current one or change the name to create a new theme
-
+
Theme name:
@@ -3629,12 +3644,12 @@ The content encoding is not UTF-8.
<strong>Remote Plugin</strong><br />The remote plugin provides the ability to send messages to a running version of OpenLP on a different computer via a web browser or through the remote API.
-
+
Remote
-
+
Remotes
Remotes
@@ -3905,142 +3920,142 @@ The content encoding is not UTF-8.
SongsPlugin.EditSongForm
-
+
Song Editor
Song Editor
-
+
&Title:
&Title:
-
+
Alt&ernate title:
Alt&ernate title:
-
+
&Lyrics:
&Lyrics:
-
+
&Verse order:
&Verse order:
-
+
&Add
&Add
-
+
&Edit
&Edit
-
+
Ed&it All
Ed&it All
-
+
&Delete
&Delete
-
+
Title && Lyrics
Title && Lyrics
-
+
Authors
Authors
-
+
&Add to Song
&Add to Song
-
+
&Remove
&Remove
-
+
&Manage Authors, Topics, Song Books
&Manage Authors, Topics, Song Books
-
+
Topic
Topic
-
+
A&dd to Song
A&dd to Song
-
+
R&emove
R&emove
-
+
Song Book
Song Book
-
+
Book:
Book:
-
+
Number:
Number:
-
+
Authors, Topics && Song Book
Authors, Topics && Song Book
-
+
Theme
Theme
-
+
New &Theme
New &Theme
-
+
Copyright Information
Copyright Information
-
+
©
©
-
+
CCLI number:
CCLI number:
-
+
Comments
Comments
-
+
Theme, Copyright Info && Comments
Theme, Copyright Info && Comments
@@ -4928,17 +4943,17 @@ Usually you are fine with the preselected choise.
SongsPlugin.VerseType
-
+
Verse
Verse
-
+
Chorus
Chorus
-
+
Bridge
Bridge
@@ -4948,22 +4963,22 @@ Usually you are fine with the preselected choise.
Pre-Chorus
-
+
Intro
Intro
-
+
Ending
Ending
-
+
Other
Other
-
+
PreChorus
diff --git a/resources/i18n/en_ZA.ts b/resources/i18n/en_ZA.ts
index 24aab6f39..fe24a3670 100644
--- a/resources/i18n/en_ZA.ts
+++ b/resources/i18n/en_ZA.ts
@@ -5,7 +5,7 @@
No Parameter found
-
+ No Parameter found
@@ -14,12 +14,12 @@ Do you want to continue anyway?
-
+
No Placeholder found
-
+
The alert text does not contain '<>'.
Do want to continue anyway?
@@ -1820,13 +1820,13 @@ Final Credit
OpenLP.ExceptionForm
-
+
Platform: %s
-
+
**OpenLP Bug Report**
Version: %s
@@ -1840,17 +1840,17 @@ Version: %s
-
+
Save Crash Report
-
+
Text files (*.txt *.log *.text)
-
+
*OpenLP Bug Report*
Version: %s
@@ -1870,15 +1870,20 @@ Version: %s
OpenLP.FileRenameForm
-
+
File Rename
File Rename
-
+
New File Name:
New File Name:
+
+
+ File Copy
+
+
OpenLP.GeneralTab
@@ -1888,122 +1893,122 @@ Version: %s
General
-
+
Monitors
Monitors
-
+
Select monitor for output display:
Select monitor for output display:
-
+
Display if a single screen
Display if a single screen
-
+
Application Startup
Application Startup
-
+
Show blank screen warning
Show blank screen warning
-
+
Automatically open the last service
Automatically open the last service
-
+
Show the splash screen
Show the splash screen
-
+
Application Settings
Application Settings
-
+
CCLI Details
CCLI Details
-
+
CCLI number:
CCLI number:
-
+
SongSelect username:
SongSelect username:
-
+
SongSelect password:
SongSelect password:
-
+
Display Position
Display Position
-
+
X
X
-
+
Y
Y
-
+
Height
Height
-
+
Width
Width
-
+
Override display position
Override display position
-
+
Screen
Screen
-
+
primary
primary
-
+
Prompt to save before starting a new service
Prompt to save before starting a new service
-
+
Automatically preview next item in service
Automatically preview next item in service
-
+
Slide loop delay:
Slide loop delay:
-
+
sec
sec
@@ -3054,104 +3059,94 @@ The content encoding is not UTF-8.
Set As &Global Default
-
+
%s (default)
%s (default)
-
+
You must select a theme to edit.
You must select a theme to edit.
-
- You must select a theme to delete.
- You must select a theme to delete.
-
-
-
- Delete Confirmation
- Delete Confirmation
-
-
-
+
Error
Error
-
+
You are unable to delete the default theme.
You are unable to delete the default theme.
-
+
You have not selected a theme.
You have not selected a theme.
-
+
Save Theme - (%s)
Save Theme - (%s)
-
+
Theme Exported
Theme Exported
-
+
Your theme has been successfully exported.
Your theme has been successfully exported.
-
+
Theme Export Failed
Theme Export Failed
-
+
Your theme could not be exported due to an error.
Your theme could not be exported due to an error.
-
+
Select Theme Import File
Select Theme Import File
-
+
Theme (*.*)
Theme (*.*)
-
+
File is not a valid theme.
The content encoding is not UTF-8.
File is not a valid theme.
The content encoding is not UTF-8.
-
+
File is not a valid theme.
File is not a valid theme.
-
+
Theme Exists
Theme Exists
-
+
A theme with this name already exists. Would you like to overwrite it?
A theme with this name already exists. Would you like to overwrite it?
-
+
Theme %s is used in the %s plugin.
Theme %s is used in the %s plugin.
-
+
Theme %s is used by the service manager.
Theme %s is used by the service manager.
@@ -3171,285 +3166,305 @@ The content encoding is not UTF-8.
&Export Theme
-
- Delete %s theme?
- Delete %s theme?
+
+ Rename
+
+
+
+
+ Delete
+ Delete
+
+
+
+ You must select a theme to %s.
+
+
+
+
+ %s Confirmation
+
+
+
+
+ %s %s theme?
+
OpenLP.ThemeWizard
-
+
Theme Wizard
Theme Wizard
-
+
Welcome to the Theme Wizard
Welcome to the Theme Wizard
-
+
This wizard will help you to create and edit your themes . Click the next button below to start the process by setting up your background.
This wizard will help you to create and edit your themes . Click the next button below to start the process by setting up your background.
-
+
Set Up Background
Set Up Background
-
+
Set up your theme's background according to the parameters below.
Set up your theme's background according to the parameters below.
-
+
Background type:
Background type:
-
+
Solid Color
Solid Colour
-
+
Gradient
Gradient
-
+
Image
Image
-
+
Color:
Color:
-
+
Gradient:
Gradient:
-
+
Horizontal
Horizontal
-
+
Vertical
Vertical
-
+
Circular
Circular
-
+
Top Left - Bottom Right
Top Left - Bottom Right
-
+
Bottom Left - Top Right
Bottom Left - Top Right
-
+
Image:
Image:
-
+
Main Area Font Details
Main Area Font Details
-
+
Define the font and display characteristics for the Display text
Define the font and display characteristics for the Display text
-
+
Font:
Font:
-
+
Size:
Size:
-
+
pt
pt
-
+
(%d lines per slide)
(%d lines per slide)
-
+
Line Spacing:
Line Spacing:
-
+
&Outline:
&Outline:
-
+
&Shadow:
&Shadow:
-
+
Bold
Bold
-
+
Italic
Italic
-
+
Footer Area Font Details
Footer Area Font Details
-
+
Define the font and display characteristics for the Footer text
Define the font and display characteristics for the Footer text
-
+
Text Formatting Details
Text Formatting Details
-
+
Allows additional display formatting information to be defined
Allows additional display formatting information to be defined
-
+
Horizontal Align:
Horizontal Align:
-
+
Left
Left
-
+
Right
Right
-
+
Center
Centre
-
+
Top
Top
-
+
Middle
Middle
-
+
Bottom
Bottom
-
+
Transitions
-
+
Output Area Locations
-
+
Allows you to change and move the main and footer areas.
-
+
&Main Area
-
+
&Use default location
-
+
X position:
X position:
-
+
px
px
-
+
Y position:
Y position:
-
+
Width:
Width:
-
+
Height:
Height:
-
+
Footer Area
-
+
Use default location
Use default location
-
+
Save and Preview
-
+
View the theme and save it replacing the current one or change the name to create a new theme
-
+
Theme name:
-
+
Vertical Align:
@@ -3639,12 +3654,12 @@ The content encoding is not UTF-8.
<strong>Remote Plugin</strong><br />The remote plugin provides the ability to send messages to a running version of OpenLP on a different computer via a web browser or through the remote API.
-
+
Remote
-
+
Remotes
Remotes
@@ -3915,117 +3930,117 @@ The content encoding is not UTF-8.
SongsPlugin.EditSongForm
-
+
Song Editor
Song Editor
-
+
&Title:
&Title:
-
+
&Lyrics:
&Lyrics:
-
+
&Add
&Add
-
+
&Edit
&Edit
-
+
Ed&it All
Ed&it All
-
+
&Delete
&Delete
-
+
Title && Lyrics
Title && Lyrics
-
+
Authors
Authors
-
+
&Add to Song
&Add to Song
-
+
&Remove
&Remove
-
+
&Manage Authors, Topics, Song Books
&Manage Authors, Topics, Song Books
-
+
Topic
Topic
-
+
A&dd to Song
A&dd to Song
-
+
R&emove
R&emove
-
+
Song Book
Song Book
-
+
Authors, Topics && Song Book
Authors, Topics && Song Book
-
+
Theme
Theme
-
+
New &Theme
New &Theme
-
+
Copyright Information
Copyright Information
-
+
©
©
-
+
Comments
Comments
-
+
Theme, Copyright Info && Comments
Theme, Copyright Info && Comments
@@ -4125,27 +4140,27 @@ The content encoding is not UTF-8.
This song book does not exist, do you want to add it?
-
+
Alt&ernate title:
Alt&ernate title:
-
+
&Verse order:
&Verse order:
-
+
CCLI number:
CCLI number:
-
+
Book:
Book:
-
+
Number:
Number:
@@ -4938,17 +4953,17 @@ Usually you are fine with the preselected choise.
SongsPlugin.VerseType
-
+
Verse
Verse
-
+
Chorus
Chorus
-
+
Bridge
Bridge
@@ -4958,22 +4973,22 @@ Usually you are fine with the preselected choise.
Pre-Chorus
-
+
Intro
Intro
-
+
Ending
Ending
-
+
Other
Other
-
+
PreChorus
diff --git a/resources/i18n/es.ts b/resources/i18n/es.ts
index a14dc033c..07fc5678b 100644
--- a/resources/i18n/es.ts
+++ b/resources/i18n/es.ts
@@ -14,12 +14,12 @@ Do you want to continue anyway?
-
+
No Placeholder found
-
+
The alert text does not contain '<>'.
Do want to continue anyway?
@@ -1674,13 +1674,13 @@ Final Credit
OpenLP.ExceptionForm
-
+
Platform: %s
-
+
**OpenLP Bug Report**
Version: %s
@@ -1694,17 +1694,17 @@ Version: %s
-
+
Save Crash Report
-
+
Text files (*.txt *.log *.text)
-
+
*OpenLP Bug Report*
Version: %s
@@ -1724,15 +1724,20 @@ Version: %s
OpenLP.FileRenameForm
-
+
File Rename
-
+
New File Name:
+
+
+ File Copy
+
+
OpenLP.GeneralTab
@@ -1742,122 +1747,122 @@ Version: %s
General
-
+
Monitors
Monitores
-
+
Select monitor for output display:
Seleccionar monitor para visualizar la salida:
-
+
Display if a single screen
-
+
Application Startup
Inicio de la Aplicación
-
+
Show blank screen warning
Mostrar advertencia de pantalla en blanco
-
+
Automatically open the last service
Abrir automáticamente el último servicio
-
+
Show the splash screen
Mostrar pantalla de bienvenida
-
+
Application Settings
Configuración del Programa
-
+
Prompt to save before starting a new service
-
+
Automatically preview next item in service
-
+
Slide loop delay:
-
+
sec
-
+
CCLI Details
Detalles de CCLI
-
+
CCLI number:
-
+
SongSelect username:
-
+
SongSelect password:
-
+
Display Position
-
+
X
-
+
Y
-
+
Height
-
+
Width
-
+
Override display position
-
+
Screen
Pantalla
-
+
primary
primario
@@ -2905,103 +2910,93 @@ The content encoding is not UTF-8.
-
+
%s (default)
-
+
You must select a theme to edit.
-
- You must select a theme to delete.
-
-
-
-
- Delete Confirmation
-
-
-
-
+
Error
Error
-
+
You are unable to delete the default theme.
-
+
You have not selected a theme.
-
+
Save Theme - (%s)
Guardar Tema - (%s)
-
+
Theme Exported
-
+
Your theme has been successfully exported.
-
+
Theme Export Failed
-
+
Your theme could not be exported due to an error.
-
+
Select Theme Import File
Seleccione el Archivo de Tema a Importar
-
+
Theme (*.*)
-
+
File is not a valid theme.
The content encoding is not UTF-8.
-
+
File is not a valid theme.
-
+
Theme Exists
Ya existe el Tema
-
+
A theme with this name already exists. Would you like to overwrite it?
-
+
Theme %s is used in the %s plugin.
-
+
Theme %s is used by the service manager.
@@ -3021,285 +3016,305 @@ The content encoding is not UTF-8.
-
- Delete %s theme?
+
+ Rename
+
+
+
+
+ Delete
+
+
+
+
+ You must select a theme to %s.
+
+
+
+
+ %s Confirmation
+
+
+
+
+ %s %s theme?
OpenLP.ThemeWizard
-
+
Theme Wizard
-
+
Welcome to the Theme Wizard
-
+
This wizard will help you to create and edit your themes . Click the next button below to start the process by setting up your background.
-
+
Set Up Background
-
+
Set up your theme's background according to the parameters below.
-
+
Background type:
-
+
Solid Color
Color Sólido
-
+
Gradient
Gradiente
-
+
Image
Imagen
-
+
Color:
-
+
Gradient:
-
+
Horizontal
Horizontal
-
+
Vertical
Vertical
-
+
Circular
Circular
-
+
Top Left - Bottom Right
-
+
Bottom Left - Top Right
-
+
Image:
Imagen:
-
+
Main Area Font Details
-
+
Define the font and display characteristics for the Display text
-
+
Font:
Fuente:
-
+
Size:
Tamaño:
-
+
pt
pt
-
+
(%d lines per slide)
-
+
Line Spacing:
-
+
&Outline:
-
+
&Shadow:
-
+
Bold
Negrita
-
+
Italic
-
+
Footer Area Font Details
-
+
Define the font and display characteristics for the Footer text
-
+
Text Formatting Details
-
+
Allows additional display formatting information to be defined
-
+
Horizontal Align:
-
+
Left
Izquierda
-
+
Right
Derecha
-
+
Center
Centro
-
+
Vertical Align:
-
+
Top
Superior
-
+
Middle
Medio
-
+
Bottom
Inferior
-
+
Transitions
-
+
Output Area Locations
-
+
Allows you to change and move the main and footer areas.
-
+
&Main Area
-
+
&Use default location
-
+
X position:
-
+
px
px
-
+
Y position:
-
+
Width:
Ancho:
-
+
Height:
Altura:
-
+
Footer Area
-
+
Use default location
-
+
Save and Preview
-
+
View the theme and save it replacing the current one or change the name to create a new theme
-
+
Theme name:
@@ -3489,12 +3504,12 @@ The content encoding is not UTF-8.
-
+
Remote
-
+
Remotes
Remotas
@@ -3765,142 +3780,142 @@ The content encoding is not UTF-8.
SongsPlugin.EditSongForm
-
+
Song Editor
Editor de Canción
-
+
&Title:
-
+
Alt&ernate title:
-
+
&Lyrics:
-
+
&Verse order:
-
+
&Add
-
+
&Edit
&Editar
-
+
Ed&it All
-
+
&Delete
&Eliminar
-
+
Title && Lyrics
Título && Letra
-
+
Authors
Autores
-
+
&Add to Song
&Agregar a Canción
-
+
&Remove
&Quitar
-
+
&Manage Authors, Topics, Song Books
-
+
Topic
Categoría
-
+
A&dd to Song
A&gregar a Canción
-
+
R&emove
&Quitar
-
+
Song Book
Himnario
-
+
Book:
Libro:
-
+
Number:
-
+
Authors, Topics && Song Book
-
+
Theme
Tema
-
+
New &Theme
-
+
Copyright Information
Información de Derechos de Autor
-
+
©
-
+
CCLI number:
-
+
Comments
Comentarios
-
+
Theme, Copyright Info && Comments
Tema, Derechos de Autor && Comentarios
@@ -4788,17 +4803,17 @@ Usually you are fine with the preselected choise.
SongsPlugin.VerseType
-
+
Verse
Verso
-
+
Chorus
Coro
-
+
Bridge
Puente
@@ -4808,22 +4823,22 @@ Usually you are fine with the preselected choise.
Pre-Coro
-
+
Intro
Intro
-
+
Ending
Final
-
+
Other
Otro
-
+
PreChorus
diff --git a/resources/i18n/et.ts b/resources/i18n/et.ts
index cc05aefdf..f9948ec1a 100644
--- a/resources/i18n/et.ts
+++ b/resources/i18n/et.ts
@@ -5,24 +5,26 @@
No Parameter found
-
+ Ühtegi parameetrit ei leitud
You have not entered a parameter to be replaced.
Do you want to continue anyway?
-
+ Sa ei ole sisestanud parameetrit, mida asendada.
+Kas tahad sellegipoolest jätkata?
-
+
No Placeholder found
-
+ Ühtegi kohahoidjat ei leitud
-
+
The alert text does not contain '<>'.
Do want to continue anyway?
-
+ Teate tekst ei sisalda '<>' märke.
+Kas tahad sellegipoolest jätkata?
@@ -45,7 +47,7 @@ Do want to continue anyway?
Alert
-
+ Teade
@@ -108,7 +110,7 @@ Do want to continue anyway?
&Parameter:
-
+ &Parameeter:
@@ -202,7 +204,7 @@ Do want to continue anyway?
You cannot combine single and second bible verses. Do you want to delete your search results and start a new search?
-
+ Ühe- ja kahekeelseid piiblisalme pole võimalik kombineerida. Kas sa tahad kustutada otsingutulemused ja alustada uut otsingut?
@@ -230,22 +232,22 @@ Do want to continue anyway?
Import
-
+ Impordi
Import a Bible
-
+ Piibli importimine
Add
-
+ Lisa
Add a new Bible
-
+ Uue Piibli lisamine
@@ -255,7 +257,7 @@ Do want to continue anyway?
Edit the selected Bible
-
+ Valitud Piibli muutmine
@@ -265,7 +267,7 @@ Do want to continue anyway?
Delete the selected Bible
-
+ Valitud Piibli kustutamine
@@ -275,7 +277,7 @@ Do want to continue anyway?
Preview the selected Bible
-
+ Valitud Piibli eelvaade
@@ -285,17 +287,17 @@ Do want to continue anyway?
Send the selected Bible live
-
+ Valitud Piibli saatmine ekraanile
Service
-
+ Teenistus
Add the selected Bible to the service
-
+ Valitud Piibli lisamine teenistusse
@@ -308,7 +310,7 @@ Do want to continue anyway?
The book you requested could not be found in this Bible. Please check your spelling and that this is a complete Bible not just one testament.
-
+ Nõutud raamatud ei leitud sellest Piiblist. Kontrolli õigekirja ning kas tegemist on terve Piibli või ühe testamendiga.
@@ -328,23 +330,32 @@ Book Chapter:Verse-Verse
Book Chapter:Verse-Verse,Verse-Verse
Book Chapter:Verse-Verse,Chapter:Verse-Verse
Book Chapter:Verse-Chapter:Verse
-
+ Sinu kirjakohaviide on vigane või pole OpenLP poolt toetatud vormingus. Veendu, et viide vastab ühele järgnevatest mustritest:
+
+Raamat peatükk
+Raamat peatükk-peatükk
+Raamat peatükk:salm-salm
+Raamat peatükk:salm-salm,salm-salm
+Raamat peatükk:salm-salm,peatükk:salm-salm
+Raamat peatükk:salm-peatükk:salm
+
Web Bible cannot be used
-
+ Veebipiiblit pole võimalik kasutada
Text Search is not available with Web Bibles.
-
+ Tekstiotsing veebipiiblist pole võimalik.
You did not enter a search keyword.
You can separate different keywords by a space to search for all of your keywords and you can separate them by a comma to search for one of them.
-
+ Sa ei sisestanud otsingusõna.
+Sa võid eraldada võtmesõnad tühikuga, et otsida neid kõiki, või eraldada need komaga, et otsitaks ühte neist.
@@ -419,7 +430,7 @@ Muudatused ei rakendu juba teenistusesse lisatud salmidele.
Display second Bible verses
-
+ Piiblit kuvatakse kahes keeles
@@ -690,18 +701,19 @@ Muudatused ei rakendu juba teenistusesse lisatud salmidele.
Open openlp.org 1.x Bible
-
+ Ava openlp.org 1.x Piibel
Starting Registering bible...
-
+ Piibli registreerimise alustamine...
Registered bible. Please note, that verses will be downloaded on
demand and thus an internet connection is required.
-
+ Piibel on registreeritud. Pane tähele, et salmid laaditakse alla
+vajadusel, seetõttu on vajalik internetiühendus.
@@ -711,17 +723,17 @@ demand and thus an internet connection is required.
Permissions:
-
+ Õigused:
CSV File
-
+ CSV fail
openlp.org 1.x bible
-
+ openlp.org 1.x Piibel
@@ -731,7 +743,7 @@ demand and thus an internet connection is required.
Bibleserver
-
+ Piibliserver
@@ -844,7 +856,7 @@ demand and thus an internet connection is required.
Second:
-
+ Teine:
@@ -868,7 +880,7 @@ demand and thus an internet connection is required.
Detecting encoding (this may take a few minutes)...
-
+ Kooditabeli tuvastamine (see võib võtta mõne minuti)...
@@ -1023,37 +1035,37 @@ demand and thus an internet connection is required.
Customs
-
+ Kohandatud
Import
-
+ Impordi
Import a Custom
-
+ Impordi kohandatud
Load
-
+ Laadi
Load a new Custom
-
+ Laadi uus kohandatud
Add
-
+ Lisa
Add a new Custom
-
+ Lisa uus kohandatud
@@ -1063,7 +1075,7 @@ demand and thus an internet connection is required.
Edit the selected Custom
-
+ Muuda valitud kohandatut
@@ -1073,7 +1085,7 @@ demand and thus an internet connection is required.
Delete the selected Custom
-
+ Kustuta valitud kohandatud
@@ -1083,7 +1095,7 @@ demand and thus an internet connection is required.
Preview the selected Custom
-
+ Valitud kohandatu eelvaade
@@ -1093,17 +1105,17 @@ demand and thus an internet connection is required.
Send the selected Custom live
-
+ Valitud kohandatu saatmine ekraanile
Service
-
+ Teenistus
Add the selected Custom to the service
-
+ Valitud kohandatud slaidi lisamine teenistusse
@@ -1121,27 +1133,27 @@ demand and thus an internet connection is required.
Images
-
+ Pildid
Load
-
+ Laadi
Load a new Image
-
+ Uue pildi laadimine
Add
-
+ Lisa
Add a new Image
-
+ Uue pildi lisamine
@@ -1151,7 +1163,7 @@ demand and thus an internet connection is required.
Edit the selected Image
-
+ Valitud pildi muutmine
@@ -1161,7 +1173,7 @@ demand and thus an internet connection is required.
Delete the selected Image
-
+ Valitud pildi kustutamine
@@ -1171,7 +1183,7 @@ demand and thus an internet connection is required.
Preview the selected Image
-
+ Valitud pildi eelvaatlemine
@@ -1181,17 +1193,17 @@ demand and thus an internet connection is required.
Send the selected Image live
-
+ Valitud pildi saatmine ekraanile
Service
-
+ Teenistus
Add the selected Image to the service
-
+ Valitud pildi lisamine teenistusele
@@ -1257,22 +1269,22 @@ demand and thus an internet connection is required.
Load
-
+ Laadi
Load a new Media
-
+ Uue meedia laadimine
Add
-
+ Lisa
Add a new Media
-
+ Uue meedia lisamine
@@ -1282,7 +1294,7 @@ demand and thus an internet connection is required.
Edit the selected Media
-
+ Valitud meedia muutmine
@@ -1292,7 +1304,7 @@ demand and thus an internet connection is required.
Delete the selected Media
-
+ Valitud meedia kustutamine
@@ -1302,7 +1314,7 @@ demand and thus an internet connection is required.
Preview the selected Media
-
+ Valitud meedia eelvaatlus
@@ -1312,17 +1324,17 @@ demand and thus an internet connection is required.
Send the selected Media live
-
+ Valitud meedia saatmine ekraanile
Service
-
+ Teenistus
Add the selected Media to the service
-
+ Valitud meedia lisamine teenistusse.
@@ -1363,12 +1375,12 @@ demand and thus an internet connection is required.
Media Display
-
+ Meediakuva
Use Phonon for video playback
-
+ Phononi kasutamine video esitamiseks
@@ -1749,7 +1761,54 @@ Final Credit
on the cross, setting us free from sin. We
bring this software to you for free because
He has set us free.
-
+ Projekti juht
+Raoul "superfly" Snyman
+
+Arendajad
+Tim "TRB143" Bentley
+Jonathan "gushie" Corwin
+Michael "cocooncrash" Gorven
+Scott "sguerrieri" Guerrieri
+Raoul "superfly" Snyman
+Martin "mijiti" Thompson
+Jon "Meths" Tibble
+
+Abilised
+Meinert "m2j" Jordan
+Andreas "googol" Preikschat
+Christian "crichter" Richter
+Philip "Phill" Ridout
+Maikel Stuivenberg
+Carsten "catini" Tingaard
+Frode "frodus" Woldsund
+
+Testijad
+Philip "Phill" Ridout
+Wesley "wrst" Stout (lead)
+
+Pakendajad
+Thomas "tabthorpe" Abthorpe (FreeBSD)
+Tim "TRB143" Bentley (Fedora)
+Michael "cocooncrash" Gorven (Ubuntu)
+Matthias "matthub" Hub (Mac OS X)
+Raoul "superfly" Snyman (Windows, Ubuntu)
+
+Kasutatud tehnoloogiad
+Python: http://www.python.org/
+Qt4: http://qt.nokia.com/
+PyQt4: http://www.riverbankcomputing.co.uk/software/pyqt/intro
+Oxygeni ikoonid: http://oxygen-icons.org/
+
+Lõpptänu
+"Sest nõnda on Jumal maailma armastanud,
+et ta oma ainusündinud Poja on andnud,
+et ükski, kes temasse usub, ei hukkuks,
+vaid et tal oleks igavene elu. -- Johannese 3:16
+
+Lõpuks suurim tänu kuulub Jumalale meie Isale,
+kes saatis oma Poja ristile surema, et vabastada
+meid patust. Me anname selle tarkvara sulle
+tasuta, sest Tema on teinud meid vabaks.
@@ -1777,12 +1836,12 @@ Final Credit
Double-click to send items straight to live
-
+ Topeltklõps otse ekraanile saatmiseks
Expand new service items on creation
-
+ Uued teenistuse kirjed on loomisel laiendatud
@@ -1800,24 +1859,25 @@ Final Credit
Send E-Mail
-
+ Saada e-kiri
Save to File
-
+ Salvesta faili
OpenLP.ExceptionForm
-
+
Platform: %s
-
+ Platvorm: %s
+
-
+
**OpenLP Bug Report**
Version: %s
@@ -1828,20 +1888,29 @@ Version: %s
--- Library Versions ---
%s
-
+ **OpenLP vearaport**
+versioon: %s
+
+--- Exception Traceback ---
+%s
+--- System information ---
+%s
+--- Library Versions ---
+%s
+
-
+
Save Crash Report
-
+ Vearaporti salvestamine
-
+
Text files (*.txt *.log *.text)
-
+ Tekstifailid (*.txt *.log *.text)
-
+
*OpenLP Bug Report*
Version: %s
@@ -1855,19 +1924,36 @@ Version: %s
--- Library Versions ---
%s
-
+ *OpenLP vearaport*
+versioon: %s
+
+--- Palun sisesta vea kirjeldus järgmistele ridadele. ---
+
+
+--- Exception Traceback ---
+%s
+--- System information ---
+%s
+--- Library Versions ---
+%s
+
OpenLP.FileRenameForm
-
+
File Rename
-
+ Faili ümbernimetamine
-
+
New File Name:
+ Uue faili nimi:
+
+
+
+ File Copy
@@ -1879,122 +1965,122 @@ Version: %s
Üldine
-
+
Monitors
Monitorid
-
+
Select monitor for output display:
Vali väljundkuva ekraan:
-
+
Display if a single screen
Kuvatakse, kui on ainult üks ekraan
-
+
Application Startup
Rakenduse käivitumine
-
+
Show blank screen warning
Kuvatakse tühja ekraani hoiatust
-
+
Automatically open the last service
Automaatselt avatakse viimane teenistus
-
+
Show the splash screen
Käivitumisel kuvatakse logo
-
+
Application Settings
Rakenduse sätted
-
+
Prompt to save before starting a new service
Enne uue teenistuse alustamist küsitakse, kas salvestada avatud teenistus
-
+
Automatically preview next item in service
Järgmise teenistuse elemendi automaatne eelvaade
-
+
Slide loop delay:
Slaidi näitamise pikkus korduses:
-
+
sec
sek
-
+
CCLI Details
CCLI andmed
-
+
CCLI number:
CCLI number:
-
+
SongSelect username:
SongSelecti kasutajanimi:
-
+
SongSelect password:
SongSelecti parool:
-
+
Display Position
Kuva asukoht
-
+
X
X
-
+
Y
Y
-
+
Height
Kõrgus
-
+
Width
Laius
-
+
Override display position
Kuva asukoht määratakse jõuga
-
+
Screen
Ekraan
-
+
primary
peamine
@@ -2432,7 +2518,7 @@ Sa võid viimase versiooni alla laadida aadressilt http://openlp.org/.
Configure &Shortcuts...
-
+ &Kiirklahvide seadistamine...
@@ -2771,22 +2857,22 @@ Sisu ei ole UTF-8 kodeeringus.
&Expand all
-
+ &Laienda kõik
Expand all the service items.
-
+ Kõigi teenistuse kirjete laiendamine.
&Collapse all
-
+ &Ahenda kõik
Collapse all the service items.
-
+ Kõigi teenistuse kirjete ahendamine.
@@ -2810,42 +2896,42 @@ Sisu ei ole UTF-8 kodeeringus.
Customize Shortcuts
-
+ Kiirklahvide kohandamine
Action
-
+ Tegevus
Shortcut
-
+ Kiirklahv
Default: %s
-
+ Vaikimisi: %s
Custom:
-
+ Kohandatud:
None
-
+ Pole
Duplicate Shortcut
-
+ Dubleeriv kiirklahv
The shortcut "%s" is already assigned to another action, please use a different shortcut.
-
+ Kiirklahv "%s" on juba seotud teise tegevusega, kasuta mingit muud kiirklahvi.
@@ -2918,17 +3004,17 @@ Sisu ei ole UTF-8 kodeeringus.
Blank Screen
-
+ Ekraani tühjendamine
Blank to Theme
-
+ Teematausta näitamine
Show Desktop
-
+ Töölaua näitamine
@@ -2959,22 +3045,22 @@ Sisu ei ole UTF-8 kodeeringus.
Theme Name Missing
-
+ Puudub teema nimi
There is no name for this theme. Please enter one.
-
+ Teemal ei ole nime. Palun sisesta nimi.
Theme Name Invalid
-
+ Sobimatu teema nimi
Invalid theme name. Please enter one.
-
+ Teema nimi pole sobiv. Palun sisesta sobiv nimi.
@@ -3045,402 +3131,412 @@ Sisu ei ole UTF-8 kodeeringus.
Määra &globaalseks vaikeväärtuseks
-
+
%s (default)
%s (vaikimisi)
-
+
You must select a theme to edit.
Pead valima kujunduse, mida muuta.
-
- You must select a theme to delete.
- Pead valima kujunduse, mida tahad kustutada.
-
-
-
- Delete Confirmation
- Kustutamise kinnitus
-
-
-
+
Error
Viga
-
+
You are unable to delete the default theme.
Vaikimisi kujundust pole võimalik kustutada.
-
+
Theme %s is used in the %s plugin.
Kujundust %s kasutatakse pluginas %s.
-
+
Theme %s is used by the service manager.
Teenistuse halduri nähtavuse ümberlülitamine.
-
+
You have not selected a theme.
Sa ei ole kujundust valinud.
-
+
Save Theme - (%s)
Salvesta kujundus - (%s)
-
+
Theme Exported
Kujundus eksporditud
-
+
Your theme has been successfully exported.
Sinu kujunduse on edukalt eksporditud.
-
+
Theme Export Failed
Kujunduse eksportimine nurjus
-
+
Your theme could not be exported due to an error.
Sinu kujundust polnud võimalik eksportida, kuna esines viga.
-
+
Select Theme Import File
Importimiseks kujunduse faili valimine
-
+
Theme (*.*)
Kujundus (*.*)
-
+
File is not a valid theme.
The content encoding is not UTF-8.
See fail ei ole korrektne kujundus.
Sisu kodeering ei ole UTF-8.
-
+
File is not a valid theme.
See fail ei ole sobilik kujundus.
-
+
Theme Exists
Kujundus on juba olemas
-
+
A theme with this name already exists. Would you like to overwrite it?
Sellenimeline kujundus on juba olemas. Kas tahad selle üle kirjutada?
&Copy Theme
-
+ &Kopeeri teemat
&Rename Theme
-
+ &Nimeta teema ümber
&Export Theme
+ &Ekspordi teema
+
+
+
+ Rename
-
- Delete %s theme?
+
+ Delete
+ Kustuta
+
+
+
+ You must select a theme to %s.
+
+
+
+
+ %s Confirmation
+
+
+
+
+ %s %s theme?
OpenLP.ThemeWizard
-
+
Theme Wizard
-
+ Teemanõustaja
-
+
Welcome to the Theme Wizard
-
+ Tere tulemast teemanõustajasse
-
+
This wizard will help you to create and edit your themes . Click the next button below to start the process by setting up your background.
-
+ See nõustaja aitab luua ja muuda kujundusi. Klõpsa edasi nupul, et seda alustada tausta määramisest.
-
+
Set Up Background
-
+ Tausta määramine
-
+
Set up your theme's background according to the parameters below.
-
+ Määra kujunduse taust, kasutades järgnevaid parameetreid.
-
+
Background type:
-
+ Tausta liik:
-
+
Solid Color
Ühtlane värv
-
+
Gradient
Üleminek
-
+
Image
Pilt
-
+
Color:
Värvus:
-
+
Gradient:
Üleminek:
-
+
Horizontal
Horisontaalne
-
+
Vertical
Vertikaalne
-
+
Circular
- Ümmargune
+ Radiaalne
-
+
Top Left - Bottom Right
-
+ Loodest kagusse
-
+
Bottom Left - Top Right
-
+ Edelast kirdesse
-
+
Image:
Pilt:
-
+
Main Area Font Details
-
+ Peamise kirja üksikasjad
-
+
Define the font and display characteristics for the Display text
-
+ Määra font ja teised kuvatava teksti omadused
-
+
Font:
Kirjastiil:
-
+
Size:
Suurus:
-
+
pt
pt
-
+
(%d lines per slide)
-
+ (%d rida slaidil)
-
+
Line Spacing:
-
+ Reavahe:
-
+
&Outline:
-
+ &Kontuurjoon:
-
+
&Shadow:
-
+
Bold
Rasvane
-
+
Italic
-
+
Footer Area Font Details
-
+
Define the font and display characteristics for the Footer text
-
+
Text Formatting Details
-
+
Allows additional display formatting information to be defined
-
+
Horizontal Align:
-
+
Left
Vasakul
-
+
Right
Paremal
-
+
Center
Keskel
-
+
Vertical Align:
-
+
Top
Üleval
-
+
Middle
Keskel
-
+
Bottom
All
-
+
Transitions
-
+
Output Area Locations
-
+
Allows you to change and move the main and footer areas.
-
+
&Main Area
-
+
&Use default location
-
+
X position:
X-asukoht:
-
+
px
px
-
+
Y position:
Y-asukoht:
-
+
Width:
Laius:
-
+
Height:
Kõrgus:
-
+
Footer Area
-
+
Use default location
Vaikimisi asukoht
-
+
Save and Preview
-
+
View the theme and save it replacing the current one or change the name to create a new theme
-
+
Theme name:
@@ -3513,7 +3609,7 @@ Sisu kodeering ei ole UTF-8.
Load
-
+ Laadi
@@ -3553,7 +3649,7 @@ Sisu kodeering ei ole UTF-8.
Service
-
+ Teenistus
@@ -3630,12 +3726,12 @@ Sisu kodeering ei ole UTF-8.
<b>Kaugjuhtimisplugin</b><br>See plugin võimaldab töötavale openlp programmile teadete saatmise teisest arvutist veebilehitseja või mõne muu rakenduse kaudu.<br>Selle peamine rakendus on teadete saatmine lastehoiust.
-
+
Remote
-
+
Remotes
Kaugjuhtimine
@@ -3802,7 +3898,7 @@ Sisu kodeering ei ole UTF-8.
Add
-
+ Lisa
@@ -3852,7 +3948,7 @@ Sisu kodeering ei ole UTF-8.
Service
-
+ Teenistus
@@ -3906,142 +4002,142 @@ Sisu kodeering ei ole UTF-8.
SongsPlugin.EditSongForm
-
+
Song Editor
Lauluredaktor
-
+
&Title:
&Pealkiri:
-
+
Alt&ernate title:
&Alternatiivne pealkiri:
-
+
&Lyrics:
&Sõnad:
-
+
&Verse order:
&Salmide järjekord:
-
+
&Add
&Lisa
-
+
&Edit
&Muuda
-
+
Ed&it All
Muuda &kõiki
-
+
&Delete
&Kustuta
-
+
Title && Lyrics
Pealkiri && laulusõnad
-
+
Authors
Autorid
-
+
&Add to Song
&Lisa laulule
-
+
&Remove
&Eemalda
-
+
&Manage Authors, Topics, Song Books
&Autorite, teemade ja laulikute haldamine
-
+
Topic
Teema
-
+
A&dd to Song
L&isa laulule
-
+
R&emove
&Eemalda
-
+
Song Book
Laulik
-
+
Book:
Book:
-
+
Number:
Number:
-
+
Authors, Topics && Song Book
Autorid, teemad && laulik
-
+
Theme
Kujundus
-
+
New &Theme
Uus &kujundus
-
+
Copyright Information
Autoriõiguse andmed
-
+
©
©
-
+
CCLI number:
CCLI number:
-
+
Comments
Kommentaarid
-
+
Theme, Copyright Info && Comments
Kujundus, autoriõigus && kommentaarid
@@ -4929,17 +5025,17 @@ Usually you are fine with the preselected choise.
SongsPlugin.VerseType
-
+
Verse
Salm
-
+
Chorus
Refrään
-
+
Bridge
Vahemäng
@@ -4949,24 +5045,24 @@ Usually you are fine with the preselected choise.
Eelrefrään
-
+
Intro
Sissejuhatus
-
+
Ending
Lõpetus
-
+
Other
Muu
-
+
PreChorus
-
+ Eelrefrään
diff --git a/resources/i18n/hu.ts b/resources/i18n/hu.ts
index 857f1f912..ff559b636 100644
--- a/resources/i18n/hu.ts
+++ b/resources/i18n/hu.ts
@@ -14,12 +14,12 @@ Do you want to continue anyway?
Nincs megadva a cserélendő paraméter. Folytatható?
-
+
No Placeholder found
Nem található a helyjelölő
-
+
The alert text does not contain '<>'.
Do want to continue anyway?
A figyelmeztető szöveg nem tartalmaz „<>” karaktereket.
@@ -1689,13 +1689,13 @@ Final Credit
OpenLP.ExceptionForm
-
+
Platform: %s
-
+
**OpenLP Bug Report**
Version: %s
@@ -1709,17 +1709,17 @@ Version: %s
-
+
Save Crash Report
-
+
Text files (*.txt *.log *.text)
-
+
*OpenLP Bug Report*
Version: %s
@@ -1739,15 +1739,20 @@ Version: %s
OpenLP.FileRenameForm
-
+
File Rename
Fájl átnevezése
-
+
New File Name:
Új fájl neve:
+
+
+ File Copy
+
+
OpenLP.GeneralTab
@@ -1757,122 +1762,122 @@ Version: %s
Általános
-
+
Monitors
Monitorok
-
+
Select monitor for output display:
Válaszd ki a vetítési képernyőt:
-
+
Display if a single screen
Megjelenítés egy képernyő esetén
-
+
Application Startup
Alkalmazás indítása
-
+
Show blank screen warning
Figyelmeztetés megjelenítése a fekete képernyőről
-
+
Automatically open the last service
Utolsó szolgálat automatikus megnyitása
-
+
Show the splash screen
Indító képernyő megjelenítése
-
+
Application Settings
Alkalmazás beállítások
-
+
Prompt to save before starting a new service
Rákérdezés mentésre új szolgálat kezdése előtt
-
+
Automatically preview next item in service
Következő elem automatikus előnézete a szolgálatban
-
+
Slide loop delay:
Időzített diák késleltetése:
-
+
sec
mp
-
+
CCLI Details
CCLI részletek
-
+
CCLI number:
CCLI szám:
-
+
SongSelect username:
SongSelect felhasználói név:
-
+
SongSelect password:
SongSelect jelszó:
-
+
Display Position
Megjelenítés pozíciója
-
+
X
-
+
Y
-
+
Height
Magasság
-
+
Width
Szélesség
-
+
Override display position
Megjelenítési pozíció felülírása
-
+
Screen
Képernyő
-
+
primary
elsődleges
@@ -2923,104 +2928,94 @@ A tartalom kódolása nem UTF-8.
Beállítás &globális alapértelmezetté
-
+
%s (default)
%s (alapértelmezett)
-
+
You must select a theme to edit.
Ki kell választani témát a szerkesztéshez.
-
- You must select a theme to delete.
- Ki kell választani témát a törléshez.
-
-
-
- Delete Confirmation
- Törlés megerősítése
-
-
-
+
Error
Hiba
-
+
You are unable to delete the default theme.
Az alapértelmezett témát nem lehet törölni.
-
+
You have not selected a theme.
Nincs kiválasztva egy téma sem.
-
+
Save Theme - (%s)
Téma mentése – (%s)
-
+
Theme Exported
Téma exportálva
-
+
Your theme has been successfully exported.
A téma sikeresen exportálásra került.
-
+
Theme Export Failed
A téma exportálása nem sikerült
-
+
Your theme could not be exported due to an error.
A témát nem sikerült exportálni egy hiba miatt.
-
+
Select Theme Import File
Importálandó téma fájl kiválasztása
-
+
Theme (*.*)
Témák (*.*)
-
+
File is not a valid theme.
The content encoding is not UTF-8.
Nem érvényes témafájl.
A tartalom kódolása nem UTF-8.
-
+
File is not a valid theme.
Nem érvényes témafájl.
-
+
Theme Exists
A téma már létezik
-
+
A theme with this name already exists. Would you like to overwrite it?
Egy ilyen nevű téma már létezik. Szeretnéd felülírni?
-
+
Theme %s is used in the %s plugin.
A(z) %s témát a(z) %s bővítmény használja.
-
+
Theme %s is used by the service manager.
A(z) %s témát a szolgálatkezelő használja.
@@ -3040,285 +3035,305 @@ A tartalom kódolása nem UTF-8.
Téma e&xportálása
-
- Delete %s theme?
- Törölhető ez a téma: %s?
+
+ Rename
+
+
+
+
+ Delete
+ Törlés
+
+
+
+ You must select a theme to %s.
+
+
+
+
+ %s Confirmation
+
+
+
+
+ %s %s theme?
+
OpenLP.ThemeWizard
-
+
Theme Wizard
Téma tündér
-
+
Welcome to the Theme Wizard
Üdvözlet a téma tündérben
-
+
This wizard will help you to create and edit your themes . Click the next button below to start the process by setting up your background.
A tündérrel témákat lehet létrehozni és módosítani. Az alább található Tovább gombra való kattintással indítható a folyamat első lépése a háttér beállításával.
-
+
Set Up Background
Háttér beállítása
-
+
Set up your theme's background according to the parameters below.
A téma háttere az alábbi paraméterekkel állítható be.
-
+
Background type:
Háttér típusa:
-
+
Solid Color
Homogén szín
-
+
Gradient
Színátmenet
-
+
Image
Kép
-
+
Color:
Szín:
-
+
Gradient:
Színátmenet:
-
+
Horizontal
Vízszintes
-
+
Vertical
Függőleges
-
+
Circular
Körkörös
-
+
Top Left - Bottom Right
Bal felső sarokból jobb alsó sarokba
-
+
Bottom Left - Top Right
Bal alső sarokbó jobb felső sarokba
-
+
Image:
Kép:
-
+
Main Area Font Details
Fő tartalom betűkészlet jellemzői
-
+
Define the font and display characteristics for the Display text
A fő szöveg betűkészlete és a megjelenési tulajdonságai
-
+
Font:
Betűkészlet:
-
+
Size:
Méret:
-
+
pt
-
+
(%d lines per slide)
(%d sor diánként)
-
+
Line Spacing:
Sorköz:
-
+
&Outline:
&Körvonal:
-
+
&Shadow:
&Árnyék:
-
+
Bold
Félkövér
-
+
Italic
Dőlt
-
+
Footer Area Font Details
Lábléc betűkészlet jellemzői
-
+
Define the font and display characteristics for the Footer text
A lábléc szöveg betűkészlete és a megjelenési tulajdonságai
-
+
Text Formatting Details
Szövegformázás jellemzői
-
+
Allows additional display formatting information to be defined
További megjelenési formázások
-
+
Horizontal Align:
Vízszintes igazítás:
-
+
Left
Balra zárt
-
+
Right
Jobbra zárt
-
+
Center
Középre igazított
-
+
Vertical Align:
Függőleges igazítás:
-
+
Top
Felülre
-
+
Middle
Középre
-
+
Bottom
Alulra
-
+
Transitions
Átmenetek
-
+
Output Area Locations
Pozíciók
-
+
Allows you to change and move the main and footer areas.
A fő szöveg és a lábléc helyzetének mozgatása.
-
+
&Main Area
&Fő szöveg
-
+
&Use default location
&Alapértelmezett helyen
-
+
X position:
X pozíció:
-
+
px
-
+
Y position:
Y pozíció:
-
+
Width:
Szélesség:
-
+
Height:
Magasság:
-
+
Footer Area
Lábléc
-
+
Use default location
Alapértelmezett helyen
-
+
Save and Preview
Mentés és előnézet
-
+
View the theme and save it replacing the current one or change the name to create a new theme
A téma előnézete és mentése. Felülírható már egy meglévő vagy egy új név megadásával új téma hozható létre
-
+
Theme name:
Téma neve:
@@ -3508,12 +3523,12 @@ A tartalom kódolása nem UTF-8.
<strong>Távvezérlő bővítmény</strong><br />A távvezérlő bővítmény egy böngésző vagy egy távoli API segítségével lehetővé teszi egy másik számítógépen futó OpenLP számára való üzenetküldést.
-
+
Remote
Távvezérlő
-
+
Remotes
Távvezérlők
@@ -3784,142 +3799,142 @@ A tartalom kódolása nem UTF-8.
SongsPlugin.EditSongForm
-
+
Song Editor
Dalszerkesztő
-
+
&Title:
&Cím:
-
+
Alt&ernate title:
&Alternatív cím:
-
+
&Lyrics:
&Dalszöveg:
-
+
&Verse order:
Versszak &sorrend:
-
+
&Add
&Hozzáadás
-
+
&Edit
&Szerkesztés
-
+
Ed&it All
&Összes szerkesztése
-
+
&Delete
&Törlés
-
+
Title && Lyrics
Cím és dalszöveg
-
+
Authors
Szerzők
-
+
&Add to Song
&Hozzáadás dalhoz
-
+
&Remove
&Eltávolítás
-
+
&Manage Authors, Topics, Song Books
Szerzők, témakörök, énekeskönyvek &kezelése
-
+
Topic
Témakör
-
+
A&dd to Song
&Hozzáadás dalhoz
-
+
R&emove
&Eltávolítás
-
+
Song Book
Énekeskönyv
-
+
Book:
Könyv:
-
+
Number:
Szám:
-
+
Authors, Topics && Song Book
Szerzők, témakörök és énekeskönyvek
-
+
Theme
Téma
-
+
New &Theme
Új &téma
-
+
Copyright Information
Szerzői jogi információ
-
+
©
-
+
CCLI number:
CCLI szám:
-
+
Comments
Megjegyzések
-
+
Theme, Copyright Info && Comments
Téma, szerzői jogi infók és megjegyzések
@@ -4808,17 +4823,17 @@ Usually you are fine with the preselected choise.
SongsPlugin.VerseType
-
+
Verse
Versszak
-
+
Chorus
Refrén
-
+
Bridge
Mellékdal
@@ -4828,22 +4843,22 @@ Usually you are fine with the preselected choise.
Elő-refrén
-
+
Intro
Bevezetés
-
+
Ending
Befejezés
-
+
Other
Egyéb
-
+
PreChorus
Elő-refrén
diff --git a/resources/i18n/ja.ts b/resources/i18n/ja.ts
index c010b05e7..3d08ea94f 100644
--- a/resources/i18n/ja.ts
+++ b/resources/i18n/ja.ts
@@ -14,12 +14,12 @@ Do you want to continue anyway?
-
+
No Placeholder found
-
+
The alert text does not contain '<>'.
Do want to continue anyway?
@@ -1674,13 +1674,13 @@ Final Credit
OpenLP.ExceptionForm
-
+
Platform: %s
-
+
**OpenLP Bug Report**
Version: %s
@@ -1694,17 +1694,17 @@ Version: %s
-
+
Save Crash Report
-
+
Text files (*.txt *.log *.text)
-
+
*OpenLP Bug Report*
Version: %s
@@ -1724,15 +1724,20 @@ Version: %s
OpenLP.FileRenameForm
-
+
File Rename
-
+
New File Name:
+
+
+ File Copy
+
+
OpenLP.GeneralTab
@@ -1742,122 +1747,122 @@ Version: %s
-
+
Monitors
-
+
Select monitor for output display:
-
+
Display if a single screen
-
+
Application Startup
-
+
Show blank screen warning
-
+
Automatically open the last service
-
+
Show the splash screen
-
+
Application Settings
-
+
Prompt to save before starting a new service
-
+
Automatically preview next item in service
-
+
Slide loop delay:
-
+
sec
-
+
CCLI Details
-
+
CCLI number:
-
+
SongSelect username:
-
+
SongSelect password:
-
+
Display Position
-
+
X
-
+
Y
-
+
Height
-
+
Width
-
+
Override display position
-
+
Screen
-
+
primary
@@ -2905,103 +2910,93 @@ The content encoding is not UTF-8.
-
+
%s (default)
-
+
You must select a theme to edit.
-
- You must select a theme to delete.
-
-
-
-
- Delete Confirmation
-
-
-
-
+
Error
-
+
You are unable to delete the default theme.
-
+
Theme %s is used in the %s plugin.
-
+
Theme %s is used by the service manager.
-
+
You have not selected a theme.
-
+
Save Theme - (%s)
-
+
Theme Exported
-
+
Your theme has been successfully exported.
-
+
Theme Export Failed
-
+
Your theme could not be exported due to an error.
-
+
Select Theme Import File
-
+
Theme (*.*)
-
+
File is not a valid theme.
The content encoding is not UTF-8.
-
+
File is not a valid theme.
-
+
Theme Exists
-
+
A theme with this name already exists. Would you like to overwrite it?
@@ -3021,285 +3016,305 @@ The content encoding is not UTF-8.
-
- Delete %s theme?
+
+ Rename
+
+
+
+
+ Delete
+
+
+
+
+ You must select a theme to %s.
+
+
+
+
+ %s Confirmation
+
+
+
+
+ %s %s theme?
OpenLP.ThemeWizard
-
+
Theme Wizard
-
+
Welcome to the Theme Wizard
-
+
This wizard will help you to create and edit your themes . Click the next button below to start the process by setting up your background.
-
+
Set Up Background
-
+
Set up your theme's background according to the parameters below.
-
+
Background type:
-
+
Solid Color
-
+
Gradient
-
+
Image
-
+
Color:
-
+
Gradient:
-
+
Horizontal
-
+
Vertical
-
+
Circular
-
+
Top Left - Bottom Right
-
+
Bottom Left - Top Right
-
+
Image:
-
+
Main Area Font Details
-
+
Define the font and display characteristics for the Display text
-
+
Font:
-
+
Size:
-
+
pt
-
+
(%d lines per slide)
-
+
Line Spacing:
-
+
&Outline:
-
+
&Shadow:
-
+
Bold
-
+
Italic
-
+
Footer Area Font Details
-
+
Define the font and display characteristics for the Footer text
-
+
Text Formatting Details
-
+
Allows additional display formatting information to be defined
-
+
Horizontal Align:
-
+
Left
-
+
Right
-
+
Center
-
+
Vertical Align:
-
+
Top
-
+
Middle
-
+
Bottom
-
+
Transitions
-
+
Output Area Locations
-
+
Allows you to change and move the main and footer areas.
-
+
&Main Area
-
+
&Use default location
-
+
X position:
-
+
px
-
+
Y position:
-
+
Width:
-
+
Height:
-
+
Footer Area
-
+
Use default location
-
+
Save and Preview
-
+
View the theme and save it replacing the current one or change the name to create a new theme
-
+
Theme name:
@@ -3489,12 +3504,12 @@ The content encoding is not UTF-8.
-
+
Remote
-
+
Remotes
@@ -3765,142 +3780,142 @@ The content encoding is not UTF-8.
SongsPlugin.EditSongForm
-
+
Song Editor
-
+
&Title:
-
+
Alt&ernate title:
-
+
&Lyrics:
-
+
&Verse order:
-
+
&Add
-
+
&Edit
-
+
Ed&it All
-
+
&Delete
削除(&D)
-
+
Title && Lyrics
-
+
Authors
-
+
&Add to Song
-
+
&Remove
-
+
&Manage Authors, Topics, Song Books
-
+
Topic
-
+
A&dd to Song
-
+
R&emove
-
+
Song Book
-
+
Book:
-
+
Number:
-
+
Authors, Topics && Song Book
-
+
Theme
-
+
New &Theme
-
+
Copyright Information
-
+
©
-
+
CCLI number:
-
+
Comments
-
+
Theme, Copyright Info && Comments
@@ -4788,17 +4803,17 @@ Usually you are fine with the preselected choise.
SongsPlugin.VerseType
-
+
Verse
-
+
Chorus
-
+
Bridge
@@ -4808,22 +4823,22 @@ Usually you are fine with the preselected choise.
-
+
Intro
-
+
Ending
-
+
Other
その他
-
+
PreChorus
diff --git a/resources/i18n/ko.ts b/resources/i18n/ko.ts
index 358235d10..d2a1e9af4 100644
--- a/resources/i18n/ko.ts
+++ b/resources/i18n/ko.ts
@@ -14,12 +14,12 @@ Do you want to continue anyway?
-
+
No Placeholder found
-
+
The alert text does not contain '<>'.
Do want to continue anyway?
@@ -1675,13 +1675,13 @@ Final Credit
OpenLP.ExceptionForm
-
+
Platform: %s
-
+
**OpenLP Bug Report**
Version: %s
@@ -1695,17 +1695,17 @@ Version: %s
-
+
Save Crash Report
-
+
Text files (*.txt *.log *.text)
-
+
*OpenLP Bug Report*
Version: %s
@@ -1725,15 +1725,20 @@ Version: %s
OpenLP.FileRenameForm
-
+
File Rename
-
+
New File Name:
+
+
+ File Copy
+
+
OpenLP.GeneralTab
@@ -1743,122 +1748,122 @@ Version: %s
-
+
Monitors
-
+
Select monitor for output display:
-
+
Display if a single screen
-
+
Application Startup
-
+
Show blank screen warning
-
+
Automatically open the last service
-
+
Show the splash screen
-
+
Application Settings
-
+
Prompt to save before starting a new service
-
+
Automatically preview next item in service
-
+
Slide loop delay:
-
+
sec
-
+
CCLI Details
-
+
CCLI number:
-
+
SongSelect username:
-
+
SongSelect password:
-
+
Display Position
-
+
X
-
+
Y
-
+
Height
-
+
Width
-
+
Override display position
-
+
Screen
-
+
primary
@@ -2906,103 +2911,93 @@ The content encoding is not UTF-8.
-
+
%s (default)
-
+
You must select a theme to edit.
-
- You must select a theme to delete.
-
-
-
-
- Delete Confirmation
-
-
-
-
+
Error
에러
-
+
You are unable to delete the default theme.
-
+
You have not selected a theme.
-
+
Save Theme - (%s)
-
+
Theme Exported
-
+
Your theme has been successfully exported.
-
+
Theme Export Failed
-
+
Your theme could not be exported due to an error.
-
+
Select Theme Import File
-
+
Theme (*.*)
-
+
File is not a valid theme.
The content encoding is not UTF-8.
-
+
File is not a valid theme.
-
+
Theme Exists
-
+
A theme with this name already exists. Would you like to overwrite it?
-
+
Theme %s is used in the %s plugin.
-
+
Theme %s is used by the service manager.
@@ -3022,285 +3017,305 @@ The content encoding is not UTF-8.
-
- Delete %s theme?
+
+ Rename
+
+
+
+
+ Delete
+
+
+
+
+ You must select a theme to %s.
+
+
+
+
+ %s Confirmation
+
+
+
+
+ %s %s theme?
OpenLP.ThemeWizard
-
+
Theme Wizard
-
+
Welcome to the Theme Wizard
-
+
This wizard will help you to create and edit your themes . Click the next button below to start the process by setting up your background.
-
+
Set Up Background
-
+
Set up your theme's background according to the parameters below.
-
+
Background type:
-
+
Solid Color
-
+
Gradient
-
+
Image
-
+
Color:
-
+
Gradient:
-
+
Horizontal
-
+
Vertical
-
+
Circular
-
+
Top Left - Bottom Right
-
+
Bottom Left - Top Right
-
+
Image:
-
+
Main Area Font Details
-
+
Define the font and display characteristics for the Display text
-
+
Font:
-
+
Size:
-
+
pt
-
+
(%d lines per slide)
-
+
Line Spacing:
-
+
&Outline:
-
+
&Shadow:
-
+
Bold
-
+
Italic
-
+
Footer Area Font Details
-
+
Define the font and display characteristics for the Footer text
-
+
Text Formatting Details
-
+
Allows additional display formatting information to be defined
-
+
Horizontal Align:
-
+
Left
-
+
Right
-
+
Center
-
+
Vertical Align:
-
+
Top
위
-
+
Middle
가운데
-
+
Bottom
아래
-
+
Transitions
-
+
Output Area Locations
-
+
Allows you to change and move the main and footer areas.
-
+
&Main Area
-
+
&Use default location
-
+
X position:
-
+
px
-
+
Y position:
-
+
Width:
-
+
Height:
-
+
Footer Area
-
+
Use default location
-
+
Save and Preview
-
+
View the theme and save it replacing the current one or change the name to create a new theme
-
+
Theme name:
@@ -3490,12 +3505,12 @@ The content encoding is not UTF-8.
-
+
Remote
-
+
Remotes
@@ -3766,142 +3781,142 @@ The content encoding is not UTF-8.
SongsPlugin.EditSongForm
-
+
Song Editor
-
+
&Title:
-
+
Alt&ernate title:
-
+
&Lyrics:
-
+
&Verse order:
-
+
&Add
-
+
&Edit
-
+
Ed&it All
-
+
&Delete
삭제(&D)
-
+
Title && Lyrics
-
+
Authors
-
+
&Add to Song
-
+
&Remove
-
+
&Manage Authors, Topics, Song Books
-
+
Topic
-
+
A&dd to Song
-
+
R&emove
-
+
Song Book
-
+
Book:
-
+
Number:
-
+
Authors, Topics && Song Book
-
+
Theme
-
+
New &Theme
-
+
Copyright Information
-
+
©
-
+
CCLI number:
-
+
Comments
-
+
Theme, Copyright Info && Comments
@@ -4789,17 +4804,17 @@ Usually you are fine with the preselected choise.
SongsPlugin.VerseType
-
+
Verse
-
+
Chorus
-
+
Bridge
@@ -4809,22 +4824,22 @@ Usually you are fine with the preselected choise.
-
+
Intro
-
+
Ending
-
+
Other
-
+
PreChorus
diff --git a/resources/i18n/nb.ts b/resources/i18n/nb.ts
index fc8b35776..374307ba7 100644
--- a/resources/i18n/nb.ts
+++ b/resources/i18n/nb.ts
@@ -14,12 +14,12 @@ Do you want to continue anyway?
-
+
No Placeholder found
-
+
The alert text does not contain '<>'.
Do want to continue anyway?
@@ -1674,13 +1674,13 @@ Final Credit
OpenLP.ExceptionForm
-
+
Platform: %s
-
+
**OpenLP Bug Report**
Version: %s
@@ -1694,17 +1694,17 @@ Version: %s
-
+
Save Crash Report
-
+
Text files (*.txt *.log *.text)
-
+
*OpenLP Bug Report*
Version: %s
@@ -1724,15 +1724,20 @@ Version: %s
OpenLP.FileRenameForm
-
+
File Rename
-
+
New File Name:
+
+
+ File Copy
+
+
OpenLP.GeneralTab
@@ -1742,122 +1747,122 @@ Version: %s
-
+
Monitors
-
+
Select monitor for output display:
Velg hvilken skjerm som skal brukes til fremvisning:
-
+
Display if a single screen
-
+
Application Startup
Programoppstart
-
+
Show blank screen warning
-
+
Automatically open the last service
Åpne forrige møteplan automatisk
-
+
Show the splash screen
-
+
Application Settings
Programinnstillinger
-
+
Prompt to save before starting a new service
-
+
Automatically preview next item in service
-
+
Slide loop delay:
-
+
sec
-
+
CCLI Details
CCLI-detaljer
-
+
CCLI number:
-
+
SongSelect username:
-
+
SongSelect password:
-
+
Display Position
-
+
X
-
+
Y
-
+
Height
-
+
Width
-
+
Override display position
-
+
Screen
-
+
primary
primær
@@ -2905,103 +2910,93 @@ The content encoding is not UTF-8.
-
+
%s (default)
-
+
You must select a theme to edit.
-
- You must select a theme to delete.
-
-
-
-
- Delete Confirmation
-
-
-
-
+
Error
Feil
-
+
You are unable to delete the default theme.
Du kan ikke slette det globale temaet
-
+
You have not selected a theme.
-
+
Save Theme - (%s)
-
+
Theme Exported
-
+
Your theme has been successfully exported.
-
+
Theme Export Failed
-
+
Your theme could not be exported due to an error.
-
+
Select Theme Import File
-
+
Theme (*.*)
-
+
File is not a valid theme.
The content encoding is not UTF-8.
-
+
File is not a valid theme.
Filen er ikke et gyldig tema.
-
+
Theme Exists
Temaet eksisterer
-
+
A theme with this name already exists. Would you like to overwrite it?
-
+
Theme %s is used in the %s plugin.
-
+
Theme %s is used by the service manager.
@@ -3021,285 +3016,305 @@ The content encoding is not UTF-8.
-
- Delete %s theme?
+
+ Rename
+
+
+
+
+ Delete
+
+
+
+
+ You must select a theme to %s.
+
+
+
+
+ %s Confirmation
+
+
+
+
+ %s %s theme?
OpenLP.ThemeWizard
-
+
Theme Wizard
-
+
Welcome to the Theme Wizard
-
+
This wizard will help you to create and edit your themes . Click the next button below to start the process by setting up your background.
-
+
Set Up Background
-
+
Set up your theme's background according to the parameters below.
-
+
Background type:
-
+
Solid Color
Ensfarget
-
+
Gradient
-
+
Image
-
+
Color:
-
+
Gradient:
-
+
Horizontal
-
+
Vertical
Vertikal
-
+
Circular
-
+
Top Left - Bottom Right
-
+
Bottom Left - Top Right
-
+
Image:
-
+
Main Area Font Details
-
+
Define the font and display characteristics for the Display text
-
+
Font:
-
+
Size:
Størrelse:
-
+
pt
pt
-
+
(%d lines per slide)
-
+
Line Spacing:
-
+
&Outline:
-
+
&Shadow:
-
+
Bold
Fet
-
+
Italic
-
+
Footer Area Font Details
-
+
Define the font and display characteristics for the Footer text
-
+
Text Formatting Details
-
+
Allows additional display formatting information to be defined
-
+
Horizontal Align:
-
+
Left
-
+
Right
-
+
Center
Sentrert
-
+
Vertical Align:
-
+
Top
Topp
-
+
Middle
Midtstilt
-
+
Bottom
Bunn
-
+
Transitions
-
+
Output Area Locations
-
+
Allows you to change and move the main and footer areas.
-
+
&Main Area
-
+
&Use default location
-
+
X position:
-
+
px
-
+
Y position:
-
+
Width:
Bredde:
-
+
Height:
Høyde:
-
+
Footer Area
-
+
Use default location
-
+
Save and Preview
-
+
View the theme and save it replacing the current one or change the name to create a new theme
-
+
Theme name:
@@ -3489,12 +3504,12 @@ The content encoding is not UTF-8.
-
+
Remote
-
+
Remotes
Fjernmeldinger
@@ -3765,142 +3780,142 @@ The content encoding is not UTF-8.
SongsPlugin.EditSongForm
-
+
Song Editor
Sangredigeringsverktøy
-
+
&Title:
&Tittel:
-
+
Alt&ernate title:
-
+
&Lyrics:
-
+
&Verse order:
-
+
&Add
-
+
&Edit
&Rediger
-
+
Ed&it All
-
+
&Delete
&Slett
-
+
Title && Lyrics
Tittel && Sangtekst
-
+
Authors
-
+
&Add to Song
-
+
&Remove
&Fjern
-
+
&Manage Authors, Topics, Song Books
-
+
Topic
Emne
-
+
A&dd to Song
-
+
R&emove
&Fjern
-
+
Song Book
-
+
Book:
Bok:
-
+
Number:
-
+
Authors, Topics && Song Book
-
+
Theme
Tema
-
+
New &Theme
-
+
Copyright Information
Copyright-informasjon
-
+
©
-
+
CCLI number:
-
+
Comments
-
+
Theme, Copyright Info && Comments
@@ -4788,17 +4803,17 @@ Usually you are fine with the preselected choise.
SongsPlugin.VerseType
-
+
Verse
Vers
-
+
Chorus
-
+
Bridge
@@ -4808,22 +4823,22 @@ Usually you are fine with the preselected choise.
Pre-Chorus
-
+
Intro
-
+
Ending
-
+
Other
Annet
-
+
PreChorus
diff --git a/resources/i18n/pt_BR.ts b/resources/i18n/pt_BR.ts
index 526cb676c..36c15980e 100644
--- a/resources/i18n/pt_BR.ts
+++ b/resources/i18n/pt_BR.ts
@@ -14,12 +14,12 @@ Do you want to continue anyway?
-
+
No Placeholder found
-
+
The alert text does not contain '<>'.
Do want to continue anyway?
@@ -1675,13 +1675,13 @@ Final Credit
OpenLP.ExceptionForm
-
+
Platform: %s
-
+
**OpenLP Bug Report**
Version: %s
@@ -1695,17 +1695,17 @@ Version: %s
-
+
Save Crash Report
-
+
Text files (*.txt *.log *.text)
-
+
*OpenLP Bug Report*
Version: %s
@@ -1725,15 +1725,20 @@ Version: %s
OpenLP.FileRenameForm
-
+
File Rename
-
+
New File Name:
+
+
+ File Copy
+
+
OpenLP.GeneralTab
@@ -1743,122 +1748,122 @@ Version: %s
Geral
-
+
Monitors
Monitores
-
+
Select monitor for output display:
Selecione um monitor para exibição:
-
+
Display if a single screen
-
+
Application Startup
Inicialização da Aplicação
-
+
Show blank screen warning
Exibir alerta de tela em branco
-
+
Automatically open the last service
Abrir a última Lista de Exibição automaticamente
-
+
Show the splash screen
Exibir a tela inicial
-
+
Application Settings
Configurações da Aplicação
-
+
Prompt to save before starting a new service
Perguntar sobre salvamento antes de iniciar uma nova lista
-
+
Automatically preview next item in service
Pré-visualizar automaticamente o próximo item na Lista de Exibição
-
+
Slide loop delay:
Atraso no loop de slide:
-
+
sec
seg
-
+
CCLI Details
Detalhes de CCLI
-
+
CCLI number:
Número CCLI:
-
+
SongSelect username:
Usuário SongSelect:
-
+
SongSelect password:
Senha do SongSelect:
-
+
Display Position
Posição do Display
-
+
X
X
-
+
Y
Y
-
+
Height
Altura
-
+
Width
Largura
-
+
Override display position
Modificar posição do display
-
+
Screen
Tela
-
+
primary
principal
@@ -2906,104 +2911,94 @@ The content encoding is not UTF-8.
-
+
%s (default)
-
+
You must select a theme to edit.
-
- You must select a theme to delete.
-
-
-
-
- Delete Confirmation
-
-
-
-
+
Error
Erro
-
+
You are unable to delete the default theme.
-
+
You have not selected a theme.
Você não selecionou um tema.
-
+
Save Theme - (%s)
Salvar Tema - (%s)
-
+
Theme Exported
-
+
Your theme has been successfully exported.
-
+
Theme Export Failed
-
+
Your theme could not be exported due to an error.
O tema não pôde ser exportado devido a um erro.
-
+
Select Theme Import File
Selecionar Arquivo de Importação de Tema
-
+
Theme (*.*)
-
+
File is not a valid theme.
The content encoding is not UTF-8.
O arquivo não é um tema válido.
A codificação do conteúdo não é UTF-8.
-
+
File is not a valid theme.
O arquivo não é um tema válido.
-
+
Theme Exists
Tema Existe
-
+
A theme with this name already exists. Would you like to overwrite it?
-
+
Theme %s is used in the %s plugin.
-
+
Theme %s is used by the service manager.
@@ -3023,285 +3018,305 @@ A codificação do conteúdo não é UTF-8.
-
- Delete %s theme?
+
+ Rename
+
+
+
+
+ Delete
+ Deletar
+
+
+
+ You must select a theme to %s.
+
+
+
+
+ %s Confirmation
+
+
+
+
+ %s %s theme?
OpenLP.ThemeWizard
-
+
Theme Wizard
-
+
Welcome to the Theme Wizard
-
+
This wizard will help you to create and edit your themes . Click the next button below to start the process by setting up your background.
-
+
Set Up Background
-
+
Set up your theme's background according to the parameters below.
-
+
Background type:
-
+
Solid Color
Cor Sólida
-
+
Gradient
Gradiente
-
+
Image
Imagem
-
+
Color:
Cor:
-
+
Gradient:
Gradiente:
-
+
Horizontal
Horizontal
-
+
Vertical
Vertical
-
+
Circular
Circular
-
+
Top Left - Bottom Right
-
+
Bottom Left - Top Right
-
+
Image:
Imagem:
-
+
Main Area Font Details
-
+
Define the font and display characteristics for the Display text
-
+
Font:
Fonte:
-
+
Size:
Tamanho:
-
+
pt
pt
-
+
(%d lines per slide)
-
+
Line Spacing:
-
+
&Outline:
-
+
&Shadow:
-
+
Bold
Negrito
-
+
Italic
-
+
Footer Area Font Details
-
+
Define the font and display characteristics for the Footer text
-
+
Text Formatting Details
-
+
Allows additional display formatting information to be defined
-
+
Horizontal Align:
-
+
Left
Esquerda
-
+
Right
Direita
-
+
Center
Centralizar
-
+
Vertical Align:
-
+
Top
Topo
-
+
Middle
Meio
-
+
Bottom
Rodapé
-
+
Transitions
-
+
Output Area Locations
-
+
Allows you to change and move the main and footer areas.
-
+
&Main Area
-
+
&Use default location
-
+
X position:
Posição X:
-
+
px
px
-
+
Y position:
Posição Y:
-
+
Width:
Largura:
-
+
Height:
Altura:
-
+
Footer Area
-
+
Use default location
Usar local padrão
-
+
Save and Preview
-
+
View the theme and save it replacing the current one or change the name to create a new theme
-
+
Theme name:
@@ -3491,12 +3506,12 @@ A codificação do conteúdo não é UTF-8.
-
+
Remote
-
+
Remotes
Remoto
@@ -3767,142 +3782,142 @@ A codificação do conteúdo não é UTF-8.
SongsPlugin.EditSongForm
-
+
Song Editor
Editor de Músicas
-
+
&Title:
&Título:
-
+
Alt&ernate title:
Título &Alternativo:
-
+
&Lyrics:
-
+
&Verse order:
Ordem das &estrofes:
-
+
&Add
%Adicionar
-
+
&Edit
&Editar
-
+
Ed&it All
-
+
&Delete
&Deletar
-
+
Title && Lyrics
Título && Letras
-
+
Authors
Autores
-
+
&Add to Song
&Adicionar à Música
-
+
&Remove
&Remover
-
+
&Manage Authors, Topics, Song Books
-
+
Topic
Tópico
-
+
A&dd to Song
A&dicionar uma Música
-
+
R&emove
R&emover
-
+
Song Book
Livro de Músicas
-
+
Book:
Livro:
-
+
Number:
-
+
Authors, Topics && Song Book
-
+
Theme
Tema
-
+
New &Theme
-
+
Copyright Information
Informação de Direitos Autorais
-
+
©
-
+
CCLI number:
Número CCLI:
-
+
Comments
Comentários
-
+
Theme, Copyright Info && Comments
Tema, Direitos Autorais && Comentários
@@ -4790,17 +4805,17 @@ Usually you are fine with the preselected choise.
SongsPlugin.VerseType
-
+
Verse
-
+
Chorus
-
+
Bridge
@@ -4810,22 +4825,22 @@ Usually you are fine with the preselected choise.
-
+
Intro
-
+
Ending
-
+
Other
-
+
PreChorus
diff --git a/resources/i18n/sv.ts b/resources/i18n/sv.ts
index df7cbff79..0cf1e4abc 100644
--- a/resources/i18n/sv.ts
+++ b/resources/i18n/sv.ts
@@ -14,12 +14,12 @@ Do you want to continue anyway?
-
+
No Placeholder found
-
+
The alert text does not contain '<>'.
Do want to continue anyway?
@@ -1675,13 +1675,13 @@ Final Credit
OpenLP.ExceptionForm
-
+
Platform: %s
-
+
**OpenLP Bug Report**
Version: %s
@@ -1695,17 +1695,17 @@ Version: %s
-
+
Save Crash Report
-
+
Text files (*.txt *.log *.text)
-
+
*OpenLP Bug Report*
Version: %s
@@ -1725,15 +1725,20 @@ Version: %s
OpenLP.FileRenameForm
-
+
File Rename
-
+
New File Name:
+
+
+ File Copy
+
+
OpenLP.GeneralTab
@@ -1743,122 +1748,122 @@ Version: %s
Allmänt
-
+
Monitors
Skärmar
-
+
Select monitor for output display:
Välj skärm för utsignal:
-
+
Display if a single screen
-
+
Application Startup
Programstart
-
+
Show blank screen warning
Visa varning vid tom skärm
-
+
Automatically open the last service
Öppna automatiskt den senaste planeringen
-
+
Show the splash screen
Visa startbilden
-
+
Application Settings
Programinställningar
-
+
Prompt to save before starting a new service
-
+
Automatically preview next item in service
Automatiskt förhandsgranska nästa post i planeringen
-
+
Slide loop delay:
-
+
sec
sekunder
-
+
CCLI Details
CCLI-detaljer
-
+
CCLI number:
CCLI-nummer
-
+
SongSelect username:
SongSelect användarnamn:
-
+
SongSelect password:
SongSelect lösenord:
-
+
Display Position
-
+
X
X
-
+
Y
Y
-
+
Height
Höjd
-
+
Width
Bredd
-
+
Override display position
-
+
Screen
Skärm
-
+
primary
primär
@@ -2906,103 +2911,93 @@ The content encoding is not UTF-8.
-
+
%s (default)
-
+
You must select a theme to edit.
-
- You must select a theme to delete.
-
-
-
-
- Delete Confirmation
-
-
-
-
+
Error
Fel
-
+
You are unable to delete the default theme.
Du kan inte ta bort standardtemat.
-
+
You have not selected a theme.
Du har inte valt ett tema.
-
+
Save Theme - (%s)
Spara tema - (%s)
-
+
Theme Exported
-
+
Your theme has been successfully exported.
-
+
Theme Export Failed
-
+
Your theme could not be exported due to an error.
-
+
Select Theme Import File
Välj tema importfil
-
+
Theme (*.*)
-
+
File is not a valid theme.
The content encoding is not UTF-8.
-
+
File is not a valid theme.
Filen är inte ett giltigt tema.
-
+
Theme Exists
Temat finns
-
+
A theme with this name already exists. Would you like to overwrite it?
-
+
Theme %s is used in the %s plugin.
-
+
Theme %s is used by the service manager.
@@ -3022,285 +3017,305 @@ The content encoding is not UTF-8.
-
- Delete %s theme?
+
+ Rename
+
+
+
+
+ Delete
+
+
+
+
+ You must select a theme to %s.
+
+
+
+
+ %s Confirmation
+
+
+
+
+ %s %s theme?
OpenLP.ThemeWizard
-
+
Theme Wizard
-
+
Welcome to the Theme Wizard
-
+
This wizard will help you to create and edit your themes . Click the next button below to start the process by setting up your background.
-
+
Set Up Background
-
+
Set up your theme's background according to the parameters below.
-
+
Background type:
-
+
Solid Color
Solid färg
-
+
Gradient
Stegvis
-
+
Image
Bild
-
+
Color:
Färg:
-
+
Gradient:
Stegvis:
-
+
Horizontal
Horisontal
-
+
Vertical
Vertikal
-
+
Circular
Cirkulär
-
+
Top Left - Bottom Right
-
+
Bottom Left - Top Right
-
+
Image:
Bild:
-
+
Main Area Font Details
-
+
Define the font and display characteristics for the Display text
-
+
Font:
Typsnitt:
-
+
Size:
Storlek:
-
+
pt
pt
-
+
(%d lines per slide)
-
+
Line Spacing:
-
+
&Outline:
-
+
&Shadow:
-
+
Bold
Fetstil
-
+
Italic
-
+
Footer Area Font Details
-
+
Define the font and display characteristics for the Footer text
-
+
Text Formatting Details
-
+
Allows additional display formatting information to be defined
-
+
Horizontal Align:
-
+
Left
Vänster
-
+
Right
Höger
-
+
Center
Centrera
-
+
Vertical Align:
-
+
Top
Toppen
-
+
Middle
Mitten
-
+
Bottom
Botten
-
+
Transitions
-
+
Output Area Locations
-
+
Allows you to change and move the main and footer areas.
-
+
&Main Area
-
+
&Use default location
-
+
X position:
X-position:
-
+
px
px
-
+
Y position:
Y-position:
-
+
Width:
Bredd:
-
+
Height:
Höjd:
-
+
Footer Area
-
+
Use default location
-
+
Save and Preview
-
+
View the theme and save it replacing the current one or change the name to create a new theme
-
+
Theme name:
@@ -3490,12 +3505,12 @@ The content encoding is not UTF-8.
-
+
Remote
-
+
Remotes
Fjärrstyrningar
@@ -3766,142 +3781,142 @@ The content encoding is not UTF-8.
SongsPlugin.EditSongForm
-
+
Song Editor
Sångredigerare
-
+
&Title:
&Titel:
-
+
Alt&ernate title:
-
+
&Lyrics:
-
+
&Verse order:
-
+
&Add
&Lägg till
-
+
&Edit
&Redigera
-
+
Ed&it All
-
+
&Delete
&Ta bort
-
+
Title && Lyrics
Titel && Sångtexter
-
+
Authors
Författare
-
+
&Add to Song
&Lägg till i sång
-
+
&Remove
&Ta bort
-
+
&Manage Authors, Topics, Song Books
-
+
Topic
Ämne
-
+
A&dd to Song
Lä&gg till i sång
-
+
R&emove
Ta &bort
-
+
Song Book
Sångbok
-
+
Book:
Bok:
-
+
Number:
Nummer:
-
+
Authors, Topics && Song Book
-
+
Theme
Tema
-
+
New &Theme
Nytt &tema
-
+
Copyright Information
Copyrightinformation
-
+
©
©
-
+
CCLI number:
CCLI nummer:
-
+
Comments
Kommentarer
-
+
Theme, Copyright Info && Comments
Tema, copyrightinfo && kommentarer
@@ -4789,17 +4804,17 @@ Usually you are fine with the preselected choise.
SongsPlugin.VerseType
-
+
Verse
Vers
-
+
Chorus
Refräng
-
+
Bridge
Brygga
@@ -4809,22 +4824,22 @@ Usually you are fine with the preselected choise.
Brygga
-
+
Intro
Intro
-
+
Ending
Ending
-
+
Other
Övrigt
-
+
PreChorus
diff --git a/setup.py b/setup.py
index c216a17c1..a435c5496 100755
--- a/setup.py
+++ b/setup.py
@@ -5,8 +5,8 @@
###############################################################################
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
# Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian #
# Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, #
# Carsten Tinggaard, Frode Woldsund #
@@ -79,4 +79,4 @@ OpenLP (previously openlp.org) is free church presentation software, or lyrics p
entry_points="""
# -*- Entry points: -*-
"""
-)
+)
\ No newline at end of file