diff --git a/MANIFEST.in b/MANIFEST.in
index 992685bcf..b51cd4c06 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,13 +4,10 @@ recursive-include openlp *.csv
recursive-include openlp *.html
recursive-include openlp *.js
recursive-include openlp *.css
-recursive-include openlp *.qm
recursive-include documentation *
-recursive-include resources/forms *
-recursive-include resources/i18n *
-recursive-include resources/images *
-recursive-include scripts *.py
-include resources/*.desktop
+recursive-include resources *
+recursive-include scripts *
include copyright.txt
include LICENSE
+include README.txt
include openlp/.version
diff --git a/documentation/manual/source/dualmonitors.rst b/documentation/manual/source/dualmonitors.rst
index ee4bc90a2..5c29e8650 100644
--- a/documentation/manual/source/dualmonitors.rst
+++ b/documentation/manual/source/dualmonitors.rst
@@ -4,11 +4,11 @@ Dual Monitor Setup
The first step in getting OpenLP working on your system is to setup your
computer properly for dual monitors. This is not very difficult, but the steps
-do vary depending on operating system.
+will vary depending on operating system.
-Most modern computers do have the ability for dual monitors. To be certain
+Most modern computers have the ability for dual monitors. To be certain,
check your computer's documentation. A typical desktop computer capable of dual
-monitors will have two of, or a combination of the two connectors below.
+monitors will have two of, or a combination of the two, connectors below.
**VGA**
@@ -18,8 +18,8 @@ monitors will have two of, or a combination of the two connectors below.
.. image:: pics/dvi.png
-A laptop computer setup only varies slightly, generally you will need only one
-of outputs pictured above since your laptops screen serves as one of the
+A laptop computer setup only varies slightly. Generally you will need only one
+of the outputs pictured above since your laptop screen serves as one of the
monitors. Sometimes with older laptops a key stroke generally involving the
:kbd:`Fn` key and another key is required to enable the second monitor on
laptops.
@@ -27,9 +27,10 @@ laptops.
Some computers also incorporate the use of :abbr:`S-Video (Separate Video)` or
:abbr:`HDMI (High-Definition Multimedia Interface)` connections.
-A typical OpenLP set up consist of your normal single monitor setup, with your
-projector setup as the second monitor. With the option of extending your
-desktop across the second monitor, or your operating system's equivalent.
+A typical OpenLP setup consist of your normal single monitor, with your
+projector hooked up to your computer as the second monitor. With the option of
+extending your desktop across the second monitor, or your operating system's
+equivalent.
Microsoft Windows
-----------------
@@ -46,8 +47,8 @@ press :kbd:`Windows+P`.
The more traditional way is also fairly straight forward. Go to
:guilabel:`Control Panel` and click on :guilabel:`Display`. This will open up
-the :guilabel:`Display` dialog. You can also bypass this step by right click on
-a blank area on your desktop and selecting :guilabel:`Resolution`.
+the :guilabel:`Display` dialog. You may also bypass this step by a right click
+on a blank area on your desktop and selecting :guilabel:`Resolution`.
.. image:: pics/winsevendisplay.png
@@ -66,7 +67,7 @@ a blank place on the desktop and click :guilabel:`Personalization`.
.. image:: pics/vistapersonalize.png
From the :guilabel:`Personalization` window click on :guilabel:`Display
-Settings`. Then enable the montior that represents your projector and make sure
+Settings`. Click on the monitor that represents your projector and make sure
you have checked :guilabel:`Extend the desktop onto this monitor`.
.. image:: pics/vistadisplaysettings.png
@@ -77,7 +78,7 @@ Windows XP
From :guilabel:`Control Panel` select :guilabel:`Display`, or right click on a
blank area of the desktop and select :guilabel:`Properties`. From the
:guilabel:`Display Properties` window click on the :guilabel:`Settings` tab.
-Then click on the monitor that represents your projector and make sure you have
+Click on the monitor that represents your projector and make sure you have
checked :guilabel:`Extend my Windows desktop onto this monitor`.
.. image:: pics/xpdisplaysettings.png
@@ -87,7 +88,7 @@ Linux
Due to the vast varieties of hardware, distributions, desktops, and drivers
this is not an exhaustive guide to dual monitor setup on Linux. This guide
-assumes that you have properly set up any proprietary drivers if needed. You
+assumes you have properly set up any proprietary drivers if needed. You
should seek out your distributions documentation if this general guide does not
work.
@@ -123,7 +124,8 @@ Linux Systems Using nVidia Drivers
This guide is for users of the proprietary nVidia driver on Linux Distributions.
It is assumed that you have properly setup your drivers according to your
-distribution's documentation, and you have a working ``xorg.conf`` file in place.
+distribution's documentation, and you have a working ``xorg.conf`` file in
+place.
If you wish to make the changes permanent in setting up your system for dual
monitors it will be necessary to modify your ``xorg.conf`` file. It is always a
@@ -166,7 +168,7 @@ After clicking :guilabel:`Configure`, select :guilabel:`TwinView`. Then click
.. image:: pics/twinview.png
-Then click :guilabel:`Apply` and if you are happy with the way things look click
+Click :guilabel:`Apply` and if you are happy with the way things look click
:guilabel:`Keep` to keep your new settings. Don't worry if all goes wrong the
settings will return back to the previous settings in 15 seconds without any
action. nVidia Settings should take care of selecting your optimum resolution
@@ -175,6 +177,6 @@ on :guilabel:`Save to X Configuration File`.
.. image:: pics/xorgwrite.png
-Then click :guilabel:`Save` and you should be set. You may want to restart X or
+Click :guilabel:`Save` and you should be set. You may want to restart X or
your machine just to make sure all the settings carry over the next time you log
in.
diff --git a/documentation/manual/source/glossary.rst b/documentation/manual/source/glossary.rst
index 6f4ebcdd6..ab6c7880e 100644
--- a/documentation/manual/source/glossary.rst
+++ b/documentation/manual/source/glossary.rst
@@ -18,7 +18,7 @@ The Main Window contains all the tools and plugins that make OpenLP function
Media Manager
-------------
-The Media Manager contains a number of tabs that plugins supply to OpenLP.
+The Media Manager contains a number of tabs the plugins supply to OpenLP.
Each tab in the Media Manager is called a **Media Item**
.. image:: pics/mediamanager.png
@@ -36,20 +36,20 @@ with them.
Service File
------------
-A service file, is the file that is created when you save your work on OpenLP.
+A service file is the file that is created when you save your service in OpenLP.
The service file consist of **Service Items**
Service Item
------------
-A service item are the **media items** that are in the **service manager**
+Service items are the **media items** that are in the **service manager**
Service Manger
--------------
The service manager contains the media items in your service file. This is the
-area from which your media items go live, and you can also save, open, and edit
-services files.
+area where your media items go live. You can also save, open, and edit
+services files from here.
.. image:: pics/servicemanager.png
@@ -65,6 +65,6 @@ Theme Manager
-------------
The theme manager is where themes are created and edited. Themes are the text
-styles backgrounds that you use to personalize your services.
+styles and backgrounds that you use to personalize your services.
.. image:: pics/thememanager.png
diff --git a/documentation/manual/source/index.rst b/documentation/manual/source/index.rst
index 378cfe2a0..36bcf2cc1 100644
--- a/documentation/manual/source/index.rst
+++ b/documentation/manual/source/index.rst
@@ -15,5 +15,4 @@ Contents:
glossary
dualmonitors
mediamanager
- songs
-
+ songs
\ No newline at end of file
diff --git a/documentation/manual/source/songs.rst b/documentation/manual/source/songs.rst
index 678a6206c..91e5539c2 100644
--- a/documentation/manual/source/songs.rst
+++ b/documentation/manual/source/songs.rst
@@ -8,26 +8,26 @@ converters provided to get data from other formats into OpenLP.
Song Importer
=============
-If you are using an earlier version of OpenLP or come from another software
+If you are using an earlier version of OpenLP or, come from another software
package, you may be able to convert your existing database to work in OpenLP
-2.0. To access the Song Importer :menuselection:`File --> Import --> Song`.
-You will then see the Song Importer window, then click :guilabel:`Next`.
+2.0. To access the Song Importer click :menuselection:`File --> Import --> Song`.
+You will see the Song Importer window, then click :guilabel:`Next`.
.. image:: pics/songimporter.png
-After choosing :guilabel:`Next` you can then select from the various types of
+After choosing :guilabel:`Next` you can select from the various types of
software that OpenLP will convert songs from.
.. image:: pics/songimporterchoices.png
-Then click on the file folder icon to choose the file of the song database you
+Click on the file folder icon to choose the file of the song database you
want to import. See the following sections for information on the different
formats that OpenLP will import.
Importing from OpenLP Version 1
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Converting from OpenLP Version 1 is a pretty simple process. You will first
+Converting from OpenLP Version 1 is a simple process. First you will
need to locate your version 1 database file.
Windows XP::
@@ -38,33 +38,34 @@ Windows Vista / Windows 7::
C:\ProgramData\openlp.org\Data\songs.olp
-After clicking :guilabel:`Next` your conversion should be complete.
+After clicking :guilabel:`Next` your conversion will be complete.
.. image:: pics/finishedimport.png
-Then press :guilabel:`Finish` and you should now be ready to use your OpenLP
-version one songs.
+Press :guilabel:`Finish` and you will now be ready to use your OpenLP
+version 1 songs.
Importing from OpenSong
^^^^^^^^^^^^^^^^^^^^^^^
-Converting from OpenSong you will need to locate your songs database. In the
+Converting from OpenSong, you will need to locate your songs database. In the
later versions of OpenSong you are asked to define the location of this. The
-songs will be located in a folder named :guilabel:`Songs`. This folder should
-contain files with all your songs in them without a file extension. (file.xxx).
-When you have located this folder you will then need to select the songs from
+songs will be located in a folder named :guilabel:`Songs`. This folder will
+contain files with all your songs in them, without a file extension. (file.xxx).
+When you have located this folder you will need to select the songs from
the folder.
.. image:: pics/selectsongs.png
-On most operating systems to select all the songs, first select the first song
-in the lest then press shift and select the last song in the list. After this
-press :guilabel:`Next` and you should see that your import has been successful.
+On most operating systems, to select all the songs, first select the first song
+in the list, press the shift key, and select the last song in the list. After
+this press :guilabel:`Next` and you will see that your import has been
+successful.
.. image:: pics/finishedimport.png
-Press :guilabel:`Finish` and you will now be ready to use your songs imported
-from OpenSong.
+Press :guilabel:`Finish` and OpenLP will be ready to use your songs that you
+imported from OpenSong.
Importing from CCLI Song Select
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -79,22 +80,23 @@ Then search for your desired song. For this example we will be adding the song
.. image:: pics/songselectsongsearch.png
-For the song you are searching for select `lyrics` This should take you to a
-page displaying the lyrics and copyright info for your song.
+For the song you are searching for, select `lyrics` This will take you to a
+page displaying the lyrics and copyright information for your song.
.. image:: pics/songselectlyrics.png
-Next, hover over the :guilabel:`Lyrics` menu from the upper right corner. Then
-choose either the .txt or .usr file. You will then be asked to chose a download
+Next, hover over the :guilabel:`Lyrics` menu from the upper right corner.
+Choose either the .txt or .usr file. You will be asked to chose a download
location if your browser does not automatically select that for you. Select
this file from the OpenLP import window and then click :guilabel:`Next` You can
also select multiple songs for import at once on most operating systems by
-selecting the first item in the list then holding shift select the last item in
-the list. When finished you should see that your import has completed.
+selecting the first item in the list then holding the shift key and select the
+last item in the list. When finished, you will see that your import has
+completed.
.. image:: pics/finishedimport.png
-Press :guilabel:`Finish` and you will now be ready to use your songs imported
+Press :guilabel:`Finish` and OpenLP will be ready to use your songs imported
from CCLI SongSelect.
diff --git a/openlp.pyw b/openlp.pyw
index 920908b61..416b2bb13 100755
--- a/openlp.pyw
+++ b/openlp.pyw
@@ -36,6 +36,8 @@ from PyQt4 import QtCore, QtGui
from openlp.core.lib import Receiver, check_directory_exists
from openlp.core.resources import qInitResources
from openlp.core.ui.mainwindow import MainWindow
+from openlp.core.ui.firsttimelanguageform import FirstTimeLanguageForm
+from openlp.core.ui.firsttimeform import FirstTimeForm
from openlp.core.ui.exceptionform import ExceptionForm
from openlp.core.ui import SplashScreen, ScreenList
from openlp.core.utils import AppLocation, LanguageManager, VersionThread
@@ -165,6 +167,13 @@ class OpenLP(QtGui.QApplication):
self.setOrganizationDomain(u'openlp.org')
self.setApplicationName(u'OpenLP')
self.setApplicationVersion(app_version[u'version'])
+ # Decide how many screens we have and their size
+ screens = ScreenList(self.desktop())
+ # First time checks in settings
+ has_run_wizard = QtCore.QSettings().value(
+ u'general/has run wizard', QtCore.QVariant(False)).toBool()
+ if not has_run_wizard:
+ FirstTimeForm(screens).exec_()
if os.name == u'nt':
self.setStyleSheet(application_stylesheet)
show_splash = QtCore.QSettings().value(
@@ -174,11 +183,9 @@ class OpenLP(QtGui.QApplication):
self.splash.show()
# make sure Qt really display the splash screen
self.processEvents()
- # Decide how many screens we have and their size
- screens = ScreenList(self.desktop())
# start the main app window
- self.appClipboard = self.clipboard()
- self.mainWindow = MainWindow(screens, app_version, self.appClipboard)
+ self.mainWindow = MainWindow(screens, app_version, self.clipboard(),
+ not has_run_wizard)
self.mainWindow.show()
if show_splash:
# now kill the splashscreen
@@ -262,10 +269,19 @@ def main():
qInitResources()
# Now create and actually run the application.
app = OpenLP(qt_args)
- if sys.platform == 'darwin':
+ # Define the settings environment
+ settings = QtCore.QSettings(u'OpenLP', u'OpenLP')
+ # First time checks in settings
+ # Use explicit reference as not inside a QT environment yet
+ if not settings.value(u'general/has run wizard',
+ QtCore.QVariant(False)).toBool():
+ if not FirstTimeLanguageForm().exec_():
+ # if cancel then stop processing
+ sys.exit()
+ if sys.platform == u'darwin':
OpenLP.addLibraryPath(QtGui.QApplication.applicationDirPath()
+ "/qt4_plugins")
- #i18n Set Language
+ # i18n Set Language
language = LanguageManager.get_language()
appTranslator = LanguageManager.get_translator(language)
app.installTranslator(appTranslator)
diff --git a/openlp/core/lib/__init__.py b/openlp/core/lib/__init__.py
index dc60a5a65..1fb842361 100644
--- a/openlp/core/lib/__init__.py
+++ b/openlp/core/lib/__init__.py
@@ -248,9 +248,8 @@ def resize_image(image, width, height, background=QtCore.Qt.black):
``height``
The new image height.
- ``background``
+ ``background``
The background colour defaults to black.
-
"""
log.debug(u'resize_image - start')
if isinstance(image, QtGui.QImage):
diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py
index e3bb4ae0f..ceaad2d46 100644
--- a/openlp/core/lib/mediamanageritem.py
+++ b/openlp/core/lib/mediamanageritem.py
@@ -349,11 +349,11 @@ class MediaManagerItem(QtGui.QWidget):
Validates whether an image still exists and, if it does, is the
thumbnail representation of the image up to date.
"""
- if not os.path.exists(image):
+ if not os.path.exists(unicode(image)):
return False
if os.path.exists(thumb):
- imageDate = os.stat(image).st_mtime
- thumbDate = os.stat(thumb).st_mtime
+ imageDate = os.stat(unicode(image)).st_mtime
+ thumbDate = os.stat(unicode(thumb)).st_mtime
# If image has been updated rebuild icon
if imageDate > thumbDate:
self.iconFromFile(image, thumb)
diff --git a/openlp/core/lib/plugin.py b/openlp/core/lib/plugin.py
index c1ff30281..6195cb248 100644
--- a/openlp/core/lib/plugin.py
+++ b/openlp/core/lib/plugin.py
@@ -114,8 +114,8 @@ class Plugin(QtCore.QObject):
"""
log.info(u'loaded')
- def __init__(self, name, version=None, pluginHelpers=None,
- mediaItemClass=None, settingsTabClass=None):
+ def __init__(self, name, pluginHelpers=None, mediaItemClass=None,
+ settingsTabClass=None, version=None):
"""
This is the constructor for the plugin object. This provides an easy
way for descendent plugins to populate common data. This method *must*
@@ -123,7 +123,7 @@ class Plugin(QtCore.QObject):
class MyPlugin(Plugin):
def __init__(self):
- Plugin.__init__(self, u'MyPlugin', u'0.1')
+ Plugin.__init__(self, u'MyPlugin', version=u'0.1')
``name``
Defaults to *None*. The name of the plugin.
@@ -145,8 +145,7 @@ class Plugin(QtCore.QObject):
self.textStrings = {}
self.setPluginTextStrings()
self.nameStrings = self.textStrings[StringContent.Name]
- if version:
- self.version = version
+ self.version = version if version else u'1.9.4'
self.settingsSection = self.name.lower()
self.icon = None
self.mediaItemClass = mediaItemClass
diff --git a/openlp/core/lib/pluginmanager.py b/openlp/core/lib/pluginmanager.py
index d2b05ab7c..6085b0da3 100644
--- a/openlp/core/lib/pluginmanager.py
+++ b/openlp/core/lib/pluginmanager.py
@@ -49,16 +49,13 @@ class PluginManager(object):
``plugin_dir``
The directory to search for plugins.
"""
- log.info(u'Plugin manager initing')
+ log.info(u'Plugin manager Initialising')
if not plugin_dir in sys.path:
log.debug(u'Inserting %s into sys.path', plugin_dir)
sys.path.insert(0, plugin_dir)
self.basepath = os.path.abspath(plugin_dir)
log.debug(u'Base path %s ', self.basepath)
- self.plugin_helpers = []
self.plugins = []
- # this has to happen after the UI is sorted
- # self.find_plugins(plugin_dir)
log.info(u'Plugin manager Initialised')
def find_plugins(self, plugin_dir, plugin_helpers):
@@ -73,7 +70,7 @@ class PluginManager(object):
A list of helper objects to pass to the plugins.
"""
- self.plugin_helpers = plugin_helpers
+ log.info(u'Finding plugins')
startdepth = len(os.path.abspath(plugin_dir).split(os.sep))
log.debug(u'finding plugins in %s at depth %d',
unicode(plugin_dir), startdepth)
@@ -102,11 +99,11 @@ class PluginManager(object):
plugin_objects = []
for p in plugin_classes:
try:
- plugin = p(self.plugin_helpers)
- log.debug(u'Loaded plugin %s with helpers', unicode(p))
+ plugin = p(plugin_helpers)
+ log.debug(u'Loaded plugin %s', unicode(p))
plugin_objects.append(plugin)
except TypeError:
- log.exception(u'loaded plugin %s has no helpers', unicode(p))
+ log.exception(u'Failed to load plugin %s', unicode(p))
plugins_list = sorted(plugin_objects, self.order_by_weight)
for plugin in plugins_list:
if plugin.checkPreConditions():
@@ -203,6 +200,7 @@ class PluginManager(object):
Loop through all the plugins and give them an opportunity to
initialise themselves.
"""
+ log.info(u'Initialise Plugins - Started')
for plugin in self.plugins:
log.info(u'initialising plugins %s in a %s state'
% (plugin.name, plugin.isActive()))
@@ -211,6 +209,7 @@ class PluginManager(object):
log.info(u'Initialisation Complete for %s ' % plugin.name)
if not plugin.isActive():
plugin.removeToolboxItem()
+ log.info(u'Initialise Plugins - Finished')
def finalise_plugins(self):
"""
diff --git a/openlp/core/lib/toolbar.py b/openlp/core/lib/toolbar.py
index 37fb67d52..1da68d72d 100644
--- a/openlp/core/lib/toolbar.py
+++ b/openlp/core/lib/toolbar.py
@@ -48,7 +48,7 @@ class OpenLPToolbar(QtGui.QToolBar):
self.icons = {}
self.setIconSize(QtCore.QSize(20, 20))
self.actions = {}
- log.debug(u'Init done')
+ log.debug(u'Init done for %s' % parent.__class__.__name__)
def addToolbarButton(self, title, icon, tooltip=None, slot=None,
checkable=False, shortcut=0, alternate=0,
diff --git a/openlp/core/ui/__init__.py b/openlp/core/ui/__init__.py
index 158f7f0cd..485d2adda 100644
--- a/openlp/core/ui/__init__.py
+++ b/openlp/core/ui/__init__.py
@@ -51,6 +51,8 @@ class HideMode(object):
Theme = 2
Screen = 3
+from firsttimeform import FirstTimeForm
+from firsttimelanguageform import FirstTimeLanguageForm
from themeform import ThemeForm
from filerenameform import FileRenameForm
from starttimeform import StartTimeForm
@@ -74,4 +76,4 @@ from thememanager import ThemeManager
__all__ = ['SplashScreen', 'AboutForm', 'SettingsForm', 'MainDisplay',
'SlideController', 'ServiceManager', 'ThemeManager', 'MediaDockManager',
- 'ServiceItemEditForm']
+ 'ServiceItemEditForm', u'FirstTimeForm']
diff --git a/openlp/core/ui/aboutdialog.py b/openlp/core/ui/aboutdialog.py
index d973c5680..aec1bad51 100644
--- a/openlp/core/ui/aboutdialog.py
+++ b/openlp/core/ui/aboutdialog.py
@@ -226,7 +226,7 @@ class Ui_AboutDialog(object):
'Portions copyright \xa9 2004-2011 '
'Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri,\n'
'Meinert Jordan, Andreas Preikschat, Christian Richter, Philip\n'
- 'Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carstenn'
+ 'Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carsten\n'
'Tinggaard, Frode Woldsund')
licence = translate('OpenLP.AboutForm',
'This program is free software; you can redistribute it and/or '
diff --git a/openlp/core/ui/displaytagdialog.py b/openlp/core/ui/displaytagdialog.py
index 2b6441e16..6a1d8ca2c 100644
--- a/openlp/core/ui/displaytagdialog.py
+++ b/openlp/core/ui/displaytagdialog.py
@@ -143,11 +143,11 @@ class Ui_DisplayTagDialog(object):
self.tagTableWidget.horizontalHeaderItem(0).setText(
translate('OpenLP.DisplayTagDialog', 'Description'))
self.tagTableWidget.horizontalHeaderItem(1).setText(
- translate('OpenLP.DisplayTagDialog', 'Tag id'))
+ translate('OpenLP.DisplayTagDialog', 'Tag Id'))
self.tagTableWidget.horizontalHeaderItem(2).setText(
- translate('OpenLP.DisplayTagDialog', 'Start Html'))
+ translate('OpenLP.DisplayTagDialog', 'Start HTML'))
self.tagTableWidget.horizontalHeaderItem(3).setText(
- translate('OpenLP.DisplayTagDialog', 'End Html'))
+ translate('OpenLP.DisplayTagDialog', 'End HTML'))
self.tagTableWidget.setColumnWidth(0, 120)
self.tagTableWidget.setColumnWidth(1, 40)
self.tagTableWidget.setColumnWidth(2, 240)
diff --git a/openlp/core/ui/firsttimeform.py b/openlp/core/ui/firsttimeform.py
new file mode 100644
index 000000000..b049e2ea7
--- /dev/null
+++ b/openlp/core/ui/firsttimeform.py
@@ -0,0 +1,288 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
+# Tibble, Carsten Tinggaard, Frode Woldsund #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it #
+# under the terms of the GNU General Public License as published by the Free #
+# Software Foundation; version 2 of the License. #
+# #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for #
+# more details. #
+# #
+# You should have received a copy of the GNU General Public License along #
+# with this program; if not, write to the Free Software Foundation, Inc., 59 #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+###############################################################################
+
+import io
+import logging
+import os
+import urllib
+from tempfile import gettempdir
+from ConfigParser import SafeConfigParser
+
+from PyQt4 import QtCore, QtGui
+
+from openlp.core.lib import translate, PluginStatus, check_directory_exists, \
+ Receiver, build_icon
+from openlp.core.utils import get_web_page, AppLocation
+from firsttimewizard import Ui_FirstTimeWizard, FirstTimePage
+
+log = logging.getLogger(__name__)
+
+class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
+ """
+ This is the Theme Import Wizard, which allows easy creation and editing of
+ OpenLP themes.
+ """
+ log.info(u'ThemeWizardForm loaded')
+
+ def __init__(self, screens, parent=None):
+ QtGui.QWizard.__init__(self, parent)
+ self.setupUi(self)
+ # check to see if we have web access
+ self.web = u'http://openlp.org/files/frw/'
+ self.config = SafeConfigParser()
+ self.webAccess = get_web_page(u'%s%s' % (self.web, u'download.cfg'))
+ if self.webAccess:
+ files = self.webAccess.read()
+ self.config.readfp(io.BytesIO(files))
+ self.displayComboBox.addItems(screens.get_screen_list())
+ self.downloading = unicode(translate('OpenLP.FirstTimeWizard',
+ 'Downloading %s...'))
+ QtCore.QObject.connect(self,
+ QtCore.SIGNAL(u'currentIdChanged(int)'),
+ self.onCurrentIdChanged)
+
+ def exec_(self, edit=False):
+ """
+ Run the wizard.
+ """
+ self.setDefaults()
+ return QtGui.QWizard.exec_(self)
+
+ def setDefaults(self):
+ """
+ Set up display at start of theme edit.
+ """
+ self.restart()
+ # Sort out internet access for downloads
+ if self.webAccess:
+ songs = self.config.get(u'songs', u'languages')
+ songs = songs.split(u',')
+ for song in songs:
+ title = unicode(self.config.get(
+ u'songs_%s' % song, u'title'), u'utf8')
+ filename = unicode(self.config.get(
+ u'songs_%s' % song, u'filename'), u'utf8')
+ item = QtGui.QListWidgetItem(title, self.songsListWidget)
+ item.setData(QtCore.Qt.UserRole, QtCore.QVariant(filename))
+ item.setCheckState(QtCore.Qt.Unchecked)
+ item.setFlags(item.flags() | QtCore.Qt.ItemIsUserCheckable)
+ bible_languages = self.config.get(u'bibles', u'languages')
+ bible_languages = bible_languages.split(u',')
+ for lang in bible_languages:
+ language = unicode(self.config.get(
+ u'bibles_%s' % lang, u'title'), u'utf8')
+ langItem = QtGui.QTreeWidgetItem(
+ self.biblesTreeWidget, QtCore.QStringList(language))
+ bibles = self.config.get(u'bibles_%s' % lang, u'translations')
+ bibles = bibles.split(u',')
+ for bible in bibles:
+ title = unicode(self.config.get(
+ u'bible_%s' % bible, u'title'), u'utf8')
+ filename = unicode(self.config.get(
+ u'bible_%s' % bible, u'filename'))
+ item = QtGui.QTreeWidgetItem(
+ langItem, QtCore.QStringList(title))
+ item.setData(0, QtCore.Qt.UserRole, QtCore.QVariant(filename))
+ item.setCheckState(0, QtCore.Qt.Unchecked)
+ item.setFlags(item.flags() | QtCore.Qt.ItemIsUserCheckable)
+ self.biblesTreeWidget.expandAll()
+ themes = self.config.get(u'themes', u'files')
+ themes = themes.split(u',')
+ for theme in themes:
+ title = self.config.get(u'theme_%s' % theme, u'title')
+ filename = self.config.get(u'theme_%s' % theme, u'filename')
+ screenshot = self.config.get(u'theme_%s' % theme, u'screenshot')
+ urllib.urlretrieve(u'%s/%s' % (self.web, screenshot),
+ os.path.join(gettempdir(), screenshot))
+ item = QtGui.QListWidgetItem(title, self.themesListWidget)
+ item.setData(QtCore.Qt.UserRole,
+ QtCore.QVariant(filename))
+ item.setIcon(build_icon(
+ os.path.join(gettempdir(), screenshot)))
+ item.setCheckState(QtCore.Qt.Unchecked)
+ item.setFlags(item.flags() | QtCore.Qt.ItemIsUserCheckable)
+
+ def nextId(self):
+ """
+ Determine the next page in the Wizard to go to.
+ """
+ if self.currentId() == FirstTimePage.Plugins:
+ if not self.webAccess:
+ return FirstTimePage.NoInternet
+ else:
+ return FirstTimePage.Songs
+ elif self.currentId() == FirstTimePage.Progress:
+ return -1
+ else:
+ return self.currentId() + 1
+
+ def onCurrentIdChanged(self, pageId):
+ """
+ Detects Page changes and updates as approprate.
+ """
+ if pageId == FirstTimePage.NoInternet:
+ self.finishButton.setVisible(True)
+ self.finishButton.setEnabled(True)
+ self.nextButton.setVisible(False)
+ elif pageId == FirstTimePage.Defaults:
+ self.themeComboBox.clear()
+ for iter in xrange(self.themesListWidget.count()):
+ item = self.themesListWidget.item(iter)
+ if item.checkState() == QtCore.Qt.Checked:
+ self.themeComboBox.addItem(item.text())
+ elif pageId == FirstTimePage.Progress:
+ self._preWizard()
+ self._performWizard()
+ self._postWizard()
+
+ def _incrementProgressBar(self, status_text, increment=1):
+ """
+ Update the wizard progress page.
+
+ ``status_text``
+ Current status information to display.
+
+ ``increment``
+ The value to increment the progress bar by.
+ """
+ if status_text:
+ self.progressLabel.setText(status_text)
+ if increment > 0:
+ self.progressBar.setValue(self.progressBar.value() + increment)
+ Receiver.send_message(u'openlp_process_events')
+
+ def _preWizard(self):
+ """
+ Prepare the UI for the process.
+ """
+ # We start on 2 for plugins status setting plus a "finished" point.
+ max_progress = 2
+ # Loop through the songs list and increase for each selected item
+ for i in xrange(self.songsListWidget.count()):
+ if self.songsListWidget.item(i).checkState() == QtCore.Qt.Checked:
+ max_progress += 1
+ # Loop through the Bibles list and increase for each selected item
+ iterator = QtGui.QTreeWidgetItemIterator(self.biblesTreeWidget)
+ while iterator.value():
+ item = iterator.value()
+ if item.parent() and item.checkState(0) == QtCore.Qt.Checked:
+ max_progress += 1
+ iterator += 1
+ # Loop through the themes list and increase for each selected item
+ for i in xrange(self.themesListWidget.count()):
+ if self.themesListWidget.item(i).checkState() == QtCore.Qt.Checked:
+ max_progress += 1
+ self.finishButton.setVisible(False)
+ self.progressBar.setValue(0)
+ self.progressBar.setMinimum(0)
+ self.progressBar.setMaximum(max_progress)
+
+ def _postWizard(self):
+ """
+ Clean up the UI after the process has finished.
+ """
+ self.progressBar.setValue(self.progressBar.maximum())
+ self.finishButton.setVisible(True)
+ self.finishButton.setEnabled(True)
+ self.cancelButton.setVisible(False)
+ self.nextButton.setVisible(False)
+ self.progressLabel.setText(translate('OpenLP.FirstTimeWizard',
+ 'Download complete. Click the finish button to start OpenLP.'))
+ Receiver.send_message(u'openlp_process_events')
+
+ def _performWizard(self):
+ """
+ Run the tasks in the wizard.
+ """
+ # Set plugin states
+ self._incrementProgressBar(translate('OpenLP.FirstTimeWizard',
+ 'Enabling selected plugins...'))
+ self._setPluginStatus(self.songsCheckBox, u'songs/status')
+ self._setPluginStatus(self.bibleCheckBox, u'bibles/status')
+ self._setPluginStatus(self.presentationCheckBox, u'presentations/status')
+ self._setPluginStatus(self.imageCheckBox, u'images/status')
+ self._setPluginStatus(self.mediaCheckBox, u'media/status')
+ self._setPluginStatus(self.remoteCheckBox, u'remotes/status')
+ self._setPluginStatus(self.customCheckBox, u'custom/status')
+ self._setPluginStatus(self.songUsageCheckBox, u'songusage/status')
+ self._setPluginStatus(self.alertCheckBox, u'alerts/status')
+ # Build directories for downloads
+ songs_destination = AppLocation.get_section_data_path(u'songs')
+ bibles_destination = AppLocation.get_section_data_path(u'bibles')
+ themes_destination = AppLocation.get_section_data_path(u'themes')
+ # Install songs
+ for i in xrange(self.songsListWidget.count()):
+ item = self.songsListWidget.item(i)
+ if item.checkState() == QtCore.Qt.Checked:
+ filename = item.data(QtCore.Qt.UserRole).toString()
+ self._incrementProgressBar(self.downloading % filename)
+ destination = os.path.join(songs_destination, u'songs.sqlite')
+ if os.path.exists(destination):
+ if QtGui.QMessageBox.question(self,
+ translate('OpenLP.FirstTimeWizard',
+ 'Overwrite Existing Songs?'),
+ translate('OpenLP.FirstTimeWizard', 'Your songs '
+ 'database already exists and your current songs will '
+ 'be permanently lost, are you sure you want to '
+ 'replace it ?'),
+ QtGui.QMessageBox.Yes | QtGui.QMessageBox.No,
+ QtGui.QMessageBox.No) != QtGui.QMessageBox.Yes:
+ continue
+ urllib.urlretrieve(u'%s%s' % (self.web, filename), destination)
+ # Install Bibles
+ bibles_iterator = QtGui.QTreeWidgetItemIterator(self.biblesTreeWidget)
+ while bibles_iterator.value():
+ item = bibles_iterator.value()
+ if item.parent() and item.checkState(0) == QtCore.Qt.Checked:
+ bible = unicode(item.data(0, QtCore.Qt.UserRole).toString())
+ self._incrementProgressBar(self.downloading % bible)
+ urllib.urlretrieve(u'%s%s' % (self.web, bible),
+ os.path.join(bibles_destination, bible))
+ bibles_iterator += 1
+ # Install themes
+ for i in xrange(self.themesListWidget.count()):
+ item = self.themesListWidget.item(i)
+ if item.checkState() == QtCore.Qt.Checked:
+ theme = unicode(item.data(QtCore.Qt.UserRole).toString())
+ self._incrementProgressBar(self.downloading % theme)
+ urllib.urlretrieve(u'%s%s' % (self.web, theme),
+ os.path.join(themes_destination, theme))
+ # Set Default Display
+ if self.displayComboBox.currentIndex() != -1:
+ QtCore.QSettings().setValue(u'General/monitor',
+ QtCore.QVariant(self.displayComboBox.currentIndex()))
+ # Set Global Theme
+ if self.themeComboBox.currentIndex() != -1:
+ QtCore.QSettings().setValue(u'themes/global theme',
+ QtCore.QVariant(self.themeComboBox.currentText()))
+ QtCore.QSettings().setValue(u'general/has run wizard',
+ QtCore.QVariant(True))
+
+ def _setPluginStatus(self, field, tag):
+ status = PluginStatus.Active if field.checkState() \
+ == QtCore.Qt.Checked else PluginStatus.Inactive
+ QtCore.QSettings().setValue(tag, QtCore.QVariant(status))
+
diff --git a/openlp/core/ui/firsttimelanguagedialog.py b/openlp/core/ui/firsttimelanguagedialog.py
new file mode 100644
index 000000000..ae44abeb5
--- /dev/null
+++ b/openlp/core/ui/firsttimelanguagedialog.py
@@ -0,0 +1,66 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
+# Tibble, Carsten Tinggaard, Frode Woldsund #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it #
+# under the terms of the GNU General Public License as published by the Free #
+# Software Foundation; version 2 of the License. #
+# #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for #
+# more details. #
+# #
+# You should have received a copy of the GNU General Public License along #
+# with this program; if not, write to the Free Software Foundation, Inc., 59 #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+###############################################################################
+
+from PyQt4 import QtCore, QtGui
+
+from openlp.core.lib import translate
+from openlp.core.lib.ui import create_accept_reject_button_box
+
+class Ui_FirstTimeLanguageDialog(object):
+ def setupUi(self, languageDialog):
+ languageDialog.setObjectName(u'languageDialog')
+ languageDialog.resize(300, 50)
+ self.dialogLayout = QtGui.QVBoxLayout(languageDialog)
+ self.dialogLayout.setContentsMargins(8, 8, 8, 8)
+ self.dialogLayout.setSpacing(8)
+ self.dialogLayout.setObjectName(u'dialogLayout')
+ self.infoLabel = QtGui.QLabel(languageDialog)
+ self.infoLabel.setObjectName(u'infoLabel')
+ self.dialogLayout.addWidget(self.infoLabel)
+ self.languageLayout = QtGui.QHBoxLayout()
+ self.languageLayout.setObjectName(u'languageLayout')
+ self.languageLabel = QtGui.QLabel(languageDialog)
+ self.languageLabel.setObjectName(u'languageLabel')
+ self.languageLayout.addWidget(self.languageLabel)
+ self.languageComboBox = QtGui.QComboBox(languageDialog)
+ self.languageComboBox.setSizeAdjustPolicy(QtGui.QComboBox.AdjustToContents)
+ self.languageComboBox.setObjectName("languageComboBox")
+ self.languageLayout.addWidget(self.languageComboBox)
+ self.dialogLayout.addLayout(self.languageLayout)
+ self.buttonBox = create_accept_reject_button_box(languageDialog, True)
+ self.dialogLayout.addWidget(self.buttonBox)
+
+ self.retranslateUi(languageDialog)
+ self.setMaximumHeight(self.sizeHint().height())
+ QtCore.QMetaObject.connectSlotsByName(languageDialog)
+
+ def retranslateUi(self, languageDialog):
+ self.setWindowTitle(translate('OpenLP.FirstTimeLanguageForm',
+ 'Select Translation'))
+ self.infoLabel.setText(translate('OpenLP.FirstTimeLanguageForm',
+ 'Choose the translation you\'d like to use in OpenLP.'))
+ self.languageLabel.setText(translate('OpenLP.FirstTimeLanguageForm',
+ 'Translation:'))
diff --git a/openlp/core/ui/firsttimelanguageform.py b/openlp/core/ui/firsttimelanguageform.py
new file mode 100644
index 000000000..a8ce3bd57
--- /dev/null
+++ b/openlp/core/ui/firsttimelanguageform.py
@@ -0,0 +1,66 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
+# Tibble, Carsten Tinggaard, Frode Woldsund #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it #
+# under the terms of the GNU General Public License as published by the Free #
+# Software Foundation; version 2 of the License. #
+# #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for #
+# more details. #
+# #
+# You should have received a copy of the GNU General Public License along #
+# with this program; if not, write to the Free Software Foundation, Inc., 59 #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+###############################################################################
+
+from PyQt4 import QtGui
+
+from openlp.core.lib import translate
+from openlp.core.utils import LanguageManager
+from firsttimelanguagedialog import Ui_FirstTimeLanguageDialog
+
+class FirstTimeLanguageForm(QtGui.QDialog, Ui_FirstTimeLanguageDialog):
+ """
+ The exception dialog
+ """
+ def __init__(self, parent=None):
+ QtGui.QDialog.__init__(self, parent)
+ self.setupUi(self)
+ self.qmList = LanguageManager.get_qm_list()
+ self.languageComboBox.addItem(u'Autodetect')
+ for key in sorted(self.qmList.keys()):
+ self.languageComboBox.addItem(key)
+
+ def exec_(self):
+ """
+ Run the Dialog with correct heading.
+ """
+ return QtGui.QDialog.exec_(self)
+
+ def accept(self):
+ # It's the first row so must be Automatic
+ if self.languageComboBox.currentIndex() == 0:
+ LanguageManager.auto_language = True
+ LanguageManager.set_language(False, False)
+ else:
+ LanguageManager.auto_language = False
+ action = QtGui.QAction(None)
+ action.setObjectName(unicode(self.languageComboBox.currentText()))
+ LanguageManager.set_language(action, False)
+ return QtGui.QDialog.accept(self)
+
+ def reject(self):
+ LanguageManager.auto_language = True
+ LanguageManager.set_language(False, False)
+ return QtGui.QDialog.reject(self)
diff --git a/openlp/core/ui/firsttimewizard.py b/openlp/core/ui/firsttimewizard.py
new file mode 100644
index 000000000..9a8d2515e
--- /dev/null
+++ b/openlp/core/ui/firsttimewizard.py
@@ -0,0 +1,261 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
+
+###############################################################################
+# OpenLP - Open Source Lyrics Projection #
+# --------------------------------------------------------------------------- #
+# Copyright (c) 2008-2011 Raoul Snyman #
+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael #
+# Gorven, Scott Guerrieri, Meinert Jordan, Armin Köhler, Andreas Preikschat, #
+# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon #
+# Tibble, Carsten Tinggaard, Frode Woldsund #
+# --------------------------------------------------------------------------- #
+# This program is free software; you can redistribute it and/or modify it #
+# under the terms of the GNU General Public License as published by the Free #
+# Software Foundation; version 2 of the License. #
+# #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or #
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for #
+# more details. #
+# #
+# You should have received a copy of the GNU General Public License along #
+# with this program; if not, write to the Free Software Foundation, Inc., 59 #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+###############################################################################
+
+from PyQt4 import QtCore, QtGui
+
+from openlp.core.lib import translate
+from openlp.core.lib.ui import add_welcome_page
+
+class FirstTimePage(object):
+ Welcome = 0
+ Plugins = 1
+ NoInternet = 2
+ Songs = 3
+ Bibles = 4
+ Themes = 5
+ Defaults = 6
+ Progress = 7
+
+
+class Ui_FirstTimeWizard(object):
+ def setupUi(self, FirstTimeWizard):
+ FirstTimeWizard.setObjectName(u'FirstTimeWizard')
+ FirstTimeWizard.resize(550, 386)
+ FirstTimeWizard.setModal(True)
+ FirstTimeWizard.setWizardStyle(QtGui.QWizard.ModernStyle)
+ FirstTimeWizard.setOptions(QtGui.QWizard.IndependentPages|
+ QtGui.QWizard.NoBackButtonOnStartPage |
+ QtGui.QWizard.NoBackButtonOnLastPage)
+ self.finishButton = self.button(QtGui.QWizard.FinishButton)
+ self.cancelButton = self.button(QtGui.QWizard.CancelButton)
+ self.nextButton = self.button(QtGui.QWizard.NextButton)
+ self.backButton = self.button(QtGui.QWizard.BackButton)
+ add_welcome_page(FirstTimeWizard, u':/wizards/wizard_firsttime.bmp')
+ # The plugins page
+ self.pluginPage = QtGui.QWizardPage()
+ self.pluginPage.setObjectName(u'pluginPage')
+ self.pluginLayout = QtGui.QVBoxLayout(self.pluginPage)
+ self.pluginLayout.setContentsMargins(40, 15, 40, 0)
+ self.pluginLayout.setObjectName(u'pluginLayout')
+ self.songsCheckBox = QtGui.QCheckBox(self.pluginPage)
+ self.songsCheckBox.setChecked(True)
+ self.songsCheckBox.setObjectName(u'songsCheckBox')
+ self.pluginLayout.addWidget(self.songsCheckBox)
+ self.customCheckBox = QtGui.QCheckBox(self.pluginPage)
+ self.customCheckBox.setChecked(True)
+ self.customCheckBox.setObjectName(u'customCheckBox')
+ self.pluginLayout.addWidget(self.customCheckBox)
+ self.bibleCheckBox = QtGui.QCheckBox(self.pluginPage)
+ self.bibleCheckBox.setChecked(True)
+ self.bibleCheckBox.setObjectName(u'bibleCheckBox')
+ self.pluginLayout.addWidget(self.bibleCheckBox)
+ self.imageCheckBox = QtGui.QCheckBox(self.pluginPage)
+ self.imageCheckBox.setChecked(True)
+ self.imageCheckBox.setObjectName(u'imageCheckBox')
+ self.pluginLayout.addWidget(self.imageCheckBox)
+ self.presentationCheckBox = QtGui.QCheckBox(self.pluginPage)
+ self.presentationCheckBox.setChecked(True)
+ self.presentationCheckBox.setObjectName(u'presentationCheckBox')
+ self.pluginLayout.addWidget(self.presentationCheckBox)
+ self.mediaCheckBox = QtGui.QCheckBox(self.pluginPage)
+ self.mediaCheckBox.setChecked(True)
+ self.mediaCheckBox.setObjectName(u'mediaCheckBox')
+ self.pluginLayout.addWidget(self.mediaCheckBox)
+ self.remoteCheckBox = QtGui.QCheckBox(self.pluginPage)
+ self.remoteCheckBox.setObjectName(u'remoteCheckBox')
+ self.pluginLayout.addWidget(self.remoteCheckBox)
+ self.songUsageCheckBox = QtGui.QCheckBox(self.pluginPage)
+ self.songUsageCheckBox.setChecked(True)
+ self.songUsageCheckBox.setObjectName(u'songUsageCheckBox')
+ self.pluginLayout.addWidget(self.songUsageCheckBox)
+ self.alertCheckBox = QtGui.QCheckBox(self.pluginPage)
+ self.alertCheckBox.setChecked(True)
+ self.alertCheckBox.setObjectName(u'alertCheckBox')
+ self.pluginLayout.addWidget(self.alertCheckBox)
+ FirstTimeWizard.setPage(FirstTimePage.Plugins, self.pluginPage)
+ # The "you don't have an internet connection" page.
+ self.noInternetPage = QtGui.QWizardPage()
+ self.noInternetPage.setObjectName(u'noInternetPage')
+ self.noInternetLayout = QtGui.QVBoxLayout(self.noInternetPage)
+ self.noInternetLayout.setContentsMargins(50, 30, 50, 40)
+ self.noInternetLayout.setObjectName(u'noInternetLayout')
+ self.noInternetLabel = QtGui.QLabel(self.noInternetPage)
+ self.noInternetLabel.setWordWrap(True)
+ self.noInternetLabel.setObjectName(u'noInternetLabel')
+ self.noInternetLayout.addWidget(self.noInternetLabel)
+ FirstTimeWizard.setPage(FirstTimePage.NoInternet, self.noInternetPage)
+ # The song samples page
+ self.songsPage = QtGui.QWizardPage()
+ self.songsPage.setObjectName(u'songsPage')
+ self.songsLayout = QtGui.QVBoxLayout(self.songsPage)
+ self.songsLayout.setContentsMargins(50, 20, 50, 20)
+ self.songsLayout.setObjectName(u'songsLayout')
+ self.songsListWidget = QtGui.QListWidget(self.songsPage)
+ self.songsListWidget.setAlternatingRowColors(True)
+ self.songsListWidget.setObjectName(u'songsListWidget')
+ self.songsLayout.addWidget(self.songsListWidget)
+ FirstTimeWizard.setPage(FirstTimePage.Songs, self.songsPage)
+ # The Bible samples page
+ self.biblesPage = QtGui.QWizardPage()
+ self.biblesPage.setObjectName(u'biblesPage')
+ self.biblesLayout = QtGui.QVBoxLayout(self.biblesPage)
+ self.biblesLayout.setContentsMargins(50, 20, 50, 20)
+ self.biblesLayout.setObjectName(u'biblesLayout')
+ self.biblesTreeWidget = QtGui.QTreeWidget(self.biblesPage)
+ self.biblesTreeWidget.setAlternatingRowColors(True)
+ self.biblesTreeWidget.header().setVisible(False)
+ self.biblesTreeWidget.setObjectName(u'biblesTreeWidget')
+ self.biblesLayout.addWidget(self.biblesTreeWidget)
+ FirstTimeWizard.setPage(FirstTimePage.Bibles, self.biblesPage)
+ # The theme samples page
+ self.themesPage = QtGui.QWizardPage()
+ self.themesPage.setObjectName(u'themesPage')
+ self.themesLayout = QtGui.QVBoxLayout(self.themesPage)
+ self.themesLayout.setContentsMargins(20, 50, 20, 60)
+ self.themesLayout.setObjectName(u'themesLayout')
+ self.themesListWidget = QtGui.QListWidget(self.themesPage)
+ self.themesListWidget.setViewMode(QtGui.QListView.IconMode)
+ self.themesListWidget.setMovement(QtGui.QListView.Static)
+ self.themesListWidget.setFlow(QtGui.QListView.LeftToRight)
+ self.themesListWidget.setSpacing(4)
+ self.themesListWidget.setUniformItemSizes(True)
+ self.themesListWidget.setIconSize(QtCore.QSize(133, 100))
+ self.themesListWidget.setWrapping(False)
+ self.themesListWidget.setObjectName(u'themesListWidget')
+ self.themesLayout.addWidget(self.themesListWidget)
+ FirstTimeWizard.setPage(FirstTimePage.Themes, self.themesPage)
+ # the default settings page
+ self.defaultsPage = QtGui.QWizardPage()
+ self.defaultsPage.setObjectName(u'defaultsPage')
+ self.defaultsLayout = QtGui.QFormLayout(self.defaultsPage)
+ self.defaultsLayout.setContentsMargins(50, 20, 50, 20)
+ self.defaultsLayout.setObjectName(u'defaultsLayout')
+ self.displayLabel = QtGui.QLabel(self.defaultsPage)
+ self.displayLabel.setObjectName(u'displayLabel')
+ self.displayComboBox = QtGui.QComboBox(self.defaultsPage)
+ self.displayComboBox.setEditable(False)
+ self.displayComboBox.setInsertPolicy(QtGui.QComboBox.NoInsert)
+ self.displayComboBox.setSizeAdjustPolicy(
+ QtGui.QComboBox.AdjustToContents)
+ self.displayComboBox.setObjectName(u'displayComboBox')
+ self.defaultsLayout.addRow(self.displayLabel, self.displayComboBox)
+ self.themeLabel = QtGui.QLabel(self.defaultsPage)
+ self.themeLabel.setObjectName(u'themeLabel')
+ self.themeComboBox = QtGui.QComboBox(self.defaultsPage)
+ self.themeComboBox.setEditable(False)
+ self.themeComboBox.setInsertPolicy(QtGui.QComboBox.NoInsert)
+ self.themeComboBox.setSizeAdjustPolicy(
+ QtGui.QComboBox.AdjustToContents)
+ self.themeComboBox.setObjectName(u'themeComboBox')
+ self.defaultsLayout.addRow(self.themeLabel, self.themeComboBox)
+ FirstTimeWizard.setPage(FirstTimePage.Defaults, self.defaultsPage)
+ # Progress page
+ self.progressPage = QtGui.QWizardPage()
+ self.progressPage.setObjectName(u'progressPage')
+ self.progressLayout = QtGui.QVBoxLayout(self.progressPage)
+ self.progressLayout.setMargin(48)
+ self.progressLayout.setObjectName(u'progressLayout')
+ self.progressLabel = QtGui.QLabel(self.progressPage)
+ self.progressLabel.setObjectName(u'progressLabel')
+ self.progressLayout.addWidget(self.progressLabel)
+ self.progressBar = QtGui.QProgressBar(self.progressPage)
+ self.progressBar.setObjectName(u'progressBar')
+ self.progressLayout.addWidget(self.progressBar)
+ FirstTimeWizard.setPage(FirstTimePage.Progress, self.progressPage)
+
+ self.retranslateUi(FirstTimeWizard)
+ QtCore.QMetaObject.connectSlotsByName(FirstTimeWizard)
+
+ def retranslateUi(self, FirstTimeWizard):
+ FirstTimeWizard.setWindowTitle(translate(
+ 'OpenLP.FirstTimeWizard', 'First Time Wizard'))
+ self.titleLabel.setText(
+ u'%s' % \
+ translate('OpenLP.FirstTimeWizard',
+ 'Welcome to the First Time Wizard'))
+ self.informationLabel.setText(translate('OpenLP.FirstTimeWizard',
+ 'This wizard will help you to configure OpenLP for initial use.'
+ ' Click the next button below to start the process of selection '
+ 'your initial options. '))
+ self.pluginPage.setTitle(translate('OpenLP.FirstTimeWizard',
+ 'Activate required Plugins'))
+ self.pluginPage.setSubTitle(translate('OpenLP.FirstTimeWizard',
+ 'Select the Plugins you wish to use. '))
+ self.songsCheckBox.setText(translate('OpenLP.FirstTimeWizard', 'Songs'))
+ self.customCheckBox.setText(translate('OpenLP.FirstTimeWizard',
+ 'Custom Text'))
+ self.bibleCheckBox.setText(translate('OpenLP.FirstTimeWizard', 'Bible'))
+ self.imageCheckBox.setText(translate('OpenLP.FirstTimeWizard',
+ 'Images'))
+ self.presentationCheckBox.setText(translate('OpenLP.FirstTimeWizard',
+ 'Presentations'))
+ self.mediaCheckBox.setText(translate('OpenLP.FirstTimeWizard',
+ 'Media (Audio and Video)'))
+ self.remoteCheckBox.setText(translate('OpenLP.FirstTimeWizard',
+ 'Allow remote access'))
+ self.songUsageCheckBox.setText(translate('OpenLP.FirstTimeWizard',
+ 'Monitor Song Usage'))
+ self.alertCheckBox.setText(translate('OpenLP.FirstTimeWizard',
+ 'Allow Alerts'))
+ self.noInternetPage.setTitle(translate('OpenLP.FirstTimeWizard',
+ 'No Internet Connection'))
+ self.noInternetPage.setSubTitle(translate(
+ 'OpenLP.FirstTimeWizard',
+ 'Unable to detect an Internet connection.'))
+ self.noInternetLabel.setText(translate('OpenLP.FirstTimeWizard',
+ 'No Internet connection was found. The First Time Wizard needs an '
+ 'Internet connection in order to be able to download sample '
+ 'songs, Bibles and themes.\n\nTo re-run the First Time Wizard and '
+ 'import this sample data at a later stage, press the cancel '
+ 'button now, check your Internet connection, and restart OpenLP.'
+ '\n\nTo cancel the First Time Wizard completely, press the finish '
+ 'button now.'))
+ self.songsPage.setTitle(translate('OpenLP.FirstTimeWizard',
+ 'Sample Songs'))
+ self.songsPage.setSubTitle(translate('OpenLP.FirstTimeWizard',
+ 'Select and download public domain songs.'))
+ self.biblesPage.setTitle(translate('OpenLP.FirstTimeWizard',
+ 'Sample Bibles'))
+ self.biblesPage.setSubTitle(translate('OpenLP.FirstTimeWizard',
+ 'Select and download free Bibles.'))
+ self.themesPage.setTitle(translate('OpenLP.FirstTimeWizard',
+ 'Sample Themes'))
+ self.themesPage.setSubTitle(translate('OpenLP.FirstTimeWizard',
+ 'Select and download sample themes.'))
+ self.defaultsPage.setTitle(translate('OpenLP.FirstTimeWizard',
+ 'Default Settings'))
+ self.defaultsPage.setSubTitle(translate('OpenLP.FirstTimeWizard',
+ 'Set up default settings to be used by OpenLP.'))
+ self.progressPage.setTitle(translate('OpenLP.FirstTimeWizard',
+ 'Setting Up And Importing'))
+ self.progressPage.setSubTitle(translate('OpenLP.FirstTimeWizard',
+ 'Please wait while OpenLP is set up and your data is imported.'))
+ self.displayLabel.setText(translate('OpenLP.FirstTimeWizard',
+ 'Default output display:'))
+ self.themeLabel.setText(translate('OpenLP.FirstTimeWizard',
+ 'Select default theme:'))
+ self.progressLabel.setText(translate('OpenLP.FirstTimeWizard',
+ 'Starting configuration process...'))
diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py
index f8bd99b81..72ebe422a 100644
--- a/openlp/core/ui/maindisplay.py
+++ b/openlp/core/ui/maindisplay.py
@@ -90,8 +90,8 @@ class MainDisplay(DisplayWidget):
"""
Set up and build the output screen
"""
- log.debug(u'Setup live = %s for monitor %s ' % (self.isLive,
- self.screens.monitor_number))
+ log.debug(u'Start setup for monitor %s (live = %s)' %
+ (self.screens.monitor_number, self.isLive))
self.usePhonon = QtCore.QSettings().value(
u'media/use phonon', QtCore.QVariant(True)).toBool()
self.phononActive = False
@@ -102,6 +102,7 @@ class MainDisplay(DisplayWidget):
self.videoWidget.setVisible(False)
self.videoWidget.setGeometry(QtCore.QRect(0, 0,
self.screen[u'size'].width(), self.screen[u'size'].height()))
+ log.debug(u'Setup Phonon for monitor %s' % self.screens.monitor_number)
self.mediaObject = Phonon.MediaObject(self)
self.audio = Phonon.AudioOutput(Phonon.VideoCategory, self.mediaObject)
Phonon.createPath(self.mediaObject, self.videoWidget)
@@ -109,6 +110,7 @@ class MainDisplay(DisplayWidget):
QtCore.QObject.connect(self.mediaObject,
QtCore.SIGNAL(u'stateChanged(Phonon::State, Phonon::State)'),
self.videoStart)
+ log.debug(u'Setup webView for monitor %s' % self.screens.monitor_number)
self.webView = QtWebKit.QWebView(self)
self.webView.setGeometry(0, 0,
self.screen[u'size'].width(), self.screen[u'size'].height())
@@ -165,6 +167,8 @@ class MainDisplay(DisplayWidget):
self.primary = False
else:
self.primary = True
+ log.debug(
+ u'Finished setup for monitor %s' % self.screens.monitor_number)
def text(self, slide):
"""
@@ -245,7 +249,8 @@ class MainDisplay(DisplayWidget):
js = u'show_image("");'
self.frame.evaluateJavaScript(js)
# Update the preview frame.
- Receiver.send_message(u'maindisplay_active')
+ if self.isLive:
+ Receiver.send_message(u'maindisplay_active')
def resetImage(self):
"""
@@ -259,7 +264,8 @@ class MainDisplay(DisplayWidget):
self.displayImage(None)
self.override = {}
# Update the preview frame.
- Receiver.send_message(u'maindisplay_active')
+ if self.isLive:
+ Receiver.send_message(u'maindisplay_active')
def resetVideo(self):
"""
@@ -276,7 +282,8 @@ class MainDisplay(DisplayWidget):
self.frame.evaluateJavaScript(u'show_video("close");')
self.override = {}
# Update the preview frame.
- Receiver.send_message(u'maindisplay_active')
+ if self.isLive:
+ Receiver.send_message(u'maindisplay_active')
def videoPlay(self):
"""
@@ -347,7 +354,8 @@ class MainDisplay(DisplayWidget):
self.videoWidget.setVisible(True)
self.audio.setVolume(vol)
# Update the preview frame.
- Receiver.send_message(u'maindisplay_active')
+ if self.isLive:
+ Receiver.send_message(u'maindisplay_active')
return self.preview()
def videoStart(self, newState, oldState):
@@ -481,7 +489,8 @@ class MainDisplay(DisplayWidget):
self.videoPlay()
self.hideMode = None
# Trigger actions when display is active again
- Receiver.send_message(u'maindisplay_active')
+ if self.isLive:
+ Receiver.send_message(u'maindisplay_active')
def __hideMouse(self):
# Hide mouse cursor when moved over display if enabled in settings
@@ -507,9 +516,6 @@ class AudioPlayer(QtCore.QObject):
``parent``
The parent widget.
-
- ``screens``
- The list of screens.
"""
log.debug(u'AudioPlayer Initialisation started')
QtCore.QObject.__init__(self, parent)
diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index 2e87f186e..cb324a872 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -232,7 +232,7 @@ class Ui_MainWindow(object):
self.LanguageGroup = QtGui.QActionGroup(mainWindow)
self.LanguageGroup.setExclusive(True)
self.LanguageGroup.setObjectName(u'LanguageGroup')
- self.LanguageGroup.setDisabled(LanguageManager.auto_language)
+ add_actions(self.LanguageGroup, [self.AutoLanguageItem])
qmList = LanguageManager.get_qm_list()
savedLanguage = LanguageManager.get_language()
for key in sorted(qmList.keys()):
@@ -425,14 +425,14 @@ class Ui_MainWindow(object):
translate('OpenLP.MainWindow', '&Online Help'))
self.helpWebSiteItem.setText(
translate('OpenLP.MainWindow', '&Web Site'))
- self.AutoLanguageItem.setText(
- translate('OpenLP.MainWindow', '&Auto Detect'))
- self.AutoLanguageItem.setStatusTip(translate('OpenLP.MainWindow',
- 'Use the system language, if available.'))
for item in self.LanguageGroup.actions():
item.setText(item.objectName())
item.setStatusTip(unicode(translate('OpenLP.MainWindow',
'Set the interface language to %s')) % item.objectName())
+ self.AutoLanguageItem.setText(
+ translate('OpenLP.MainWindow', '&Autodetect'))
+ self.AutoLanguageItem.setStatusTip(translate('OpenLP.MainWindow',
+ 'Use the system language, if available.'))
self.ToolsAddToolItem.setText(
translate('OpenLP.MainWindow', 'Add &Tool...'))
self.ToolsAddToolItem.setStatusTip(translate('OpenLP.MainWindow',
@@ -461,7 +461,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
actionList = ActionList()
- def __init__(self, screens, applicationVersion, clipboard):
+ def __init__(self, screens, applicationVersion, clipboard, firstTime):
"""
This constructor sets up the interface, the various managers, and the
plugins.
@@ -550,8 +550,6 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
QtCore.SIGNAL(u'triggered()'),
self.ServiceManagerContents.printServiceOrder)
# i18n set signals for languages
- QtCore.QObject.connect(self.AutoLanguageItem,
- QtCore.SIGNAL(u'toggled(bool)'), self.setAutoLanguage)
self.LanguageGroup.triggered.connect(LanguageManager.set_language)
QtCore.QObject.connect(self.ModeDefaultItem,
QtCore.SIGNAL(u'triggered()'), self.onModeDefaultItemClicked)
@@ -626,6 +624,10 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
self.MediaToolBox.setCurrentIndex(savedPlugin)
self.settingsForm.postSetUp()
Receiver.send_message(u'cursor_normal')
+ # Import themes if first time
+ if firstTime:
+ self.themeManagerContents.firstTime()
+
def setAutoLanguage(self, value):
self.LanguageGroup.setDisabled(value)
diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py
index 3cdf25c7a..fa2bc50f5 100644
--- a/openlp/core/ui/servicemanager.py
+++ b/openlp/core/ui/servicemanager.py
@@ -415,47 +415,75 @@ class ServiceManager(QtGui.QWidget):
"""
if not self.fileName():
return self.saveFileAs()
- else:
- fileName = self.fileName()
- log.debug(u'ServiceManager.saveFile - %s' % fileName)
- SettingsManager.set_last_dir(self.mainwindow.serviceSettingsSection,
- split_filename(fileName)[0])
- service = []
- serviceFileName = fileName.replace(u'.osz', u'.osd')
- zip = None
- file = None
- try:
- write_list = []
- zip = zipfile.ZipFile(unicode(fileName), 'w')
- for item in self.serviceItems:
- service.append({u'serviceitem': \
- item[u'service_item'].get_service_repr()})
- if item[u'service_item'].uses_file():
- for frame in item[u'service_item'].get_frames():
- if item[u'service_item'].is_image():
- path_from = frame[u'path']
- else:
- path_from = unicode(os.path.join(
- frame[u'path'],
- frame[u'title']))
- # On write a file once
- if not path_from in write_list:
- write_list.append(path_from)
- zip.write(path_from.encode(u'utf-8'))
- file = open(serviceFileName, u'wb')
- cPickle.dump(service, file)
- file.close()
- zip.write(serviceFileName.encode(u'utf-8'))
- except IOError:
- log.exception(u'Failed to save service to disk')
- finally:
- if file:
- file.close()
- if zip:
- zip.close()
- delete_file(serviceFileName)
- self.mainwindow.addRecentFile(fileName)
- self.setModified(False)
+ path_file_name = unicode(self.fileName())
+ (path, file_name) = os.path.split(path_file_name)
+ (basename, extension) = os.path.splitext(file_name)
+ service_file_name = basename + '.osd'
+ log.debug(u'ServiceManager.saveFile - %s' % path_file_name)
+ SettingsManager.set_last_dir(self.mainwindow.serviceSettingsSection,
+ path)
+ service = []
+ write_list = []
+ total_size = 0
+ for item in self.serviceItems:
+ service.append({u'serviceitem':
+ item[u'service_item'].get_service_repr()})
+ if not item[u'service_item'].uses_file():
+ continue
+ for frame in item[u'service_item'].get_frames():
+ if item[u'service_item'].is_image():
+ path_from = frame[u'path']
+ else:
+ path_from = os.path.join(frame[u'path'], frame[u'title'])
+ # Only write a file once
+ if path_from in write_list:
+ continue
+ file_size = os.path.getsize(path_from)
+ size_limit = 52428800 # 50MiB
+ #if file_size > size_limit:
+ # # File exeeds size_limit bytes, ask user
+ # message = unicode(translate('OpenLP.ServiceManager',
+ # 'Do you want to include \n%.1f MB file "%s"\n'
+ # 'into the service file?\nThis may take some time.\n\n'
+ # 'Please note that you need to\ntake care of that file'
+ # ' yourself,\nif you leave it out.')) % \
+ # (file_size/1048576, os.path.split(path_from)[1])
+ # ans = QtGui.QMessageBox.question(self.mainwindow,
+ # translate('OpenLP.ServiceManager', 'Including Large '
+ # 'File'), message, QtGui.QMessageBox.StandardButtons(
+ # QtGui.QMessageBox.Ok|QtGui.QMessageBox.Cancel),
+ # QtGui.QMessageBox.Ok)
+ # if ans == QtGui.QMessageBox.Cancel:
+ # continue
+ write_list.append(path_from)
+ total_size += file_size
+ log.debug(u'ServiceManager.saveFile - ZIP contents size is %i bytes' %
+ total_size)
+ service_content = cPickle.dumps(service)
+ # Usual Zip file cannot exceed 2GiB, file with Zip64 cannot be
+ # extracted using unzip in UNIX.
+ allow_zip_64 = (total_size > 2147483648 + len(service_content))
+ log.debug(u'ServiceManager.saveFile - allowZip64 is %s' %
+ allow_zip_64)
+ zip = None
+ try:
+ zip = zipfile.ZipFile(path_file_name, 'w', zipfile.ZIP_STORED,
+ allow_zip_64)
+ # First we add service contents.
+ # We save ALL filenames into ZIP using UTF-8.
+ zip.writestr(service_file_name.encode(u'utf-8'),
+ service_content)
+ # Finally add all the listed media files.
+ for path_from in write_list:
+ zip.write(path_from, path_from.encode(u'utf-8'))
+ except IOError:
+ log.exception(u'Failed to save service to disk')
+ return False
+ finally:
+ if zip:
+ zip.close()
+ self.mainwindow.addRecentFile(path_file_name)
+ self.setModified(False)
return True
def saveFileAs(self):
diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py
index 0caa83e72..c81b987b4 100644
--- a/openlp/core/ui/slidecontroller.py
+++ b/openlp/core/ui/slidecontroller.py
@@ -162,7 +162,7 @@ class SlideController(QtGui.QWidget):
self.themeScreen.setText(
translate('OpenLP.SlideController', 'Blank to Theme'))
self.desktopScreen = icon_action(self.hideMenu, u'Desktop Screen',
- u':/slides/slide_desktop.png', False)
+ u':/slides/slide_desktop.png', False)
self.desktopScreen.setText(
translate('OpenLP.SlideController', 'Show Desktop'))
self.hideMenu.setDefaultAction(self.blankScreen)
diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py
index 0e04d7b46..407d0cfa8 100644
--- a/openlp/core/ui/thememanager.py
+++ b/openlp/core/ui/thememanager.py
@@ -145,6 +145,20 @@ class ThemeManager(QtGui.QWidget):
# Last little bits of setting up
self.configUpdated()
+ def firstTime(self):
+ """
+ Import new themes downloaded by the first time wizard
+ """
+ Receiver.send_message(u'cursor_busy')
+ encoding = get_filesystem_encoding()
+ files = SettingsManager.get_files(self.settingsSection, u'.otz')
+ for file in files:
+ file = os.path.join(self.path, file).encode(encoding)
+ self.unzipTheme(file, self.path)
+ delete_file(file)
+ self.loadThemes()
+ Receiver.send_message(u'cursor_normal')
+
def configUpdated(self, firstTime=False):
"""
Triggered when Config dialog is updated.
@@ -370,6 +384,7 @@ class ThemeManager(QtGui.QWidget):
'Save Theme - (%s)')) % theme,
SettingsManager.get_last_dir(self.settingsSection, 1))
path = unicode(path)
+ Receiver.send_message(u'cursor_busy')
if path:
SettingsManager.set_last_dir(self.settingsSection, path, 1)
themePath = os.path.join(path, theme + u'.otz')
@@ -395,6 +410,7 @@ class ThemeManager(QtGui.QWidget):
finally:
if zip:
zip.close()
+ Receiver.send_message(u'cursor_normal')
def onImportTheme(self):
"""
@@ -408,12 +424,14 @@ class ThemeManager(QtGui.QWidget):
unicode(translate('OpenLP.ThemeManager',
'OpenLP Themes (*.theme *.otz)')))
log.info(u'New Themes %s', unicode(files))
+ Receiver.send_message(u'cursor_busy')
if files:
for file in files:
SettingsManager.set_last_dir(
self.settingsSection, unicode(file))
self.unzipTheme(file, self.path)
self.loadThemes()
+ Receiver.send_message(u'cursor_normal')
def loadThemes(self):
"""
diff --git a/openlp/core/utils/__init__.py b/openlp/core/utils/__init__.py
index 70b994653..381712977 100644
--- a/openlp/core/utils/__init__.py
+++ b/openlp/core/utils/__init__.py
@@ -35,6 +35,7 @@ import urllib2
from datetime import datetime
from PyQt4 import QtGui, QtCore
+
if sys.platform != u'win32' and sys.platform != u'darwin':
try:
from xdg import BaseDirectory
@@ -134,7 +135,7 @@ class AppLocation(object):
elif dir_type == AppLocation.LanguageDir:
app_path = _get_frozen_path(
os.path.abspath(os.path.split(sys.argv[0])[0]),
- os.path.split(openlp.__file__)[0])
+ _get_os_dir_path(dir_type))
return os.path.join(app_path, u'i18n')
else:
return _get_os_dir_path(dir_type)
@@ -169,15 +170,21 @@ def _get_os_dir_path(dir_type):
if dir_type == AppLocation.DataDir:
return os.path.join(unicode(os.getenv(u'APPDATA'), encoding),
u'openlp', u'data')
+ elif dir_type == AppLocation.LanguageDir:
+ return os.path.split(openlp.__file__)[0]
return os.path.join(unicode(os.getenv(u'APPDATA'), encoding),
u'openlp')
elif sys.platform == u'darwin':
if dir_type == AppLocation.DataDir:
return os.path.join(unicode(os.getenv(u'HOME'), encoding),
u'Library', u'Application Support', u'openlp', u'Data')
+ elif dir_type == AppLocation.LanguageDir:
+ return os.path.split(openlp.__file__)[0]
return os.path.join(unicode(os.getenv(u'HOME'), encoding),
u'Library', u'Application Support', u'openlp')
else:
+ if dir_type == AppLocation.LanguageDir:
+ return os.path.join(u'/usr', u'share', u'openlp')
if XDG_BASE_AVAILABLE:
if dir_type == AppLocation.ConfigDir:
return os.path.join(unicode(BaseDirectory.xdg_config_home,
@@ -337,6 +344,7 @@ def get_web_page(url, header=None, update_openlp=False):
return None
if update_openlp:
Receiver.send_message(u'openlp_process_events')
+ log.debug(page)
return page
def file_is_unicode(filename):
diff --git a/openlp/core/utils/languagemanager.py b/openlp/core/utils/languagemanager.py
index ced2fa843..8e5ab1f54 100644
--- a/openlp/core/utils/languagemanager.py
+++ b/openlp/core/utils/languagemanager.py
@@ -63,6 +63,8 @@ class LanguageManager(object):
"""
Find all available language files in this OpenLP install
"""
+ log.debug(u'Translation files: %s', AppLocation.get_directory(
+ AppLocation.LanguageDir))
trans_dir = QtCore.QDir(AppLocation.get_directory(
AppLocation.LanguageDir))
file_names = trans_dir.entryList(QtCore.QStringList(u'*.qm'),
@@ -100,27 +102,37 @@ class LanguageManager(object):
return language
@staticmethod
- def set_language(action):
+ def set_language(action, message=True):
"""
Set the language to translate OpenLP into
``action``
The language menu option
+
+ ``message``
+ Display the message option
"""
language = u'en'
if action:
- action_name = u'%s' % action.objectName()
- qm_list = LanguageManager.get_qm_list()
- language = u'%s' % qm_list[action_name]
+ action_name = unicode(action.objectName())
+ if action_name == u'AutoLanguageItem':
+ LanguageManager.auto_language = True
+ else:
+ LanguageManager.auto_language = False
+ qm_list = LanguageManager.get_qm_list()
+ language = unicode(qm_list[action_name])
if LanguageManager.auto_language:
language = u'[%s]' % language
- QtCore.QSettings().setValue(
+ # This needs to be here for the setValue to work
+ settings = QtCore.QSettings(u'OpenLP', u'OpenLP')
+ settings.setValue(
u'general/language', QtCore.QVariant(language))
log.info(u'Language file: \'%s\' written to conf file' % language)
- QtGui.QMessageBox.information(None,
- translate('OpenLP.LanguageManager', 'Language'),
- translate('OpenLP.LanguageManager',
- 'Please restart OpenLP to use your new language setting.'))
+ if message:
+ QtGui.QMessageBox.information(None,
+ translate('OpenLP.LanguageManager', 'Language'),
+ translate('OpenLP.LanguageManager',
+ 'Please restart OpenLP to use your new language setting.'))
@staticmethod
def init_qm_list():
diff --git a/openlp/plugins/alerts/alertsplugin.py b/openlp/plugins/alerts/alertsplugin.py
index 1d9bd4c61..256e78916 100644
--- a/openlp/plugins/alerts/alertsplugin.py
+++ b/openlp/plugins/alerts/alertsplugin.py
@@ -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.4', plugin_helpers,
+ Plugin.__init__(self, u'Alerts', plugin_helpers,
settingsTabClass=AlertsTab)
self.weight = -3
self.icon = build_icon(u':/plugins/plugin_alerts.png')
diff --git a/openlp/plugins/bibles/bibleplugin.py b/openlp/plugins/bibles/bibleplugin.py
index 73a9b7e1d..61bca84aa 100644
--- a/openlp/plugins/bibles/bibleplugin.py
+++ b/openlp/plugins/bibles/bibleplugin.py
@@ -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.4', plugin_helpers,
+ Plugin.__init__(self, u'Bibles', plugin_helpers,
BibleMediaItem, BiblesTab)
self.weight = -9
self.icon_path = u':/plugins/plugin_bibles.png'
diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py
index 690564182..2b2f6597e 100644
--- a/openlp/plugins/bibles/lib/mediaitem.py
+++ b/openlp/plugins/bibles/lib/mediaitem.py
@@ -449,8 +449,7 @@ class BibleMediaItem(MediaManagerItem):
if restore:
old_text = unicode(combo.currentText())
combo.clear()
- for i in range(range_from, range_to + 1):
- combo.addItem(unicode(i))
+ combo.addItems([unicode(i) for i in range(range_from, range_to + 1)])
if restore and combo.findText(old_text) != -1:
combo.setCurrentIndex(combo.findText(old_text))
@@ -704,8 +703,7 @@ class BibleMediaItem(MediaManagerItem):
service_item.theme = None
else:
service_item.theme = self.settings.bible_theme
- for slide in raw_slides:
- service_item.add_from_text(slide[:30], slide)
+ [service_item.add_from_text(slide[:30], slide) for slide in raw_slides]
return True
def formatTitle(self, start_item, old_item):
@@ -744,8 +742,7 @@ class BibleMediaItem(MediaManagerItem):
else:
verse_range = start_chapter + verse_separator + start_verse + \
range_separator + old_chapter + verse_separator + old_verse
- title = u'%s %s (%s)' % (start_book, verse_range, bibles)
- return title
+ return u'%s %s (%s)' % (start_book, verse_range, bibles)
def checkTitle(self, item, old_item):
"""
diff --git a/openlp/plugins/custom/customplugin.py b/openlp/plugins/custom/customplugin.py
index c6c129e68..79064b53c 100644
--- a/openlp/plugins/custom/customplugin.py
+++ b/openlp/plugins/custom/customplugin.py
@@ -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.4', plugin_helpers,
+ Plugin.__init__(self, u'Custom', plugin_helpers,
CustomMediaItem, CustomTab)
self.weight = -5
self.manager = Manager(u'custom', init_schema)
diff --git a/openlp/plugins/images/imageplugin.py b/openlp/plugins/images/imageplugin.py
index 84d7a71cc..ae7f56e1d 100644
--- a/openlp/plugins/images/imageplugin.py
+++ b/openlp/plugins/images/imageplugin.py
@@ -35,8 +35,7 @@ class ImagePlugin(Plugin):
log.info(u'Image Plugin loaded')
def __init__(self, plugin_helpers):
- Plugin.__init__(self, u'Images', u'1.9.4', plugin_helpers,
- ImageMediaItem)
+ Plugin.__init__(self, u'Images', plugin_helpers, ImageMediaItem)
self.weight = -7
self.icon_path = u':/plugins/plugin_images.png'
self.icon = build_icon(self.icon_path)
diff --git a/openlp/plugins/media/mediaplugin.py b/openlp/plugins/media/mediaplugin.py
index 3438f0279..06936cd44 100644
--- a/openlp/plugins/media/mediaplugin.py
+++ b/openlp/plugins/media/mediaplugin.py
@@ -38,13 +38,25 @@ class MediaPlugin(Plugin):
log.info(u'%s MediaPlugin loaded', __name__)
def __init__(self, plugin_helpers):
- Plugin.__init__(self, u'Media', u'1.9.4', plugin_helpers,
+ Plugin.__init__(self, u'Media', plugin_helpers,
MediaMediaItem, MediaTab)
self.weight = -6
self.icon_path = u':/plugins/plugin_media.png'
self.icon = build_icon(self.icon_path)
# passed with drag and drop messages
self.dnd_id = u'Media'
+ self.additional_extensions = {
+ u'audio/ac3': [u'.ac3'],
+ u'audio/flac': [u'.flac'],
+ u'audio/x-m4a': [u'.m4a'],
+ u'audio/x-mp3': [u'.mp3'],
+ u'audio/mpeg': [u'.mp3', u'.mp2', u'.mpga', u'.mpega', u'.m4a'],
+ u'audio/qcelp': [u'.qcp'],
+ u'audio/x-wma': [u'.wma'],
+ u'audio/x-ms-wma': [u'.wma'],
+ u'video/x-matroska': [u'.mpv', u'.mkv'],
+ u'video/x-wmv': [u'.wmv'],
+ u'video/x-ms-wmv': [u'.wmv']}
self.audio_extensions_list = []
self.video_extensions_list = []
mimetypes.init()
@@ -65,6 +77,17 @@ class MediaPlugin(Plugin):
self.serviceManager.supportedSuffixes(extension[1:])
log.info(u'MediaPlugin: %s extensions: %s' % (mimetype,
u' '.join(extensions)))
+ # Add extensions for this mimetype from self.additional_extensions.
+ # This hack clears mimetypes' and operating system's shortcomings
+ # by providing possibly missing extensions.
+ if mimetype in self.additional_extensions.keys():
+ for extension in self.additional_extensions[mimetype]:
+ ext = u'*%s' % extension
+ if ext not in list:
+ list.append(ext)
+ self.serviceManager.supportedSuffixes(extension[1:])
+ log.info(u'MediaPlugin: %s additional extensions: %s' % (mimetype,
+ u' '.join(self.additional_extensions[mimetype])))
def about(self):
about_text = translate('MediaPlugin', 'Media Plugin'
diff --git a/openlp/plugins/presentations/presentationplugin.py b/openlp/plugins/presentations/presentationplugin.py
index eb7e714f0..f45901e43 100644
--- a/openlp/plugins/presentations/presentationplugin.py
+++ b/openlp/plugins/presentations/presentationplugin.py
@@ -51,7 +51,7 @@ class PresentationPlugin(Plugin):
"""
log.debug(u'Initialised')
self.controllers = {}
- Plugin.__init__(self, u'Presentations', u'1.9.4', plugin_helpers)
+ Plugin.__init__(self, u'Presentations', plugin_helpers)
self.weight = -8
self.icon_path = u':/plugins/plugin_presentations.png'
self.icon = build_icon(self.icon_path)
diff --git a/openlp/plugins/remotes/remoteplugin.py b/openlp/plugins/remotes/remoteplugin.py
index 7236d7546..0ed0ec099 100644
--- a/openlp/plugins/remotes/remoteplugin.py
+++ b/openlp/plugins/remotes/remoteplugin.py
@@ -38,7 +38,7 @@ class RemotesPlugin(Plugin):
"""
remotes constructor
"""
- Plugin.__init__(self, u'Remotes', u'1.9.4', plugin_helpers,
+ Plugin.__init__(self, u'Remotes', plugin_helpers,
settingsTabClass=RemoteTab)
self.icon = build_icon(u':/plugins/plugin_remote.png')
self.weight = -1
diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py
index 0e874c3d5..0d9121c45 100644
--- a/openlp/plugins/songs/forms/editsongform.py
+++ b/openlp/plugins/songs/forms/editsongform.py
@@ -810,4 +810,4 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
# This method must only be run after the self.song = Song() assignment.
log.debug(u'processTitle')
self.song.search_title = re.sub(r'[\'"`,;:(){}?]+', u'',
- unicode(self.song.search_title)).lower()
+ unicode(self.song.search_title)).lower().strip()
diff --git a/openlp/plugins/songs/lib/db.py b/openlp/plugins/songs/lib/db.py
index a6255476a..b72517f70 100644
--- a/openlp/plugins/songs/lib/db.py
+++ b/openlp/plugins/songs/lib/db.py
@@ -256,7 +256,7 @@ def init_schema(url):
mapper(Song, songs_table,
properties={
'authors': relation(Author, backref='songs',
- secondary=authors_songs_table),
+ secondary=authors_songs_table, lazy=False),
'book': relation(Book, backref='songs'),
'media_files': relation(MediaFile, backref='songs',
secondary=media_files_songs_table),
diff --git a/openlp/plugins/songs/lib/foilpresenterimport.py b/openlp/plugins/songs/lib/foilpresenterimport.py
index 0d81e6f41..a26d1c05a 100644
--- a/openlp/plugins/songs/lib/foilpresenterimport.py
+++ b/openlp/plugins/songs/lib/foilpresenterimport.py
@@ -540,7 +540,7 @@ class FoilPresenter(object):
song.alternate_title = self._child(titelstring)
song.search_title += u'@' + song.alternate_title
song.search_title = re.sub(r'[\'"`,;:(){}?]+', u'',
- unicode(song.search_title)).lower()
+ unicode(song.search_title)).lower().strip()
def _process_topics(self, foilpresenterfolie, song):
"""
diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py
index 37a404daa..feabc98b7 100644
--- a/openlp/plugins/songs/lib/mediaitem.py
+++ b/openlp/plugins/songs/lib/mediaitem.py
@@ -159,15 +159,15 @@ class SongMediaItem(MediaManagerItem):
def onSearchTextButtonClick(self):
search_keywords = unicode(self.searchTextEdit.displayText())
search_results = []
- # search_type = self.searchTypeComboBox.currentIndex()
search_type = self.searchTextEdit.currentSearchType()
if search_type == SongSearch.Entire:
log.debug(u'Entire Song Search')
search_results = self.parent.manager.get_all_objects(Song,
or_(Song.search_title.like(u'%' + self.whitespace.sub(u' ',
search_keywords.lower()) + u'%'),
- Song.search_lyrics.like(u'%' + search_keywords.lower() + \
- u'%')), Song.search_title.asc())
+ Song.search_lyrics.like(u'%' + search_keywords.lower() + u'%'),
+ Song.comments.like(u'%' + search_keywords.lower() + u'%')),
+ Song.search_title.asc())
self.displayResultsSong(search_results)
elif search_type == SongSearch.Titles:
log.debug(u'Titles Search')
@@ -198,7 +198,7 @@ class SongMediaItem(MediaManagerItem):
Handle the exit from the edit dialog and trigger remote updates
of songs
"""
- log.debug(u'onSongListLoad')
+ log.debug(u'onSongListLoad - start')
# Called to redisplay the song list screen edit from a search
# or from the exit of the Song edit dialog. If remote editing is active
# Trigger it and clean up so it will not update again.
@@ -213,6 +213,7 @@ class SongMediaItem(MediaManagerItem):
self.parent.serviceManager.replaceServiceItem(item)
self.onRemoteEditClear()
self.onSearchTextButtonClick()
+ log.debug(u'onSongListLoad - finished')
def displayResultsSong(self, searchresults):
log.debug(u'display results Song')
@@ -252,11 +253,13 @@ class SongMediaItem(MediaManagerItem):
if self.searchAsYouType:
search_length = 1
if self.searchTextEdit.currentSearchType() == SongSearch.Entire:
- search_length = 3
+ search_length = 4
elif self.searchTextEdit.currentSearchType() == SongSearch.Lyrics:
- search_length = 7
+ search_length = 3
if len(text) > search_length:
self.onSearchTextButtonClick()
+ elif len(text) == 0:
+ self.onClearTextButtonClick()
def onImportClick(self):
if not hasattr(self, u'import_wizard'):
@@ -307,6 +310,7 @@ class SongMediaItem(MediaManagerItem):
item_id = (self.editItem.data(QtCore.Qt.UserRole)).toInt()[0]
self.edit_song_form.loadSong(item_id, False)
self.edit_song_form.exec_()
+ self.editItem = None
def onDeleteClick(self):
"""
@@ -445,10 +449,9 @@ class SongMediaItem(MediaManagerItem):
add_song = False
editId = song.id
break
- if add_song:
- if self.addSongFromService:
- editId = self.openLyrics.xml_to_song(item.xml_version)
- self.onSearchTextButtonClick()
+ if add_song and self.addSongFromService:
+ editId = self.openLyrics.xml_to_song(item.xml_version)
+ self.onSearchTextButtonClick()
# Update service with correct song id.
if editId:
Receiver.send_message(u'service_item_update',
diff --git a/openlp/plugins/songs/lib/olpimport.py b/openlp/plugins/songs/lib/olpimport.py
index fe010b501..11170f9a0 100644
--- a/openlp/plugins/songs/lib/olpimport.py
+++ b/openlp/plugins/songs/lib/olpimport.py
@@ -167,7 +167,7 @@ class OpenLPSongImport(SongImport):
new_song.alternate_title = old_titles[1]
else:
new_song.alternate_title = u''
- new_song.search_title = song.search_title
+ new_song.search_title = song.search_title.strip()
new_song.song_number = song.song_number
new_song.lyrics = song.lyrics
new_song.search_lyrics = song.search_lyrics
diff --git a/openlp/plugins/songs/lib/oooimport.py b/openlp/plugins/songs/lib/oooimport.py
index 22e36b716..e9db0ac3e 100644
--- a/openlp/plugins/songs/lib/oooimport.py
+++ b/openlp/plugins/songs/lib/oooimport.py
@@ -96,7 +96,7 @@ class OooImport(SongImport):
"""
if os.name == u'nt':
self.start_ooo_process()
- self.desktop = self.manager.createInstance(
+ self.desktop = self.ooo_manager.createInstance(
u'com.sun.star.frame.Desktop')
else:
context = uno.getComponentContext()
@@ -118,9 +118,9 @@ class OooImport(SongImport):
def start_ooo_process(self):
try:
if os.name == u'nt':
- self.manager = Dispatch(u'com.sun.star.ServiceManager')
- self.manager._FlagAsMethod(u'Bridge_GetStruct')
- self.manager._FlagAsMethod(u'Bridge_GetValueObject')
+ self.ooo_manager = Dispatch(u'com.sun.star.ServiceManager')
+ self.ooo_manager._FlagAsMethod(u'Bridge_GetStruct')
+ self.ooo_manager._FlagAsMethod(u'Bridge_GetValueObject')
else:
cmd = get_uno_command()
process = QtCore.QProcess()
@@ -134,9 +134,11 @@ class OooImport(SongImport):
"""
Open the passed file in OpenOffice.org Impress
"""
+ self.filepath = filepath
if os.name == u'nt':
- url = u'file:///' + filepath.replace(u'\\', u'/')
+ url = filepath.replace(u'\\', u'/')
url = url.replace(u':', u'|').replace(u' ', u'%20')
+ url = u'file:///' + url
else:
url = uno.systemPathToFileUrl(filepath)
properties = []
@@ -190,10 +192,7 @@ class OooImport(SongImport):
if slidetext.strip() == u'':
slidetext = u'\f'
text += slidetext
- song = SongImport(self.manager)
- songs = SongImport.process_songs_text(self.manager, text)
- for song in songs:
- song.finish()
+ self.process_songs_text(text)
return
def process_doc(self):
@@ -215,6 +214,16 @@ class OooImport(SongImport):
if textportion.BreakType in (PAGE_AFTER, PAGE_BOTH):
paratext += u'\f'
text += paratext + u'\n'
- songs = SongImport.process_songs_text(self.manager, text)
- for song in songs:
- song.finish()
+ self.process_songs_text(text)
+
+ def process_songs_text(self, text):
+ songtexts = self.tidy_text(text).split(u'\f')
+ self.set_defaults()
+ for songtext in songtexts:
+ if songtext.strip():
+ self.process_song_text(songtext.strip())
+ if self.check_complete():
+ self.finish()
+ self.set_defaults()
+ if self.check_complete():
+ self.finish()
diff --git a/openlp/plugins/songs/lib/openlyricsexport.py b/openlp/plugins/songs/lib/openlyricsexport.py
index c2b58980b..42410a7e0 100644
--- a/openlp/plugins/songs/lib/openlyricsexport.py
+++ b/openlp/plugins/songs/lib/openlyricsexport.py
@@ -29,10 +29,11 @@ songs from the database to the OpenLyrics format.
"""
import logging
import os
+import re
from lxml import etree
-from openlp.core.lib import Receiver, translate
+from openlp.core.lib import check_directory_exists, Receiver, translate
from openlp.plugins.songs.lib import OpenLyrics
log = logging.getLogger(__name__)
@@ -50,8 +51,7 @@ class OpenLyricsExport(object):
self.manager = parent.plugin.manager
self.songs = songs
self.save_path = save_path
- if not os.path.exists(self.save_path):
- os.mkdir(self.save_path)
+ check_directory_exists(self.save_path)
def do_export(self):
"""
@@ -69,6 +69,10 @@ class OpenLyricsExport(object):
song.title)
xml = openLyrics.song_to_xml(song)
tree = etree.ElementTree(etree.fromstring(xml))
- tree.write(os.path.join(self.save_path, song.title + u'.xml'),
+ filename = u'%s (%s).xml' % (song.title,
+ u', '.join([author.display_name for author in song.authors]))
+ filename = re.sub(
+ r'[/\\?*|<>\[\]":<>+%]+', u'_', filename).strip(u'_')
+ tree.write(os.path.join(self.save_path, filename),
encoding=u'utf-8', xml_declaration=True, pretty_print=True)
return True
diff --git a/openlp/plugins/songs/lib/sofimport.py b/openlp/plugins/songs/lib/sofimport.py
index 711761114..49adcd302 100644
--- a/openlp/plugins/songs/lib/sofimport.py
+++ b/openlp/plugins/songs/lib/sofimport.py
@@ -72,6 +72,7 @@ class SofImport(OooImport):
to SongImport for writing song to disk
"""
OooImport.__init__(self, manager, **kwargs)
+ self.song = False
def process_ooo_document(self):
"""
@@ -94,8 +95,8 @@ class SofImport(OooImport):
if paragraph.supportsService("com.sun.star.text.Paragraph"):
self.process_paragraph(paragraph)
if self.song:
- self.song.finish()
- self.song = None
+ self.finish()
+ self.song = False
def process_paragraph(self, paragraph):
"""
@@ -143,7 +144,7 @@ class SofImport(OooImport):
self.blanklines += 1
if self.blanklines > 1:
return
- if self.song.title != u'':
+ if self.title != u'':
self.finish_verse()
return
self.blanklines = 0
@@ -161,17 +162,17 @@ class SofImport(OooImport):
self.skip_to_close_bracket = True
return
if text.startswith(u'Copyright'):
- self.song.add_copyright(text)
+ self.add_copyright(text)
return
if text == u'(Repeat)':
self.finish_verse()
- self.song.repeat_verse()
+ self.repeat_verse()
return
- if self.song.title == u'':
- if self.song.copyright == u'':
- self.add_author(text)
+ if self.title == u'':
+ if self.copyright == u'':
+ self.add_sof_author(text)
else:
- self.song.add_copyright(text)
+ self.add_copyright(text)
return
self.add_verse_line(text)
@@ -183,15 +184,15 @@ class SofImport(OooImport):
into line
"""
text = textportion.getString()
- text = SongImport.tidy_text(text)
+ text = self.tidy_text(text)
if text.strip() == u'':
return text
if textportion.CharWeight == BOLD:
boldtext = text.strip()
- if boldtext.isdigit() and self.song.song_number == '':
+ if boldtext.isdigit() and self.song_number == '':
self.add_songnumber(boldtext)
return u''
- if self.song.title == u'':
+ if self.title == u'':
text = self.uncap_text(text)
self.add_title(text)
return text
@@ -207,10 +208,11 @@ class SofImport(OooImport):
"""
if self.song:
self.finish_verse()
- if not self.song.check_complete():
+ if not self.check_complete():
return
- self.song.finish()
- self.song = SongImport(self.manager)
+ self.finish()
+ self.song = True
+ self.set_defaults()
self.skip_to_close_bracket = False
self.is_chorus = False
self.italics = False
@@ -221,17 +223,17 @@ class SofImport(OooImport):
Add a song number, store as alternate title. Also use the song
number to work out which songbook we're in
"""
- self.song.song_number = song_no
- self.song.alternate_title = song_no + u'.'
- self.song.song_book_pub = u'Kingsway Publications'
+ self.song_number = song_no
+ self.alternate_title = song_no + u'.'
+ self.song_book_pub = u'Kingsway Publications'
if int(song_no) <= 640:
- self.song.song_book = u'Songs of Fellowship 1'
+ self.song_book = u'Songs of Fellowship 1'
elif int(song_no) <= 1150:
- self.song.song_book = u'Songs of Fellowship 2'
+ self.song_book = u'Songs of Fellowship 2'
elif int(song_no) <= 1690:
- self.song.song_book = u'Songs of Fellowship 3'
+ self.song_book = u'Songs of Fellowship 3'
else:
- self.song.song_book = u'Songs of Fellowship 4'
+ self.song_book = u'Songs of Fellowship 4'
def add_title(self, text):
"""
@@ -243,10 +245,10 @@ class SofImport(OooImport):
title = title[1:]
if title.endswith(u','):
title = title[:-1]
- self.song.title = title
+ self.title = title
self.import_wizard.incrementProgressBar(u'Processing song ' + title, 0)
- def add_author(self, text):
+ def add_sof_author(self, text):
"""
Add the author. OpenLP stores them individually so split by 'and', '&'
and comma.
@@ -254,7 +256,7 @@ class SofImport(OooImport):
"Mr Smith" and "Mrs Smith".
"""
text = text.replace(u' and ', u' & ')
- self.song.parse_author(text)
+ self.parse_author(text)
def add_verse_line(self, text):
"""
@@ -262,7 +264,7 @@ class SofImport(OooImport):
we're beyond the second line of first verse, then this indicates
a change of verse. Italics are a chorus
"""
- if self.italics != self.is_chorus and ((len(self.song.verses) > 0) or
+ if self.italics != self.is_chorus and ((len(self.verses) > 0) or
(self.currentverse.count(u'\n') > 1)):
self.finish_verse()
if self.italics:
@@ -282,14 +284,14 @@ class SofImport(OooImport):
splitat = None
else:
versetag = u'V'
- splitat = self.verse_splits(self.song.song_number)
+ splitat = self.verse_splits(self.song_number)
if splitat:
ln = 0
verse = u''
for line in self.currentverse.split(u'\n'):
ln += 1
if line == u'' or ln > splitat:
- self.song.add_verse(verse, versetag)
+ self.add_sof_verse(verse, versetag)
ln = 0
if line:
verse = line + u'\n'
@@ -298,12 +300,18 @@ class SofImport(OooImport):
else:
verse += line + u'\n'
if verse:
- self.song.add_verse(verse, versetag)
+ self.add_sof_verse(verse, versetag)
else:
- self.song.add_verse(self.currentverse, versetag)
+ self.add_sof_verse(self.currentverse, versetag)
self.currentverse = u''
self.is_chorus = False
+ def add_sof_verse(self, lyrics, tag):
+ self.add_verse(lyrics, tag)
+ if not self.is_chorus and u'C1' in self.verse_order_list_generated:
+ self.verse_order_list_generated.append(u'C1')
+ self.verse_order_list_generated_useful = True
+
def uncap_text(self, text):
"""
Words in the title are in all capitals, so we lowercase them.
diff --git a/openlp/plugins/songs/lib/songimport.py b/openlp/plugins/songs/lib/songimport.py
index 5bfba9b77..3bc1a082f 100644
--- a/openlp/plugins/songs/lib/songimport.py
+++ b/openlp/plugins/songs/lib/songimport.py
@@ -103,23 +103,7 @@ class SongImport(QtCore.QObject):
def register(self, import_wizard):
self.import_wizard = import_wizard
- @staticmethod
- def process_songs_text(manager, text):
- songs = []
- songtexts = SongImport.tidy_text(text).split(u'\f')
- song = SongImport(manager)
- for songtext in songtexts:
- if songtext.strip():
- song.process_song_text(songtext.strip())
- if song.check_complete():
- songs.append(song)
- song = SongImport(manager)
- if song.check_complete():
- songs.append(song)
- return songs
-
- @staticmethod
- def tidy_text(text):
+ def tidy_text(self, text):
"""
Get rid of some dodgy unicode and formatting characters we're not
interested in. Some can be converted to ascii.
@@ -146,12 +130,12 @@ class SongImport(QtCore.QObject):
def process_verse_text(self, text):
lines = text.split(u'\n')
if text.lower().find(self.copyright_string) >= 0 \
- or text.find(SongStrings.CopyrightSymbol) >= 0:
+ or text.find(unicode(SongStrings.CopyrightSymbol)) >= 0:
copyright_found = False
for line in lines:
if (copyright_found or
line.lower().find(self.copyright_string) >= 0 or
- line.find(SongStrings.CopyrightSymbol) >= 0):
+ line.find(unicode(SongStrings.CopyrightSymbol)) >= 0):
copyright_found = True
self.add_copyright(line)
else:
@@ -240,7 +224,7 @@ class SongImport(QtCore.QObject):
self.verse_counts[verse_def[0]] = int(verse_def[1:])
self.verses.append([verse_def, verse_text.rstrip(), lang])
self.verse_order_list_generated.append(verse_def)
-
+
def repeat_verse(self):
"""
Repeat the previous verse in the verse order
@@ -276,6 +260,7 @@ class SongImport(QtCore.QObject):
song.alternate_title = self.alternate_title
song.search_title = self.remove_punctuation(self.title).lower() \
+ '@' + self.remove_punctuation(self.alternate_title).lower()
+ song.search_title = song.search_title.strip()
song.song_number = self.song_number
song.search_lyrics = u''
verses_changed_to_other = {}
diff --git a/openlp/plugins/songs/lib/xml.py b/openlp/plugins/songs/lib/xml.py
index a2a73ec97..bd22ea4b2 100644
--- a/openlp/plugins/songs/lib/xml.py
+++ b/openlp/plugins/songs/lib/xml.py
@@ -536,7 +536,7 @@ class OpenLyrics(object):
song.alternate_title = self._text(title)
song.search_title += u'@' + song.alternate_title
song.search_title = re.sub(r'[\'"`,;:(){}?]+', u'',
- unicode(song.search_title)).lower()
+ unicode(song.search_title)).lower().strip()
def _process_topics(self, properties, song):
"""
diff --git a/openlp/plugins/songs/songsplugin.py b/openlp/plugins/songs/songsplugin.py
index 0335b3a6e..1e072afdf 100644
--- a/openlp/plugins/songs/songsplugin.py
+++ b/openlp/plugins/songs/songsplugin.py
@@ -53,8 +53,7 @@ class SongsPlugin(Plugin):
"""
Create and set up the Songs plugin.
"""
- Plugin.__init__(self, u'Songs', u'1.9.4', plugin_helpers,
- SongMediaItem, SongsTab)
+ Plugin.__init__(self, u'Songs', plugin_helpers, SongMediaItem, SongsTab)
self.weight = -10
self.manager = Manager(u'songs', init_schema)
self.icon_path = u':/plugins/plugin_songs.png'
@@ -154,7 +153,7 @@ class SongsPlugin(Plugin):
if song.alternate_title is None:
song.alternate_title = u''
song.search_title = self.whitespace.sub(u' ', song.title.lower() +
- u' ' + song.alternate_title.lower())
+ u' ' + song.alternate_title.lower()).strip()
# Remove the "language" attribute from lyrics tag. This is not very
# important, but this keeps the database clean. This can be removed
# when everybody has run the reindex tool once.
diff --git a/openlp/plugins/songusage/forms/songusagedetailform.py b/openlp/plugins/songusage/forms/songusagedetailform.py
index ee37b2a9c..edfee3595 100644
--- a/openlp/plugins/songusage/forms/songusagedetailform.py
+++ b/openlp/plugins/songusage/forms/songusagedetailform.py
@@ -88,6 +88,15 @@ class SongUsageDetailForm(QtGui.QDialog, Ui_SongUsageDetailDialog):
"""
log.debug(u'accept')
path = unicode(self.fileLineEdit.text())
+ if path == u'':
+ Receiver.send_message(u'openlp_error_message', {
+ u'title': translate('SongUsagePlugin.SongUsageDetailForm',
+ 'Output Path Not Selected'),
+ u'message': unicode(translate(
+ 'SongUsagePlugin.SongUsageDetailForm', 'You have not set a '
+ 'valid output location for your song usage report. Please '
+ 'select an existing path on your computer.'))})
+ return
check_directory_exists(path)
filename = unicode(translate('SongUsagePlugin.SongUsageDetailForm',
'usage_detail_%s_%s.txt')) % (
diff --git a/openlp/plugins/songusage/songusageplugin.py b/openlp/plugins/songusage/songusageplugin.py
index e1dc0f1a8..99446dbe4 100644
--- a/openlp/plugins/songusage/songusageplugin.py
+++ b/openlp/plugins/songusage/songusageplugin.py
@@ -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.4', plugin_helpers)
+ Plugin.__init__(self, u'SongUsage', plugin_helpers)
self.weight = -4
self.icon = build_icon(u':/plugins/plugin_songusage.png')
self.manager = None
diff --git a/resources/debian/Makefile b/resources/debian/Makefile
new file mode 100644
index 000000000..1fe02b479
--- /dev/null
+++ b/resources/debian/Makefile
@@ -0,0 +1,17 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+build:
+ mkdir -p resources/i18n/qm
+ for TSFILE in resources/i18n/*.ts; do\
+ lrelease-qt4 $$TSFILE -qm resources/i18n/qm/`basename $$TSFILE .ts`.qm;\
+ done
+
+install:
+ mkdir -p $(DESTDIR)/usr/share/openlp/i18n
+ cd resources/i18n/qm && for QMFILE in*.qm; do\
+ mv $QMFILE $(DESTDIR)/usr/share/openlp/i18n;\
+ done
+
+clean:
+ rm -fR resources/i18n/qm
diff --git a/resources/debian/debian/changelog b/resources/debian/debian/changelog
new file mode 100644
index 000000000..1d22843f1
--- /dev/null
+++ b/resources/debian/debian/changelog
@@ -0,0 +1,389 @@
+openlp (1.9.4+bzr1355-0ubuntu1~natty1) natty; urgency=low
+
+ * Autobuild
+
+ -- Sun, 06 Mar 2011 00:10:03 -0500
+
+openlp (1.9.4+bzr1355-0ubuntu1~maverick1) maverick; urgency=low
+
+ * Autobuild
+
+ -- Sun, 06 Mar 2011 00:07:03 -0500
+
+openlp (1.9.4+bzr1355-0ubuntu1~lucid1) lucid; urgency=low
+
+ * Autobuild
+
+ -- Sun, 06 Mar 2011 00:05:27 -0500
+
+openlp (1.9.4+bzr1355-0ubuntu1~karmic1) karmic; urgency=low
+
+ * Autobuild
+
+ -- Sun, 06 Mar 2011 00:03:17 -0500
+
+openlp (1.9.4+bzr1350-0ubuntu1~natty1) natty; urgency=low
+
+ * Autobuild
+
+ -- Sat, 05 Mar 2011 00:08:15 -0500
+
+openlp (1.9.4+bzr1350-0ubuntu1~maverick1) maverick; urgency=low
+
+ * Autobuild
+
+ -- Sat, 05 Mar 2011 00:06:40 -0500
+
+openlp (1.9.4+bzr1350-0ubuntu1~lucid1) lucid; urgency=low
+
+ * Autobuild
+
+ -- Sat, 05 Mar 2011 00:05:09 -0500
+
+openlp (1.9.4+bzr1350-0ubuntu1~karmic1) karmic; urgency=low
+
+ * Autobuild
+
+ -- Sat, 05 Mar 2011 00:03:14 -0500
+
+openlp (1.9.4+bzr1347-0ubuntu1~natty1) natty; urgency=low
+
+ * Autobuild
+
+ -- Fri, 04 Mar 2011 00:04:49 -0500
+
+openlp (1.9.4+bzr1347-0ubuntu1~maverick1) maverick; urgency=low
+
+ * Autobuild
+
+ -- Fri, 04 Mar 2011 00:04:15 -0500
+
+openlp (1.9.4+bzr1347-0ubuntu1~lucid1) lucid; urgency=low
+
+ * Autobuild
+
+ -- Fri, 04 Mar 2011 00:03:34 -0500
+
+openlp (1.9.4+bzr1347-0ubuntu1~karmic1) karmic; urgency=low
+
+ * Autobuild
+
+ -- Fri, 04 Mar 2011 00:02:43 -0500
+
+openlp (1.9.4+bzr1344-0ubuntu1~natty1) natty; urgency=low
+
+ * Autobuild
+
+ -- Thu, 03 Mar 2011 00:03:56 -0500
+
+openlp (1.9.4+bzr1344-0ubuntu1~maverick1) maverick; urgency=low
+
+ * Autobuild
+
+ -- Thu, 03 Mar 2011 00:03:30 -0500
+
+openlp (1.9.4+bzr1344-0ubuntu1~lucid1) lucid; urgency=low
+
+ * Autobuild
+
+ -- Thu, 03 Mar 2011 00:03:05 -0500
+
+openlp (1.9.4+bzr1344-0ubuntu1~karmic1) karmic; urgency=low
+
+ * Autobuild
+
+ -- Thu, 03 Mar 2011 00:02:26 -0500
+
+openlp (1.9.4+bzr1342-0ubuntu1~natty1) natty; urgency=low
+
+ * Autobuild
+
+ -- Tue, 01 Mar 2011 00:03:44 -0500
+
+openlp (1.9.4+bzr1342-0ubuntu1~maverick1) maverick; urgency=low
+
+ * Autobuild
+
+ -- Tue, 01 Mar 2011 00:03:28 -0500
+
+openlp (1.9.4+bzr1342-0ubuntu1~lucid1) lucid; urgency=low
+
+ * Autobuild
+
+ -- Tue, 01 Mar 2011 00:03:03 -0500
+
+openlp (1.9.4+bzr1342-0ubuntu1~karmic1) karmic; urgency=low
+
+ * Autobuild
+
+ -- Tue, 01 Mar 2011 00:02:28 -0500
+
+openlp (1.9.4+bzr1341-0ubuntu1~natty1) natty; urgency=low
+
+ * Autobuild
+
+ -- Sun, 27 Feb 2011 00:04:05 -0500
+
+openlp (1.9.4+bzr1341-0ubuntu1~maverick1) maverick; urgency=low
+
+ * Autobuild
+
+ -- Sun, 27 Feb 2011 00:03:48 -0500
+
+openlp (1.9.4+bzr1341-0ubuntu1~lucid1) lucid; urgency=low
+
+ * Autobuild
+
+ -- Sun, 27 Feb 2011 00:03:20 -0500
+
+openlp (1.9.4+bzr1341-0ubuntu1~karmic1) karmic; urgency=low
+
+ * Autobuild
+
+ -- Sun, 27 Feb 2011 00:02:34 -0500
+
+openlp (1.9.4+bzr1337-0ubuntu1~natty1) natty; urgency=low
+
+ * Autobuild
+
+ -- Sat, 26 Feb 2011 00:04:02 -0500
+
+openlp (1.9.4+bzr1337-0ubuntu1~maverick1) maverick; urgency=low
+
+ * Autobuild
+
+ -- Sat, 26 Feb 2011 00:03:44 -0500
+
+openlp (1.9.4+bzr1337-0ubuntu1~lucid1) lucid; urgency=low
+
+ * Autobuild
+
+ -- Sat, 26 Feb 2011 00:03:18 -0500
+
+openlp (1.9.4+bzr1337-0ubuntu1~karmic1) karmic; urgency=low
+
+ * Autobuild
+
+ -- Sat, 26 Feb 2011 00:02:32 -0500
+
+openlp (1.9.4+bzr1332-0ubuntu1~natty1) natty; urgency=low
+
+ * Autobuild
+
+ -- Fri, 25 Feb 2011 00:04:00 -0500
+
+openlp (1.9.4+bzr1332-0ubuntu1~maverick1) maverick; urgency=low
+
+ * Autobuild
+
+ -- Fri, 25 Feb 2011 00:03:41 -0500
+
+openlp (1.9.4+bzr1332-0ubuntu1~lucid1) lucid; urgency=low
+
+ * Autobuild
+
+ -- Fri, 25 Feb 2011 00:03:16 -0500
+
+openlp (1.9.4+bzr1332-0ubuntu1~karmic1) karmic; urgency=low
+
+ * Autobuild
+
+ -- Fri, 25 Feb 2011 00:02:36 -0500
+
+openlp (1.9.4+bzr1328-0ubuntu1~natty1) natty; urgency=low
+
+ * Autobuild
+
+ -- Thu, 24 Feb 2011 00:03:47 -0500
+
+openlp (1.9.4+bzr1328-0ubuntu1~maverick1) maverick; urgency=low
+
+ * Autobuild
+
+ -- Thu, 24 Feb 2011 00:03:31 -0500
+
+openlp (1.9.4+bzr1328-0ubuntu1~lucid1) lucid; urgency=low
+
+ * Autobuild
+
+ -- Thu, 24 Feb 2011 00:03:07 -0500
+
+openlp (1.9.4+bzr1328-0ubuntu1~karmic1) karmic; urgency=low
+
+ * Autobuild
+
+ -- Thu, 24 Feb 2011 00:02:28 -0500
+
+openlp (1.9.4+bzr1324-0ubuntu1~natty1) natty; urgency=low
+
+ * Autobuild
+
+ -- Wed, 23 Feb 2011 00:03:48 -0500
+
+openlp (1.9.4+bzr1324-0ubuntu1~maverick1) maverick; urgency=low
+
+ * Autobuild
+
+ -- Wed, 23 Feb 2011 00:03:33 -0500
+
+openlp (1.9.4+bzr1324-0ubuntu1~lucid1) lucid; urgency=low
+
+ * Autobuild
+
+ -- Wed, 23 Feb 2011 00:03:08 -0500
+
+openlp (1.9.4+bzr1324-0ubuntu1~karmic1) karmic; urgency=low
+
+ * Autobuild
+
+ -- Wed, 23 Feb 2011 00:02:28 -0500
+
+openlp (1.9.4+bzr1322-0ubuntu1~natty1) natty; urgency=low
+
+ * Autobuild
+
+ -- Tue, 22 Feb 2011 00:04:06 -0500
+
+openlp (1.9.4+bzr1322-0ubuntu1~maverick1) maverick; urgency=low
+
+ * Autobuild
+
+ -- Tue, 22 Feb 2011 00:03:52 -0500
+
+openlp (1.9.4+bzr1322-0ubuntu1~lucid1) lucid; urgency=low
+
+ * Autobuild
+
+ -- Tue, 22 Feb 2011 00:03:28 -0500
+
+openlp (1.9.4+bzr1322-0ubuntu1~karmic1) karmic; urgency=low
+
+ * Autobuild
+
+ -- Tue, 22 Feb 2011 00:02:42 -0500
+
+openlp (1.9.4+bzr1320-0ubuntu1~natty1) natty; urgency=low
+
+ * Autobuild
+
+ -- Mon, 21 Feb 2011 00:03:59 -0500
+
+openlp (1.9.4+bzr1320-0ubuntu1~maverick1) maverick; urgency=low
+
+ * Autobuild
+
+ -- Mon, 21 Feb 2011 00:03:45 -0500
+
+openlp (1.9.4+bzr1320-0ubuntu1~lucid1) lucid; urgency=low
+
+ * Autobuild
+
+ -- Mon, 21 Feb 2011 00:03:21 -0500
+
+openlp (1.9.4+bzr1320-0ubuntu1~karmic1) karmic; urgency=low
+
+ * Autobuild
+
+ -- Mon, 21 Feb 2011 00:02:41 -0500
+
+openlp (1.9.4+bzr1316-0ubuntu1~natty1) natty; urgency=low
+
+ * Autobuild
+
+ -- Sun, 20 Feb 2011 05:32:08 -0500
+
+openlp (1.9.4+bzr1316-0ubuntu1~maverick1) maverick; urgency=low
+
+ * Autobuild
+
+ -- Sun, 20 Feb 2011 05:31:51 -0500
+
+openlp (1.9.4+bzr1316-0ubuntu1~lucid1) lucid; urgency=low
+
+ * Autobuild
+
+ -- Sun, 20 Feb 2011 05:31:28 -0500
+
+openlp (1.9.4+bzr1316-0ubuntu1~karmic1) karmic; urgency=low
+
+ * Autobuild
+
+ -- Sun, 20 Feb 2011 05:30:49 -0500
+
+openlp (1.9.4+bzr1315-0ubuntu1~natty1) natty; urgency=low
+
+ * Autobuild
+
+ -- Sat, 19 Feb 2011 16:24:12 -0500
+
+openlp (1.9.4+bzr1315-0ubuntu1~maverick1) maverick; urgency=low
+
+ * Autobuild
+
+ -- Sat, 19 Feb 2011 16:23:51 -0500
+
+openlp (1.9.4+bzr1315-0ubuntu1~lucid1) lucid; urgency=low
+
+ * Autobuild
+
+ -- Sat, 19 Feb 2011 16:23:28 -0500
+
+openlp (1.9.4+bzr1315-0ubuntu1~karmic1) karmic; urgency=low
+
+ * Autobuild
+
+ -- Sat, 19 Feb 2011 16:22:49 -0500
+
+openlp (1.9.4+bzr1314-0ubuntu1~natty1) natty; urgency=low
+
+ * Autobuild
+
+ -- Sat, 19 Feb 2011 15:35:36 -0500
+
+openlp (1.9.4+bzr1314-0ubuntu1~maverick1) maverick; urgency=low
+
+ * Autobuild
+
+ -- Sat, 19 Feb 2011 15:35:21 -0500
+
+openlp (1.9.4+bzr1314-0ubuntu1~lucid1) lucid; urgency=low
+
+ * Autobuild
+
+ -- Sat, 19 Feb 2011 15:34:53 -0500
+
+openlp (1.9.4+bzr1314-0ubuntu1~karmic1) karmic; urgency=low
+
+ * Autobuild
+
+ -- Sat, 19 Feb 2011 15:34:10 -0500
+
+openlp (1.9.4+bzr1313-0ubuntu1~natty1) natty; urgency=low
+
+ * Autobuild
+
+ -- Sat, 19 Feb 2011 13:58:14 -0500
+
+openlp (1.9.4+bzr1313-0ubuntu1~maverick1) maverick; urgency=low
+
+ * Autobuild
+
+ -- Sat, 19 Feb 2011 13:57:40 -0500
+
+openlp (1.9.4+bzr1313-0ubuntu1~lucid1) lucid; urgency=low
+
+ * Autobuild
+
+ -- Sat, 19 Feb 2011 13:57:11 -0500
+
+openlp (1.9.4+bzr1313-0ubuntu1~karmic1) karmic; urgency=low
+
+ * Autobuild
+
+ -- Sat, 19 Feb 2011 13:56:17 -0500
+
+openlp (0.0.0+bzr664-0ubuntu1) karmic; urgency=low
+
+ * Initial release
+
+ -- Michael Gorven Fri, 06 Nov 2009 09:46:40 +0200
diff --git a/resources/debian/debian/compat b/resources/debian/debian/compat
new file mode 100644
index 000000000..7ed6ff82d
--- /dev/null
+++ b/resources/debian/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/resources/debian/debian/control b/resources/debian/debian/control
new file mode 100644
index 000000000..220b500d2
--- /dev/null
+++ b/resources/debian/debian/control
@@ -0,0 +1,19 @@
+Source: openlp
+Section: python
+Priority: extra
+Maintainer: OpenLP Developers
+Build-Depends: cdbs, debhelper (>= 5), python-setuptools, python-support,
+ python, qt4-dev-tools
+Standards-Version: 3.8.3
+Homepage: http://openlp.org/
+
+Package: openlp
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-qt4,
+ python-qt4-phonon, python-sqlalchemy, python-chardet, python-beautifulsoup,
+ python-lxml, python-sqlite, python-enchant
+Conflicts: python-openlp
+Description: Church lyrics projection application
+ OpenLP is free church presentation software, or lyrics projection software,
+ used to display slides of songs, Bible verses, videos, images, and even
+ presentations for church worship using a computer and a data projector.
diff --git a/resources/debian/debian/copyright b/resources/debian/debian/copyright
new file mode 100644
index 000000000..54e52a356
--- /dev/null
+++ b/resources/debian/debian/copyright
@@ -0,0 +1,10 @@
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
+Upstream-Name: OpenLP
+Upstream-Maintainer: OpenLP Developers
+Upstream-Source: http://openlp.org/
+
+Files: *
+Copyright: (c) 2008-2009 Raoul Snyman
+License: GPL-2
+X-Comment: On Debian GNU/Linux systems, the complete text of the
+ GPL-2 License can be found in /usr/share/common-licenses/GPL-2
diff --git a/resources/debian/debian/docs b/resources/debian/debian/docs
new file mode 100644
index 000000000..dfcaa10d3
--- /dev/null
+++ b/resources/debian/debian/docs
@@ -0,0 +1 @@
+documentation
diff --git a/resources/debian/debian/openlp.install b/resources/debian/debian/openlp.install
new file mode 100644
index 000000000..5ef4e79ce
--- /dev/null
+++ b/resources/debian/debian/openlp.install
@@ -0,0 +1 @@
+resources/openlp.desktop /usr/share/applications
diff --git a/resources/debian/debian/pycompat b/resources/debian/debian/pycompat
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/resources/debian/debian/pycompat
@@ -0,0 +1 @@
+2
diff --git a/resources/debian/debian/pyversions b/resources/debian/debian/pyversions
new file mode 100644
index 000000000..b3dc41ebc
--- /dev/null
+++ b/resources/debian/debian/pyversions
@@ -0,0 +1 @@
+2.5-
diff --git a/resources/debian/debian/rules b/resources/debian/debian/rules
new file mode 100755
index 000000000..c8fe91ecc
--- /dev/null
+++ b/resources/debian/debian/rules
@@ -0,0 +1,21 @@
+#!/usr/bin/make -f
+
+DEB_PYTHON_SYSTEM := pysupport
+DEB_MAKE_BUILD_TARGET := build
+DEB_MAKE_INSTALL_TARGET := install
+DEB_MAKE_CLEAN_TARGET := clean
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/python-distutils.mk
+include /usr/share/cdbs/1/class/makefile.mk
+
+binary-post-install/openlp::
+ for SIZE in 16x16 32x32 48x48 64x64 128x128 256x256; do \
+ mkdir -p debian/openlp/usr/share/icons/hicolor/$$SIZE/apps && \
+ cp resources/images/openlp-logo-$$SIZE.png debian/openlp/usr/share/icons/hicolor/$$SIZE/apps/openlp.png; \
+ done
+
+ mkdir -p debian/openlp/usr/share/icons/hicolor/scalable/apps && \
+ cp resources/images/openlp-logo.svg debian/openlp/usr/share/icons/hicolor/scalable/apps/openlp.svg
+
+ cd debian/openlp/usr/bin/ && mv openlp.pyw openlp
diff --git a/resources/forms/firsttimewizard.ui b/resources/forms/firsttimewizard.ui
new file mode 100644
index 000000000..54dd80306
--- /dev/null
+++ b/resources/forms/firsttimewizard.ui
@@ -0,0 +1,375 @@
+
+
+ FirstTimeWizard
+
+
+
+ 0
+ 0
+ 550
+ 386
+
+
+
+ First Time Wizard
+
+
+ true
+
+
+ QWizard::ModernStyle
+
+
+ QWizard::IndependentPages|QWizard::NoBackButtonOnStartPage
+
+
+
+
+
+
+
+
+
+
+ 8
+
+
+ 0
+
+ -
+
+
+
+ 163
+ 0
+
+
+
+
+ 163
+ 16777215
+
+
+
+ 0
+
+
+
+
+
+ :/wizards/wizard_importbible.bmp
+
+
+ 0
+
+
+
+ -
+
+
+ 8
+
+
-
+
+
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:14pt; font-weight:600;">Welcome to the First Time Wizard</span></p></body></html>
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+ QSizePolicy::Fixed
+
+
+
+ 20
+ 40
+
+
+
+
+ -
+
+
+ This wizard will help you to configure OpenLP for initial use . Click the next button below to start the process of selection your initial options.
+
+
+ true
+
+
+ 10
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+
+
+
+
+
+
+ Activate required Plugins
+
+
+ Select the Plugins you wish to use.
+
+
+ -
+
+
-
+
+
+ Songs
+
+
+ true
+
+
+
+ -
+
+
+ Custom Text
+
+
+ true
+
+
+
+ -
+
+
+ Bible
+
+
+ true
+
+
+
+ -
+
+
+ Images
+
+
+ true
+
+
+
+ -
+
+
+ Presentations
+
+
+ true
+
+
+
+ -
+
+
+ Media (Audio and Video)
+
+
+ true
+
+
+
+ -
+
+
+ Allow remote access
+
+
+
+ -
+
+
+ Monitor Song Usage
+
+
+ true
+
+
+
+ -
+
+
+ Allow Alerts
+
+
+ true
+
+
+
+
+
+
+
+
+
+ Download Samples from OpenLP.org
+
+
+ Select samples to downlaod and install for use.
+
+
+
+
+ 20
+ 20
+ 461
+ 17
+
+
+
+ No Internet connection found so unable to download any default files.
+
+
+
+
+
+ 20
+ 0
+ 501
+ 281
+
+
+
+ Download Example Files
+
+
+ -
+
+
+ Qt::ScrollBarAlwaysOff
+
+
+ false
+
+
+ true
+
+
+ QAbstractItemView::NoSelection
+
+
+ false
+
+
+
+ 1
+
+
+
+
+
+
+
+
+
+ Default Settings
+
+
+ Set up default values to be used by OpenLP
+
+
+
+
+ 20
+ 20
+ 491
+ 113
+
+
+
+ -
+
+
+ Default output display
+
+
+
+ -
+
+
+ false
+
+
+ QComboBox::NoInsert
+
+
+ QComboBox::AdjustToContents
+
+
+
+ -
+
+
+ Select the default Theme
+
+
+
+ -
+
+
+ QComboBox::AdjustToContents
+
+
+
+
+
+
+
+
+ 60
+ 160
+ 471
+ 17
+
+
+
+ Press Finish to apply all you changes and start OpenLP
+
+
+
+
+
+ 60
+ 220
+ 351
+ 17
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/gentoo/openlp-1.9.4.ebuild b/resources/gentoo/openlp-1.9.4.ebuild
new file mode 100644
index 000000000..4e87a27b3
--- /dev/null
+++ b/resources/gentoo/openlp-1.9.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Copyright 2010 Jaak Ristioja
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+RESTRICT_PYTHON_ABIS="3.*"
+inherit python
+
+DESCRIPTION="Free church presentation software"
+HOMEPAGE="http://openlp.org/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/OpenLP-${PV}-src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 x86-fbsd x86-freebsd amd64-linux x86-linux x86-macos x86-solaris"
+
+RDEPEND=">=dev-lang/python-2.5.0
+ dev-python/beautifulsoup
+ dev-python/chardet
+ dev-python/lxml
+ dev-python/pyenchant
+ dev-python/PyQt4[X,multimedia]
+ dev-python/sqlalchemy"
+DEPEND="${RDEPEND}"
+
+PYTHON_DEPEND="2:2.5"
+PYTHON_MODNAME="openlp"
+
+S=${WORKDIR}/OpenLP-${PV}-src
diff --git a/resources/i18n/af.ts b/resources/i18n/af.ts
index f9d3e7117..1b913d27f 100644
--- a/resources/i18n/af.ts
+++ b/resources/i18n/af.ts
@@ -23,7 +23,8 @@ Gaan steeds voort?
-
+ Die attent-teks bevat nie '<>' nie.
+Gaan steeds voort?
@@ -154,28 +155,28 @@ Do you want to continue anyway?
BibleDB.Wizard
-
+
Testament invoer... %s
-
+
Testament invoer... voltooi.
-
+
Boek invoer... %s
-
+
Importing verses from <book name>...
Vers invoer vanaf %s...
-
+
Vers invoer... voltooi.
@@ -211,7 +212,7 @@ Do you want to continue anyway?
-
+
@@ -529,7 +530,7 @@ Veranderinge affekteer nie verse wat reeds in die diens is nie.
Bybel Bestaan reeds
-
+
Die Bybel invoer het misluk.
@@ -544,12 +545,12 @@ Veranderinge affekteer nie verse wat reeds in die diens is nie.
Hierdie Bybel bestaan reeds. Voer asseblief 'n ander Bybel in of wis eers die bestaande een uit.
-
+
Begin Bybel registrasie...
-
+
Geregistreerde bybel. Neem kennis daarvan dat verse op aanvraag
@@ -672,7 +673,7 @@ afgelaai word en dus word 'n Internet konneksie benodig.
BiblesPlugin.Opensong
-
+
Importing <book name> <chapter>...
Invoer %s %s...
@@ -681,12 +682,12 @@ afgelaai word en dus word 'n Internet konneksie benodig.
BiblesPlugin.OsisImport
-
+
Bepaal enkodering (dit mag 'n paar minuute neem)...
-
+
Importing <book name> <chapter>...
Invoer %s %s...
@@ -840,59 +841,59 @@ afgelaai word en dus word 'n Internet konneksie benodig.
ImagePlugin
-
+
<strong>Beeld Mini-program</strong><br/>Die beeld mini-program verskaf vertoning van beelde.<br/>Een van die onderskeidende kenmerke van hierdie mini-program is die vermoë om beelde te groepeer in die diensbestuurder wat dit maklik maak om verskeie beelde te vertoon. Die mini-program kan ook van OpenLP se "tydgebonde herhaling"-funksie gebruik maak om 'n automatiese skyfe-vertoning te verkry. Verder kan beelde van hierdie mini-program gebruik word om die huidige tema se agtergrond te vervang hoewel 'n tema sy eie agtergrond het.
-
+
Laai 'n nuwe Beeld
-
+
Voeg 'n nuwe Beeld by
-
+
Redigeer die geselekteerde Beeld
-
+
Wis die geselekteerde Beeld uit
-
+
Sien voorskou van die geselekteerde Beeld
-
+
Stuur die geselekteerde Beeld regstreeks
-
+
Voeg die geselekteerde Beeld by die diens
-
+
name singular
Beeld
-
+
name plural
Beelde
-
+
container title
Beelde
@@ -949,59 +950,59 @@ Voeg steeds die ander beelde by?
MediaPlugin
-
+
<strong>Media Mini-program</strong><br/>Die media mini-program verskaf speel funksies van audio en video.
-
+
Laai nuwe Media
-
+
Voeg nuwe Media by
-
+
Redigeer die geselekteerde Media
-
+
Wis die geselekteerde Media uit
-
+
Sien voorskou van die geselekteerde Media
-
+
Stuur die geselekteerde Media regstreeks
-
+
Voeg die geselekteerde Media by die diens
-
+
name singular
Media
-
+
name plural
Media
-
+
container title
Media
@@ -1086,17 +1087,17 @@ Vind meer uit oor OpenLP: http://openlp.org/
OpenLP is geskryf en word onderhou deur vrywilligers. As u graag wil sien dat meer Christelike sagteware geskryf word, oorweeg dit asseblief om by te dra deur die knoppie hieronder te gebruik.
-
+
Krediete
-
+
Lisensie
-
+
Dra By
@@ -1106,7 +1107,17 @@ OpenLP is geskryf en word onderhou deur vrywilligers. As u graag wil sien dat me
bou %s
-
+
+
+ Hierdie program is gratis sagteware; dit kan verspei en/of verander word onder die terme van die GNU Algemene Publieke Lisensie soos deur die Gratis Sagteware Vondasie gepubliseer is; weergawe 2 van die Lisensie.
+
+
+
+
+ Hierdie program word versprei in die hoop dat dit nuttig sal wees, maar SONDER ENIGE WAARBORG; sonder die geïmpliseerde waarborg van VERHANDELBAARHEID of GESKIKTHEID VIR 'N SPESIFIEKE DOEL. Sien hieronder vir meer inligting.
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
+Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carsten
+Tinggaard, Frode Woldsund
@@ -1262,18 +1293,18 @@ Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, CarstennTinggaard, Frod
-
- Etiket id
+
+
-
- Begin Html
+
+
-
- Eind-Html
+
+
@@ -1326,12 +1357,12 @@ Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, CarstennTinggaard, Frod
-
+ Heg 'n Lêer aan
-
+ Beskrywende karakters om in te voer: %s
@@ -1340,17 +1371,18 @@ Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, CarstennTinggaard, Frod
-
+ Platvorm: %s
+
-
+ Stoor Bots Verslag
-
+ Teks lêers (*.txt *.log *.text)
@@ -1368,7 +1400,20 @@ Version: %s
--- Library Versions ---
%s
-
+ **OpenLP Bug Report**
+Version: %s
+
+--- Details of the Exception. ---
+
+%s
+
+ --- Exception Traceback ---
+%s
+--- System information ---
+%s
+--- Library Versions ---
+%s
+
@@ -1387,7 +1432,20 @@ Version: %s
%s
Please add the information that bug reports are favoured written in English.
-
+ *OpenLP Bug Report*
+Version: %s
+
+--- Details of the Exception. ---
+
+%s
+
+ --- Exception Traceback ---
+%s
+--- System information ---
+%s
+--- Library Versions ---
+%s
+
@@ -1395,16 +1453,216 @@ Version: %s
-
+ Lêer Hernoem
-
+ Nuwe Lêer Naam:
+ Lêer Kopieër
+
+
+
+ OpenLP.FirstTimeLanguageForm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ OpenLP.FirstTimeWizard
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Beelde
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1523,18 +1781,18 @@ Version: %s
-
+ Kyk vir opdaterings van OpenLP
OpenLP.LanguageManager
-
+
Taal
-
+
Herlaai asseblief OpenLP om die nuwe taal instelling te gebruik.
@@ -1544,7 +1802,7 @@ Version: %s
-
+ OpenLP Vertooning
@@ -1840,17 +2098,12 @@ Version: %s
&Web Tuiste
-
-
- Verklik Outom&aties
-
-
-
+
Gebruik die sisteem se taal as dit beskikbaar is.
-
+
Verstel die koppelvlak taal na %s
@@ -1895,7 +2148,7 @@ Version: %s
Verstel die skou modus na Regstreeks.
-
+
@@ -1904,22 +2157,22 @@ You can download the latest version from http://openlp.org/.
Die nuutste weergawe kan afgelaai word vanaf http://openlp.org/.
-
+
OpenLP Weergawe is Opdateer
-
+
OpenLP Hoof Vertoning Blanko
-
+
Die Hoof Skerm is afgeskakel
-
+
Verstek Tema: %s
@@ -1932,48 +2185,53 @@ Die nuutste weergawe kan afgelaai word vanaf http://openlp.org/.
-
+ Konfigureer Kortpaaie
-
+
-
+ Mook OpenLP toe
-
+
-
+ Maak OpenLP sekerlik toe?
-
+ Druk die huidige Diens Bestelling.
-
+ Ctrl+P
-
+ Maak &Data Lêer oop...
-
+ Maak die lêer waar liedere, bybels en ander data is, oop.
+ Konfigureer Vertoon Haakies
+
+
+
+
OpenLP.MediaManagerItem
-
+
Geen item geselekteer nie
@@ -2061,12 +2319,12 @@ Die nuutste weergawe kan afgelaai word vanaf http://openlp.org/.
-
+ Pas Blaai
-
+ Pas Wydte
@@ -2074,62 +2332,62 @@ Die nuutste weergawe kan afgelaai word vanaf http://openlp.org/.
-
+ Opsies
-
+ Close
-
+ Kopieër
-
+ Kopieër as HTML
-
+ Zoom In
-
+ Zoem Uit
-
+ Zoem Oorspronklike
-
+ Ander Opsies
-
+ Sluit skyfie teks in indien beskikbaar
-
+ Sluit diens item notas in
-
+ Sluit die speel tyd van die media items in
-
+ Diens Bestelling Blad
@@ -2137,12 +2395,12 @@ Die nuutste weergawe kan afgelaai word vanaf http://openlp.org/.
-
+ Skerm
-
+ primêr
@@ -2251,51 +2509,51 @@ Die nuutste weergawe kan afgelaai word vanaf http://openlp.org/.
&Verander Item Tema
-
+
Lêer is nie 'n geldige diens nie.
Die inhoud enkodering is nie UTF-8 nie.
-
+
Lêer is nie 'n geldige diens nie.
-
+
Vermisde Vertoon Hanteerder
-
+
Die item kan nie vertoon word nie omdat daar nie 'n hanteerder is om dit te vertoon nie
-
+
Die item kan nie vertoon word nie omdat die mini-program wat dit moet vertoon vermis of onaktief is
-
+ Br&ei alles uit
-
+ Brei al die diens items uit.
-
+ Stort alles ineen
-
+ Stort al die diens items ineen
@@ -2303,64 +2561,64 @@ Die inhoud enkodering is nie UTF-8 nie.
Maak Lêer oop
-
+
-
+ OpenLP Diens Lêers (*.osz)
-
+ Skuif die geselekteerde afwaarts in die venster.
-
+ Skuif op
-
+ Skuif die geselekteerde opwaarts in die venster.
-
+ Gaan Regstreeks
-
+ Stuur die geselekteerde item Regstreeks
-
+ Redigeer Diens
-
+ Notas:
-
+ Begin Tyd
-
+ Wys Voorskou
-
+ Vertoon Regstreeks
-
+ Die huidige diens was verander. Stoor hierdie diens?
@@ -2384,140 +2642,140 @@ Die inhoud enkodering is nie UTF-8 nie.
-
+ Verpersoonlik Kortpaaie
-
+ Aksie
-
+ Kortpad
-
+ Verstek: %s
-
+ Persoonlik:
-
+ Geen
-
+ Duplikaat Kortpad
-
+ Die kortpad "%s" is alreeds toegeken aan 'n ander aksie, kies asseblief 'n ander kortpad.
-
+ Alternatief
OpenLP.SlideController
-
+
Beweeg na vorige
-
+
Beweeg na volgende
-
+
Verskuil
-
+
Verskuif na regstreekse skerm
-
+
Begin aaneenlopende lus
-
+
Stop deurlopende lus
-
+
Vertraging tussen skyfies in sekondes
-
+
Begin media speel
-
+
Gaan Na
-
+
Redigeer en laai weer 'n lied voorskou
-
+
-
+ Blanko Skerm
-
+ Blanko na Tema
-
+
-
+ Wys Werkskerm
-
+
-
+ Vorige Skyfie
-
+
-
+ Volgende Skyfie
-
+
-
+ Vorige Diens
-
+
-
+ Volgende Diens
-
+
-
+ Ontsnap Item
@@ -2538,32 +2796,32 @@ Die inhoud enkodering is nie UTF-8 nie.
-
+ Item Begin Tyd
-
+ Ure:
-
+ h
-
+ m
-
+ Minute:
-
+ Sekondes:
@@ -2571,32 +2829,32 @@ Die inhoud enkodering is nie UTF-8 nie.
- Selekteer beeld
+ Selekteer Beeld
-
+ Tema Naam Vermis
-
+ Daar is nie 'n naam vir hierdie tema nie. Voer asseblief een in.
-
+ Tema Naam Ongeldig
-
+ Ongeldige tema naam. Voer asseblief een in.
-
+ (%d lyne per skyfie)
@@ -2662,131 +2920,131 @@ Die inhoud enkodering is nie UTF-8 nie.
Stel in As &Globale Standaard
-
+
%s (standaard)
-
+
Kies 'n tema om te redigeer.
-
+
Die standaard tema kan nie uitgewis word nie.
-
+
Geen tema is geselekteer nie.
-
+
Stoor Tema - (%s)
-
+
Tema Uitvoer
-
+
Die tema was suksesvol uitgevoer.
-
+
Tema Uitvoer het Misluk
-
+
Die tema kon nie uitgevoer word nie weens 'n fout.
-
+
Kies Tema Invoer Lêer
-
+
Lêer is nie 'n geldige tema nie.
Die inhoud enkodering is nie UTF-8 nie.
-
+
Lêer is nie 'n geldige tema nie.
-
+
Tema %s is in gebruik deur die %s mini-program.
-
+ &Kopieër Tema
-
+ He&rnoem Tema
-
+ Vo&er Tema uit
-
+
-
+ Kies 'n tema om te hernoem.
-
+
-
+ Hernoem Bevestiging
-
+
-
+ Hernoem %s tema?
-
+
-
+ Kies 'n tema om uit te wis.
-
+
-
+ Uitwis Bevestiging
-
+
-
+ Wis %s tema uit?
-
+
-
+ Validerings Fout
-
+
-
+ 'n Tema met hierdie naam bestaan alreeds.
-
+
-
+ OpenLP Temas (*.theme *.otz)
@@ -2794,27 +3052,27 @@ Die inhoud enkodering is nie UTF-8 nie.
-
+ Tema Gids
-
+ Welkom by die Tema Gids
-
+ Stel die Agtergrond Op
-
+ Stel jou tema se agtergrond op volgens die parameters hier onder.
-
+ Agtergrond tipe:
@@ -2854,22 +3112,22 @@ Die inhoud enkodering is nie UTF-8 nie.
-
+ Links Bo - Regs Onder
-
+ Links Onder - Regs Bo
-
+ Hoof Area Skrif Gegewens
-
+ Definieër die skrif en vertoon karrakters vir die Vertoon teks
@@ -2884,17 +3142,17 @@ Die inhoud enkodering is nie UTF-8 nie.
-
+ Lyn Spasiëring:
-
+ Buitelyn:
-
+ &Skaduwee:
@@ -2904,32 +3162,32 @@ Die inhoud enkodering is nie UTF-8 nie.
-
+ Italiaans
-
+ Voetskrif Area Skrif Gegewens
-
+ Definieër die skrif en vertoon karraktereienskappe vir die Voetskrif teks
-
+ Teks Formattering Gegewens
-
+ Laat toe dat addisionele vertoon formattering inligting gedifinieër word
-
+ Horisontale Sporing:
@@ -2949,22 +3207,22 @@ Die inhoud enkodering is nie UTF-8 nie.
-
+ Uitvoer Area Liggings
-
+ Laat toe dat die hoof en voetskrif areas verander en geskuif word.
-
+ Hoof Area
-
+ Gebr&uik verstek ligging
@@ -2999,37 +3257,37 @@ Die inhoud enkodering is nie UTF-8 nie.
-
+ Stoor en Voorskou
-
+ Besigtig die tema en stoor dit waarna die huidige een vervang, of verander die naam om 'n nuwe een te skep
-
+ Tema naam:
-
+ Hierdie gids sal help om temas te skep en te redigeer. Klik die volgende knoppie hieronder om die proses te begin deur jou agtergrond op te stel.
-
+ Oorskakel effekte:
-
+ Voetskrif Area
-
+ Redigeer Tema - %s
@@ -3090,22 +3348,22 @@ Die inhoud enkodering is nie UTF-8 nie.
-
+ Wis die geselekteerde item uit.
-
+ Skuif die seleksie een posisie op.
-
+ Skuif die seleksie een posisie af.
-
+ &Voeg by
@@ -3130,12 +3388,12 @@ Die inhoud enkodering is nie UTF-8 nie.
-
+ Voer in
-
+ Lengte %s
@@ -3145,12 +3403,12 @@ Die inhoud enkodering is nie UTF-8 nie.
-
+ Laai
-
+ Nuwe
@@ -3185,7 +3443,7 @@ Die inhoud enkodering is nie UTF-8 nie.
-
+ Herstel Agtergrond
@@ -3200,17 +3458,17 @@ Die inhoud enkodering is nie UTF-8 nie.
-
+ Diens
-
+ Begin %s
-
+ &Vertikale Sporing:
@@ -3240,7 +3498,7 @@ Die inhoud enkodering is nie UTF-8 nie.
-
+ Kanselleer
@@ -3250,12 +3508,12 @@ Die inhoud enkodering is nie UTF-8 nie.
-
+ Leë Veld
-
+ Uitvoer
@@ -3271,12 +3529,12 @@ Die inhoud enkodering is nie UTF-8 nie.
-
+ Regstreekse Agtergrond Fout
-
+ Regstreekse Paneel
@@ -3287,25 +3545,25 @@ Die inhoud enkodering is nie UTF-8 nie.
Singular
-
+ Geen Lêer Geselekteer nie
Plural
-
+ Geen Leêrs Geselekteer nie
Singular
-
+ Geen Item Geselekteer nie
Plural
- Geen item geselekteer nie
+ Geen items geselekteer nie
@@ -3315,12 +3573,12 @@ Die inhoud enkodering is nie UTF-8 nie.
-
+ Voorskou Paneel
-
+ Druk Diens Orde
@@ -3341,7 +3599,7 @@ Die inhoud enkodering is nie UTF-8 nie.
-
+ Kies 'n item om uit te wis.
@@ -3363,7 +3621,7 @@ Die inhoud enkodering is nie UTF-8 nie.
-
+ Weergawe
@@ -3393,7 +3651,7 @@ Die inhoud enkodering is nie UTF-8 nie.
-
+ Selekteer die invoer vormaat en die ligging vanwaar invoer geskied.
@@ -3403,7 +3661,7 @@ Die inhoud enkodering is nie UTF-8 nie.
-
+ Maak %s Lêer Oop
@@ -3424,7 +3682,7 @@ Die inhoud enkodering is nie UTF-8 nie.
A file type e.g. OpenSong
-
+ Spesifiseer ten minste een %s lêer om vanaf in te voer.
@@ -3434,7 +3692,7 @@ Die inhoud enkodering is nie UTF-8 nie.
-
+ Welkom by die Lied Uitvoer Gids
@@ -3445,13 +3703,13 @@ Die inhoud enkodering is nie UTF-8 nie.
Singular
-
+ Outeur
Plural
- Skrywers
+ Outeure
@@ -3494,7 +3752,7 @@ Die inhoud enkodering is nie UTF-8 nie.
-
+ Konfigureer Vertoon Hakkies
@@ -3507,27 +3765,27 @@ Die inhoud enkodering is nie UTF-8 nie.
-
+ Laai 'n nuwe Aanbiedieng
-
+ Wis die geselekteerde Aanbieding uit
-
+ Sien voorskou van die geselekteerde Aanbieding
-
+ Stuur die geselekteerde Aanbieding regstreeks
-
+ Voeg die geselekteerde Aanbieding by die diens
@@ -3588,22 +3846,22 @@ Die inhoud enkodering is nie UTF-8 nie.
-
+ Aanbiedinge (%s)
-
+ Vermisde Aanbieding
-
+ Die Aanbieding %s bestaan nie meer nie.
-
+ Die Aanbieding %s is onvolledig, herlaai asseblief.
@@ -3621,7 +3879,7 @@ Die inhoud enkodering is nie UTF-8 nie.
-
+ %s (nie beskikbaar nie)
@@ -3635,7 +3893,7 @@ Die inhoud enkodering is nie UTF-8 nie.
name singular
-
+ Afstandbeheer
@@ -3647,7 +3905,7 @@ Die inhoud enkodering is nie UTF-8 nie.
container title
-
+ Afstandbeheer
@@ -3714,19 +3972,19 @@ Die inhoud enkodering is nie UTF-8 nie.
name singular
-
+ SongUsage
name plural
-
+ SongUsage
container title
-
+ SongUsage
@@ -3749,12 +4007,12 @@ Die inhoud enkodering is nie UTF-8 nie.
-
+ Uitwissing Suksesvol
-
+ Al die gevraagde data is suksesvol uitgewis.
@@ -3785,99 +4043,111 @@ Die inhoud enkodering is nie UTF-8 nie.
Uitvoer Lêer Ligging
-
+
-
+ usage_detail_%s_%s.txt
-
+
-
+ Verslag Skepping
-
+
+ Verslag
+ %s
+was suksesvol geskep.
+
+
+
+
+
+
+
+
+
SongsPlugin
-
+
&Lied
-
+
Voer liedere in deur van die invoer helper gebruik te maak.
-
+
<strong>Liedere Mini-program</strong><br/>Die liedere mini-program verskaf die vermoë om liedere te vertoon en te bestuur.
-
+
-
+ He&r-indeks Liedere
-
+
-
+ Her-indeks die liedere databasis om lied-soektogte en organisering te verbeter.
-
+
-
+ Besig om liedere indek te herskep...
+
+
+
+
+ Voeg 'n nuwe Lied by
-
-
+
+ Redigeer die geselekteerde Lied
-
-
+
+ Wis die geselekteerde Lied uit
-
-
+
+ Skou die geselekteerde Lied
-
-
+
+ Stuur die geselekteerde Lied regstreeks
-
-
-
-
-
-
+ Voeg die geselekteerde Lied by die diens
-
+
name singular
Lied
-
+
name plural
Liedere
-
+
container title
Liedere
@@ -3885,95 +4155,99 @@ has been successfully created.
-
+ Arabies (CP-1256)
-
+ Balties (CP-1257)
-
+ Sentraal Europees (CP-1250)
-
+ Cyrillies (CP-1251)
-
+ Grieks (CP-1253)
-
+ Hebreeus (CP-1255)
-
+ Japanees (CP-932)
-
+ Koreaans (CP-949)
-
+ Vereenvoudigde Chinees (CP-936)
-
+ Thai (CP-874)
-
+ Tradisionele Chinees (CP-950)
-
+ Turks (CP-1254)
-
+ Viëtnamees (CP-1258)
-
+ Wes-Europees (CP-1252)
-
+ Karrakter Enkodering
-
+ Die kodeblad instelling is verantwoordelik
+vir die korrekte karrakter voorstelling.
+Gewoonlik is die reeds-geselekteerde
+keuse voldoende.
-
+ Kies asseblief die karrakter enkodering.
+Die enkodering is verantwoordelik vir die korrekte karrakter voorstelling.
-
+
-
+ Voer liedere uit deur gebruik te maak van die uitvoer gids.
@@ -4019,7 +4293,7 @@ The encoding is responsible for the correct character representation.
-
+ Voer lied %d van %d in
@@ -4197,12 +4471,12 @@ The encoding is responsible for the correct character representation.
-
+ Daar word 'n outeur benodig vir hierdie lied.
-
+ Daar word teks benodig vir die vers.
@@ -4228,82 +4502,82 @@ The encoding is responsible for the correct character representation.
-
+ Lied Uitvoer Gids
-
+ Hierdie gids sal help om die liedere na die oop en gratis OpenLyrics aanbiddigs-formaat uit te voer.
-
+ Kies Liedere
-
+ Merk Alles Af
-
+ Merk Alles Aan
-
+ Kies Lêer-gids
-
+ Kies die gids waar die liedere gestoor moet word.
-
+ Lêer Gids:
-
+ Uitvoer
-
+ Wag asseblief terwyl die liedere uitgevoer word.
-
+ Ten minste een lied moet bygevoeg word om uit te voer.
-
+ Geen Stoor Ligging gespesifiseer nie
-
+ Uitvoer begin...
-
+ Merk die liediere wat uitgevoer moet vord.
-
+ 'n Lêer gids moet gespesifiseer word.
-
+ Kies Bestemming Lêer gids
@@ -4371,42 +4645,42 @@ The encoding is responsible for the correct character representation.
-
+ OpenLP 2.0 Databasisse
-
+ openlp.org v1.x Databasisse
-
+ Words Of Worship Lied Lêers
-
+ Songs Of Fellowship Lied Lêers
-
+ SongBeamer Lêers
-
+ SongShow Plus Lied Lêers
-
+ Ten minste een document of aanbieding moet gespesifiseer word om vanaf in te voer.
-
+ Foilpresenter Lied Lêers
@@ -4427,25 +4701,25 @@ The encoding is responsible for the correct character representation.
Lirieke
-
+
Wis Lied(ere) uit?
-
+
-
+ CCLI Lisensie:
-
+ Volledige Lied
-
+
-
-
+
+ Wis regtig die %n geselekteerde lied(ere)?
@@ -4455,7 +4729,7 @@ The encoding is responsible for the correct character representation.
-
+ Voer lied %d van %d in
@@ -4463,7 +4737,7 @@ The encoding is responsible for the correct character representation.
-
+ Uitvoer "%s"...
@@ -4494,12 +4768,12 @@ The encoding is responsible for the correct character representation.
-
+ Uitvoer voltooi.
-
+ Die lied uitvoer het misluk.
@@ -4613,17 +4887,17 @@ The encoding is responsible for the correct character representation.
-
+ Die outeur %s bestaan alreeds. Moet liedere met die outeur %s die bestaande outeur %s gebruik?
-
+ Die onderwerp %s bestaan alreeds. Moet liedere met die onderwerp %s die bestaande onderwerp %s gebruik?
-
+ Die boek %s bestaan reeds. Moed liedere met die doek %s gebruik maak van bestaande boek %s?
@@ -4646,12 +4920,12 @@ The encoding is responsible for the correct character representation.
-
+ Opdateer diens van lied-redigering
-
+ Voer vermisde liedere by wanneer die diens oopgemaak word
diff --git a/resources/i18n/de.ts b/resources/i18n/de.ts
index e3a09b405..8fa214d0a 100644
--- a/resources/i18n/de.ts
+++ b/resources/i18n/de.ts
@@ -154,28 +154,28 @@ Do you want to continue anyway?
BibleDB.Wizard
-
+
-
+
-
+
-
+
Importing verses from <book name>...
-
+
@@ -211,7 +211,7 @@ Do you want to continue anyway?
-
+
@@ -517,7 +517,7 @@ Changes do not affect verses already in the service.
Übersetzung bereits vorhanden
-
+
Der Bibelimport ist fehlgeschlagen.
@@ -537,12 +537,12 @@ Changes do not affect verses already in the service.
Diese Bibel existiert bereit. Bitte geben Sie einen anderen Übersetzungsnamen an oder löschen Sie zuerst die Existierende.
-
+
Starte Erfassung der Bibel...
-
+
Erfassung abgeschlossen.
@@ -666,7 +666,7 @@ Daher ist eine Verbindung zum Internet erforderlich.
BiblesPlugin.Opensong
-
+
Importing <book name> <chapter>...
%s %s wird importiert...
@@ -675,12 +675,12 @@ Daher ist eine Verbindung zum Internet erforderlich.
BiblesPlugin.OsisImport
-
+
Kodierung wird ermittelt (dies kann etwas dauern)...
-
+
Importing <book name> <chapter>...
%s %s wird importiert...
@@ -834,60 +834,60 @@ Daher ist eine Verbindung zum Internet erforderlich.
ImagePlugin
-
+
<strong>Bilder Erweiterung</strong><br />Die Erweiterung Bilder ermöglicht die Anzeige von Bildern.<br />Eine der besonderen Eigenschaften dieser Erweiterung ist die Möglichkeit, in der Ablaufverwaltung, mehrere Bilder zu einer Gruppe zusammen zu fassen. Dies vereinfacht die die Anzeige mehrerer Bilder. Ebenso kann mit Hilfe der Zeitschleife, sehr einfach eine Diaschau erzeugt werden, welche dann automatisch abläuft. Des weiteren können mit dieser Erweiterung Bilder benutzt werden, um das Hintergrundbild des aktuellen Design zu ersetzen.
-
+
name singular
Bild
-
+
name plural
Bilder
-
+
container title
Bilder
-
+
-
+
Füge eine neues Bild hinzu
-
+
Bearbeite das ausgewählte Bild
-
+
Lösche da ausgewählte Bild
-
+
-
+
-
+
@@ -943,60 +943,60 @@ Wollen Sie die anderen Bilder trotzdem hinzufügen?
MediaPlugin
-
+
<strong>Erweiterung Medien</strong><br />Die Erweiterung Medien ermöglicht es Audio- und Videodateien abzuspielen.
-
+
name singular
Medien
-
+
name plural
Medien
-
+
container title
Medien
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -1080,17 +1080,17 @@ Erkunden Sie OpenLP: http://openlp.org/
OpenLP wird von freiwiligen Helfern programmiert und gewartet. Wenn Sie sich mehr freie christliche Programme wünschen, ermutigen wir Sie, sich doch sich zu beteiligen und den Knopf weiter unten nutzen.
-
+
Danksagungen
-
+
Lizenz
-
+
Mitmachen
@@ -1100,7 +1100,17 @@ OpenLP wird von freiwiligen Helfern programmiert und gewartet. Wenn Sie sich meh
build %s
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
+Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carsten
+Tinggaard, Frode Woldsund
@@ -1256,18 +1286,18 @@ Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, CarstennTinggaard, Frod
-
- Tag ID
+
+
-
- Anfangs HTML
+
+
-
- End HTML
+
+
@@ -1403,6 +1433,206 @@ Version: %s
Datei kopieren
+
+ OpenLP.FirstTimeLanguageForm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ OpenLP.FirstTimeWizard
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Lieder
+
+
+
+
+
+
+
+
+
+ Bibeltext
+
+
+
+
+ Bilder
+
+
+
+
+ Präsentationen
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
OpenLP.GeneralTab
@@ -1524,12 +1754,12 @@ Version: %s
OpenLP.LanguageManager
-
+
Sprache
-
+
Bitte starten Sie OpenLP neu, um die neue Spracheinstellung zu verwenden.
@@ -1835,17 +2065,12 @@ Version: %s
&Webseite
-
-
- &Automatische Auswahl
-
-
-
+
Die Systemsprache, sofern diese verfügbar ist, verwenden.
-
+
Die Sprache von OpenLP auf %s stellen
@@ -1890,27 +2115,27 @@ Version: %s
Die Ansicht für den Live-Betrieb optimieren.
-
+
Neue OpenLP Version verfügbar
-
+
Hauptbildschirm abgedunkelt
-
+
Die Projektion ist momentan nicht aktiv.
-
+
Standarddesign: %s
-
+
@@ -1930,12 +2155,12 @@ Sie können die letzte Version auf http://openlp.org abrufen.
&Tastenkürzel einrichten...
-
+
OpenLP beenden
-
+
Sind Sie sicher, dass OpenLP beendet werden soll?
@@ -1964,11 +2189,16 @@ Sie können die letzte Version auf http://openlp.org abrufen.
+
+
+
+
+
OpenLP.MediaManagerItem
-
+
Keine Elemente ausgewählt.
@@ -2246,29 +2476,29 @@ Sie können die letzte Version auf http://openlp.org abrufen.
&Design des Elements ändern
-
+
Die gewählte Datei ist keine gültige OpenLP Ablaufdatei.
Der Inhalt ist nicht in UTF-8 kodiert.
-
+
Die Datei ist keine gültige OpenLP Ablaufdatei.
-
+
Fehlende Anzeigesteuerung
-
+
Dieses Element kann nicht angezeigt werden, da es keine Steuerung dafür gibt.
-
+
Dieses Element kann nicht angezeigt werden, da die zugehörige Erweiterung fehlt oder inaktiv ist.
@@ -2298,7 +2528,7 @@ Der Inhalt ist nicht in UTF-8 kodiert.
Ablauf öffnen
-
+
OpenLP Ablaufdateien (*.osz)
@@ -2425,57 +2655,57 @@ Der Inhalt ist nicht in UTF-8 kodiert.
OpenLP.SlideController
-
+
Vorherige Seite anzeigen
-
+
Nächste Seite anzeigen
-
+
Verbergen
-
+
Zur Live Ansicht verschieben
-
+
Endlosschleife starten
-
+
Endlosschleife stoppen
-
+
Pause zwischen den Folien in Sekunden
-
+
Abspielen
-
+
Gehe zu
-
+
Bearbeiten und Liedvorschau aktualisieren
-
+
Anzeige abdunkeln
@@ -2485,32 +2715,32 @@ Der Inhalt ist nicht in UTF-8 kodiert.
Design leeren
-
+
Desktop anzeigen
-
+
-
+
-
+
-
+
-
+
@@ -2632,69 +2862,69 @@ Der Inhalt ist nicht in UTF-8 kodiert.
Als &globalen Standard setzen
-
+
%s (standard)
-
+
Zum Bearbeiten muss ein Design ausgewählt sein.
-
+
Es ist nicht möglich das Standarddesign zu entfernen.
-
+
Es ist kein Design ausgewählt.
-
+
Speicherort für »%s«
-
+
Design exportiert
-
+
Das Design wurde erfolgreich exportiert.
-
+
Designexport fehlgeschlagen
-
+
Dieses Design konnte aufgrund eines Fehlers nicht exportiert werden.
-
+
OpenLP Designdatei importieren
-
+
Die Datei ist keine gültige OpenLP Designdatei.
Sie ist nicht in UTF-8 kodiert.
-
+
Diese Datei ist keine gültige OpenLP Designdatei.
-
+
Das Design %s wird in der %s Erweiterung benutzt.
@@ -2714,42 +2944,42 @@ Sie ist nicht in UTF-8 kodiert.
Design &exportieren
-
+
Es ist kein Design zur Umbenennung ausgewählt.
-
+
Umbenennung bestätigen
-
+
Soll das Design »%s« wirklich umbenennt werden?
-
+
Es ist kein Design zum Löschen ausgewählt.
-
+
Löschbestätigung
-
+
Sott das Design »%s« wirklich gelöscht werden?
-
+
-
+
Ein Design mit diesem Namen existiert bereits.
@@ -2779,7 +3009,7 @@ Sie ist nicht in UTF-8 kodiert.
-
+
OpenLP Designs (*.theme *.otz)
@@ -3780,69 +4010,79 @@ Sie ist nicht in UTF-8 kodiert.
Speicherort
-
+
Aufrufprotokoll_%s_%s.txt
-
+
-
+
+
+
+
+
+
+
+
+
+
+
SongsPlugin
-
+
&Lied
-
+
Lieder importieren.
-
+
<strong>Erweiterung Lieder</strong><br />Die Erweiterung Lieder ermöglicht die Darstellung und Verwaltung von Liedtexten.
-
+
Liederverzeichnis &reindizieren
-
+
Das reindizieren der Liederdatenbank kann die Suchergebnisse verbessern.
-
+
Reindiziere die Liederdatenbank...
-
+
name singular
Lied
-
+
name plural
Lieder
-
+
container title
Lieder
@@ -3937,37 +4177,37 @@ Usually you are fine with the preselected choice.
-
+
-
+
Erstelle eine neues Lied
-
+
Bearbeite das ausgewählte Lied
-
+
Lösche das ausgewählte Lied
-
+
-
+
-
+
@@ -4423,12 +4663,12 @@ Usually you are fine with the preselected choice.
Liedtext
-
+
Lied(er) löschen?
-
+
CCLI-Lizenz:
@@ -4438,7 +4678,7 @@ Usually you are fine with the preselected choice.
Ganzes Lied
-
+
Sind Sie sicher, dass das Lied gelöscht werden soll?
diff --git a/resources/i18n/en.ts b/resources/i18n/en.ts
index 0dcfa3e8b..0897347d7 100644
--- a/resources/i18n/en.ts
+++ b/resources/i18n/en.ts
@@ -153,28 +153,28 @@ Do you want to continue anyway?
BibleDB.Wizard
-
+
-
+
-
+
-
+
Importing verses from <book name>...
-
+
@@ -210,7 +210,7 @@ Do you want to continue anyway?
-
+
@@ -529,7 +529,7 @@ Changes do not affect verses already in the service.
-
+
@@ -539,12 +539,12 @@ Changes do not affect verses already in the service.
-
+
-
+
@@ -661,7 +661,7 @@ demand and thus an internet connection is required.
BiblesPlugin.Opensong
-
+
Importing <book name> <chapter>...
@@ -670,12 +670,12 @@ demand and thus an internet connection is required.
BiblesPlugin.OsisImport
-
+
-
+
Importing <book name> <chapter>...
@@ -829,59 +829,59 @@ demand and thus an internet connection is required.
ImagePlugin
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
name singular
-
+
name plural
-
+
container title
@@ -937,59 +937,59 @@ Do you want to add the other images anyway?
MediaPlugin
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
name singular
-
+
name plural
-
+
container title
@@ -1068,17 +1068,17 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
-
+
-
+
-
+
@@ -1088,7 +1088,17 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
+Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carsten
+Tinggaard, Frode Woldsund
@@ -1244,17 +1274,17 @@ Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, CarstennTinggaard, Frod
-
+
-
+
-
+
@@ -1389,6 +1419,206 @@ Version: %s
+
+ OpenLP.FirstTimeLanguageForm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ OpenLP.FirstTimeWizard
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
OpenLP.GeneralTab
@@ -1510,12 +1740,12 @@ Version: %s
OpenLP.LanguageManager
-
+
-
+
@@ -1821,17 +2051,12 @@ Version: %s
-
-
-
-
-
-
+
-
+
@@ -1876,29 +2101,29 @@ Version: %s
-
+
-
+
-
+
-
+
-
+
@@ -1914,12 +2139,12 @@ You can download the latest version from http://openlp.org/.
-
+
-
+
@@ -1948,11 +2173,16 @@ You can download the latest version from http://openlp.org/.
+
+
+
+
+
OpenLP.MediaManagerItem
-
+
@@ -2230,33 +2460,33 @@ You can download the latest version from http://openlp.org/.
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2408,57 +2638,57 @@ The content encoding is not UTF-8.
OpenLP.SlideController
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2468,32 +2698,32 @@ The content encoding is not UTF-8.
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2640,68 +2870,68 @@ The content encoding is not UTF-8.
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2721,47 +2951,47 @@ The content encoding is not UTF-8.
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -3762,82 +3992,92 @@ The content encoding is not UTF-8.
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
SongsPlugin
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -3930,25 +4170,25 @@ The encoding is responsible for the correct character representation.
-
+
name singular
-
+
name plural
-
+
container title
-
+
@@ -4404,12 +4644,12 @@ The encoding is responsible for the correct character representation.
-
+
-
+
@@ -4419,7 +4659,7 @@ The encoding is responsible for the correct character representation.
-
+
diff --git a/resources/i18n/en_GB.ts b/resources/i18n/en_GB.ts
index 9f8f7f560..1c1c672b5 100644
--- a/resources/i18n/en_GB.ts
+++ b/resources/i18n/en_GB.ts
@@ -153,28 +153,28 @@ Do you want to continue anyway?
BibleDB.Wizard
-
+
-
+
-
+
-
+
Importing verses from <book name>...
-
+
@@ -210,7 +210,7 @@ Do you want to continue anyway?
-
+
@@ -520,7 +520,7 @@ Changes do not affect verses already in the service.
Bible Exists
-
+
Your Bible import failed.
@@ -535,12 +535,12 @@ Changes do not affect verses already in the service.
This Bible already exists. Please import a different Bible or first delete the existing one.
-
+
-
+
@@ -662,7 +662,7 @@ demand and thus an internet connection is required.
BiblesPlugin.Opensong
-
+
Importing <book name> <chapter>...
@@ -671,12 +671,12 @@ demand and thus an internet connection is required.
BiblesPlugin.OsisImport
-
+
-
+
Importing <book name> <chapter>...
@@ -830,59 +830,59 @@ demand and thus an internet connection is required.
ImagePlugin
-
+
<strong>Image Plugin</strong><br />The image plugin provides displaying of images.<br />One of the distinguishing features of this plugin is the ability to group a number of images together in the service manager, making the displaying of multiple images easier. This plugin can also make use of OpenLP's "timed looping" feature to create a slide show that runs automatically. In addition to this, images from the plugin can be used to override the current theme's background, which renders text-based items like songs with the selected image as a background instead of the background provided by the theme.
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
name singular
Image
-
+
name plural
-
+
container title
@@ -938,59 +938,59 @@ Do you want to add the other images anyway?
MediaPlugin
-
+
<strong>Media Plugin</strong><br />The media plugin provides playback of audio and video.
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
name singular
Media
-
+
name plural
Media
-
+
container title
Media
@@ -1075,17 +1075,17 @@ Find out more about OpenLP: http://openlp.org/
OpenLP is written and maintained by volunteers. If you would like to see more free Christian software being written, please consider contributing by using the button below.
-
+
Credits
-
+
Licence
-
+
Contribute
@@ -1095,7 +1095,17 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
build %s
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
+Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carsten
+Tinggaard, Frode Woldsund
@@ -1251,17 +1281,17 @@ Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, CarstennTinggaard, Frod
-
+
-
+
-
+
@@ -1396,6 +1426,206 @@ Version: %s
+
+ OpenLP.FirstTimeLanguageForm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ OpenLP.FirstTimeWizard
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
OpenLP.GeneralTab
@@ -1517,12 +1747,12 @@ Version: %s
OpenLP.LanguageManager
-
+
Language
-
+
Please restart OpenLP to use your new language setting.
@@ -1828,17 +2058,12 @@ Version: %s
&Web Site
-
-
- &Auto Detect
-
-
-
+
Use the system language, if available.
-
+
Set the interface language to %s
@@ -1883,7 +2108,7 @@ Version: %s
Set the view mode to Live.
-
+
@@ -1891,22 +2116,22 @@ You can download the latest version from http://openlp.org/.
You can download the latest version from http://openlp.org/.
-
+
OpenLP Version Updated
-
+
OpenLP Main Display Blanked
-
+
The Main Display has been blanked out
-
+
Default Theme: %s
@@ -1922,12 +2147,12 @@ You can download the latest version from http://openlp.org/.
-
+
-
+
@@ -1956,11 +2181,16 @@ You can download the latest version from http://openlp.org/.
+
+
+
+
+
OpenLP.MediaManagerItem
-
+
No Items Selected
@@ -2238,29 +2468,29 @@ You can download the latest version from http://openlp.org/.
&Change Item Theme
-
+
File is not a valid service.
The content encoding is not UTF-8.
-
+
File is not a valid service.
-
+
Missing Display Handler
-
+
Your item cannot be displayed as there is no handler to display it
-
+
Your item cannot be displayed as the plugin required to display it is missing or inactive
@@ -2290,7 +2520,7 @@ The content encoding is not UTF-8.
-
+
@@ -2417,57 +2647,57 @@ The content encoding is not UTF-8.
OpenLP.SlideController
-
+
Move to previous
-
+
Move to next
-
+
Hide
-
+
Move to live
-
+
Start continuous loop
-
+
Stop continuous loop
-
+
Delay between slides in seconds
-
+
Start playing media
-
+
Go To
-
+
Edit and reload song preview
-
+
@@ -2477,32 +2707,32 @@ The content encoding is not UTF-8.
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2649,69 +2879,69 @@ The content encoding is not UTF-8.
Set As &Global Default
-
+
%s (default)
-
+
You must select a theme to edit.
-
+
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
-
+
File is not a valid theme.
The content encoding is not UTF-8.
-
+
File is not a valid theme.
-
+
Theme %s is used in the %s plugin.
@@ -2731,47 +2961,47 @@ The content encoding is not UTF-8.
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -3772,99 +4002,109 @@ The content encoding is not UTF-8.
Output File Location
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
SongsPlugin
-
+
&Song
-
+
Import songs using the import wizard.
-
+
<strong>Songs Plugin</strong><br />The songs plugin provides the ability to display and manage songs.
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
name singular
Song
-
+
name plural
Songs
-
+
container title
Songs
@@ -3958,7 +4198,7 @@ The encoding is responsible for the correct character representation.
-
+
@@ -4414,12 +4654,12 @@ The encoding is responsible for the correct character representation.
Lyrics
-
+
Delete Song(s)?
-
+
@@ -4429,7 +4669,7 @@ The encoding is responsible for the correct character representation.
-
+
diff --git a/resources/i18n/en_ZA.ts b/resources/i18n/en_ZA.ts
index 3b6dffb0d..176d72218 100644
--- a/resources/i18n/en_ZA.ts
+++ b/resources/i18n/en_ZA.ts
@@ -155,28 +155,28 @@ Do you want to continue anyway?
BibleDB.Wizard
-
+
Importing testaments... %s
-
+
Importing testaments... done.
-
+
Importing books... %s
-
+
Importing verses from <book name>...
Importing verses from %s...
-
+
Importing verses... done.
@@ -212,7 +212,7 @@ Do you want to continue anyway?
Bible not fully loaded.
-
+
You cannot combine single and dual Bible verse search results. Do you want to delete your search results and start a new search?
@@ -530,7 +530,7 @@ Changes do not affect verses already in the service.
Bible Exists
-
+
Your Bible import failed.
@@ -545,12 +545,12 @@ Changes do not affect verses already in the service.
This Bible already exists. Please import a different Bible or first delete the existing one.
-
+
Starting Registering bible...
-
+
Registered bible. Please note, that verses will be downloaded on
@@ -570,37 +570,37 @@ demand and thus an internet connection is required.
-
+ Bibleserver
-
+ Bible file:
-
+ Testaments file:
-
+ Books file:
-
+ Verses file:
-
+ You have not specified a testaments file. Do you want to proceed with the import?
-
+ openlp.org 1.x Bible Files
@@ -668,30 +668,30 @@ demand and thus an internet connection is required.
-
+ Scripture Reference
BiblesPlugin.Opensong
-
+
Importing <book name> <chapter>...
-
+ Importing %s %s...
BiblesPlugin.OsisImport
-
+
-
+ Detecting encoding (this may take a few minutes)...
-
+
Importing <book name> <chapter>...
-
+ Importing %s %s...
@@ -842,59 +842,59 @@ demand and thus an internet connection is required.
ImagePlugin
-
+
<strong>Image Plugin</strong><br />The image plugin provides displaying of images.<br />One of the distinguishing features of this plugin is the ability to group a number of images together in the service manager, making the displaying of multiple images easier. This plugin can also make use of OpenLP's "timed looping" feature to create a slide show that runs automatically. In addition to this, images from the plugin can be used to override the current theme's background, which renders text-based items like songs with the selected image as a background instead of the background provided by the theme.
-
+
Load a new Image
-
+
Add a new Image
-
+
Edit the selected Image
-
+
Delete the selected Image
-
+
Preview the selected Image
-
+
Send the selected Image live
-
+
Add the selected Image to the service
-
+
name singular
Image
-
+
name plural
Images
-
+
container title
Images
@@ -905,7 +905,7 @@ demand and thus an internet connection is required.
-
+ Select Attachment
@@ -928,81 +928,82 @@ demand and thus an internet connection is required.
-
+ Missing Image(s)
-
+ The following image(s) no longer exist: %s
-
+ The following image(s) no longer exist: %s
+Do you want to add the other images anyway?
-
+ There was a problem replacing your background, the image file "%s" no longer exists.
MediaPlugin
-
+
<strong>Media Plugin</strong><br />The media plugin provides playback of audio and video.
-
+
Load a new Media
-
+
Add a new Media
-
+
Edit the selected Media
-
+
Delete the selected Media
-
+
Preview the selected Media
-
+
Send the selected Media live
-
+
Add the selected Media to the service
-
+
name singular
Media
-
+
name plural
Media
-
+
container title
Media
@@ -1023,12 +1024,12 @@ Do you want to add the other images anyway?
-
+ Missing Media File
-
+ The file %s no longer exists.
@@ -1038,12 +1039,12 @@ Do you want to add the other images anyway?
-
+ There was a problem replacing your background, the media file "%s" no longer exists.
-
+ Videos (%s);;Audio (%s);;%s (*)
@@ -1087,17 +1088,17 @@ Find out more about OpenLP: http://openlp.org/
OpenLP is written and maintained by volunteers. If you would like to see more free Christian software being written, please consider contributing by using the button below.
-
+
Credits
-
+
License
-
+
Contribute
@@ -1107,7 +1108,17 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
build %s
-
+
+
+ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
+
+
+
+
+ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See below for more details.
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
+Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carsten
+Tinggaard, Frode Woldsund
@@ -1191,37 +1222,37 @@ Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, CarstennTinggaard, Frod
-
+ Enable application exit confirmation
-
+ Mouse Cursor
-
+ Hide mouse cursor when over display window
-
+ Default Image
- Background color:
+ Background colour:
-
+ Image file:
-
+ Open File
@@ -1229,51 +1260,51 @@ Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, CarstennTinggaard, Frod
-
+ Edit Selection
-
+ Update
-
+ Description
-
+ Tag
-
+ Start tag
-
+ End tag
-
+ Default
-
+
-
+
-
+
@@ -1282,17 +1313,17 @@ Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, CarstennTinggaard, Frod
-
+ Update Error
-
+ Tag "n" already defined.
-
+ Tag %s already defined.
@@ -1310,28 +1341,29 @@ Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, CarstennTinggaard, Frod
-
+ Send E-Mail
-
+ Save to File
-
+ Please enter a description of what you were doing to cause this error
+(Minimum 20 characters)
-
+ Attach File
-
+ Description characters to enter : %s
@@ -1340,17 +1372,18 @@ Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, CarstennTinggaard, Frod
-
+ Platform: %s
+
-
+ Save Crash Report
-
+ Text files (*.txt *.log *.text)
@@ -1368,7 +1401,20 @@ Version: %s
--- Library Versions ---
%s
-
+ **OpenLP Bug Report**
+Version: %s
+
+--- Details of the Exception. ---
+
+%s
+
+ --- Exception Traceback ---
+%s
+--- System information ---
+%s
+--- Library Versions ---
+%s
+
@@ -1387,7 +1433,20 @@ Version: %s
%s
Please add the information that bug reports are favoured written in English.
-
+ *OpenLP Bug Report*
+Version: %s
+
+--- Details of the Exception. ---
+
+%s
+
+ --- Exception Traceback ---
+%s
+--- System information ---
+%s
+--- Library Versions ---
+%s
+
@@ -1405,6 +1464,206 @@ Version: %s
+ File Copy
+
+
+
+ OpenLP.FirstTimeLanguageForm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ OpenLP.FirstTimeWizard
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1523,18 +1782,18 @@ Version: %s
-
+ Check for updates to OpenLP
OpenLP.LanguageManager
-
+
Language
-
+
Please restart OpenLP to use your new language setting.
@@ -1544,7 +1803,7 @@ Version: %s
-
+ OpenLP Display
@@ -1840,17 +2099,12 @@ Version: %s
&Web Site
-
-
- &Auto Detect
-
-
-
+
Use the system language, if available.
-
+
Set the interface language to %s
@@ -1895,27 +2149,27 @@ Version: %s
Set the view mode to Live.
-
+
OpenLP Version Updated
-
+
OpenLP Main Display Blanked
-
+
The Main Display has been blanked out
-
+
Default Theme: %s
-
+
@@ -1935,45 +2189,50 @@ You can download the latest version from http://openlp.org/.
Configure &Shortcuts...
-
+
-
+ Close OpenLP
-
+
-
+ Are you sure you want to close OpenLP?
-
+ Print the current Service Order.
-
+ Ctrl+P
-
+ Open &Data Folder...
-
+ Open the folder where songs, Bibles and other data resides.
+ &Configure Display Tags
+
+
+
+
OpenLP.MediaManagerItem
-
+
No Items Selected
@@ -2061,12 +2320,12 @@ You can download the latest version from http://openlp.org/.
-
+ Fit Page
-
+ Fit Width
@@ -2074,62 +2333,62 @@ You can download the latest version from http://openlp.org/.
-
+ Options
-
+ Close
-
+ Copy
-
+ Copy as HTML
-
+ Zoom In
-
+ Zoom Out
-
+ Zoom Original
-
+ Other Options
-
+ Include slide text if available
-
+ Include service item notes
-
+ Include play length of media items
-
+ Service Order Sheet
@@ -2137,12 +2396,12 @@ You can download the latest version from http://openlp.org/.
-
+ Screen
-
+ primary
@@ -2251,29 +2510,29 @@ You can download the latest version from http://openlp.org/.
&Change Item Theme
-
+
File is not a valid service.
The content encoding is not UTF-8.
-
+
File is not a valid service.
-
+
Missing Display Handler
-
+
Your item cannot be displayed as there is no handler to display it
-
+
Your item cannot be displayed as the plugin required to display it is missing or inactive
@@ -2300,67 +2559,67 @@ The content encoding is not UTF-8.
-
+ Open File
-
+
-
+ OpenLP Service Files (*.osz)
-
+ Moves the selection down the window.
-
+ Move up
-
+ Moves the selection up the window.
-
+ Go Live
-
+ Send the selected item to Live.
-
+ Modified Service
-
+ Notes:
-
+ &Start Time
-
+ Show &Preview
-
+ Show &Live
-
+ The current service has been modified. Would you like to save this service?
@@ -2424,63 +2683,63 @@ The content encoding is not UTF-8.
-
+ Alternate
OpenLP.SlideController
-
+
Move to previous
-
+
Move to next
-
+
Hide
-
+
Move to live
-
+
Start continuous loop
-
+
Stop continuous loop
-
+
Delay between slides in seconds
-
+
Start playing media
-
+
Go To
-
+
Edit and reload song preview
-
+
Blank Screen
@@ -2490,34 +2749,34 @@ The content encoding is not UTF-8.
Blank to Theme
-
+
Show Desktop
-
+
-
+ Previous Slide
-
+
-
+ Next Slide
-
+
-
+ Previous Service
-
+
-
+ Next Service
-
+
-
+ Escape Item
@@ -2538,32 +2797,32 @@ The content encoding is not UTF-8.
-
+ Item Start Time
-
+ Hours:
-
+ h
-
+ m
-
+ Minutes:
-
+ Seconds:
@@ -2662,69 +2921,69 @@ The content encoding is not UTF-8.
Set As &Global Default
-
+
%s (default)
-
+
You must select a theme to edit.
-
+
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
-
+
File is not a valid theme.
The content encoding is not UTF-8.
-
+
File is not a valid theme.
-
+
Theme %s is used in the %s plugin.
@@ -2744,49 +3003,49 @@ The content encoding is not UTF-8.
&Export Theme
-
+
-
+ You must select a theme to rename.
-
+
-
+ Rename Confirmation
-
+
-
+ Rename %s theme?
-
+
-
+ You must select a theme to delete.
-
+
-
+ Delete Confirmation
-
+
-
+ Delete %s theme?
-
+
-
+ Validation Error
-
+
-
+ A theme with this name already exists.
-
+
-
+ OpenLP Themes (*.theme *.otz)
@@ -2829,7 +3088,7 @@ The content encoding is not UTF-8.
- Color:
+ Colour:
@@ -2949,22 +3208,22 @@ The content encoding is not UTF-8.
-
+ Output Area Locations
-
+ Allows you to change and move the main and footer areas.
-
+ &Main Area
-
+ &Use default location
@@ -2999,37 +3258,37 @@ The content encoding is not UTF-8.
-
+ Save and Preview
-
+ View the theme and save it replacing the current one or change the name to create a new theme
-
+ Theme name:
-
+ 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.
-
+ Transitions:
-
+ &Footer Area
-
+ Edit Theme - %s
@@ -3090,17 +3349,17 @@ The content encoding is not UTF-8.
-
+ Delete the selected item.
-
+ Move selection up one position.
-
+ Move selection down one position.
@@ -3135,7 +3394,7 @@ The content encoding is not UTF-8.
-
+ Length %s
@@ -3150,7 +3409,7 @@ The content encoding is not UTF-8.
-
+ New
@@ -3185,7 +3444,7 @@ The content encoding is not UTF-8.
-
+ Reset Background
@@ -3205,12 +3464,12 @@ The content encoding is not UTF-8.
-
+ Start %s
-
+ &Vertical Align:
@@ -3240,7 +3499,7 @@ The content encoding is not UTF-8.
-
+ Cancel
@@ -3250,12 +3509,12 @@ The content encoding is not UTF-8.
-
+ Empty Field
-
+ Export
@@ -3271,12 +3530,12 @@ The content encoding is not UTF-8.
-
+ Live Background Error
-
+ Live Panel
@@ -3287,19 +3546,19 @@ The content encoding is not UTF-8.
Singular
-
+ No File Selected
Plural
-
+ No Files Selected
Singular
-
+ No Item Selected
@@ -3315,12 +3574,12 @@ The content encoding is not UTF-8.
-
+ Preview Panel
-
+ Print Service Order
@@ -3363,7 +3622,7 @@ The content encoding is not UTF-8.
-
+ Version
@@ -3393,7 +3652,7 @@ The content encoding is not UTF-8.
-
+ Select the import format and the location to import from.
@@ -3403,7 +3662,7 @@ The content encoding is not UTF-8.
-
+ Open %s File
@@ -3424,7 +3683,7 @@ The content encoding is not UTF-8.
A file type e.g. OpenSong
-
+ You need to specify at least one %s file to import from.
@@ -3434,7 +3693,7 @@ The content encoding is not UTF-8.
-
+ Welcome to the Song Export Wizard
@@ -3445,7 +3704,7 @@ The content encoding is not UTF-8.
Singular
-
+ Author
@@ -3494,7 +3753,7 @@ The content encoding is not UTF-8.
-
+ Configure Display Tags
@@ -3507,27 +3766,27 @@ The content encoding is not UTF-8.
-
+ Load a new Presentation
-
+ Delete the selected Presentation
-
+ Preview the selected Presentation
-
+ Send the selected Presentation live
-
+ Add the selected Presentation to the service
@@ -3588,22 +3847,22 @@ The content encoding is not UTF-8.
-
+ Presentations (%s)
-
+ Missing Presentation
-
+ The Presentation %s no longer exists.
-
+ The Presentation %s is incomplete, please reload.
@@ -3621,7 +3880,7 @@ The content encoding is not UTF-8.
-
+ %s (unavailable)
@@ -3635,7 +3894,7 @@ The content encoding is not UTF-8.
name singular
-
+ Remote
@@ -3647,7 +3906,7 @@ The content encoding is not UTF-8.
container title
-
+ Remote
@@ -3714,19 +3973,19 @@ The content encoding is not UTF-8.
name singular
-
+ SongUsage
name plural
-
+ SongUsage
container title
-
+ SongUsage
@@ -3749,12 +4008,12 @@ The content encoding is not UTF-8.
-
+ Deletion Successful
-
+ All requested data has been deleted successfully.
@@ -3785,99 +4044,111 @@ The content encoding is not UTF-8.
Report Location
-
+
-
+ usage_detail_%s_%s.txt
-
+
-
+ Report Creation
-
+
+ Report
+%s
+has been successfully created.
+
+
+
+
+
+
+
+
+
SongsPlugin
-
+
&Song
-
+
Import songs using the import wizard.
-
+
<strong>Songs Plugin</strong><br />The songs plugin provides the ability to display and manage songs.
-
+
-
+ &Re-index Songs
-
+
-
+ Re-index the songs database to improve searching and ordering.
-
+
-
+ Reindexing songs...
+
+
+
+
+ Add a new Song
-
-
+
+ Edit the selected Song
-
-
+
+ Delete the selected Song
-
-
+
+ Preview the selected Song
-
-
+
+ Send the selected Song live
-
-
-
-
-
-
+ Add the selected Song to the service
-
+
name singular
Song
-
+
name plural
Songs
-
+
container title
Songs
@@ -3885,95 +4156,98 @@ has been successfully created.
-
+ Arabic (CP-1256)
-
+ Baltic (CP-1257)
-
+ Central European (CP-1250)
-
+ Cyrillic (CP-1251)
-
+ Greek (CP-1253)
-
+ Hebrew (CP-1255)
-
+ Japanese (CP-932)
-
+ Korean (CP-949)
-
+ Simplified Chinese (CP-936)
-
+ Thai (CP-874)
-
+ Traditional Chinese (CP-950)
-
+ Turkish (CP-1254)
-
+ Vietnam (CP-1258)
-
+ Western European (CP-1252)
-
+ Character Encoding
-
+ The codepage setting is responsible
+for the correct character representation.
+Usually you are fine with the preselected choice.
-
+ Please choose the character encoding.
+The encoding is responsible for the correct character representation.
-
+
-
+ Exports songs using the export wizard.
@@ -4019,7 +4293,7 @@ The encoding is responsible for the correct character representation.
-
+ Importing song %d of %d
@@ -4197,12 +4471,12 @@ The encoding is responsible for the correct character representation.
-
+ You need to have an author for this song.
-
+ You need to type some text in to the verse.
@@ -4228,82 +4502,82 @@ The encoding is responsible for the correct character representation.
-
+ Song Export Wizard
-
+ This wizard will help to export your songs to the open and free OpenLyrics worship song format.
-
+ Select Songs
-
+ Uncheck All
-
+ Check All
-
+ Select Directory
-
+ Select the directory you want the songs to be saved.
-
+ Directory:
-
+ Exporting
-
+ Please wait while your songs are exported.
-
+ You need to add at least one Song to export.
-
+ No Save Location specified
-
+ Starting export...
-
+ Check the songs you want to export.
-
+ You need to specify a directory.
-
+ Select Destination Folder
@@ -4371,42 +4645,42 @@ The encoding is responsible for the correct character representation.
-
+ OpenLP 2.0 Databases
-
+ openlp.org v1.x Databases
-
+ Words Of Worship Song Files
-
+ Songs Of Fellowship Song Files
-
+ SongBeamer Files
-
+ SongShow Plus Song Files
-
+ You need to specify at least one document or presentation file to import from.
-
+ Foilpresenter Song Files
@@ -4427,26 +4701,26 @@ The encoding is responsible for the correct character representation.
Lyrics
-
+
Delete Song(s)?
-
+
-
+ CCLI License:
-
+ Entire Song
-
+
-
-
-
+
+ Are you sure you want to delete the %n selected song(s)?
+ Are you sure you want to delete the %n selected song(s)?
@@ -4455,7 +4729,7 @@ The encoding is responsible for the correct character representation.
-
+ Importing song %d of %d.
@@ -4463,7 +4737,7 @@ The encoding is responsible for the correct character representation.
-
+ Exporting "%s"...
@@ -4494,12 +4768,12 @@ The encoding is responsible for the correct character representation.
-
+ Finished export.
-
+ Your song export failed.
@@ -4613,17 +4887,17 @@ The encoding is responsible for the correct character representation.
-
+ The author %s already exists. Would you like to make songs with author %s use the existing author %s?
-
+ The topic %s already exists. Would you like to make songs with topic %s use the existing topic %s?
-
+ The book %s already exists. Would you like to make songs with book %s use the existing book %s?
@@ -4646,12 +4920,12 @@ The encoding is responsible for the correct character representation.
-
+ Update service from song edit
-
+ Add missing songs when opening service
diff --git a/resources/i18n/es.ts b/resources/i18n/es.ts
index 7db94baba..e2d926a23 100644
--- a/resources/i18n/es.ts
+++ b/resources/i18n/es.ts
@@ -154,28 +154,28 @@ Do you want to continue anyway?
BibleDB.Wizard
-
+
-
+
-
+
-
+
Importing verses from <book name>...
-
+
@@ -211,7 +211,7 @@ Do you want to continue anyway?
-
+
@@ -520,7 +520,7 @@ Changes do not affect verses already in the service.
Ya existe la Biblia
-
+
La importación de su Biblia falló.
@@ -535,12 +535,12 @@ Changes do not affect verses already in the service.
-
+
-
+
@@ -662,7 +662,7 @@ demand and thus an internet connection is required.
BiblesPlugin.Opensong
-
+
Importing <book name> <chapter>...
@@ -671,12 +671,12 @@ demand and thus an internet connection is required.
BiblesPlugin.OsisImport
-
+
-
+
Importing <book name> <chapter>...
@@ -830,59 +830,59 @@ demand and thus an internet connection is required.
ImagePlugin
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
name singular
Imagen
-
+
name plural
-
+
container title
@@ -938,59 +938,59 @@ Do you want to add the other images anyway?
MediaPlugin
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
name singular
Medios
-
+
name plural
Medios
-
+
container title
Medios
@@ -1069,17 +1069,17 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
-
+
Créditos
-
+
Licencia
-
+
Contribuir
@@ -1089,7 +1089,17 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
+Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carsten
+Tinggaard, Frode Woldsund
@@ -1245,17 +1275,17 @@ Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, CarstennTinggaard, Frod
-
+
-
+
-
+
@@ -1390,6 +1420,206 @@ Version: %s
+
+ OpenLP.FirstTimeLanguageForm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ OpenLP.FirstTimeWizard
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
OpenLP.GeneralTab
@@ -1511,12 +1741,12 @@ Version: %s
OpenLP.LanguageManager
-
+
-
+
@@ -1822,17 +2052,12 @@ Version: %s
Sitio &Web
-
-
-
-
-
-
+
-
+
@@ -1877,29 +2102,29 @@ Version: %s
-
+
-
+
Versión de OpenLP Actualizada
-
+
Pantalla Principal de OpenLP en Blanco
-
+
La Pantalla Principal esta en negro
-
+
@@ -1915,12 +2140,12 @@ You can download the latest version from http://openlp.org/.
-
+
-
+
@@ -1949,11 +2174,16 @@ You can download the latest version from http://openlp.org/.
+
+
+
+
+
OpenLP.MediaManagerItem
-
+
@@ -2231,28 +2461,28 @@ You can download the latest version from http://openlp.org/.
&Cambiar Tema de Ítem
-
+
-
+
-
+
-
+
-
+
@@ -2282,7 +2512,7 @@ The content encoding is not UTF-8.
-
+
@@ -2409,57 +2639,57 @@ The content encoding is not UTF-8.
OpenLP.SlideController
-
+
Regresar al anterior
-
+
Ir al siguiente
-
+
-
+
Proyectar en vivo
-
+
Iniciar bucle continuo
-
+
Detener el bucle
-
+
Espera entre diapositivas en segundos
-
+
Iniciar la reproducción de medios
-
+
-
+
-
+
@@ -2469,32 +2699,32 @@ The content encoding is not UTF-8.
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2641,68 +2871,68 @@ The content encoding is not UTF-8.
-
+
-
+
-
+
-
+
-
+
Guardar Tema - (%s)
-
+
-
+
-
+
-
+
-
+
Seleccione el Archivo de Tema a Importar
-
+
-
+
-
+
@@ -2722,47 +2952,47 @@ The content encoding is not UTF-8.
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -3763,99 +3993,109 @@ The content encoding is not UTF-8.
Archivo de Salida
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
SongsPlugin
-
+
&Canción
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
name singular
Canción
-
+
name plural
Canciones
-
+
container title
Canciones
@@ -3949,7 +4189,7 @@ The encoding is responsible for the correct character representation.
-
+
@@ -4405,12 +4645,12 @@ The encoding is responsible for the correct character representation.
Letra
-
+
-
+
@@ -4420,7 +4660,7 @@ The encoding is responsible for the correct character representation.
-
+
diff --git a/resources/i18n/et.ts b/resources/i18n/et.ts
index 37b2170ab..04a040232 100644
--- a/resources/i18n/et.ts
+++ b/resources/i18n/et.ts
@@ -154,28 +154,28 @@ Do you want to continue anyway?
BibleDB.Wizard
-
+
Testamentide importimine... %s
-
+
Testamentide importimine... valmis.
-
+
Raamatute importimine... %s
-
+
Importing verses from <book name>...
Salmide importimine failist %s...
-
+
Salmide importimine... valmis.
@@ -211,7 +211,7 @@ Do you want to continue anyway?
-
+
@@ -539,17 +539,17 @@ Muudatused ei rakendu juba teenistusesse lisatud salmidele.
See Piibel on juba olemas! Palun impordi mingi muu Piibel või kustuta enne olemasolev.
-
+
Piibli importimine nurjus.
-
+
Piibli registreerimise alustamine...
-
+
Piibel on registreeritud. Pane tähele, et salmid laaditakse alla
@@ -672,7 +672,7 @@ vajadusel, seetõttu on vajalik internetiühendus.
BiblesPlugin.Opensong
-
+
Importing <book name> <chapter>...
%s %s. peatüki importimine...
@@ -681,12 +681,12 @@ vajadusel, seetõttu on vajalik internetiühendus.
BiblesPlugin.OsisImport
-
+
Kooditabeli tuvastamine (see võib võtta mõne minuti)...
-
+
Importing <book name> <chapter>...
%s %s. peatüki importimine...
@@ -840,59 +840,59 @@ vajadusel, seetõttu on vajalik internetiühendus.
ImagePlugin
-
+
<strong>Pildiplugin</strong><br />Pildiplugin võimaldab piltide kuvamise.<br />Üks selle plugina One of the distinguishing features of this plugin is the ability to group a number of images together in the service manager, making the displaying of multiple images easier. This plugin can also make use of OpenLP's "timed looping" feature to create a slide show that runs automatically. In addition to this, images from the plugin can be used to override the current theme's background, which renders text-based items like songs with the selected image as a background instead of the background provided by the theme.
-
+
Uue pildi laadimine
-
+
Uue pildi lisamine
-
+
Valitud pildi muutmine
-
+
Valitud pildi kustutamine
-
+
Valitud pildi eelvaatlemine
-
+
Valitud pildi saatmine ekraanile
-
+
Valitud pildi lisamine teenistusele
-
+
name singular
Pilt
-
+
name plural
Pildid
-
+
container title
Pildid
@@ -948,59 +948,59 @@ Do you want to add the other images anyway?
MediaPlugin
-
+
<strong>Meediaplugin</strong><br />Meedia plugin võimaldab audio- ja videofailide taasesitamist.
-
+
Uue meedia laadimine
-
+
Uue meedia lisamine
-
+
Valitud meedia muutmine
-
+
Valitud meedia kustutamine
-
+
Valitud meedia eelvaatlus
-
+
Valitud meedia saatmine ekraanile
-
+
Valitud meedia lisamine teenistusse
-
+
name singular
Meedia
-
+
name plural
Meedia
-
+
container title
Meedia
@@ -1068,17 +1068,17 @@ Do you want to add the other images anyway?
OpenLP.AboutForm
-
+
Autorid
-
+
Litsents
-
+
Aita kaasa
@@ -1105,7 +1105,17 @@ OpenLP kohta võid lähemalt uurida aadressil: http://openlp.org/
OpenLP on kirjutatud vabatahtlike poolt. Kui sulle meeldiks näha rohkem kristlikku tarkvara, siis võid annetada, selleks klõpsa alumisele nupule.
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
+Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carsten
+Tinggaard, Frode Woldsund
@@ -1261,18 +1291,18 @@ Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, CarstennTinggaard, Frod
-
- Sildi ID
+
+
-
- HTMLi algus
+
+
-
- HTMLi lõpp
+
+
@@ -1434,6 +1464,206 @@ Version: %s
Faili kopeerimine
+
+ OpenLP.FirstTimeLanguageForm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ OpenLP.FirstTimeWizard
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Laulud
+
+
+
+
+
+
+
+
+
+ Piibel
+
+
+
+
+ Pildid
+
+
+
+
+ Esitlused
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
OpenLP.GeneralTab
@@ -1555,12 +1785,12 @@ Version: %s
OpenLP.LanguageManager
-
+
Keel
-
+
Uue keele kasutamiseks käivita OpenLP uuesti.
@@ -1866,17 +2096,12 @@ Version: %s
&Veebileht
-
-
- &Isetuvastus
-
-
-
+
Kui saadaval, kasutatakse süsteemi keelt.
-
+
Kasutajaliidese keeleks %s määramine
@@ -1921,27 +2146,27 @@ Version: %s
Vaate režiimiks ekraanivaate valimine.
-
+
OpenLP uuendus
-
+
OpenLP peakuva on tühi
-
+
Peakuva on tühi
-
+
Vaikimisi kujundus: %s
-
+
@@ -1961,12 +2186,12 @@ Sa võid viimase versiooni alla laadida aadressilt http://openlp.org/.&Kiirklahvide seadistamine...
-
+
OpenLP sulgemine
-
+
Kas oled kindel, et tahad OpenLP sulgeda?
@@ -1995,11 +2220,16 @@ Sa võid viimase versiooni alla laadida aadressilt http://openlp.org/.Open the folder where songs, bibles and other data resides.
Laulude, Piiblite ja muude andmete kataloogi avamine.
+
+
+
+
+
OpenLP.MediaManagerItem
-
+
Ühtegi elementi pole valitud
@@ -2277,29 +2507,29 @@ Sa võid viimase versiooni alla laadida aadressilt http://openlp.org/.&Muuda elemendi kujundust
-
+
Fail ei ole sobiv teenistus.
Sisu ei ole UTF-8 kodeeringus.
-
+
Fail pole sobiv teenistus.
-
+
Puudub kuvakäsitleja
-
+
Seda elementi pole võimalik näidata ekraanil, kuna puudub seda käsitsev programm
-
+
Seda elementi pole võimalik näidata ekraanil, kuna puudub seda käsitsev programm
@@ -2329,7 +2559,7 @@ Sisu ei ole UTF-8 kodeeringus.
Faili avamine
-
+
OpenLP teenistuse failid (*.osz)
@@ -2456,57 +2686,57 @@ Sisu ei ole UTF-8 kodeeringus.
OpenLP.SlideController
-
+
Eelmisele liikumine
-
+
Järgmisele liikumine
-
+
Peida
-
+
Tõsta ekraanile
-
+
Muuda ja kuva laulu eelvaade uuesti
-
+
Katkematu korduse alustamine
-
+
Katkematu korduse lõpetamine
-
+
Viivitus slaidide vahel sekundites
-
+
Meediaesituse alustamine
-
+
Liigu kohta
-
+
Ekraani tühjendamine
@@ -2516,32 +2746,32 @@ Sisu ei ole UTF-8 kodeeringus.
Kujunduse tausta näitamine
-
+
Töölaua näitamine
-
+
Eelmine slaid
-
+
Järgmine slaid
-
+
Eelmine teenistus
-
+
Järgmine teenistus
-
+
Kuva sulgemine
@@ -2688,69 +2918,69 @@ Sisu ei ole UTF-8 kodeeringus.
Määra &globaalseks vaikeväärtuseks
-
+
%s (vaikimisi)
-
+
Pead valima kujunduse, mida muuta.
-
+
Vaikimisi kujundust pole võimalik kustutada.
-
+
Kujundust %s kasutatakse pluginas %s.
-
+
Sa ei ole kujundust valinud.
-
+
Salvesta kujundus - (%s)
-
+
Kujundus eksporditud
-
+
Sinu kujunduse on edukalt eksporditud.
-
+
Kujunduse eksportimine nurjus
-
+
Sinu kujundust polnud võimalik eksportida, kuna esines viga.
-
+
Importimiseks kujunduse faili valimine
-
+
See fail ei ole korrektne kujundus.
Sisu kodeering ei ole UTF-8.
-
+
See fail ei ole sobilik kujundus.
@@ -2770,47 +3000,47 @@ Sisu kodeering ei ole UTF-8.
&Ekspordi kujundus
-
+
Pead valima kujunduse, mida ümber nimetada.
-
+
Ümbernimetamise kinnitus
-
+
Kas anda kujundusele %s uus nimi?
-
+
Pead valima kujunduse, mida tahad kustutada.
-
+
Kustutamise kinnitus
-
+
Kas kustutada kujundus %s?
-
+
Valideerimise viga
-
+
Sellenimeline teema on juba olemas.
-
+
OpenLP kujundused (*.theme *.otz)
@@ -3811,17 +4041,17 @@ Sisu kodeering ei ole UTF-8.
Väljundfaili asukoht
-
+
laulukasutuse_andmed_%s_%s.txt
-
+
Raporti koostamine
-
+
@@ -3829,83 +4059,93 @@ has been successfully created.
%s
on edukalt loodud.
+
+
+
+
+
+
+
+
+
+
SongsPlugin
-
+
&Laul
-
+
Laulude importimine importimise nõustajaga.
-
+
<strong>Laulude plugin</strong><br />See plugin võimaldab laulude kuvamise ja haldamise.
-
+
&Indekseeri laulud uuesti
-
+
Laulude andmebaasi kordusindekseerimine, et parendada otsimist ja järjekorda.
-
+
Laulude kordusindekseerimine...
-
+
Uue laulu lisamine
-
+
Valitud laulu muutmine
-
+
Valitud laulu kustutamine
-
+
Valitud laulu eelvaatlus
-
+
Valitud laulu saatmine ekraanile
-
+
Valitud laulu lisamine teenistusele
-
+
name singular
Laul
-
+
name plural
Laulud
-
+
container title
Laulud
@@ -4001,7 +4241,7 @@ The encoding is responsible for the correct character representation.
Kodeering on vajalik märkide õige esitamise jaoks.
-
+
Eksportimise nõustaja abil laulude eksportimine.
@@ -4457,12 +4697,12 @@ Kodeering on vajalik märkide õige esitamise jaoks.
Laulusõnad
-
+
Kas kustutada laul(ud)?
-
+
CCLI litsents:
@@ -4472,7 +4712,7 @@ Kodeering on vajalik märkide õige esitamise jaoks.
Kogu laulust
-
+
diff --git a/resources/i18n/fr.ts b/resources/i18n/fr.ts
index 0a58735f8..02140b8e5 100644
--- a/resources/i18n/fr.ts
+++ b/resources/i18n/fr.ts
@@ -153,28 +153,28 @@ Do you want to continue anyway?
BibleDB.Wizard
-
+
-
+
-
+
-
+
Importing verses from <book name>...
-
+
@@ -210,7 +210,7 @@ Do you want to continue anyway?
-
+
@@ -546,19 +546,19 @@ Les changement ne s'applique aux versets déjà un service.
Fichier CSV
-
+
Commence l'enregistrement de la Bible...
-
+
Bible enregistrée. Veuillez noter que les verset vont être téléchargement
a la demande, une connexion Interner fiable est donc nécessaire.
-
+
Votre import de Bible à échoué.
@@ -664,7 +664,7 @@ a la demande, une connexion Interner fiable est donc nécessaire.
BiblesPlugin.Opensong
-
+
Importing <book name> <chapter>...
Import %s %s...
@@ -673,12 +673,12 @@ a la demande, une connexion Interner fiable est donc nécessaire.
BiblesPlugin.OsisImport
-
+
Détection de l'encodage (cela peut prendre quelque minutes)...
-
+
Importing <book name> <chapter>...
Import %s %s...
@@ -832,60 +832,60 @@ a la demande, une connexion Interner fiable est donc nécessaire.
ImagePlugin
-
+
-
+
name singular
Image
-
+
name plural
Images
-
+
container title
Images
-
+
Charge une nouvelle image
-
+
Ajoute une nouvelle image
-
+
Édite l'image sélectionnée
-
+
Efface l'image sélectionnée
-
+
Prévisualise l'image sélectionnée
-
+
Envoie l'image sélectionnée en direct
-
+
Ajoute l'image sélectionnée au service
@@ -941,60 +941,60 @@ Voulez-vous ajouter de toute façon d'autres images ?
MediaPlugin
-
+
<strong>Module média</strong><br />Le module média permet une lecture de contenu audio et vidéo.
-
+
name singular
Médias
-
+
name plural
Médias
-
+
container title
Médias
-
+
Charge un nouveau média
-
+
Ajoute un nouveau média
-
+
Édite le média sélectionné
-
+
Efface le média sélectionné
-
+
Prévisualise le média sélectionné
-
+
Envoie le média en direct
-
+
Ajouter le média sélectionné au service
@@ -1072,17 +1072,17 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
-
+
Crédits
-
+
Licence
-
+
Contribuer
@@ -1092,7 +1092,17 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
+Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carsten
+Tinggaard, Frode Woldsund
@@ -1248,17 +1278,17 @@ Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, CarstennTinggaard, Frod
-
+
-
+
-
+
@@ -1394,6 +1424,206 @@ Version: %s
Renomme le fichier
+
+ OpenLP.FirstTimeLanguageForm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ OpenLP.FirstTimeWizard
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Bible
+
+
+
+
+ Images
+
+
+
+
+ Présentations
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
OpenLP.GeneralTab
@@ -1515,12 +1745,12 @@ Version: %s
OpenLP.LanguageManager
-
+
Langage
-
+
Veuillez redémarrer OpenLP pour utiliser votre nouvelle propriété de langue.
@@ -1831,17 +2061,12 @@ Version: %s
Site &Web
-
-
- Détection &automatique
-
-
-
+
Utilise le langage système, si disponible.
-
+
Défini la langue de l'interface à %s
@@ -1886,7 +2111,7 @@ Version: %s
-
+
@@ -1895,32 +2120,32 @@ You can download the latest version from http://openlp.org/.
Vous pouvez télécharger la dernière version depuis http://openlp.org/.
-
+
Version d'OpenLP mis a jours
-
+
OpenLP affichage principale noirci
-
+
L'affichage principale a été noirci
-
+
Ferme OpenLP
-
+
Êtes vous sur de vouloir fermer OpenLP ?
-
+
Thème par défaut : %s
@@ -1955,11 +2180,16 @@ Vous pouvez télécharger la dernière version depuis http://openlp.org/.&Configure Display Tags
+
+
+
+
+
OpenLP.MediaManagerItem
-
+
Pas d'éléments sélectionné
@@ -2282,34 +2512,34 @@ Vous pouvez télécharger la dernière version depuis http://openlp.org/.Ouvre un fichier
-
+
Fichier service OpenLP (*.osz)
-
+
Le fichier n'est un service valide.
Le contenu n'est pas de l'UTF-8.
-
+
Le fichier n'est pas un service valide.
-
+
Délégué d'affichage manquent
-
+
Votre élément ne peut pas être affiché il n'y a pas de délégué pour l'afficher
-
+
Votre élément ne peut pas être affiché le module nécessaire pour l'afficher est manquant ou inactif
@@ -2416,32 +2646,32 @@ Le contenu n'est pas de l'UTF-8.
OpenLP.SlideController
-
+
Diapositive précédente
-
+
Aller au précédent
-
+
Aller au suivant
-
+
Aller au suivant
-
+
Cache
-
+
Écran noir
@@ -2451,57 +2681,57 @@ Le contenu n'est pas de l'UTF-8.
Thème vide
-
+
Affiche le bureau
-
+
Démarre une boucle continue
-
+
Arrête la boucle continue
-
+
Délais entre les diapositives en secondes
-
+
Déplace en direct
-
+
Édite et recharge le chant prévisualisé
-
+
Démarre la lecture de média
-
+
Aller à
-
+
Service précédent
-
+
Service suivant
-
+
@@ -2663,114 +2893,114 @@ Le contenu n'est pas de l'UTF-8.
&Exporte le thème
-
+
%s (défaut)
-
+
Vous devez sélectionner a thème à renommer.
-
+
Confirme le renommage
-
+
Renomme le thème %s ?
-
+
Vous devez sélectionner un thème a éditer.
-
+
Vous devez sélectionner un thème à effacer.
-
+
Confirmation d'effacement
-
+
Efface le thème %s ?
-
+
Vous n'avez pas sélectionner de thème.
-
+
Enregistre le thème - (%s)
-
+
Thème exporté
-
+
Votre thème a été exporter avec succès.
-
+
L'export du thème a échoué
-
+
Votre thème ne peut pas être exporter a cause d'une erreur.
-
+
Select le fichier thème à importer
-
+
Le fichier n'est pas un thème.
Le contenu n'est pas de l'UTF-8.
-
+
Erreur de validation
-
+
Le fichier n'est pas un thème valide.
-
+
Le thème avec ce nom existe déjà.
-
+
Vous ne pouvez pas supprimer le thème par défaut.
-
+
Thème %s est utiliser par le module %s.
-
+
@@ -3771,22 +4001,32 @@ Le contenu n'est pas de l'UTF-8.
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
SongsPlugin
@@ -3879,85 +4119,85 @@ The encoding is responsible for the correct character representation.
-
+
-
+
-
+
-
+
-
+
-
+
-
+
name singular
-
+
name plural
-
+
container title
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -4418,12 +4658,12 @@ The encoding is responsible for the correct character representation.
-
+
-
+
@@ -4431,7 +4671,7 @@ The encoding is responsible for the correct character representation.
-
+
diff --git a/resources/i18n/hu.ts b/resources/i18n/hu.ts
index 36d46c94c..7469a72fd 100644
--- a/resources/i18n/hu.ts
+++ b/resources/i18n/hu.ts
@@ -153,28 +153,28 @@ Do you want to continue anyway?
BibleDB.Wizard
-
+
-
+
-
+
-
+
Importing verses from <book name>...
-
+
@@ -210,7 +210,7 @@ Do you want to continue anyway?
-
+
@@ -520,7 +520,7 @@ A módosítások nem érintik a már a szolgálatban lévő verseket.Biblia létezik
-
+
A Biblia importálása nem sikerült.
@@ -535,12 +535,12 @@ A módosítások nem érintik a már a szolgálatban lévő verseket.Ez a Biblia már létezik. Kérlek, importálj egy másik Bibliát vagy előbb töröld a meglévőt.
-
+
A Biblia regisztrálása elkezdődött...
-
+
Biblia regisztrálva. Megjegyzés: a versek csak kérésre lesznek letöltve és ekkor internet kapcsolat szükségeltetik.
@@ -662,7 +662,7 @@ demand and thus an internet connection is required.
BiblesPlugin.Opensong
-
+
Importing <book name> <chapter>...
@@ -671,12 +671,12 @@ demand and thus an internet connection is required.
BiblesPlugin.OsisImport
-
+
Kódolás észlelése (ez eltarthat pár percig)...
-
+
Importing <book name> <chapter>...
@@ -830,59 +830,59 @@ demand and thus an internet connection is required.
ImagePlugin
-
+
<strong>Kép bővítmény</strong><br />A kép a bővítmény mindenféle kép vetítését teszi lehetővé.<br />A bővítmény egyik különös figyelmet érdemlő képessége az, hogy képes a szolgálatkezelőn csoportba foglalni a képeket, így könnyebbé téve sok kép vetítését. A bővítmény képes az OpenLP „időzített körkörös” lejátszásra is, amivel a diákat automatikusan tudjuk léptetni. Továbbá, a bővítményben megadott képekkel felülírhatjuk a téma háttérképét, amellyel a szöveg alapú elemek, mint pl. a dalok, a megadott háttérképpel jelennek meg, a témában beállított háttérkép helyett.
-
+
Új kép betöltése
-
+
Új kép hozzáadása
-
+
A kijelölt kép szerkesztése
-
+
A kijelölt kép törlése
-
+
A kijelölt kép előnézete
-
+
A kijelölt kép élő adásba küldése
-
+
A kijelölt kép hozzáadása a szolgálathoz
-
+
name singular
Kép
-
+
name plural
Képek
-
+
container title
Képek
@@ -938,59 +938,59 @@ Do you want to add the other images anyway?
MediaPlugin
-
+
<strong>Média bővítmény</strong><br />A média bővítmény hangok és videók lejátszását teszi lehetővé.
-
+
Új médiaállomány betöltése
-
+
Új médiaállomány hozzáadása
-
+
A kijelölt médiaállomány szerkesztése
-
+
A kijelölt médiaállomány törlése
-
+
A kijelölt médiaállomány előnézete
-
+
A kijelölt médiaállomány élő adásba küldése
-
+
A kijelölt médiaállomány hozzáadása a szolgálathoz
-
+
name singular
Média
-
+
name plural
Média
-
+
container title
Média
@@ -1075,17 +1075,17 @@ Többet az OpenLP-ről: http://openlp.org/
Az OpenLP-t önkéntesek készítették és tartják karban. Ha szeretnél több keresztény számítógépes programot, fontold meg a részvételt az alábbi gomb igénybevételével.
-
+
Közreműködők
-
+
Licenc
-
+
Részvétel
@@ -1095,7 +1095,17 @@ Az OpenLP-t önkéntesek készítették és tartják karban. Ha szeretnél több
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
+Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carsten
+Tinggaard, Frode Woldsund
@@ -1251,17 +1281,17 @@ Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, CarstennTinggaard, Frod
-
+
-
+
-
+
@@ -1396,6 +1426,206 @@ Version: %s
+
+ OpenLP.FirstTimeLanguageForm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ OpenLP.FirstTimeWizard
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
OpenLP.GeneralTab
@@ -1517,12 +1747,12 @@ Version: %s
OpenLP.LanguageManager
-
+
Nyelv
-
+
A nyelvi beállítások az OpenLP újraindítása után lépnek érvénybe.
@@ -1828,17 +2058,12 @@ Version: %s
&Weboldal
-
-
- &Automatikus felismerés
-
-
-
+
Rendszernyelv használata, ha elérhető.
-
+
A felhasználói felület nyelvének átváltása erre: %s
@@ -1883,7 +2108,7 @@ Version: %s
Nézetmód váltása a Élő módra.
-
+
@@ -1892,22 +2117,22 @@ You can download the latest version from http://openlp.org/.
A legfrissebb verzió a http://openlp.org/ oldalról szerezhető be.
-
+
OpenLP verziófrissítés
-
+
Sötét OpenLP fő képernyő
-
+
A fő képernyő el lett sötétítve
-
+
Alapértelmezett téma: %s
@@ -1923,12 +2148,12 @@ A legfrissebb verzió a http://openlp.org/ oldalról szerezhető be.Magyar
-
+
-
+
@@ -1957,11 +2182,16 @@ A legfrissebb verzió a http://openlp.org/ oldalról szerezhető be.&Configure Display Tags
+
+
+
+
+
OpenLP.MediaManagerItem
-
+
Nincs kijelölt elem
@@ -2239,29 +2469,29 @@ A legfrissebb verzió a http://openlp.org/ oldalról szerezhető be.Elem témájának &módosítása
-
+
A fájl nem érvényes szolgálat.
A tartalom kódolása nem UTF-8.
-
+
A fájl nem érvényes szolgálat.
-
+
Hiányzó képernyő kezelő
-
+
Az elemet nem lehet megjeleníteni, mert nincs kezelő, amely megjelenítené
-
+
Az elemet nem lehet megjeleníteni, mert a bővítmény, amely kezelné, hiányzik vagy inaktív
@@ -2291,7 +2521,7 @@ A tartalom kódolása nem UTF-8.
-
+
@@ -2418,57 +2648,57 @@ A tartalom kódolása nem UTF-8.
OpenLP.SlideController
-
+
Mozgatás az előzőre
-
+
Mozgatás a következőre
-
+
Elrejtés
-
+
Élő adásba küldés
-
+
Folyamatos vetítés indítása
-
+
Folyamatos vetítés leállítása
-
+
Diák közötti késleltetés másodpercben
-
+
Médialejátszás indítása
-
+
Ugrás erre
-
+
Szerkesztés és az dal előnézetének újraolvasása
-
+
Üres képernyő
@@ -2478,32 +2708,32 @@ A tartalom kódolása nem UTF-8.
Üres téma
-
+
Asztal megjelenítése
-
+
-
+
-
+
-
+
-
+
@@ -2650,69 +2880,69 @@ A tartalom kódolása nem UTF-8.
Beállítás &globális alapértelmezetté
-
+
%s (alapértelmezett)
-
+
Ki kell választani témát a szerkesztéshez.
-
+
Az alapértelmezett témát nem lehet törölni.
-
+
Nincs kiválasztva egy téma sem.
-
+
Téma mentése – (%s)
-
+
Téma exportálva
-
+
A téma sikeresen exportálásra került.
-
+
A téma exportálása nem sikerült
-
+
A témát nem sikerült exportálni egy hiba miatt.
-
+
Importálandó téma fájl kiválasztása
-
+
Nem érvényes témafájl.
A tartalom kódolása nem UTF-8.
-
+
Nem érvényes témafájl.
-
+
A(z) %s témát a(z) %s bővítmény használja.
@@ -2732,47 +2962,47 @@ A tartalom kódolása nem UTF-8.
Téma e&xportálása
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -3773,99 +4003,109 @@ A tartalom kódolása nem UTF-8.
Kimeneti fájl elérési útvonala
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
SongsPlugin
-
+
&Dal
-
+
Dalok importálása az importálás tündérrel.
-
+
<strong>Dalok bővítmény</strong><br />A dalok bővítmény dalok megjelenítését és kezelését teszi lehetővé.
-
+
Dalok újra&indexelése
-
+
Dal adatbázis újraindexelése a keresés és a rendezés javításához.
-
+
Dalok indexelése folyamatban...
-
+
Új dal hozzáadása
-
+
A kijelölt dal szerkesztése
-
+
A kijelölt dal törlése
-
+
A kijelölt dal előnézete
-
+
A kijelölt dal élő adásba küldése
-
+
A kijelölt dal hozzáadása a szolgálathoz
-
+
name singular
Dal
-
+
name plural
Dalok
-
+
container title
Dalok
@@ -3959,7 +4199,7 @@ The encoding is responsible for the correct character representation.
-
+
@@ -4415,12 +4655,12 @@ The encoding is responsible for the correct character representation.
Dalszöveg
-
+
Törölhető(ek) a dal(ok)?
-
+
CCLI licenc:
@@ -4430,7 +4670,7 @@ The encoding is responsible for the correct character representation.
-
+
diff --git a/resources/i18n/id.ts b/resources/i18n/id.ts
index 8900300e6..873c6f642 100644
--- a/resources/i18n/id.ts
+++ b/resources/i18n/id.ts
@@ -154,28 +154,28 @@ Do you want to continue anyway?
BibleDB.Wizard
-
+
-
+
-
+
-
+
Importing verses from <book name>...
-
+
@@ -211,7 +211,7 @@ Do you want to continue anyway?
-
+
@@ -531,7 +531,7 @@ Perubahan tidak akan mempengaruhi ayat yang kini tampil.
-
+
@@ -541,12 +541,12 @@ Perubahan tidak akan mempengaruhi ayat yang kini tampil.
-
+
-
+
@@ -663,7 +663,7 @@ demand and thus an internet connection is required.
BiblesPlugin.Opensong
-
+
Importing <book name> <chapter>...
Mengimpor %s %s...
@@ -672,12 +672,12 @@ demand and thus an internet connection is required.
BiblesPlugin.OsisImport
-
+
-
+
Importing <book name> <chapter>...
Mengimpor %s %s...
@@ -831,59 +831,59 @@ demand and thus an internet connection is required.
ImagePlugin
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
name singular
-
+
name plural
-
+
container title
@@ -939,59 +939,59 @@ Do you want to add the other images anyway?
MediaPlugin
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
name singular
-
+
name plural
-
+
container title
@@ -1070,17 +1070,17 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
-
+
-
+
-
+
@@ -1090,7 +1090,17 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
+Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carsten
+Tinggaard, Frode Woldsund
@@ -1246,17 +1276,17 @@ Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, CarstennTinggaard, Frod
-
+
-
+
-
+
@@ -1391,6 +1421,206 @@ Version: %s
+
+ OpenLP.FirstTimeLanguageForm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ OpenLP.FirstTimeWizard
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Alkitab
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
OpenLP.GeneralTab
@@ -1512,12 +1742,12 @@ Version: %s
OpenLP.LanguageManager
-
+
-
+
@@ -1823,17 +2053,12 @@ Version: %s
-
-
-
-
-
-
+
-
+
@@ -1878,29 +2103,29 @@ Version: %s
-
+
-
+
-
+
-
+
-
+
@@ -1916,12 +2141,12 @@ You can download the latest version from http://openlp.org/.
-
+
-
+
@@ -1950,11 +2175,16 @@ You can download the latest version from http://openlp.org/.
+
+
+
+
+
OpenLP.MediaManagerItem
-
+
@@ -2232,33 +2462,33 @@ You can download the latest version from http://openlp.org/.
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2410,57 +2640,57 @@ The content encoding is not UTF-8.
OpenLP.SlideController
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2470,32 +2700,32 @@ The content encoding is not UTF-8.
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2642,68 +2872,68 @@ The content encoding is not UTF-8.
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2723,47 +2953,47 @@ The content encoding is not UTF-8.
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -3764,82 +3994,92 @@ The content encoding is not UTF-8.
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
SongsPlugin
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -3932,25 +4172,25 @@ The encoding is responsible for the correct character representation.
-
+
name singular
-
+
name plural
-
+
container title
-
+
@@ -4406,12 +4646,12 @@ The encoding is responsible for the correct character representation.
-
+
-
+
@@ -4421,7 +4661,7 @@ The encoding is responsible for the correct character representation.
-
+
diff --git a/resources/i18n/ja.ts b/resources/i18n/ja.ts
index 4ea5843e4..a9d298ea0 100644
--- a/resources/i18n/ja.ts
+++ b/resources/i18n/ja.ts
@@ -12,18 +12,19 @@ Do you want to continue anyway?
-
+ 引数が見つかりません
-
+ プレースホルダーが見つかりません
-
+ 警告テキストは、'<>'を含みません。
+処理を続けてもよろしいですか?
@@ -154,28 +155,28 @@ Do you want to continue anyway?
BibleDB.Wizard
-
+
新旧訳を取込み中...%s
-
+
新旧訳の取込み...完了。
-
+
書簡の取込み中...%s
-
+
Importing verses from <book name>...
節の取込み中 %s...
-
+
節の取込み....完了。
@@ -211,7 +212,7 @@ Do you want to continue anyway?
-
+
@@ -226,7 +227,7 @@ Do you want to continue anyway?
- <strong>聖書プラグイン</strong><br />聖書プラグインは、礼拝で様々な訳の御言葉を表示する機能を提供します。
+ <strong>聖書プラグイン</strong><br />聖書プラグインは、礼拝プログラムで様々な訳の御言葉を表示する機能を提供します。
@@ -261,7 +262,7 @@ Do you want to continue anyway?
- 選択した聖書を礼拝に追加
+ 選択した聖書を礼拝プログラムに追加
@@ -331,7 +332,14 @@ Book Chapter:Verse-Verse
Book Chapter:Verse-Verse,Verse-Verse
Book Chapter:Verse-Verse,Chapter:Verse-Verse
Book Chapter:Verse-Chapter:Verse
-
+ 参照聖句の形式が、OpenLPにサポートされていません。以下のパターンに準拠した参照聖句である事を確認下さい。
+
+書 章
+書 章-章
+書 章:節-節
+書 章:節-節,節-節
+書 章:節-節,章:節-節
+書 章:節-章:節
@@ -364,7 +372,7 @@ Book Chapter:Verse-Chapter:Verse
- 聖書のテーマ:
+ 聖書の外観テーマ:
@@ -405,7 +413,7 @@ Book Chapter:Verse-Chapter:Verse
- 注意: 既に礼拝に含まれる御言葉は変更されません。
+ 注意: 既に礼拝プログラムに含まれる御言葉は変更されません。
@@ -531,17 +539,17 @@ Changes do not affect verses already in the service.
すでにこの聖書データは取り込み済みです。他の聖書データを取り込むか既に取り込まれた聖書を削除してください。
-
+
聖書データの取り込みに失敗しました。
-
+
聖書を登録しています...
-
+
聖書が登録されました。節ごとに必要に応じてダウンロードされますので、インターネットへの接続が要求される事を留意しておいてください。
@@ -584,7 +592,7 @@ demand and thus an internet connection is required.
-
+ 新旧訳ファイルを指定していません。インポートを継続しますか?
@@ -657,13 +665,13 @@ demand and thus an internet connection is required.
-
+ 参照聖句
BiblesPlugin.Opensong
-
+
Importing <book name> <chapter>...
%s %sをインポートしています...
@@ -672,12 +680,12 @@ demand and thus an internet connection is required.
BiblesPlugin.OsisImport
-
+
エンコードの検出中です(数分かかることがあります)...
-
+
Importing <book name> <chapter>...
%s %sをインポートしています...
@@ -688,7 +696,7 @@ demand and thus an internet connection is required.
- <strong>カスタムプラグイン</strong><br />カスタムプラグインは、カスタムのテキストを歌などと同様に表示する機能を提供します。
+ <strong>カスタムプラグイン</strong><br />カスタムプラグインは、カスタムのテキストを賛美などと同様に表示する機能を提供します。
@@ -744,7 +752,7 @@ demand and thus an internet connection is required.
- テーマ(&m):
+ 外観テーマ(&m):
@@ -764,7 +772,7 @@ demand and thus an internet connection is required.
-
+ クレジット(&C):
@@ -807,7 +815,7 @@ demand and thus an internet connection is required.
- 選択したカスタムを礼拝に追加
+ 選択したカスタムを礼拝プログラムに追加
@@ -831,59 +839,59 @@ demand and thus an internet connection is required.
ImagePlugin
-
+
- <strong>画像プラグイン</strong><br />画像プラグインは、画像を表示する機能を提供します。<br />礼拝マネージャで複数の画像をグループ化したり、複数の画像を簡単に表示することができます。タイムアウトループの機能を使用してスライドショーを自動的に表示することもできます。さらに、歌などのテキストベースの項目の背景を、テーマで指定されたものからこのプラグインの画像に変更することもできます。
+ <strong>画像プラグイン</strong><br />画像プラグインは、画像を表示する機能を提供します。<br />礼拝プログラムで複数の画像をグループ化したり、複数の画像を簡単に表示することができます。タイムアウトループの機能を使用してスライドショーを自動的に表示することもできます。さらに、賛美などのテキストベースの項目の背景を、外観テーマで指定されたものからこのプラグインの画像に変更することもできます。
-
+
新しい画像を読み込み
-
+
新しい画像を追加
-
+
選択した画像を編集
-
+
選択した画像を削除
-
+
選択した画像をプレビュー
-
+
選択した画像をライブへ送る
-
+
- 選択した画像を礼拝に追加
+ 選択した画像を礼拝プログラムに追加
-
+
name singular
画像
-
+
name plural
画像
-
+
container title
画像
@@ -940,59 +948,59 @@ Do you want to add the other images anyway?
MediaPlugin
-
+
<strong>メディアプラグイン</strong><br />メディアプラグインは、音声や動画を再生する機能を提供します。
-
+
新しいメディアを読み込み
-
+
新しいメディアを追加
-
+
選択したメディアを編集
-
+
選択したメディアを削除
-
+
選択したメディアをプレビュー
-
+
選択したメディアをライブへ送る
-
+
- 選択したメディアを礼拝に追加
+ 選択したメディアを礼拝プログラムに追加
-
+
name singular
メディア
-
+
name plural
メディア
-
+
container title
メディア
@@ -1033,7 +1041,7 @@ Do you want to add the other images anyway?
-
+ ビデオ (%s);;オーディオ (%s);;%s (*)
@@ -1068,7 +1076,7 @@ OpenLP is free church presentation software, or lyrics projection software, used
Find out more about OpenLP: http://openlp.org/
OpenLP is written and maintained by volunteers. If you would like to see more free Christian software being written, please consider contributing by using the button below.
- OpenLPは、教会専用のフリー(無償及び利用に関して)のプレゼンテーション及び歌詞投射ソフトウェアです。
+ OpenLPは、教会専用のフリー(無償及び利用に関して)のプレゼンテーション及び賛美詞投射ソフトウェアです。
パソコンとプロジェクターを用いて、聖書箇所、画像また他プレゼンテーションデータ(OpenOffice.orgやPowerPoint/Viewerが必要)をスライド表示する事ができます。
@@ -1077,17 +1085,17 @@ http://openlp.org/にて詳しくご紹介しております。
OpenLPは、ボランティアの手により開発保守されています。もっと多くのクリスチャンの手によるフリーのソフトウェア開発に興味がある方は、以下のボタンからどうぞ。
-
+
著作情報
-
+
ライセンス
-
+
貢献する
@@ -1097,7 +1105,17 @@ OpenLPは、ボランティアの手により開発保守されています。
ビルド %s
-
+
+
+ このプログラムは、フリーソフトです。あなたは、これを再配布したり、the Free Software Foundationが発行したGNU General Public Licenseバージョン2の元で改変する事が出来ます。
+
+
+
+
+ このプログラムは、皆様のお役に立てると期待し、配布しています。しかし、完全に無保障である事を覚えて下さい。商品としての暗黙の保障としての商品適格性や特定の使用適合性もありません。詳しくは、以下の文をお読みください。
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
+Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carsten
+Tinggaard, Frode Woldsund
@@ -1166,7 +1204,7 @@ Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, CarstennTinggaard, Frod
- 起動時に前回のメディアマネージャを開く
+ 起動時に前回のメディアマネジャーを開く
@@ -1176,7 +1214,7 @@ Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, CarstennTinggaard, Frod
- 礼拝の項目の作成時に展開する
+ 礼拝項目の作成時に展開する
@@ -1191,27 +1229,27 @@ Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, CarstennTinggaard, Frod
-
+ ディスプレイウィンドウの上では、マウスカーソルを隠す
-
+ 既定の画像
- 背景色:
+ 背景色:
-
+ 画像ファイル:
- ファイルを開く
+ ファイルを開く
@@ -1219,52 +1257,52 @@ Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, CarstennTinggaard, Frod
- 選択項目を編集
+ 選択項目を編集
- 更新
+ 更新
- 説明
+ 説明
- タグ
+ タグ
- 開始HTML
+ 開始タグ
- 終了HTML
+ 終了タグ
- 初期設定
+ 初期設定
-
- タグID
+
+
-
- 開始HTML
+
+
-
- 終了HTML
+
+
@@ -1425,6 +1463,206 @@ Version: %s
ファイルをコピー
+
+ OpenLP.FirstTimeLanguageForm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ OpenLP.FirstTimeWizard
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 賛美
+
+
+
+
+
+
+
+
+
+ 聖書
+
+
+
+
+ 画像
+
+
+
+
+ プレゼンテーション
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
OpenLP.GeneralTab
@@ -1460,7 +1698,7 @@ Version: %s
- 自動的に前回の礼拝を開く
+ 自動的に前回の礼拝プログラムを開く
@@ -1475,7 +1713,7 @@ Version: %s
- 新しい礼拝を開く前に保存を確認する
+ 新しい礼拝プログラムを開く前に保存を確認する
@@ -1546,12 +1784,12 @@ Version: %s
OpenLP.LanguageManager
-
+
言語
-
+
新しい言語設定を使用するために、OpenLPを再起動してください。
@@ -1614,17 +1852,17 @@ Version: %s
- メディアマネージャ
+ メディアマネジャー
- 礼拝マネージャ
+ 礼拝プログラム
- テーママネージャ
+ 外観テーママネジャー
@@ -1644,7 +1882,7 @@ Version: %s
- 存在する礼拝を開きます。
+ 存在する礼拝プログラムを開きます。
@@ -1659,7 +1897,7 @@ Version: %s
- 現在の礼拝をディスクに保存します。
+ 現在の礼拝プログラムをディスクに保存します。
@@ -1674,12 +1912,12 @@ Version: %s
- 名前をつけて礼拝を保存
+ 名前をつけて礼拝プログラムを保存
- 現在の礼拝を新しい名前で保存します。
+ 現在の礼拝プログラムを新しい名前で保存します。
@@ -1704,7 +1942,7 @@ Version: %s
- テーマ(&T)
+ 外観テーマ(&T)
@@ -1714,7 +1952,7 @@ Version: %s
- メディアマネージャ(&M)
+ メディアマネジャー(&M)
@@ -1734,17 +1972,17 @@ Version: %s
- テーママネージャ(&T)
+ 外観テーママネジャー(&T)
- テーママネジャーの切り替え
+ 外観テーママネジャーの切り替え
- テーママネジャーの可視性を切り替える。
+ 外観テーママネジャーの可視性を切り替える。
@@ -1754,22 +1992,22 @@ Version: %s
- 礼拝マネジャー(&S)
+ 礼拝プログラム(&S)
- 礼拝マネジャーを切り替え
+ 礼拝プログラムを切り替え
- 礼拝マネジャーの可視性を切り替える。
+ 礼拝プログラムの可視性を切り替える。
- 礼拝マネジャー
+ 礼拝プログラム
@@ -1857,17 +2095,12 @@ Version: %s
ウェブサイト(&W)
-
-
- 自動検出(&A)
-
-
-
+
システム言語を可能であれば使用します。
-
+
インターフェイス言語を%sに設定
@@ -1912,7 +2145,7 @@ Version: %s
表示モードをライブにします。
-
+
@@ -1921,24 +2154,24 @@ You can download the latest version from http://openlp.org/.
http://openlp.org/から最新版がダウンロード可能です。
-
+
OpenLPのバージョンアップ完了
-
+
OpenLPのプライマリディスプレイがブランクです
-
+
OpenLPのプライマリディスプレイがブランクになりました
-
+
- 既定テーマ
+ 既定外観テーマ
@@ -1952,19 +2185,19 @@ http://openlp.org/から最新版がダウンロード可能です。ショートカットの設定(&S)...
-
+
OpenLPの終了
-
+
本当にOpenLPを終了してもよろしいですか?
- 現在の礼拝順序を印刷します。
+ 現在の礼拝プログラム順序を印刷します。
@@ -1974,23 +2207,28 @@ http://openlp.org/から最新版がダウンロード可能です。
-
+ 表示タグを設定(&C)
-
+ データフォルダを開く(&D)...
+ 賛美、聖書データなどのデータが含まれているフォルダを開く。
+
+
+
+
OpenLP.MediaManagerItem
-
+
項目の選択がありません
@@ -2078,12 +2316,12 @@ http://openlp.org/から最新版がダウンロード可能です。
-
+ サイズをページに合わせる
-
+ サイズをページの横幅に合わせる
@@ -2091,62 +2329,62 @@ http://openlp.org/から最新版がダウンロード可能です。
-
+ オプション
-
+ 閉じる
-
+ コピー
-
+ HTMLとしてコピーする
-
+ ズームイン
-
+ ズームアウト
-
+ 既定のズームに戻す
-
+ その他のオプション
-
+ 可能であれば、スライドテキストを含める
-
+ 礼拝項目メモを含める
-
+ メディア項目の再生時間を含める
- 礼拝順序シート
+ 礼拝プログラム順序シート
@@ -2154,12 +2392,12 @@ http://openlp.org/から最新版がダウンロード可能です。
- スクリーン
+ スクリーン
- プライマリ
+ プライマリ
@@ -2175,17 +2413,17 @@ http://openlp.org/から最新版がダウンロード可能です。
- 既存の礼拝を読み込む
+ 既存の礼拝プログラムを読み込む
- 礼拝を保存
+ 礼拝プログラムを保存
- 礼拝のテーマを選択
+ 礼拝プログラムの外観テーマを選択
@@ -2235,7 +2473,7 @@ http://openlp.org/から最新版がダウンロード可能です。
- 選択した項目を礼拝から削除する。
+ 選択した項目を礼拝プログラムから削除する。
@@ -2265,32 +2503,32 @@ http://openlp.org/から最新版がダウンロード可能です。
- 項目のテーマを変更(&C)
+ 項目の外観テーマを変更(&C)
-
+
- 礼拝ファイルが有効でありません。
+ 礼拝プログラムファイルが有効でありません。
エンコードがUTF-8でありません。
-
+
- 礼拝ファイルが有効でありません。
+ 礼拝プログラムファイルが有効でありません。
-
+
ディスプレイハンドラが見つかりません
-
+
ディスプレイハンドラが見つからないため項目を表示する事ができません
-
+
必要なプラグインが見つからないか無効なため、項目を表示する事ができません
@@ -2320,9 +2558,9 @@ The content encoding is not UTF-8.
ファイルを開く
-
+
- OpenLP 礼拝ファイル (*.osz)
+ OpenLP 礼拝プログラムファイル (*.osz)
@@ -2352,7 +2590,7 @@ The content encoding is not UTF-8.
- 礼拝の編集
+ 礼拝プログラムの編集
@@ -2362,22 +2600,22 @@ The content encoding is not UTF-8.
-
+ 開始時間(&S)
-
+ プレビュー表示(&P)
-
+ ライブ表示(&L)
-
+ 現在の礼拝プログラムは、編集されています。保存しますか?
@@ -2441,98 +2679,98 @@ The content encoding is not UTF-8.
-
+ 代替
OpenLP.SlideController
-
+
前へ移動
-
+
次へ移動
-
+
隠す
-
+
ライブへ移動
-
+
編集し再読み込み
-
+
繰り返し再生を開始
-
+
繰り返し再生を停止
-
+
次のスライドまでの遅延
-
+
メディア再生を開始
-
+
-
+
スクリーンをブランク
- テーマをブランク
+ 外観テーマをブランク
-
+
デスクトップを表示
-
+
前スライド
-
+
次スライド
-
+
- 前の礼拝
+ 前の礼拝プログラム
-
+
- 次の礼拝
+ 次の礼拝プログラム
-
+
項目をエスケープ
@@ -2555,32 +2793,32 @@ The content encoding is not UTF-8.
-
+ 項目開始時間
-
+ 時:
-
+ 時
-
+ 分
-
+ 分:
-
+ 秒:
@@ -2593,22 +2831,22 @@ The content encoding is not UTF-8.
- テーマ名が不明です
+ 外観テーマ名が不明です
- テーマ名がありません。入力してください。
+ 外観テーマ名がありません。入力してください。
- 無効なテーマ名
+ 無効な外観テーマ名
- 無効なテーマ名です。入力してください。
+ 無効な外観テーマ名です。入力してください。
@@ -2621,57 +2859,57 @@ The content encoding is not UTF-8.
- 新しいテーマを作成する。
+ 新しい外観テーマを作成する。
- テーマ編集
+ 外観テーマ編集
- テーマの編集する。
+ 外観テーマの編集する。
- テーマ削除
+ 外観テーマ削除
- テーマの削除する。
+ 外観テーマの削除する。
- テーマインポート
+ 外観テーマインポート
- テーマのインポートをする。
+ 外観テーマのインポートをする。
- テーマのエキスポート
+ 外観テーマのエキスポート
- テーマのエキスポートをする。
+ 外観テーマのエキスポートをする。
- テーマの編集(&E)
+ 外観テーマの編集(&E)
- テーマの削除(&D)
+ 外観テーマの削除(&D)
@@ -2679,130 +2917,130 @@ The content encoding is not UTF-8.
全体の既定として設定(&G))
-
+
%s (既定)
-
+
- 編集するテーマを選択してください。
+ 編集する外観テーマを選択してください。
-
+
- 既定のテーマを削除する事はできません。
+ 既定の外観テーマを削除する事はできません。
-
+
- %s プラグインでこのテーマは利用されています。
+ %s プラグインでこの外観テーマは利用されています。
-
+
- テーマの選択がありません。
+ 外観テーマの選択がありません。
-
+
- テーマを保存 - (%s)
+ 外観テーマを保存 - (%s)
-
+
- テーマエキスポート
+ 外観テーマエキスポート
-
+
- テーマは正常にエキスポートされました。
+ 外観テーマは正常にエキスポートされました。
-
+
- テーマのエキスポート失敗
+ 外観テーマのエキスポート失敗
-
+
- エラーが発生したためテーマは、エキスポートされませんでした。
+ エラーが発生したため外観テーマは、エキスポートされませんでした。
-
+
- インポート対象のテーマファイル選択
+ インポート対象の外観テーマファイル選択
-
+
- ファイルは無効なテーマです。文字コードがUTF-8ではありません。
+ ファイルは無効な外観テーマです。文字コードがUTF-8ではありません。
-
+
- 無効なテーマファイルです。
+ 無効な外観テーマファイルです。
- テーマのコピー(&C)
+ 外観テーマのコピー(&C)
- テーマの名前を変更(&N)
+ 外観テーマの名前を変更(&N)
- テーマのエキスポート(&E)
+ 外観テーマのエキスポート(&E)
-
+
- 名前を変更するテーマを選択してください。
+ 名前を変更する外観テーマを選択してください。
-
+
名前変更確認
-
+
- %sテーマの名前を変更します。宜しいですか?
+ %s外観テーマの名前を変更します。宜しいですか?
-
+
- 削除するテーマを選択してください。
+ 削除する外観テーマを選択してください。
-
+
削除確認
-
+
- %s テーマを削除します。宜しいですか?
+ %s 外観テーマを削除します。宜しいですか?
-
+
検証エラー
-
+
- 同名のテーマが既に存在します。
+ 同名の外観テーマが既に存在します。
-
+
-
+ OpenLP 外観テーマ (*.theme *.otz)
@@ -2810,12 +3048,12 @@ The content encoding is not UTF-8.
- テーマガイド
+ 外観テーマガイド
- テーマガイドをようこそ
+ 外観テーマガイドをようこそ
@@ -2825,7 +3063,7 @@ The content encoding is not UTF-8.
- 以下の項目に応じて、テーマに使用する背景を設定してください。
+ 以下の項目に応じて、外観テーマに使用する背景を設定してください。
@@ -3020,17 +3258,17 @@ The content encoding is not UTF-8.
- テーマを表示し、現在のテーマを置き換えるか名前を変更して新しいテーマを作成し、保存する
+ 外観テーマを表示し、現在の外観テーマを置き換えるか名前を変更して新しい外観テーマを作成し、保存する
- テーマ名:
+ 外観テーマ名:
- このガイドは、あなたのテーマを作成編集する手助けをします。次へをクリックして、背景を選択してください。
+ このガイドは、あなたの外観テーマを作成編集する手助けをします。次へをクリックして、背景を選択してください。
@@ -3045,7 +3283,7 @@ The content encoding is not UTF-8.
- テーマ編集 - %s
+ 外観テーマ編集 - %s
@@ -3053,32 +3291,32 @@ The content encoding is not UTF-8.
- 全体テーマ
+ 全体外観テーマ
- テーマレベル
+ 外観テーマレベル
- 歌レベル(&O)
+ 賛美レベル(&O)
- データベース内のそれぞれの歌のテーマを使用します。歌にテーマが設定されていない場合、礼拝のテーマを使用します。礼拝にテーマが設定されていなければ、全体設定のテーマを使用します。
+ データベース内のそれぞれの賛美の外観テーマを使用します。賛美に外観テーマが設定されていない場合、礼拝プログラムの外観テーマを使用します。礼拝プログラムに外観テーマが設定されていなければ、全体設定の外観テーマを使用します。
- 礼拝レベル(&S)
+ 礼拝プログラムレベル(&S)
- 礼拝のテーマを用い、歌個々のテーマを上書きします。礼拝にテーマが設定されていなければ、全体設定のテーマを使用します。
+ 礼拝プログラムの外観テーマを用い、賛美個々の外観テーマを上書きします。礼拝プログラムに外観テーマが設定されていなければ、全体設定の外観テーマを使用します。
@@ -3088,7 +3326,7 @@ The content encoding is not UTF-8.
- 全体テーマを用い、すべての礼拝や歌に関連付けられたテーマを上書きします。
+ 全体外観テーマを用い、すべての礼拝プログラムや賛美に関連付けられた外観テーマを上書きします。
@@ -3121,353 +3359,382 @@ The content encoding is not UTF-8.
- 情報
+ ソフトウェア情報
- 追加(&A)
+ 追加(&A)
-
+ 詳細設定
- 全てのファイル
+ 全てのファイル
-
+ 下部
- 参照...
+ 参照...
- キャンセル
+ キャンセル
- CCLI番号:
+ CCLI番号:
- 新規礼拝を作成します。
+ 新規礼拝プログラムを作成します。
- 編集(&E)
+ 編集(&E)
-
+ 空のフィールド
-
+ エキスポート
Abbreviated font pointsize unit
-
+
- 画像
+ 画像
- インポート
+ インポート
-
+ 長さ %s
- ライブ
+ ライブ
- ライブ背景エラー
+ ライブ背景エラー
-
+ ライブパネル
- 読み込み
+ 読み込み
-
+ 中央部
- 新規
+ 新規
- 新しい礼拝
+ 新しい礼拝プログラム
- 新しいテーマ
+ 新しい外観テーマ
Singular
-
+ ファイルが選択されていません
Plural
-
+ ファイルが一つも選択されていません
Singular
-
+ 項目が選択されていません
Plural
- 項目の選択がありません
+ 一つの項目も選択されていません
-
+
-
+
- 礼拝を開く
+ 礼拝プログラムを開く
- プレビュー
+ プレビュー
-
+ プレビューパネル
- 礼拝順序を印刷
+ 礼拝プログラム順序を印刷
-
+ 背景を置換
- ライブの背景を置換
+ ライブの背景を置換
- 背景をリセット
+ 背景をリセット
- ライブの背景をリセット
+ ライブの背景をリセット
The abbreviated unit for seconds
- 秒
+ 秒
-
+ 保存してプレビュー
- 検索
+ 検索
- 削除する項目を選択してください。
+ 削除する項目を選択して下さい。
- 項目を編集してください。
+ 編集する項目を選択して下さい。
- 礼拝の保存
+ 礼拝プログラムの保存
- 礼拝
+ 礼拝プログラム
-
+ 開始 %s
Singular
- テーマ
+ 外観テーマ
Plural
- テーマ
+ 外観テーマ
-
+ 上部
-
+ バージョン
-
+ 垂直整列(&V):
-
+ インポートの完了。
- 書式:
+ 書式:
-
+ インポート中
- "%s"をインポート中...
+ "%s"をインポート中...
-
+ インポート元を選択
-
+ インポート形式とインポート元を選択して下さい。
- The openlp.org 1.xの取込機能が、Pythonの拡張機能がないためオフになっています。取込機能をお使いになられる場合、python-sqlite拡張機能をインストール必要があります。
+ The openlp.org 1.xの取込機能が、Pythonの拡張機能がないためオフになっています。取込機能をお使いになられる場合、python-sqlite拡張機能をインストール必要があります。
-
+ %sファイルを開く
-
+
- 完了。
+ 準備完了。
-
+ インポートを開始しています....
A file type e.g. OpenSong
-
+ インポート元となる%sファイルを最低一つ選択する必要があります。
- 選択した聖書を礼拝に追加へようこそ
+ 聖書インポートガイドへようこそ
-
+ 賛美エキスポートガイドへようこそ
- 歌インポートガイドへようこそ
+ 賛美インポートガイドへようこそ
Singular
-
+ アーティスト
Plural
- アーティスト
+ アーティスト
+
+
+
+
+ Singular
+ アルバム
+
+
+
+
+ Plural
+ アルバム
+
+
+
+
+ 賛美の保守
+
+
+
+
+ Singular
+ 題目
+
+
+
+
+ Plural
+ 題目
@@ -3475,42 +3742,13 @@ The content encoding is not UTF-8.
Copyright symbol.
-
-
-
- Singular
- アルバム
-
-
-
-
- Plural
- アルバム
-
-
-
-
- 歌の保守
-
-
-
-
- Singular
- 題目
-
-
-
-
- Plural
- 題目
-
OpenLP.displayTagDialog
-
+ 表示タグを設定
@@ -3543,7 +3781,7 @@ The content encoding is not UTF-8.
- 選択したプレゼンテーションを礼拝に追加
+ 選択したプレゼンテーションを礼拝プログラムに追加
@@ -3637,7 +3875,7 @@ The content encoding is not UTF-8.
-
+ %s (利用不可)
@@ -3689,7 +3927,7 @@ The content encoding is not UTF-8.
- 歌の利用記録(&S)
+ 賛美の利用記録(&S)
@@ -3719,12 +3957,12 @@ The content encoding is not UTF-8.
- 歌の利用記録の切り替える。
+ 賛美の利用記録の切り替える。
- <strong>SongUsage Plugin</strong><br />このプラグインは、歌の利用頻度を記録します。
+ <strong>SongUsage Plugin</strong><br />このプラグインは、賛美の利用頻度を記録します。
@@ -3755,12 +3993,12 @@ The content encoding is not UTF-8.
- 選択された歌の利用記録を削除しますか?
+ 選択された賛美の利用記録を削除しますか?
- 選択された歌の利用記録を削除します。よろしいですか?
+ 選択された賛美の利用記録を削除します。よろしいですか?
@@ -3778,12 +4016,12 @@ The content encoding is not UTF-8.
- 歌利用記録の抽出
+ 賛美利用記録の抽出
- 歌利用の期間
+ 賛美利用の期間
@@ -3801,17 +4039,17 @@ The content encoding is not UTF-8.
レポートの出力場所
-
+
-
+
レポート生成
-
+
@@ -3819,86 +4057,96 @@ has been successfully created.
%s
- は正常に生成されました。
+
+
+
+
+
+
+
+
+
+
SongsPlugin
-
+
- 歌(&S)
+ 賛美(&S)
-
+
- インポートウィザードを使用して歌をインポートします。
+ インポートウィザードを使用して賛美をインポートします。
-
+
- <strong>歌プラグイン</strong><br />歌プラグインは、歌を表示し管理する機能を提供します。
+ <strong>賛美プラグイン</strong><br />賛美プラグインは、賛美を表示し管理する機能を提供します。
-
+
- 歌のインデックスを再作成(&R)
+ 賛美のインデックスを再作成(&R)
-
+
- 歌データベースのインデックスを再作成し、検索や並べ替えを速くします。
+ 賛美データベースのインデックスを再作成し、検索や並べ替えを速くします。
-
+
- 歌のインデックスを再作成中...
+ 賛美のインデックスを再作成中...
+
+
+
+
+ 賛美を追加
-
- 歌を追加
+
+ 選択した賛美を編集
-
- 選択した歌を編集
+
+ 選択した賛美を削除
-
- 選択した歌を削除
+
+ 選択した賛美をプレビュー
-
- 選択した歌をプレビュー
+
+ 選択した賛美をライブへ送る
-
- 選択した歌をライブへ送る
+
+ 選択した賛美を礼拝プログラムに追加
-
-
- 選択した歌を礼拝に追加
+
+
+ name singular
+ 賛美
-
- name singular
- 歌
-
-
-
name plural
- 歌
+ 賛美
-
+
container title
- 歌
+ 賛美
@@ -3933,7 +4181,7 @@ has been successfully created.
-
+ 日本語 (CP-932)
@@ -3989,9 +4237,9 @@ The encoding is responsible for the correct character representation.
文字コードを選択してください。文字が正常に表示されるのに必要な設定です。
-
+
-
+ エキスポートガイドを使って賛美をエキスポートする。
@@ -4037,7 +4285,7 @@ The encoding is responsible for the correct character representation.
- 歌(%d/%d)をインポートしています
+ 賛美(%d/%d)をインポートしています
@@ -4060,7 +4308,7 @@ The encoding is responsible for the correct character representation.
- 歌詞(&L):
+ 賛美詞(&L):
@@ -4075,12 +4323,12 @@ The encoding is responsible for the correct character representation.
- タイトル && 歌詞
+ タイトル && 賛美詞
- 歌に追加(&A)
+ 賛美に追加(&A)
@@ -4095,7 +4343,7 @@ The encoding is responsible for the correct character representation.
- 歌に追加(&A)
+ 賛美に追加(&A)
@@ -4120,7 +4368,7 @@ The encoding is responsible for the correct character representation.
- 新しいテーマ(&N)
+ 新しい外観テーマ(&N)
@@ -4135,7 +4383,7 @@ The encoding is responsible for the correct character representation.
- テーマ、著作情報 && コメント
+ 外観テーマ、著作情報 && コメント
@@ -4155,7 +4403,7 @@ The encoding is responsible for the correct character representation.
- 有効なアーティストを選択してください。一覧から選択するか新しいアーティストを入力し、"歌にアーティストを追加"をクリックしてください。
+ 有効なアーティストを選択してください。一覧から選択するか新しいアーティストを入力し、"賛美にアーティストを追加"をクリックしてください。
@@ -4175,12 +4423,12 @@ The encoding is responsible for the correct character representation.
- 有効なトピックを選択してください。一覧から選択するか新しいトピックを入力し、"歌にトピックを追加"をクリックしてください。
+ 有効なトピックを選択してください。一覧から選択するか新しいトピックを入力し、"賛美にトピックを追加"をクリックしてください。
- 歌のタイトルを入力する必要があります。
+ 賛美のタイトルを入力する必要があります。
@@ -4200,7 +4448,7 @@ The encoding is responsible for the correct character representation.
- %sはバース順序で使われていません。本当にこの歌を保存しても宜しいですか?
+ %sはバース順序で使われていません。本当にこの賛美を保存しても宜しいですか?
@@ -4246,82 +4494,82 @@ The encoding is responsible for the correct character representation.
-
+ 賛美エキスポートガイド
-
+ このガイドは、あなたの賛美がオープンなOpenLyrics worship song形式としてエキスポートする手伝いをします。
-
+ 賛美を選択して下さい
-
+ エキスポートしたい賛美をチェックして下さい。
-
+ すべてのチェックを外す
-
+ すべてをチェックする
-
+ フォルダを選択して下さい
-
+ 賛美を保存するフォルダを選択して下さい。
-
+ フォルダ:
-
+ エキスポート中
-
+ 賛美をエキスポートしている間今しばらくお待ちください。
-
+ エキスポートする最低一つの賛美を選択する必要があります。
-
+ 保存先が指定されていません
-
+ エキスポートを開始しています...
-
+ フォルダを選択して下さい。
-
+ 出力先フォルダを選択して下さい
@@ -4334,12 +4582,12 @@ The encoding is responsible for the correct character representation.
- 歌インポートガイド
+ 賛美インポートガイド
- このガイドは、様々なフォーマットの歌をインポートする手助けをします。次へをクリックし、インポートするファイルのフォーマットを選択してください。
+ このガイドは、様々なフォーマットの賛美をインポートする手助けをします。次へをクリックし、インポートするファイルのフォーマットを選択してください。
@@ -4379,7 +4627,7 @@ The encoding is responsible for the correct character representation.
- 歌がインポートされるまでしばらくお待ちください。
+ 賛美がインポートされるまでしばらくお待ちください。
@@ -4404,27 +4652,27 @@ The encoding is responsible for the correct character representation.
-
+ インポート対象となる最低一つのドキュメント又はプレゼンテーションファイルを選択する必要があります。
-
+ Songs Of Fellowship Song ファイル
-
+ SongBeamerファイル
-
+ SongShow Plus Songファイル
-
+ Foilpresenter Song ファイル
@@ -4442,28 +4690,28 @@ The encoding is responsible for the correct character representation.
- 歌詞
+ 賛美詞
-
+
- これらの歌を削除しますか?
+ これらの賛美を削除しますか?
-
+
CCLI ライセンス:
- 歌全体
+ 賛美全体
-
+
- 選択された%n件の歌を削除します。宜しいですか?
+ 選択された%n件の賛美を削除します。宜しいですか?
@@ -4472,7 +4720,7 @@ The encoding is responsible for the correct character representation.
- 歌(%d/%d)をインポートしています。
+ 賛美(%d/%d)をインポートしています。
@@ -4480,7 +4728,7 @@ The encoding is responsible for the correct character representation.
-
+ 「%s」をエキスポートしています...
@@ -4511,12 +4759,12 @@ The encoding is responsible for the correct character representation.
-
+ エキスポート完了。
-
+ 賛美のエキスポートに失敗しました。
@@ -4532,7 +4780,7 @@ The encoding is responsible for the correct character representation.
- 歌のインポートに失敗しました。
+ 賛美のインポートに失敗しました。
@@ -4595,7 +4843,7 @@ The encoding is responsible for the correct character representation.
- 最低一つの歌に割り振られているため、このアーティストを削除できませんでした。
+ 最低一つの賛美に割り振られているため、このアーティストを削除できませんでした。
@@ -4610,7 +4858,7 @@ The encoding is responsible for the correct character representation.
- 最低一つの歌に割り振られているため、このトピックを削除できませんでした。
+ 最低一つの賛美に割り振られているため、このトピックを削除できませんでした。
@@ -4625,22 +4873,22 @@ The encoding is responsible for the correct character representation.
- 最低一つの歌に割り振られているため、このアルバムを削除できませんでした。
+ 最低一つの賛美に割り振られているため、このアルバムを削除できませんでした。
- アーティスト%sは既に存在します。既存のアーティスト%sを用い、アーティスト%sで歌を作りますか?
+ アーティスト%sは既に存在します。既存のアーティスト%sを用い、アーティスト%sで賛美を作りますか?
- 題目%sは既に存在します。既存の題目%sを用い、題目%sで歌を作りますか?
+ 題目%sは既に存在します。既存の題目%sを用い、題目%sで賛美を作りますか?
- アルバム%sは既に存在します。既存のアルバム%sを用い、アルバム%sで歌を作りますか?
+ アルバム%sは既に存在します。既存のアルバム%sを用い、アルバム%sで賛美を作りますか?
@@ -4648,7 +4896,7 @@ The encoding is responsible for the correct character representation.
- 歌モード
+ 賛美モード
@@ -4663,12 +4911,12 @@ The encoding is responsible for the correct character representation.
- 編集後に礼拝を更新
+ 編集後に礼拝プログラムを更新
- 礼拝を開いたときに存在しない歌を追加
+ 礼拝プログラムを開いたときに存在しない賛美を追加
diff --git a/resources/i18n/ko.ts b/resources/i18n/ko.ts
index 49645d279..b65182f64 100644
--- a/resources/i18n/ko.ts
+++ b/resources/i18n/ko.ts
@@ -153,28 +153,28 @@ Do you want to continue anyway?
BibleDB.Wizard
-
+
-
+
-
+
-
+
Importing verses from <book name>...
-
+
@@ -210,7 +210,7 @@ Do you want to continue anyway?
-
+
@@ -520,7 +520,7 @@ Changes do not affect verses already in the service.
-
+
@@ -535,12 +535,12 @@ Changes do not affect verses already in the service.
-
+
-
+
@@ -662,7 +662,7 @@ demand and thus an internet connection is required.
BiblesPlugin.Opensong
-
+
Importing <book name> <chapter>...
@@ -671,12 +671,12 @@ demand and thus an internet connection is required.
BiblesPlugin.OsisImport
-
+
-
+
Importing <book name> <chapter>...
@@ -830,59 +830,59 @@ demand and thus an internet connection is required.
ImagePlugin
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
name singular
-
+
name plural
-
+
container title
@@ -938,59 +938,59 @@ Do you want to add the other images anyway?
MediaPlugin
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
name singular
-
+
name plural
-
+
container title
@@ -1069,17 +1069,17 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
-
+
-
+
-
+
@@ -1089,7 +1089,17 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
+Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carsten
+Tinggaard, Frode Woldsund
@@ -1245,17 +1275,17 @@ Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, CarstennTinggaard, Frod
-
+
-
+
-
+
@@ -1390,6 +1420,206 @@ Version: %s
+
+ OpenLP.FirstTimeLanguageForm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ OpenLP.FirstTimeWizard
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
OpenLP.GeneralTab
@@ -1511,12 +1741,12 @@ Version: %s
OpenLP.LanguageManager
-
+
-
+
@@ -1822,17 +2052,12 @@ Version: %s
-
-
-
-
-
-
+
-
+
@@ -1877,29 +2102,29 @@ Version: %s
-
+
-
+
-
+
-
+
-
+
@@ -1915,12 +2140,12 @@ You can download the latest version from http://openlp.org/.
-
+
-
+
@@ -1949,11 +2174,16 @@ You can download the latest version from http://openlp.org/.
+
+
+
+
+
OpenLP.MediaManagerItem
-
+
@@ -2231,28 +2461,28 @@ You can download the latest version from http://openlp.org/.
-
+
-
+
-
+
-
+
-
+
@@ -2282,7 +2512,7 @@ The content encoding is not UTF-8.
-
+
@@ -2409,57 +2639,57 @@ The content encoding is not UTF-8.
OpenLP.SlideController
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2469,32 +2699,32 @@ The content encoding is not UTF-8.
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2641,68 +2871,68 @@ The content encoding is not UTF-8.
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2722,47 +2952,47 @@ The content encoding is not UTF-8.
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -3763,99 +3993,109 @@ The content encoding is not UTF-8.
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
SongsPlugin
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
name singular
-
+
name plural
-
+
container title
@@ -3949,7 +4189,7 @@ The encoding is responsible for the correct character representation.
-
+
@@ -4405,12 +4645,12 @@ The encoding is responsible for the correct character representation.
-
+
-
+
@@ -4420,7 +4660,7 @@ The encoding is responsible for the correct character representation.
-
+
diff --git a/resources/i18n/nb.ts b/resources/i18n/nb.ts
index 5eea1673d..09d5ba427 100644
--- a/resources/i18n/nb.ts
+++ b/resources/i18n/nb.ts
@@ -153,28 +153,28 @@ Do you want to continue anyway?
BibleDB.Wizard
-
+
-
+
-
+
-
+
Importing verses from <book name>...
-
+
@@ -210,7 +210,7 @@ Do you want to continue anyway?
-
+
@@ -519,7 +519,7 @@ Changes do not affect verses already in the service.
Bibelen eksisterer
-
+
Bibelimporteringen mislyktes.
@@ -534,12 +534,12 @@ Changes do not affect verses already in the service.
-
+
-
+
@@ -661,7 +661,7 @@ demand and thus an internet connection is required.
BiblesPlugin.Opensong
-
+
Importing <book name> <chapter>...
@@ -670,12 +670,12 @@ demand and thus an internet connection is required.
BiblesPlugin.OsisImport
-
+
-
+
Importing <book name> <chapter>...
@@ -829,59 +829,59 @@ demand and thus an internet connection is required.
ImagePlugin
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
name singular
-
+
name plural
-
+
container title
@@ -937,59 +937,59 @@ Do you want to add the other images anyway?
MediaPlugin
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
name singular
-
+
name plural
-
+
container title
@@ -1068,17 +1068,17 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
-
+
-
+
Lisens
-
+
@@ -1088,7 +1088,17 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
+Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carsten
+Tinggaard, Frode Woldsund
@@ -1244,17 +1274,17 @@ Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, CarstennTinggaard, Frod
-
+
-
+
-
+
@@ -1389,6 +1419,206 @@ Version: %s
+
+ OpenLP.FirstTimeLanguageForm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ OpenLP.FirstTimeWizard
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
OpenLP.GeneralTab
@@ -1510,12 +1740,12 @@ Version: %s
OpenLP.LanguageManager
-
+
-
+
@@ -1821,17 +2051,12 @@ Version: %s
&Internett side
-
-
-
-
-
-
+
-
+
@@ -1876,29 +2101,29 @@ Version: %s
-
+
-
+
OpenLP versjonen har blitt oppdatert
-
+
-
+
-
+
@@ -1914,12 +2139,12 @@ You can download the latest version from http://openlp.org/.
-
+
-
+
@@ -1948,11 +2173,16 @@ You can download the latest version from http://openlp.org/.
+
+
+
+
+
OpenLP.MediaManagerItem
-
+
@@ -2230,28 +2460,28 @@ You can download the latest version from http://openlp.org/.
&Bytt objekttema
-
+
-
+
-
+
-
+
-
+
@@ -2281,7 +2511,7 @@ The content encoding is not UTF-8.
-
+
@@ -2408,57 +2638,57 @@ The content encoding is not UTF-8.
OpenLP.SlideController
-
+
Flytt til forrige
-
+
-
+
-
+
-
+
Start kontinuerlig løkke
-
+
-
+
Forsinkelse mellom lysbilder i sekund
-
+
Start avspilling av media
-
+
-
+
-
+
@@ -2468,32 +2698,32 @@ The content encoding is not UTF-8.
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2640,68 +2870,68 @@ The content encoding is not UTF-8.
-
+
-
+
-
+
Du kan ikke slette det globale temaet
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
Filen er ikke et gyldig tema.
-
+
@@ -2721,47 +2951,47 @@ The content encoding is not UTF-8.
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -3762,99 +3992,109 @@ The content encoding is not UTF-8.
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
SongsPlugin
-
+
&Sang
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
name singular
Sang
-
+
name plural
Sanger
-
+
container title
Sanger
@@ -3948,7 +4188,7 @@ The encoding is responsible for the correct character representation.
-
+
@@ -4404,12 +4644,12 @@ The encoding is responsible for the correct character representation.
-
+
-
+
@@ -4419,7 +4659,7 @@ The encoding is responsible for the correct character representation.
-
+
diff --git a/resources/i18n/nl.ts b/resources/i18n/nl.ts
index 75f10b76f..ef499af93 100644
--- a/resources/i18n/nl.ts
+++ b/resources/i18n/nl.ts
@@ -12,18 +12,19 @@ Toch doorgaan?
-
+ geen parameters gevonden
-
+ niet gevonden
-
+ De waarschuwing bevat geen '<>'.
+Toch doorgaan?
@@ -154,30 +155,30 @@ Do you want to continue anyway?
BibleDB.Wizard
-
+
-
+ Testament importeren... %s
-
+
-
+ Importeren testamenten... klaar.
-
+
-
+ Importeren bijbelboeken... %s
-
+
Importing verses from <book name>...
-
+ Importeren bijbelverzen uit %s...
-
+
-
+ Importeren bijbelverzen... klaar.
@@ -190,7 +191,7 @@ Do you want to continue anyway?
- Parse fout
+ Verwerkingsfout
@@ -211,7 +212,7 @@ Do you want to continue anyway?
-
+
@@ -331,7 +332,14 @@ Book Chapter:Verse-Verse
Book Chapter:Verse-Verse,Verse-Verse
Book Chapter:Verse-Verse,Chapter:Verse-Verse
Book Chapter:Verse-Chapter:Verse
-
+ De opgegeven tekstverwijzing wordt niet herkend door OpenLP of is ongeldig. Gebruik een van onderstaande patronen:
+
+Boek Hoofdstuk
+Boek Hoofdstuk-Hoofdstuk
+Boek Hoofdstuk:Vers-Vers
+Boek Hoofdstuk:Vers-Vers,Vers-Vers
+Boek Hoofdstuk:Vers-Vers,Hoofdstuk:Vers-Vers
+Boek Hoofdstuk:Vers-Hoofdstuk:Vers
@@ -517,7 +525,7 @@ Deze wijzigingen hebben geen betrekking op bijbelverzen die al in de liturgie zi
Deze bijbelvertaling bestaat reeds
-
+
Het importeren is mislukt.
@@ -537,12 +545,12 @@ Deze wijzigingen hebben geen betrekking op bijbelverzen die al in de liturgie zi
Deze bijbel bestaat reeds. Geef een andere naam of verwijder eerst het bestaande exemplaar.
-
+
Start registreren Bijbel...
-
+
Registratie afgerond.
@@ -566,27 +574,27 @@ N.B. bijbelteksten worden gedownload indien nodig internetverbinding is dus nood
-
+ Bijbel bestand:
-
+ Testamenten bestand:
-
+ Bijbelboeken bestand:
-
+ Bijbelverzen bestand:
-
+ Geen testament bestand opgegeven. Toch importeren?
@@ -659,13 +667,13 @@ N.B. bijbelteksten worden gedownload indien nodig internetverbinding is dus nood
-
+ Schriftverwijzing
BiblesPlugin.Opensong
-
+
Importing <book name> <chapter>...
%s %s wordt geïmporteerd...
@@ -674,12 +682,12 @@ N.B. bijbelteksten worden gedownload indien nodig internetverbinding is dus nood
BiblesPlugin.OsisImport
-
+
Tekstcodering detecteren (dat kan even duren)...
-
+
Importing <book name> <chapter>...
%s %s wordt geïmporteerd...
@@ -833,59 +841,59 @@ N.B. bijbelteksten worden gedownload indien nodig internetverbinding is dus nood
ImagePlugin
-
+
<strong>Afbeeldingen Plugin</strong><br />De afbeeldingen plugin voorziet in de mogelijkheid afbeeldingen te laten zien.<br />Een van de bijzondere mogelijkheden is dat meerdere afbeeldingen als groep in de liturgie worden opgenomen, zodat weergave van meerdere afbeeldingen eenvoudiger wordt. Deze plugin maakt doorlopende diashows (bijv. om de 3 sec. een nieuwe dia) mogelijk. Ook kun met deze plugin de achtergrondafbeelding van het thema vervangen met een andere afbeelding. Ook de combinatie van tekst en beeld is mogelijk.
-
+
Afbeelding laden
-
+
Afbeelding toevoegen
-
+
Afbeelding bewerken
-
+
Geselecteerde afbeeldingen wissen
-
+
Geselecteerde afbeeldingen voorbeeld bekijken
-
+
Geselecteerde afbeeldingen Live tonen
-
+
Geselecteerde afbeeldingen aan liturgie toevoegen
-
+
name singular
Afbeelding
-
+
name plural
Bilder
-
+
container title
Afbeeldingen
@@ -896,7 +904,7 @@ N.B. bijbelteksten worden gedownload indien nodig internetverbinding is dus nood
-
+ Selecteer bijlage
@@ -942,59 +950,59 @@ De andere afbeeldingen alsnog toevoegen?
MediaPlugin
-
+
<strong>Media Plugin</strong><br />De media plugin voorziet in mogelijkheden audio en video af te spelen.
-
+
Laad nieuw media bestand
-
+
Voeg nieuwe media toe
-
+
Bewerk geselecteerd media bestand
-
+
Verwijder geselecteerd media bestand
-
+
Toon voorbeeld van geselecteerd media bestand
-
+
Toon geselecteerd media bestand Live
-
+
Voeg geselecteerd media bestand aan liturgie toe
-
+
name singular
Medien
-
+
name plural
Medien
-
+
container title
Media
@@ -1035,7 +1043,7 @@ De andere afbeeldingen alsnog toevoegen?
-
+ Video’s (%s);;Audio (%s);;%s (*)
@@ -1070,7 +1078,7 @@ OpenLP is free church presentation software, or lyrics projection software, used
Find out more about OpenLP: http://openlp.org/
OpenLP is written and maintained by volunteers. If you would like to see more free Christian software being written, please consider contributing by using the button below.
- OpenLP <version><revision> - Open Source Lyrics Projection
+ OpenLP <version><revision> - Open Source Lyrics Projection
OpenLP is free church presentation software, or lyrics projection software, used to display slides of songs, Bible verses, videos, images, and even presentations (if OpenOffice.org, PowerPoint or PowerPoint Viewer is installed) for church worship using a computer and a data projector.
@@ -1079,17 +1087,17 @@ Find out more about OpenLP: http://openlp.org/
OpenLP is written and maintained by volunteers. If you would like to see more free Christian software being written, please consider contributing by using the button below.
-
+
- Credits
+ Credits
-
+
Licentie
-
+
Bijdragen
@@ -1099,7 +1107,17 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
build %s
-
+
+
+ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
+
+
+
+
+ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See below for more details.
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
+Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carsten
+Tinggaard, Frode Woldsund
@@ -1193,27 +1231,27 @@ Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, CarstennTinggaard, Frod
-
+ Verberg muisaanwijzer in het weergave venster
-
+ standaard afbeelding
- Achtergrondkleur:
+ Achtergrondkleur:
-
+ Afbeeldingsbestand:
- Open bestand
+ Open bestand
@@ -1221,52 +1259,52 @@ Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, CarstennTinggaard, Frod
- Bewerk selectie
+ Bewerk selectie
- Update
+ Update
- Omschrijving
+ Omschrijving
- Tag
+ Tag
- Start tag
+ Start tag
- Eind tag
+ Eind tag
- Standaard
+ Standaard
-
- Tag id
+
+
-
- Start Html
+
+
-
- Eind Html
+
+
@@ -1402,6 +1440,206 @@ Version: %s
Bestand kopiëren
+
+ OpenLP.FirstTimeLanguageForm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ OpenLP.FirstTimeWizard
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ bijbeltekst
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
OpenLP.GeneralTab
@@ -1523,12 +1761,12 @@ Version: %s
OpenLP.LanguageManager
-
+
Taal
-
+
Start OpenLP opnieuw op om de nieuwe taalinstellingen te gebruiken.
@@ -1834,17 +2072,12 @@ Version: %s
&Website
-
-
- &Automatisch detecteren
-
-
-
+
Gebruik systeem standaardtaal, indien mogelijk.
-
+
%s als taal in OpenLP gebruiken
@@ -1889,27 +2122,27 @@ Version: %s
Weergave modus naar Live.
-
+
Nieuwe OpenLP versie beschikbaar
-
+
OpenLP projectie op zwart
-
+
Projectie is uitgeschakeld: scherm staat op zwart
-
+
Standaardthema: %s
-
+
@@ -1929,12 +2162,12 @@ U kunt de laatste versie op http://openlp.org/ downloaden.
&Sneltoetsen instellen...
-
+
OpenLP afsluiten
-
+
OpenLP afsluiten?
@@ -1963,11 +2196,16 @@ U kunt de laatste versie op http://openlp.org/ downloaden.
+
+
+
+
+
OpenLP.MediaManagerItem
-
+
Niets geselecteerd
@@ -2245,29 +2483,29 @@ U kunt de laatste versie op http://openlp.org/ downloaden.
&Wijzig onderdeel thema
-
+
Geen geldig liturgie bestand.
Tekst codering is geen UTF-8.
-
+
Geen geldig liturgie bestand.
-
+
Ontbrekende weergave regelaar
-
+
Dit onderdeel kan niet weergegeven worden, omdat er een regelaar ontbreekt
-
+
Dit onderdeel kan niet weergegeven worden omdat de benodigde plugin ontbreekt of inactief is
@@ -2297,7 +2535,7 @@ Tekst codering is geen UTF-8.
Open bestand
-
+
OpenLP liturgie bestanden (*.osz)
@@ -2424,57 +2662,57 @@ Tekst codering is geen UTF-8.
OpenLP.SlideController
-
+
Naar vorige
-
+
Naar volgende
-
+
Verbergen
-
+
Naar Live
-
+
Start doorlopende diashow
-
+
Stop doorlopende diashow
-
+
Vertraging tussen dia's in seconden
-
+
Start afspelen media
-
+
Ga naar
-
+
Bewerk en lied voorbeeld opnieuw weergeven
-
+
Zwart scherm
@@ -2484,32 +2722,32 @@ Tekst codering is geen UTF-8.
Zwart naar thema
-
+
Toon bureaublad
-
+
Vorige dia
-
+
Volgende dia
-
+
Vorige liturgie
-
+
Volgende liturgie
-
+
Onderdeel annuleren
@@ -2656,69 +2894,69 @@ Tekst codering is geen UTF-8.
Instellen als al&gemene standaard
-
+
%s (standaard)
-
+
Selecteer een thema om te bewerken.
-
+
Het standaard thema kan niet worden verwijderd.
-
+
Selecteer een thema.
-
+
Thema opslaan - (%s)
-
+
Thema geëxporteerd
-
+
Exporteren thema is gelukt.
-
+
Exporteren thema is mislukt
-
+
Thema kan niet worden geëxporteerd als gevolg van een fout.
-
+
Selecteer te importeren thema bestand
-
+
Geen geldig thema bestand.
Tekst codering is geen UTF-8.
-
+
Geen geldig thema bestand.
-
+
Thema %s wordt gebruikt in de %s plugin.
@@ -2738,47 +2976,47 @@ Tekst codering is geen UTF-8.
&Exporteer thema
-
+
Selecteer een thema om te hernoemen.
-
+
Bevestig hernoemen
-
+
%s thema hernoemen?
-
+
Selecteer een thema om te verwijderen.
-
+
Bevestig verwijderen
-
+
%s thema verwijderen?
-
+
Validatie fout
-
+
Er bestaat al een thema met deze naam.
-
+
@@ -3124,7 +3362,7 @@ Tekst codering is geen UTF-8.
- Import
+ Importeren
@@ -3134,7 +3372,7 @@ Tekst codering is geen UTF-8.
- Live
+ Live
@@ -3154,7 +3392,7 @@ Tekst codering is geen UTF-8.
- OpenLP 2.0
+ OpenLP 2.0
@@ -3255,7 +3493,7 @@ Tekst codering is geen UTF-8.
Abbreviated font pointsize unit
- pt
+ pt
@@ -3304,7 +3542,7 @@ Tekst codering is geen UTF-8.
- openlp.org 1.x
+ openlp.org 1.x
@@ -3340,7 +3578,7 @@ Tekst codering is geen UTF-8.
- You must select an item to edit.
+ Selecteer iets om te bewerken.
@@ -3377,7 +3615,7 @@ Tekst codering is geen UTF-8.
- Importing "%s"...
+ Importeren "%s"...
@@ -3779,99 +4017,109 @@ Tekst codering is geen UTF-8.
Bestandslocatie
-
+
liedgebruik_details_%s_%s.txt
-
+
-
+
+
+
+
+
+
+
+
+
+
+
SongsPlugin
-
+
&Lied
-
+
Importeer liederen met de lied assistent.
-
+
<strong>Lied plugin</strong><br />De lied plugin regelt de weergave en het beheer van liederen.
-
+
He&r-indexeer liederen
-
+
Her-indexxer de liederen in de database om het zoeken en ordenen te verbeteren.
-
+
Liederen her-indexeren...
-
+
Voeg nieuw lied toe
-
+
Bewerk geselecteerde lied
-
+
Verwijder geselecteerde lied
-
+
Toon voorbeeld geselecteerd lied
-
+
Toon lied Live
-
+
Voeg geselecteerde lied toe aan de liturgie
-
+
name singular
Lied
-
+
name plural
Lieder
-
+
container title
Liederen
@@ -3968,7 +4216,7 @@ een correcte weergave van lettertekens.
Meestal voldoet de suggestie van OpenLP.
-
+
@@ -4149,37 +4397,37 @@ Meestal voldoet de suggestie van OpenLP.
- You have not used %s anywhere in the verse order. Are you sure you want to save the song like this?
+ U heeft %s nergens in de vers volgorde gebruikt. Weet u zeker dat u dit lied zo wilt opslaan?
- Alt&ernate title:
+ Afwiss&elende titel:
- &Verse order:
+ &Vers volgorde:
- &Manage Authors, Topics, Song Books
+ &Beheer auteurs, onderwerpen, liedboeken
- Authors, Topics && Song Book
+ Auteurs, onderwerpen && liedboeken
- This author is already in the list.
+ Deze auteur staat al in de lijst.
- This topic is already in the list.
+ Dit onderwerp staat al in de lijst.
@@ -4194,12 +4442,12 @@ Meestal voldoet de suggestie van OpenLP.
- You need to have an author for this song.
+ Iemand heeft dit lied geschreven.
- You need to type some text in to the verse.
+ Er moet toch een tekst zijn om te zingen.
@@ -4225,82 +4473,82 @@ Meestal voldoet de suggestie van OpenLP.
-
+ Lied Exporteer Assistent
-
+ Deze assistent helpt u uw liederen te exporteren naar het openen vrije OpenLyrics worship lied bestand formaat.
-
+ Selecteer liederen
-
+ Deselecteer alles
-
+ Selecteer alles
-
+ Selecteer map
-
+ Selecteer de map waar de liederen moet worden bewaard.
-
+ Map:
-
+ Exporteren
-
+ Even wachten terwijl de liederen worden geëxporteerd.
-
+ Kies minstens een lied om te exporteren.
-
+ Niet opgegeven waar bestand moet worden bewaard
-
+ Start exporteren...
-
+ Selecteer de liederen die u wilt exporteren.
-
+ Geef aan waar het bestand moet worden opgeslagen.
-
+ Selecteer een doelmap
@@ -4308,12 +4556,12 @@ Meestal voldoet de suggestie van OpenLP.
- Lied import assistent
+ Lied importeer assistent
- This wizard will help you to import songs from a variety of formats. Click the next button below to start the process by selecting a format to import from.
+ Deze assistent helpt liederen in verschillende bestandsformaten te importeren in OpenLP. Klik op volgende en kies daarna het bestandsformaat van het te importeren lied.
@@ -4333,12 +4581,12 @@ Meestal voldoet de suggestie van OpenLP.
- Please wait while your songs are imported.
+ Even geduld tijdens het importeren.
- Select Document/Presentation Files
+ Selecteer Documenten/Presentatie bestanden
@@ -4424,12 +4672,12 @@ Meestal voldoet de suggestie van OpenLP.
Liedtekst
-
+
Delete Song(s)?
-
+
CCLI Licentie:
@@ -4439,10 +4687,10 @@ Meestal voldoet de suggestie van OpenLP.
Gehele lied
-
+
-
- Are you sure you want to delete the %n selected song(s)?
+
+ Weet u zeker dat u deze %n lied(eren) wilt verwijderen?
diff --git a/resources/i18n/pt_BR.ts b/resources/i18n/pt_BR.ts
index d12f18edc..681764422 100644
--- a/resources/i18n/pt_BR.ts
+++ b/resources/i18n/pt_BR.ts
@@ -12,18 +12,19 @@ Ainda deseja continuar?
-
+ Nenhum Parâmetro Encontrado
-
+ Nenhum Marcador de Posição Encontrado
-
+ O texto de alerta não contém '<>'.
+Você gostaria de continuar de qualquer maneira?
@@ -154,28 +155,28 @@ Do you want to continue anyway?
BibleDB.Wizard
-
+
Importando testamentos... %s
-
+
Importando testamentos... concluído.
-
+
Importando livros... %s
-
+
Importing verses from <book name>...
Importando versículos de %s...
-
+
Importando versículos... concluído.
@@ -211,7 +212,7 @@ Do you want to continue anyway?
-
+
@@ -246,7 +247,7 @@ Do you want to continue anyway?
- Deletar a Bíblia selecionada
+ Excluir a Bíblia selecionada
@@ -331,7 +332,14 @@ Book Chapter:Verse-Verse
Book Chapter:Verse-Verse,Verse-Verse
Book Chapter:Verse-Verse,Chapter:Verse-Verse
Book Chapter:Verse-Chapter:Verse
-
+ A sua referência das escrituras é inválida ou não é suportada pelo OpenLP. Por favor certifique-se que ela está de acordo com um dos seguintes padrões:
+
+Capítulo do Livro
+Capítulo do Lívro-Capítulo
+Capítulo do Livro:Versículo-Versículo
+Capítulo do Livro:Versículo-Versículo,Versículo-Versículo
+Capítulo do Livro:Versículo-Versículo,Capítulo:Versículo-Versículo
+Capítulo do Livro:Versículo-Capítulo:Versículo
@@ -406,7 +414,7 @@ Book Chapter:Verse-Chapter:Verse
Nota:
-Mudanças não afetam os versículos que já estão no culto.
+Mudanças não afetam os versículos que já estão na lista de exibição.
@@ -522,7 +530,7 @@ Mudanças não afetam os versículos que já estão no culto.
Bíblia Existe
-
+
A sua Importação da Bíblia falhou.
@@ -537,12 +545,12 @@ Mudanças não afetam os versículos que já estão no culto.
Esta Bíblia já existe. Importe uma Bíblia diferente ou apague a existente primeiro.
-
+
Registrando Bíblia...
-
+
Bíblia registrada. Note que os versos serão baixados de acordo
@@ -566,7 +574,7 @@ com o uso, portanto uma conexão com a internet é necessária.
- Arquivo de Bíblia
+ Arquivo de Bíblia:
@@ -654,18 +662,18 @@ com o uso, portanto uma conexão com a internet é necessária.
- Segundo:
+ Segundo:
-
+ Referência da Escritura
BiblesPlugin.Opensong
-
+
Importing <book name> <chapter>...
Importando %s %s...
@@ -674,12 +682,12 @@ com o uso, portanto uma conexão com a internet é necessária.
BiblesPlugin.OsisImport
-
+
Detectando codificação (isto pode levar alguns minutos)...
-
+
Importing <book name> <chapter>...
Importando %s %s...
@@ -690,7 +698,7 @@ com o uso, portanto uma conexão com a internet é necessária.
- <strong>Plugin Personalizado</strong><br />O plugin personalizado permite criar slides de texto que são apresentados da mesma maneira que as músicas. Este plugin permite mais liberdade do que o plugin de músicas.
+ <strong>Plugin Personalizado</strong><br />O plugin personalizado permite criar slides de texto que são apresentados da mesma maneira que as músicas. Este plugin permite mais liberdade do que o plugin de músicas.
@@ -821,71 +829,71 @@ com o uso, portanto uma conexão com a internet é necessária.
name plural
-
+ Customizados
container title
- Customizado
+ Customizado
ImagePlugin
-
+
- <strong>Plugin de Imagens</strong><br />O plugin de imagens fornece a exibição de imagens,<br />Uma das funcionalidades importantes deste plugin é a habilidade de agrupar várias imagens na Lista de Exibição, facilitando a exibição de várias imagens. Este plugin também pode usar a funcionalidade de "loop temporizado" do OpenLP para criar uma apresentação de slides que é executada automaticamente. Além disso, imagens do plugin podem ser usadas em sobreposição ao plano de fundo do tema atual, exibindo itens baseados em texto como músicas com a imagem selecionada ao fundo ao invés do plano de fundo fornecido pelo tema.
+ <strong>Plugin de Imagens</strong><br />O plugin de imagens fornece a exibição de imagens.<br />Uma das funcionalidades importantes deste plugin é a habilidade de agrupar várias imagens na Lista de Exibição, facilitando a exibição de várias imagens. Este plugin também pode usar a funcionalidade de "loop temporizado" do OpenLP para criar uma apresentação de slides que é executada automaticamente. Além disso, imagens do plugin podem ser usadas em sobreposição ao plano de fundo do tema atual, exibindo itens baseados em texto como músicas com a imagem selecionada ao fundo ao invés do plano de fundo fornecido pelo tema.
-
+
Carregar um nova Imagem
-
+
Adicionar uma nova Imagem
-
+
Editar a Imagem selecionada
-
+
- Deletar a Imagem selecionada
+ Excluir a Imagem selecionada
+
+
+
+
+ Visualizar a Imagem selecionada
-
- Pré-Visualizar a Imagem selecionada
-
-
-
Projetar a Imagem selecionada
-
+
Adicionar Imagem selecionada à Lista de Exibição
-
+
name singular
Imagem
-
+
name plural
Imagens
-
+
container title
Imagens
@@ -942,59 +950,59 @@ Deseja continuar adicionando as outras imagens?
MediaPlugin
-
+
<strong>Plugin de Mídia</strong><br />O plugin de mídia faz a reprodução de áudio e vídeo.
-
+
Carregar nova Mídia
-
+
Adicionar nova Mídia
-
+
Editar Mídia selecionada
-
+
Excluir a Mídia selecionada
-
+
Pré-visualizar a Mídia selecionada
-
+
Projetar a Mídia selecionada
-
+
Adicionar a Mídia selecionada à Lista de Exibição
-
+
name singular
Mídia
-
+
name plural
Mídia
-
+
container title
Mídia
@@ -1025,7 +1033,7 @@ Deseja continuar adicionando as outras imagens?
- Você precisa selecionar um arquivo de mídia para definir como plano de fundo.
+ Você precisa selecionar um arquivo de mídia para substituir o plano de fundo.
@@ -1035,7 +1043,7 @@ Deseja continuar adicionando as outras imagens?
-
+ Vídeos (%s);;Áudio (%s);;%s (*)
@@ -1043,7 +1051,7 @@ Deseja continuar adicionando as outras imagens?
- Exibição de Mídia
+ Exibição de Mídia
@@ -1079,17 +1087,17 @@ Conheça mais sobre o OpenLP: http://openlp.org/
O OpenLP é escrito e mantido por voluntários. Se você gostaria de contribuir para mais softwares livres Cristãos serem produzidos, considere contribuir usando o botão abaixo.
-
+
Créditos
-
+
Licença
-
+
Contribuir
@@ -1099,7 +1107,17 @@ O OpenLP é escrito e mantido por voluntários. Se você gostaria de contribuir
compilação %s
-
+
+
+ Este programa é um software livre; você pode redistribui-lo e/ou modifica-lo dentro dos termos da Licença Pública Geral GNU como publicada pela Fundação do Software Livre (FSF); na versão 2 da Licença.
+
+
+
+
+ Este programa é distribuido na esperança que será útil, mas SEM NENHUMA GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou ADEQUAÇÃO PARA UM DETERMINADO FIM. Veja abaixo para maiores detalhes.
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
+Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carsten
+Tinggaard, Frode Woldsund
@@ -1183,7 +1221,7 @@ Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, CarstennTinggaard, Frod
- Habilitar confirmação de saída do programa
+ Habilitar confirmação de saída do programa
@@ -1193,27 +1231,27 @@ Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, CarstennTinggaard, Frod
-
+ Ocultar o cursor do mouse quando estiver sobre a tela de exibição
-
+ Imagem Padrão
- Cor do plano de fundo:
+ Cor do plano de fundo:
-
+ Arquivo de Imagem:
- Abrir Arquivo
+ Abrir Arquivo
@@ -1221,51 +1259,51 @@ Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, CarstennTinggaard, Frod
- Editar Seleção
+ Editar Seleção
- Update
+ Atualizar
- Descrição
+ Descrição
-
+ Etiqueta
-
+ Etiqueta Inicial
-
+ Etiqueta Final
- Padrão
+ Padrão
-
+
-
+
-
+
@@ -1279,12 +1317,12 @@ Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, CarstennTinggaard, Frod
-
+ Etiqueta "n" já está definida.
-
+ Etiqueta %s já está definida.
@@ -1429,6 +1467,206 @@ Agradecemos se for possível escrever seu relatório em inglês.
Copiar arquivo
+
+ OpenLP.FirstTimeLanguageForm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ OpenLP.FirstTimeWizard
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Músicas
+
+
+
+
+
+
+
+
+
+ Bíblia
+
+
+
+
+ Imagens
+
+
+
+
+ Apresentações
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
OpenLP.GeneralTab
@@ -1550,12 +1788,12 @@ Agradecemos se for possível escrever seu relatório em inglês.
OpenLP.LanguageManager
-
+
Idioma
-
+
Por favor reinicie o OpenLP para usar a nova configuração de idioma.
@@ -1763,7 +2001,7 @@ Agradecemos se for possível escrever seu relatório em inglês.
- Alternar para o Gerenciador de Lista de Exibição
+ Alternar a Lista de Exibição
@@ -1788,7 +2026,7 @@ Agradecemos se for possível escrever seu relatório em inglês.
- Alternar a visibilidade da coluna de pré-visualização.
+ Alternar a visibilidade da coluna de pré-visualização.
@@ -1861,17 +2099,12 @@ Agradecemos se for possível escrever seu relatório em inglês.
&Web Site
-
-
- &Auto-detectar
-
-
-
+
Usar o idioma do sistema, caso disponível.
-
+
Definir o idioma da interface como %s
@@ -1916,7 +2149,7 @@ Agradecemos se for possível escrever seu relatório em inglês.
Configurar o modo de visualização como Projeção.
-
+
@@ -1925,22 +2158,22 @@ You can download the latest version from http://openlp.org/.
Voce pode baixar a versão mais nova em http://openlp.org/.
-
+
Versão do OpenLP Atualizada
-
+
Tela Principal do OpenLP em Branco
-
+
A Tela Principal foi apagada
-
+
Tema padrão: %s
@@ -1948,7 +2181,7 @@ Voce pode baixar a versão mais nova em http://openlp.org/.
Please add the name of your language here
- Português
+ Português (Brasil)
@@ -1956,19 +2189,19 @@ Voce pode baixar a versão mais nova em http://openlp.org/.
Configurar &Atalhos...
-
+
Fechar o OpenLP
-
+
- Você tem certeza de que quer fechar o OpenLP?
+ Você tem certeza de que quer fechar o OpenLP?
-
+ Imprimir a Lista de Exibição atual.
@@ -1978,23 +2211,28 @@ Voce pode baixar a versão mais nova em http://openlp.org/.
-
+ &Configurar Etiquetas de Exibição
-
+ Abrir Pasta de &Dados...
+ Abrir a pasta na qual músicas, Bíblias e outros arquivos são armazenados.
+
+
+
+
OpenLP.MediaManagerItem
-
+
Nenhum Item Selecionado
@@ -2011,7 +2249,7 @@ Voce pode baixar a versão mais nova em http://openlp.org/.
- Você precisa selecionar um ou mais itens para projetar.
+ Você precisa selecionar um ou mais itens para projetar.
@@ -2026,12 +2264,12 @@ Voce pode baixar a versão mais nova em http://openlp.org/.
- Item da Lista de Exibição inválido
+ Item da Lista de Exibição inválido
- Você precisa selecionar um item %s da Lista de Exibição.
+ Você precisa selecionar um item %s da Lista de Exibição.
@@ -2082,12 +2320,12 @@ Voce pode baixar a versão mais nova em http://openlp.org/.
-
+ Ajustar na Página
-
+ Ajustar Largura
@@ -2095,62 +2333,62 @@ Voce pode baixar a versão mais nova em http://openlp.org/.
-
+ Opções
-
+ Fechar
-
+ Copiar
-
+ Copiar como HTML
-
+ Aumentar o Zoom
-
+ Diminuir o Zoom
-
+ Zoom Original
-
+ Outras Opções
-
+ Incluir texto do slide se disponível
-
+ Incluir notas da lista de exibição
-
+ Incluir duração dos itens de mídia
-
+ Folha de Ordem de Culto
@@ -2158,12 +2396,12 @@ Voce pode baixar a versão mais nova em http://openlp.org/.
- Tela
+ Tela
- primário
+ primário
@@ -2234,12 +2472,12 @@ Voce pode baixar a versão mais nova em http://openlp.org/.
- &Deletar da Lista de Exibição
+ &Excluir da Lista de Exibição
- Deletar o item selecionado da Lista de Exibição.
+ Excluir o item selecionado da Lista de Exibição.
@@ -2272,46 +2510,46 @@ Voce pode baixar a versão mais nova em http://openlp.org/.
&Alterar Tema do Item
-
+
O arquivo não é uma lista válida.
A codificação do conteúdo não é UTF-8.
-
+
- Arquivo não é uma Lista de Exibição válida.
+ Arquivo não é uma Lista de Exibição válida.
-
+
-
+
-
+
- O item não pode ser exibido porque o plugin necessário para visualizá-lo está faltando ou está inativo
+ O item não pode ser exibido porque o plugin necessário para visualizá-lo está faltando ou está inativo
- &Expandir todos
+ &Expandir todos
- Expandir todos os itens da lista.
+ Expandir todos os itens da lista.
- &Recolher todos
+ &Recolher todos
@@ -2324,9 +2562,9 @@ A codificação do conteúdo não é UTF-8.
Abrir Arquivo
-
+
- Lista de Exibição do OpenLP (*.osz)
+ Listas de Exibição do OpenLP (*.osz)
@@ -2336,7 +2574,7 @@ A codificação do conteúdo não é UTF-8.
- Mover para cima
+ Mover para cima
@@ -2366,22 +2604,22 @@ A codificação do conteúdo não é UTF-8.
-
+ &Horário Inicial
-
+ Exibir &Visualização
-
+ Exibir &Projeção
-
+ A lista de exibição atual foi modificada. Você gostaria de salvá-la?
@@ -2389,7 +2627,7 @@ A codificação do conteúdo não é UTF-8.
- Item de Notas de Culto
+ Anotações do Item
@@ -2425,12 +2663,12 @@ A codificação do conteúdo não é UTF-8.
- Personalizado:
+ Personalizado:
- Nenhum
+ Nenhum
@@ -2445,63 +2683,63 @@ A codificação do conteúdo não é UTF-8.
-
+ Alternativo
OpenLP.SlideController
-
+
Mover para o anterior
-
+
Mover para o próximo
-
+
- Ocultar
+ Ocultar
-
+
Mover para projeção
-
+
Iniciar repetição contínua
-
+
Parar repetição contínua
-
+
Intervalo entre slides em segundos
-
+
Iniciar a reprodução de mídia
-
+
Ir Para
-
+
Editar e recarregar pré-visualização da música
-
+
Apagar Tela
@@ -2511,32 +2749,32 @@ A codificação do conteúdo não é UTF-8.
Apagar e deixar Fundo
-
+
Mostrar a Área de Trabalho
-
+
Slide Anterior
-
+
Próximo Slide
-
+
Lista Anterior
-
+
Próxima Lista
-
+
@@ -2551,7 +2789,7 @@ A codificação do conteúdo não é UTF-8.
-
+ Tags de Formatação
@@ -2559,32 +2797,32 @@ A codificação do conteúdo não é UTF-8.
-
+ Horário Inicial do Item
-
+ Horários:
-
+ h
-
+ m
-
+ Minutos:
-
+ Segundos:
@@ -2597,7 +2835,7 @@ A codificação do conteúdo não é UTF-8.
- Faltando Nome do Tema
+ Faltando Nome do Tema
@@ -2612,7 +2850,7 @@ A codificação do conteúdo não é UTF-8.
- O nome do tema é inválido. Por favor forneça um.
+ O nome do tema é inválido. Por favor forneça um.
@@ -2683,69 +2921,69 @@ A codificação do conteúdo não é UTF-8.
Definir como Padrão &Global
-
+
%s (padrão)
-
+
Você precisa selecionar um tema para editar.
-
+
Você não pode apagar o tema padrão.
-
+
Você não selecionou um tema.
-
+
Salvar Tema - (%s)
-
+
Tema Exportado
-
+
Seu tema foi exportado com sucesso.
-
+
Falha ao Exportar Tema
-
+
O tema não pôde ser exportado devido a um erro.
-
+
Selecionar Arquivo de Importação de Tema
-
+
O arquivo não é um tema válido.
A codificação do conteúdo não é UTF-8.
-
+
O arquivo não é um tema válido.
-
+
O tema %s é usado no plugin %s.
@@ -2765,49 +3003,49 @@ A codificação do conteúdo não é UTF-8.
&Exportar Tema
-
+
Você precisa selecionar um tema para renomear.
-
+
- Confirmar Renomeação
+ Confirmar Renomeação
-
+
Renomear o tema %s?
-
+
Você precisa selecionar um tema para apagar.
-
+
- Confirmar Apagamento
+ Confirmar Exclusão
-
+
Apagar o tema %s?
-
+
Erro de Validação
-
+
Já existe um tema com este nome.
-
+
-
+ Temas do OpenLP (*.theme *.otz)
@@ -2825,7 +3063,7 @@ A codificação do conteúdo não é UTF-8.
- Configurar Plano de Fundo
+ Configurar Plano de Fundo
@@ -2840,7 +3078,7 @@ A codificação do conteúdo não é UTF-8.
- Cor Sólida
+ Cor Sólida
@@ -2875,22 +3113,22 @@ A codificação do conteúdo não é UTF-8.
- Esquerda Superior - Direita Inferior
+ Esquerda Superior - Direita Inferior
- Esquerda Inferior - Direita Superior
+ Esquerda Inferior - Direita Superior
- Detalhes da Fonte da Área Principal
+ Detalhes da Fonte da Área Principal
-
+ Definir a fonte de características de exibição para o texto Exibido
@@ -2900,7 +3138,7 @@ A codificação do conteúdo não é UTF-8.
- Tamanho:
+ Tamanho:
@@ -2935,17 +3173,17 @@ A codificação do conteúdo não é UTF-8.
- Defina as características do texto do Rodapé
+ Defina as características do texto do Rodapé
- Detalhes da Formatação da Fonte
+ Detalhes da Formatação da Fonte
- Permite que formatações adicionais sejam feitas
+ Permite que formatações adicionais sejam feitas
@@ -2965,12 +3203,12 @@ A codificação do conteúdo não é UTF-8.
- Centralizar
+ Centralizado
- Localização da Área de Saída
+ Localização da Área de Saída
@@ -3045,7 +3283,7 @@ A codificação do conteúdo não é UTF-8.
- Área do &Rodapé
+ Área do &Rodapé
@@ -3063,7 +3301,7 @@ A codificação do conteúdo não é UTF-8.
- Nível dos Temas
+ Nível dos Temas
@@ -3073,12 +3311,12 @@ A codificação do conteúdo não é UTF-8.
- Use o tema de cada música na base de dados. Se uma música não tiver um tema associado com ela, então use o tema do culto. Se o culto não tiver um tema, então use o tema global.
+ Use o tema de cada música na base de dados. Se uma música não tiver um tema associado com ela, então use o tema da lista de exibição. Se a lista não tiver um tema, então use o tema global.
- Nível de &Lista de Exibição
+ Nível da &Lista de Exibição
@@ -3106,7 +3344,7 @@ A codificação do conteúdo não é UTF-8.
- &Apagar
+ &Excluir
@@ -3116,98 +3354,98 @@ A codificação do conteúdo não é UTF-8.
- Mover a seleção para cima em uma posição.
+ Mover a seleção para cima em uma posição.
- Mover a seleção para baixo em uma posição.
+ Mover a seleção para baixo em uma posição.
- Sobre
+ Sobre
- &Adicionar
+ &Adicionar
- Avançado
+ Avançado
- Todos os Arquivos
+ Todos os Arquivos
- Rodapé
+ Rodapé
- Procurar...
+ Procurar...
- Cancelar
+ Cancelar
- Número CCLI:
+ Número CCLI:
- Criar uma nova Lista de Exibição.
+ Criar uma nova Lista de Exibição.
- &Editar
+ &Editar
-
+ Campo Vazio
-
+ Exportar
Abbreviated font pointsize unit
- pt
+ pt
- Imagem
+ Imagem
- Importar
+ Importar
-
+ Comprimento %s
- Projeção
+ Projeção
@@ -3217,297 +3455,297 @@ A codificação do conteúdo não é UTF-8.
-
+ Painel de Projeção
- Carregar
+ Carregar
- Meio
+ Meio
- Novo
+ Novo
-
+ Nova Lista de Exibição
- Novo Tema
+ Novo Tema
Singular
-
+ Nenhum Arquivo Selecionado
Plural
-
+ Nenhum Arquivo Selecionado
Singular
-
+ Nenhum Item Selecionado
Plural
- Nenhum Item Selecionado
+ Nenhum Item Selecionado
- openlp.org 1.x
+ openlp.org 1.x
- OpenLP 2.0
+ OpenLP 2.0
- Abrir Lista de Exibição
+ Abrir Lista de Exibição
- Pré-Visualização
+ Pré-Visualização
-
+ Painel de Pré-Visualização
-
+ Imprimir Ordem de Culto
- Substituir Plano de Fundo
+ Substituir Plano de Fundo
- Trocar Plano de Fundo da Projeção
+ Trocar Plano de Fundo da Projeção
-
+ Restabelecer o Plano de Fundo
- Restabelecer o Plano de Fundo da Projeção
+ Restabelecer o Plano de Fundo da Projeção
The abbreviated unit for seconds
- s
+ s
- Salvar && Pré-Visualizar
+ Salvar && Pré-Visualizar
- Pesquisar
+ Pesquisar
- Você precisa selecionar um item para apagar.
+ Você precisa selecionar um item para excluir.
- Você precisa selecionar um item para editar.
+ Você precisa selecionar um item para editar.
- Salvar Lista de Exibição
+ Salvar Lista de Exibição
- Lista de Exibição
+ Lista de Exibição
-
+ Início %s
Singular
- Tema
+ Tema
Plural
- Temas
+ Temas
- Topo
+ Topo
-
+ Versão
-
+ Alinhamento &Vertical:
-
+ Importação concluída.
- Formato:
+ Formato:
- Importando
+ Importando
- Importando "%s"...
+ Importando "%s"...
- Selecionar Origem da Importação
+ Selecionar Origem da Importação
-
+ Selecione o formato e a localização para a importação.
- O importador do openlp.org 1.x foi desabilitado devido à falta de um módulo Python. Se você deseja utilizar este importador, você precisa instalar o módulo "python-sqlite".
+ O importador do openlp.org 1.x foi desabilitado devido à falta de um módulo Python. Se você deseja utilizar este importador, você precisa instalar o módulo "python-sqlite".
-
+ Abrir o Arquivo %s
- %p%
+ %p%
- Pronto.
+ Pronto.
- Iniciando importação...
+ Iniciando importação...
A file type e.g. OpenSong
-
+ Você precisa especificar pelo menos um arquivo %s para importar.
- Bem Vindo ao assistente de Importação de Bíblias
+ Bem Vindo ao Assistente de Importação de Bíblias
-
+ Bem Vindo ao Assistente de Exportação de Músicas
- Bem-vindo ao Assistente de Importação de Música
+ Bem-vindo ao Assistente de Importação de Música
Singular
-
+ Autor
Plural
- Autores
+ Autores
Copyright symbol.
- ©
+ ©
Singular
- Livro de Músicas
+ Livro de Músicas
Plural
- Hinários
+ Hinários
- Gerenciamento de Músicas
+ Gerenciamento de Músicas
Singular
- Tópico
+ Tópico
Plural
- Tópicos
+ Tópicos
@@ -3515,7 +3753,7 @@ A codificação do conteúdo não é UTF-8.
-
+ Configurar Etiquetas de Exibição
@@ -3523,17 +3761,17 @@ A codificação do conteúdo não é UTF-8.
-
+ <strong>Plugin de Apresentação</strong><br />O plugin de apresentação provê a habilidade de exibir apresentações utilizando um diferente número de programas. Os programas disponíveis são exibidos em uma caixa de seleção.
- Carregar uma nova Apresentação
+ Carregar uma nova Apresentação
- Apagar a Apresentação selecionada
+ Excluir a Apresentação selecionada
@@ -3554,7 +3792,7 @@ A codificação do conteúdo não é UTF-8.
name singular
- Apresentação
+ Apresentação
@@ -3589,7 +3827,7 @@ A codificação do conteúdo não é UTF-8.
- O Arquivo já Existe
+ O Arquivo já Existe
@@ -3609,12 +3847,12 @@ A codificação do conteúdo não é UTF-8.
- Apresentações (%s)
+ Apresentações (%s)
- Apresentação Não Encontrada
+ Apresentação Não Encontrada
@@ -3624,7 +3862,7 @@ A codificação do conteúdo não é UTF-8.
- A Apresentação %s está incompleta, por favor recarregue-a.
+ A Apresentação %s está incompleta, por favor recarregue-a.
@@ -3637,12 +3875,12 @@ A codificação do conteúdo não é UTF-8.
- Permitir que a aplicação de apresentações seja substituída
+ Permitir que a aplicação de apresentações seja substituída
-
+ %s (indisponivel)
@@ -3650,25 +3888,25 @@ A codificação do conteúdo não é UTF-8.
-
+ <strong>Plugin Remoto</strong><br />O plugin remoto provê a abilidade de enviar mensagens para uma versão do OpenLP em execução em um computador diferente através de um navegador de internet ou através da API remota.
name singular
-
+ Remoto
name plural
- Remoto
+ Remotos
container title
- Remoto
+ Remoto
@@ -3676,7 +3914,7 @@ A codificação do conteúdo não é UTF-8.
- Endereço IP do servidor:
+ Endereço IP do servidor:
@@ -3694,60 +3932,60 @@ A codificação do conteúdo não é UTF-8.
-
+ &Registro de Uso de Músicas
-
+ &Excluir Dados de Registro
-
+ Excluir registros de uso até uma data específica.
-
+ &Extrair Dados de Registro
-
+ Gerar um relatório sobre o uso das músicas.
-
+ Alternar Registro
-
+ Alternar o registro de uso das músicas.
-
+ <strong>Plugin de Uso das Músicas</strong><br />Este plugin registra o uso das músicas nos cultos.
name singular
-
+ Registro das Músicas
name plural
-
+ Registro das Músicas
container title
-
+ Registro das Músicas
@@ -3755,27 +3993,27 @@ A codificação do conteúdo não é UTF-8.
-
+ Excluir Dados de Registro das Músicas
-
+ Deseja Excluir os Eventos de Registro das Músicas?
-
+ Você tem certeza que deseja excluir o registro selecionado?
-
+ Exclusão Bem Sucedida
- Todos os dados solicitados foram apagados com sucesso.
+ Todos os dados solicitados foram apagados com sucesso.
@@ -3783,7 +4021,7 @@ A codificação do conteúdo não é UTF-8.
-
+ Extração de Uso das Músicas
@@ -3806,17 +4044,17 @@ A codificação do conteúdo não é UTF-8.
Local do arquivo de saída
-
+
-
+ detalhe_uso_%s_%s.txt
-
+
-
+ Criação de Relatório
-
+
@@ -3824,86 +4062,96 @@ has been successfully created.
%s
foi criado com sucesso.
+
+
+
+
+
+
+
+
+
+
SongsPlugin
-
+
&Música
-
+
Importar músicas com o assistente de importação.
-
+
-
+ <strong>Plugin de Músicas</strong><br />O plugin de músicas provê a habilidade de exibir e gerenciar músicas.
-
+
&Re-indexar Músicas
-
+
Re-indexar o banco de dados de músicas para melhorar a busca e a ordenação.
-
+
Reindexando músicas...
-
+
Adicionar uma nova Música
-
+
Editar a Música selecioanda
-
+
Apagar a Música selecionada
-
+
Pré-visualizar a Música selecionada
-
+
Projetar a Música selecionada
-
+
Adicionar a Música selecionada à Lista de Exibição
-
+
name singular
Música
-
+
name plural
-
+ Músicas
-
+
container title
- Músicas
+ Músicas
@@ -3918,7 +4166,7 @@ foi criado com sucesso.
- Europeu Central (CP-1250)
+ Europeu Central (CP-1250)
@@ -3953,7 +4201,7 @@ foi criado com sucesso.
- Tailandês (CP-874)
+ Tailandês (CP-874)
@@ -3973,7 +4221,7 @@ foi criado com sucesso.
- Europeu Ocidental (CP-1252)
+ Europeu Ocidental (CP-1252)
@@ -3985,7 +4233,7 @@ foi criado com sucesso.
- O Código de páginas é responsável
+ O Código de páginas é responsável
pela correta representação dos caracteres.
Normalmente a opção pré-selecionada é segura.
@@ -3997,9 +4245,9 @@ The encoding is responsible for the correct character representation.
A codificação é responsável pela correta representação dos caracteres.
-
+
-
+ Exportar músicas utilizando o assistente.
@@ -4007,7 +4255,7 @@ A codificação é responsável pela correta representação dos caracteres.
- Manutenção de Autores
+ Gerenciamento de Autores
@@ -4037,7 +4285,7 @@ A codificação é responsável pela correta representação dos caracteres.
- Você não definiu um nome de tela para o autor, combinar o nome e o sobrenome?
+ Você não definiu um nome de tela para o autor, combinar o nome e o sobrenome?
@@ -4098,7 +4346,7 @@ A codificação é responsável pela correta representação dos caracteres.
- &Gerenciar Autores, Assuntos, Hinários
+ &Gerenciar Autores, Assuntos, Hinários
@@ -4123,7 +4371,7 @@ A codificação é responsável pela correta representação dos caracteres.
- Autores, Assuntos && Hinários
+ Autores, Assuntos && Hinários
@@ -4133,7 +4381,7 @@ A codificação é responsável pela correta representação dos caracteres.
- Informação de Direitos Autorais
+ Direitos Autorais
@@ -4163,7 +4411,7 @@ A codificação é responsável pela correta representação dos caracteres.
- Você não selecionou um autor válido. Selecione um autor da list, ou digite um novo autor e clique em "Adicionar Autor à Música" para adicionar o novo autor.
+ Você não selecionou um autor válido. Selecione um autor da lista, ou digite um novo autor e clique em "Adicionar Autor à Música" para adicioná-lo.
@@ -4198,7 +4446,7 @@ A codificação é responsável pela correta representação dos caracteres.
- Aviso
+ Aviso
@@ -4213,12 +4461,12 @@ A codificação é responsável pela correta representação dos caracteres.
- Adicionar Livro
+ Adicionar Livro
- Este hinário não existe, deseja adicioná-lo?
+ Este hinário não existe, deseja adicioná-lo?
@@ -4228,7 +4476,7 @@ A codificação é responsável pela correta representação dos caracteres.
- Você precisa digitar algum texto na estrofe.
+ Você precisa digitar algum texto na estrofe.
@@ -4254,82 +4502,82 @@ A codificação é responsável pela correta representação dos caracteres.
-
+ Assistente de Exportação de Músicas
-
+ Este assistente irá ajudá-lo a exportar as suas músicas para o formato aberto e gratuito OpenLyrics.
-
+ Selecionar Músicas
-
+ Selecione as músicas que você deseja exportar.
-
+ Desmarcar Todas
-
+ Selecionar Todas
-
+ Selecionar Diretório
-
+ Selecionar o diretório que você deseja salvar as músicas.
-
+ Diretório:
-
+ Exportando
-
+ Por favor aguarde enquanto as suas músicas são exportadas.
-
+ Você precisa adicionar pelo menos uma Música para exportar.
-
+ Nenhum local para Salvar foi especificado
-
+ Iniciando a exportação...
-
+ Você precisa especificar um diretório.
-
+ Selecione uma Pasta de Destino
@@ -4337,7 +4585,7 @@ A codificação é responsável pela correta representação dos caracteres.
- Selecione Documentos/Apresentações
+ Selecione Documentos/Apresentações
@@ -4352,7 +4600,7 @@ A codificação é responsável pela correta representação dos caracteres.
- Documento/Apresentação Genérica
+ Documento/Apresentação Genérica
@@ -4367,7 +4615,7 @@ A codificação é responsável pela correta representação dos caracteres.
- Remover Arquivos(s)
+ Remover Arquivos(s)
@@ -4377,7 +4625,7 @@ A codificação é responsável pela correta representação dos caracteres.
- O importador de documento/apresentação foi desabilitado porque o OpenOffice.org não foi encontrado.
+ O importador de documento/apresentação foi desabilitado porque o OpenOffice.org não foi encontrado no seu computador.
@@ -4387,7 +4635,7 @@ A codificação é responsável pela correta representação dos caracteres.
-
+ O importador para o formato OpenLyrics ainda não foi desenvolvido, mas como você pode ver, nós ainda pretendemos desenvolvê-lo. Possivelmente ele estará disponível na próxima versão.
@@ -4412,27 +4660,27 @@ A codificação é responsável pela correta representação dos caracteres.
-
+ Você precisa especificar pelo menos um documento ou apresentação para importar.
-
+ Arquivos do Songs Of Fellowship
-
+ Arquivos do SongBeamer
-
+ Arquivos do SongShow Plus
-
+ Arquivos do Folipresenter
@@ -4440,7 +4688,7 @@ A codificação é responsável pela correta representação dos caracteres.
- Manter a lista de autores, tópicos e livros
+ Gerenciar a lista de autores, tópicos e livros
@@ -4453,12 +4701,12 @@ A codificação é responsável pela correta representação dos caracteres.Letra
-
+
Apagar Música(s)?
-
+
Licença CCLI:
@@ -4468,7 +4716,7 @@ A codificação é responsável pela correta representação dos caracteres.Música Inteira
-
+
Tem certeza de que quer apagar as %n música(s) selecionadas?
@@ -4489,7 +4737,7 @@ A codificação é responsável pela correta representação dos caracteres.
-
+ Exportando "%s"...
@@ -4497,7 +4745,7 @@ A codificação é responsável pela correta representação dos caracteres.
- Gerenciamento de Hinários
+ Gerenciamento de Hinários
@@ -4520,12 +4768,12 @@ A codificação é responsável pela correta representação dos caracteres.
-
+ Exportação Finalizada.
-
+ A sua exportação falhou.
@@ -4619,17 +4867,17 @@ A codificação é responsável pela correta representação dos caracteres.
- Apagar Livro
+ Apagar Hinário
- Tem certeza de que quer apagar o hinário selecionado?
+ Tem certeza de que quer excluir o hinário selecionado?
- Este hinário não pode ser apagado, pois está associado a ao menos uma música.
+ Este hinário não pode ser excluido, pois está associado a ao menos uma música.
@@ -4649,7 +4897,7 @@ A codificação é responsável pela correta representação dos caracteres.
- O livro %s já existe. Deseja que as músicas com o livro %s usem o livro %s existente?
+ O hinário %s já existe. Deseja que as músicas com o hinário %s usem o hinário %s existente?
diff --git a/resources/i18n/ru.ts b/resources/i18n/ru.ts
index 5780689e8..bfecb65cb 100644
--- a/resources/i18n/ru.ts
+++ b/resources/i18n/ru.ts
@@ -154,28 +154,28 @@ Do you want to continue anyway?
BibleDB.Wizard
-
+
Импорт заветов... %s
-
+
Импорт заветов... завершен.
-
+
Импорт книг... %s
-
+
Importing verses from <book name>...
Импорт стихов из %s...
-
+
Импорт стихов... завершен.
@@ -211,7 +211,7 @@ Do you want to continue anyway?
-
+
@@ -551,18 +551,18 @@ Changes do not affect verses already in the service.
-
+
-
+
-
+
@@ -663,7 +663,7 @@ demand and thus an internet connection is required.
BiblesPlugin.Opensong
-
+
Importing <book name> <chapter>...
@@ -672,12 +672,12 @@ demand and thus an internet connection is required.
BiblesPlugin.OsisImport
-
+
-
+
Importing <book name> <chapter>...
@@ -831,60 +831,60 @@ demand and thus an internet connection is required.
ImagePlugin
-
+
<strong>Плагин Изображений</strong><br />Плагин изображений позволяет отображать изображения.<br />Одной из отличительных возможностей этого плагина является возможность группировать выбранные изображение в менеджере служения, что делает работу с большим количеством изображений более легкой. Этот плагин также позволяет использовать возможности "временной петли" OpenLP, чтобы создавать слайд-шоу, которые выполняются автоматически. В дополнение к этому, изображения из плагина могут быть использованы, чтобы заменить текущий фон, что позволяет отображать текстовые элементы, такие как песни, с выбранным изображением в качестве фона, вместо фона, который указан в теме.
-
+
name singular
Изображение
-
+
name plural
Изображения
-
+
container title
Изображения
-
+
Загрузить новое Изображение
-
+
Добавить новое Изображение
-
+
Изменить выбранное изображение
-
+
Удалить выбранное изображение
-
+
Просмотреть выбранное Изображение
-
+
Послать выбранное Изображение на проектор
-
+
Добавить выбранное изображение к Служению
@@ -940,60 +940,60 @@ Do you want to add the other images anyway?
MediaPlugin
-
+
<strong>Плагин Медиа</strong><br />Плагин Медиа обеспечивает проигрывание аудио и видео файлов.
-
+
name singular
Медиа
-
+
name plural
Медиа
-
+
container title
Медиа
-
+
Открыть новый медиафайл
-
+
Добавить новый медиафайл
-
+
Редактировать выбранный медиафайл
-
+
Удалить выбранный медиафайл
-
+
Предпросмотр выбранного медиафайла
-
+
Отправить выбранный медиафайл на проектор
-
+
Добавить выбранный медиафайл к служению
@@ -1071,17 +1071,17 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
-
+
-
+
Лицензия
-
+
@@ -1091,7 +1091,17 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
Билд %s
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
+Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carsten
+Tinggaard, Frode Woldsund
@@ -1247,17 +1277,17 @@ Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, CarstennTinggaard, Frod
-
+
-
+
-
+
@@ -1392,6 +1422,206 @@ Version: %s
+
+ OpenLP.FirstTimeLanguageForm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ OpenLP.FirstTimeWizard
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Псалмы
+
+
+
+
+
+
+
+
+
+ Библия
+
+
+
+
+ Изображения
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
OpenLP.GeneralTab
@@ -1513,12 +1743,12 @@ Version: %s
OpenLP.LanguageManager
-
+
-
+
@@ -1839,17 +2069,12 @@ Version: %s
&Веб-сайт
-
-
- &Автоопределение
-
-
-
+
Использовать системный язык, если доступно.
-
+
Изменить язык интерфеса на %s
@@ -1894,39 +2119,39 @@ Version: %s
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -1951,11 +2176,16 @@ You can download the latest version from http://openlp.org/.
+
+
+
+
+
OpenLP.MediaManagerItem
-
+
@@ -2283,7 +2513,7 @@ You can download the latest version from http://openlp.org/.
-
+
@@ -2293,28 +2523,28 @@ You can download the latest version from http://openlp.org/.
-
+
-
+
-
+
-
+
-
+
@@ -2411,32 +2641,32 @@ The content encoding is not UTF-8.
OpenLP.SlideController
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2446,57 +2676,57 @@ The content encoding is not UTF-8.
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2658,113 +2888,113 @@ The content encoding is not UTF-8.
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -3765,22 +3995,32 @@ The content encoding is not UTF-8.
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
SongsPlugin
@@ -3873,85 +4113,85 @@ The encoding is responsible for the correct character representation.
-
+
-
+
-
+
-
+
-
+
-
+
-
+
name singular
-
+
name plural
Псалмы
-
+
container title
Псалмы
-
+
Добавить новый Псалом
-
+
Редактировать выбранный Псалом
-
+
Удалить выбранный Псалом
-
+
Прсомотреть выбранный Псалом
-
+
Вывести выбранный псалом на Проектор
-
+
Добавить выбранный Псалом к служению
-
+
@@ -4412,12 +4652,12 @@ The encoding is responsible for the correct character representation.
-
+
-
+
@@ -4426,7 +4666,7 @@ The encoding is responsible for the correct character representation.
-
+
diff --git a/resources/i18n/sv.ts b/resources/i18n/sv.ts
index b421540fa..1c5d7eb81 100644
--- a/resources/i18n/sv.ts
+++ b/resources/i18n/sv.ts
@@ -12,7 +12,7 @@ Vill du fortsätta ändå?
-
+ Inga parametrar hittades
@@ -154,30 +154,30 @@ Do you want to continue anyway?
BibleDB.Wizard
-
+
-
+
-
+
-
+
Importing verses from <book name>...
Importerar verser från %s...
-
+
-
+ Importerar verser... klart.
@@ -195,7 +195,7 @@ Do you want to continue anyway?
-
+ Det var problem med nerladdningen av versurvalet. Kontrollera internetuppkopplingen och om problemet återkommer fundera på att rapportera det som en bugg.
@@ -211,7 +211,7 @@ Do you want to continue anyway?
-
+
@@ -522,7 +522,7 @@ Changes do not affect verses already in the service.
Bibeln finns redan
-
+
Din bibelimport misslyckades.
@@ -537,12 +537,12 @@ Changes do not affect verses already in the service.
-
+
-
+
@@ -664,7 +664,7 @@ demand and thus an internet connection is required.
BiblesPlugin.Opensong
-
+
Importing <book name> <chapter>...
Importerar %s %s...
@@ -673,12 +673,12 @@ demand and thus an internet connection is required.
BiblesPlugin.OsisImport
-
+
Analyserar kodning (detta kan ta några minuter)...
-
+
Importing <book name> <chapter>...
Importerar %s %s...
@@ -832,59 +832,59 @@ demand and thus an internet connection is required.
ImagePlugin
-
+
-
+
Ladda en ny bild
-
+
Lägg till en ny bild
-
+
Redigera vald bild
-
+
Ta bort vald bild
-
+
Förhandsgranska vald bild
-
+
-
+
-
+
name singular
Bild
-
+
name plural
Bilder
-
+
container title
Bilder
@@ -908,12 +908,12 @@ demand and thus an internet connection is required.
-
+ Du måste välja en bild som skall tas bort.
-
+ Du måste välja en bild att ersätta bakgrundsbilden med.
@@ -941,59 +941,59 @@ Vill du lägga till dom andra bilderna ändå?
MediaPlugin
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
name singular
Media
-
+
name plural
Media
-
+
container title
Media
@@ -1072,17 +1072,17 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
-
+
Lista över medverkande
-
+
Licens
-
+
Bidra
@@ -1092,7 +1092,17 @@ OpenLP is written and maintained by volunteers. If you would like to see more fr
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
+Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carsten
+Tinggaard, Frode Woldsund
@@ -1201,7 +1231,7 @@ Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, CarstennTinggaard, Frod
-
+ Bildfil:
@@ -1248,17 +1278,17 @@ Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, CarstennTinggaard, Frod
-
+
-
+
-
+
@@ -1295,7 +1325,7 @@ Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, CarstennTinggaard, Frod
-
+ Skicka e-post
@@ -1393,6 +1423,206 @@ Version: %s
+
+ OpenLP.FirstTimeLanguageForm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ OpenLP.FirstTimeWizard
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Bibel
+
+
+
+
+ Bilder
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
OpenLP.GeneralTab
@@ -1413,7 +1643,7 @@ Version: %s
-
+ Visa även på enkel skärm
@@ -1514,12 +1744,12 @@ Version: %s
OpenLP.LanguageManager
-
+
Språk
-
+
Vänligen starta om OpenLP för att aktivera dina nya språkinställningar.
@@ -1742,7 +1972,7 @@ Version: %s
- &Förhandsgranskning
+ &Förhandsgranskningpanel
@@ -1825,19 +2055,14 @@ Version: %s
&Webbsida
-
-
- Välj &automatiskt
-
-
-
+
Använd systemspråket om möjligt.
-
+
-
+ Sätt användargränssnittets språk till %s
@@ -1880,29 +2105,29 @@ Version: %s
-
+
-
+
OpenLP-versionen uppdaterad
-
+
OpenLPs huvuddisplay rensad
-
+
Huvuddisplayen har rensats
-
+
Standardtema: %s
@@ -1918,12 +2143,12 @@ You can download the latest version from http://openlp.org/.
-
+
-
+
@@ -1952,11 +2177,16 @@ You can download the latest version from http://openlp.org/.
+
+
+
+
+
OpenLP.MediaManagerItem
-
+
Inget objekt valt
@@ -2026,17 +2256,17 @@ You can download the latest version from http://openlp.org/.
-
+ %s (Inaktiv)
-
+ %s (Aktiv)
-
+ %s (Ej valbar)
@@ -2044,12 +2274,12 @@ You can download the latest version from http://openlp.org/.
-
+ Passa sidan
-
+ Passa bredden
@@ -2057,42 +2287,42 @@ You can download the latest version from http://openlp.org/.
-
+ Alternativ
-
+ Stäng
-
+ Kopiera
-
+ Kopiera som HTML
-
+ Zooma in
-
+ Zooma ut
-
+ Zooma original
-
+ Andra alternativ
@@ -2146,7 +2376,7 @@ You can download the latest version from http://openlp.org/.
- Spara denna mötesplanering
+ Spara denna planering
@@ -2156,7 +2386,7 @@ You can download the latest version from http://openlp.org/.
- Flytta till &toppen
+ Flytta högst &upp
@@ -2196,7 +2426,7 @@ You can download the latest version from http://openlp.org/.
- &Ta bort från mötesplanering
+ &Ta bort från planeringen
@@ -2234,28 +2464,28 @@ You can download the latest version from http://openlp.org/.
&Byt objektets tema
-
+
-
+
-
+
-
+
-
+
@@ -2285,7 +2515,7 @@ The content encoding is not UTF-8.
-
+
@@ -2412,57 +2642,57 @@ The content encoding is not UTF-8.
OpenLP.SlideController
-
+
Flytta till föregående
-
+
Flytta till nästa
-
+
-
+
Flytta till live
-
+
Börja oändlig loop
-
+
Stoppa upprepad loop
-
+
Fördröjning mellan bilder, i sekunder
-
+
Börja spela media
-
+
-
+
-
+
@@ -2472,32 +2702,32 @@ The content encoding is not UTF-8.
-
+
-
+
-
+
-
+
-
+
-
+
@@ -2558,7 +2788,7 @@ The content encoding is not UTF-8.
-
+ Temanamn saknas
@@ -2644,68 +2874,68 @@ The content encoding is not UTF-8.
-
+
-
+
-
+
Du kan inte ta bort standardtemat.
-
+
Du har inte valt ett tema.
-
+
Spara tema - (%s)
-
+
-
+
-
+
-
+
-
+
Välj tema importfil
-
+
-
+
Filen är inte ett giltigt tema.
-
+
@@ -2725,47 +2955,47 @@ The content encoding is not UTF-8.
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -3766,99 +3996,109 @@ The content encoding is not UTF-8.
Utfil sökväg
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
SongsPlugin
-
+
&Sång
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
name singular
Sång
-
+
name plural
Sånger
-
+
container title
Sånger
@@ -3952,7 +4192,7 @@ The encoding is responsible for the correct character representation.
-
+
@@ -4408,12 +4648,12 @@ The encoding is responsible for the correct character representation.
Sångtexter
-
+
-
+
@@ -4423,7 +4663,7 @@ The encoding is responsible for the correct character representation.
-
+
diff --git a/resources/i18n/zh_CN.ts b/resources/i18n/zh_CN.ts
new file mode 100644
index 000000000..1292d0c54
--- /dev/null
+++ b/resources/i18n/zh_CN.ts
@@ -0,0 +1,4929 @@
+
+
+
+ AlertPlugin.AlertForm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AlertsPlugin
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ name singular
+
+
+
+
+
+ name plural
+
+
+
+
+
+ container title
+
+
+
+
+ AlertsPlugin.AlertForm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AlertsPlugin.AlertsManager
+
+
+
+
+
+
+
+ AlertsPlugin.AlertsTab
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ BibleDB.Wizard
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Importing verses from <book name>...
+
+
+
+
+
+
+
+
+
+ BiblePlugin.HTTPBible
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ BiblePlugin.MediaItem
+
+
+
+
+
+
+
+
+
+
+
+
+ BiblesPlugin
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ name singular
+
+
+
+
+
+ name plural
+
+
+
+
+
+ container title
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ BiblesPlugin.BibleManager
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ BiblesPlugin.BiblesTab
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ BiblesPlugin.ImportWizardForm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ BiblesPlugin.MediaItem
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ BiblesPlugin.Opensong
+
+
+
+ Importing <book name> <chapter>...
+
+
+
+
+ BiblesPlugin.OsisImport
+
+
+
+
+
+
+
+
+ Importing <book name> <chapter>...
+
+
+
+
+ CustomPlugin
+
+
+
+
+
+
+
+ CustomPlugin.CustomTab
+
+
+
+
+
+
+
+
+
+
+
+
+ CustomPlugin.EditCustomForm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ CustomsPlugin
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ name singular
+
+
+
+
+
+ name plural
+
+
+
+
+
+ container title
+
+
+
+
+ ImagePlugin
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ name singular
+
+
+
+
+
+ name plural
+
+
+
+
+
+ container title
+
+
+
+
+ ImagePlugin.ExceptionDialog
+
+
+
+
+
+
+
+ ImagePlugin.MediaItem
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ MediaPlugin
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ name singular
+
+
+
+
+
+ name plural
+
+
+
+
+
+ container title
+
+
+
+
+ MediaPlugin.MediaItem
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ MediaPlugin.MediaTab
+
+
+
+
+
+
+
+
+
+
+
+
+ OpenLP
+
+
+
+
+
+
+
+ OpenLP.AboutForm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ OpenLP.AdvancedTab
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ OpenLP.DisplayTagDialog
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ OpenLP.DisplayTagTab
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ OpenLP.ExceptionDialog
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ OpenLP.ExceptionForm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Please add the information that bug reports are favoured written in English.
+
+
+
+
+ OpenLP.FileRenameForm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ OpenLP.FirstTimeLanguageForm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ OpenLP.FirstTimeWizard
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ OpenLP.GeneralTab
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ OpenLP.LanguageManager
+
+
+
+
+
+
+
+
+
+
+
+
+ OpenLP.MainDisplay
+
+
+
+
+
+
+
+ OpenLP.MainWindow
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Please add the name of your language here
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ OpenLP.MediaManagerItem
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ OpenLP.PluginForm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ OpenLP.PrintServiceDialog
+
+
+
+
+
+
+
+
+
+
+
+
+ OpenLP.PrintServiceForm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ OpenLP.ScreenList
+
+
+
+
+
+
+
+
+
+
+
+
+ OpenLP.ServiceItemEditForm
+
+
+
+
+
+
+
+ OpenLP.ServiceManager
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ OpenLP.ServiceNoteForm
+
+
+
+
+
+
+
+ OpenLP.SettingsForm
+
+
+
+
+
+
+
+ OpenLP.ShortcutListDialog
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ OpenLP.SlideController
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ OpenLP.SpellTextEdit
+
+
+
+
+
+
+
+
+
+
+
+
+ OpenLP.StartTimeForm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ OpenLP.ThemeForm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ OpenLP.ThemeManager
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ OpenLP.ThemeWizard
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ OpenLP.ThemesTab
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ OpenLP.Ui
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Abbreviated font pointsize unit
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Singular
+
+
+
+
+
+ Plural
+
+
+
+
+
+ Singular
+
+
+
+
+
+ Plural
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ The abbreviated unit for seconds
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Singular
+
+
+
+
+
+ Plural
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ A file type e.g. OpenSong
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Singular
+
+
+
+
+
+ Plural
+
+
+
+
+
+ Copyright symbol.
+
+
+
+
+
+ Singular
+
+
+
+
+
+ Plural
+
+
+
+
+
+
+
+
+
+
+ Singular
+
+
+
+
+
+ Plural
+
+
+
+
+ OpenLP.displayTagDialog
+
+
+
+
+
+
+
+ PresentationPlugin
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ name singular
+
+
+
+
+
+ name plural
+
+
+
+
+
+ container title
+
+
+
+
+ PresentationPlugin.MediaItem
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PresentationPlugin.PresentationTab
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ RemotePlugin
+
+
+
+
+
+
+
+
+ name singular
+
+
+
+
+
+ name plural
+
+
+
+
+
+ container title
+
+
+
+
+ RemotePlugin.RemoteTab
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SongUsagePlugin
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ name singular
+
+
+
+
+
+ name plural
+
+
+
+
+
+ container title
+
+
+
+
+ SongUsagePlugin.SongUsageDeleteForm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SongUsagePlugin.SongUsageDetailForm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SongsPlugin
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ name singular
+
+
+
+
+
+ name plural
+
+
+
+
+
+ container title
+
+
+
+
+
+
+
+
+
+ SongsPlugin.AuthorsForm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SongsPlugin.CCLIFileImport
+
+
+
+
+
+
+
+ SongsPlugin.EditSongForm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SongsPlugin.EditVerseForm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SongsPlugin.ExportWizardForm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SongsPlugin.ImportWizardForm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SongsPlugin.MediaItem
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SongsPlugin.OpenLPSongImport
+
+
+
+
+
+
+
+ SongsPlugin.OpenLyricsExport
+
+
+
+
+
+
+
+ SongsPlugin.SongBookForm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SongsPlugin.SongExportForm
+
+
+
+
+
+
+
+
+
+
+
+
+ SongsPlugin.SongImport
+
+
+
+
+
+
+
+ SongsPlugin.SongImportForm
+
+
+
+
+
+
+
+ SongsPlugin.SongMaintenanceForm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SongsPlugin.SongsTab
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SongsPlugin.TopicsForm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SongsPlugin.VerseType
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/images/openlp-2.qrc b/resources/images/openlp-2.qrc
index 794e006d9..0d3191eff 100644
--- a/resources/images/openlp-2.qrc
+++ b/resources/images/openlp-2.qrc
@@ -92,6 +92,7 @@
wizard_exportsong.bmp
wizard_importsong.bmp
wizard_importbible.bmp
+ wizard_firsttime.bmp
wizard_createtheme.bmp
diff --git a/resources/images/wizard_firsttime.bmp b/resources/images/wizard_firsttime.bmp
new file mode 100644
index 000000000..f37de5be2
Binary files /dev/null and b/resources/images/wizard_firsttime.bmp differ