diff --git a/copyright.txt b/copyright.txt index 0e405e6e9..0ef481f2b 100644 --- a/copyright.txt +++ b/copyright.txt @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/documentation/manual/make.bat b/documentation/manual/make.bat index 8d21b45ce..20bff1ee7 100644 --- a/documentation/manual/make.bat +++ b/documentation/manual/make.bat @@ -1,112 +1,112 @@ -@ECHO OFF - -REM Command file for Sphinx documentation - -set SPHINXBUILD=sphinx-build -set ALLSPHINXOPTS=-d build/doctrees %SPHINXOPTS% source -if NOT "%PAPER%" == "" ( - set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS% -) - -if "%1" == "" goto help - -if "%1" == "help" ( - :help - echo.Please use `make ^` where ^ is one of - echo. html to make standalone HTML files - echo. dirhtml to make HTML files named index.html in directories - echo. pickle to make pickle files - echo. json to make JSON files - echo. htmlhelp to make HTML files and a HTML help project - echo. qthelp to make HTML files and a qthelp project - echo. latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter - echo. changes to make an overview over all changed/added/deprecated items - echo. linkcheck to check all external links for integrity - echo. doctest to run all doctests embedded in the documentation if enabled - goto end -) - -if "%1" == "clean" ( - for /d %%i in (build\*) do rmdir /q /s %%i - del /q /s build\* - goto end -) - -if "%1" == "html" ( - %SPHINXBUILD% -b html %ALLSPHINXOPTS% build/html - echo. - echo.Build finished. The HTML pages are in build/html. - goto end -) - -if "%1" == "dirhtml" ( - %SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% build/dirhtml - echo. - echo.Build finished. The HTML pages are in build/dirhtml. - goto end -) - -if "%1" == "pickle" ( - %SPHINXBUILD% -b pickle %ALLSPHINXOPTS% build/pickle - echo. - echo.Build finished; now you can process the pickle files. - goto end -) - -if "%1" == "json" ( - %SPHINXBUILD% -b json %ALLSPHINXOPTS% build/json - echo. - echo.Build finished; now you can process the JSON files. - goto end -) - -if "%1" == "htmlhelp" ( - %SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% build/htmlhelp - echo. - echo.Build finished; now you can run HTML Help Workshop with the ^ -.hhp project file in build/htmlhelp. - goto end -) - -if "%1" == "qthelp" ( - %SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% build/qthelp - echo. - echo.Build finished; now you can run "qcollectiongenerator" with the ^ -.qhcp project file in build/qthelp, like this: - echo.^> qcollectiongenerator build\qthelp\OpenLP.qhcp - echo.To view the help file: - echo.^> assistant -collectionFile build\qthelp\OpenLP.ghc - goto end -) - -if "%1" == "latex" ( - %SPHINXBUILD% -b latex %ALLSPHINXOPTS% build/latex - echo. - echo.Build finished; the LaTeX files are in build/latex. - goto end -) - -if "%1" == "changes" ( - %SPHINXBUILD% -b changes %ALLSPHINXOPTS% build/changes - echo. - echo.The overview file is in build/changes. - goto end -) - -if "%1" == "linkcheck" ( - %SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% build/linkcheck - echo. - echo.Link check complete; look for any errors in the above output ^ -or in build/linkcheck/output.txt. - goto end -) - -if "%1" == "doctest" ( - %SPHINXBUILD% -b doctest %ALLSPHINXOPTS% build/doctest - echo. - echo.Testing of doctests in the sources finished, look at the ^ -results in build/doctest/output.txt. - goto end -) - -:end +@ECHO OFF + +REM Command file for Sphinx documentation + +set SPHINXBUILD=sphinx-build +set ALLSPHINXOPTS=-d build/doctrees %SPHINXOPTS% source +if NOT "%PAPER%" == "" ( + set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS% +) + +if "%1" == "" goto help + +if "%1" == "help" ( + :help + echo.Please use `make ^` where ^ is one of + echo. html to make standalone HTML files + echo. dirhtml to make HTML files named index.html in directories + echo. pickle to make pickle files + echo. json to make JSON files + echo. htmlhelp to make HTML files and a HTML help project + echo. qthelp to make HTML files and a qthelp project + echo. latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter + echo. changes to make an overview over all changed/added/deprecated items + echo. linkcheck to check all external links for integrity + echo. doctest to run all doctests embedded in the documentation if enabled + goto end +) + +if "%1" == "clean" ( + for /d %%i in (build\*) do rmdir /q /s %%i + del /q /s build\* + goto end +) + +if "%1" == "html" ( + %SPHINXBUILD% -b html %ALLSPHINXOPTS% build/html + echo. + echo.Build finished. The HTML pages are in build/html. + goto end +) + +if "%1" == "dirhtml" ( + %SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% build/dirhtml + echo. + echo.Build finished. The HTML pages are in build/dirhtml. + goto end +) + +if "%1" == "pickle" ( + %SPHINXBUILD% -b pickle %ALLSPHINXOPTS% build/pickle + echo. + echo.Build finished; now you can process the pickle files. + goto end +) + +if "%1" == "json" ( + %SPHINXBUILD% -b json %ALLSPHINXOPTS% build/json + echo. + echo.Build finished; now you can process the JSON files. + goto end +) + +if "%1" == "htmlhelp" ( + %SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% build/htmlhelp + echo. + echo.Build finished; now you can run HTML Help Workshop with the ^ +.hhp project file in build/htmlhelp. + goto end +) + +if "%1" == "qthelp" ( + %SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% build/qthelp + echo. + echo.Build finished; now you can run "qcollectiongenerator" with the ^ +.qhcp project file in build/qthelp, like this: + echo.^> qcollectiongenerator build\qthelp\OpenLP.qhcp + echo.To view the help file: + echo.^> assistant -collectionFile build\qthelp\OpenLP.ghc + goto end +) + +if "%1" == "latex" ( + %SPHINXBUILD% -b latex %ALLSPHINXOPTS% build/latex + echo. + echo.Build finished; the LaTeX files are in build/latex. + goto end +) + +if "%1" == "changes" ( + %SPHINXBUILD% -b changes %ALLSPHINXOPTS% build/changes + echo. + echo.The overview file is in build/changes. + goto end +) + +if "%1" == "linkcheck" ( + %SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% build/linkcheck + echo. + echo.Link check complete; look for any errors in the above output ^ +or in build/linkcheck/output.txt. + goto end +) + +if "%1" == "doctest" ( + %SPHINXBUILD% -b doctest %ALLSPHINXOPTS% build/doctest + echo. + echo.Testing of doctests in the sources finished, look at the ^ +results in build/doctest/output.txt. + goto end +) + +:end diff --git a/documentation/manual/source/bibles.rst b/documentation/manual/source/bibles.rst new file mode 100644 index 000000000..41b3933aa --- /dev/null +++ b/documentation/manual/source/bibles.rst @@ -0,0 +1,180 @@ +====== +Bibles +====== + +Managing Bibles in OpenLP is a relatively simple process. There are also +converters provided to get data from other formats into OpenLP. + +Bible Importer +============== + +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 Bible Importer :menuselection:`File --> Import --> Bible`. +You may also enter the Bible Importer by clicking the :guilabel:`Import Icon:` + +.. image:: pics/themeimportexport.png + +You will see the Bible Importer window, click :guilabel:`Next`. + +.. image:: pics/bibleimport01.png + +After clicking :guilabel:`Next` you can select from the various types of +software that OpenLP will convert Bibles from. + +.. image:: pics/bibleimport02.png + +Click on the file folder icon to choose the file of the Bible 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 simple process. First you will need to +locate your Version 1 Bibles. + +Windows XP:: + + C:\Documents and Settings\All Users\Application Data\openlp.org\Data\Bibles\ + +Windows Vista / Windows 7:: + + C:\ProgramData\openlp.org\Data\Bibles\ + +OpenLP Version 1 Bibles have the `.bible` file extension. After selecting +all of the OpenLP Version 1 Bibles you want to convert, click :guilabel:`Next` + +.. image:: pics/bibleimportdetails1.png + +Enter your Bible name and copyright details. Click :guilabel:`Next`. It may +take some time to convert your Bibles so please be patient. + +.. image:: pics/bibleimportfinished1.png + +When the import has finished click :guilabel:`Finish` and you should be +ready to use your OpenLP Version 1 Bibles. + +Importing OSIS Bibles +^^^^^^^^^^^^^^^^^^^^^ + +**About OSIS Formatted Bibles** + +OSIS is a format intended to provide a common format for Bibles. More +information can be found out here: http://www.bibletechnologies.net/ + +If you have any software installed that is part of the Sword Project +http://www.crosswire.org/sword/index.jsp it can be easily converted. + +Importing OSIS files is very simple. Select your OSIS Bible file and click +:guilabel:`Next` + +.. image:: pics/bibleimportdetails1.png + +Enter you Bible name and copyright details. Click :guilabel:`Next`. It may take +some time to convert your Bibles so please be patient. + +.. image:: pics/bibleimportfinished1.png + +Click :guilabel:`Finish` and you should be ready to use your OpenLP Version +1 Bibles. + +You can use the commands below convert Bibles from that software to OSIS format. + +The following commands are used in all platforms and the commands are case +sensitive across all platforms. To convert a Bible using Command Prompt in +Windows or a Terminal in Linux or MAC you would type:: + + mod2osis biblename > biblename.osis + +For example: if I wanted to convert a King James Version Bible I would type +something similar to this:: + + mod2osis KJV > kjv.osis + +You may also wish to dictate a file location for the conversion to place the +osis file for example:: + + mod2osis KJV > /home/user/bibles/kjv.osis + +Importing OpenSong Bibles +^^^^^^^^^^^^^^^^^^^^^^^^^ + +Converting from OpenSong you will need to locate your bibles 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:`Bibles`. This folder should +contain files with all your bibles in them without a file extension. (file.xmms). +When you have located this folder you will need to select the bible from the +folder. + +You may also import downloaded bibles from OpenSong. The process is the same, +except you will need to extract the bible from a zip file. This is usually done +by right clicking on the downloaded file and select `Extract` or `Extract Here`. + +After selecting the OpenSong Bibles you want to convert, click :guilabel:`Next` + +.. image:: pics/bibleimportdetails1.png + +Enter your Bible name and copyright details. Click :guilabel:`Next`. It may +take some time to convert your Bibles so please be patient. + +.. image:: pics/bibleimportfinished1.png + +When the import has finished then click :guilabel:`Finish` and you should now be +ready to use your OpenSong Bibles. + +Importing Web Download Bibles +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +**About Web Download** + +OpenLP provides a Web Download method to import Bibles when you do not have a +locally installed Bible available. The Web Download method registers the Bible +in OpenLP like the other bibles only it downloads the verses as you need them. +This import is not meant to be used as your sole source for Bibles, but rather +as another option and does require an internet connection. + +To use the web download feature select web download from the import wizard. + +.. image:: pics/bibleimport01.png + +You can select from several options of location to download from and also +what Bible translation you need. You will probably want to choose the location +from where you get the best performance or has the translation you need. + +.. image:: pics/webbible1.png + +You can also select a proxy server if needed from the `Proxy Server` tab. Your +network administrator will know if this is necessary, in most cases this will +not be needed. + +.. image:: pics/webbibleproxy1.png + +After selecting your download location and the Bible you wish to use, click +:guilabel:`Next` When your import is completed click :guilabel:`Finish` + +.. image:: pics/biblewebcomplete.png + +You should now be ready to use the web bible. + +Importing CSV formatted Bibles +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +If you have a Bible in .csv format OpenLP can import it. CSV Bibles will +consist of two files a `books` file and a `verse` file. + +Select CSV from the list of Bible types to import. + +.. image:: pics/bibleimport02.png + +You are now ready to select your .csv files. You will need to select both your +books and verse file location. + +.. image:: pics/csvimport1.png + +After you have selected the file locations you can click :guilabel:`Next` + +.. image:: pics/bibleimportfinished1.png + +Click :guilabel:`Finish` and you should now be ready to use your imported CSV +Bible \ No newline at end of file diff --git a/documentation/manual/source/conf.py b/documentation/manual/source/conf.py index f0d918c11..2e9c0a88f 100644 --- a/documentation/manual/source/conf.py +++ b/documentation/manual/source/conf.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # # OpenLP documentation build configuration file, created by -# sphinx-quickstart on Fri Jul 10 17:20:40 2009. +# sphinx-quickstart on Thu Sep 30 21:24:54 2010. # # This file is execfile()d with the current directory set to its containing dir. # @@ -11,19 +11,22 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import os import sys +import os # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the # documentation root, use os.path.abspath to make it absolute, like shown here. -#sys.path.insert(0, os.path.abspath(os.path.join('..', '..'))) +#sys.path.insert(0, os.path.abspath('.')) # -- General configuration ----------------------------------------------------- +# If your documentation needs a minimal Sphinx version, state it here. +#needs_sphinx = '1.0' + # Add any Sphinx extension module names here, as strings. They can be extensions # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. -#extensions = ['sphinx.ext.autodoc'] +extensions = [] # Add any paths that contain templates here, relative to this directory. templates_path = ['_templates'] @@ -32,14 +35,14 @@ templates_path = ['_templates'] source_suffix = '.rst' # The encoding of source files. -source_encoding = 'utf-8' +#source_encoding = 'utf-8-sig' # The master toctree document. master_doc = 'index' # General information about the project. project = u'OpenLP' -copyright = u'2004-2010 Raoul Snyman' +copyright = u'2004 - 2011, Raoul Snyman' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -48,7 +51,7 @@ copyright = u'2004-2010 Raoul Snyman' # The short X.Y version. version = '2.0' # The full version, including alpha/beta/rc tags. -release = '1.9.5' +release = '2.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -60,12 +63,9 @@ release = '1.9.5' # Else, today_fmt is used as the format for a strftime call. #today_fmt = '%B %d, %Y' -# List of documents that shouldn't be included in the build. -#unused_docs = [] - -# List of directories, relative to source directory, that shouldn't be searched -# for source files. -exclude_trees = [] +# List of patterns, relative to source directory, that match files and +# directories to ignore when looking for source files. +exclude_patterns = ['_build'] # The reST default role (used for this markup: `text`) to use for all documents. #default_role = None @@ -75,7 +75,7 @@ exclude_trees = [] # If true, the current module name will be prepended to all description # unit titles (such as .. function::). -add_module_names = False +#add_module_names = True # If true, sectionauthor and moduleauthor directives will be shown in the # output. They are ignored by default. @@ -90,15 +90,17 @@ pygments_style = 'sphinx' # -- Options for HTML output --------------------------------------------------- -# The theme to use for HTML and HTML Help pages. Major themes that come with -# Sphinx are currently 'default' and 'sphinxdoc'. -#html_theme = 'openlp_qthelp' -html_theme = 'default' +# The theme to use for HTML and HTML Help pages. See the documentation for +# a list of builtin themes. +if sys.argv[2] == 'qthelp' or sys.argv[2] == 'htmlhelp': + html_theme = 'openlp_qthelp' +else: + html_theme = 'default' # Theme options are theme-specific and customize the look and feel of a theme # further. For a list of options available for each theme, see the # documentation. -if html_theme == 'default': +if sys.argv[2] == 'html': html_theme_options = { 'sidebarbgcolor': '#3a60a9', 'relbarbgcolor': '#203b6f', @@ -109,23 +111,23 @@ if html_theme == 'default': } # Add any paths that contain custom themes here, relative to this directory. -html_theme_path = [u'../themes'] +html_theme_path = [os.path.join(os.path.abspath('..'), 'themes')] # The name for this set of Sphinx documents. If None, it defaults to # " v documentation". -html_title = u'OpenLP 2.0 User Manual' +html_title = u'OpenLP 2.0 Reference Manual' # A shorter title for the navigation bar. Default is the same as html_title. #html_short_title = None # The name of an image file (relative to this directory) to place at the top # of the sidebar. -#html_logo = None +html_logo = 'pics/logo.png' # The name of an image file (within the static path) to use as favicon of the # docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 # pixels large. -#html_favicon = None +html_favicon = 'pics/openlp.ico' # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, @@ -134,7 +136,7 @@ html_static_path = ['_static'] # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # using the given strftime format. -#html_last_updated_fmt = '%b %d, %Y' +html_last_updated_fmt = '%b %d, %Y' # If true, SmartyPants will be used to convert quotes and dashes to # typographically correct entities. @@ -148,7 +150,7 @@ html_static_path = ['_static'] #html_additional_pages = {} # If false, no module index is generated. -#html_use_modindex = True +#html_domain_indices = True # If false, no index is generated. #html_use_index = True @@ -159,16 +161,22 @@ html_static_path = ['_static'] # If true, links to the reST sources are added to the pages. #html_show_sourcelink = True +# If true, "Created using Sphinx" is shown in the HTML footer. Default is True. +#html_show_sphinx = True + +# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True. +#html_show_copyright = True + # If true, an OpenSearch description file will be output, and all pages will # contain a tag referring to it. The value of this option must be the # base URL from which the finished HTML is served. #html_use_opensearch = '' -# If nonempty, this is the file name suffix for HTML files (e.g. ".xhtml"). -#html_file_suffix = '' +# This is the file name suffix for HTML files (e.g. ".xhtml"). +#html_file_suffix = None # Output file base name for HTML help builder. -htmlhelp_basename = 'OpenLP-2.0-manual' +htmlhelp_basename = 'OpenLP' # -- Options for LaTeX output -------------------------------------------------- @@ -182,8 +190,8 @@ htmlhelp_basename = 'OpenLP-2.0-manual' # Grouping the document tree into LaTeX files. List of tuples # (source start file, target name, title, author, documentclass [howto/manual]). latex_documents = [ - ('index', 'OpenLP.tex', u'OpenLP 2.0 User Manual', - u'Raoul Snyman', 'manual'), + ('index', 'OpenLP.tex', u'OpenLP Reference Manual', + u'Wesley Stout', 'manual'), ] # The name of an image file (relative to this directory) to place at the top of @@ -194,6 +202,12 @@ latex_documents = [ # not chapters. #latex_use_parts = False +# If true, show page references after internal links. +#latex_show_pagerefs = False + +# If true, show URL addresses after external links. +#latex_show_urls = False + # Additional stuff for the LaTeX preamble. #latex_preamble = '' @@ -201,10 +215,14 @@ latex_documents = [ #latex_appendices = [] # If false, no module index is generated. -#latex_use_modindex = True +#latex_domain_indices = True -# A dictionary that contains LaTeX snippets that override those Sphinx usually -# puts into the generated .tex files. -latex_elements = { - 'fontpkg': '\\usepackage{helvet}' -} + +# -- Options for manual page output -------------------------------------------- + +# One entry per manual page. List of tuples +# (source start file, name, description, authors, manual section). +man_pages = [ + ('index', 'openlp', u'OpenLP Reference Manual', + [u'Wesley Stout'], 1) +] diff --git a/documentation/manual/source/configure.rst b/documentation/manual/source/configure.rst new file mode 100644 index 000000000..9b4cc6f8f --- /dev/null +++ b/documentation/manual/source/configure.rst @@ -0,0 +1,363 @@ +================== +Configuring OpenLP +================== + +OpenLP has many options you can configure to suit your needs. Most options are +self-explanatory and we will quickly review them. + +To configure OpenLP, click on :menuselection:`Settings --> Configure OpenLP...` + +The plugins you have activated will have configure options. If all the plugins +are activated there will be 9 tabs across the top you can configure. + +General Tab +=========== + +.. image:: pics/configuregeneral.png + +Monitors +^^^^^^^^ +To select the monitor you want to display OpenLP on, click the drop-down box +and choose. + +Display if a single screen +^^^^^^^^^^^^^^^^^^^^^^^^^^ + +When this box is selected, you will be able to see your display on a separate +window on the monitor you are using. Click the display and push the Esc key +on your keyboard to close the display window. + +Application Startup +^^^^^^^^^^^^^^^^^^^ + +**Show blank screen warning:** + +When this box is selected, you will get a warning when opening OpenLP that the +output display has been blanked. You may have blanked it and shut down the +program and this will warn you it is still blanked. + +**Automatically open the last service:** + +When this box is selected, OpenLP will remember the last service you were +working on when you closed the program. + +**Show the splash screen:** + +When this box it selected, the OpenLP logo will be displayed in the center of +the screen until the program opens. This is useful to know if the program is +opening. + +Application Settings +^^^^^^^^^^^^^^^^^^^^ + +**Prompt to save before starting a new service** + +When this box is selected, OpenLP will prompt you to save the service you are +working on before starting a new service. + +**Automatically preview next item in service** + +When this box is selected, the next item in the Service Manager will show in the +Preview pane. + +**Slide loop delay** + +This setting is the time delay in seconds if you want to continuously loop +images, verses, or lyrics. This control timer is also accessible on the "live +toolbar. + +CCLI Details +^^^^^^^^^^^^ + +**CCLI number** + +If you subscribe to CCLI, this box is for your License number. This number is +also displayed in the Song Footer box. + +Display Position +^^^^^^^^^^^^^^^^ +This setting will default to your computer monitor. It will override the output +display combo box. If your projector display is different, select the Override +display position and make the changes here to match your projector display. This +option also comes in handy when you have the "Display if a single screen" box +selected. You can make the display smaller so it does not cover your whole +screen. + +Themes Tab +========== + +.. image:: pics/configurethemes.png + +Global Theme +^^^^^^^^^^^^ + +Choose the theme you would like to use as your default global theme from the +drop down box. The theme selected appears below. The global theme use is +determined by the Theme Level you have selected. + +Theme Level +^^^^^^^^^^^ + +Choose from one of three options for the default use of your theme. + +**Song Level:** + +With this level selected, your theme is associated with the song. The theme is +controlled by adding or editing a song in the Song editor and your song theme +takes priority. If your song does not have a theme associated with it, OpenLP +will use the theme set in the Service Manager. + +**Service Level:** + +With this level selected, your theme is controlled at the top of the Service +Manager. Select your default service theme there. This setting will override +your Song theme. + +**Global Level:** + +With this level selected, all songs and verses will use the theme selected on +the left in the Global Theme drop down. + +Advanced Tab +============ + +.. image:: pics/configureadvanced.png + + +UI Settings (user interface) +^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +**Number of recent files to display:** + +Set this number for OpenLP to remember your last files open. These will show +under File. + +**Remember active media manager tab on startup:** + +With this box selected OpenLP media manager will open on the same tab that it +was closed on. + +**Double-click to send items straight to live:** + +With this box selected, double-clicking on anything in the Media Manager will +immediately send it live instead of to Preview. + +**Expand new service items on creation:** + +With this box selected, everything you add to the Service Manager will be +expanded so you can see all the verses, lyrics and presentations, line by line. +When you open OpenLP, everything will automatically be expanded in the Service +Manager. + +Songs Tab +========= + +.. image:: pics/configuresongs.png + +Songs Mode +^^^^^^^^^^ + +**Enable search as you type:** + +With this box selected, Media Manager/Songs will display the song you are +searching for as you are typing. If this box is not selected, you need to type +in your search box and then click on the Search button. + +**Display verses on live tool bar:** + +With this box selected, a Go To drop down box is available on the live toolbar +to select any part of the verse type you want displayed live. + +**Update service from song edit:** + +With this box selected and you edit a song in the media manager, the results +will also change the song if it is added to the Service Manager. If this box +is not selected, your song edit changes will only be available in the Service +Manager if you add it again. + +**Add missing songs when opening service:** + +With this box selected, when you open an order of service created on another +computer, or if one of the songs are no longer in your Media Manager, it will +automatically enter the song in your Songs Media Manager. If this box is not +checked, the song is available in the service but will not be added to the +Media Manager. + +Bibles Tab +========== + +.. image:: pics/configurebibles.png + +Verse Display +^^^^^^^^^^^^^ + +**Only show new chapter numbers:** + +With this box selected, the live display of the verse will only show the +chapter number and verse for the first verse, and just the verse numbers after +that. If the chapter changes, the new chapter number will be displayed with the +verse number for the first line, and only the verse number displayed thereafter. + +**Display style:** + +This option will put brackets around the chapter and verse numbers. You may +select No Brackets or your bracket style from the drop down menu. + +**Layout style:** + +There are three options to determine how your Bible verses are displayed. + +`Verse Per Slide` will display one verse per slide. +`Verse Per Line` will start each verse on a new line until the slide is full. +`Continuous` will run all verses together separated by verse number and chapter +if chapter is selected to show above. + +**Note: Changes do not affect verses already in the service.** + +**Display second Bible verses:** + +OpenLP has the ability to display the same verse in two different Bible +versions for comparison. With this option selected, there will be a Second +choice in the Bible Media Manager to use this option. Verses will display with +one verse per slide with the second Bible verse below. + +**Bible theme:** + +You may select your default Bible theme from this drop down box. This selected +theme will only be used if your `Theme Level` is set at `Song Level`. + +**Note: Changes do not affect verses already in the service.** + + +Presentations Tab +================= + +.. image:: pics/configurepresentations.png + +Available Controllers +^^^^^^^^^^^^^^^^^^^^^ + +OpenLP has the ability to import OpenOffice Impress or Microsoft PowerPoint +presentations, and use Impress, PowerPoint, or PowerPoint Viewer to display +them and they are controlled from within OpenLP. Please remember that in order +to use this function, you must have Impress, PowerPoint or PowerPoint Viewer +installed on your computer because OpenLP uses these programs to open and run +the presentation. You may select your default controllers here in this tab. + +Advanced +^^^^^^^^ + +**Allow presentation application to be overridden** + +With this option selected, you will see `Present using` area with a dropdown +box on the Presentations toolbar in Media Manager which gives you the option +to select the presentation program you want to use. + +Media Tab +========= + +.. image:: pics/configuremedia.png + +Media Display +^^^^^^^^^^^^^ + +**Use Phonon for video playback** + +If you are having trouble displaying media, selecting this box could help. + +Custom Tab: +=========== + +.. image:: pics/configurecustom.png + +Custom Display +^^^^^^^^^^^^^^ + +**Display Footer** + +With this option selected, your Custom slide Title will be displayed in the +footer. + +**Note: If you have an entry in the Credits box of your custom slide, title and +credits will always be displayed.** + +Alerts Tab +========== + +.. image:: pics/configurealerts.png + +Font +^^^^ + +**Font name:** + +Choose your desired font from the drop down menu + +**Font color:** + +Choose your font color here. + +**Background color:** + +Choose the background color the font will be displayed on. + +**Font size:** + +This will adjust the size of the font. + +**Alert timeout:** + +This setting will determine how long your Alert will be displayed on the screen, +in seconds. + +**Location:** + +Choose the location where you want the alert displayed on the +screen, Top, Middle or Bottom. + +**Preview:** + +Your choices will be displayed here. + +Remote Tab +=========== + +.. image:: pics/configureremotes.png + +OpenLP gives you the ability to control your Service Manager from a remote +computer through a web browser. This was written actually for a nursery or day +care where a "come and get YYYY" message could be triggered remotely. It has +now become an interface to control the whole service remotely. + +An example of one use for this would be if you have a missionary with a +PowerPoint presentation, it may be easier for that missionary to remotely +connect to your projection computer and change the slides when he wants to. + +To use this feature you will need to be on a network, wired or wireless, know +the IP address of the projection computer and enter that IP address and port +number in the remote computer's web browser. + +To find your projection computer's IP address for Windows, open Command Prompt +and type in “ipconfig” (without quotations), press Enter key and your IP +address will show. In Linux, open Terminal and type “ifconfig” (without +quotations), and use the IP address after “inet addr:” The IP address will +always have a format of xxx.xxx.xxx.xxx where x is one to three digits long. + +Server Settings +^^^^^^^^^^^^^^^ + +Serve on IP address: Put your projection computer's IP address here. + +Port Number +^^^^^^^^^^^ + +You can use the default port number or change it to another number. + +With these two settings written down, open a web browser in the remote computer +and enter the IP address followed by a colon and then the port number, ie: +192.168.1.104:4316 then press enter. You should now have access to the OpenLP +Controller. If it does not come up, you either entered the wrong IP address, +port number or one or both computer's are not connected to the network. + + + diff --git a/documentation/manual/source/dualmonitors.rst b/documentation/manual/source/dualmonitors.rst index 5c29e8650..3e1a8d210 100644 --- a/documentation/manual/source/dualmonitors.rst +++ b/documentation/manual/source/dualmonitors.rst @@ -180,3 +180,42 @@ on :guilabel:`Save to X Configuration File`. 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. + +Linux Systems With Intel Video +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Generally systems with Intel video cards work very well. They are well supported +by open source drivers. There are, however, a couple of issues that may require +some work arounds. + +**Resolution Issue** + +There is a limitation with certain cards which limits the total resolution to +2048x2048, so both monitors can not have a total resolution totaling more than +that. To work around this it may be necessary to position your monitor as a top +or bottom monitor as opposed to the typical side by side setup. This can easily +be accomplished through your desktop's control of monitors. Please see the +sections on dual monitors with KDE and GNOME above. + +**Primary Monitor Issues** + +With certain cards your system may get confused on what is the primary display. +For example many users will be using a laptop. You will want your laptop screen +to be the primary screen, and your projector to be the secondary monitor. +Certain Intel cards reverse this. To work around this you will need to know the +name of your monitor. If you are a KDE user this info is given to you in the +display settings. If you are not using KDE enter the following in a terminal +without your projector connected to your computer:: + + user@linux:~ $ xrandr -q + +This will give you a long string of output. Screen names will be something along +the lines of LVDM, VGA-0 or some convention similar to that. Without your +projector connected to your computer only one monitor will show as being +connected. That will be the monitor you will need to use as the primary. Now +connect your projector and enter:: + + user@linux:~ $ xrandr --output LVDM --primary + +**Note** it has been reported that when this issue is occurring you will not +want to connect your projector until your desktop is running. diff --git a/documentation/manual/source/glossary.rst b/documentation/manual/source/glossary.rst index ab6c7880e..fd00f4842 100644 --- a/documentation/manual/source/glossary.rst +++ b/documentation/manual/source/glossary.rst @@ -25,6 +25,12 @@ Each tab in the Media Manager is called a **Media Item** From the Media Manager you can send Media Items to the Preview or Live screens. +Platform +-------- + +When the word platform is used, it is usually referring to your operating system, +Windows, Linux or MAC OS. + Preview ------- diff --git a/documentation/manual/source/index.rst b/documentation/manual/source/index.rst index 36bcf2cc1..6e8753f9f 100644 --- a/documentation/manual/source/index.rst +++ b/documentation/manual/source/index.rst @@ -14,5 +14,8 @@ Contents: introduction glossary dualmonitors + configure + bibles + themes mediamanager songs \ No newline at end of file diff --git a/documentation/manual/source/mediamanager.rst b/documentation/manual/source/mediamanager.rst index 2cf1d2c57..778ae8ccd 100644 --- a/documentation/manual/source/mediamanager.rst +++ b/documentation/manual/source/mediamanager.rst @@ -3,8 +3,8 @@ Media Manager ============= Once you get your system set up for OpenLP you will be ready to add content to -your setup. This will all happen through the **Media Manager**. The -`Media Manager` contains all the bibles, songs, presentations, media, and +your Service Manager. This will all happen through the **Media Manager**. The +`Media Manager` contains all the Bibles, Songs, Presentations, Media, and everything else that you will project through OpenLP. Enabling the Plugins @@ -16,11 +16,235 @@ this is what the `Media Manager` looks like with all the plugins enabled. .. image:: pics/mediamanager.png To enable the plugins navigate to :menuselection:`Settings --> Plugins` or -press `F7`. You will then want to click on the plugin to the left that you want -to enable and select **active** from the drop down box to the right. +press `F7`. You will want to click on the plugin to the left that you want to +enable and select **active** from the drop down box to the right. .. image:: pics/plugins.png -Now you should be ready to add content to OpenLP check out the section of this -guide on the individual plugins. +You are now ready to add content for your service. + +Adding Media Content +-------------------- + +This section will describe how to add the different types of media OpenLP is +capable of displaying. + +Songs +^^^^^ +Clicking on Songs in the Media Manager will display all of the songs you have +added by Title and Author/Authors. + +Using the buttons you can: + +`Add a song:` Brings up the dialog box to add a new song + +`Edit the selected song:` Brings up the dialog box to make changes to the song + +`Delete the selected song:` Removes the song from your song list + +`Preview the selected song:` Lets you see what your song will look like +displayed live + +`Send the selected song live:` This option will immediately display your song +live. + +`Add the selected Song to the service:` This will enter your song in the Service +Manager. You may also drag your song over to the Service Manager. + +`Maintain the list of authors, topics and books:` Brings up a dialog box to edit +Authors, Topics or Song Books. +Note: Right clicking on a song file will bring up some of the same options. + +Bibles +^^^^^^ +Clicking on Bibles in the Media Manager will display your options for searching +and adding chapters and verses to the Service Manager. + +Using the buttons you can: + +`Import a Bible:` This is discussed in detail on the Bible Importer page in the +manual. + +`Preview the selected Bible:` Sends your selected verses to the Preview window + +`Send the selected Bible live:` This option will immediately display your +selected verses live. + +`Add the selected Bible to the service:` This will enter your verses into the +Service Manager. You may also click and drag your verses over to the Service +Manager. + +**Quick tab** + +`Version:` Once you have imported a Bible, it will be displayed in the Version +drop down box. Select the version of the Bible you want to use here. + +**Second** + +If you have “Display second Bible verses” selected in Configure OpenLP, Bibles +tab, this choice will be visible. This option is for displaying another version +of the Bible for comparison. Both versions will be displayed. If there is not +enough space on one slide, the Second version will be displayed on the next +slide. + +Use the `Search` button to display your results in the box below. + +**Find** + +You will type your search query in this box for the following two searches. + +`Search type:` You may search for a specific verse using this format below. + +Book Chapter +Book Chapter-Chapter +Book Chapter:Verse-Verse +Book Chapter:Verse-Verse, Verse-Verse +Book Chapter:Verse-Verse,Chapter:Verse-Verse +Book Chapter: Verse-Chapter:Verse + +`Text Search:` + +You may also search by a keyword or words. The more words you use for the +search, the more you will narrow down your results. + +**Results** `Clear and Keep.` + +Each search you make will display your verses below. If you would like to +display verses that are out of sequence you may select `Keep` in the drop down +box and continue your search for the next verse or verses. All searches will be +shown and kept below. +If you select `Clear` from the drop down box, each new search clears the +previous search from the list below. + +**Advanced tab** + +This tab is convenient for selecting book, chapter and verse by name and number. +Version and Second are the same as in Quick tab above. Click on each box and +select the version you wish to display and Second version if you wish to display +an alternative version. + +Use the `Search` button to display your results in the box below. + +`Book:` Click on the drop down box and select the book you want to display. +`Chapter: Verse:` Select your chapter From and To and Verse From and To + +Results will work the same as the Quick tab above. + +Presentations +^^^^^^^^^^^^^ +Using the buttons you can: + +`Load a new presentation:` This brings up a dialog box to find your presentation +and list it in OpenLP. + +`Delete the selected Presentation:` This removes your Presentation from the list. +Please note: this will not delete the presentation from your computer, only from +the OpenLP list. + +`Preview the selected Presentation:` Sends your selected Presentation to the +Preview window + +`Send the selected Presentation live:` This option will immediately display your +selected Presentation live. + +`Add the selected Presentation to the service:` This will enter your +Presentation into the Service Manager. You may also click and drag your +Presentation over to the Service Manager. + +Right clicking on a Presentation file will bring up some of the same options. + +Images +^^^^^^ +Using the buttons you can: + +`Load a new Image:` This brings up a dialog box to find your Image and list it +in OpenLP. + +`Delete the selected Image:` This removes your Image from the list. Please note: +this will not delete the Image from your computer, just the OpenLP list. + +`Preview the selected Image:` Sends your selected Image to the Preview window + +`Send the selected Image live:` This option will immediately display your +selected Image live. + +`Add the selected Image to the service:` This will enter your Image into the +Service Manager. You may also click and drag your Image over to the Service +Manager. + +`Replace Live Background:` With an Image selected, clicking this button will +immediately replace the live background being displayed with your selection. +The Image will replace the theme background until the theme changes or the +"Remove Background" button is pressed. + + +Right clicking on an Image file will bring up some of the same options. + +Media +^^^^^ + +Media is an audio or video file. Generally if you can play or view your media +on your computer without OpenLP, you can also play it in OpenLP. + +Using the buttons you can: +`Load a new Media:` This brings up a dialog box to find your Media and list it +in OpenLP. + +`Delete the selected Media:` This removes your Media from the list. Please note: +this will not delete the Media from your computer, just the OpenLP list. + +`Preview the selected Media:` Sends your selected Media to the Preview window + +`Send the selected Media live:` This option will immediately display your +selected Media live. + +`Add the selected Media to the service:` This will enter your Media into the +Service Manager. You may also click and drag your Media over to the Service +Manager. + +`Replace Live Background:` With a Media file selected, clicking this button will +immediately replace the live background being displayed with your selection. + +Right clicking on a Media file will bring up some of the same options. + +Custom +^^^^^^ + +Custom gives you the option of creating your own slide. This could be useful for +displaying readings, liturgy or any text that may not be found in Songs or +Bibles. + +`Add a new Custom:` Brings up the dialog box to add a new Custom display. +`Edit the selected Custom:` Brings up the dialog box to make changes to the +Custom display. + +`Delete the selected Custom:` Remove the Custom from your list + +`Preview the selected Custom:` Lets you see what your Custom will look like +displayed live + +`Send the selected Custom live:` This option will immediately display your +Custom live + +`Add the selected Custom to the service:` This will enter your Custom in the +Service Manager. You may also drag your Custom over to the Service Manager. + +Right clicking on a Custom file will bring up some of the same options. + +When you Add a new Custom slide a dialog box will appear. + +`Title:` Name of your Custom slide. + +`Add:` After clicking on Add you will enter your text you want to display in +this box. To create multiple slides, click the Split Slide button. When you have +finished adding your text, click on the Save button. + +`Theme:` Select the theme you want to use for your Custom slide from this drop +down box. +`Credits:` Anything typed in this box will be displayed in the footer +information on the display. When you are finished, click the Save button. + +To Edit your slide, click on the Edit button to edit part of it or the Edit All +if you need to make multiple changes. Use the Up and Down arrows to change the +arrangement of your Custom slide. diff --git a/documentation/manual/source/pics/addsong.png b/documentation/manual/source/pics/addsong.png new file mode 100644 index 000000000..3bcdfc088 Binary files /dev/null and b/documentation/manual/source/pics/addsong.png differ diff --git a/documentation/manual/source/pics/addsongservice1.png b/documentation/manual/source/pics/addsongservice1.png new file mode 100644 index 000000000..1a01edadb Binary files /dev/null and b/documentation/manual/source/pics/addsongservice1.png differ diff --git a/documentation/manual/source/pics/addsongservice2.png b/documentation/manual/source/pics/addsongservice2.png new file mode 100644 index 000000000..4be2728d0 Binary files /dev/null and b/documentation/manual/source/pics/addsongservice2.png differ diff --git a/documentation/manual/source/pics/authorstopicsbooks.png b/documentation/manual/source/pics/authorstopicsbooks.png new file mode 100644 index 000000000..dd7aa4862 Binary files /dev/null and b/documentation/manual/source/pics/authorstopicsbooks.png differ diff --git a/documentation/manual/source/pics/bibleimport01.png b/documentation/manual/source/pics/bibleimport01.png new file mode 100644 index 000000000..be8bdfbf3 Binary files /dev/null and b/documentation/manual/source/pics/bibleimport01.png differ diff --git a/documentation/manual/source/pics/bibleimport02.png b/documentation/manual/source/pics/bibleimport02.png new file mode 100644 index 000000000..23c4b7b2a Binary files /dev/null and b/documentation/manual/source/pics/bibleimport02.png differ diff --git a/documentation/manual/source/pics/bibleimportdetails1.png b/documentation/manual/source/pics/bibleimportdetails1.png new file mode 100644 index 000000000..519c36922 Binary files /dev/null and b/documentation/manual/source/pics/bibleimportdetails1.png differ diff --git a/documentation/manual/source/pics/bibleimportfinished1.png b/documentation/manual/source/pics/bibleimportfinished1.png new file mode 100644 index 000000000..15fbd7bae Binary files /dev/null and b/documentation/manual/source/pics/bibleimportfinished1.png differ diff --git a/documentation/manual/source/pics/biblewebcomplete.png b/documentation/manual/source/pics/biblewebcomplete.png new file mode 100644 index 000000000..a928f8021 Binary files /dev/null and b/documentation/manual/source/pics/biblewebcomplete.png differ diff --git a/documentation/manual/source/pics/configureadvanced.png b/documentation/manual/source/pics/configureadvanced.png new file mode 100644 index 000000000..f31812f93 Binary files /dev/null and b/documentation/manual/source/pics/configureadvanced.png differ diff --git a/documentation/manual/source/pics/configurealerts.png b/documentation/manual/source/pics/configurealerts.png new file mode 100644 index 000000000..ac46801dc Binary files /dev/null and b/documentation/manual/source/pics/configurealerts.png differ diff --git a/documentation/manual/source/pics/configurebibles.png b/documentation/manual/source/pics/configurebibles.png new file mode 100644 index 000000000..cd44ee4af Binary files /dev/null and b/documentation/manual/source/pics/configurebibles.png differ diff --git a/documentation/manual/source/pics/configurecustom.png b/documentation/manual/source/pics/configurecustom.png new file mode 100644 index 000000000..3db5c4989 Binary files /dev/null and b/documentation/manual/source/pics/configurecustom.png differ diff --git a/documentation/manual/source/pics/configuregeneral.png b/documentation/manual/source/pics/configuregeneral.png new file mode 100644 index 000000000..b1bae76e0 Binary files /dev/null and b/documentation/manual/source/pics/configuregeneral.png differ diff --git a/documentation/manual/source/pics/configuremedia.png b/documentation/manual/source/pics/configuremedia.png new file mode 100644 index 000000000..cc9e11a38 Binary files /dev/null and b/documentation/manual/source/pics/configuremedia.png differ diff --git a/documentation/manual/source/pics/configurepresentations.png b/documentation/manual/source/pics/configurepresentations.png new file mode 100644 index 000000000..4960aa8e5 Binary files /dev/null and b/documentation/manual/source/pics/configurepresentations.png differ diff --git a/documentation/manual/source/pics/configureremotes.png b/documentation/manual/source/pics/configureremotes.png new file mode 100644 index 000000000..9eb22131c Binary files /dev/null and b/documentation/manual/source/pics/configureremotes.png differ diff --git a/documentation/manual/source/pics/configuresongs.png b/documentation/manual/source/pics/configuresongs.png new file mode 100644 index 000000000..19796f3b5 Binary files /dev/null and b/documentation/manual/source/pics/configuresongs.png differ diff --git a/documentation/manual/source/pics/configurethemes.png b/documentation/manual/source/pics/configurethemes.png new file mode 100644 index 000000000..c8241ddaf Binary files /dev/null and b/documentation/manual/source/pics/configurethemes.png differ diff --git a/documentation/manual/source/pics/createthemeicon.png b/documentation/manual/source/pics/createthemeicon.png new file mode 100644 index 000000000..d1fefc0d2 Binary files /dev/null and b/documentation/manual/source/pics/createthemeicon.png differ diff --git a/documentation/manual/source/pics/csvimport1.png b/documentation/manual/source/pics/csvimport1.png new file mode 100644 index 000000000..9a4214aec Binary files /dev/null and b/documentation/manual/source/pics/csvimport1.png differ diff --git a/documentation/manual/source/pics/csvimport2.png b/documentation/manual/source/pics/csvimport2.png new file mode 100644 index 000000000..d0c8e569b Binary files /dev/null and b/documentation/manual/source/pics/csvimport2.png differ diff --git a/documentation/manual/source/pics/logo.png b/documentation/manual/source/pics/logo.png new file mode 100644 index 000000000..a232b59a9 Binary files /dev/null and b/documentation/manual/source/pics/logo.png differ diff --git a/documentation/manual/source/pics/openlp.ico b/documentation/manual/source/pics/openlp.ico new file mode 100644 index 000000000..e53fce8d7 Binary files /dev/null and b/documentation/manual/source/pics/openlp.ico differ diff --git a/documentation/manual/source/pics/previewsong1.png b/documentation/manual/source/pics/previewsong1.png new file mode 100644 index 000000000..23a6b2a07 Binary files /dev/null and b/documentation/manual/source/pics/previewsong1.png differ diff --git a/documentation/manual/source/pics/previewsong2.png b/documentation/manual/source/pics/previewsong2.png new file mode 100644 index 000000000..6202e0d14 Binary files /dev/null and b/documentation/manual/source/pics/previewsong2.png differ diff --git a/documentation/manual/source/pics/sendsonglive1.png b/documentation/manual/source/pics/sendsonglive1.png new file mode 100644 index 000000000..abef56775 Binary files /dev/null and b/documentation/manual/source/pics/sendsonglive1.png differ diff --git a/documentation/manual/source/pics/sendsonglive2.png b/documentation/manual/source/pics/sendsonglive2.png new file mode 100644 index 000000000..5700495f3 Binary files /dev/null and b/documentation/manual/source/pics/sendsonglive2.png differ diff --git a/documentation/manual/source/pics/songeditor1.png b/documentation/manual/source/pics/songeditor1.png new file mode 100644 index 000000000..d34e10165 Binary files /dev/null and b/documentation/manual/source/pics/songeditor1.png differ diff --git a/documentation/manual/source/pics/songeditor11.png b/documentation/manual/source/pics/songeditor11.png new file mode 100644 index 000000000..0d25eb097 Binary files /dev/null and b/documentation/manual/source/pics/songeditor11.png differ diff --git a/documentation/manual/source/pics/songeditor2.png b/documentation/manual/source/pics/songeditor2.png new file mode 100644 index 000000000..e9f02fd16 Binary files /dev/null and b/documentation/manual/source/pics/songeditor2.png differ diff --git a/documentation/manual/source/pics/songeditor3.png b/documentation/manual/source/pics/songeditor3.png new file mode 100644 index 000000000..4c567ab29 Binary files /dev/null and b/documentation/manual/source/pics/songeditor3.png differ diff --git a/documentation/manual/source/pics/songeditor4.png b/documentation/manual/source/pics/songeditor4.png new file mode 100644 index 000000000..b8fe6be9c Binary files /dev/null and b/documentation/manual/source/pics/songeditor4.png differ diff --git a/documentation/manual/source/pics/songeditor5.png b/documentation/manual/source/pics/songeditor5.png new file mode 100644 index 000000000..bfc9aba75 Binary files /dev/null and b/documentation/manual/source/pics/songeditor5.png differ diff --git a/documentation/manual/source/pics/songeditor6.png b/documentation/manual/source/pics/songeditor6.png new file mode 100644 index 000000000..e727b3828 Binary files /dev/null and b/documentation/manual/source/pics/songeditor6.png differ diff --git a/documentation/manual/source/pics/songeditor7.png b/documentation/manual/source/pics/songeditor7.png new file mode 100644 index 000000000..eeb6f0ff1 Binary files /dev/null and b/documentation/manual/source/pics/songeditor7.png differ diff --git a/documentation/manual/source/pics/songeditor8.png b/documentation/manual/source/pics/songeditor8.png new file mode 100644 index 000000000..fd57d79b4 Binary files /dev/null and b/documentation/manual/source/pics/songeditor8.png differ diff --git a/documentation/manual/source/pics/songeditor9.png b/documentation/manual/source/pics/songeditor9.png new file mode 100644 index 000000000..cf067a7dc Binary files /dev/null and b/documentation/manual/source/pics/songeditor9.png differ diff --git a/documentation/manual/source/pics/songs12.png b/documentation/manual/source/pics/songs12.png new file mode 100644 index 000000000..d9637a4d0 Binary files /dev/null and b/documentation/manual/source/pics/songs12.png differ diff --git a/documentation/manual/source/pics/songs13.png b/documentation/manual/source/pics/songs13.png new file mode 100644 index 000000000..2d084954c Binary files /dev/null and b/documentation/manual/source/pics/songs13.png differ diff --git a/documentation/manual/source/pics/songs14.png b/documentation/manual/source/pics/songs14.png new file mode 100644 index 000000000..917bb6bf6 Binary files /dev/null and b/documentation/manual/source/pics/songs14.png differ diff --git a/documentation/manual/source/pics/songs15.png b/documentation/manual/source/pics/songs15.png new file mode 100644 index 000000000..74deea0ec Binary files /dev/null and b/documentation/manual/source/pics/songs15.png differ diff --git a/documentation/manual/source/pics/songs16.png b/documentation/manual/source/pics/songs16.png new file mode 100644 index 000000000..e72026839 Binary files /dev/null and b/documentation/manual/source/pics/songs16.png differ diff --git a/documentation/manual/source/pics/songs17.png b/documentation/manual/source/pics/songs17.png new file mode 100644 index 000000000..c5b56d1eb Binary files /dev/null and b/documentation/manual/source/pics/songs17.png differ diff --git a/documentation/manual/source/pics/themeeditbutton.png b/documentation/manual/source/pics/themeeditbutton.png new file mode 100644 index 000000000..b3e6a768b Binary files /dev/null and b/documentation/manual/source/pics/themeeditbutton.png differ diff --git a/documentation/manual/source/pics/themeimportexport.png b/documentation/manual/source/pics/themeimportexport.png new file mode 100644 index 000000000..189a2a435 Binary files /dev/null and b/documentation/manual/source/pics/themeimportexport.png differ diff --git a/documentation/manual/source/pics/thememanager1.png b/documentation/manual/source/pics/thememanager1.png new file mode 100644 index 000000000..24dd6bec0 Binary files /dev/null and b/documentation/manual/source/pics/thememanager1.png differ diff --git a/documentation/manual/source/pics/themewizard1.png b/documentation/manual/source/pics/themewizard1.png new file mode 100644 index 000000000..1e37687fb Binary files /dev/null and b/documentation/manual/source/pics/themewizard1.png differ diff --git a/documentation/manual/source/pics/themewizard2.png b/documentation/manual/source/pics/themewizard2.png new file mode 100644 index 000000000..ba1654daf Binary files /dev/null and b/documentation/manual/source/pics/themewizard2.png differ diff --git a/documentation/manual/source/pics/themewizard3.png b/documentation/manual/source/pics/themewizard3.png new file mode 100644 index 000000000..508e80c1c Binary files /dev/null and b/documentation/manual/source/pics/themewizard3.png differ diff --git a/documentation/manual/source/pics/themewizard4.png b/documentation/manual/source/pics/themewizard4.png new file mode 100644 index 000000000..9cd50ed67 Binary files /dev/null and b/documentation/manual/source/pics/themewizard4.png differ diff --git a/documentation/manual/source/pics/themewizard5.png b/documentation/manual/source/pics/themewizard5.png new file mode 100644 index 000000000..cb5c0813c Binary files /dev/null and b/documentation/manual/source/pics/themewizard5.png differ diff --git a/documentation/manual/source/pics/themewizard6.png b/documentation/manual/source/pics/themewizard6.png new file mode 100644 index 000000000..9958d43f0 Binary files /dev/null and b/documentation/manual/source/pics/themewizard6.png differ diff --git a/documentation/manual/source/pics/themewizard7.png b/documentation/manual/source/pics/themewizard7.png new file mode 100644 index 000000000..92d9e47ac Binary files /dev/null and b/documentation/manual/source/pics/themewizard7.png differ diff --git a/documentation/manual/source/pics/themewizard8.png b/documentation/manual/source/pics/themewizard8.png new file mode 100644 index 000000000..a25cf0d8c Binary files /dev/null and b/documentation/manual/source/pics/themewizard8.png differ diff --git a/documentation/manual/source/pics/themewizard9.png b/documentation/manual/source/pics/themewizard9.png new file mode 100644 index 000000000..2bde33ac7 Binary files /dev/null and b/documentation/manual/source/pics/themewizard9.png differ diff --git a/documentation/manual/source/pics/themewizardwelcome.png b/documentation/manual/source/pics/themewizardwelcome.png new file mode 100644 index 000000000..f58e7c8f3 Binary files /dev/null and b/documentation/manual/source/pics/themewizardwelcome.png differ diff --git a/documentation/manual/source/pics/webbible1.png b/documentation/manual/source/pics/webbible1.png new file mode 100644 index 000000000..6ff1b6560 Binary files /dev/null and b/documentation/manual/source/pics/webbible1.png differ diff --git a/documentation/manual/source/pics/webbibleproxy1.png b/documentation/manual/source/pics/webbibleproxy1.png new file mode 100644 index 000000000..23ba9ad24 Binary files /dev/null and b/documentation/manual/source/pics/webbibleproxy1.png differ diff --git a/documentation/manual/source/quickstart.rst b/documentation/manual/source/quickstart.rst new file mode 100644 index 000000000..81e262125 --- /dev/null +++ b/documentation/manual/source/quickstart.rst @@ -0,0 +1,11 @@ +======================== +OpenLP Quick Start Guide +======================== + +Thank you for choosing OpenLP. The developers of OpenLP have attempted to make +OpenLP intuitive and easy to use. This Quick Start Guide will help you to get +going quickly. + +Bible Importer +============== + diff --git a/documentation/manual/source/themes.rst b/documentation/manual/source/themes.rst new file mode 100644 index 000000000..b689cb1a8 --- /dev/null +++ b/documentation/manual/source/themes.rst @@ -0,0 +1,196 @@ +====== +Themes +====== + + +The `Theme Manager` is where you can set backgrounds, fonts, and colors to the +style you desire. From the theme manager you can create a new theme, Edit a +theme, Delete a theme, Import a theme, and Export a theme. + +.. image:: /pics/thememanager1.png + +Creating New Themes +=================== +Click the :guilabel:`Create Theme Icon` to Create a new theme + +.. image:: /pics/createthemeicon.png + +This will bring up the `Theme Wizard` + +.. image:: /pics/themewizardwelcome.png + +Click :guilabel:`Next`. You have 3 choices in the drop down menu for Background +type: Solid Color, Gradient, or Image. + +.. image:: /pics/themewizard1.png + +Solid color: select solid color and click on the black button next to Color. +You will have the option of choosing among the colors you see or entering your +own. + +.. image:: /pics/themewizard2.png + +Gradient: choose the two colors, First and Second, you want to fade together +and the Gradient drop down will let you determine the directions of the fade. + +.. image:: /pics/themewizard3.png + +Image: Click on the folder to find and select your image. OpenLP accepts a +variety of image types. + +.. image:: /pics/themewizard4.png + +**Note:** If possible, try to use the same size image as your projector is +displaying. + +When finished with your selection for background, click the :guilabel:`Next` +button. + +This is the area where you will select and define your font characteristics for +the Display text. + +.. image:: /pics/themewizard5.png + +**Font:** Choose the font you would like to use from the drop down. + +**Color:** Choose the color of your font. + +**Size:** The size of your font determines how many lines are shown per slide. +As you change the font size, the lines per slide will change. + +**Line Spacing:** This setting determines how much space you want between +lines. This setting will also change the lines per slide. + +**Outline:** If you desire an outline around your font, select the Outline box, +choose your color and size of the outline. + +**Shadow:** If you desire a shadow around your font, select the Shadow box and +choose your color and size of the shadow. + +**Bold Display:** select the box for Bold font + +**Italic Display:** select the box for Italic font + +When you are finished selecting your font details click the :guilabel:`Next` +button. + +**Footer Area Font Details** + +This page determines the Font, Font Color, and size of the font for the footer. +The footer is where the Title of the song, Author or Authors, Copyright and +CCLI License are displayed. + +.. image:: /pics/themewizard6.png + +When you are finished setting your footer font details, click :guilabel:`Next`. + +**Text Formatting Details** + +This page determines the alignment of the text on your slide and the transition +from one slide to the next. + +.. image:: /pics/themewizard7.png + +**Horizontal Align** the text to the Left, Right or Center of the screen. + +**Vertical Align** the text to the Top, Middle or bottom of the screen. + +**Transitions** + +When this box is selected, switching slides will fade out from one and fade in +to the next. When the box is not selected, slide changing will be instant. + +When you are finished setting your Text Formatting Details, click :guilabel:`Next`. + +**Output Area Locations** + +This page gives you the ability to position your Main area or Footer area to a +specific area of the screen using the x and y positions. ie: if you do not want +your footer on the bottom left, you can make the adjustment here. +You can resize the Width and the Height of the Main Area and the Footer Area. +ie: If you have a temporary or permanent obstacle in one part of the viewing +area, you can resize the Main or Footer area and use x and y positions to +display in a different position on the screen. + +.. image:: /pics/themewizard8.png + +You can also change the Width and the Height of the Main Area of the Footer Area. + +When you are finished setting your Output Area Locations, click :guilabel:`Next`. + +Save and Preview + +.. image:: /pics/themewizard9.png + +**Theme Name:** Enter your theme name here. + +**Preview** +The Preview shows the choices you made when setting up the previous pages plus, +shows all the edit effects possible so you can see what the impact is on all +possible font colors and characteristics. + +If you are satisfied with your selections, click :guilabel:`Finish`. If you +want to make a change, use the :guilabel:`Back` button. + +Editing Themes +============== +Now that you created your theme, and you show it on the projector and there is +something you don't like, you can easily Edit your theme either by clicking the +Theme Edit Button: + +.. image:: /pics/themeeditbutton.png + +Or by right-clicking your theme and selecting the appropriate action. + +Deleting Themes +=============== + +The Delete Button: + +.. image:: /pics/songs17.png + +will delete a selected theme or by right-clicking your theme and selecting +the appropriate action. + +**Note:** deleting the currently selected global theme or the +default theme is not possible. + +Exporting Themes +================ +If you would like to transfer a theme from one computer to another, click on +the theme you want to Export, click the last button in the Theme Manager: + +.. image:: /pics/themeimportexport.png + +choose the folder you want to save your theme and click the OK button. + +Importing Themes +================ + +The fourth button in the Theme Manager: + +.. image:: /pics/themeimportexport.png + +will allow you to Import an Exported theme. Click the Import button, select the +folder and the theme file, and click OK. Your imported theme will be in the +Theme Manager. Import Theme will also handle version 1 Exports. You will need to +check your imported theme since many of the values will have been defaulted. + +Rename Theme +============ + +If you created a theme and want to change the name of it, right-click your +theme and click Rename theme and enter the new name. + +Copy Theme +========== + +Now that you created a theme with all the attributes you like, you can +right-click the theme, click on Copy theme, choose your new name and click OK. +You now have a duplicate of your first theme that you can edit the way you want. + +Set as Global default +===================== + +If you right-click your theme, you have the option to set the theme as Global +default. This option is covered in greater detail under “Configure OpenLP. diff --git a/openlp.pyw b/openlp.pyw index af3908c30..b8c16c585 100755 --- a/openlp.pyw +++ b/openlp.pyw @@ -7,9 +7,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # @@ -27,20 +27,26 @@ import os import sys import logging +# Import uuid now, to avoid the rare bug described in the support system: +# http://support.openlp.org/issues/102 +# If https://bugs.gentoo.org/show_bug.cgi?id=317557 is fixed, the import can be +# removed. +import uuid from optparse import OptionParser from traceback import format_exception -from subprocess import Popen, PIPE from PyQt4 import QtCore, QtGui from openlp.core.lib import Receiver, check_directory_exists +from openlp.core.lib.ui import UiStrings 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 +from openlp.core.utils import AppLocation, LanguageManager, VersionThread, \ + get_application_version log = logging.getLogger() @@ -71,91 +77,18 @@ class OpenLP(QtGui.QApplication): The core application class. This class inherits from Qt's QApplication class in order to provide the core of the application. """ - log.info(u'OpenLP Application Loaded') - def _get_version(self): + def exec_(self): """ - Load and store current Application Version + Override exec method to allow the shared memory to be released on exit """ - if u'--dev-version' in sys.argv or u'-d' in sys.argv: - # If we're running the dev version, let's use bzr to get the version - try: - # If bzrlib is availble, use it - from bzrlib.branch import Branch - b = Branch.open_containing('.')[0] - b.lock_read() - try: - # Get the branch's latest revision number. - revno = b.revno() - # Convert said revision number into a bzr revision id. - revision_id = b.dotted_revno_to_revision_id((revno,)) - # Get a dict of tags, with the revision id as the key. - tags = b.tags.get_reverse_tag_dict() - # Check if the latest - if revision_id in tags: - full_version = u'%s' % tags[revision_id][0] - else: - full_version = '%s-bzr%s' % \ - (sorted(b.tags.get_tag_dict().keys())[-1], revno) - finally: - b.unlock() - except: - # Otherwise run the command line bzr client - bzr = Popen((u'bzr', u'tags', u'--sort', u'time'), stdout=PIPE) - output, error = bzr.communicate() - code = bzr.wait() - if code != 0: - raise Exception(u'Error running bzr tags') - lines = output.splitlines() - if len(lines) == 0: - tag = u'0.0.0' - revision = u'0' - else: - tag, revision = lines[-1].split() - bzr = Popen((u'bzr', u'log', u'--line', u'-r', u'-1'), - stdout=PIPE) - output, error = bzr.communicate() - code = bzr.wait() - if code != 0: - raise Exception(u'Error running bzr log') - latest = output.split(u':')[0] - full_version = latest == revision and tag or \ - u'%s-bzr%s' % (tag, latest) - else: - # We're not running the development version, let's use the file - filepath = AppLocation.get_directory(AppLocation.VersionDir) - filepath = os.path.join(filepath, u'.version') - fversion = None - try: - fversion = open(filepath, u'r') - full_version = unicode(fversion.read()).rstrip() - except IOError: - log.exception('Error in version file.') - full_version = u'0.0.0-bzr000' - finally: - if fversion: - fversion.close() - bits = full_version.split(u'-') - app_version = { - u'full': full_version, - u'version': bits[0], - u'build': bits[1] if len(bits) > 1 else None - } - if app_version[u'build']: - log.info( - u'Openlp version %s build %s', - app_version[u'version'], - app_version[u'build'] - ) - else: - log.info(u'Openlp version %s' % app_version[u'version']) - return app_version + QtGui.QApplication.exec_() + self.sharedMemory.detach() def run(self): """ Run the OpenLP application. """ - app_version = self._get_version() # provide a listener for widgets to reqest a screen update. QtCore.QObject.connect(Receiver.get_receiver(), QtCore.SIGNAL(u'openlp_process_events'), self.processEvents) @@ -163,10 +96,6 @@ class OpenLP(QtGui.QApplication): QtCore.SIGNAL(u'cursor_busy'), self.setBusyCursor) QtCore.QObject.connect(Receiver.get_receiver(), QtCore.SIGNAL(u'cursor_normal'), self.setNormalCursor) - self.setOrganizationName(u'OpenLP') - 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 @@ -186,7 +115,7 @@ class OpenLP(QtGui.QApplication): # make sure Qt really display the splash screen self.processEvents() # start the main app window - self.mainWindow = MainWindow(screens, app_version, self.clipboard()) + self.mainWindow = MainWindow(screens, self) self.mainWindow.show() if show_splash: # now kill the splashscreen @@ -198,9 +127,27 @@ class OpenLP(QtGui.QApplication): update_check = QtCore.QSettings().value( u'general/update check', QtCore.QVariant(True)).toBool() if update_check: - VersionThread(self.mainWindow, app_version).start() + VersionThread(self.mainWindow).start() return self.exec_() + def isAlreadyRunning(self): + """ + Look to see if OpenLP is already running and ask if a 2nd copy + is to be started. + """ + self.sharedMemory = QtCore.QSharedMemory('OpenLP') + if self.sharedMemory.attach(): + status = QtGui.QMessageBox.critical(None, + UiStrings.Error, UiStrings.OpenLPStart, + QtGui.QMessageBox.StandardButtons( + QtGui.QMessageBox.Yes | QtGui.QMessageBox.No)) + if status == QtGui.QMessageBox.No: + return True + return False + else: + self.sharedMemory.create(1) + return False + def hookException(self, exctype, value, traceback): if not hasattr(self, u'mainWindow'): log.exception(''.join(format_exception(exctype, value, traceback))) @@ -273,11 +220,15 @@ def main(): qInitResources() # Now create and actually run the application. app = OpenLP(qt_args) - # Define the settings environment - settings = QtCore.QSettings(u'OpenLP', u'OpenLP') + # Instance check + if app.isAlreadyRunning(): + sys.exit() + app.setOrganizationName(u'OpenLP') + app.setOrganizationDomain(u'openlp.org') + app.setApplicationName(u'OpenLP') + app.setApplicationVersion(get_application_version()[u'version']) # First time checks in settings - # Use explicit reference as not inside a QT environment yet - if not settings.value(u'general/has run wizard', + if not QtCore.QSettings().value(u'general/has run wizard', QtCore.QVariant(False)).toBool(): if not FirstTimeLanguageForm().exec_(): # if cancel then stop processing diff --git a/openlp/.version b/openlp/.version index ae8249b9a..998994b7f 100644 --- a/openlp/.version +++ b/openlp/.version @@ -1 +1 @@ -1.9.2-bzr987 \ No newline at end of file +1.9.5-bzr1421 \ No newline at end of file diff --git a/openlp/__init__.py b/openlp/__init__.py index 9c22aab8b..ac3dac24c 100644 --- a/openlp/__init__.py +++ b/openlp/__init__.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/core/__init__.py b/openlp/core/__init__.py index 00d8b78c0..1cef928bc 100644 --- a/openlp/core/__init__.py +++ b/openlp/core/__init__.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/core/lib/__init__.py b/openlp/core/lib/__init__.py index 1fb842361..ddb1ae9b1 100644 --- a/openlp/core/lib/__init__.py +++ b/openlp/core/lib/__init__.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # @@ -316,8 +316,11 @@ def check_directory_exists(dir): Theme directory to make sure exists """ log.debug(u'check_directory_exists %s' % dir) - if not os.path.exists(dir): - os.makedirs(dir) + try: + if not os.path.exists(dir): + os.makedirs(dir) + except IOError: + pass from listwidgetwithdnd import ListWidgetWithDnD from displaytags import DisplayTags diff --git a/openlp/core/lib/db.py b/openlp/core/lib/db.py index c92f992c8..42dab1e42 100644 --- a/openlp/core/lib/db.py +++ b/openlp/core/lib/db.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/core/lib/displaytags.py b/openlp/core/lib/displaytags.py index fc36bc090..b584af023 100644 --- a/openlp/core/lib/displaytags.py +++ b/openlp/core/lib/displaytags.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/core/lib/dockwidget.py b/openlp/core/lib/dockwidget.py index efc0a3066..9b4661fee 100644 --- a/openlp/core/lib/dockwidget.py +++ b/openlp/core/lib/dockwidget.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/core/lib/eventreceiver.py b/openlp/core/lib/eventreceiver.py index 78b0c6324..bee195b0f 100644 --- a/openlp/core/lib/eventreceiver.py +++ b/openlp/core/lib/eventreceiver.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # @@ -101,6 +101,10 @@ class EventReceiver(QtCore.QObject): ``servicemanager_previous_item`` Display the previous item in the service + ``servicemanager_preview_live`` + Requests a Preview item from the Service Manager to update live and + add a new item to the preview panel + ``servicemanager_next_item`` Display the next item in the service diff --git a/openlp/core/lib/htmlbuilder.py b/openlp/core/lib/htmlbuilder.py index 4faf47ddc..67a05c6a1 100644 --- a/openlp/core/lib/htmlbuilder.py +++ b/openlp/core/lib/htmlbuilder.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/core/lib/imagemanager.py b/openlp/core/lib/imagemanager.py index 31b41dc0f..4873f4975 100644 --- a/openlp/core/lib/imagemanager.py +++ b/openlp/core/lib/imagemanager.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/core/lib/listwidgetwithdnd.py b/openlp/core/lib/listwidgetwithdnd.py index 5cd8cf9e2..c45b4cc9d 100644 --- a/openlp/core/lib/listwidgetwithdnd.py +++ b/openlp/core/lib/listwidgetwithdnd.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/core/lib/mediamanageritem.py b/openlp/core/lib/mediamanageritem.py index ceaad2d46..087c2a1d3 100644 --- a/openlp/core/lib/mediamanageritem.py +++ b/openlp/core/lib/mediamanageritem.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/core/lib/plugin.py b/openlp/core/lib/plugin.py index 6195cb248..eda8ecfa1 100644 --- a/openlp/core/lib/plugin.py +++ b/openlp/core/lib/plugin.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # @@ -32,6 +32,7 @@ from PyQt4 import QtCore from openlp.core.lib import Receiver from openlp.core.lib.ui import UiStrings +from openlp.core.utils import get_application_version log = logging.getLogger(__name__) @@ -145,7 +146,10 @@ class Plugin(QtCore.QObject): self.textStrings = {} self.setPluginTextStrings() self.nameStrings = self.textStrings[StringContent.Name] - self.version = version if version else u'1.9.4' + if version: + self.version = version + else: + self.version = get_application_version()[u'version'] 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 6085b0da3..9289084c6 100644 --- a/openlp/core/lib/pluginmanager.py +++ b/openlp/core/lib/pluginmanager.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py index 4df87a4df..0eeae6abd 100644 --- a/openlp/core/lib/renderer.py +++ b/openlp/core/lib/renderer.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/core/lib/rendermanager.py b/openlp/core/lib/rendermanager.py index 0c9549ea5..65f2b355c 100644 --- a/openlp/core/lib/rendermanager.py +++ b/openlp/core/lib/rendermanager.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # @@ -145,7 +145,8 @@ class RenderManager(object): else: self.theme = self.service_theme else: - if theme: + # Images have a theme of -1 + if theme and theme != -1: self.theme = theme elif theme_level == ThemeLevel.Song or \ theme_level == ThemeLevel.Service: diff --git a/openlp/core/lib/searchedit.py b/openlp/core/lib/searchedit.py index d2424d00e..4841d76dc 100644 --- a/openlp/core/lib/searchedit.py +++ b/openlp/core/lib/searchedit.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py index d446edc75..48a277633 100644 --- a/openlp/core/lib/serviceitem.py +++ b/openlp/core/lib/serviceitem.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # @@ -109,7 +109,9 @@ class ServiceItem(object): self.edit_id = None self.xml_version = None self.start_time = 0 + self.end_time = 0 self.media_length = 0 + self.from_service = False self._new_item() def _new_item(self): @@ -261,6 +263,7 @@ class ServiceItem(object): u'data': self.data_string, u'xml_version': self.xml_version, u'start_time': self.start_time, + u'end_time': self.end_time, u'media_length': self.media_length } service_data = [] @@ -307,6 +310,8 @@ class ServiceItem(object): self.xml_version = header[u'xml_version'] if u'start_time' in header: self.start_time = header[u'start_time'] + if u'end_time' in header: + self.end_time = header[u'end_time'] if u'media_length' in header: self.media_length = header[u'media_length'] if self.service_item_type == ServiceItemType.Text: @@ -449,4 +454,3 @@ class ServiceItem(object): return end else: return u'%s : %s' % (start, end) - diff --git a/openlp/core/lib/settingsmanager.py b/openlp/core/lib/settingsmanager.py index d09497540..bb83371e6 100644 --- a/openlp/core/lib/settingsmanager.py +++ b/openlp/core/lib/settingsmanager.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/core/lib/settingstab.py b/openlp/core/lib/settingstab.py index 4f3748c8d..1c2ad5fe4 100644 --- a/openlp/core/lib/settingstab.py +++ b/openlp/core/lib/settingstab.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/core/lib/spelltextedit.py b/openlp/core/lib/spelltextedit.py index 493781ccc..4016dcb09 100644 --- a/openlp/core/lib/spelltextedit.py +++ b/openlp/core/lib/spelltextedit.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/core/lib/theme.py b/openlp/core/lib/theme.py index ef26ca842..134df7652 100644 --- a/openlp/core/lib/theme.py +++ b/openlp/core/lib/theme.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/core/lib/toolbar.py b/openlp/core/lib/toolbar.py index 1da68d72d..d5d2fa4f8 100644 --- a/openlp/core/lib/toolbar.py +++ b/openlp/core/lib/toolbar.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/core/lib/ui.py b/openlp/core/lib/ui.py index eae4f60ca..c1a9f8b35 100644 --- a/openlp/core/lib/ui.py +++ b/openlp/core/lib/ui.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # @@ -49,6 +49,7 @@ class UiStrings(object): Cancel = translate('OpenLP.Ui', 'Cancel') CCLINumberLabel = translate('OpenLP.Ui', 'CCLI number:') CreateService = translate('OpenLP.Ui', 'Create a new service.') + Default = unicode(translate('OpenLP.Ui', 'Default')) Delete = translate('OpenLP.Ui', '&Delete') Edit = translate('OpenLP.Ui', '&Edit') EmptyField = translate('OpenLP.Ui', 'Empty Field') @@ -56,6 +57,7 @@ class UiStrings(object): Export = translate('OpenLP.Ui', 'Export') FontSizePtUnit = translate('OpenLP.Ui', 'pt', 'Abbreviated font pointsize unit') + Hours = translate('OpenLP.Ui', 'h', 'The abbreviated unit for hours') Image = translate('OpenLP.Ui', 'Image') Import = translate('OpenLP.Ui', 'Import') LengthTime = unicode(translate('OpenLP.Ui', 'Length %s')) @@ -63,6 +65,7 @@ class UiStrings(object): LiveBGError = translate('OpenLP.Ui', 'Live Background Error') LivePanel = translate('OpenLP.Ui', 'Live Panel') Load = translate('OpenLP.Ui', 'Load') + Minutes = translate('OpenLP.Ui', 'm', 'The abbreviated unit for minutes') Middle = translate('OpenLP.Ui', 'Middle') New = translate('OpenLP.Ui', 'New') NewService = translate('OpenLP.Ui', 'New Service') @@ -73,6 +76,8 @@ class UiStrings(object): NISp = translate('OpenLP.Ui', 'No Items Selected', 'Plural') OLPV1 = translate('OpenLP.Ui', 'openlp.org 1.x') OLPV2 = translate('OpenLP.Ui', 'OpenLP 2.0') + OpenLPStart = translate('OpenLP.Ui', 'OpenLP is already running. Do you ' + 'wish to continue?') OpenService = translate('OpenLP.Ui', 'Open Service') Preview = translate('OpenLP.Ui', 'Preview') PreviewPanel = translate('OpenLP.Ui', 'Preview Panel') @@ -81,7 +86,7 @@ class UiStrings(object): ReplaceLiveBG = translate('OpenLP.Ui', 'Replace Live Background') ResetBG = translate('OpenLP.Ui', 'Reset Background') ResetLiveBG = translate('OpenLP.Ui', 'Reset Live Background') - S = translate('OpenLP.Ui', 's', 'The abbreviated unit for seconds') + Seconds = translate('OpenLP.Ui', 's', 'The abbreviated unit for seconds') SaveAndPreview = translate('OpenLP.Ui', 'Save && Preview') Search = translate('OpenLP.Ui', 'Search') SelectDelete = translate('OpenLP.Ui', 'You must select an item to delete.') diff --git a/openlp/core/theme/__init__.py b/openlp/core/theme/__init__.py index 52f7120b1..bd5ba899d 100644 --- a/openlp/core/theme/__init__.py +++ b/openlp/core/theme/__init__.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/core/theme/theme.py b/openlp/core/theme/theme.py index bb6b25a9e..78e9cb7e7 100644 --- a/openlp/core/theme/theme.py +++ b/openlp/core/theme/theme.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/core/ui/__init__.py b/openlp/core/ui/__init__.py index 485d2adda..a2985c0b8 100644 --- a/openlp/core/ui/__init__.py +++ b/openlp/core/ui/__init__.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/core/ui/aboutdialog.py b/openlp/core/ui/aboutdialog.py index aec1bad51..33fc53827 100644 --- a/openlp/core/ui/aboutdialog.py +++ b/openlp/core/ui/aboutdialog.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # @@ -112,32 +112,32 @@ class Ui_AboutDialog(object): u'Andreas "googol" Preikschat', u'Raoul "superfly" Snyman', u'Martin "mijiti" Thompson', u'Jon "Meths" Tibble'] contributors = [u'Scott "sguerrieri" Guerrieri', - u'Meinert "m2j" Jordan', u'Armin "orangeshirt" K\xf6hler', + u'Matthias "matthub" Hub', u'Meinert "m2j" Jordan', + u'Armin "orangeshirt" K\xf6hler', u'Mattias "mahfiaz" P\xf5ldaru', u'Christian "crichter" Richter', u'Philip "Phill" Ridout', u'Jeffrey "whydoubt" Smith', u'Maikel Stuivenberg', - u'Carsten "catini" Tingaard', u'Frode "frodus" Woldsund'] + u'Frode "frodus" Woldsund'] testers = [u'Philip "Phill" Ridout', u'Wesley "wrst" Stout', u'John "jseagull1" Cegalis (lead)'] packagers = ['Thomas "tabthorpe" Abthorpe (FreeBSD)', u'Tim "TRB143" Bentley (Fedora)', - u'Michael "cocooncrash" Gorven (Ubuntu)', u'Matthias "matthub" Hub (Mac OS X)', - u'Raoul "superfly" Snyman (Windows, Ubuntu)'] + u'Stevan "StevanP" Pettit (Windows)', + u'Raoul "superfly" Snyman (Ubuntu)'] translators = { u'af': [u'Johan "nuvolari" Mynhardt'], u'de': [u'Patrick "madmuffin" Br\xfcckner', - u'Meinert "m2j" Jordan', - u'Andreas "googol" Preikschat', + u'Meinert "m2j" Jordan', u'Andreas "googol" Preikschat', u'Christian "crichter" Richter'], u'en_GB': [u'Tim "TRB143" Bentley', u'Jonathan "gushie" Corwin'], u'en_ZA': [u'Raoul "superfly" Snyman'], u'et': [u'Mattias "mahfiaz" P\xf5ldaru'], u'fr': [u'Stephan\xe9 "stbrunner" Brunner'], - u'hu': [u'Gyuris Gellért'], + u'hu': [u'Gyuris Gell\xe9t'], u'ja': [u'Kunio "Kunio" Nakamaru'], u'nb': [u'Atle "pendlaren" Weibell', u'Frode "frodus" Woldsund'], u'nl': [u'Arjen "typovar" van Voorst'], - u'pt_BR': [u'Rafael "rafaellerm" Lerm'], + u'pt_BR': [u'Rafael "rafaellerm" Lerm', u'Gustavo Bim'], u'ru': [u'Sergey "ratz" Ratz'] } documentors = [u'Wesley "wrst" Stout', diff --git a/openlp/core/ui/aboutform.py b/openlp/core/ui/aboutform.py index a6550b23c..4112cfd8f 100644 --- a/openlp/core/ui/aboutform.py +++ b/openlp/core/ui/aboutform.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # @@ -28,25 +28,26 @@ from PyQt4 import QtCore, QtGui from aboutdialog import Ui_AboutDialog from openlp.core.lib import translate +from openlp.core.utils import get_application_version class AboutForm(QtGui.QDialog, Ui_AboutDialog): """ The About dialog """ - def __init__(self, parent, applicationVersion): + def __init__(self, parent): """ Do some initialisation stuff """ QtGui.QDialog.__init__(self, parent) - self.applicationVersion = applicationVersion + applicationVersion = get_application_version() self.setupUi(self) about_text = self.aboutTextEdit.toPlainText() about_text = about_text.replace(u'', - self.applicationVersion[u'version']) - if self.applicationVersion[u'build']: + applicationVersion[u'version']) + if applicationVersion[u'build']: build_text = unicode(translate('OpenLP.AboutForm', ' build %s')) % \ - self.applicationVersion[u'build'] + applicationVersion[u'build'] else: build_text = u'' about_text = about_text.replace(u'', build_text) diff --git a/openlp/core/ui/advancedtab.py b/openlp/core/ui/advancedtab.py index a8e8b294e..e9ab159ea 100644 --- a/openlp/core/ui/advancedtab.py +++ b/openlp/core/ui/advancedtab.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/core/ui/displaytagdialog.py b/openlp/core/ui/displaytagdialog.py index 6a1d8ca2c..848818e88 100644 --- a/openlp/core/ui/displaytagdialog.py +++ b/openlp/core/ui/displaytagdialog.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/core/ui/displaytagform.py b/openlp/core/ui/displaytagform.py index e29fe3384..24cd14bd0 100644 --- a/openlp/core/ui/displaytagform.py +++ b/openlp/core/ui/displaytagform.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/core/ui/exceptiondialog.py b/openlp/core/ui/exceptiondialog.py index 770913b01..4aa01f776 100644 --- a/openlp/core/ui/exceptiondialog.py +++ b/openlp/core/ui/exceptiondialog.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/core/ui/exceptionform.py b/openlp/core/ui/exceptionform.py index 6fb2d3f84..50cf597ea 100644 --- a/openlp/core/ui/exceptionform.py +++ b/openlp/core/ui/exceptionform.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/core/ui/filerenamedialog.py b/openlp/core/ui/filerenamedialog.py index 30c206d2c..ec0f0e2dd 100644 --- a/openlp/core/ui/filerenamedialog.py +++ b/openlp/core/ui/filerenamedialog.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/core/ui/filerenameform.py b/openlp/core/ui/filerenameform.py index 69a1c3f6a..049b68336 100644 --- a/openlp/core/ui/filerenameform.py +++ b/openlp/core/ui/filerenameform.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/core/ui/firsttimeform.py b/openlp/core/ui/firsttimeform.py index ba912641d..dc1932015 100644 --- a/openlp/core/ui/firsttimeform.py +++ b/openlp/core/ui/firsttimeform.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/core/ui/firsttimelanguagedialog.py b/openlp/core/ui/firsttimelanguagedialog.py index 93751763f..bdc03048a 100644 --- a/openlp/core/ui/firsttimelanguagedialog.py +++ b/openlp/core/ui/firsttimelanguagedialog.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/core/ui/firsttimelanguageform.py b/openlp/core/ui/firsttimelanguageform.py index 22057fbfc..f6ffafb8f 100644 --- a/openlp/core/ui/firsttimelanguageform.py +++ b/openlp/core/ui/firsttimelanguageform.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/core/ui/firsttimewizard.py b/openlp/core/ui/firsttimewizard.py index 9ed5e7193..4c7ae6880 100644 --- a/openlp/core/ui/firsttimewizard.py +++ b/openlp/core/ui/firsttimewizard.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # @@ -26,6 +26,8 @@ from PyQt4 import QtCore, QtGui +import sys + from openlp.core.lib import translate from openlp.core.lib.ui import add_welcome_page @@ -77,7 +79,10 @@ class Ui_FirstTimeWizard(object): self.imageCheckBox.setObjectName(u'imageCheckBox') self.pluginLayout.addWidget(self.imageCheckBox) self.presentationCheckBox = QtGui.QCheckBox(self.pluginPage) - self.presentationCheckBox.setChecked(True) + if sys.platform == "darwin": + self.presentationCheckBox.setChecked(False) + else: + self.presentationCheckBox.setChecked(True) self.presentationCheckBox.setObjectName(u'presentationCheckBox') self.pluginLayout.addWidget(self.presentationCheckBox) self.mediaCheckBox = QtGui.QCheckBox(self.pluginPage) @@ -210,6 +215,8 @@ class Ui_FirstTimeWizard(object): 'Images')) self.presentationCheckBox.setText(translate('OpenLP.FirstTimeWizard', 'Presentations')) + if sys.platform == "darwin": + self.presentationCheckBox.setEnabled(False) self.mediaCheckBox.setText(translate('OpenLP.FirstTimeWizard', 'Media (Audio and Video)')) self.remoteCheckBox.setText(translate('OpenLP.FirstTimeWizard', diff --git a/openlp/core/ui/generaltab.py b/openlp/core/ui/generaltab.py index eabccd301..d249dd4e0 100644 --- a/openlp/core/ui/generaltab.py +++ b/openlp/core/ui/generaltab.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # @@ -105,6 +105,9 @@ class GeneralTab(SettingsTab): self.saveCheckServiceCheckBox = QtGui.QCheckBox(self.settingsGroupBox) self.saveCheckServiceCheckBox.setObjectName(u'saveCheckServiceCheckBox') self.settingsLayout.addRow(self.saveCheckServiceCheckBox) + self.autoUnblankCheckBox = QtGui.QCheckBox(self.settingsGroupBox) + self.autoUnblankCheckBox.setObjectName(u'autoUnblankCheckBox') + self.settingsLayout.addRow(self.autoUnblankCheckBox) self.autoPreviewCheckBox = QtGui.QCheckBox(self.settingsGroupBox) self.autoPreviewCheckBox.setObjectName(u'autoPreviewCheckBox') self.settingsLayout.addRow(self.autoPreviewCheckBox) @@ -224,6 +227,8 @@ class GeneralTab(SettingsTab): translate('OpenLP.GeneralTab', 'Application Settings')) self.saveCheckServiceCheckBox.setText(translate('OpenLP.GeneralTab', 'Prompt to save before starting a new service')) + self.autoUnblankCheckBox.setText(translate('OpenLP.GeneralTab', + 'Unblank display when adding new live item')) self.autoPreviewCheckBox.setText(translate('OpenLP.GeneralTab', 'Automatically preview next item in service')) self.timeoutLabel.setText(translate('OpenLP.GeneralTab', @@ -262,6 +267,8 @@ class GeneralTab(SettingsTab): u'songselect password', QtCore.QVariant(u'')).toString())) self.saveCheckServiceCheckBox.setChecked(settings.value(u'save prompt', QtCore.QVariant(False)).toBool()) + self.autoUnblankCheckBox.setChecked(settings.value(u'auto unblank', + QtCore.QVariant(False)).toBool()) self.monitorComboBox.setCurrentIndex(self.monitorNumber) self.displayOnMonitorCheck.setChecked(self.screens.display) self.warningCheckBox.setChecked(settings.value(u'blank warning', @@ -312,6 +319,8 @@ class GeneralTab(SettingsTab): QtCore.QVariant(self.checkForUpdatesCheckBox.isChecked())) settings.setValue(u'save prompt', QtCore.QVariant(self.saveCheckServiceCheckBox.isChecked())) + settings.setValue(u'auto unblank', + QtCore.QVariant(self.autoUnblankCheckBox.isChecked())) settings.setValue(u'auto preview', QtCore.QVariant(self.autoPreviewCheckBox.isChecked())) settings.setValue(u'loop delay', diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py index 6b61a539d..5a864957e 100644 --- a/openlp/core/ui/maindisplay.py +++ b/openlp/core/ui/maindisplay.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # @@ -367,7 +367,7 @@ class MainDisplay(DisplayWidget): self.mediaObject.setCurrentSource(Phonon.MediaSource(videoPath)) # Need the timer to trigger set the trigger to 200ms # Value taken from web documentation. - if self.serviceItem.start_time != 0: + if self.serviceItem.end_time != 0: self.mediaObject.setTickInterval(200) self.mediaObject.play() self.webView.setVisible(False) @@ -401,9 +401,9 @@ class MainDisplay(DisplayWidget): def videoTick(self, tick): """ Triggered on video tick every 200 milli seconds - Will be used to manage stop time later """ - pass + if tick > self.serviceItem.end_time * 1000: + self.videoFinished() def isWebLoaded(self): """ @@ -489,7 +489,11 @@ class MainDisplay(DisplayWidget): self.footer(serviceItem.foot_text) # if was hidden keep it hidden if self.hideMode and self.isLive: - self.hideDisplay(self.hideMode) + if QtCore.QSettings().value(u'general/auto unblank', + QtCore.QVariant(False)).toBool(): + Receiver.send_message(u'slidecontroller_live_unblank') + else: + self.hideDisplay(self.hideMode) # display hidden for video end we have a new item so must be shown if self.videoHide and self.isLive: self.videoHide = False diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index 294cca49b..594c6cc91 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # @@ -38,7 +38,7 @@ from openlp.core.ui import AboutForm, SettingsForm, ServiceManager, \ ThemeManager, SlideController, PluginForm, MediaDockManager, \ ShortcutListForm, DisplayTagForm from openlp.core.utils import AppLocation, add_actions, LanguageManager, \ - ActionList + ActionList, get_application_version log = logging.getLogger(__name__) @@ -256,7 +256,6 @@ class Ui_MainWindow(object): u':/system/system_about.png') mainWindow.actionList.add_action(self.HelpAboutItem, u'Help') self.HelpOnlineHelpItem = base_action(mainWindow, u'HelpOnlineHelpItem') - self.HelpOnlineHelpItem.setEnabled(False) mainWindow.actionList.add_action(self.HelpOnlineHelpItem, u'Help') self.helpWebSiteItem = base_action(mainWindow, u'helpWebSiteItem') mainWindow.actionList.add_action(self.helpWebSiteItem, u'Help') @@ -304,7 +303,6 @@ class Ui_MainWindow(object): self.ExportLanguageItem.setVisible(False) self.SettingsShortcutsItem.setVisible(False) self.HelpDocumentationItem.setVisible(False) - self.HelpOnlineHelpItem.setVisible(False) def retranslateUi(self, mainWindow): """ @@ -430,6 +428,9 @@ class Ui_MainWindow(object): translate('OpenLP.MainWindow', 'Ctrl+F1')) self.HelpOnlineHelpItem.setText( translate('OpenLP.MainWindow', '&Online Help')) + # Uncomment after 1.9.5 beta string freeze + #self.HelpOnlineHelpItem.setShortcut( + # translate('OpenLP.MainWindow', 'F1')) self.helpWebSiteItem.setText( translate('OpenLP.MainWindow', '&Web Site')) for item in self.LanguageGroup.actions(): @@ -468,15 +469,15 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): actionList = ActionList() - def __init__(self, screens, applicationVersion, clipboard): + def __init__(self, screens, application): """ This constructor sets up the interface, the various managers, and the plugins. """ QtGui.QMainWindow.__init__(self) self.screens = screens - self.applicationVersion = applicationVersion - self.clipboard = clipboard + + self.application = application # Set up settings sections for the main application # (not for use by plugins) self.uiSettingsSection = u'user interface' @@ -486,7 +487,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): self.serviceNotSaved = False self.actionList = ActionList() self.settingsmanager = SettingsManager(screens) - self.aboutForm = AboutForm(self, applicationVersion) + self.aboutForm = AboutForm(self) self.settingsForm = SettingsForm(self.screens, self, self) self.displayTagForm = DisplayTagForm(self) self.shortcutForm = ShortcutListForm(self) @@ -530,6 +531,8 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): self.ViewThemeManagerItem.setChecked) QtCore.QObject.connect(self.helpWebSiteItem, QtCore.SIGNAL(u'triggered()'), self.onHelpWebSiteClicked) + QtCore.QObject.connect(self.HelpOnlineHelpItem, + QtCore.SIGNAL(u'triggered()'), self.onHelpOnLineHelpClicked) QtCore.QObject.connect(self.HelpAboutItem, QtCore.SIGNAL(u'triggered()'), self.onHelpAboutItemClicked) QtCore.QObject.connect(self.ToolsOpenDataFolder, @@ -619,9 +622,6 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): # Call the initialise method to setup plugins. log.info(u'initialise plugins') self.pluginManager.initialise_plugins() - # Once all components are initialised load the Themes - log.info(u'Load Themes') - self.themeManagerContents.loadThemes() log.info(u'Load data from Settings') if QtCore.QSettings().value(u'advanced/save current plugin', QtCore.QVariant(False)).toBool(): @@ -630,6 +630,9 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): if savedPlugin != -1: self.MediaToolBox.setCurrentIndex(savedPlugin) self.settingsForm.postSetUp() + # Once all components are initialised load the Themes + log.info(u'Load Themes') + self.themeManagerContents.loadThemes(True) Receiver.send_message(u'cursor_normal') def setAutoLanguage(self, value): @@ -648,7 +651,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): 'version from http://openlp.org/.')) QtGui.QMessageBox.question(self, translate('OpenLP.MainWindow', 'OpenLP Version Updated'), - version_text % (version, self.applicationVersion[u'full'])) + version_text % (version, get_application_version()[u'full'])) def show(self): """ @@ -658,7 +661,12 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): if self.liveController.display.isVisible(): self.liveController.display.setFocus() self.activateWindow() - if QtCore.QSettings().value( + if len(self.application.arguments()) > 0: + args = [] + for a in self.application.arguments(): + args.extend([a]) + self.ServiceManagerContents.loadFile(unicode(args[0])) + elif QtCore.QSettings().value( self.generalSettingsSection + u'/auto open', QtCore.QVariant(False)).toBool(): self.ServiceManagerContents.loadLastFile() @@ -676,7 +684,6 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): def firstTime(self): # Import themes if first time Receiver.send_message(u'openlp_process_events') - self.themeManagerContents.firstTime() for plugin in self.pluginManager.plugins: if hasattr(plugin, u'firstTime'): Receiver.send_message(u'openlp_process_events') @@ -720,11 +727,17 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): import webbrowser webbrowser.open_new(u'http://openlp.org/') + def onHelpOnLineHelpClicked(self): + """ + Load the online OpenLP manual + """ + import webbrowser + webbrowser.open_new(u'http://manual.openlp.org/') + def onHelpAboutItemClicked(self): """ Show the About form """ - self.aboutForm.applicationVersion = self.applicationVersion self.aboutForm.exec_() def onPluginItemClicked(self): diff --git a/openlp/core/ui/mediadockmanager.py b/openlp/core/ui/mediadockmanager.py index 2d388faf4..ef4bc62e0 100644 --- a/openlp/core/ui/mediadockmanager.py +++ b/openlp/core/ui/mediadockmanager.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/core/ui/plugindialog.py b/openlp/core/ui/plugindialog.py index 0f6ed9395..0ead739a5 100644 --- a/openlp/core/ui/plugindialog.py +++ b/openlp/core/ui/plugindialog.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/core/ui/pluginform.py b/openlp/core/ui/pluginform.py index 15ac62e42..bfac5f3e0 100644 --- a/openlp/core/ui/pluginform.py +++ b/openlp/core/ui/pluginform.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/core/ui/printservicedialog.py b/openlp/core/ui/printservicedialog.py index 41101e8ff..97f4b4060 100644 --- a/openlp/core/ui/printservicedialog.py +++ b/openlp/core/ui/printservicedialog.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # @@ -64,8 +64,7 @@ class Ui_PrintServiceDialog(object): 'Options')) self.optionsButton.setToolButtonStyle( QtCore.Qt.ToolButtonTextBesideIcon) - self.optionsButton.setIcon(QtGui.QIcon( - build_icon(u':/system/system_configure.png'))) + self.optionsButton.setIcon(build_icon(u':/system/system_configure.png')) self.optionsButton.setCheckable(True) self.toolbar.addWidget(self.optionsButton) self.closeButton = self.toolbar.addAction( @@ -80,24 +79,23 @@ class Ui_PrintServiceDialog(object): translate('OpenLP.PrintServiceForm', 'Copy as HTML')) self.toolbar.addSeparator() self.zoomInButton = QtGui.QToolButton(self.toolbar) - self.zoomInButton.setIcon(QtGui.QIcon( - build_icon(u':/general/general_zoom_in.png'))) + self.zoomInButton.setIcon(build_icon(u':/general/general_zoom_in.png')) self.zoomInButton.setToolTip(translate('OpenLP.PrintServiceForm', 'Zoom In')) self.zoomInButton.setObjectName(u'zoomInButton') self.zoomInButton.setIconSize(QtCore.QSize(22, 22)) self.toolbar.addWidget(self.zoomInButton) self.zoomOutButton = QtGui.QToolButton(self.toolbar) - self.zoomOutButton.setIcon(QtGui.QIcon( - build_icon(u':/general/general_zoom_out.png'))) + self.zoomOutButton.setIcon( + build_icon(u':/general/general_zoom_out.png')) self.zoomOutButton.setToolTip(translate('OpenLP.PrintServiceForm', 'Zoom Out')) self.zoomOutButton.setObjectName(u'zoomOutButton') self.zoomOutButton.setIconSize(QtCore.QSize(22, 22)) self.toolbar.addWidget(self.zoomOutButton) self.zoomOriginalButton = QtGui.QToolButton(self.toolbar) - self.zoomOriginalButton.setIcon(QtGui.QIcon( - build_icon(u':/general/general_zoom_original.png'))) + self.zoomOriginalButton.setIcon( + build_icon(u':/general/general_zoom_original.png')) self.zoomOriginalButton.setToolTip(translate('OpenLP.PrintServiceForm', 'Zoom Original')) self.zoomOriginalButton.setObjectName(u'zoomOriginalButton') diff --git a/openlp/core/ui/printserviceform.py b/openlp/core/ui/printserviceform.py index 713e7c27b..8dda6a9f6 100644 --- a/openlp/core/ui/printserviceform.py +++ b/openlp/core/ui/printserviceform.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # @@ -33,12 +33,12 @@ from openlp.core.ui.printservicedialog import Ui_PrintServiceDialog, ZoomSize class PrintServiceForm(QtGui.QDialog, Ui_PrintServiceDialog): - def __init__(self, parent, serviceManager): + def __init__(self, mainWindow, serviceManager): """ Constructor """ - QtGui.QDialog.__init__(self, parent) - self.parent = parent + QtGui.QDialog.__init__(self, mainWindow) + self.mainWindow = mainWindow self.serviceManager = serviceManager self.printer = QtGui.QPrinter() self.printDialog = QtGui.QPrintDialog(self.printer, self) @@ -134,9 +134,12 @@ class PrintServiceForm(QtGui.QDialog, Ui_PrintServiceDialog): item.notes.replace(u'\n', u'
')) # Add play length of media files. if item.is_media() and self.metaDataCheckBox.isChecked(): + tme = item.media_length + if item.end_time > 0: + tme = item.end_time - item.start_time text += u'

%s %s

' % (translate( 'OpenLP.ServiceManager', u'Playing time:'), - unicode(datetime.timedelta(seconds=item.media_length))) + unicode(datetime.timedelta(seconds=tme))) if self.footerTextEdit.toPlainText(): text += u'

%s

%s' % (translate('OpenLP.ServiceManager', u'Custom Service Notes:'), self.footerTextEdit.toPlainText()) @@ -181,13 +184,14 @@ class PrintServiceForm(QtGui.QDialog, Ui_PrintServiceDialog): """ Copies the display text to the clipboard as plain text """ - self.parent.clipboard.setText(self.document.toPlainText()) + self.mainWindow.application.clipboard.setText( + self.document.toPlainText()) def copyHtmlText(self): """ Copies the display text to the clipboard as Html """ - self.parent.clipboard.setText(self.document.toHtml()) + self.mainWindow.application.clipboard.setText(self.document.toHtml()) def printServiceOrder(self): """ diff --git a/openlp/core/ui/screen.py b/openlp/core/ui/screen.py index 6b4978727..15dbd9883 100644 --- a/openlp/core/ui/screen.py +++ b/openlp/core/ui/screen.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/core/ui/serviceitemeditdialog.py b/openlp/core/ui/serviceitemeditdialog.py index f2909eabb..4e966a38b 100644 --- a/openlp/core/ui/serviceitemeditdialog.py +++ b/openlp/core/ui/serviceitemeditdialog.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/core/ui/serviceitemeditform.py b/openlp/core/ui/serviceitemeditform.py index 588bdbfd6..400566099 100644 --- a/openlp/core/ui/serviceitemeditform.py +++ b/openlp/core/ui/serviceitemeditform.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # @@ -141,4 +141,3 @@ class ServiceItemEditForm(QtGui.QDialog, Ui_ServiceItemEditDialog): else: self.upButton.setEnabled(True) self.deleteButton.setEnabled(True) - diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index 56aa1bea1..168ad8a8c 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # @@ -231,13 +231,15 @@ class ServiceManager(QtGui.QWidget): QtCore.QObject.connect(self.themeComboBox, QtCore.SIGNAL(u'activated(int)'), self.onThemeComboBoxSelected) QtCore.QObject.connect(self.serviceManagerList, - QtCore.SIGNAL(u'doubleClicked(QModelIndex)'), self.makeLive) + QtCore.SIGNAL(u'doubleClicked(QModelIndex)'), self.onMakeLive) QtCore.QObject.connect(self.serviceManagerList, QtCore.SIGNAL(u'itemCollapsed(QTreeWidgetItem*)'), self.collapsed) QtCore.QObject.connect(self.serviceManagerList, QtCore.SIGNAL(u'itemExpanded(QTreeWidgetItem*)'), self.expanded) QtCore.QObject.connect(Receiver.get_receiver(), QtCore.SIGNAL(u'theme_update_list'), self.updateThemeList) + QtCore.QObject.connect(Receiver.get_receiver(), + QtCore.SIGNAL(u'servicemanager_preview_live'), self.previewLive) QtCore.QObject.connect(Receiver.get_receiver(), QtCore.SIGNAL(u'servicemanager_next_item'), self.nextItem) QtCore.QObject.connect(Receiver.get_receiver(), @@ -481,28 +483,30 @@ class ServiceManager(QtGui.QWidget): # 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) + log.debug(u'ServiceManager.saveFile - allowZip64 is %s' % allow_zip_64) zip = None + success = True 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) + 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 + success = False finally: if zip: zip.close() - self.mainwindow.addRecentFile(path_file_name) - self.setModified(False) - return True + if success: + self.mainwindow.addRecentFile(path_file_name) + self.setModified(False) + else: + delete_file(path_file_name) + return success def saveFileAs(self): """ @@ -527,8 +531,9 @@ class ServiceManager(QtGui.QWidget): def loadFile(self, fileName): if not fileName: return False - else: - fileName = unicode(fileName) + fileName = unicode(fileName) + if not os.path.exists(fileName): + return False zip = None fileTo = None try: @@ -558,6 +563,7 @@ class ServiceManager(QtGui.QWidget): self.newFile() for item in items: serviceItem = ServiceItem() + serviceItem.from_service = True serviceItem.render_manager = self.mainwindow.renderManager serviceItem.set_from_service(item, self.servicePath) self.validateItem(serviceItem) @@ -566,24 +572,27 @@ class ServiceManager(QtGui.QWidget): Receiver.send_message(u'%s_service_load' % serviceItem.name.lower(), serviceItem) delete_file(p_file) + self.setFileName(fileName) + self.mainwindow.addRecentFile(fileName) + self.setModified(False) + QtCore.QSettings().setValue( + 'service/last file', QtCore.QVariant(fileName)) Receiver.send_message(u'cursor_normal') else: critical_error_message_box( message=translate('OpenLP.ServiceManager', 'File is not a valid service.')) log.exception(u'File contains no service data') - except (IOError, NameError): + except (IOError, NameError, zipfile.BadZipfile): + critical_error_message_box( + message=translate('OpenLP.ServiceManager', + 'File could not be opened because it is corrupt.')) log.exception(u'Problem loading service file %s' % fileName) finally: if fileTo: fileTo.close() if zip: zip.close() - self.setFileName(fileName) - self.mainwindow.addRecentFile(fileName) - self.setModified(False) - QtCore.QSettings(). \ - setValue(u'service/last file', QtCore.QVariant(fileName)) def loadLastFile(self): """ @@ -652,10 +661,6 @@ class ServiceManager(QtGui.QWidget): item = self.findServiceItem()[0] self.startTimeForm.item = self.serviceItems[item] if self.startTimeForm.exec_(): - self.serviceItems[item][u'service_item'].start_time = \ - self.startTimeForm.hourSpinBox.value() * 3600 + \ - self.startTimeForm.minuteSpinBox.value() * 60 + \ - self.startTimeForm.secondSpinBox.value() self.repaintServiceList(item, -1) def onServiceItemEditForm(self): @@ -666,6 +671,19 @@ class ServiceManager(QtGui.QWidget): self.addServiceItem(self.serviceItemEditForm.getServiceItem(), replace=True, expand=self.serviceItems[item][u'expanded']) + def previewLive(self, message): + """ + Called by the SlideController to request a preview item be made live + and allows the next preview to be updated if relevent. + """ + id, row = message.split(u':') + for sitem in self.serviceItems: + if sitem[u'service_item']._uuid == id: + item = self.serviceManagerList.topLevelItem(sitem[u'order'] - 1) + self.serviceManagerList.setCurrentItem(item) + self.makeLive(int(row)) + return + def nextItem(self): """ Called by the SlideController to select the next service item. @@ -1021,6 +1039,7 @@ class ServiceManager(QtGui.QWidget): if expand is None: expand = self.expandTabs item.render() + item.from_service = True if replace: sitem, child = self.findServiceItem() item.merge(self.serviceItems[sitem][u'service_item']) @@ -1075,11 +1094,24 @@ class ServiceManager(QtGui.QWidget): else: return self.serviceItems[item][u'service_item'] - def makeLive(self): + def onMakeLive(self): + """ + Send the current item to the Live slide controller but triggered + by a tablewidget click event. + """ + self.makeLive() + + def makeLive(self, row=-1): """ Send the current item to the Live slide controller + + ``row`` + Row number to be displayed if from preview. + -1 is passed if the value is not set """ item, child = self.findServiceItem() + if row != -1: + child = row if self.serviceItems[item][u'service_item'].is_valid: self.mainwindow.liveController.addServiceManagerItem( self.serviceItems[item][u'service_item'], child) @@ -1256,4 +1288,4 @@ class ServiceManager(QtGui.QWidget): Print a Service Order Sheet. """ settingDialog = PrintServiceForm(self.mainwindow, self) - settingDialog.exec_() \ No newline at end of file + settingDialog.exec_() diff --git a/openlp/core/ui/servicenoteform.py b/openlp/core/ui/servicenoteform.py index 200e12818..ef1c627d4 100644 --- a/openlp/core/ui/servicenoteform.py +++ b/openlp/core/ui/servicenoteform.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/core/ui/settingsdialog.py b/openlp/core/ui/settingsdialog.py index af8ba84ab..70f83f4fa 100644 --- a/openlp/core/ui/settingsdialog.py +++ b/openlp/core/ui/settingsdialog.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/core/ui/settingsform.py b/openlp/core/ui/settingsform.py index 872b37586..cf66ad090 100644 --- a/openlp/core/ui/settingsform.py +++ b/openlp/core/ui/settingsform.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/core/ui/shortcutlistdialog.py b/openlp/core/ui/shortcutlistdialog.py index b4673f410..4e5b9e270 100644 --- a/openlp/core/ui/shortcutlistdialog.py +++ b/openlp/core/ui/shortcutlistdialog.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/core/ui/shortcutlistform.py b/openlp/core/ui/shortcutlistform.py index 4f770045c..e87ba3ada 100644 --- a/openlp/core/ui/shortcutlistform.py +++ b/openlp/core/ui/shortcutlistform.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index ae0c52273..232653326 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # @@ -46,6 +46,7 @@ class SlideList(QtGui.QTableWidget): QtGui.QTableWidget.__init__(self, parent.controller) self.parent = parent + class SlideController(QtGui.QWidget): """ SlideController is the slide controller widget. This widget is what the @@ -184,7 +185,7 @@ class SlideController(QtGui.QWidget): self.delaySpinBox.setMinimum(1) self.delaySpinBox.setMaximum(180) self.toolbar.addToolbarWidget(u'Image SpinBox', self.delaySpinBox) - self.delaySpinBox.setSuffix(UiStrings.S) + self.delaySpinBox.setSuffix(UiStrings.Seconds) self.delaySpinBox.setToolTip(translate('OpenLP.SlideController', 'Delay between slides in seconds')) else: @@ -1013,8 +1014,12 @@ class SlideController(QtGui.QWidget): """ row = self.previewListWidget.currentRow() if row > -1 and row < self.previewListWidget.rowCount(): - self.parent.liveController.addServiceManagerItem( - self.serviceItem, row) + if self.serviceItem.from_service: + Receiver.send_message('servicemanager_preview_live', + u'%s:%s' % (self.serviceItem._uuid, row)) + else: + self.parent.liveController.addServiceManagerItem( + self.serviceItem, row) def onMediaStart(self, item): """ diff --git a/openlp/core/ui/splashscreen.py b/openlp/core/ui/splashscreen.py index 88c6f09f9..84aa1d7df 100644 --- a/openlp/core/ui/splashscreen.py +++ b/openlp/core/ui/splashscreen.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/core/ui/starttimedialog.py b/openlp/core/ui/starttimedialog.py index 14ef84aac..be34b765e 100644 --- a/openlp/core/ui/starttimedialog.py +++ b/openlp/core/ui/starttimedialog.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # @@ -32,39 +32,90 @@ from openlp.core.lib.ui import UiStrings, create_accept_reject_button_box class Ui_StartTimeDialog(object): def setupUi(self, StartTimeDialog): StartTimeDialog.setObjectName(u'StartTimeDialog') - StartTimeDialog.resize(300, 10) + StartTimeDialog.resize(350, 10) self.dialogLayout = QtGui.QGridLayout(StartTimeDialog) self.dialogLayout.setObjectName(u'dialogLayout') + self.startLabel = QtGui.QLabel(StartTimeDialog) + self.startLabel.setObjectName(u'startLabel') + self.startLabel.setAlignment(QtCore.Qt.AlignHCenter) + self.dialogLayout.addWidget(self.startLabel, 0, 1, 1, 1) + self.finishLabel = QtGui.QLabel(StartTimeDialog) + self.finishLabel.setObjectName(u'finishLabel') + self.finishLabel.setAlignment(QtCore.Qt.AlignHCenter) + self.dialogLayout.addWidget(self.finishLabel, 0, 2, 1, 1) + self.lengthLabel = QtGui.QLabel(StartTimeDialog) + self.lengthLabel.setObjectName(u'startLabel') + self.lengthLabel.setAlignment(QtCore.Qt.AlignHCenter) + self.dialogLayout.addWidget(self.lengthLabel, 0, 3, 1, 1) self.hourLabel = QtGui.QLabel(StartTimeDialog) - self.hourLabel.setObjectName("hourLabel") - self.dialogLayout.addWidget(self.hourLabel, 0, 0, 1, 1) + self.hourLabel.setObjectName(u'hourLabel') + self.dialogLayout.addWidget(self.hourLabel, 1, 0, 1, 1) self.hourSpinBox = QtGui.QSpinBox(StartTimeDialog) - self.hourSpinBox.setObjectName("hourSpinBox") - self.dialogLayout.addWidget(self.hourSpinBox, 0, 1, 1, 1) + self.hourSpinBox.setObjectName(u'hourSpinBox') + self.hourSpinBox.setMinimum(0) + self.hourSpinBox.setMaximum(4) + self.dialogLayout.addWidget(self.hourSpinBox, 1, 1, 1, 1) + self.hourFinishSpinBox = QtGui.QSpinBox(StartTimeDialog) + self.hourFinishSpinBox.setObjectName(u'hourFinishSpinBox') + self.hourFinishSpinBox.setMinimum(0) + self.hourFinishSpinBox.setMaximum(4) + self.dialogLayout.addWidget(self.hourFinishSpinBox, 1, 2, 1, 1) + self.hourFinishLabel = QtGui.QLabel(StartTimeDialog) + self.hourFinishLabel.setObjectName(u'hourLabel') + self.hourFinishLabel.setAlignment(QtCore.Qt.AlignRight) + self.dialogLayout.addWidget(self.hourFinishLabel, 1, 3, 1, 1) self.minuteLabel = QtGui.QLabel(StartTimeDialog) - self.minuteLabel.setObjectName("minuteLabel") - self.dialogLayout.addWidget(self.minuteLabel, 1, 0, 1, 1) + self.minuteLabel.setObjectName(u'minuteLabel') + self.dialogLayout.addWidget(self.minuteLabel, 2, 0, 1, 1) self.minuteSpinBox = QtGui.QSpinBox(StartTimeDialog) - self.minuteSpinBox.setObjectName("minuteSpinBox") - self.dialogLayout.addWidget(self.minuteSpinBox, 1, 1, 1, 1) + self.minuteSpinBox.setObjectName(u'minuteSpinBox') + self.minuteSpinBox.setMinimum(0) + self.minuteSpinBox.setMaximum(59) + self.dialogLayout.addWidget(self.minuteSpinBox, 2, 1, 1, 1) + self.minuteFinishSpinBox = QtGui.QSpinBox(StartTimeDialog) + self.minuteFinishSpinBox.setObjectName(u'minuteFinishSpinBox') + self.minuteFinishSpinBox.setMinimum(0) + self.minuteFinishSpinBox.setMaximum(59) + self.dialogLayout.addWidget(self.minuteFinishSpinBox, 2, 2, 1, 1) + self.minuteFinishLabel = QtGui.QLabel(StartTimeDialog) + self.minuteFinishLabel.setObjectName(u'minuteLabel') + self.minuteFinishLabel.setAlignment(QtCore.Qt.AlignRight) + self.dialogLayout.addWidget(self.minuteFinishLabel, 2, 3, 1, 1) self.secondLabel = QtGui.QLabel(StartTimeDialog) - self.secondLabel.setObjectName("secondLabel") - self.dialogLayout.addWidget(self.secondLabel, 2, 0, 1, 1) + self.secondLabel.setObjectName(u'secondLabel') + self.dialogLayout.addWidget(self.secondLabel, 3, 0, 1, 1) self.secondSpinBox = QtGui.QSpinBox(StartTimeDialog) - self.secondSpinBox.setObjectName("secondSpinBox") - self.dialogLayout.addWidget(self.secondSpinBox, 2, 1, 1, 1) + self.secondSpinBox.setObjectName(u'secondSpinBox') + self.secondSpinBox.setMinimum(0) + self.secondSpinBox.setMaximum(59) + self.secondFinishSpinBox = QtGui.QSpinBox(StartTimeDialog) + self.secondFinishSpinBox.setObjectName(u'secondFinishSpinBox') + self.secondFinishSpinBox.setMinimum(0) + self.secondFinishSpinBox.setMaximum(59) + self.dialogLayout.addWidget(self.secondFinishSpinBox, 3, 2, 1, 1) + self.secondFinishLabel = QtGui.QLabel(StartTimeDialog) + self.secondFinishLabel.setObjectName(u'secondLabel') + self.secondFinishLabel.setAlignment(QtCore.Qt.AlignRight) + self.dialogLayout.addWidget(self.secondFinishLabel, 3, 3, 1, 1) + self.dialogLayout.addWidget(self.secondSpinBox, 3, 1, 1, 1) self.buttonBox = create_accept_reject_button_box(StartTimeDialog, True) - self.dialogLayout.addWidget(self.buttonBox, 4, 0, 1, 2) + self.dialogLayout.addWidget(self.buttonBox, 5, 2, 1, 2) self.retranslateUi(StartTimeDialog) self.setMaximumHeight(self.sizeHint().height()) QtCore.QMetaObject.connectSlotsByName(StartTimeDialog) def retranslateUi(self, StartTimeDialog): self.setWindowTitle(translate('OpenLP.StartTimeForm', - 'Item Start Time')) + 'Item Start and Finish Time')) + self.hourSpinBox.setSuffix(UiStrings.Hours) + self.minuteSpinBox.setSuffix(UiStrings.Minutes) + self.secondSpinBox.setSuffix(UiStrings.Seconds) + self.hourFinishSpinBox.setSuffix(UiStrings.Hours) + self.minuteFinishSpinBox.setSuffix(UiStrings.Minutes) + self.secondFinishSpinBox.setSuffix(UiStrings.Seconds) self.hourLabel.setText(translate('OpenLP.StartTimeForm', 'Hours:')) - self.hourSpinBox.setSuffix(translate('OpenLP.StartTimeForm', 'h')) - self.minuteSpinBox.setSuffix(translate('OpenLP.StartTimeForm', 'm')) - self.secondSpinBox.setSuffix(UiStrings.S) self.minuteLabel.setText(translate('OpenLP.StartTimeForm', 'Minutes:')) self.secondLabel.setText(translate('OpenLP.StartTimeForm', 'Seconds:')) + self.startLabel.setText(translate('OpenLP.StartTimeForm', 'Start')) + self.finishLabel.setText(translate('OpenLP.StartTimeForm', 'Finish')) + self.lengthLabel.setText(translate('OpenLP.StartTimeForm', 'Length')) diff --git a/openlp/core/ui/starttimeform.py b/openlp/core/ui/starttimeform.py index 01800602f..a30dd3b8e 100644 --- a/openlp/core/ui/starttimeform.py +++ b/openlp/core/ui/starttimeform.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # @@ -28,6 +28,9 @@ from PyQt4 import QtGui from starttimedialog import Ui_StartTimeDialog +from openlp.core.lib import translate +from openlp.core.lib.ui import UiStrings, critical_error_message_box + class StartTimeForm(QtGui.QDialog, Ui_StartTimeDialog): """ The exception dialog @@ -40,13 +43,51 @@ class StartTimeForm(QtGui.QDialog, Ui_StartTimeDialog): """ Run the Dialog with correct heading. """ - seconds = self.item[u'service_item'].start_time + hour, minutes, seconds = self._time_split( + self.item[u'service_item'].start_time) + self.hourSpinBox.setValue(hour) + self.minuteSpinBox.setValue(minutes) + self.secondSpinBox.setValue(seconds) + hours, minutes, seconds = self._time_split( + self.item[u'service_item'].media_length) + self.hourFinishSpinBox.setValue(hours) + self.minuteFinishSpinBox.setValue(minutes) + self.secondFinishSpinBox.setValue(seconds) + self.hourFinishLabel.setText(u'%s%s' % (unicode(hour), UiStrings.Hours)) + self.minuteFinishLabel.setText(u'%s%s' % + (unicode(minutes), UiStrings.Minutes)) + self.secondFinishLabel.setText(u'%s%s' % + (unicode(seconds), UiStrings.Seconds)) + return QtGui.QDialog.exec_(self) + + def accept(self): + start = self.hourSpinBox.value() * 3600 + \ + self.minuteSpinBox.value() * 60 + \ + self.secondSpinBox.value() + end = self.hourFinishSpinBox.value() * 3600 + \ + self.minuteFinishSpinBox.value() * 60 + \ + self.secondFinishSpinBox.value() + if end > self.item[u'service_item'].media_length: + critical_error_message_box( + title=translate('OpenLP.StartTimeForm', + 'Time Validation Error'), + message=translate('OpenLP.StartTimeForm', + 'End time is set after the end of the media item')) + return + elif start > end: + critical_error_message_box( + title=translate('OpenLP.StartTimeForm', + 'Time Validation Error'), + message=translate('OpenLP.StartTimeForm', + 'Start time is after the End Time of the media item')) + return + self.item[u'service_item'].start_time = start + self.item[u'service_item'].end_time = end + return QtGui.QDialog.accept(self) + + def _time_split(self, seconds): hours = seconds / 3600 seconds -= 3600 * hours minutes = seconds / 60 seconds -= 60 * minutes - self.hourSpinBox.setValue(hours) - self.minuteSpinBox.setValue(minutes) - self.secondSpinBox.setValue(seconds) - return QtGui.QDialog.exec_(self) - + return hours, minutes, seconds diff --git a/openlp/core/ui/themeform.py b/openlp/core/ui/themeform.py index cc490bf9b..6653e7e1d 100644 --- a/openlp/core/ui/themeform.py +++ b/openlp/core/ui/themeform.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py index 487798f5b..d033daeb3 100644 --- a/openlp/core/ui/thememanager.py +++ b/openlp/core/ui/thememanager.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # @@ -156,10 +156,9 @@ class ThemeManager(QtGui.QWidget): 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): + def configUpdated(self): """ Triggered when Config dialog is updated. """ @@ -433,7 +432,7 @@ class ThemeManager(QtGui.QWidget): self.loadThemes() Receiver.send_message(u'cursor_normal') - def loadThemes(self): + def loadThemes(self, firstTime=False): """ Loads the theme lists and triggers updates accross the whole system using direct calls or core functions and events for the plugins. @@ -443,31 +442,44 @@ class ThemeManager(QtGui.QWidget): self.themelist = [] self.themeListWidget.clear() dirList = os.listdir(self.path) - dirList.sort() - for name in dirList: - if name.endswith(u'.png'): - # check to see file is in theme root directory - theme = os.path.join(self.path, name) - if os.path.exists(theme): - textName = os.path.splitext(name)[0] - if textName == self.global_theme: - name = unicode(translate('OpenLP.ThemeManager', - '%s (default)')) % textName - else: - name = textName - thumb = os.path.join(self.thumbPath, u'%s.png' % textName) - item_name = QtGui.QListWidgetItem(name) - if os.path.exists(thumb): - icon = build_icon(thumb) - else: - icon = build_icon(theme) - pixmap = icon.pixmap(QtCore.QSize(88, 50)) - pixmap.save(thumb, u'png') - item_name.setIcon(icon) - item_name.setData(QtCore.Qt.UserRole, - QtCore.QVariant(textName)) - self.themeListWidget.addItem(item_name) - self.themelist.append(textName) + files = SettingsManager.get_files(self.settingsSection, u'.png') + if firstTime: + self.firstTime() + # No themes have been found so create one + if len(files) == 0: + theme = ThemeXML() + theme.theme_name = UiStrings.Default + self._writeTheme(theme, None, None) + QtCore.QSettings().setValue( + self.settingsSection + u'/global theme', + QtCore.QVariant(theme.theme_name)) + self.configUpdated() + files = SettingsManager.get_files(self.settingsSection, u'.png') + files.sort() + # now process the file list of png files + for name in files: + # check to see file is in theme root directory + theme = os.path.join(self.path, name) + if os.path.exists(theme): + textName = os.path.splitext(name)[0] + if textName == self.global_theme: + name = unicode(translate('OpenLP.ThemeManager', + '%s (default)')) % textName + else: + name = textName + thumb = os.path.join(self.thumbPath, u'%s.png' % textName) + item_name = QtGui.QListWidgetItem(name) + if os.path.exists(thumb): + icon = build_icon(thumb) + else: + icon = build_icon(theme) + pixmap = icon.pixmap(QtCore.QSize(88, 50)) + pixmap.save(thumb, u'png') + item_name.setIcon(icon) + item_name.setData(QtCore.Qt.UserRole, + QtCore.QVariant(textName)) + self.themeListWidget.addItem(item_name) + self.themelist.append(textName) self._pushThemes() def _pushThemes(self): diff --git a/openlp/core/ui/themestab.py b/openlp/core/ui/themestab.py index c7442744f..1b76d2198 100644 --- a/openlp/core/ui/themestab.py +++ b/openlp/core/ui/themestab.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/core/ui/themewizard.py b/openlp/core/ui/themewizard.py index 20cca69c6..9e464aa7a 100644 --- a/openlp/core/ui/themewizard.py +++ b/openlp/core/ui/themewizard.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/core/ui/wizard.py b/openlp/core/ui/wizard.py index 0b275733e..cb3a75294 100644 --- a/openlp/core/ui/wizard.py +++ b/openlp/core/ui/wizard.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/core/utils/__init__.py b/openlp/core/utils/__init__.py index 54b48cdf6..3c639297e 100644 --- a/openlp/core/utils/__init__.py +++ b/openlp/core/utils/__init__.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # @@ -33,6 +33,7 @@ import sys import time import urllib2 from datetime import datetime +from subprocess import Popen, PIPE from PyQt4 import QtGui, QtCore @@ -44,9 +45,10 @@ if sys.platform != u'win32' and sys.platform != u'darwin': XDG_BASE_AVAILABLE = False import openlp -from openlp.core.lib import Receiver, translate +from openlp.core.lib import Receiver, translate, check_directory_exists log = logging.getLogger(__name__) +APPLICATION_VERSION = {} IMAGES_FILTER = None UNO_CONNECTION_TYPE = u'pipe' #UNO_CONNECTION_TYPE = u'socket' @@ -56,9 +58,8 @@ class VersionThread(QtCore.QThread): A special Qt thread class to fetch the version of OpenLP from the website. This is threaded so that it doesn't affect the loading time of OpenLP. """ - def __init__(self, parent, app_version): + def __init__(self, parent): QtCore.QThread.__init__(self, parent) - self.app_version = app_version self.version_splitter = re.compile( r'([0-9]+).([0-9]+).([0-9]+)(?:-bzr([0-9]+))?') @@ -68,7 +69,8 @@ class VersionThread(QtCore.QThread): """ time.sleep(1) Receiver.send_message(u'maindisplay_blank_check') - version = check_latest_version(self.app_version) + app_version = get_application_version() + version = check_latest_version(app_version) remote_version = {} local_version = {} match = self.version_splitter.match(version) @@ -80,7 +82,7 @@ class VersionThread(QtCore.QThread): remote_version[u'revision'] = int(match.group(4)) else: return - match = self.version_splitter.match(self.app_version[u'full']) + match = self.version_splitter.match(app_version[u'full']) if match: local_version[u'major'] = int(match.group(1)) local_version[u'minor'] = int(match.group(2)) @@ -146,8 +148,7 @@ class AppLocation(object): Return the path OpenLP stores all its data under. """ path = AppLocation.get_directory(AppLocation.DataDir) - if not os.path.exists(path): - os.makedirs(path) + check_directory_exists(path) return path @staticmethod @@ -157,8 +158,7 @@ class AppLocation(object): """ data_path = AppLocation.get_data_path() path = os.path.join(data_path, section) - if not os.path.exists(path): - os.makedirs(path) + check_directory_exists(path) return path def _get_os_dir_path(dir_type): @@ -208,6 +208,85 @@ def _get_frozen_path(frozen_option, non_frozen_option): return frozen_option return non_frozen_option +def get_application_version(): + """ + Returns the application version of the running instance of OpenLP:: + + {u'full': u'1.9.4-bzr1249', u'version': u'1.9.4', u'build': u'bzr1249'} + """ + global APPLICATION_VERSION + if APPLICATION_VERSION: + return APPLICATION_VERSION + if u'--dev-version' in sys.argv or u'-d' in sys.argv: + # If we're running the dev version, let's use bzr to get the version. + try: + # If bzrlib is available, use it. + from bzrlib.branch import Branch + b = Branch.open_containing('.')[0] + b.lock_read() + try: + # Get the branch's latest revision number. + revno = b.revno() + # Convert said revision number into a bzr revision id. + revision_id = b.dotted_revno_to_revision_id((revno,)) + # Get a dict of tags, with the revision id as the key. + tags = b.tags.get_reverse_tag_dict() + # Check if the latest + if revision_id in tags: + full_version = u'%s' % tags[revision_id][0] + else: + full_version = '%s-bzr%s' % \ + (sorted(b.tags.get_tag_dict().keys())[-1], revno) + finally: + b.unlock() + except: + # Otherwise run the command line bzr client. + bzr = Popen((u'bzr', u'tags', u'--sort', u'time'), stdout=PIPE) + output, error = bzr.communicate() + code = bzr.wait() + if code != 0: + raise Exception(u'Error running bzr tags') + lines = output.splitlines() + if len(lines) == 0: + tag = u'0.0.0' + revision = u'0' + else: + tag, revision = lines[-1].split() + bzr = Popen((u'bzr', u'log', u'--line', u'-r', u'-1'), stdout=PIPE) + output, error = bzr.communicate() + code = bzr.wait() + if code != 0: + raise Exception(u'Error running bzr log') + latest = output.split(u':')[0] + full_version = latest == revision and tag or \ + u'%s-bzr%s' % (tag, latest) + else: + # We're not running the development version, let's use the file. + filepath = AppLocation.get_directory(AppLocation.VersionDir) + filepath = os.path.join(filepath, u'.version') + fversion = None + try: + fversion = open(filepath, u'r') + full_version = unicode(fversion.read()).rstrip() + except IOError: + log.exception('Error in version file.') + full_version = u'0.0.0-bzr000' + finally: + if fversion: + fversion.close() + bits = full_version.split(u'-') + APPLICATION_VERSION = { + u'full': full_version, + u'version': bits[0], + u'build': bits[1] if len(bits) > 1 else None + } + if APPLICATION_VERSION[u'build']: + log.info(u'Openlp version %s build %s', + APPLICATION_VERSION[u'version'], APPLICATION_VERSION[u'build']) + else: + log.info(u'Openlp version %s' % APPLICATION_VERSION[u'version']) + return APPLICATION_VERSION + def check_latest_version(current_version): """ Check the latest version of OpenLP against the version file on the OpenLP diff --git a/openlp/core/utils/actions.py b/openlp/core/utils/actions.py index 30d1d7586..41ae41f4b 100644 --- a/openlp/core/utils/actions.py +++ b/openlp/core/utils/actions.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/core/utils/languagemanager.py b/openlp/core/utils/languagemanager.py index 8e5ab1f54..9dbf9a779 100644 --- a/openlp/core/utils/languagemanager.py +++ b/openlp/core/utils/languagemanager.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # @@ -91,7 +91,7 @@ class LanguageManager(object): """ Retrieve a saved language to use from settings """ - settings = QtCore.QSettings(u'OpenLP', u'OpenLP') + settings = QtCore.QSettings() language = unicode(settings.value( u'general/language', QtCore.QVariant(u'[en]')).toString()) log.info(u'Language file: \'%s\' Loaded from conf file' % language) @@ -123,9 +123,7 @@ class LanguageManager(object): language = unicode(qm_list[action_name]) if LanguageManager.auto_language: language = u'[%s]' % language - # This needs to be here for the setValue to work - settings = QtCore.QSettings(u'OpenLP', u'OpenLP') - settings.setValue( + QtCore.QSettings().setValue( u'general/language', QtCore.QVariant(language)) log.info(u'Language file: \'%s\' written to conf file' % language) if message: diff --git a/openlp/plugins/__init__.py b/openlp/plugins/__init__.py index 5fd39d572..7a160a316 100644 --- a/openlp/plugins/__init__.py +++ b/openlp/plugins/__init__.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/alerts/__init__.py b/openlp/plugins/alerts/__init__.py index f3c629b25..3a0892d49 100644 --- a/openlp/plugins/alerts/__init__.py +++ b/openlp/plugins/alerts/__init__.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/alerts/alertsplugin.py b/openlp/plugins/alerts/alertsplugin.py index 256e78916..db0ba3b7e 100644 --- a/openlp/plugins/alerts/alertsplugin.py +++ b/openlp/plugins/alerts/alertsplugin.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/alerts/forms/__init__.py b/openlp/plugins/alerts/forms/__init__.py index e2809ed73..bb4a9940f 100644 --- a/openlp/plugins/alerts/forms/__init__.py +++ b/openlp/plugins/alerts/forms/__init__.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/alerts/forms/alertdialog.py b/openlp/plugins/alerts/forms/alertdialog.py index 27b0b0f7d..da788f2bd 100644 --- a/openlp/plugins/alerts/forms/alertdialog.py +++ b/openlp/plugins/alerts/forms/alertdialog.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/alerts/forms/alertform.py b/openlp/plugins/alerts/forms/alertform.py index e29211e66..b87ff3c5d 100644 --- a/openlp/plugins/alerts/forms/alertform.py +++ b/openlp/plugins/alerts/forms/alertform.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/alerts/lib/__init__.py b/openlp/plugins/alerts/lib/__init__.py index 3b446b67d..39cbbfe59 100644 --- a/openlp/plugins/alerts/lib/__init__.py +++ b/openlp/plugins/alerts/lib/__init__.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/alerts/lib/alertsmanager.py b/openlp/plugins/alerts/lib/alertsmanager.py index a05a29575..d12fb41ec 100644 --- a/openlp/plugins/alerts/lib/alertsmanager.py +++ b/openlp/plugins/alerts/lib/alertsmanager.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/alerts/lib/alertstab.py b/openlp/plugins/alerts/lib/alertstab.py index 5b4f670a3..64a9801ca 100644 --- a/openlp/plugins/alerts/lib/alertstab.py +++ b/openlp/plugins/alerts/lib/alertstab.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # @@ -112,7 +112,7 @@ class AlertsTab(SettingsTab): self.FontSizeSpinBox.setSuffix(UiStrings.FontSizePtUnit) self.TimeoutLabel.setText( translate('AlertsPlugin.AlertsTab', 'Alert timeout:')) - self.TimeoutSpinBox.setSuffix(UiStrings.S) + self.TimeoutSpinBox.setSuffix(UiStrings.Seconds) self.PreviewGroupBox.setTitle(UiStrings.Preview) self.FontPreview.setText(UiStrings.OLPV2) diff --git a/openlp/plugins/alerts/lib/db.py b/openlp/plugins/alerts/lib/db.py index 9cfa34846..72c671620 100644 --- a/openlp/plugins/alerts/lib/db.py +++ b/openlp/plugins/alerts/lib/db.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/bibles/__init__.py b/openlp/plugins/bibles/__init__.py index 29364ab1a..5a2035e13 100644 --- a/openlp/plugins/bibles/__init__.py +++ b/openlp/plugins/bibles/__init__.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/bibles/bibleplugin.py b/openlp/plugins/bibles/bibleplugin.py index e4dd2f768..4f677f211 100644 --- a/openlp/plugins/bibles/bibleplugin.py +++ b/openlp/plugins/bibles/bibleplugin.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/bibles/forms/__init__.py b/openlp/plugins/bibles/forms/__init__.py index 15f14de9e..e6897e53f 100644 --- a/openlp/plugins/bibles/forms/__init__.py +++ b/openlp/plugins/bibles/forms/__init__.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/bibles/forms/bibleimportform.py b/openlp/plugins/bibles/forms/bibleimportform.py index 7967b2ec4..117ffaf4c 100644 --- a/openlp/plugins/bibles/forms/bibleimportform.py +++ b/openlp/plugins/bibles/forms/bibleimportform.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/bibles/lib/__init__.py b/openlp/plugins/bibles/lib/__init__.py index 7bc941210..e219fbc00 100644 --- a/openlp/plugins/bibles/lib/__init__.py +++ b/openlp/plugins/bibles/lib/__init__.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/bibles/lib/biblestab.py b/openlp/plugins/bibles/lib/biblestab.py index 74be7145b..7a631ad09 100644 --- a/openlp/plugins/bibles/lib/biblestab.py +++ b/openlp/plugins/bibles/lib/biblestab.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/bibles/lib/csvbible.py b/openlp/plugins/bibles/lib/csvbible.py index b96382df2..9ff7394d1 100644 --- a/openlp/plugins/bibles/lib/csvbible.py +++ b/openlp/plugins/bibles/lib/csvbible.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/bibles/lib/db.py b/openlp/plugins/bibles/lib/db.py index 5cf000ee1..85ab98de1 100644 --- a/openlp/plugins/bibles/lib/db.py +++ b/openlp/plugins/bibles/lib/db.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/bibles/lib/http.py b/openlp/plugins/bibles/lib/http.py index 52baab14c..6a6ef131a 100644 --- a/openlp/plugins/bibles/lib/http.py +++ b/openlp/plugins/bibles/lib/http.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # @@ -255,7 +255,7 @@ class BGExtract(object): if isinstance(part.next, Tag) and part.next.name == u'div': # Run out of verses so stop. break - part = part.next + part = part.next verse_list[clean_verse_num] = unicode(verse_text) if not verse_list: log.debug(u'No content found in the BibleGateway response.') diff --git a/openlp/plugins/bibles/lib/manager.py b/openlp/plugins/bibles/lib/manager.py index c11e10588..67469e063 100644 --- a/openlp/plugins/bibles/lib/manager.py +++ b/openlp/plugins/bibles/lib/manager.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index fc68bf66b..a9694fd0c 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # @@ -551,64 +551,52 @@ class BibleMediaItem(MediaManagerItem): further action is saved for/in each row. """ verse_separator = get_reference_match(u'sep_v_display') - version = self.parent.manager.get_meta_data(bible, u'Version') - copyright = self.parent.manager.get_meta_data(bible, u'Copyright') - permissions = self.parent.manager.get_meta_data(bible, u'Permissions') + version = self.parent.manager.get_meta_data(bible, u'Version').value + copyright = self.parent.manager.get_meta_data(bible, u'Copyright').value + permissions = \ + self.parent.manager.get_meta_data(bible, u'Permissions').value + second_version = u'' + second_copyright = u'' + second_permissions = u'' if second_bible: - second_version = self.parent.manager.get_meta_data(second_bible, - u'Version') - second_copyright = self.parent.manager.get_meta_data(second_bible, - u'Copyright') - second_permissions = self.parent.manager.get_meta_data(second_bible, - u'Permissions') - if not second_permissions: - second_permissions = u'' + second_version = self.parent.manager.get_meta_data( + second_bible, u'Version').value + second_copyright = self.parent.manager.get_meta_data( + second_bible, u'Copyright').value + second_permissions = self.parent.manager.get_meta_data( + second_bible, u'Permissions').value for count, verse in enumerate(self.search_results): + data = { + 'book': QtCore.QVariant(verse.book.name), + 'chapter': QtCore.QVariant(verse.chapter), + 'verse': QtCore.QVariant(verse.verse), + 'bible': QtCore.QVariant(bible), + 'version': QtCore.QVariant(version), + 'copyright': QtCore.QVariant(copyright), + 'permissions': QtCore.QVariant(permissions), + 'text': QtCore.QVariant(verse.text), + 'second_bible': QtCore.QVariant(second_bible), + 'second_version': QtCore.QVariant(second_version), + 'second_copyright': QtCore.QVariant(second_copyright), + 'second_permissions': QtCore.QVariant(second_permissions), + 'second_text': QtCore.QVariant(u'') + } if second_bible: try: - vdict = { - 'book': QtCore.QVariant(verse.book.name), - 'chapter': QtCore.QVariant(verse.chapter), - 'verse': QtCore.QVariant(verse.verse), - 'bible': QtCore.QVariant(bible), - 'version': QtCore.QVariant(version.value), - 'copyright': QtCore.QVariant(copyright.value), - 'permissions': QtCore.QVariant(permissions.value), - 'text': QtCore.QVariant(verse.text), - 'second_bible': QtCore.QVariant(second_bible), - 'second_version': QtCore.QVariant(second_version.value), - 'second_copyright': QtCore.QVariant( - second_copyright.value), - 'second_permissions': QtCore.QVariant( - second_permissions.value), - 'second_text': QtCore.QVariant( - self.second_search_results[count].text) - } + data[u'second_text'] = QtCore.QVariant( + self.second_search_results[count].text) except IndexError: + log.exception(u'The second_search_results does not have as ' + 'many verses as the search_results.') break bible_text = u' %s %d%s%d (%s, %s)' % (verse.book.name, - verse.chapter, verse_separator, verse.verse, version.value, - second_version.value) + verse.chapter, verse_separator, verse.verse, version, + second_version) else: - vdict = { - 'book': QtCore.QVariant(verse.book.name), - 'chapter': QtCore.QVariant(verse.chapter), - 'verse': QtCore.QVariant(verse.verse), - 'bible': QtCore.QVariant(bible), - 'version': QtCore.QVariant(version.value), - 'copyright': QtCore.QVariant(copyright.value), - 'permissions': QtCore.QVariant(permissions.value), - 'text': QtCore.QVariant(verse.text), - 'second_bible': QtCore.QVariant(u''), - 'second_version': QtCore.QVariant(u''), - 'second_copyright': QtCore.QVariant(u''), - 'second_permissions': QtCore.QVariant(u''), - 'second_text': QtCore.QVariant(u'') - } bible_text = u'%s %d%s%d (%s)' % (verse.book.name, - verse.chapter, verse_separator, verse.verse, version.value) + verse.chapter, verse_separator, verse.verse, version) bible_verse = QtGui.QListWidgetItem(bible_text) - bible_verse.setData(QtCore.Qt.UserRole, QtCore.QVariant(vdict)) + bible_verse.setData(QtCore.Qt.UserRole, QtCore.QVariant(data)) self.listView.addItem(bible_verse) self.listView.selectAll() self.search_results = {} @@ -810,11 +798,9 @@ class BibleMediaItem(MediaManagerItem): else: verse_text = unicode(verse) if self.settings.display_style == DisplayStyle.Round: - verse_text = u'{su}(' + verse_text + u'){/su}' - elif self.settings.display_style == DisplayStyle.Curly: - verse_text = u'{su}{' + verse_text + u'}{/su}' - elif self.settings.display_style == DisplayStyle.Square: - verse_text = u'{su}[' + verse_text + u']{/su}' - else: - verse_text = u'{su}' + verse_text + u'{/su}' - return verse_text + return u'{su}(%s){/su}' % verse_text + if self.settings.display_style == DisplayStyle.Curly: + return u'{su}{%s}{/su}' % verse_text + if self.settings.display_style == DisplayStyle.Square: + return u'{su}[%s]{/su}' % verse_text + return u'{su}%s{/su}' % verse_text diff --git a/openlp/plugins/bibles/lib/openlp1.py b/openlp/plugins/bibles/lib/openlp1.py index 2d19db20c..e43417c02 100644 --- a/openlp/plugins/bibles/lib/openlp1.py +++ b/openlp/plugins/bibles/lib/openlp1.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/bibles/lib/opensong.py b/openlp/plugins/bibles/lib/opensong.py index a7f1eff33..585ecf9c7 100644 --- a/openlp/plugins/bibles/lib/opensong.py +++ b/openlp/plugins/bibles/lib/opensong.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/bibles/lib/osis.py b/openlp/plugins/bibles/lib/osis.py index 78e2551d9..e2eb25b4f 100644 --- a/openlp/plugins/bibles/lib/osis.py +++ b/openlp/plugins/bibles/lib/osis.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/bibles/lib/versereferencelist.py b/openlp/plugins/bibles/lib/versereferencelist.py index 46c228f39..bc28f2570 100644 --- a/openlp/plugins/bibles/lib/versereferencelist.py +++ b/openlp/plugins/bibles/lib/versereferencelist.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/custom/__init__.py b/openlp/plugins/custom/__init__.py index 3a1e4461a..5171155d2 100644 --- a/openlp/plugins/custom/__init__.py +++ b/openlp/plugins/custom/__init__.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/custom/customplugin.py b/openlp/plugins/custom/customplugin.py index 79064b53c..0e88202ca 100644 --- a/openlp/plugins/custom/customplugin.py +++ b/openlp/plugins/custom/customplugin.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/custom/forms/__init__.py b/openlp/plugins/custom/forms/__init__.py index c12d29c07..fb3cf975b 100644 --- a/openlp/plugins/custom/forms/__init__.py +++ b/openlp/plugins/custom/forms/__init__.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/custom/forms/editcustomdialog.py b/openlp/plugins/custom/forms/editcustomdialog.py index 12ac3ed7e..1ea0413ff 100644 --- a/openlp/plugins/custom/forms/editcustomdialog.py +++ b/openlp/plugins/custom/forms/editcustomdialog.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/custom/forms/editcustomform.py b/openlp/plugins/custom/forms/editcustomform.py index cf819749f..f81bd4c7d 100644 --- a/openlp/plugins/custom/forms/editcustomform.py +++ b/openlp/plugins/custom/forms/editcustomform.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/custom/forms/editcustomslidedialog.py b/openlp/plugins/custom/forms/editcustomslidedialog.py index 08610954f..d6ebf23ec 100644 --- a/openlp/plugins/custom/forms/editcustomslidedialog.py +++ b/openlp/plugins/custom/forms/editcustomslidedialog.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/custom/forms/editcustomslideform.py b/openlp/plugins/custom/forms/editcustomslideform.py index 2aea81482..7d4e32968 100644 --- a/openlp/plugins/custom/forms/editcustomslideform.py +++ b/openlp/plugins/custom/forms/editcustomslideform.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # @@ -45,7 +45,7 @@ class EditCustomSlideForm(QtGui.QDialog, Ui_CustomSlideEditDialog): self.setupUi(self) # Connecting signals and slots QtCore.QObject.connect(self.splitButton, - QtCore.SIGNAL(u'pressed()'), self.onSplitButtonPressed) + QtCore.SIGNAL(u'clicked()'), self.onSplitButtonPressed) def setText(self, text): """ diff --git a/openlp/plugins/custom/lib/__init__.py b/openlp/plugins/custom/lib/__init__.py index 0c53505ac..25abdd38b 100644 --- a/openlp/plugins/custom/lib/__init__.py +++ b/openlp/plugins/custom/lib/__init__.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/custom/lib/customtab.py b/openlp/plugins/custom/lib/customtab.py index 9b61f8f15..8ab7ade51 100644 --- a/openlp/plugins/custom/lib/customtab.py +++ b/openlp/plugins/custom/lib/customtab.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/custom/lib/customxmlhandler.py b/openlp/plugins/custom/lib/customxmlhandler.py index 5ea941e35..2babe3d12 100644 --- a/openlp/plugins/custom/lib/customxmlhandler.py +++ b/openlp/plugins/custom/lib/customxmlhandler.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/custom/lib/db.py b/openlp/plugins/custom/lib/db.py index 74155ad96..35c24413a 100644 --- a/openlp/plugins/custom/lib/db.py +++ b/openlp/plugins/custom/lib/db.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/custom/lib/mediaitem.py b/openlp/plugins/custom/lib/mediaitem.py index c0c7a7e86..69265ed75 100644 --- a/openlp/plugins/custom/lib/mediaitem.py +++ b/openlp/plugins/custom/lib/mediaitem.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/images/__init__.py b/openlp/plugins/images/__init__.py index 13ea2592a..a375f863f 100644 --- a/openlp/plugins/images/__init__.py +++ b/openlp/plugins/images/__init__.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/images/imageplugin.py b/openlp/plugins/images/imageplugin.py index ae7f56e1d..5d009ad65 100644 --- a/openlp/plugins/images/imageplugin.py +++ b/openlp/plugins/images/imageplugin.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/images/lib/__init__.py b/openlp/plugins/images/lib/__init__.py index 34c9f1ca8..6a9e364f9 100644 --- a/openlp/plugins/images/lib/__init__.py +++ b/openlp/plugins/images/lib/__init__.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py index e6fdfe7db..d9b139d68 100644 --- a/openlp/plugins/images/lib/mediaitem.py +++ b/openlp/plugins/images/lib/mediaitem.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/media/__init__.py b/openlp/plugins/media/__init__.py index c13c59ef6..9271a0936 100644 --- a/openlp/plugins/media/__init__.py +++ b/openlp/plugins/media/__init__.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/media/lib/__init__.py b/openlp/plugins/media/lib/__init__.py index cb4806631..7f63c8108 100644 --- a/openlp/plugins/media/lib/__init__.py +++ b/openlp/plugins/media/lib/__init__.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py index 8a1bc2b76..7612ab7c9 100644 --- a/openlp/plugins/media/lib/mediaitem.py +++ b/openlp/plugins/media/lib/mediaitem.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # @@ -36,7 +36,7 @@ from openlp.core.lib.ui import UiStrings, critical_error_message_box from PyQt4.phonon import Phonon log = logging.getLogger(__name__) - + class MediaMediaItem(MediaManagerItem): """ This is the custom media manager item for Media Slides. @@ -137,7 +137,7 @@ class MediaMediaItem(MediaManagerItem): # This will be corrected in 1.9.6 critical_error_message_box( translate('PresentationPlugin.MediaItem', 'Unsupported File'), - unicode(translate('PresentationPlugin.MediaItem', + unicode(translate('PresentationPlugin.MediaItem', 'Unsupported File'))) return False # File too big for processing @@ -150,7 +150,7 @@ class MediaMediaItem(MediaManagerItem): # This will be corrected in 1.9.6 self.mediaObject.stop() critical_error_message_box( - translate('PresentationPlugin.MediaItem', + translate('PresentationPlugin.MediaItem', 'Unsupported File'), unicode(translate('PresentationPlugin.MediaItem', 'Unsupported File'))) @@ -172,7 +172,7 @@ class MediaMediaItem(MediaManagerItem): def mediaStateWait(self, mediaState): """ Wait for the video to change its state - Wait no longer than 5 seconds. + Wait no longer than 5 seconds. """ start = datetime.now() while self.mediaObject.state() != mediaState: @@ -182,7 +182,7 @@ class MediaMediaItem(MediaManagerItem): if (datetime.now() - start).seconds > 5: return False return True - + def initialise(self): self.listView.clear() self.listView.setIconSize(QtCore.QSize(88, 50)) diff --git a/openlp/plugins/media/lib/mediatab.py b/openlp/plugins/media/lib/mediatab.py index 995816860..2679ad64f 100644 --- a/openlp/plugins/media/lib/mediatab.py +++ b/openlp/plugins/media/lib/mediatab.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/media/mediaplugin.py b/openlp/plugins/media/mediaplugin.py index 683875e95..e01e6846d 100644 --- a/openlp/plugins/media/mediaplugin.py +++ b/openlp/plugins/media/mediaplugin.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/presentations/__init__.py b/openlp/plugins/presentations/__init__.py index 628816bcf..bf077953a 100644 --- a/openlp/plugins/presentations/__init__.py +++ b/openlp/plugins/presentations/__init__.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/presentations/lib/__init__.py b/openlp/plugins/presentations/lib/__init__.py index b5575268a..b41c2f2f6 100644 --- a/openlp/plugins/presentations/lib/__init__.py +++ b/openlp/plugins/presentations/lib/__init__.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/presentations/lib/impresscontroller.py b/openlp/plugins/presentations/lib/impresscontroller.py index 48fb85ed3..8166a2258 100644 --- a/openlp/plugins/presentations/lib/impresscontroller.py +++ b/openlp/plugins/presentations/lib/impresscontroller.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/presentations/lib/mediaitem.py b/openlp/plugins/presentations/lib/mediaitem.py index 2a552a480..6009ff906 100644 --- a/openlp/plugins/presentations/lib/mediaitem.py +++ b/openlp/plugins/presentations/lib/mediaitem.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # @@ -189,7 +189,7 @@ class PresentationMediaItem(MediaManagerItem): icon = build_icon(u':/general/general_delete.png') else: critical_error_message_box( - self, translate('PresentationPlugin.MediaItem', + translate('PresentationPlugin.MediaItem', 'Unsupported File'), translate('PresentationPlugin.MediaItem', 'This type of presentation is not supported.')) diff --git a/openlp/plugins/presentations/lib/messagelistener.py b/openlp/plugins/presentations/lib/messagelistener.py index 6554c033a..b86219f42 100644 --- a/openlp/plugins/presentations/lib/messagelistener.py +++ b/openlp/plugins/presentations/lib/messagelistener.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/presentations/lib/powerpointcontroller.py b/openlp/plugins/presentations/lib/powerpointcontroller.py index 5b19ac246..793b0b75d 100644 --- a/openlp/plugins/presentations/lib/powerpointcontroller.py +++ b/openlp/plugins/presentations/lib/powerpointcontroller.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/presentations/lib/pptviewcontroller.py b/openlp/plugins/presentations/lib/pptviewcontroller.py index 5ec560167..94fd05f31 100644 --- a/openlp/plugins/presentations/lib/pptviewcontroller.py +++ b/openlp/plugins/presentations/lib/pptviewcontroller.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/presentations/lib/pptviewlib/README.TXT b/openlp/plugins/presentations/lib/pptviewlib/README.TXT index 686278729..6cbf18cb0 100644 --- a/openlp/plugins/presentations/lib/pptviewlib/README.TXT +++ b/openlp/plugins/presentations/lib/pptviewlib/README.TXT @@ -1,17 +1,17 @@ PPTVIEWLIB - Control PowerPoint Viewer 2003/2007 (for openlp.org) -Copyright (C) 2008 Jonathan Corwin (j@corwin.co.uk) - -This library wrappers the free Microsoft PowerPoint Viewer (2003/2007) program, -allowing it to be more easily controlled from another program. +Copyright (C) 2008-2011 Jonathan Corwin (j@corwin.co.uk) -The PowerPoint Viewer must already be installed on the destination machine, and is +This library wrappers the free Microsoft PowerPoint Viewer (2003/2007) program, +allowing it to be more easily controlled from another program. + +The PowerPoint Viewer must already be installed on the destination machine, and is freely available at microsoft.com. The full Microsoft Office PowerPoint and PowerPoint Viewer 97 have a COM interface allowing automation. This ability was removed from the 2003+ viewer offerings. -To developers: I am not a C/C++ or Win32 API programmer as you can probably tell. +To developers: I am not a C/C++ or Win32 API programmer as you can probably tell. The code and API of this DLL could certainly do with some tidying up, and the error trapping, where it exists, is very basic. I'll happily accept patches! @@ -28,94 +28,94 @@ This project can be built with the free Microsoft Visual C++ 2008 Express Editio USAGE ----- BOOL CheckInstalled(void); - Returns TRUE if PowerPointViewer is installed. FALSE if not. + Returns TRUE if PowerPointViewer is installed. FALSE if not. int OpenPPT(char *filename, HWND hParentWnd, RECT rect, char *previewpath); - Opens the PowerPoint file, counts the number of slides, sizes and positions accordingly - and creates preview images of each slide. Note PowerPoint Viewer only allows the - slideshow to be resized whilst it is being loaded. It can be moved at any time however. + Opens the PowerPoint file, counts the number of slides, sizes and positions accordingly + and creates preview images of each slide. Note PowerPoint Viewer only allows the + slideshow to be resized whilst it is being loaded. It can be moved at any time however. - The only way to count the number of slides is to step through the entire show. Therefore - there will be a delay whilst opening large presentations for the first time. - For pre XP/2003 systems, the slideshow will flicker as the screen snapshots are taken. + The only way to count the number of slides is to step through the entire show. Therefore + there will be a delay whilst opening large presentations for the first time. + For pre XP/2003 systems, the slideshow will flicker as the screen snapshots are taken. - filename: The PowerPoint file to be opened. Full path - hParentWnd: The window which will become the parent of the slideshow window. - Can be NULL. - rect: The location/dimensions of the slideshow window. - If all properties of this structure are zero, the dimensions of the hParentWnd - are used. - previewpath If specified, the prefix to use for snapshot images of each slide, in the - form: previewpath + n + ".bmp", where n is the slide number. - A file called previewpath + "info.txt" will also be created containing information - about the PPT file, to speed up future openings of the unmodified file. - Note it is up the calling program to directly access these images if they - are required. + filename: The PowerPoint file to be opened. Full path + hParentWnd: The window which will become the parent of the slideshow window. + Can be NULL. + rect: The location/dimensions of the slideshow window. + If all properties of this structure are zero, the dimensions of the hParentWnd + are used. + previewpath If specified, the prefix to use for snapshot images of each slide, in the + form: previewpath + n + ".bmp", where n is the slide number. + A file called previewpath + "info.txt" will also be created containing information + about the PPT file, to speed up future openings of the unmodified file. + Note it is up the calling program to directly access these images if they + are required. + + RETURNS: An unique identifier to pass to other methods in this library. + If < 0, then the PPT failed to open. + If >=0, ClosePPT must be called when the PPT is no longer being used + or when the calling program is closed to release resources/hooks. - RETURNS: An unique identifier to pass to other methods in this library. - If < 0, then the PPT failed to open. - If >=0, ClosePPT must be called when the PPT is no longer being used - or when the calling program is closed to release resources/hooks. - void ClosePPT(int id); - Closes the presentation, releasing any resources and hooks. + Closes the presentation, releasing any resources and hooks. + + id: The value returned from OpenPPT. - id: The value returned from OpenPPT. - int GetCurrentSlide(int id); - Returns the current slide number (from 1) + Returns the current slide number (from 1) - id: The value returned from OpenPPT. + id: The value returned from OpenPPT. int GetSlideCount(int id); - Returns the total number of slides. + Returns the total number of slides. - id: The value returned from OpenPPT. + id: The value returned from OpenPPT. void NextStep(int id); - Advances one step (animation) through the slideshow. + Advances one step (animation) through the slideshow. - id: The value returned from OpenPPT. + id: The value returned from OpenPPT. void PrevStep(int id); - Goes backwards one step (animation) through the slideshow. + Goes backwards one step (animation) through the slideshow. - id: The value returned from OpenPPT. + id: The value returned from OpenPPT. void GotoSlide(int id, int slideno); - Goes directly to a specific slide in the slideshow + Goes directly to a specific slide in the slideshow - id: The value returned from OpenPPT. - slideno: The number of the slide (from 1) to go directly to. - - If the slide has already been displayed, then the completed slide with animations performed - will be shown. This is how the PowerPoint Viewer works so have no control over this. + id: The value returned from OpenPPT. + slideno: The number of the slide (from 1) to go directly to. + + If the slide has already been displayed, then the completed slide with animations performed + will be shown. This is how the PowerPoint Viewer works so have no control over this. void RestartShow(int id); - Restarts the show from the beginning. To reset animations, behind the scenes it - has to travel to the end and step backwards though the entire show. Therefore - for large presentations there might be a delay. + Restarts the show from the beginning. To reset animations, behind the scenes it + has to travel to the end and step backwards though the entire show. Therefore + for large presentations there might be a delay. - id: The value returned from OpenPPT. + id: The value returned from OpenPPT. void Blank(int id); - Blanks the screen, colour black. + Blanks the screen, colour black. - id: The value returned from OpenPPT. + id: The value returned from OpenPPT. void Unblank(int id) - Unblanks the screen, restoring it to it's pre-blank state. - - id: The value returned from OpenPPT. + Unblanks the screen, restoring it to it's pre-blank state. + + id: The value returned from OpenPPT. void Stop(int id) - Moves the slideshow off the screen. (There is no concept of stop show in the PowerPoint Viewer) + Moves the slideshow off the screen. (There is no concept of stop show in the PowerPoint Viewer) - id: The value returned from OpenPPT. + id: The value returned from OpenPPT. void Resume(int id) - Moves the slideshow display back onto the screen following a Stop() + Moves the slideshow display back onto the screen following a Stop() - id: The value returned from OpenPPT. + id: The value returned from OpenPPT. diff --git a/openlp/plugins/presentations/lib/pptviewlib/ppttest.py b/openlp/plugins/presentations/lib/pptviewlib/ppttest.py index 9730659c3..337bdb09f 100644 --- a/openlp/plugins/presentations/lib/pptviewlib/ppttest.py +++ b/openlp/plugins/presentations/lib/pptviewlib/ppttest.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # @@ -78,7 +78,7 @@ class PPTViewer(QtGui.QWidget): grid.addWidget(self.widthEdit, row, 1) grid.addWidget(height_label, row, 2) grid.addWidget(self.heightEdit, row, 3) - row = row + 1 + row = row + 1 grid.addWidget(ppt_label, row, 0) grid.addWidget(self.pptEdit, row, 1) grid.addWidget(ppt_dlg_btn, row, 2) @@ -121,14 +121,14 @@ class PPTViewer(QtGui.QWidget): app.processEvents() def nextClick(self): - if self.pptid < 0: + if self.pptid < 0: return self.pptdll.NextStep(self.pptid) self.updateCurrSlide() app.processEvents() def blankClick(self): - if self.pptid < 0: + if self.pptid < 0: return self.pptdll.Blank(self.pptid) app.processEvents() @@ -140,14 +140,14 @@ class PPTViewer(QtGui.QWidget): app.processEvents() def restartClick(self): - if self.pptid < 0: + if self.pptid < 0: return self.pptdll.RestartShow(self.pptid) self.updateCurrSlide() app.processEvents() def stopClick(self): - if self.pptid < 0: + if self.pptid < 0: return self.pptdll.Stop(self.pptid) app.processEvents() @@ -159,7 +159,7 @@ class PPTViewer(QtGui.QWidget): app.processEvents() def closeClick(self): - if self.pptid < 0: + if self.pptid < 0: return self.pptdll.ClosePPT(self.pptid) self.pptid = -1 @@ -167,10 +167,10 @@ class PPTViewer(QtGui.QWidget): def openClick(self): oldid = self.pptid; - rect = RECT(int(self.xEdit.text()), int(self.yEdit.text()), + rect = RECT(int(self.xEdit.text()), int(self.yEdit.text()), int(self.widthEdit.text()), int(self.heightEdit.text())) - filename = str(self.pptEdit.text().replace(u'/', u'\\')) - folder = str(self.folderEdit.text().replace(u'/', u'\\')) + filename = str(self.pptEdit.text().replace(u'/', u'\\')) + folder = str(self.folderEdit.text().replace(u'/', u'\\')) print filename, folder self.pptid = self.pptdll.OpenPPT(filename, None, rect, folder) print u'id: ' + unicode(self.pptid) @@ -182,7 +182,7 @@ class PPTViewer(QtGui.QWidget): self.updateCurrSlide() def updateCurrSlide(self): - if self.pptid < 0: + if self.pptid < 0: return slide = unicode(self.pptdll.GetCurrentSlide(self.pptid)) print u'currslide: ' + slide @@ -190,7 +190,7 @@ class PPTViewer(QtGui.QWidget): app.processEvents() def gotoClick(self): - if self.pptid < 0: + if self.pptid < 0: return print self.slideEdit.text() self.pptdll.GotoSlide(self.pptid, int(self.slideEdit.text())) @@ -198,7 +198,7 @@ class PPTViewer(QtGui.QWidget): app.processEvents() def openDialog(self): - self.pptEdit.setText(QtGui.QFileDialog.getOpenFileName(self, + self.pptEdit.setText(QtGui.QFileDialog.getOpenFileName(self, u'Open file')) if __name__ == '__main__': diff --git a/openlp/plugins/presentations/lib/pptviewlib/pptviewlib.cpp b/openlp/plugins/presentations/lib/pptviewlib/pptviewlib.cpp index f8a07d940..93e7b17d9 100644 --- a/openlp/plugins/presentations/lib/pptviewlib/pptviewlib.cpp +++ b/openlp/plugins/presentations/lib/pptviewlib/pptviewlib.cpp @@ -4,9 +4,9 @@ * --------------------------------------------------------------------------- * * Copyright (c) 2008-2011 Raoul Snyman * * Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael * -* Gorven, Scott Guerrieri, Meinert Jordan, Armin Khler, Andreas Preikschat, * -* Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon * -* Tibble, Carsten Tinggaard, Frode Woldsund * +* Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, * +* Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, * +* Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 * @@ -22,7 +22,7 @@ * Temple Place, Suite 330, Boston, MA 02111-1307 USA * ******************************************************************************/ -#define WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN #include #include #include @@ -32,13 +32,13 @@ #include #include "pptviewlib.h" -// Because of the callbacks used by SetWindowsHookEx, the memory used needs to -// be sharable across processes (the callbacks are done from a different +// Because of the callbacks used by SetWindowsHookEx, the memory used needs to +// be sharable across processes (the callbacks are done from a different // process) Therefore use data_seg with RWS memory. // // See http://msdn.microsoft.com/en-us/library/aa366551(VS.85).aspx for // alternative method of holding memory, removing fixed limits which would allow -// dynamic number of items, rather than a fixed number. Use a Local\ mapping, +// dynamic number of items, rather than a fixed number. Use a Local\ mapping, // since global has UAC issues in Vista. #pragma data_seg(".PPTVIEWLIB") @@ -50,7 +50,7 @@ BOOL debug = FALSE; HINSTANCE hInstance = NULL; -BOOL APIENTRY DllMain(HMODULE hModule, DWORD ulReasonForCall, +BOOL APIENTRY DllMain(HMODULE hModule, DWORD ulReasonForCall, LPVOID lpReserved) { hInstance = (HINSTANCE)hModule; @@ -66,7 +66,7 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD ulReasonForCall, //DEBUG("THREAD_DETACH\n"); break; case DLL_PROCESS_DETACH: - // Clean up... hopefully there is only the one process attached? + // Clean up... hopefully there is only the one process attached? // We'll find out soon enough during tests! DEBUG("PROCESS_DETACH\n"); for (int i = 0; i < MAX_PPTS; i++) @@ -94,10 +94,10 @@ DllExport BOOL CheckInstalled() // Open the PointPoint, count the slides and take a snapshot of each slide // for use in previews // previewpath is a prefix for the location to put preview images of each slide. -// ".bmp" will be appended to complete the path. E.g. "c:\temp\slide" would +// ".bmp" will be appended to complete the path. E.g. "c:\temp\slide" would // create "c:\temp\slide1.bmp" slide2.bmp, slide3.bmp etc. // It will also create a *info.txt containing information about the ppt -DllExport int OpenPPT(char *filename, HWND hParentWnd, RECT rect, +DllExport int OpenPPT(char *filename, HWND hParentWnd, RECT rect, char *previewPath) { STARTUPINFO si; @@ -106,7 +106,7 @@ DllExport int OpenPPT(char *filename, HWND hParentWnd, RECT rect, int id; DEBUG("OpenPPT start: %s; %s\n", filename, previewPath); - DEBUG("OpenPPT start: %u; %i, %i, %i, %i\n", hParentWnd, rect.top, + DEBUG("OpenPPT start: %u; %i, %i, %i, %i\n", hParentWnd, rect.top, rect.left, rect.bottom, rect.right); if (GetPPTViewerPath(cmdLine, sizeof(cmdLine)) == FALSE) { @@ -166,9 +166,9 @@ DllExport int OpenPPT(char *filename, HWND hParentWnd, RECT rect, memset(&si, 0, sizeof(si)); memset(&pi, 0, sizeof(pi)); BOOL gotInfo = GetPPTInfo(id); - /* - * I'd really like to just hook on the new threadid. However this always - * gives error 87. Perhaps I'm hooking to soon? No idea... however can't + /* + * I'd really like to just hook on the new threadid. However this always + * gives error 87. Perhaps I'm hooking to soon? No idea... however can't * wait since I need to ensure I pick up the WM_CREATE as this is the only * time the window can be resized in such away the content scales correctly * @@ -186,7 +186,7 @@ DllExport int OpenPPT(char *filename, HWND hParentWnd, RECT rect, return -1; } pptView[id].state = PPT_STARTED; - Sleep(10); + Sleep(10); if (!CreateProcess(NULL, cmdLine, NULL, NULL, FALSE, 0, 0, NULL, &si, &pi)) { DEBUG("OpenPPT: CreateProcess failed\n"); @@ -218,24 +218,24 @@ DllExport int OpenPPT(char *filename, HWND hParentWnd, RECT rect, DEBUG("OpenPPT: Step %d/%d\n", steps, pptView[id].steps); steps++; NextStep(id); - } + } Sleep(10); } DEBUG("OpenPPT: Slides %d, Steps %d, first slide steps %d\n", - pptView[id].slideCount, pptView[id].steps, + pptView[id].slideCount, pptView[id].steps, pptView[id].firstSlideSteps); for(int i = 1; i <= pptView[id].slideCount; i++) { DEBUG("OpenPPT: Slide %d = %d\n", i, pptView[id].slideNos[i]); } SavePPTInfo(id); - if (pptView[id].state == PPT_CLOSING + if (pptView[id].state == PPT_CLOSING || pptView[id].slideCount <= 0) { ClosePPT(id); id=-1; } - else + else { RestartShow(id); } @@ -278,14 +278,14 @@ BOOL GetPPTInfo(int id) return FALSE; } fgets(buf, 100, pFile); // version == 1 - fgets(buf, 100, pFile); + fgets(buf, 100, pFile); if (fileStats.st_mtime != atoi(buf)) { DEBUG("GetPPTInfo: date changed\n"); fclose (pFile); return FALSE; } - fgets(buf, 100, pFile); + fgets(buf, 100, pFile); if (fileStats.st_size != atoi(buf)) { DEBUG("GetPPTInfo: size changed\n"); @@ -350,13 +350,13 @@ BOOL GetPPTViewerPath(char *pptViewerPath, int stringSize) LRESULT lResult; DEBUG("GetPPTViewerPath: start\n"); - if ((RegOpenKeyEx(HKEY_CLASSES_ROOT, + if ((RegOpenKeyEx(HKEY_CLASSES_ROOT, "PowerPointViewer.Show.12\\shell\\Show\\command", 0, KEY_READ, &hKey) != ERROR_SUCCESS) - && (RegOpenKeyEx(HKEY_CLASSES_ROOT, + && (RegOpenKeyEx(HKEY_CLASSES_ROOT, "Applications\\PPTVIEW.EXE\\shell\\open\\command", 0, KEY_READ, &hKey) != ERROR_SUCCESS) - && (RegOpenKeyEx(HKEY_CLASSES_ROOT, + && (RegOpenKeyEx(HKEY_CLASSES_ROOT, "Applications\\PPTVIEW.EXE\\shell\\Show\\command", 0, KEY_READ, &hKey) != ERROR_SUCCESS)) { @@ -364,7 +364,7 @@ BOOL GetPPTViewerPath(char *pptViewerPath, int stringSize) } dwType = REG_SZ; dwSize = (DWORD)stringSize; - lResult = RegQueryValueEx(hKey, NULL, NULL, &dwType, (LPBYTE)pptViewerPath, + lResult = RegQueryValueEx(hKey, NULL, NULL, &dwType, (LPBYTE)pptViewerPath, &dwSize); RegCloseKey(hKey); if (lResult != ERROR_SUCCESS) @@ -372,16 +372,16 @@ BOOL GetPPTViewerPath(char *pptViewerPath, int stringSize) return FALSE; } // remove "%1" from end of key value - pptViewerPath[strlen(pptViewerPath) - 4] = '\0'; + pptViewerPath[strlen(pptViewerPath) - 4] = '\0'; DEBUG("GetPPTViewerPath: exit ok\n"); return TRUE; } -// Unhook the Windows hook +// Unhook the Windows hook void Unhook(int id) { DEBUG("Unhook: start %d\n", id); - if (pptView[id].hook != NULL) + if (pptView[id].hook != NULL) { UnhookWindowsHookEx(pptView[id].hook); } @@ -418,18 +418,18 @@ DllExport void ClosePPT(int id) DllExport void Resume(int id) { DEBUG("Resume: %d\n", id); - MoveWindow(pptView[id].hWnd, pptView[id].rect.left, - pptView[id].rect.top, - pptView[id].rect.right - pptView[id].rect.left, + MoveWindow(pptView[id].hWnd, pptView[id].rect.left, + pptView[id].rect.top, + pptView[id].rect.right - pptView[id].rect.left, pptView[id].rect.bottom - pptView[id].rect.top, TRUE); - Unblank(id); + Unblank(id); } // Moves the show off the screen so it can't be seen DllExport void Stop(int id) { DEBUG("Stop:%d\n", id); - MoveWindow(pptView[id].hWnd, -32000, -32000, - pptView[id].rect.right - pptView[id].rect.left, + MoveWindow(pptView[id].hWnd, -32000, -32000, + pptView[id].rect.right - pptView[id].rect.left, pptView[id].rect.bottom - pptView[id].rect.top, TRUE); } @@ -461,7 +461,7 @@ DllExport int GetCurrentSlide(int id) } } -// Take a step forwards through the show +// Take a step forwards through the show DllExport void NextStep(int id) { DEBUG("NextStep:%d (%d)\n", id, pptView[id].currentSlide); @@ -470,11 +470,11 @@ DllExport void NextStep(int id) { pptView[id].guess = pptView[id].currentSlide + 1; } - PostMessage(pptView[id].hWnd2, WM_MOUSEWHEEL, MAKEWPARAM(0, -WHEEL_DELTA), + PostMessage(pptView[id].hWnd2, WM_MOUSEWHEEL, MAKEWPARAM(0, -WHEEL_DELTA), 0); } -// Take a step backwards through the show +// Take a step backwards through the show DllExport void PrevStep(int id) { DEBUG("PrevStep:%d (%d)\n", id, pptView[id].currentSlide); @@ -482,16 +482,16 @@ DllExport void PrevStep(int id) { pptView[id].guess = pptView[id].currentSlide - 1; } - PostMessage(pptView[id].hWnd2, WM_MOUSEWHEEL, MAKEWPARAM(0, WHEEL_DELTA), + PostMessage(pptView[id].hWnd2, WM_MOUSEWHEEL, MAKEWPARAM(0, WHEEL_DELTA), 0); } // Blank the show (black screen) DllExport void Blank(int id) -{ +{ // B just toggles blank on/off. However pressing any key unblanks. - // So send random unmapped letter first (say 'A'), then we can - // better guarantee B will blank instead of trying to guess + // So send random unmapped letter first (say 'A'), then we can + // better guarantee B will blank instead of trying to guess // whether it was already blank or not. DEBUG("Blank:%d\n", id); HWND h1 = GetForegroundWindow(); @@ -499,7 +499,7 @@ DllExport void Blank(int id) SetForegroundWindow(pptView[id].hWnd); SetFocus(pptView[id].hWnd); // slight pause, otherwise event triggering this call may grab focus back! - Sleep(50); + Sleep(50); keybd_event((int)'A', 0, 0, 0); keybd_event((int)'A', 0, KEYEVENTF_KEYUP, 0); keybd_event((int)'B', 0, 0, 0); @@ -507,21 +507,21 @@ DllExport void Blank(int id) SetForegroundWindow(h1); SetFocus(h2); } -// Unblank the show +// Unblank the show DllExport void Unblank(int id) -{ +{ DEBUG("Unblank:%d\n", id); - // Pressing any key resumes. + // Pressing any key resumes. // For some reason SendMessage works for unblanking, but not blanking. SendMessage(pptView[id].hWnd2, WM_CHAR, 'A', 0); } // Go directly to a slide DllExport void GotoSlide(int id, int slideNo) -{ +{ DEBUG("GotoSlide %i %i:\n", id, slideNo); // Did try WM_KEYDOWN/WM_CHAR/WM_KEYUP with SendMessage but didn't work - // perhaps I was sending to the wrong window? No idea. + // perhaps I was sending to the wrong window? No idea. // Anyway fall back to keybd_event, which is OK as long we makesure // the slideshow has focus first char ch[10]; @@ -534,7 +534,7 @@ DllExport void GotoSlide(int id, int slideNo) SetForegroundWindow(pptView[id].hWnd); SetFocus(pptView[id].hWnd); // slight pause, otherwise event triggering this call may grab focus back! - Sleep(50); + Sleep(50); for (int i=0; i<10; i++) { if (ch[i] == '\0') break; @@ -550,11 +550,11 @@ DllExport void GotoSlide(int id, int slideNo) // Restart the show from the beginning DllExport void RestartShow(int id) { - // If we just go direct to slide one, then it remembers that all other - // slides have been animated, so ends up just showing the completed slides - // of those slides that have been animated next time we advance. - // Only way I've found to get around this is to step backwards all the way - // through. Lets move the window out of the way first so the audience + // If we just go direct to slide one, then it remembers that all other + // slides have been animated, so ends up just showing the completed slides + // of those slides that have been animated next time we advance. + // Only way I've found to get around this is to step backwards all the way + // through. Lets move the window out of the way first so the audience // doesn't see this. DEBUG("RestartShow:%d\n", id); Stop(id); @@ -604,20 +604,20 @@ LRESULT CALLBACK CbtProc(int nCode, WPARAM wParam, LPARAM lParam) { pptView[id].hWnd2 = hCurrWnd; } - else + else { pptView[id].hWnd = hCurrWnd; CBT_CREATEWND* cw = (CBT_CREATEWND*)lParam; - if (pptView[id].hParentWnd != NULL) + if (pptView[id].hParentWnd != NULL) { cw->lpcs->hwndParent = pptView[id].hParentWnd; } - cw->lpcs->cy = pptView[id].rect.bottom + cw->lpcs->cy = pptView[id].rect.bottom - pptView[id].rect.top; cw->lpcs->cx = pptView[id].rect.right - pptView[id].rect.left; - cw->lpcs->y = -32000; - cw->lpcs->x = -32000; + cw->lpcs->y = -32000; + cw->lpcs->x = -32000; } if ((pptView[id].hWnd != NULL) && (pptView[id].hWnd2 != NULL)) { @@ -633,12 +633,12 @@ LRESULT CALLBACK CbtProc(int nCode, WPARAM wParam, LPARAM lParam) } } } - return CallNextHookEx(hook, nCode, wParam, lParam); + return CallNextHookEx(hook, nCode, wParam, lParam); } // This hook exists whilst the slideshow is loading but only listens on the // slideshows thread. It listens out for mousewheel events -LRESULT CALLBACK GetMsgProc(int nCode, WPARAM wParam, LPARAM lParam) +LRESULT CALLBACK GetMsgProc(int nCode, WPARAM wParam, LPARAM lParam) { HHOOK hook = NULL; MSG *pMSG = (MSG *)lParam; @@ -653,7 +653,7 @@ LRESULT CALLBACK GetMsgProc(int nCode, WPARAM wParam, LPARAM lParam) break; } } - if (id >= 0 && nCode == HC_ACTION && wParam == PM_REMOVE + if (id >= 0 && nCode == HC_ACTION && wParam == PM_REMOVE && pMSG->message == WM_MOUSEWHEEL) { if (pptView[id].state != PPT_LOADED) @@ -697,24 +697,24 @@ LRESULT CALLBACK CwpProc(int nCode, WPARAM wParam, LPARAM lParam){ && (pptView[id].previewPath != NULL && strlen(pptView[id].previewPath) > 0)) { - sprintf_s(filename, MAX_PATH, "%s%i.bmp", - pptView[id].previewPath, + sprintf_s(filename, MAX_PATH, "%s%i.bmp", + pptView[id].previewPath, pptView[id].currentSlide); CaptureAndSaveWindow(cwp->hwnd, filename); } - if (((cwp->wParam == 0) + if (((cwp->wParam == 0) || (pptView[id].slideNos[1] == cwp->wParam)) && (pptView[id].currentSlide > 0)) { pptView[id].state = PPT_LOADED; pptView[id].currentSlide = pptView[id].slideCount + 1; - } - else + } + else { - if (cwp->wParam > 0) + if (cwp->wParam > 0) { pptView[id].currentSlide = pptView[id].currentSlide + 1; - pptView[id].slideNos[pptView[id].currentSlide] + pptView[id].slideNos[pptView[id].currentSlide] = cwp->wParam; pptView[id].slideCount = pptView[id].currentSlide; pptView[id].lastSlideSteps = 0; @@ -723,9 +723,9 @@ LRESULT CALLBACK CwpProc(int nCode, WPARAM wParam, LPARAM lParam){ } else { - if (cwp->wParam > 0) + if (cwp->wParam > 0) { - if(pptView[id].guess > 0 + if(pptView[id].guess > 0 && pptView[id].slideNos[pptView[id].guess] == 0) { pptView[id].currentSlide = 0; @@ -744,7 +744,7 @@ LRESULT CALLBACK CwpProc(int nCode, WPARAM wParam, LPARAM lParam){ pptView[id].currentSlide = pptView[id].guess; } pptView[id].guess = 0; - } + } } } if ((pptView[id].state != PPT_CLOSED) @@ -754,13 +754,13 @@ LRESULT CALLBACK CwpProc(int nCode, WPARAM wParam, LPARAM lParam){ pptView[id].state = PPT_CLOSING; } } - return CallNextHookEx(hook, nCode, wParam, lParam); + return CallNextHookEx(hook, nCode, wParam, lParam); } VOID CaptureAndSaveWindow(HWND hWnd, CHAR* filename) { HBITMAP hBmp; - if ((hBmp = CaptureWindow(hWnd)) == NULL) + if ((hBmp = CaptureWindow(hWnd)) == NULL) { return; } @@ -769,13 +769,13 @@ VOID CaptureAndSaveWindow(HWND hWnd, CHAR* filename) UINT uiBytesPerRow = 3 * client.right; // RGB takes 24 bits UINT uiRemainderForPadding; - if ((uiRemainderForPadding = uiBytesPerRow % sizeof(DWORD)) > 0) + if ((uiRemainderForPadding = uiBytesPerRow % sizeof(DWORD)) > 0) uiBytesPerRow += (sizeof(DWORD) - uiRemainderForPadding); UINT uiBytesPerAllRows = uiBytesPerRow * client.bottom; PBYTE pDataBits; - if ((pDataBits = new BYTE[uiBytesPerAllRows]) != NULL) + if ((pDataBits = new BYTE[uiBytesPerAllRows]) != NULL) { BITMAPINFOHEADER bmi = {0}; BITMAPFILEHEADER bmf = {0}; @@ -801,13 +801,13 @@ VOID CaptureAndSaveWindow(HWND hWnd, CHAR* filename) // Writing: FILE* pFile; int err = fopen_s(&pFile, filename, "wb"); - if (err == 0) + if (err == 0) { fwrite(&bmf, sizeof(bmf), 1, pFile); fwrite(&bmi, sizeof(bmi), 1, pFile); fwrite(pDataBits, sizeof(BYTE), uiBytesPerAllRows, pFile); fclose(pFile); - } + } delete [] pDataBits; } DeleteObject(hBmp); @@ -822,25 +822,25 @@ HBITMAP CaptureWindow(HWND hWnd) RECT rcClient; GetClientRect(hWnd, &rcClient); if ((hImage = CreateCompatibleBitmap(hDC, rcClient.right, rcClient.bottom)) - != NULL) + != NULL) { HDC hMemDC; HBITMAP hDCBmp; - if ((hMemDC = CreateCompatibleDC(hDC)) != NULL) + if ((hMemDC = CreateCompatibleDC(hDC)) != NULL) { hDCBmp = (HBITMAP)SelectObject(hMemDC, hImage); HMODULE hLib = LoadLibrary("User32"); // PrintWindow works for windows outside displayable area - // but was only introduced in WinXP. BitBlt requires the window to + // but was only introduced in WinXP. BitBlt requires the window to // be topmost and within the viewable area of the display if (GetProcAddress(hLib, "PrintWindow") == NULL) { - SetWindowPos(hWnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE); - BitBlt(hMemDC, 0, 0, rcClient.right, rcClient.bottom, hDC, 0, + SetWindowPos(hWnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE); + BitBlt(hMemDC, 0, 0, rcClient.right, rcClient.bottom, hDC, 0, 0, SRCCOPY); - SetWindowPos(hWnd, HWND_NOTOPMOST, -32000, -32000, 0, 0, - SWP_NOSIZE); + SetWindowPos(hWnd, HWND_NOTOPMOST, -32000, -32000, 0, 0, + SWP_NOSIZE); } else { @@ -852,9 +852,9 @@ HBITMAP CaptureWindow(HWND hWnd) } } ReleaseDC(hWnd, hDC); - if (!bOk) + if (!bOk) { - if (hImage) + if (hImage) { DeleteObject(hImage); hImage = NULL; diff --git a/openlp/plugins/presentations/lib/pptviewlib/pptviewlib.h b/openlp/plugins/presentations/lib/pptviewlib/pptviewlib.h index 714376f63..4c98f8bb3 100644 --- a/openlp/plugins/presentations/lib/pptviewlib/pptviewlib.h +++ b/openlp/plugins/presentations/lib/pptviewlib/pptviewlib.h @@ -4,9 +4,9 @@ * --------------------------------------------------------------------------- * * Copyright (c) 2008-2011 Raoul Snyman * * Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael * -* Gorven, Scott Guerrieri, Meinert Jordan, Armin Khler, Andreas Preikschat, * -* Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon * -* Tibble, Carsten Tinggaard, Frode Woldsund * +* Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, * +* Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, * +* Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 * @@ -22,14 +22,14 @@ * Temple Place, Suite 330, Boston, MA 02111-1307 USA * ******************************************************************************/ -#define DllExport extern "C" __declspec( dllexport ) +#define DllExport extern "C" __declspec( dllexport ) #define DEBUG(...) if (debug) printf(__VA_ARGS__) -enum PPTVIEWSTATE {PPT_CLOSED, PPT_STARTED, PPT_OPENED, PPT_LOADED, +enum PPTVIEWSTATE {PPT_CLOSED, PPT_STARTED, PPT_OPENED, PPT_LOADED, PPT_CLOSING}; -DllExport int OpenPPT(char *filename, HWND hParentWnd, RECT rect, +DllExport int OpenPPT(char *filename, HWND hParentWnd, RECT rect, char *previewPath); DllExport BOOL CheckInstalled(); DllExport void ClosePPT(int id); @@ -59,7 +59,7 @@ void Unhook(int id); #define MAX_PPTS 16 #define MAX_SLIDES 256 -struct PPTVIEW +struct PPTVIEW { HHOOK hook; HHOOK msgHook; diff --git a/openlp/plugins/presentations/lib/presentationcontroller.py b/openlp/plugins/presentations/lib/presentationcontroller.py index bd37746c1..3c7bdcc33 100644 --- a/openlp/plugins/presentations/lib/presentationcontroller.py +++ b/openlp/plugins/presentations/lib/presentationcontroller.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/presentations/lib/presentationtab.py b/openlp/plugins/presentations/lib/presentationtab.py index 7b85eebb4..25ad04f82 100644 --- a/openlp/plugins/presentations/lib/presentationtab.py +++ b/openlp/plugins/presentations/lib/presentationtab.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/presentations/presentationplugin.py b/openlp/plugins/presentations/presentationplugin.py index f45901e43..3575bbacd 100644 --- a/openlp/plugins/presentations/presentationplugin.py +++ b/openlp/plugins/presentations/presentationplugin.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/remotes/__init__.py b/openlp/plugins/remotes/__init__.py index 70445293a..6dc3d5cce 100644 --- a/openlp/plugins/remotes/__init__.py +++ b/openlp/plugins/remotes/__init__.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/remotes/html/index.html b/openlp/plugins/remotes/html/index.html index bb3352f1f..3708db654 100644 --- a/openlp/plugins/remotes/html/index.html +++ b/openlp/plugins/remotes/html/index.html @@ -1,5 +1,29 @@ + OpenLP 2.0 Remote diff --git a/openlp/plugins/remotes/html/openlp.css b/openlp/plugins/remotes/html/openlp.css index d436523a8..225079510 100644 --- a/openlp/plugins/remotes/html/openlp.css +++ b/openlp/plugins/remotes/html/openlp.css @@ -3,8 +3,9 @@ * ------------------------------------------------------------------------- * * Copyright (c) 2008-2010 Raoul Snyman * * Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael * - * Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin * - * Thompson, Jon Tibble, Carsten Tinggaard * + * Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, * + * Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, * + * Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 * diff --git a/openlp/plugins/remotes/html/openlp.js b/openlp/plugins/remotes/html/openlp.js index 0745db61c..cff36b42c 100644 --- a/openlp/plugins/remotes/html/openlp.js +++ b/openlp/plugins/remotes/html/openlp.js @@ -3,8 +3,9 @@ * ------------------------------------------------------------------------- * * Copyright (c) 2008-2010 Raoul Snyman * * Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael * - * Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin * - * Thompson, Jon Tibble, Carsten Tinggaard * + * Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, * + * Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, * + * Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 * @@ -92,7 +93,6 @@ window.OpenLP = { }, setSlide: function (event) { var slide = OpenLP.getElement(event); - console.log(slide); var id = slide.attr("value"); var text = JSON.stringify({"request": {"id": id}}); $.getJSON( diff --git a/openlp/plugins/remotes/lib/__init__.py b/openlp/plugins/remotes/lib/__init__.py index 693406204..c1a170c1b 100644 --- a/openlp/plugins/remotes/lib/__init__.py +++ b/openlp/plugins/remotes/lib/__init__.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/remotes/lib/httpserver.py b/openlp/plugins/remotes/lib/httpserver.py index 0d1e163eb..caf4ba396 100644 --- a/openlp/plugins/remotes/lib/httpserver.py +++ b/openlp/plugins/remotes/lib/httpserver.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # @@ -53,7 +53,7 @@ the remotes. ``/api/alert`` Sends an alert message to the alerts plugin. This method expects a JSON-encoded dict like this:: - + {"request": {"text": ""}} ``/api/controller/{live|preview}/{action}`` @@ -358,7 +358,7 @@ class HttpConnection(object): def display(self, action): """ Hide or show the display screen. - + ``action`` This is the action, either ``hide`` or ``show``. """ diff --git a/openlp/plugins/remotes/lib/remotetab.py b/openlp/plugins/remotes/lib/remotetab.py index 2dfee06ce..6d782b503 100644 --- a/openlp/plugins/remotes/lib/remotetab.py +++ b/openlp/plugins/remotes/lib/remotetab.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/remotes/remoteplugin.py b/openlp/plugins/remotes/remoteplugin.py index 0ed0ec099..41346dbab 100644 --- a/openlp/plugins/remotes/remoteplugin.py +++ b/openlp/plugins/remotes/remoteplugin.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/songs/__init__.py b/openlp/plugins/songs/__init__.py index 8332f7233..131d1d337 100644 --- a/openlp/plugins/songs/__init__.py +++ b/openlp/plugins/songs/__init__.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/songs/forms/__init__.py b/openlp/plugins/songs/forms/__init__.py index 356817ef9..599735247 100644 --- a/openlp/plugins/songs/forms/__init__.py +++ b/openlp/plugins/songs/forms/__init__.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/songs/forms/authorsdialog.py b/openlp/plugins/songs/forms/authorsdialog.py index ed2f87e2e..c558c1439 100644 --- a/openlp/plugins/songs/forms/authorsdialog.py +++ b/openlp/plugins/songs/forms/authorsdialog.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/songs/forms/authorsform.py b/openlp/plugins/songs/forms/authorsform.py index ad4cea3de..ea92077ff 100644 --- a/openlp/plugins/songs/forms/authorsform.py +++ b/openlp/plugins/songs/forms/authorsform.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/songs/forms/editsongdialog.py b/openlp/plugins/songs/forms/editsongdialog.py index 90bd51ebc..a9bd132cd 100644 --- a/openlp/plugins/songs/forms/editsongdialog.py +++ b/openlp/plugins/songs/forms/editsongdialog.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py index 76c3acb31..7f7b7fd90 100644 --- a/openlp/plugins/songs/forms/editsongform.py +++ b/openlp/plugins/songs/forms/editsongform.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/songs/forms/editversedialog.py b/openlp/plugins/songs/forms/editversedialog.py index 391d9be65..09ff7b135 100644 --- a/openlp/plugins/songs/forms/editversedialog.py +++ b/openlp/plugins/songs/forms/editversedialog.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/songs/forms/editverseform.py b/openlp/plugins/songs/forms/editverseform.py index 645de8a60..c48d37c4f 100644 --- a/openlp/plugins/songs/forms/editverseform.py +++ b/openlp/plugins/songs/forms/editverseform.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/songs/forms/songbookdialog.py b/openlp/plugins/songs/forms/songbookdialog.py index 337210b38..0bee88908 100644 --- a/openlp/plugins/songs/forms/songbookdialog.py +++ b/openlp/plugins/songs/forms/songbookdialog.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/songs/forms/songbookform.py b/openlp/plugins/songs/forms/songbookform.py index 23886750b..aac3f65ca 100644 --- a/openlp/plugins/songs/forms/songbookform.py +++ b/openlp/plugins/songs/forms/songbookform.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/songs/forms/songexportform.py b/openlp/plugins/songs/forms/songexportform.py index d8bc8b3a6..d71321b98 100644 --- a/openlp/plugins/songs/forms/songexportform.py +++ b/openlp/plugins/songs/forms/songexportform.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/songs/forms/songimportform.py b/openlp/plugins/songs/forms/songimportform.py index 10422aadd..6d20c8f41 100644 --- a/openlp/plugins/songs/forms/songimportform.py +++ b/openlp/plugins/songs/forms/songimportform.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/songs/forms/songmaintenancedialog.py b/openlp/plugins/songs/forms/songmaintenancedialog.py index 42ec16352..9d4b7da91 100644 --- a/openlp/plugins/songs/forms/songmaintenancedialog.py +++ b/openlp/plugins/songs/forms/songmaintenancedialog.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/songs/forms/songmaintenanceform.py b/openlp/plugins/songs/forms/songmaintenanceform.py index d5f432c2b..0a1effcf3 100644 --- a/openlp/plugins/songs/forms/songmaintenanceform.py +++ b/openlp/plugins/songs/forms/songmaintenanceform.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/songs/forms/topicsdialog.py b/openlp/plugins/songs/forms/topicsdialog.py index ee6fc88e7..67ae06e9a 100644 --- a/openlp/plugins/songs/forms/topicsdialog.py +++ b/openlp/plugins/songs/forms/topicsdialog.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/songs/forms/topicsform.py b/openlp/plugins/songs/forms/topicsform.py index a191d8156..3263be1d6 100644 --- a/openlp/plugins/songs/forms/topicsform.py +++ b/openlp/plugins/songs/forms/topicsform.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/songs/lib/__init__.py b/openlp/plugins/songs/lib/__init__.py index b9dcd1e96..4f95791b3 100644 --- a/openlp/plugins/songs/lib/__init__.py +++ b/openlp/plugins/songs/lib/__init__.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/songs/lib/cclifileimport.py b/openlp/plugins/songs/lib/cclifileimport.py index b9236919a..03a86c455 100644 --- a/openlp/plugins/songs/lib/cclifileimport.py +++ b/openlp/plugins/songs/lib/cclifileimport.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # @@ -30,15 +30,16 @@ import chardet import codecs from openlp.core.lib import translate +from openlp.plugins.songs.lib import VerseType from songimport import SongImport log = logging.getLogger(__name__) class CCLIFileImport(SongImport): """ - The :class:`CCLIFileImport` class provides OpenLP with the ability to - import CCLI SongSelect song files in both .txt and .usr formats. - See http://www.ccli.com/ for more details. + The :class:`CCLIFileImport` class provides OpenLP with the ability to import + CCLI SongSelect song files in both .txt and .usr formats. See + ``_ for more details. """ def __init__(self, manager, **kwargs): @@ -55,7 +56,7 @@ class CCLIFileImport(SongImport): def do_import(self): """ - Import either a .usr or a .txt SongSelect file + Import either a ``.usr`` or a ``.txt`` SongSelect file. """ log.debug(u'Starting CCLI File Import') song_total = len(self.import_source) @@ -67,6 +68,7 @@ class CCLIFileImport(SongImport): (song_count, song_total)) filename = unicode(filename) log.debug(u'Importing CCLI File: %s', filename) + self.set_defaults() lines = [] if os.path.isfile(filename): detect_file = open(filename, u'r') @@ -81,12 +83,10 @@ class CCLIFileImport(SongImport): lines = infile.readlines() ext = os.path.splitext(filename)[1] if ext.lower() == u'.usr': - log.info(u'SongSelect .usr format file found %s: ', - filename) + log.info(u'SongSelect .usr format file found: %s', filename) self.do_import_usr_file(lines) elif ext.lower() == u'.txt': - log.info(u'SongSelect .txt format file found %s: ', - filename) + log.info(u'SongSelect .txt format file found: %s', filename) self.do_import_txt_file(lines) else: log.info(u'Extension %s is not valid', filename) @@ -97,9 +97,8 @@ class CCLIFileImport(SongImport): def do_import_usr_file(self, textList): """ - The :func:`do_import_usr_file` method provides OpenLP - with the ability to import CCLI SongSelect songs in - *USR* file format + The :func:`do_import_usr_file` method provides OpenLP with the ability + to import CCLI SongSelect songs in *USR* file format. ``textList`` An array of strings containing the usr file content. @@ -108,35 +107,46 @@ class CCLIFileImport(SongImport): ``[File]`` USR file format first line + ``Type=`` Indicates the file type e.g. *Type=SongSelect Import File* + ``Version=3.0`` File format version + ``[S A2672885]`` Contains the CCLI Song number e.g. *2672885* + ``Title=`` Contains the song title (e.g. *Title=Above All*) + ``Author=`` Contains a | delimited list of the song authors e.g. *Author=LeBlanc, Lenny | Baloche, Paul* + ``Copyright=`` Contains a | delimited list of the song copyrights e.g. Copyright=1999 Integrity's Hosanna! Music | LenSongs Publishing (Verwaltet von Gerth Medien Musikverlag) + ``Admin=`` Contains the song administrator e.g. *Admin=Gerth Medien Musikverlag* + ``Themes=`` Contains a /t delimited list of the song themes e.g. *Themes=Cross/tKingship/tMajesty/tRedeemer* + ``Keys=`` Contains the keys in which the music is played?? e.g. *Keys=A* + ``Fields=`` Contains a list of the songs fields in order /t delimited e.g. *Fields=Vers 1/tVers 2/tChorus 1/tAndere 1* + ``Words=`` Contains the songs various lyrics in order as shown by the *Fields* description @@ -144,57 +154,60 @@ class CCLIFileImport(SongImport): """ log.debug(u'USR file text: %s', textList) - self.set_defaults() + song_author = u'' + song_topics = u'' for line in textList: if line.startswith(u'Title='): - song_name = line[6:].strip() + self.title = line[6:].strip() elif line.startswith(u'Author='): song_author = line[7:].strip() elif line.startswith(u'Copyright='): - song_copyright = line[10:].strip() + self.copyright = line[10:].strip() + elif line.startswith(u'Themes='): + song_topics = line[7:].strip() elif line.startswith(u'[S A'): - song_ccli = line[4:-3].strip() + self.ccli_number = line[4:-3].strip() elif line.startswith(u'Fields='): - #Fields contain single line indicating verse, chorus, etc, - #/t delimited, same as with words field. store seperately - #and process at end. + # Fields contain single line indicating verse, chorus, etc, + # /t delimited, same as with words field. store seperately + # and process at end. song_fields = line[7:].strip() elif line.startswith(u'Words='): song_words = line[6:].strip() - #Unhandled usr keywords:Type,Version,Admin,Themes,Keys - #Process Fields and words sections + # Unhandled usr keywords: Type, Version, Admin, Keys + # Process Fields and words sections. check_first_verse_line = False field_list = song_fields.split(u'/t') words_list = song_words.split(u'/t') for counter in range(0, len(field_list)): if field_list[counter].startswith(u'Ver'): - verse_type = u'V' + verse_type = VerseType.Tags[VerseType.Verse] elif field_list[counter].startswith(u'Ch'): - verse_type = u'C' + verse_type = VerseType.Tags[VerseType.Chorus] elif field_list[counter].startswith(u'Br'): - verse_type = u'B' - else: #Other - verse_type = u'O' + verse_type = VerseType.Tags[VerseType.Bridge] + else: + verse_type = VerseType.Tags[VerseType.Other] check_first_verse_line = True verse_text = unicode(words_list[counter]) verse_text = verse_text.replace(u'/n', u'\n') verse_lines = verse_text.split(u'\n', 1) if check_first_verse_line: if verse_lines[0].startswith(u'(PRE-CHORUS'): - verse_type = u'P' + verse_type = VerseType.Tags[VerseType.PreChorus] log.debug(u'USR verse PRE-CHORUS: %s', verse_lines[0]) verse_text = verse_lines[1] elif verse_lines[0].startswith(u'(BRIDGE'): - verse_type = u'B' + verse_type = VerseType.Tags[VerseType.Bridge] log.debug(u'USR verse BRIDGE') verse_text = verse_lines[1] elif verse_lines[0].startswith(u'('): - verse_type = u'O' + verse_type = VerseType.Tags[VerseType.Other] verse_text = verse_lines[1] if len(verse_text) > 0: self.add_verse(verse_text, verse_type) check_first_verse_line = False - #Handle multiple authors + # Handle multiple authors author_list = song_author.split(u'/') if len(author_list) < 2: author_list = song_author.split(u'|') @@ -204,16 +217,13 @@ class CCLIFileImport(SongImport): self.add_author(u' '.join(reversed(separated))) else: self.add_author(author) - self.title = song_name - self.copyright = song_copyright - self.ccli_number = song_ccli + self.topics = [topic.strip() for topic in song_topics.split(u'/t')] self.finish() def do_import_txt_file(self, textList): """ - The :func:`do_import_txt_file` method provides OpenLP - with the ability to import CCLI SongSelect songs in - *TXT* file format + The :func:`do_import_txt_file` method provides OpenLP with the ability + to import CCLI SongSelect songs in *TXT* file format. ``textList`` An array of strings containing the txt file content. @@ -243,12 +253,10 @@ class CCLIFileImport(SongImport): """ log.debug(u'TXT file text: %s', textList) - self.set_defaults() line_number = 0 check_first_verse_line = False verse_text = u'' - song_comments = u'' - song_copyright = u'' + song_author = u'' verse_start = False for line in textList: clean_line = line.strip() @@ -258,12 +266,12 @@ class CCLIFileImport(SongImport): elif verse_start: if verse_text: self.add_verse(verse_text, verse_type) - verse_text = '' + verse_text = u'' verse_start = False else: #line_number=0, song title if line_number == 0: - song_name = clean_line + self.title = clean_line line_number += 1 #line_number=1, verses elif line_number == 1: @@ -271,37 +279,37 @@ class CCLIFileImport(SongImport): if clean_line.startswith(u'CCLI'): line_number += 1 ccli_parts = clean_line.split(' ') - song_ccli = ccli_parts[len(ccli_parts)-1] + self.ccli_number = ccli_parts[len(ccli_parts) - 1] elif not verse_start: # We have the verse descriptor - verse_desc_parts = clean_line.split(' ') + verse_desc_parts = clean_line.split(u' ') if len(verse_desc_parts) == 2: if verse_desc_parts[0].startswith(u'Ver'): - verse_type = u'V' + verse_type = VerseType.Tags[VerseType.Verse] elif verse_desc_parts[0].startswith(u'Ch'): - verse_type = u'C' + verse_type = VerseType.Tags[VerseType.Chorus] elif verse_desc_parts[0].startswith(u'Br'): - verse_type = u'B' + verse_type = VerseType.Tags[VerseType.Bridge] else: - #we need to analyse the next line for - #verse type, so set flag - verse_type = u'O' + # we need to analyse the next line for + # verse type, so set flag + verse_type = VerseType.Tags[VerseType.Other] check_first_verse_line = True verse_number = verse_desc_parts[1] else: - verse_type = u'O' + verse_type = VerseType.Tags[VerseType.Other] verse_number = 1 verse_start = True else: - #check first line for verse type + # check first line for verse type if check_first_verse_line: if line.startswith(u'(PRE-CHORUS'): - verse_type = u'P' + verse_type = VerseType.Tags[VerseType.PreChorus] elif line.startswith(u'(BRIDGE'): - verse_type = u'B' + verse_type = VerseType.Tags[VerseType.Bridge] # Handle all other misc types elif line.startswith(u'('): - verse_type = u'O' + verse_type = VerseType.Tags[VerseType.Other] else: verse_text = verse_text + line check_first_verse_line = False @@ -313,24 +321,19 @@ class CCLIFileImport(SongImport): #line_number=2, copyright if line_number == 2: line_number += 1 - song_copyright = clean_line + self.copyright = clean_line #n=3, authors elif line_number == 3: line_number += 1 song_author = clean_line #line_number=4, comments lines before last line - elif (line_number == 4) and \ - (not clean_line.startswith(u'CCL')): - song_comments = song_comments + clean_line + elif line_number == 4 and not clean_line.startswith(u'CCL'): + self.comments += clean_line # split on known separators author_list = song_author.split(u'/') if len(author_list) < 2: author_list = song_author.split(u'|') - #Clean spaces before and after author names + # Clean spaces before and after author names. for author_name in author_list: self.add_author(author_name.strip()) - self.title = song_name - self.copyright = song_copyright - self.ccli_number = song_ccli - self.comments = song_comments self.finish() diff --git a/openlp/plugins/songs/lib/db.py b/openlp/plugins/songs/lib/db.py index b72517f70..fd6d94d14 100644 --- a/openlp/plugins/songs/lib/db.py +++ b/openlp/plugins/songs/lib/db.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/songs/lib/easislidesimport.py b/openlp/plugins/songs/lib/easislidesimport.py index c4683765b..d326e83ca 100644 --- a/openlp/plugins/songs/lib/easislidesimport.py +++ b/openlp/plugins/songs/lib/easislidesimport.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/songs/lib/ewimport.py b/openlp/plugins/songs/lib/ewimport.py index 880c7f547..e68b19494 100644 --- a/openlp/plugins/songs/lib/ewimport.py +++ b/openlp/plugins/songs/lib/ewimport.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/songs/lib/foilpresenterimport.py b/openlp/plugins/songs/lib/foilpresenterimport.py index dbea5e79a..44ea56147 100644 --- a/openlp/plugins/songs/lib/foilpresenterimport.py +++ b/openlp/plugins/songs/lib/foilpresenterimport.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/songs/lib/importer.py b/openlp/plugins/songs/lib/importer.py index 773be2fd7..bad31c0ea 100644 --- a/openlp/plugins/songs/lib/importer.py +++ b/openlp/plugins/songs/lib/importer.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py index b95bff3dc..723b6c5d5 100644 --- a/openlp/plugins/songs/lib/mediaitem.py +++ b/openlp/plugins/songs/lib/mediaitem.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/songs/lib/olp1import.py b/openlp/plugins/songs/lib/olp1import.py index 989b7df8a..232b17db0 100644 --- a/openlp/plugins/songs/lib/olp1import.py +++ b/openlp/plugins/songs/lib/olp1import.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/songs/lib/olpimport.py b/openlp/plugins/songs/lib/olpimport.py index e324fbedf..e8b9f0dd7 100644 --- a/openlp/plugins/songs/lib/olpimport.py +++ b/openlp/plugins/songs/lib/olpimport.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/songs/lib/oooimport.py b/openlp/plugins/songs/lib/oooimport.py index e9db0ac3e..c9c05907e 100644 --- a/openlp/plugins/songs/lib/oooimport.py +++ b/openlp/plugins/songs/lib/oooimport.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/songs/lib/openlyricsexport.py b/openlp/plugins/songs/lib/openlyricsexport.py index 42410a7e0..d3367bfa9 100644 --- a/openlp/plugins/songs/lib/openlyricsexport.py +++ b/openlp/plugins/songs/lib/openlyricsexport.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/songs/lib/openlyricsimport.py b/openlp/plugins/songs/lib/openlyricsimport.py index 31b2bc959..208ef3e52 100644 --- a/openlp/plugins/songs/lib/openlyricsimport.py +++ b/openlp/plugins/songs/lib/openlyricsimport.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/songs/lib/opensongimport.py b/openlp/plugins/songs/lib/opensongimport.py index 4da1234a5..37fc2b5ef 100644 --- a/openlp/plugins/songs/lib/opensongimport.py +++ b/openlp/plugins/songs/lib/opensongimport.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/songs/lib/sofimport.py b/openlp/plugins/songs/lib/sofimport.py index 49ed5b569..0b7e0c139 100644 --- a/openlp/plugins/songs/lib/sofimport.py +++ b/openlp/plugins/songs/lib/sofimport.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/songs/lib/songbeamerimport.py b/openlp/plugins/songs/lib/songbeamerimport.py index 6d6b4e932..5cd2c4329 100644 --- a/openlp/plugins/songs/lib/songbeamerimport.py +++ b/openlp/plugins/songs/lib/songbeamerimport.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/songs/lib/songimport.py b/openlp/plugins/songs/lib/songimport.py index c14354dcb..5bc1f15d0 100644 --- a/openlp/plugins/songs/lib/songimport.py +++ b/openlp/plugins/songs/lib/songimport.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/songs/lib/songshowplusimport.py b/openlp/plugins/songs/lib/songshowplusimport.py index 363bfaa98..d5ab85f89 100644 --- a/openlp/plugins/songs/lib/songshowplusimport.py +++ b/openlp/plugins/songs/lib/songshowplusimport.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/songs/lib/songstab.py b/openlp/plugins/songs/lib/songstab.py index 2848208d2..14aacefdc 100644 --- a/openlp/plugins/songs/lib/songstab.py +++ b/openlp/plugins/songs/lib/songstab.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/songs/lib/test/test_import_file.py b/openlp/plugins/songs/lib/test/test_import_file.py index 4c3460426..6be485210 100644 --- a/openlp/plugins/songs/lib/test/test_import_file.py +++ b/openlp/plugins/songs/lib/test/test_import_file.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/songs/lib/test/test_importing_lots.py b/openlp/plugins/songs/lib/test/test_importing_lots.py index 4fa5dc7c1..5cd8b3362 100644 --- a/openlp/plugins/songs/lib/test/test_importing_lots.py +++ b/openlp/plugins/songs/lib/test/test_importing_lots.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/songs/lib/test/test_opensongimport.py b/openlp/plugins/songs/lib/test/test_opensongimport.py index cd85cad3b..e29b9733c 100644 --- a/openlp/plugins/songs/lib/test/test_opensongimport.py +++ b/openlp/plugins/songs/lib/test/test_opensongimport.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/songs/lib/ui.py b/openlp/plugins/songs/lib/ui.py index fe4aab988..0a389087e 100644 --- a/openlp/plugins/songs/lib/ui.py +++ b/openlp/plugins/songs/lib/ui.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/songs/lib/wowimport.py b/openlp/plugins/songs/lib/wowimport.py index b4bddd4d3..cbdd40758 100644 --- a/openlp/plugins/songs/lib/wowimport.py +++ b/openlp/plugins/songs/lib/wowimport.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/songs/lib/xml.py b/openlp/plugins/songs/lib/xml.py index 0bf64c6fa..87e28591e 100644 --- a/openlp/plugins/songs/lib/xml.py +++ b/openlp/plugins/songs/lib/xml.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # @@ -68,6 +68,7 @@ from lxml import etree, objectify from openlp.plugins.songs.lib import clean_song, VerseType from openlp.plugins.songs.lib.db import Author, Book, Song, Topic +from openlp.core.utils import get_application_version log = logging.getLogger(__name__) @@ -230,8 +231,8 @@ class OpenLyrics(object): # Append the necessary meta data to the song. song_xml.set(u'xmlns', u'http://openlyrics.info/namespace/2009/song') song_xml.set(u'version', OpenLyrics.IMPLEMENTED_VERSION) - song_xml.set(u'createdIn', u'OpenLP 1.9.4') # Use variable - song_xml.set(u'modifiedIn', u'OpenLP 1.9.4') # Use variable + song_xml.set(u'createdIn', get_application_version()[u'version']) + song_xml.set(u'modifiedIn', get_application_version()[u'version']) song_xml.set(u'modifiedDate', datetime.datetime.now().strftime(u'%Y-%m-%dT%H:%M:%S')) properties = etree.SubElement(song_xml, u'properties') diff --git a/openlp/plugins/songs/songsplugin.py b/openlp/plugins/songs/songsplugin.py index c54efc132..1260a832b 100644 --- a/openlp/plugins/songs/songsplugin.py +++ b/openlp/plugins/songs/songsplugin.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/songusage/__init__.py b/openlp/plugins/songusage/__init__.py index 5a58a5a81..15832d17c 100644 --- a/openlp/plugins/songusage/__init__.py +++ b/openlp/plugins/songusage/__init__.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/songusage/forms/__init__.py b/openlp/plugins/songusage/forms/__init__.py index c95384e5e..103ce032f 100644 --- a/openlp/plugins/songusage/forms/__init__.py +++ b/openlp/plugins/songusage/forms/__init__.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/songusage/forms/songusagedeletedialog.py b/openlp/plugins/songusage/forms/songusagedeletedialog.py index 879056e16..95e877ca3 100644 --- a/openlp/plugins/songusage/forms/songusagedeletedialog.py +++ b/openlp/plugins/songusage/forms/songusagedeletedialog.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/songusage/forms/songusagedeleteform.py b/openlp/plugins/songusage/forms/songusagedeleteform.py index a96aacccd..1c7294729 100644 --- a/openlp/plugins/songusage/forms/songusagedeleteform.py +++ b/openlp/plugins/songusage/forms/songusagedeleteform.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/songusage/forms/songusagedetaildialog.py b/openlp/plugins/songusage/forms/songusagedetaildialog.py index 7c812efeb..371c3d6f4 100644 --- a/openlp/plugins/songusage/forms/songusagedetaildialog.py +++ b/openlp/plugins/songusage/forms/songusagedetaildialog.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/songusage/forms/songusagedetailform.py b/openlp/plugins/songusage/forms/songusagedetailform.py index edfee3595..11816d85c 100644 --- a/openlp/plugins/songusage/forms/songusagedetailform.py +++ b/openlp/plugins/songusage/forms/songusagedetailform.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/songusage/lib/__init__.py b/openlp/plugins/songusage/lib/__init__.py index 860b25463..6cb536530 100644 --- a/openlp/plugins/songusage/lib/__init__.py +++ b/openlp/plugins/songusage/lib/__init__.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/songusage/lib/db.py b/openlp/plugins/songusage/lib/db.py index 2508ddc14..a3a2c4fc4 100644 --- a/openlp/plugins/songusage/lib/db.py +++ b/openlp/plugins/songusage/lib/db.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/openlp/plugins/songusage/songusageplugin.py b/openlp/plugins/songusage/songusageplugin.py index 99446dbe4..8ff40373a 100644 --- a/openlp/plugins/songusage/songusageplugin.py +++ b/openlp/plugins/songusage/songusageplugin.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/resources/i18n/af.ts b/resources/i18n/af.ts index fb4007cdc..d36d55147 100644 --- a/resources/i18n/af.ts +++ b/resources/i18n/af.ts @@ -1552,102 +1552,102 @@ Version: %s OpenLP.FirstTimeWizard - + Downloading %s... Aflaai %s... - + Download complete. Click the finish button to start OpenLP. Aflaai voltooi. Klik op die klaar knoppie om OpenLP te begin. - + Enabling selected plugins... Skakel geselekteerde miniprogramme aan... - + First Time Wizard Eerste-keer Gids - + Welcome to the First Time Wizard Welkom by die Eerste-keer Gids - + 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. Hierdie gids sal bystand verleen in die proses om OpenLP op te stel vir eerste gebruik. Klik die volgende knoppie hieronder om die seleksie proses te begin. - + Activate required Plugins Aktiveer nodige Miniprogramme - + Select the Plugins you wish to use. Kies die Miniprogramme wat gebruik moet word. - + Songs Liedere - + Custom Text Verpersoonlike Teks - + Bible Bybel - + Images Beelde - + Presentations Aanbiedinge - + Media (Audio and Video) Media (Klank en Video) - + Allow remote access Laat afgeleë toegang toe - + Monitor Song Usage Monitor Lied-Gebruik - + Allow Alerts Laat Waarskuwings Toe - + No Internet Connection Geen Internet Verbinding - + Unable to detect an Internet connection. Nie in staat om 'n Internet verbinding op te spoor nie. - + 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. To 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. @@ -1659,67 +1659,67 @@ Om die Eerste-gebruik Gids later te gebruik om hierde data in te trek, druk die Om die Eerste-keer gids heeltemal te kanselleer, druk die vollledig-knoppie hieronder. - + Sample Songs Voorbeeld Liedere - + Select and download public domain songs. Kies en laai liedere vanaf die publieke domein. - + Sample Bibles Voorbeeld Bybels - + Select and download free Bibles. Kies en laai gratis Bybels af. - + Sample Themes Voorbeeld Temas - + Select and download sample themes. Kies en laai voorbeeld temas af. - + Default Settings Verstek Instellings - + Set up default settings to be used by OpenLP. Stel verstek instellings wat deur OpenLP gebruik moet word. - + Setting Up And Importing Opstel en Invoer - + Please wait while OpenLP is set up and your data is imported. Wag asseblief terwyl OpenLP opgestel word en die data ingevoer word. - + Default output display: Verstek uitgaande vertoning: - + Select default theme: Kies verstek tema: - + Starting configuration process... Konfigurasie proses begin... @@ -1845,12 +1845,12 @@ Om die Eerste-keer gids heeltemal te kanselleer, druk die vollledig-knoppie hier OpenLP.LanguageManager - + Language Taal - + Please restart OpenLP to use your new language setting. Herlaai asseblief OpenLP om die nuwe taal instelling te gebruik. @@ -1866,347 +1866,347 @@ Om die Eerste-keer gids heeltemal te kanselleer, druk die vollledig-knoppie hier OpenLP.MainWindow - + &File &Lêer - + &Import &Invoer - + &Export Uitvo&er - + &View &Bekyk - + M&ode M&odus - + &Tools &Gereedskap - + &Settings Ver&stellings - + &Language Taa&l - + &Help &Hulp - + Media Manager Media Bestuurder - + Service Manager Diens Bestuurder - + Theme Manager Tema Bestuurder - + &New &Nuwe - + Ctrl+N Ctrl+N - + &Open Maak &Oop - + Open an existing service. Maak 'n bestaande diens oop. - + Ctrl+O Ctrl+O - + &Save &Stoor - + Save the current service to disk. Stoor die huidige diens na skyf. - + Ctrl+S Ctrl+S - + Save &As... Stoor &As... - + Save Service As Stoor Diens As - + Save the current service under a new name. Stoor die huidige diens onder 'n nuwe naam. - + Ctrl+Shift+S Ctrl+Shift+S - + E&xit &Uitgang - + Quit OpenLP Sluit OpenLP Af - + Alt+F4 Alt+F4 - + &Theme &Tema - + &Configure OpenLP... &Konfigureer OpenLP... - + &Media Manager &Media Bestuurder - + Toggle Media Manager Wissel Media Bestuurder - + Toggle the visibility of the media manager. Wissel sigbaarheid van die media bestuurder. - + F8 F8 - + &Theme Manager &Tema Bestuurder - + Toggle Theme Manager Wissel Tema Bestuurder - + Toggle the visibility of the theme manager. Wissel sigbaarheid van die tema bestuurder. - + F10 F10 - + &Service Manager &Diens Bestuurder - + Toggle Service Manager Wissel Diens Bestuurder - + Toggle the visibility of the service manager. Wissel sigbaarheid van die diens bestuurder. - + F9 F9 - + &Preview Panel Voorskou &Paneel - + Toggle Preview Panel Wissel Voorskou Paneel - + Toggle the visibility of the preview panel. Wissel sigbaarheid van die voorskou paneel. - + F11 F11 - + &Live Panel Regstreekse Panee&l - + Toggle Live Panel Wissel Regstreekse Paneel - + Toggle the visibility of the live panel. Wissel sigbaarheid van die regstreekse paneel. - + F12 F12 - + &Plugin List Mini-&program Lys - + List the Plugins Lys die Mini-programme - + Alt+F7 Alt+F7 - + &User Guide Gebr&uikers Gids - + &About &Aangaande - + More information about OpenLP Meer inligting aangaande OpenLP - + Ctrl+F1 Ctrl+F1 - + &Online Help &Aanlyn Hulp - + &Web Site &Web Tuiste - + Use the system language, if available. Gebruik die sisteem se taal as dit beskikbaar is. - + Set the interface language to %s Verstel die koppelvlak taal na %s - + Add &Tool... Voeg Gereedskaps&tuk by... - + Add an application to the list of tools. Voeg 'n applikasie by die lys van gereedskapstukke. - + &Default &Verstek - + Set the view mode back to the default. Verstel skou modus terug na verstek modus. - + &Setup Op&stel - + Set the view mode to Setup. Verstel die skou modus na Opstel modus. - + &Live &Regstreeks - + Set the view mode to Live. Verstel die skou modus na Regstreeks. - + Version %s of OpenLP is now available for download (you are currently running version %s). You can download the latest version from http://openlp.org/. @@ -2215,22 +2215,22 @@ You can download the latest version from http://openlp.org/. Die nuutste weergawe kan afgelaai word vanaf http://openlp.org/. - + OpenLP Version Updated OpenLP Weergawe is Opdateer - + OpenLP Main Display Blanked OpenLP Hoof Vertoning Blanko - + The Main Display has been blanked out Die Hoof Skerm is afgeskakel - + Default Theme: %s Verstek Tema: %s @@ -2241,47 +2241,47 @@ Die nuutste weergawe kan afgelaai word vanaf http://openlp.org/. Afrikaans - + Configure &Shortcuts... Konfigureer Kortpaaie - + Close OpenLP Mook OpenLP toe - + Are you sure you want to close OpenLP? Maak OpenLP sekerlik toe? - + Print the current Service Order. Druk die huidige Diens Bestelling. - + Ctrl+P Ctrl+P - + Open &Data Folder... Maak &Data Lêer oop... - + Open the folder where songs, bibles and other data resides. Maak die lêer waar liedere, bybels en ander data is, oop. - + &Configure Display Tags Konfigureer Vertoon Haakies - + &Autodetect Spoor outom&aties op diff --git a/resources/i18n/cs.ts b/resources/i18n/cs.ts new file mode 100644 index 000000000..2919e9622 --- /dev/null +++ b/resources/i18n/cs.ts @@ -0,0 +1,4993 @@ + + + + AlertPlugin.AlertForm + + + You have not entered a parameter to be replaced. +Do you want to continue anyway? + Nebyl zadán žádný parametr pro nahrazení. +Chcete přesto pokračovat? + + + + No Parameter Found + Parametr nebyl nalezen + + + + No Placeholder Found + Zástupný znak nenalezen. + + + + The alert text does not contain '<>'. +Do you want to continue anyway? + Text upozornění neobsahuje '<>'. +Chcete přesto pokračovat? + + + + AlertsPlugin + + + &Alert + &Upozornění + + + + Show an alert message. + Zobrazí vzkaz upozornění. + + + + <strong>Alerts Plugin</strong><br />The alert plugin controls the displaying of nursery alerts on the display screen + <strong>Modul upozornění</strong><br />Modul upozornění řídí zobrazení upozornění na zobrazovací obrazovce + + + + Alert + name singular + Upozornění + + + + Alerts + name plural + Více upozornění + + + + Alerts + container title + Více upozornění + + + + AlertsPlugin.AlertForm + + + Alert Message + Vzkaz upozornění + + + + Alert &text: + &Text upozornění + + + + &New + &Nový + + + + &Save + &Uložit + + + + Displ&ay + &Zobrazit + + + + Display && Cl&ose + Zobrazit a za&vřít + + + + New Alert + Nové upozornění + + + + You haven't specified any text for your alert. Please type in some text before clicking New. + Nebyl zadán žádný text upozornění. Před klepnutím na Nový prosím zadejte nějaký text. + + + + &Parameter: + &Parametr: + + + + AlertsPlugin.AlertsManager + + + Alert message created and displayed. + Vzkaz upozornění byl vytvořen a zobrazen. + + + + AlertsPlugin.AlertsTab + + + Font + Písmo + + + + Font name: + Název písma: + + + + Font color: + Barva písma: + + + + Background color: + Barva pozadí: + + + + Font size: + Velikost písma: + + + + Alert timeout: + Čas vypršení upozornění: + + + + BibleDB.Wizard + + + Importing testaments... %s + Importuji Bible... %s + + + + Importing testaments... done. + Importuji Bible... hotovo. + + + + Importing books... %s + Importuji knihy... %s + + + + Importing verses from %s... + Importing verses from <book name>... + Importuji verše z %s... + + + + Importing verses... done. + Importuji verše... hotovo. + + + + BiblePlugin.HTTPBible + + + Download Error + Chyba stahování + + + + There was a problem downloading your verse selection. Please check your Internet connection, and if this error continues to occur please consider reporting a bug. + Při stahování výběru veršů se vyskytl problém. Prosím prověřte své internetové připojení. Pokud se tato chyba stále objevuje, zvašte prosím nahlášení chyby. + + + + Parse Error + Chyba zpracování + + + + There was a problem extracting your verse selection. If this error continues to occur please consider reporting a bug. + Při rozbalování výběru veršů se vyskytl problém. Pokud se tato chyba stále objevuje, zvašte prosím nahlášení chyby. + + + + BiblePlugin.MediaItem + + + Bible not fully loaded. + Bible není celá načtena. + + + + You cannot combine single and dual Bible verse search results. Do you want to delete your search results and start a new search? + Nelze kombinovat jednoduché a dvojité výsledky hledání veršů v Bibli. Přejete si smazat výsledky hledání a začít s novým vyhledáváním? + + + + BiblesPlugin + + + &Bible + &Bible + + + + <strong>Bible Plugin</strong><br />The Bible plugin provides the ability to display bible verses from different sources during the service. + <strong>Modul Bible</strong><br />Modul Bible dovoluje během služby zobrazovat biblické verše z různých zdrojů. + + + + Import a Bible + Import Bible + + + + Add a new Bible + Přidat Bibli + + + + Edit the selected Bible + Upravit vybranou Bibli + + + + Delete the selected Bible + Smazat vybranou Bibli + + + + Preview the selected Bible + Náhled vybrané Bible + + + + Send the selected Bible live + Vybraná Bibli naživo + + + + Add the selected Bible to the service + Přidat vybranou Bibli k službě + + + + Bible + name singular + Bible + + + + Bibles + name plural + Více Biblí + + + + Bibles + container title + Více Biblí + + + + No Book Found + Kniha nenalezena + + + + No matching book could be found in this Bible. Check that you have spelled the name of the book correctly. + V Bibli nebyla nalezena odpovídající kniha. Prověřte, že název knihy byl zadán správně. + + + + BiblesPlugin.BibleManager + + + Scripture Reference Error + Chyba v odkazu do Bible + + + + Web Bible cannot be used + Bibli z www nelze použít + + + + Text Search is not available with Web Bibles. + Hledání textu není dostupné v Bibli z www. + + + + You did not enter a search keyword. +You can separate different keywords by a space to search for all of your keywords and you can separate them by a comma to search for one of them. + Nebylo zadáno slovo pro hledání. +K hledání textu obsahující všechna slova je nutno tato slova oddělit mezerou. Oddělením slov čárkou se bude hledat text obsahující alespoň jedno ze zadaných slov. + + + + There are no Bibles currently installed. Please use the Import Wizard to install one or more Bibles. + Žádné Bible nejsou nainstalovány. K p?idání jedné nebo více Biblí prosím použijte Pr?vodce importem. + + + + Your scripture reference is either not supported by OpenLP or is invalid. Please make sure your reference conforms to one of the following patterns: + +Book Chapter +Book Chapter-Chapter +Book Chapter:Verse-Verse +Book Chapter:Verse-Verse,Verse-Verse +Book Chapter:Verse-Verse,Chapter:Verse-Verse +Book Chapter:Verse-Chapter:Verse + Odkaz do Bible buďto není podporován aplikací OpenLP nebo je neplatný. Přesvědčte se prosím, že odkaz odpovídá jednomu z následujcích vzorů: + +Kniha Kapitola +Kniha Kapitola-Kapitola +Kniha Kapitola:Verš-Verš +Kniha Kapitola:Verš-Verš,Verš-Verš +Kniha Kapitola:Verš-Verš,Kapitola:Verš-Verš +Kniha Kapitola:Verš-Kapitola:Verš + + + + No Bibles Available + Žádné Bible k dispozici + + + + BiblesPlugin.BiblesTab + + + Verse Display + Zobrazit verš + + + + Only show new chapter numbers + Zobrazit jen číslo nové kapitoly + + + + Layout style: + Styl rozvržení: + + + + Display style: + Styl zobrazení: + + + + Bible theme: + Motiv Bible: + + + + Verse Per Slide + Verš na jeden snímek + + + + Verse Per Line + Verš na jeden řádek + + + + Continuous + Spojitý + + + + No Brackets + Žádné závorky + + + + ( And ) + ( A ) + + + + { And } + { A } + + + + [ And ] + [ A ] + + + + Note: +Changes do not affect verses already in the service. + Poznámka: +Verše, které jsou už ve službě, nejsou změnami ovlivněny. + + + + Display second Bible verses + Zobrazit druhé verše z Bible + + + + BiblesPlugin.ImportWizardForm + + + Bible Import Wizard + Průvodce importem Bible + + + + This wizard will help you to import Bibles from a variety of formats. Click the next button below to start the process by selecting a format to import from. + Tento průvodce usnadní import Biblí z různých formátů. Proces importu se spustí klepnutím níže na tlačítko další. Potom vyberte formát, ze kterého se bude Bible importovat. + + + + Web Download + Stáhnutí z www + + + + Location: + Umístění: + + + + Crosswalk + + + + + BibleGateway + + + + + Bible: + Bible: + + + + Download Options + Volby stahování + + + + Server: + Server: + + + + Username: + Uživatelské jméno: + + + + Password: + Heslo: + + + + Proxy Server (Optional) + Proxy Server (Volitelné) + + + + License Details + Podrobnosti licence + + + + Set up the Bible's license details. + Nastavit podrobnosti k licenci Bible. + + + + Version name: + Název verze: + + + + Copyright: + Autorská práva: + + + + Please wait while your Bible is imported. + Prosím vyčkejte, než se Bible importuje. + + + + You need to specify a file with books of the Bible to use in the import. + Je potřeba určit soubor s knihami Bible. Tento soubor se použije při importu. + + + + You need to specify a file of Bible verses to import. + K importu je třeba určit soubor s veršemi Bible. + + + + You need to specify a version name for your Bible. + Je nutno uvést název verze Bible. + + + + You need to set a copyright for your Bible. Bibles in the Public Domain need to be marked as such. + K Bibli je potřeba nastavit autorská práva. Bible, které jsou volná díla, je nutno takto označit. + + + + Bible Exists + Bible existuje + + + + This Bible already exists. Please import a different Bible or first delete the existing one. + Tato Bible už existuje. Importujte prosím jinou Bibli nebo nejdříve smažte tu existující. + + + + Your Bible import failed. + CSV soubor + + + + CSV File + Zahajuji registraci Bible... + + + + Starting Registering bible... + Zahajuji registraci Bible... + + + + Registered bible. Please note, that verses will be downloaded on +demand and thus an internet connection is required. + Bible zaregistrována. Vezm?te prosím na v?domí, že verše budou stahovány jak bude pot?eba, což vyžaduje p?ipojení k Internetu. + + + + Bibleserver + Bibleserver + + + + Permissions: + Povolení: + + + + Bible file: + Soubor s Biblí: + + + + Testaments file: + Soubor se zákonem: + + + + Books file: + Soubor s knihami: + + + + Verses file: + Soubor s verši: + + + + You have not specified a testaments file. Do you want to proceed with the import? + Nebyl zadán soubor se zákony. Chcete pokračovat s importem? + + + + openlp.org 1.x Bible Files + Soubory s Biblemi z openlp.org 1.x + + + + BiblesPlugin.MediaItem + + + Quick + Rychlý + + + + Find: + Hledat: + + + + Results: + Výsledky: + + + + Book: + Kniha: + + + + Chapter: + Kapitola: + + + + Verse: + Verš: + + + + From: + Od: + + + + To: + Do: + + + + Text Search + Hledání textu + + + + Clear + Vyprázdnit + + + + Keep + Ponechat + + + + Second: + Druhý: + + + + Scripture Reference + Odkaz do Bible + + + + BiblesPlugin.Opensong + + + Importing %s %s... + Importing <book name> <chapter>... + Importuji %s %s... + + + + BiblesPlugin.OsisImport + + + Detecting encoding (this may take a few minutes)... + Zjištuji kódování (může trvat několik minut)... + + + + Importing %s %s... + Importing <book name> <chapter>... + Importuji %s %s... + + + + CustomPlugin + + + <strong>Custom Plugin</strong><br />The custom plugin provides the ability to set up custom text slides that can be displayed on the screen the same way songs are. This plugin provides greater freedom over the songs plugin. + + + + + CustomPlugin.CustomTab + + + Custom Display + Vlastní zobrazení + + + + Display footer + Patička zobrazení + + + + CustomPlugin.EditCustomForm + + + Edit Custom Slides + Upravit vlastní snímky + + + + &Title: + &Název: + + + + Add a new slide at bottom. + Přidat nový snímek na konec. + + + + Edit the selected slide. + Upravit vybraný snímek. + + + + Edit all the slides at once. + Upravit všechny snímky najednou. + + + + Split Slide + Rozdělit snímek + + + + Split a slide into two by inserting a slide splitter. + Vložením oddělovače se snímek rozdělí na dva. + + + + The&me: + &Motiv: + + + + &Credits: + &Zásluhy: + + + + You need to type in a title. + Je nutno zadat název. + + + + You need to add at least one slide + Je nutno přidat alespoň jeden snímek + + + + Ed&it All + Upra&it vše + + + + CustomsPlugin + + + Import a Custom + Import vlastního + + + + Load a new Custom + Načíst nový vlastní + + + + Add a new Custom + Přidat nový vlastní + + + + Edit the selected Custom + Upravit vybraný vlastní + + + + Delete the selected Custom + Smazat vybraný vlastní + + + + Preview the selected Custom + Náhled vybraného vlastního + + + + Send the selected Custom live + Vybraný vlastní snímek naživo + + + + Add the selected Custom to the service + Přidat vybraný vlastní ke službě + + + + Custom + name singular + Vlastní + + + + Customs + name plural + Více vlastních + + + + Custom + container title + Vlastní + + + + 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 + Načíst nový obrázek + + + + Add a new Image + Přidat nový obrázek + + + + Edit the selected Image + Upravit vybraný obrázek + + + + Delete the selected Image + Smazat vybraný obrázek + + + + Preview the selected Image + Náhled vybraného obrázku + + + + Send the selected Image live + Vybraný obrázek naživo + + + + Add the selected Image to the service + Přidat vybraný obrázek ke službě + + + + Image + name singular + Obrázek + + + + Images + name plural + Obrázky + + + + Images + container title + Obrázky + + + + ImagePlugin.ExceptionDialog + + + Select Attachment + Vybrat přílohu + + + + ImagePlugin.MediaItem + + + Select Image(s) + Vybrat obrázky + + + + You must select an image to delete. + Pro smazání musíte nejdříve vybrat obrázek. + + + + You must select an image to replace the background with. + K nahrazení pozadí musíte nejdříve vybrat obrázek. + + + + Missing Image(s) + Chybějící obrázky + + + + The following image(s) no longer exist: %s + Následující obrázky už neexistují: %s + + + + The following image(s) no longer exist: %s +Do you want to add the other images anyway? + Následující obrázky už neexistují: % +Chcete přidat ostatní obrázky? + + + + There was a problem replacing your background, the image file "%s" no longer exists. + Problém s nahrazením pozadí. Obrázek "%s" už neexistuje. + + + + MediaPlugin + + + <strong>Media Plugin</strong><br />The media plugin provides playback of audio and video. + <strong>Modul média</strong><br />Modul média umožňuje přehrávat audio a video. + + + + Load a new Media + Načíst nové médium + + + + Add a new Media + Přidat nové médium + + + + Edit the selected Media + Upravit vybrané médium + + + + Delete the selected Media + Smazat vybrané médium + + + + Preview the selected Media + Náhled vybraného média + + + + Send the selected Media live + Vybrané médium naživo + + + + Add the selected Media to the service + Přidat vybrané médium ke službě + + + + Media + name singular + Médium + + + + Media + name plural + Médium + + + + Media + container title + Médium + + + + MediaPlugin.MediaItem + + + Select Media + Vybrat médium + + + + You must select a media file to delete. + Ke smazání musíte nejdříve vybrat soubor s médiem. + + + + You must select a media file to replace the background with. + K nahrazení pozadí musíte nejdříve vybrat soubor s médiem. + + + + There was a problem replacing your background, the media file "%s" no longer exists. + Problém s nahrazením pozadí. Soubor s médiem "%s" už neexistuje. + + + + Missing Media File + Chybějící soubory s médii + + + + The file %s no longer exists. + Soubor %s už neexistuje. + + + + Videos (%s);;Audio (%s);;%s (*) + Video (%s);;Audio (%s);;%s (*) + + + + MediaPlugin.MediaTab + + + Media Display + Zobrazení médií + + + + Use Phonon for video playback + Použít Phonon k přehrávání videa + + + + OpenLP + + + Image Files + Soubory s obrázky + + + + OpenLP.AboutForm + + + OpenLP <version><revision> - Open Source Lyrics Projection + +OpenLP is free church presentation software, or lyrics projection software, used to display slides of songs, Bible verses, videos, images, and even presentations (if OpenOffice.org, PowerPoint or PowerPoint Viewer is installed) for church worship using a computer and a data projector. + +Find out more about OpenLP: http://openlp.org/ + +OpenLP is written and maintained by volunteers. If you would like to see more free Christian software being written, please consider contributing by using the button below. + + + + + Credits + Zásluhy + + + + License + Licence + + + + Contribute + Přispět + + + + build %s + sestavení %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. + + + + + Project Lead + %s + +Developers + %s + +Contributors + %s + +Testers + %s + +Packagers + %s + +Translators + Afrikaans (af) + %s + German (de) + %s + English, United Kingdom (en_GB) + %s + English, South Africa (en_ZA) + %s + Estonian (et) + %s + French (fr) + %s + Hungarian (hu) + %s + Japanese (ja) + %s + Norwegian Bokmål (nb) + %s + Dutch (nl) + %s + Portuguese, Brazil (pt_BR) + %s + Russian (ru) + %s + +Documentation + %s + +Built With + Python: http://www.python.org/ + Qt4: http://qt.nokia.com/ + PyQt4: http://www.riverbankcomputing.co.uk/software/pyqt/intro + Oxygen Icons: http://oxygen-icons.org/ + +Final Credit + "For God so loved the world that He gave + His one and only Son, so that whoever + believes in Him will not perish but inherit + eternal life." -- John 3:16 + + And last but not least, final credit goes to + God our Father, for sending His Son to die + on the cross, setting us free from sin. We + bring this software to you for free because + He has set us free. + Vedení projektu + %s + +Vývojáři + %s + +Přispěvatelé + %s + +Testeři + %s + +Balíčkovači + %s + +Překladatelé + Afrikaans (af) + %s + German (de) + %s + English, United Kingdom (en_GB) + %s + English, South Africa (en_ZA) + %s + Estonian (et) + %s + French (fr) + %s + Hungarian (hu) + %s + Japanese (ja) + %s + Norwegian Bokmål (nb) + %s + Dutch (nl) + %s + Portuguese, Brazil (pt_BR) + %s + Russian (ru) + %s + +Dokumentace + %s + +Vytvořeno za použití + Python: http://www.python.org/ + Qt4: http://qt.nokia.com/ + PyQt4: http://www.riverbankcomputing.co.uk/software/pyqt/intro + Oxygen Icons: http://oxygen-icons.org/ + +Finální zásluhy + "Neboť Bůh tak miloval svět, že dal + svého jednorozeného Syna, aby žádný, + kdo v něj věří, nezahynul, ale měl věčný + život." -- Jan 3:16 + + V neposlední řadě, konečné zásluhy patří + Bohu, našemu Otci, že poslal Svého Syna + zemřít na kříži, osvobodit nás od hříchu. + Přinášíme tuto aplikaci zdarma, protože + On nás učinil svobodnými. + + + + Copyright © 2004-2011 Raoul Snyman +Portions copyright © 2004-2011 Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri, +Meinert Jordan, Andreas Preikschat, Christian Richter, Philip +Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carsten +Tinggaard, Frode Woldsund + + + + + OpenLP.AdvancedTab + + + UI Settings + + + + + Number of recent files to display: + + + + + Remember active media manager tab on startup + + + + + Double-click to send items straight to live + + + + + Expand new service items on creation + + + + + Enable application exit confirmation + + + + + Mouse Cursor + + + + + Hide mouse cursor when over display window + + + + + Default Image + + + + + Background color: + Barva pozadí: + + + + Image file: + + + + + Open File + + + + + OpenLP.DisplayTagDialog + + + Edit Selection + + + + + Update + + + + + Description + + + + + Tag + + + + + Start tag + + + + + End tag + + + + + Default + + + + + Tag Id + + + + + Start HTML + + + + + End HTML + + + + + OpenLP.DisplayTagTab + + + Update Error + + + + + Tag "n" already defined. + + + + + Tag %s already defined. + + + + + OpenLP.ExceptionDialog + + + Error Occurred + + + + + Oops! OpenLP hit a problem, and couldn't recover. The text in the box below contains information that might be helpful to the OpenLP developers, so please e-mail it to bugs@openlp.org, along with a detailed description of what you were doing when the problem occurred. + + + + + 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 + + + + + OpenLP.ExceptionForm + + + Platform: %s + + + + + + Save Crash Report + + + + + Text files (*.txt *.log *.text) + + + + + **OpenLP Bug Report** +Version: %s + +--- Details of the Exception. --- + +%s + + --- Exception Traceback --- +%s +--- System information --- +%s +--- Library Versions --- +%s + + + + + + *OpenLP Bug Report* +Version: %s + +--- Details of the Exception. --- + +%s + + --- Exception Traceback --- +%s +--- System information --- +%s +--- Library Versions --- +%s + + Please add the information that bug reports are favoured written in English. + + + + + OpenLP.FileRenameForm + + + File Rename + + + + + New File Name: + + + + + File Copy + + + + + OpenLP.FirstTimeLanguageForm + + + Select Translation + + + + + Choose the translation you'd like to use in OpenLP. + + + + + Translation: + + + + + OpenLP.FirstTimeWizard + + + Songs + + + + + First Time Wizard + + + + + Welcome to the First Time Wizard + + + + + Activate required Plugins + + + + + Select the Plugins you wish to use. + + + + + Custom Text + + + + + Bible + Bible + + + + Images + Obrázky + + + + Presentations + + + + + Media (Audio and Video) + + + + + Allow remote access + + + + + Monitor Song Usage + + + + + Allow Alerts + + + + + Default Settings + + + + + Downloading %s... + + + + + Download complete. Click the finish button to start OpenLP. + + + + + Enabling selected plugins... + + + + + 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. + + + + + No Internet Connection + + + + + Unable to detect an Internet connection. + + + + + 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. + +To 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. + +To cancel the First Time Wizard completely, press the finish button now. + + + + + Sample Songs + + + + + Select and download public domain songs. + + + + + Sample Bibles + + + + + Select and download free Bibles. + + + + + Sample Themes + + + + + Select and download sample themes. + + + + + Set up default settings to be used by OpenLP. + + + + + Setting Up And Importing + + + + + Please wait while OpenLP is set up and your data is imported. + + + + + Default output display: + + + + + Select default theme: + + + + + Starting configuration process... + + + + + OpenLP.GeneralTab + + + General + + + + + Monitors + + + + + Select monitor for output display: + + + + + Display if a single screen + + + + + Application Startup + + + + + Show blank screen warning + + + + + Automatically open the last service + + + + + Show the splash screen + + + + + Application Settings + + + + + Prompt to save before starting a new service + + + + + Automatically preview next item in service + + + + + Slide loop delay: + + + + + sec + + + + + CCLI Details + + + + + SongSelect username: + + + + + SongSelect password: + + + + + Display Position + + + + + X + + + + + Y + + + + + Height + + + + + Width + + + + + Override display position + + + + + Check for updates to OpenLP + + + + + OpenLP.LanguageManager + + + Language + + + + + Please restart OpenLP to use your new language setting. + + + + + OpenLP.MainDisplay + + + OpenLP Display + + + + + OpenLP.MainWindow + + + &File + + + + + &Import + + + + + &Export + + + + + &View + + + + + M&ode + + + + + &Tools + + + + + &Settings + + + + + &Language + + + + + &Help + + + + + Media Manager + + + + + Service Manager + + + + + Theme Manager + + + + + &New + &Nový + + + + Ctrl+N + + + + + &Open + + + + + Open an existing service. + + + + + Ctrl+O + + + + + &Save + &Uložit + + + + Save the current service to disk. + + + + + Ctrl+S + + + + + Save &As... + + + + + Save Service As + + + + + Save the current service under a new name. + + + + + Ctrl+Shift+S + + + + + E&xit + + + + + Quit OpenLP + + + + + Alt+F4 + + + + + &Theme + + + + + &Configure OpenLP... + + + + + &Media Manager + + + + + Toggle Media Manager + + + + + Toggle the visibility of the media manager. + + + + + F8 + + + + + &Theme Manager + + + + + Toggle Theme Manager + + + + + Toggle the visibility of the theme manager. + + + + + F10 + + + + + &Service Manager + + + + + Toggle Service Manager + + + + + Toggle the visibility of the service manager. + + + + + F9 + + + + + &Preview Panel + + + + + Toggle Preview Panel + + + + + Toggle the visibility of the preview panel. + + + + + F11 + + + + + &Live Panel + + + + + Toggle Live Panel + + + + + Toggle the visibility of the live panel. + + + + + F12 + + + + + &Plugin List + + + + + List the Plugins + + + + + Alt+F7 + + + + + &User Guide + + + + + &About + + + + + More information about OpenLP + + + + + Ctrl+F1 + + + + + &Online Help + + + + + &Web Site + + + + + Use the system language, if available. + + + + + Set the interface language to %s + + + + + Add &Tool... + + + + + Add an application to the list of tools. + + + + + &Default + + + + + Set the view mode back to the default. + + + + + &Setup + + + + + Set the view mode to Setup. + + + + + &Live + + + + + Set the view mode to Live. + + + + + Version %s of OpenLP is now available for download (you are currently running version %s). + +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 + + + + + English + Please add the name of your language here + + + + + Configure &Shortcuts... + + + + + Close OpenLP + + + + + Are you sure you want to close OpenLP? + + + + + Print the current Service Order. + + + + + Ctrl+P + + + + + &Configure Display Tags + + + + + Open &Data Folder... + + + + + Open the folder where songs, bibles and other data resides. + + + + + &Autodetect + + + + + OpenLP.MediaManagerItem + + + No Items Selected + + + + + &Add to selected Service Item + + + + + You must select one or more items to preview. + + + + + You must select one or more items to send live. + + + + + You must select one or more items. + + + + + You must select an existing service item to add to. + + + + + Invalid Service Item + + + + + You must select a %s service item. + + + + + OpenLP.PluginForm + + + Plugin List + + + + + Plugin Details + + + + + Status: + + + + + Active + + + + + Inactive + + + + + %s (Inactive) + + + + + %s (Active) + + + + + %s (Disabled) + + + + + OpenLP.PrintServiceDialog + + + Fit Page + + + + + Fit Width + + + + + OpenLP.PrintServiceForm + + + 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 + + + + + OpenLP.ScreenList + + + Screen + + + + + primary + + + + + OpenLP.ServiceItemEditForm + + + Reorder Service Item + + + + + OpenLP.ServiceManager + + + Load an existing service + + + + + Save this service + + + + + Select a theme for the service + + + + + Move to &top + + + + + Move item to the top of the service. + + + + + Move &up + + + + + Move item up one position in the service. + + + + + Move &down + + + + + Move item down one position in the service. + + + + + Move to &bottom + + + + + Move item to the end of the service. + + + + + &Delete From Service + + + + + Delete the selected item from the service. + + + + + &Add New Item + + + + + &Add to Selected Item + + + + + &Edit Item + + + + + &Reorder Item + + + + + &Notes + + + + + &Change Item Theme + + + + + OpenLP Service Files (*.osz) + + + + + 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 + + + + + &Expand all + + + + + Expand all the service items. + + + + + &Collapse all + + + + + Collapse all the service items. + + + + + Open File + + + + + Notes: + + + + + Moves the selection down the window. + + + + + Move up + + + + + Moves the selection up the window. + + + + + Go Live + + + + + Send the selected item to Live. + + + + + &Start Time + + + + + Show &Preview + + + + + Show &Live + + + + + Modified Service + + + + + The current service has been modified. Would you like to save this service? + + + + + OpenLP.ServiceNoteForm + + + Service Item Notes + + + + + OpenLP.SettingsForm + + + Configure OpenLP + + + + + OpenLP.ShortcutListDialog + + + Customize Shortcuts + + + + + Action + + + + + Shortcut + + + + + Default: %s + + + + + Custom: + + + + + None + + + + + Duplicate Shortcut + + + + + The shortcut "%s" is already assigned to another action, please use a different shortcut. + + + + + Alternate + + + + + OpenLP.SlideController + + + Move to previous + + + + + Move to next + + + + + Hide + + + + + Move to live + + + + + Edit and reload song preview + + + + + Start continuous loop + + + + + Stop continuous loop + + + + + Delay between slides in seconds + + + + + Start playing media + + + + + Go To + + + + + Blank Screen + + + + + Blank to Theme + + + + + Show Desktop + + + + + Previous Slide + + + + + Next Slide + + + + + Previous Service + + + + + Next Service + + + + + Escape Item + + + + + OpenLP.SpellTextEdit + + + Spelling Suggestions + + + + + Formatting Tags + + + + + OpenLP.StartTimeForm + + + Item Start Time + + + + + Hours: + + + + + h + + + + + m + + + + + Minutes: + + + + + Seconds: + + + + + OpenLP.ThemeForm + + + Select Image + + + + + Theme Name Missing + + + + + There is no name for this theme. Please enter one. + + + + + Theme Name Invalid + + + + + Invalid theme name. Please enter one. + + + + + (%d lines per slide) + + + + + OpenLP.ThemeManager + + + Create a new theme. + + + + + Edit Theme + + + + + Edit a theme. + + + + + Delete Theme + + + + + Delete a theme. + + + + + Import Theme + + + + + Import a theme. + + + + + Export Theme + + + + + Export a theme. + + + + + &Edit Theme + + + + + &Delete Theme + + + + + Set As &Global Default + + + + + %s (default) + + + + + You must select a theme to edit. + + + + + You are unable to delete the default theme. + + + + + Theme %s is used in the %s plugin. + + + + + 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. + + + + + &Copy Theme + + + + + &Rename Theme + + + + + &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) + + + + + OpenLP.ThemeWizard + + + Theme Wizard + + + + + Welcome to the Theme Wizard + + + + + Set Up Background + + + + + Set up your theme's background according to the parameters below. + + + + + Background type: + + + + + Solid Color + + + + + Gradient + + + + + Color: + + + + + Gradient: + + + + + Horizontal + + + + + Vertical + + + + + Circular + + + + + Top Left - Bottom Right + + + + + Bottom Left - Top Right + + + + + Main Area Font Details + + + + + Define the font and display characteristics for the Display text + + + + + Font: + + + + + Size: + + + + + Line Spacing: + + + + + &Outline: + + + + + &Shadow: + + + + + Bold + + + + + Italic + + + + + Footer Area Font Details + + + + + Define the font and display characteristics for the Footer text + + + + + Text Formatting Details + + + + + Allows additional display formatting information to be defined + + + + + Horizontal Align: + + + + + Left + + + + + Right + + + + + Center + + + + + Output Area Locations + + + + + Allows you to change and move the main and footer areas. + + + + + &Main Area + + + + + &Use default location + + + + + X position: + + + + + px + + + + + Y position: + + + + + Width: + + + + + Height: + + + + + Use default location + + + + + Save and Preview + + + + + View the theme and save it replacing the current one or change the name to create a new theme + + + + + Theme name: + + + + + Edit Theme - %s + + + + + 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 + + + + + OpenLP.ThemesTab + + + Global Theme + + + + + Theme Level + + + + + S&ong Level + + + + + Use the theme from each song in the database. If a song doesn't have a theme associated with it, then use the service's theme. If the service doesn't have a theme, then use the global theme. + + + + + &Service Level + + + + + Use the theme from the service, overriding any of the individual songs' themes. If the service doesn't have a theme, then use the global theme. + + + + + &Global Level + + + + + Use the global theme, overriding any themes associated with either the service or the songs. + + + + + OpenLP.Ui + + + Error + + + + + About + + + + + &Add + + + + + Advanced + + + + + All Files + + + + + Bottom + + + + + Browse... + + + + + Cancel + + + + + CCLI number: + + + + + Create a new service. + + + + + &Delete + + + + + &Edit + + + + + Empty Field + + + + + Export + + + + + pt + Abbreviated font pointsize unit + + + + + Image + Obrázek + + + + Import + + + + + Length %s + + + + + Live + + + + + Live Background Error + + + + + Live Panel + + + + + Load + + + + + Middle + + + + + New + + + + + New Service + + + + + New Theme + + + + + No File Selected + Singular + + + + + No Files Selected + Plural + + + + + No Item Selected + Singular + + + + + No Items Selected + Plural + + + + + openlp.org 1.x + + + + + OpenLP 2.0 + + + + + Open Service + + + + + Preview + + + + + Preview Panel + + + + + Print Service Order + + + + + Replace Background + + + + + Replace Live Background + + + + + Reset Background + + + + + Reset Live Background + + + + + s + The abbreviated unit for seconds + + + + + Save && Preview + + + + + Search + + + + + You must select an item to delete. + + + + + You must select an item to edit. + + + + + Save Service + + + + + Service + + + + + Start %s + + + + + Theme + Singular + + + + + Themes + Plural + + + + + Top + + + + + Version + + + + + Delete the selected item. + + + + + Move selection up one position. + + + + + Move selection down one position. + + + + + &Vertical Align: + + + + + Finished import. + + + + + Format: + + + + + Importing + + + + + Importing "%s"... + + + + + Select Import Source + + + + + Select the import format and the location to import from. + + + + + The openlp.org 1.x importer has been disabled due to a missing Python module. If you want to use this importer, you will need to install the "python-sqlite" module. + + + + + Open %s File + + + + + %p% + + + + + Ready. + + + + + Starting import... + + + + + You need to specify at least one %s file to import from. + A file type e.g. OpenSong + + + + + Welcome to the Bible Import Wizard + + + + + Welcome to the Song Export Wizard + + + + + Welcome to the Song Import Wizard + + + + + Author + Singular + + + + + Authors + Plural + + + + + © + Copyright symbol. + + + + + Song Book + Singular + + + + + Song Books + Plural + + + + + Song Maintenance + + + + + Topic + Singular + + + + + Topics + Plural + + + + + OpenLP.displayTagDialog + + + Configure Display Tags + + + + + PresentationPlugin + + + <strong>Presentation Plugin</strong><br />The presentation plugin provides the ability to show presentations using a number of different programs. The choice of available presentation programs is available to the user in a drop down box. + + + + + Load a new Presentation + + + + + Delete the selected Presentation + + + + + Preview the selected Presentation + + + + + Send the selected Presentation live + + + + + Add the selected Presentation to the service + + + + + Presentation + name singular + + + + + Presentations + name plural + + + + + Presentations + container title + + + + + PresentationPlugin.MediaItem + + + Select Presentation(s) + + + + + Automatic + + + + + Present using: + + + + + File Exists + + + + + A presentation with that filename already exists. + + + + + Unsupported File + + + + + This type of presentation is not supported. + + + + + Presentations (%s) + + + + + Missing Presentation + + + + + The Presentation %s no longer exists. + + + + + The Presentation %s is incomplete, please reload. + + + + + PresentationPlugin.PresentationTab + + + Available Controllers + + + + + Allow presentation application to be overriden + + + + + %s (unavailable) + + + + + RemotePlugin + + + <strong>Remote Plugin</strong><br />The remote plugin provides the ability to send messages to a running version of OpenLP on a different computer via a web browser or through the remote API. + + + + + Remote + name singular + + + + + Remotes + name plural + + + + + Remote + container title + + + + + RemotePlugin.RemoteTab + + + Serve on IP address: + + + + + Port number: + + + + + Server Settings + + + + + SongUsagePlugin + + + &Song Usage Tracking + + + + + &Delete Tracking Data + + + + + Delete song usage data up to a specified date. + + + + + &Extract Tracking Data + + + + + Generate a report on song usage. + + + + + Toggle Tracking + + + + + Toggle the tracking of song usage. + + + + + <strong>SongUsage Plugin</strong><br />This plugin tracks the usage of songs in services. + + + + + SongUsage + name singular + + + + + SongUsage + name plural + + + + + SongUsage + container title + + + + + SongUsagePlugin.SongUsageDeleteForm + + + Delete Song Usage Data + + + + + Delete Selected Song Usage Events? + + + + + Are you sure you want to delete selected Song Usage data? + + + + + Deletion Successful + + + + + All requested data has been deleted successfully. + + + + + SongUsagePlugin.SongUsageDetailForm + + + Song Usage Extraction + + + + + Select Date Range + + + + + to + + + + + Report Location + + + + + Output File Location + + + + + usage_detail_%s_%s.txt + + + + + Report Creation + + + + + Report +%s +has been successfully created. + + + + + Output Path Not Selected + + + + + You have not set a valid output location for your song usage report. Please select an existing path on your computer. + + + + + 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 + + + + + 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. + + + + + Song + name singular + + + + + Songs + name plural + + + + + Songs + container title + + + + + Exports songs using the export wizard. + + + + + SongsPlugin.AuthorsForm + + + Author Maintenance + + + + + Display name: + + + + + First name: + + + + + Last name: + + + + + You need to type in the first name of the author. + + + + + You need to type in the last name of the author. + + + + + You have not set a display name for the author, combine the first and last names? + + + + + SongsPlugin.CCLIFileImport + + + Importing song %d of %d + + + + + SongsPlugin.EditSongForm + + + Song Editor + + + + + &Title: + &Název: + + + + Alt&ernate title: + + + + + &Lyrics: + + + + + &Verse order: + + + + + Ed&it All + Upra&it vše + + + + Title && Lyrics + + + + + &Add to Song + + + + + &Remove + + + + + &Manage Authors, Topics, Song Books + + + + + A&dd to Song + + + + + R&emove + + + + + Book: + Kniha: + + + + Number: + + + + + Authors, Topics && Song Book + + + + + New &Theme + + + + + Copyright Information + + + + + Comments + + + + + Theme, Copyright Info && Comments + + + + + Add Author + + + + + This author does not exist, do you want to add them? + + + + + This author is already in the list. + + + + + You have not selected a valid author. Either select an author from the list, or type in a new author and click the "Add Author to Song" button to add the new author. + + + + + Add Topic + + + + + This topic does not exist, do you want to add it? + + + + + This topic is already in the list. + + + + + You have not selected a valid topic. Either select a topic from the list, or type in a new topic and click the "Add Topic to Song" button to add the new topic. + + + + + You need to type in a song title. + + + + + You need to type in at least one verse. + + + + + Warning + + + + + The verse order is invalid. There is no verse corresponding to %s. Valid entries are %s. + + + + + You have not used %s anywhere in the verse order. Are you sure you want to save the song like this? + + + + + Add Book + + + + + This song book does not exist, do you want to add it? + + + + + You need to have an author for this song. + + + + + You need to type some text in to the verse. + + + + + SongsPlugin.EditVerseForm + + + Edit Verse + + + + + &Verse type: + + + + + &Insert + + + + + SongsPlugin.ExportWizardForm + + + Song Export Wizard + + + + + This wizard will help to export your songs to the open and free OpenLyrics worship song format. + + + + + Select Songs + + + + + Check the songs you want to export. + + + + + 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... + + + + + You need to specify a directory. + + + + + Select Destination Folder + + + + + SongsPlugin.ImportWizardForm + + + Select Document/Presentation Files + + + + + Song Import Wizard + + + + + 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. + + + + + Generic Document/Presentation + + + + + Filename: + + + + + The OpenLyrics importer has not yet been developed, but as you can see, we are still intending to do so. Hopefully it will be in the next release. + + + + + Add Files... + + + + + Remove File(s) + + + + + The Songs of Fellowship importer has been disabled because OpenLP cannot find OpenOffice.org on your computer. + + + + + The generic document/presentation importer has been disabled because OpenLP cannot find OpenOffice.org on your computer. + + + + + Please wait while your songs are imported. + + + + + Administered by %s + + + + + OpenLP 2.0 Databases + + + + + openlp.org v1.x Databases + + + + + Words Of Worship Song Files + + + + + You need to specify at least one document or presentation file to import from. + + + + + Songs Of Fellowship Song Files + + + + + SongBeamer Files + + + + + SongShow Plus Song Files + + + + + Foilpresenter Song Files + + + + + SongsPlugin.MediaItem + + + Maintain the lists of authors, topics and books + + + + + Titles + + + + + Lyrics + + + + + Delete Song(s)? + + + + + CCLI License: + + + + + Entire Song + + + + + Are you sure you want to delete the %n selected song(s)? + + + + + + + + + SongsPlugin.OpenLPSongImport + + + Importing song %d of %d. + + + + + SongsPlugin.OpenLyricsExport + + + Exporting "%s"... + + + + + SongsPlugin.SongBookForm + + + Song Book Maintenance + + + + + &Name: + + + + + &Publisher: + + + + + You need to type in a name for the book. + + + + + SongsPlugin.SongExportForm + + + Finished export. + + + + + Your song export failed. + + + + + SongsPlugin.SongImport + + + copyright + + + + + SongsPlugin.SongImportForm + + + Your song import failed. + + + + + SongsPlugin.SongMaintenanceForm + + + Could not add your author. + + + + + This author already exists. + + + + + Could not add your topic. + + + + + This topic already exists. + + + + + Could not add your book. + + + + + This book already exists. + + + + + Could not save your changes. + + + + + Could not save your modified author, because the author already exists. + + + + + Could not save your modified topic, because it already exists. + + + + + Delete Author + + + + + Are you sure you want to delete the selected author? + + + + + This author cannot be deleted, they are currently assigned to at least one song. + + + + + Delete Topic + + + + + Are you sure you want to delete the selected topic? + + + + + This topic cannot be deleted, it is currently assigned to at least one song. + + + + + Delete Book + + + + + Are you sure you want to delete the selected book? + + + + + This book cannot be deleted, it is currently assigned to at least one song. + + + + + 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? + + + + + SongsPlugin.SongsTab + + + Songs Mode + + + + + Enable search as you type + + + + + Display verses on live tool bar + + + + + Update service from song edit + + + + + Add missing songs when opening service + + + + + SongsPlugin.TopicsForm + + + Topic Maintenance + + + + + Topic name: + + + + + You need to type in a topic name. + + + + + SongsPlugin.VerseType + + + Verse + + + + + Chorus + + + + + Bridge + + + + + Pre-Chorus + + + + + Intro + + + + + Ending + + + + + Other + + + + diff --git a/resources/i18n/de.ts b/resources/i18n/de.ts index 01bcf69a4..8f9d65468 100644 --- a/resources/i18n/de.ts +++ b/resources/i18n/de.ts @@ -103,7 +103,7 @@ Möchten Sie trotzdem fortfahren? You haven't specified any text for your alert. Please type in some text before clicking New. - Der Hinweis enthält noch keinen Text. Bitte geben Sie einen Text an, bevor Sie auf Neu klicken. + Der Hinweis enthält noch keinen Text. Bitte geben Sie einen Text an, bevor Sie auf »Neu« klicken. @@ -214,7 +214,7 @@ Möchten Sie trotzdem fortfahren? You cannot combine single and dual Bible verse search results. Do you want to delete your search results and start a new search? - Es ist nicht möglich Einzel- und Zweifach Bibelvers Suchergegnisse zu kombinieren. Sollen die Suchergebnisse gelöscht und eine neue Suche gestart werden? + Es ist nicht möglich Einzel- und Zweifach Bibelvers Suchergebnisse zu kombinieren. Sollen die Suchergebnisse gelöscht und eine neue Suche gestartet werden? @@ -320,7 +320,7 @@ Um nach mehreren Begriffen gleichzeitig zu suchen, müssen die Begriffe durch ei There are no Bibles currently installed. Please use the Import Wizard to install one or more Bibles. - Zur Zeit sind keine Bibelübersetzungen installiert. Zur Suche muss eine solche mit dem Importassistent importiert werden. + Zurzeit sind keine Bibelübersetzungen installiert. Zur Suche muss eine solche mit dem Importassistent importiert werden. @@ -332,7 +332,7 @@ Book Chapter:Verse-Verse Book Chapter:Verse-Verse,Verse-Verse Book Chapter:Verse-Verse,Chapter:Verse-Verse Book Chapter:Verse-Chapter:Verse - Ihre Bibelstelle ist entwerder nicht von OpenLP unterstützt oder sie ist ungültig. Bitte überprüfen Sie, dass Ihre Bibelstelle ein der folgenden Muster entspricht: + Ihre Bibelstelle ist entweder nicht von OpenLP unterstützt oder sie ist ungültig. Bitte überprüfen Sie, dass Ihre Bibelstelle ein der folgenden Muster entspricht: Buch Kapitel Buch Kapitel-Kapitel @@ -413,8 +413,8 @@ Buch Kapitel:Verse-Kapitel:Verse Note: Changes do not affect verses already in the service. - Anmerkung: -Änderungen beeinflussen keine Verse, welche bereits im Veranstaltungplan sind. + Anmerkung: +Änderungen beeinflussen keine Verse, welche bereits im Ablauf vorhanden sind. @@ -462,7 +462,7 @@ Changes do not affect verses already in the service. Download Options - Download Optionen + Download-Optionen @@ -565,7 +565,7 @@ Daher ist eine Verbindung zum Internet erforderlich. CSV File - CSV Datei + CSV-Datei @@ -939,7 +939,7 @@ Daher ist eine Verbindung zum Internet erforderlich. The following image(s) no longer exist: %s Do you want to add the other images anyway? - Auf die folgenden Bilder kann nicht mehr zugegriffen werden: %s. + Auf die folgenden Bilder kann nicht mehr zugegriffen werden: %s Wollen Sie die anderen Bilder trotzdem hinzufügen? @@ -1079,13 +1079,13 @@ 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 ist eine freie Kirchen- oder Liedtext-Präsentationssoftware, mit der Liedtexte, Bibeltexte, Videos, Bilder sowie auch PowerPoint bzw. Impress Präsentationen (falls diese Programme installiert sind) von einem Computer aus auf einem Beamer angezeigt werden können. 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. +OpenLP wird von freiwilligen 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. @@ -1390,7 +1390,7 @@ Tinggaard, Frode Woldsund Tag %s already defined. - Tag %s bereits definiert. + Tag »%s« bereits definiert. @@ -1398,8 +1398,8 @@ Tinggaard, Frode Woldsund Oops! OpenLP hit a problem, and couldn't recover. The text in the box below contains information that might be helpful to the OpenLP developers, so please e-mail it to bugs@openlp.org, along with a detailed description of what you were doing when the problem occurred. - Ups! OpenLP hat ein Problem und kann es nicht beheben. Der Text im unteren Fenster enthält Informationen, welche möglicherweise hilfreich für die OpenLP Entwickler sind. -Bitte senden Sie eine E-Mail an: bugs@openlp.org mit einer auführlichen Beschreibung was Sie taten als das Problem auftrat. + Ups! OpenLP hat ein Problem und kann es nicht beheben. Der Text im unteren Fenster enthält Informationen, welche möglicherweise hilfreich für die OpenLP Entwickler sind. +Bitte senden Sie eine E-Mail an: bugs@openlp.org mit einer ausführlichen Beschreibung was Sie taten als das Problem auftrat. @@ -1420,8 +1420,8 @@ Bitte senden Sie eine E-Mail an: bugs@openlp.org mit einer auführlichen Beschre Please enter a description of what you were doing to cause this error (Minimum 20 characters) - Bitte geben Sie ein Beschreibung ein, was Sie gemacht haben, als -dieser Fehler auftrat (mindestens 20 Zeichen). Bitte verwenden Sie Englisch. + Bitte geben Sie ein Beschreibung ein, was Sie gemacht haben, als +dieser Fehler auftrat (mindestens 20 Zeichen). Bitte verwenden Sie (wenn möglich) Englisch. @@ -1556,175 +1556,175 @@ Version: %s OpenLP.FirstTimeWizard - + Downloading %s... %s wird heruntergeladen... - + Download complete. Click the finish button to start OpenLP. Download vollständig. Klicken Sie »Fertig« um OpenLP zu starten. - + Enabling selected plugins... Aktiviere ausgewählte Erweiterungen... - + First Time Wizard Einrichtungsassistent - + Welcome to the First Time Wizard Herzlich willkommen zum Einrichtungsassistent - + 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. Dieser Assistent wird Ihnen helfen OpenLP für die erste Benutzung zu konfigurieren. Klicken sie »Weiter« um den Assistenten zu starten. - + Activate required Plugins Erweiterungen aktivieren - + Select the Plugins you wish to use. Wählen Sie die Erweiterungen aus, die Sie nutzen wollen. - + Songs Lieder - + Custom Text Sonderfolien - + Bible Bibel - + Images Bilder - + Presentations Präsentationen - + Media (Audio and Video) Medien (Audio und Video) - + Allow remote access Erlaube Fernsteuerung - + Monitor Song Usage Lieder Benutzung Protokollierung - + Allow Alerts Erlaube Hinweise - + No Internet Connection Keine Internetverbindung - + Unable to detect an Internet connection. Es könnte keine Internetverbindung aufgebaut werden. - + 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. To 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. To cancel the First Time Wizard completely, press the finish button now. - Es konnte keine Internetverbindung aufgebaut werden. Der Einrichtungsassistent benötigt eine Internetverbindung um Lieder, Bibeln und Design runter zuladen. + Es konnte keine Internetverbindung aufgebaut werden. Der Einrichtungsassistent benötigt eine Internetverbindung um Lieder, Bibeln und Design herunter zu laden. Um den Einrichtungsassistent später erneut zu starten und diese Beispieldaten zu importieren, drücken Sie »Abbrechen«, überprüfen Sie Ihre Internetverbindung und starten Sie OpenLP erneut. Um den Einrichtungsassistent nicht auszuführen, drücken Sie »Fertig«. - + Sample Songs Beispiellieder - + Select and download public domain songs. - Wählen und laden Sie Public Domain Lieder runter. + Wählen und laden Sie Gemeinfreie (bzw. kostenlose) Lieder herunter. - + Sample Bibles Beispielbibeln - + Select and download free Bibles. Wählen und laden Sie freie Bibeln runter. - + Sample Themes Beispieldesigns - + Select and download sample themes. Wählen und laden Sie Beispieldesigns runter. - + Default Settings Standardeinstellungen - + Set up default settings to be used by OpenLP. Grundeinstellungen konfigurieren... - + Setting Up And Importing Konfiguriere und importiere - + Please wait while OpenLP is set up and your data is imported. Bitte warten Sie, während OpenLP eingerichtet wird. - + Default output display: Projektionsbildschirm: - + Select default theme: Standarddesign: - + Starting configuration process... Starte Konfiguration... @@ -1804,12 +1804,12 @@ Um den Einrichtungsassistent nicht auszuführen, drücken Sie »Fertig«. SongSelect username: - SongSelect Benutzername: + SongSelect-Benutzername: SongSelect password: - SongSelect Passwort: + SongSelect-Passwort: @@ -1850,12 +1850,12 @@ Um den Einrichtungsassistent nicht auszuführen, drücken Sie »Fertig«. OpenLP.LanguageManager - + Language Sprache - + Please restart OpenLP to use your new language setting. Bitte starten Sie OpenLP neu, um die neue Spracheinstellung zu verwenden. @@ -1865,373 +1865,373 @@ Um den Einrichtungsassistent nicht auszuführen, drücken Sie »Fertig«. OpenLP Display - OpenLP Anzeige + OpenLP-Anzeige OpenLP.MainWindow - + &File &Datei - + &Import &Importieren - + &Export &Exportieren - + &View &Ansicht - + M&ode An&sichtsmodus - + &Tools E&xtras - + &Settings &Einstellungen - + &Language &Sprache - + &Help &Hilfe - + Media Manager Medienverwaltung - + Service Manager Ablaufverwaltung - + Theme Manager Designverwaltung - + &New &Neu - + Ctrl+N Strg+N - + &Open Ö&ffnen - + Open an existing service. Einen vorhandenen Ablauf öffnen. - + Ctrl+O Strg+O - + &Save &Speichern - + Save the current service to disk. Den aktuellen Ablauf speichern. - + Ctrl+S Strg+S - + Save &As... Speichern &unter... - + Save Service As Den aktuellen Ablauf unter einem neuen Namen speichern - + Save the current service under a new name. Den aktuellen Ablauf unter einem neuen Namen speichern. - + Ctrl+Shift+S Strg+Umschalt+S - + E&xit &Beenden - + Quit OpenLP OpenLP beenden - + Alt+F4 Alt+F4 - + &Theme &Design - + &Configure OpenLP... &Einstellungen... - + &Media Manager &Medienverwaltung - + Toggle Media Manager Die Medienverwaltung ein- bzw. ausblenden - + Toggle the visibility of the media manager. Die Medienverwaltung ein- bzw. ausblenden. - + F8 F8 - + &Theme Manager &Designverwaltung - + Toggle Theme Manager Die Designverwaltung ein- bzw. ausblenden - + Toggle the visibility of the theme manager. Die Designverwaltung ein- bzw. ausblenden. - + F10 F10 - + &Service Manager &Ablaufverwaltung - + Toggle Service Manager Die Ablaufverwaltung ein- bzw. ausblenden - + Toggle the visibility of the service manager. Die Ablaufverwaltung ein- bzw. ausblenden. - + F9 F9 - + &Preview Panel - &Vorschau Ansicht + &Vorschau-Ansicht - + Toggle Preview Panel Die Vorschau ein- bzw. ausblenden - + Toggle the visibility of the preview panel. Die Vorschau ein- bzw. ausschalten. - + F11 F11 - + &Live Panel - &Live Ansicht + &Live-Ansicht - + Toggle Live Panel Die Live Ansicht ein- bzw. ausschalten - + Toggle the visibility of the live panel. Die Live Ansicht ein- bzw. ausschalten. - + F12 F12 - + &Plugin List Er&weiterungen... - + List the Plugins Erweiterungen verwalten - + Alt+F7 Alt+F7 - + &User Guide Benutzer&handbuch - + &About &Info über OpenLP - + More information about OpenLP Mehr Informationen über OpenLP - + Ctrl+F1 Strg+F1 - + &Online Help &Online Hilfe - + &Web Site &Webseite - + Use the system language, if available. Die Systemsprache, sofern diese verfügbar ist, verwenden. - + Set the interface language to %s Die Sprache von OpenLP auf %s stellen - + Add &Tool... Hilfsprogramm hin&zufügen... - + Add an application to the list of tools. Eine Anwendung zur Liste der Hilfsprogramme hinzufügen. - + &Default &Standard - + Set the view mode back to the default. Den Ansichtsmodus auf Standardeinstellung setzen. - + &Setup &Einrichten - + Set the view mode to Setup. Die Ansicht für die Ablauferstellung optimieren. - + &Live &Live - + Set the view mode to Live. Die Ansicht für den Live-Betrieb optimieren. - + OpenLP Version Updated Neue OpenLP Version verfügbar - + OpenLP Main Display Blanked Hauptbildschirm abgedunkelt - + The Main Display has been blanked out Die Projektion ist momentan nicht aktiv. - + Default Theme: %s Standarddesign: %s - + Version %s of OpenLP is now available for download (you are currently running version %s). You can download the latest version from http://openlp.org/. @@ -2246,47 +2246,47 @@ Sie können die letzte Version auf http://openlp.org abrufen. Deutsch - + Configure &Shortcuts... &Tastenkürzel einrichten... - + Close OpenLP OpenLP beenden - + Are you sure you want to close OpenLP? Sind Sie sicher, dass OpenLP beendet werden soll? - + Print the current Service Order. Drucke den aktuellen Ablauf. - + Ctrl+P Strg+P - + Open &Data Folder... Öffne &Datenverzeichnis... - + Open the folder where songs, bibles and other data resides. Öffne das Verzeichnis, wo Lieder, Bibeln und andere Daten gespeichert sind. - + &Configure Display Tags &Formatvorlagen - + &Autodetect &Automatisch @@ -2420,7 +2420,7 @@ Sie können die letzte Version auf http://openlp.org abrufen. Zoom Out - Wegzoomen + Wegzoomen @@ -2740,7 +2740,7 @@ Der Inhalt ist nicht in UTF-8 kodiert. The shortcut "%s" is already assigned to another action, please use a different shortcut. - Das Tastenkürzel »%s« ist bereitz einer anderen Aktion zugeordnet. Bitte wählen Sie ein anderes Tastenkürzel. + Das Tastenkürzel »%s« ist bereits einer anderen Aktion zugeordnet. Bitte wählen Sie ein anderes Tastenkürzel. @@ -2798,7 +2798,7 @@ Der Inhalt ist nicht in UTF-8 kodiert. Edit and reload song preview - Bearbeiten und Liedvorschau aktualisieren + Bearbeiten und Vorschau aktualisieren @@ -2851,7 +2851,7 @@ Der Inhalt ist nicht in UTF-8 kodiert. Formatting Tags - Formatkürzel + Formatvorlagen @@ -2960,7 +2960,7 @@ Der Inhalt ist nicht in UTF-8 kodiert. %s (default) - %s (standard) + %s (Standard) @@ -3022,7 +3022,7 @@ Sie ist nicht in UTF-8 kodiert. Theme %s is used in the %s plugin. - Das Design %s wird in der %s Erweiterung benutzt. + Das Design »%s« wird in der »%s« Erweiterung benutzt. @@ -3067,7 +3067,7 @@ Sie ist nicht in UTF-8 kodiert. Delete %s theme? - Sott das Design »%s« wirklich gelöscht werden? + Soll das Design »%s« wirklich gelöscht werden? @@ -3120,7 +3120,7 @@ Sie ist nicht in UTF-8 kodiert. Welcome to the Theme Wizard - Willkomen beim Designassistenten + Willkommen beim Designassistenten @@ -3476,7 +3476,7 @@ Sie ist nicht in UTF-8 kodiert. Replace Background - Live Hintergrund ersetzen + Live-Hintergrund ersetzen @@ -3566,7 +3566,7 @@ Sie ist nicht in UTF-8 kodiert. CCLI number: - CCLI Nummer: + CCLI-Nummer: @@ -3592,7 +3592,7 @@ Sie ist nicht in UTF-8 kodiert. Live Background Error - Live Hintergrund Fehler + Live-Hintergrund Fehler @@ -3719,7 +3719,7 @@ Sie ist nicht in UTF-8 kodiert. The openlp.org 1.x importer has been disabled due to a missing Python module. If you want to use this importer, you will need to install the "python-sqlite" module. - Der openlp.ort 1.x Importassistent wurde, wegem einem fehlenden Python Modul deaktiviert. When Sie diesen Importassistenten nutzen wollen, dann mussen Sie das »python-sqlite« Modul installieren. + Der openlp.ort 1.x Importassistent wurde, wegen einem fehlenden Python Modul deaktiviert. Wenn Sie diesen Importassistenten nutzen wollen, dann müssen Sie das »python-sqlite« Modul installieren. @@ -3739,7 +3739,7 @@ Sie ist nicht in UTF-8 kodiert. Starting import... - Beginne import... + Beginne Import... @@ -3924,7 +3924,7 @@ Sie ist nicht in UTF-8 kodiert. The Presentation %s is incomplete, please reload. - Die Präsentation %s ist nicht vollständig, bitte neu laden. + Die Präsentation »%s« ist nicht vollständig, bitte neu laden. @@ -3986,7 +3986,7 @@ Sie ist nicht in UTF-8 kodiert. Server Settings - Server Einstellungen + Server-Einstellungen @@ -4439,7 +4439,7 @@ Einstellung korrekt. You have not selected a valid author. Either select an author from the list, or type in a new author and click the "Add Author to Song" button to add the new author. - Es wurde kein gültiger Autor ausgewählt. Bitte wählen Sie einen Autor aus der Liste oder geben Sie einen neuen Author ein und drücken die Schaltfläche »Author hinzufügen«. + Es wurde kein gültiger Autor ausgewählt. Bitte wählen Sie einen Autor aus der Liste oder geben Sie einen neuen Autor ein und drücken die Schaltfläche »Autor hinzufügen«. @@ -4474,7 +4474,7 @@ Einstellung korrekt. You need to type in at least one verse. - Mindestens ein Vers muss angegeben sein. + Mindestens ein Vers muss angegeben sein. @@ -4534,7 +4534,7 @@ Einstellung korrekt. You need to have an author for this song. - Das Lied benötigt mindestens einen Author. + Das Lied benötigt mindestens einen Autor. @@ -4570,7 +4570,7 @@ Einstellung korrekt. This wizard will help to export your songs to the open and free OpenLyrics worship song format. - Dieser Assistent wird Ihnen helfen Lieder in das freie und offne OpenLyrics Lobpreis Lieder Format zu exportieren. + Dieser Assistent wird Ihnen helfen Lieder in das freie und offene OpenLyrics Lobpreis Lieder Format zu exportieren. @@ -4653,7 +4653,7 @@ Einstellung korrekt. 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. - Dieser Assistent hilft Ihnen Liedtexte aus verschiedenen Formaten zu importieren. Klicken Sie auf »Weiter« um das Quellformat auszuwählen, aus dem Sie importieren möchen. + Dieser Assistent hilft Ihnen Liedtexte aus verschiedenen Formaten zu importieren. Klicken Sie auf »Weiter« um das Quellformat auszuwählen, aus dem Sie importieren möchten. @@ -4782,8 +4782,8 @@ Einstellung korrekt. Are you sure you want to delete the %n selected song(s)? - Sind Sie sicher, dass das Lied gelöscht werden soll? Sind Sie sicher, dass die %n Lieder gelöscht werden sollen? + @@ -4890,12 +4890,12 @@ Einstellung korrekt. Could not add your author. - Der Author konnte nicht hinzugefügt werden. + Der Autor konnte nicht hinzugefügt werden. This author already exists. - Der Author existiert bereits in der Datenbank. + Der Autor existiert bereits in der Datenbank. @@ -4920,7 +4920,7 @@ Einstellung korrekt. Could not save your changes. - Die Änderungen konnten nicht gesteichert werden. + Die Änderungen konnten nicht gespeichert werden. @@ -4930,7 +4930,7 @@ Einstellung korrekt. This author cannot be deleted, they are currently assigned to at least one song. - Der Author konnte nicht gelöscht werden, da er mindestens einem Lied zugeordnet ist. + Der Autor konnte nicht gelöscht werden, da er mindestens einem Lied zugeordnet ist. @@ -4945,17 +4945,17 @@ Einstellung korrekt. Could not save your modified author, because the author already exists. - Der geänderte Author konnte nicht gespeichert werden, da es bereits in der Datenbank existiert. + Der geänderte Autor konnte nicht gespeichert werden, da es bereits in der Datenbank existiert. The author %s already exists. Would you like to make songs with author %s use the existing author %s? - Der Author %s existiert bereits. Sollen Lieder von %s %s als Author setzen? + Der Autor »%s« existiert bereits. Sollen Lieder von »%s« »%s« als Autor setzen? The topic %s already exists. Would you like to make songs with topic %s use the existing topic %s? - Das Thema %s existiert bereits. Sollen Lieder zum Thema %s das Thema %s verwenden? + Das Thema »%s« existiert bereits. Sollen Lieder zum Thema »%s« das Thema »%s« verwenden? @@ -4973,7 +4973,7 @@ Einstellung korrekt. Enable search as you type - Aktiviere Vorschlagssuche + Aktiviere Vorschlagssuche (search as you type) @@ -4983,7 +4983,7 @@ Einstellung korrekt. Update service from song edit - Bei Liedbearbeitung den Ablauf aktuallisieren + Bei Liedbearbeitung im Ablauf das Lied in der Datenbank aktualisieren diff --git a/resources/i18n/en.ts b/resources/i18n/en.ts index 1a4a97333..fbb56ea2e 100644 --- a/resources/i18n/en.ts +++ b/resources/i18n/en.ts @@ -1440,107 +1440,107 @@ Version: %s OpenLP.FirstTimeWizard - + Songs - + First Time Wizard - + Welcome to the First Time Wizard - + Activate required Plugins - + Select the Plugins you wish to use. - + Custom Text - + Bible - + Images - + Presentations - + Media (Audio and Video) - + Allow remote access - + Monitor Song Usage - + Allow Alerts - + Default Settings - + Downloading %s... - + Download complete. Click the finish button to start OpenLP. - + Enabling selected plugins... - + 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. - + No Internet Connection - + Unable to detect an Internet connection. - + 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. To 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. @@ -1549,62 +1549,62 @@ To cancel the First Time Wizard completely, press the finish button now. - + Sample Songs - + Select and download public domain songs. - + Sample Bibles - + Select and download free Bibles. - + Sample Themes - + Select and download sample themes. - + Set up default settings to be used by OpenLP. - + Setting Up And Importing - + Please wait while OpenLP is set up and your data is imported. - + Default output display: - + Select default theme: - + Starting configuration process... @@ -1730,12 +1730,12 @@ To cancel the First Time Wizard completely, press the finish button now. OpenLP.LanguageManager - + Language - + Please restart OpenLP to use your new language setting. @@ -1751,369 +1751,369 @@ To cancel the First Time Wizard completely, press the finish button now. OpenLP.MainWindow - + &File - + &Import - + &Export - + &View - + M&ode - + &Tools - + &Settings - + &Language - + &Help - + Media Manager - + Service Manager - + Theme Manager - + &New - + Ctrl+N - + &Open - + Open an existing service. - + Ctrl+O - + &Save - + Save the current service to disk. - + Ctrl+S - + Save &As... - + Save Service As - + Save the current service under a new name. - + Ctrl+Shift+S - + E&xit - + Quit OpenLP - + Alt+F4 - + &Theme - + &Configure OpenLP... - + &Media Manager - + Toggle Media Manager - + Toggle the visibility of the media manager. - + F8 - + &Theme Manager - + Toggle Theme Manager - + Toggle the visibility of the theme manager. - + F10 - + &Service Manager - + Toggle Service Manager - + Toggle the visibility of the service manager. - + F9 - + &Preview Panel - + Toggle Preview Panel - + Toggle the visibility of the preview panel. - + F11 - + &Live Panel - + Toggle Live Panel - + Toggle the visibility of the live panel. - + F12 - + &Plugin List - + List the Plugins - + Alt+F7 - + &User Guide - + &About - + More information about OpenLP - + Ctrl+F1 - + &Online Help - + &Web Site - + Use the system language, if available. - + Set the interface language to %s - + Add &Tool... - + Add an application to the list of tools. - + &Default - + Set the view mode back to the default. - + &Setup - + Set the view mode to Setup. - + &Live - + Set the view mode to Live. - + Version %s of OpenLP is now available for download (you are currently running version %s). 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 @@ -2124,47 +2124,47 @@ 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 - + &Configure Display Tags - + Open &Data Folder... - + Open the folder where songs, bibles and other data resides. - + &Autodetect diff --git a/resources/i18n/en_GB.ts b/resources/i18n/en_GB.ts index 1c1dacd4a..0a2107ff9 100644 --- a/resources/i18n/en_GB.ts +++ b/resources/i18n/en_GB.ts @@ -1551,102 +1551,102 @@ Version: %s OpenLP.FirstTimeWizard - + Downloading %s... Downloading %s... - + Download complete. Click the finish button to start OpenLP. Download complete. Click the finish button to start OpenLP. - + Enabling selected plugins... Enabling selected plugins... - + First Time Wizard First Time Wizard - + Welcome to the First Time Wizard Welcome to the First Time Wizard - + 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. This wizard will help you to configure OpenLP for initial use. Click the next button below to start the process of selecting your initial options. - + Activate required Plugins Activate required Plugins - + Select the Plugins you wish to use. Select the Plugins you wish to use. - + Songs Songs - + Custom Text Custom Text - + Bible Bible - + Images Images - + Presentations Presentations - + Media (Audio and Video) Media (Audio and Video) - + Allow remote access Allow remote access - + Monitor Song Usage Monitor Song Usage - + Allow Alerts Allow Alerts - + No Internet Connection No Internet Connection - + Unable to detect an Internet connection. Unable to detect an Internet connection. - + 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. To 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. @@ -1659,67 +1659,67 @@ To re-run the First Time Wizard and import this sample data at a later stage, pr To cancel the First Time Wizard completely, press the finish button now. - + Sample Songs Sample Songs - + Select and download public domain songs. Select and download public domain songs. - + Sample Bibles Sample Bibles - + Select and download free Bibles. Select and download free Bibles. - + Sample Themes Sample Themes - + Select and download sample themes. Select and download sample themes. - + Default Settings Default Settings - + Set up default settings to be used by OpenLP. Set up default settings to be used by OpenLP. - + Setting Up And Importing Setting Up And Importing - + Please wait while OpenLP is set up and your data is imported. Please wait while OpenLP is set up and your data is imported. - + Default output display: Default output display: - + Select default theme: Select default theme: - + Starting configuration process... Starting configuration process... @@ -1845,12 +1845,12 @@ To cancel the First Time Wizard completely, press the finish button now. OpenLP.LanguageManager - + Language Language - + Please restart OpenLP to use your new language setting. Please restart OpenLP to use your new language setting. @@ -1866,347 +1866,347 @@ To cancel the First Time Wizard completely, press the finish button now. OpenLP.MainWindow - + &File &File - + &Import &Import - + &Export &Export - + &View &View - + M&ode M&ode - + &Tools &Tools - + &Settings &Settings - + &Language &Language - + &Help &Help - + Media Manager Media Manager - + Service Manager Service Manager - + Theme Manager Theme Manager - + &New &New - + Ctrl+N Ctrl+N - + &Open &Open - + Open an existing service. Open an existing service. - + Ctrl+O Ctrl+O - + &Save &Save - + Save the current service to disk. Save the current service to disk. - + Ctrl+S Ctrl+S - + Save &As... Save &As... - + Save Service As Save Service As - + Save the current service under a new name. Save the current service under a new name. - + Ctrl+Shift+S Ctrl+Shift+S - + E&xit E&xit - + Quit OpenLP Quit OpenLP - + Alt+F4 Alt+F4 - + &Theme &Theme - + &Configure OpenLP... &Configure OpenLP... - + &Media Manager &Media Manager - + Toggle Media Manager Toggle Media Manager - + Toggle the visibility of the media manager. Toggle the visibility of the media manager. - + F8 F8 - + &Theme Manager &Theme Manager - + Toggle Theme Manager Toggle Theme Manager - + Toggle the visibility of the theme manager. Toggle the visibility of the theme manager. - + F10 F10 - + &Service Manager &Service Manager - + Toggle Service Manager Toggle Service Manager - + Toggle the visibility of the service manager. Toggle the visibility of the service manager. - + F9 F9 - + &Preview Panel &Preview Panel - + Toggle Preview Panel Toggle Preview Panel - + Toggle the visibility of the preview panel. Toggle the visibility of the preview panel. - + F11 F11 - + &Live Panel &Live Panel - + Toggle Live Panel Toggle Live Panel - + Toggle the visibility of the live panel. Toggle the visibility of the live panel. - + F12 F12 - + &Plugin List &Plugin List - + List the Plugins List the Plugins - + Alt+F7 Alt+F7 - + &User Guide &User Guide - + &About &About - + More information about OpenLP More information about OpenLP - + Ctrl+F1 Ctrl+F1 - + &Online Help &Online Help - + &Web Site &Web Site - + Use the system language, if available. Use the system language, if available. - + Set the interface language to %s Set the interface language to %s - + Add &Tool... Add &Tool... - + Add an application to the list of tools. Add an application to the list of tools. - + &Default &Default - + Set the view mode back to the default. Set the view mode back to the default. - + &Setup &Setup - + Set the view mode to Setup. Set the view mode to Setup. - + &Live &Live - + Set the view mode to Live. Set the view mode to Live. - + Version %s of OpenLP is now available for download (you are currently running version %s). You can download the latest version from http://openlp.org/. @@ -2214,22 +2214,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 Version Updated - + OpenLP Main Display Blanked OpenLP Main Display Blanked - + The Main Display has been blanked out The Main Display has been blanked out - + Default Theme: %s Default Theme: %s @@ -2240,47 +2240,47 @@ You can download the latest version from http://openlp.org/. English (United Kingdom) - + Configure &Shortcuts... Configure &Shortcuts... - + Close OpenLP Close OpenLP - + Are you sure you want to close OpenLP? Are you sure you want to close OpenLP? - + Print the current Service Order. Print the current Service Order. - + Ctrl+P Ctrl+P - + Open &Data Folder... Open &Data Folder... - + Open the folder where songs, bibles and other data resides. Open the folder where songs, Bibles and other data resides. - + &Configure Display Tags &Configure Display Tags - + &Autodetect &Autodetect @@ -4775,8 +4775,8 @@ The encoding is responsible for the correct character representation. Are you sure you want to delete the %n selected song(s)? - Are you sure you want to delete the %n selected song(s)? - + Are you sure you want to delete the %n selected song? + Are you sure you want to delete the %n selected songs? diff --git a/resources/i18n/en_ZA.ts b/resources/i18n/en_ZA.ts index 8ccf56d45..e03cca1fa 100644 --- a/resources/i18n/en_ZA.ts +++ b/resources/i18n/en_ZA.ts @@ -1,6 +1,5 @@ - - + AlertPlugin.AlertForm @@ -1152,7 +1151,7 @@ Translators %s Japanese (ja) %s - Norwegian Bokmål (nb) + Norwegian Bokmål (nb) %s Dutch (nl) %s @@ -1245,8 +1244,8 @@ Final Credit - Copyright © 2004-2011 Raoul Snyman -Portions copyright © 2004-2011 Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri, + Copyright © 2004-2011 Raoul Snyman +Portions copyright © 2004-2011 Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri, Meinert Jordan, Andreas Preikschat, Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carsten Tinggaard, Frode Woldsund @@ -1553,102 +1552,102 @@ Version: %s OpenLP.FirstTimeWizard - + Downloading %s... Downloading %s... - + Download complete. Click the finish button to start OpenLP. Download complete. Click the finish button to start OpenLP. - + Enabling selected plugins... Enabling selected plugins... - + First Time Wizard First Time Wizard - + Welcome to the First Time Wizard Welcome to the First Time Wizard - + 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. 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. - + Activate required Plugins Activate required Plugins - + Select the Plugins you wish to use. Select the Plugins you wish to use. - + Songs Songs - + Custom Text Custom Text - + Bible Bible - + Images Images - + Presentations Presentations - + Media (Audio and Video) Media (Audio and Video) - + Allow remote access Allow remote access - + Monitor Song Usage Monitor Song Usage - + Allow Alerts Allow Alerts - + No Internet Connection No Internet Connection - + Unable to detect an Internet connection. Unable to detect an Internet connection. - + 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. To 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. @@ -1661,67 +1660,67 @@ To re-run the First Time Wizard and import this sample data at a later stage, pr To cancel the First Time Wizard completely, press the finish button now. - + Sample Songs Sample Songs - + Select and download public domain songs. Select and download public domain songs. - + Sample Bibles Sample Bibles - + Select and download free Bibles. Select and download free Bibles. - + Sample Themes Sample Themes - + Select and download sample themes. Select and download sample themes. - + Default Settings Default Settings - + Set up default settings to be used by OpenLP. Set up default settings to be used by OpenLP. - + Setting Up And Importing Setting Up And Importing - + Please wait while OpenLP is set up and your data is imported. Please wait while OpenLP is set up and your data is imported. - + Default output display: Default output display: - + Select default theme: Select default theme: - + Starting configuration process... Starting configuration process... @@ -1847,12 +1846,12 @@ To cancel the First Time Wizard completely, press the finish button now. OpenLP.LanguageManager - + Language Language - + Please restart OpenLP to use your new language setting. Please restart OpenLP to use your new language setting. @@ -1868,367 +1867,367 @@ To cancel the First Time Wizard completely, press the finish button now. OpenLP.MainWindow - + &File &File - + &Import &Import - + &Export &Export - + &View &View - + M&ode M&ode - + &Tools &Tools - + &Settings &Settings - + &Language &Language - + &Help &Help - + Media Manager Media Manager - + Service Manager Service Manager - + Theme Manager Theme Manager - + &New &New - + Ctrl+N Ctrl+N - + &Open &Open - + Open an existing service. Open an existing service. - + Ctrl+O Ctrl+O - + &Save &Save - + Save the current service to disk. Save the current service to disk. - + Ctrl+S Ctrl+S - + Save &As... Save &As... - + Save Service As Save Service As - + Save the current service under a new name. Save the current service under a new name. - + Ctrl+Shift+S Ctrl+Shift+S - + E&xit E&xit - + Quit OpenLP Quit OpenLP - + Alt+F4 Alt+F4 - + &Theme &Theme - + &Configure OpenLP... &Configure OpenLP... - + &Media Manager &Media Manager - + Toggle Media Manager Toggle Media Manager - + Toggle the visibility of the media manager. Toggle the visibility of the media manager. - + F8 F8 - + &Theme Manager &Theme Manager - + Toggle Theme Manager Toggle Theme Manager - + Toggle the visibility of the theme manager. Toggle the visibility of the theme manager. - + F10 F10 - + &Service Manager &Service Manager - + Toggle Service Manager Toggle Service Manager - + Toggle the visibility of the service manager. Toggle the visibility of the service manager. - + F9 F9 - + &Preview Panel &Preview Panel - + Toggle Preview Panel Toggle Preview Panel - + Toggle the visibility of the preview panel. Toggle the visibility of the preview panel. - + F11 F11 - + &Live Panel &Live Panel - + Toggle Live Panel Toggle Live Panel - + Toggle the visibility of the live panel. Toggle the visibility of the live panel. - + F12 F12 - + &Plugin List &Plugin List - + List the Plugins List the Plugins - + Alt+F7 Alt+F7 - + &User Guide &User Guide - + &About &About - + More information about OpenLP More information about OpenLP - + Ctrl+F1 Ctrl+F1 - + &Online Help &Online Help - + &Web Site &Web Site - + Use the system language, if available. Use the system language, if available. - + Set the interface language to %s Set the interface language to %s - + Add &Tool... Add &Tool... - + Add an application to the list of tools. Add an application to the list of tools. - + &Default &Default - + Set the view mode back to the default. Set the view mode back to the default. - + &Setup &Setup - + Set the view mode to Setup. Set the view mode to Setup. - + &Live &Live - + Set the view mode to Live. Set the view mode to Live. - + OpenLP Version Updated OpenLP Version Updated - + OpenLP Main Display Blanked OpenLP Main Display Blanked - + The Main Display has been blanked out The Main Display has been blanked out - + Default Theme: %s Default Theme: %s - + Version %s of OpenLP is now available for download (you are currently running version %s). You can download the latest version from http://openlp.org/. @@ -2243,47 +2242,47 @@ You can download the latest version from http://openlp.org/. English (South Africa) - + Configure &Shortcuts... Configure &Shortcuts... - + Close OpenLP Close OpenLP - + Are you sure you want to close OpenLP? Are you sure you want to close OpenLP? - + Print the current Service Order. Print the current Service Order. - + Ctrl+P Ctrl+P - + Open &Data Folder... Open &Data Folder... - + Open the folder where songs, bibles and other data resides. Open the folder where songs, Bibles and other data resides. - + &Configure Display Tags &Configure Display Tags - + &Autodetect &Autodetect @@ -3773,7 +3772,7 @@ The content encoding is not UTF-8. - © + © Copyright symbol. © diff --git a/resources/i18n/es.ts b/resources/i18n/es.ts index 69430e041..5f8c716ad 100644 --- a/resources/i18n/es.ts +++ b/resources/i18n/es.ts @@ -1441,102 +1441,102 @@ Version: %s OpenLP.FirstTimeWizard - + Downloading %s... - + Download complete. Click the finish button to start OpenLP. - + Enabling selected plugins... - + First Time Wizard - + Welcome to the First Time Wizard - + 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. - + Activate required Plugins - + Select the Plugins you wish to use. - + Songs - + Custom Text - + Bible - + Images - + Presentations - + Media (Audio and Video) - + Allow remote access - + Monitor Song Usage - + Allow Alerts - + No Internet Connection - + Unable to detect an Internet connection. - + 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. To 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. @@ -1545,67 +1545,67 @@ To cancel the First Time Wizard completely, press the finish button now. - + Sample Songs - + Select and download public domain songs. - + Sample Bibles - + Select and download free Bibles. - + Sample Themes - + Select and download sample themes. - + Default Settings - + Set up default settings to be used by OpenLP. - + Setting Up And Importing - + Please wait while OpenLP is set up and your data is imported. - + Default output display: - + Select default theme: - + Starting configuration process... @@ -1731,12 +1731,12 @@ To cancel the First Time Wizard completely, press the finish button now. OpenLP.LanguageManager - + Language - + Please restart OpenLP to use your new language setting. @@ -1752,369 +1752,369 @@ To cancel the First Time Wizard completely, press the finish button now. OpenLP.MainWindow - + &File &Archivo - + &Import &Importar - + &Export &Exportar - + &View &Ver - + M&ode M&odo - + &Tools &Herramientas - + &Settings &Preferencias - + &Language &Idioma - + &Help &Ayuda - + Media Manager Gestor de Medios - + Service Manager Gestor de Servicio - + Theme Manager Gestor de Temas - + &New &Nuevo - + Ctrl+N Ctrl+N - + &Open &Abrir - + Open an existing service. - + Ctrl+O Ctrl+O - + &Save &Guardar - + Save the current service to disk. - + Ctrl+S Crtl+G - + Save &As... Guardar &Como... - + Save Service As Guardar Servicio Como - + Save the current service under a new name. - + Ctrl+Shift+S - + E&xit &Salir - + Quit OpenLP Salir de OpenLP - + Alt+F4 Alt+F4 - + &Theme &Tema - + &Configure OpenLP... - + &Media Manager Gestor de &Medios - + Toggle Media Manager Alternar Gestor de Medios - + Toggle the visibility of the media manager. - + F8 F8 - + &Theme Manager Gestor de &Temas - + Toggle Theme Manager Alternar Gestor de Temas - + Toggle the visibility of the theme manager. - + F10 F10 - + &Service Manager Gestor de &Servicio - + Toggle Service Manager Alternar Gestor de Servicio - + Toggle the visibility of the service manager. - + F9 F9 - + &Preview Panel &Panel de Vista Previa - + Toggle Preview Panel Alternar Panel de Vista Previa - + Toggle the visibility of the preview panel. - + F11 F11 - + &Live Panel - + Toggle Live Panel - + Toggle the visibility of the live panel. - + F12 F12 - + &Plugin List Lista de &Plugins - + List the Plugins Lista de Plugins - + Alt+F7 Alt+F7 - + &User Guide Guía de &Usuario - + &About &Acerca De - + More information about OpenLP Más información acerca de OpenLP - + Ctrl+F1 Ctrl+F1 - + &Online Help &Ayuda En Línea - + &Web Site Sitio &Web - + Use the system language, if available. - + Set the interface language to %s - + Add &Tool... - + Add an application to the list of tools. - + &Default - + Set the view mode back to the default. - + &Setup - + Set the view mode to Setup. - + &Live En &vivo - + Set the view mode to Live. - + Version %s of OpenLP is now available for download (you are currently running version %s). You can download the latest version from http://openlp.org/. - + OpenLP Version Updated Versión de OpenLP Actualizada - + OpenLP Main Display Blanked Pantalla Principal de OpenLP en Blanco - + The Main Display has been blanked out La Pantalla Principal esta en negro - + Default Theme: %s @@ -2125,47 +2125,47 @@ You can download the latest version from http://openlp.org/. Español - + 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 - + &Autodetect diff --git a/resources/i18n/et.ts b/resources/i18n/et.ts index 97322155c..14d81f18e 100644 --- a/resources/i18n/et.ts +++ b/resources/i18n/et.ts @@ -1,5 +1,5 @@ - + AlertPlugin.AlertForm @@ -124,27 +124,27 @@ Kas tahad sellest hoolimata jätkata? Font - Kirjastiil + Font Font name: - Kirjastiili nimi: + Fondi nimi: Font color: - Kirja värvus: + Teksti värvus: Background color: - Taustavärvus: + Tausta värvus: Font size: - Kirja suurus: + Teksti suurus: @@ -1268,7 +1268,7 @@ Jon Tibble, Carsten Tinggaard, Frode Woldsund Remember active media manager tab on startup - Käivitumisel tuletatakse meelde, milline meediahalduri osa oli aktiivne + Käivitumisel avatakse viimati avatud meediahalduri osa @@ -1549,102 +1549,102 @@ Version: %s OpenLP.FirstTimeWizard - + Downloading %s... %s allalaadimine... - + Download complete. Click the finish button to start OpenLP. Allalaadimine lõpetatud. OpenLP käivitamiseks klõpsa lõpetamise nupule. - + Enabling selected plugins... Valitud pluginate sisselülitamine... - + First Time Wizard Esmakäivituse nõustaja - + Welcome to the First Time Wizard Tere tulemast esmakäivituse nõustajasse - + 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. Nõustaja aitab teha esmase seadistuse OpenLP kasutamiseks. Klõpsa all asuval edasi nupul, et alustada lähtevalikute tegemist. - + Activate required Plugins Vajalike pluginate sisselülitamine - + Select the Plugins you wish to use. Vali pluginad, mida tahad kasutada. - + Songs - Laulud + Laulud - + Custom Text Kohandatud tekst - + Bible - Piibel + Piibel + + + + Images + Pildid - Images - Pildid + Presentations + Esitlused - Presentations - Esitlused - - - Media (Audio and Video) Meedia (audio ja video) - + Allow remote access Kaugligipääs - + Monitor Song Usage Laulukasutuse monitooring - + Allow Alerts Teadaanded - + No Internet Connection Internetiühendust pole - + Unable to detect an Internet connection. Internetiühendust ei leitud. - + 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. To 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. @@ -1657,67 +1657,67 @@ Esmakäivituse nõustaja taaskäivitamiseks hiljem, klõpsa praegu loobu nupule, Esmakäivituse nõustajast loobumiseks klõpsa lõpetamise nupule. - + Sample Songs Näidislaulud - + Select and download public domain songs. Vali ja laadi alla avalikku omandisse kuuluvaid laule. - + Sample Bibles Näidispiiblid - + Select and download free Bibles. Vabade Piiblite valimine ja allalaadimine. - + Sample Themes Näidiskujundused - + Select and download sample themes. Näidiskujunduste valimine ja allalaadimine. - + Default Settings Vaikimisi sätted - + Set up default settings to be used by OpenLP. OpenLP jaoks vaikimisi sätete määramine. - + Setting Up And Importing Seadistamine ja importimine - + Please wait while OpenLP is set up and your data is imported. Palun oota, kuni OpenLP on seadistatud ning sinu andmed on imporditud. - + Default output display: Vaikimisi ekraani kuva: - + Select default theme: Vali vaikimisi kujundus: - + Starting configuration process... Seadistamise alustamine... @@ -1752,7 +1752,7 @@ Esmakäivituse nõustajast loobumiseks klõpsa lõpetamise nupule. Show blank screen warning - Kuvatakse tühja ekraani hoiatust + Kuvatakse tühjendatud ekraani hoiatust @@ -1782,12 +1782,12 @@ Esmakäivituse nõustajast loobumiseks klõpsa lõpetamise nupule. Slide loop delay: - Slaidi näitamise pikkus korduses: + Slaidi pikkus korduses: sec - sek + sek @@ -1843,12 +1843,12 @@ Esmakäivituse nõustajast loobumiseks klõpsa lõpetamise nupule. OpenLP.LanguageManager - + Language Keel - + Please restart OpenLP to use your new language setting. Uue keele kasutamiseks käivita OpenLP uuesti. @@ -1864,367 +1864,367 @@ Esmakäivituse nõustajast loobumiseks klõpsa lõpetamise nupule. OpenLP.MainWindow - + &File &Fail - + &Import &Impordi - + &Export &Ekspordi - + &View &Vaade - + M&ode &Režiim - + &Tools &Tööriistad - + &Settings &Sätted - + &Language &Keel - + &Help A&bi - + Media Manager Meediahaldur - + Service Manager Teenistuse haldur - + Theme Manager Kujunduse haldur - + &New &Uus - + Ctrl+N Ctrl+N - + &Open &Ava - + Open an existing service. Olemasoleva teenistuse avamine. - + Ctrl+O Ctrl+O - + &Save &Salvesta - + Save the current service to disk. Praeguse teenistuse salvestamine kettale. - + Ctrl+S Ctrl+S - + Save &As... Salvesta &kui... - + Save Service As Salvesta teenistus kui - + Save the current service under a new name. Praeguse teenistuse salvestamine uue nimega. - + Ctrl+Shift+S Ctrl+Shift+S - + E&xit &Välju - + Quit OpenLP Lahku OpenLPst - + Alt+F4 Alt+F4 - + &Theme &Kujundus - + &Configure OpenLP... &Seadista OpenLP... - + &Media Manager &Meediahaldur - + Toggle Media Manager Meediahalduri lüliti - + Toggle the visibility of the media manager. Meediahalduri nähtavuse ümberlüliti. - + F8 F8 - + &Theme Manager &Kujunduse haldur - + Toggle Theme Manager Kujunduse halduri lüliti - + Toggle the visibility of the theme manager. Kujunduse halduri nähtavuse ümberlülitamine. - + F10 F10 - + &Service Manager &Teenistuse haldur - + Toggle Service Manager Teenistuse halduri lüliti - + Toggle the visibility of the service manager. Teenistuse halduri nähtavuse ümberlülitamine. - + F9 F9 - + &Preview Panel &Eelvaatluspaneel - + Toggle Preview Panel Eelvaatluspaneeli lüliti - + Toggle the visibility of the preview panel. Eelvaatluspaneeli nähtavuse ümberlülitamine. - + F11 F11 - + &Live Panel &Ekraani paneel - + Toggle Live Panel Ekraani paneeli lüliti - + Toggle the visibility of the live panel. Ekraani paneeli nähtavuse muutmine. - + F12 F12 - + &Plugin List &Pluginate loend - + List the Plugins Pluginate loend - + Alt+F7 Alt+F7 - + &User Guide &Kasutajajuhend - + &About &Lähemalt - + More information about OpenLP Lähem teave OpenLP kohta - + Ctrl+F1 Ctrl+F1 - + &Online Help &Abi veebis - + &Web Site &Veebileht - + Use the system language, if available. Kui saadaval, kasutatakse süsteemi keelt. - + Set the interface language to %s Kasutajaliidese keeleks %s määramine - + Add &Tool... Lisa &tööriist... - + Add an application to the list of tools. Rakenduse lisamine tööriistade loendisse. - + &Default &Vaikimisi - + Set the view mode back to the default. Vaikimisi kuvarežiimi taastamine. - + &Setup &Ettevalmistus - + Set the view mode to Setup. Ettevalmistuse kuvarežiimi valimine. - + &Live &Otse - + Set the view mode to Live. Vaate režiimiks ekraanivaate valimine. - + OpenLP Version Updated OpenLP uuendus - + OpenLP Main Display Blanked OpenLP peakuva on tühi - + The Main Display has been blanked out Peakuva on tühi - + Default Theme: %s Vaikimisi kujundus: %s - + Version %s of OpenLP is now available for download (you are currently running version %s). You can download the latest version from http://openlp.org/. @@ -2239,47 +2239,47 @@ Sa võid viimase versiooni alla laadida aadressilt http://openlp.org/.Eesti - + Configure &Shortcuts... &Kiirklahvide seadistamine... - + Close OpenLP OpenLP sulgemine - + Are you sure you want to close OpenLP? Kas oled kindel, et tahad OpenLP sulgeda? - + Print the current Service Order. Praeguse teenistuse järjekorra printimine. - + Ctrl+P Ctrl+P - + &Configure Display Tags &Kuvasiltide seadistamine - + Open &Data Folder... Ava &andmete kataloog... - + Open the folder where songs, bibles and other data resides. Laulude, Piiblite ja muude andmete kataloogi avamine. - + &Autodetect &Isetuvastus @@ -2451,12 +2451,12 @@ Sa võid viimase versiooni alla laadida aadressilt http://openlp.org/. Screen - Ekraan + Ekraan primary - peamine + peamine @@ -3178,17 +3178,17 @@ Sisu kodeering ei ole UTF-8. Main Area Font Details - Peamise kirja üksikasjad + Peamise teksti üksikasjad Define the font and display characteristics for the Display text - Määra font ja teised kuvatava teksti omadused + Määra font ja teised teksti omadused Font: - Kirjastiil: + Font: @@ -3228,7 +3228,7 @@ Sisu kodeering ei ole UTF-8. Define the font and display characteristics for the Footer text - Määra jaluse kirja font ja muud omadused + Määra jaluse font ja muud omadused @@ -3366,7 +3366,7 @@ Sisu kodeering ei ole UTF-8. Use the theme from each song in the database. If a song doesn't have a theme associated with it, then use the service's theme. If the service doesn't have a theme, then use the global theme. - Iga laulu jaoks kasutatakse sellele andmebaasis määratud kujundust. Kui laulul kujundus puudub, kasutatakse teenistuse kujundust. Kui teenistusel kujundus puudub, siis kasutatakse üleüldist kujundust. + Laul kuvatakse sellele andmebaasis määratud kujundusega. Kui laulul kujundus puudub, kasutatakse teenistuse kujundust. Kui teenistusel kujundus puudub, siis kasutatakse üleüldist kujundust. @@ -4772,8 +4772,7 @@ Kodeering on vajalik märkide õige esitamise jaoks. Are you sure you want to delete the %n selected song(s)? - - Kas oled kindel, et tahad kustutada %n valitud laulu? + diff --git a/resources/i18n/fr.ts b/resources/i18n/fr.ts index 5ba33523d..90e4d6d16 100644 --- a/resources/i18n/fr.ts +++ b/resources/i18n/fr.ts @@ -1445,102 +1445,102 @@ Version: %s OpenLP.FirstTimeWizard - + Downloading %s... - + Download complete. Click the finish button to start OpenLP. - + Enabling selected plugins... - + First Time Wizard - + Welcome to the First Time Wizard - + 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. - + Activate required Plugins - + Select the Plugins you wish to use. - + Songs - + Custom Text - + Bible Bible - + Images Images - + Presentations Présentations - + Media (Audio and Video) - + Allow remote access - + Monitor Song Usage - + Allow Alerts - + No Internet Connection - + Unable to detect an Internet connection. - + 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. To 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. @@ -1549,67 +1549,67 @@ To cancel the First Time Wizard completely, press the finish button now. - + Sample Songs - + Select and download public domain songs. - + Sample Bibles - + Select and download free Bibles. - + Sample Themes - + Select and download sample themes. - + Default Settings - + Set up default settings to be used by OpenLP. - + Setting Up And Importing - + Please wait while OpenLP is set up and your data is imported. - + Default output display: - + Select default theme: - + Starting configuration process... @@ -1735,12 +1735,12 @@ To cancel the First Time Wizard completely, press the finish button now. OpenLP.LanguageManager - + Language Langage - + Please restart OpenLP to use your new language setting. Veuillez redémarrer OpenLP pour utiliser votre nouvelle propriété de langue. @@ -1756,352 +1756,352 @@ To cancel the First Time Wizard completely, press the finish button now. OpenLP.MainWindow - + &File &Fichier - + &Import &Import - + &Export &Export - + &View &View - + M&ode M&ode - + &Tools &Outils - + &Settings &Options - + &Language &Langue - + &Help &Aide - + Media Manager Gestionnaire de médias - + Service Manager Gestionnaire de services - + Theme Manager Gestionnaire de thèmes - + &New &Nouveau - + Ctrl+N Ctrl+N - + &Open &Open - + Open an existing service. Ouvre un service existant. - + Ctrl+O Ctrl+O - + &Save &Enregistre - + Save the current service to disk. Enregistre le service courant sur le disque. - + Ctrl+S Ctrl+S - + Save &As... Enregistre &sous... - + Save Service As Enregistre le service sous - + Save the current service under a new name. Enregistre le service courant sous un nouveau nom. - + Ctrl+Shift+S Ctrl+Shift+S - + E&xit &Quitter - + Quit OpenLP Quitter OpenLP - + Alt+F4 Alt+F4 - + &Theme &Thème - + Configure &Shortcuts... Personnalise les &raccourcis... - + &Configure OpenLP... &Personnalise OpenLP... - + &Media Manager Gestionnaire de &médias - + Toggle Media Manager - + Toggle the visibility of the media manager. - + F8 F8 - + &Theme Manager Gestionnaire de &thèmes - + Toggle Theme Manager - + Toggle the visibility of the theme manager. - + F10 F10 - + &Service Manager Gestionnaire de &services - + Toggle Service Manager - + Toggle the visibility of the service manager. - + F9 F9 - + &Preview Panel Panneau de &prévisualisation - + Toggle Preview Panel - + Toggle the visibility of the preview panel. - + F11 F11 - + &Live Panel Panneau du &direct - + Toggle Live Panel - + Toggle the visibility of the live panel. - + F12 F12 - + &Plugin List Liste des &modules - + List the Plugins Liste des modules - + Alt+F7 Alt+F7 - + &User Guide &Guide utilisateur - + &About &Á propos - + More information about OpenLP Plus d'information sur OpenLP - + Ctrl+F1 Ctrl+F1 - + &Online Help &Aide en ligne - + &Web Site Site &Web - + Use the system language, if available. Utilise le langage système, si disponible. - + Set the interface language to %s Défini la langue de l'interface à %s - + Add &Tool... Ajoute un &outils.. - + Add an application to the list of tools. Ajoute une application a la liste des outils. - + &Default &Défaut - + Set the view mode back to the default. Redéfini le mode vue comme par défaut. - + &Setup - + Set the view mode to Setup. - + &Live &Direct - + Set the view mode to Live. - + Version %s of OpenLP is now available for download (you are currently running version %s). You can download the latest version from http://openlp.org/. @@ -2110,32 +2110,32 @@ You can download the latest version from http://openlp.org/. Vous pouvez télécharger la dernière version depuis http://openlp.org/. - + OpenLP Version Updated Version d'OpenLP mis a jours - + OpenLP Main Display Blanked OpenLP affichage principale noirci - + The Main Display has been blanked out L'affichage principale a été noirci - + Close OpenLP Ferme OpenLP - + Are you sure you want to close OpenLP? Êtes vous sur de vouloir fermer OpenLP ? - + Default Theme: %s Thème par défaut : %s @@ -2146,32 +2146,32 @@ Vous pouvez télécharger la dernière version depuis http://openlp.org/.Anglais - + Print the current Service Order. - + Ctrl+P - + Open &Data Folder... - + Open the folder where songs, bibles and other data resides. - + &Configure Display Tags - + &Autodetect diff --git a/resources/i18n/hu.ts b/resources/i18n/hu.ts index 0b857d6ff..7280722a0 100644 --- a/resources/i18n/hu.ts +++ b/resources/i18n/hu.ts @@ -1,5 +1,5 @@ - + AlertPlugin.AlertForm @@ -11,18 +11,19 @@ Do you want to continue anyway? No Parameter Found - + Nem található a paraméter No Placeholder Found - + Nem található a helyjelölő The alert text does not contain '<>'. Do you want to continue anyway? - + Az értesítő szöveg nem tartalmaz „<>” karaktereket. +Folytatható? @@ -30,35 +31,35 @@ Do you want to continue anyway? &Alert - &Figyelmeztetés + &Értesítés Show an alert message. - Figyelmeztetést jelenít meg. + Értesítést jelenít meg. <strong>Alerts Plugin</strong><br />The alert plugin controls the displaying of nursery alerts on the display screen - <strong>Figyelmeztetés bővítmény</strong><br />A figyelmeztetés bővítmény kezeli gyermekfelügyelet felhívásait a vetítőn + <strong>Értesítés bővítmény</strong><br />Az értesítés bővítmény kezeli a gyermekfelügyelet felhívásait a vetítőn. Alert name singular - Figyelmeztetés + Értesítés Alerts name plural - Figyelmeztetések + Értesítések Alerts container title - Figyelmeztetések + Értesítések @@ -66,12 +67,12 @@ Do you want to continue anyway? Alert Message - Figyelmeztetés + Értesítő üzenet Alert &text: - Figyelmeztető &szöveg: + Értesítés &szövege: @@ -96,12 +97,12 @@ Do you want to continue anyway? New Alert - Új figyelmeztetés + Új értesítés You haven't specified any text for your alert. Please type in some text before clicking New. - A figyelmeztető szöveg nincs megadva. Adj meg valamilyen szöveget az Új gombra való kattintás előtt. + Az értesítés szövege nincs megadva. Adj meg valamilyen szöveget az Új gombra való kattintás előtt. @@ -114,7 +115,7 @@ Do you want to continue anyway? Alert message created and displayed. - A figyelmeztető üzenet létrejött és megjelent. + Az értesítő üzenet létrejött és megjelent. @@ -147,7 +148,7 @@ Do you want to continue anyway? Alert timeout: - Figyelmeztetés késleltetése: + Értesítés időtartama: @@ -155,28 +156,28 @@ Do you want to continue anyway? Importing testaments... %s - + Szövetség importálása… %s Importing testaments... done. - + Szövetség importálása… kész. Importing books... %s - + Könyvek importálása… %s Importing verses from %s... Importing verses from <book name>... - + Versek importálása ebből a könyvből: %… Importing verses... done. - + Versek importálása… kész. @@ -184,22 +185,22 @@ Do you want to continue anyway? Download Error - - - - - Parse Error - + Letöltési hiba There was a problem downloading your verse selection. Please check your Internet connection, and if this error continues to occur please consider reporting a bug. - + Probléma történt a kijelölt versek letöltésekor. Kérem, ellenőrizd a az internetkapcsolatot, és ha a hiba nem oldódik meg, fontold meg a hiba bejelentését. + + + + Parse Error + Feldolgozási hiba There was a problem extracting your verse selection. If this error continues to occur please consider reporting a bug. - + Probléma történt a kiválasztott versek kicsomagolásakor. Ha a hiba nem oldódik meg, fontold meg a hiba bejelentését. @@ -207,12 +208,12 @@ Do you want to continue anyway? Bible not fully loaded. - + A Biblia nem töltődött be teljesen. You cannot combine single and dual Bible verse search results. Do you want to delete your search results and start a new search? - + Az egyes és a kettőzött bibliaversek nem kombinálhatók. Töröljük a keresési eredményt és kezdjünk egy újabbat? @@ -260,35 +261,35 @@ Do you want to continue anyway? Add the selected Bible to the service - A kijelölt Biblia hozzáadása a szolgálathoz + A kijelölt Biblia hozzáadása a szolgálati sorrendhez Bible name singular - Biblia + Biblia Bibles name plural - Bibliák + Bibliák Bibles container title - Bibliák + Bibliák No Book Found - Nincs ilyen könyv + Nincs ilyen könyv No matching book could be found in this Bible. Check that you have spelled the name of the book correctly. - + A kért könyv nem található ebben a Bibliában. Kérlek, ellenőrizd a könyv nevének helyesírását. @@ -298,6 +299,25 @@ Do you want to continue anyway? Scripture Reference Error Igehely hivatkozási hiba + + + Your scripture reference is either not supported by OpenLP or is invalid. Please make sure your reference conforms to one of the following patterns: + +Book Chapter +Book Chapter-Chapter +Book Chapter:Verse-Verse +Book Chapter:Verse-Verse,Verse-Verse +Book Chapter:Verse-Verse,Chapter:Verse-Verse +Book Chapter:Verse-Chapter:Verse + Ezt az igehely hivatkozást nem támogatja az OpenLP vagy nem helyes. Kérlek, ellenőrizd, hogy a hivatkozás megfelel-e az egyik alábbi mintának: + +Könyv fejezet +Könyv fejezet-fejezet +Könyv fejezet:Vers-Vers +Könyv fejezet:Vers-Vers,Vers-Vers +Könyv fejezet:Vers-Vers,Fejezet:Vers-Vers +Könyv fejezet:Vers-Fejezet:Vers + Web Bible cannot be used @@ -312,29 +332,18 @@ Do you want to continue anyway? You did not enter a search keyword. You can separate different keywords by a space to search for all of your keywords and you can separate them by a comma to search for one of them. - - - - - There are no Bibles currently installed. Please use the Import Wizard to install one or more Bibles. - - - - - Your scripture reference is either not supported by OpenLP or is invalid. Please make sure your reference conforms to one of the following patterns: - -Book Chapter -Book Chapter-Chapter -Book Chapter:Verse-Verse -Book Chapter:Verse-Verse,Verse-Verse -Book Chapter:Verse-Verse,Chapter:Verse-Verse -Book Chapter:Verse-Chapter:Verse - + Nincs megadva keresési kifejezés. +Több kifejezés is megadható. Szóközzel történő elválasztás esetén minden egyes kifejezésre történik a keresés, míg vesszővel való elválasztás esetén csak az egyikre. No Bibles Available - + Nincsenek elérhető Bibliák + + + + There are no Bibles currently installed. Please use the Import Wizard to install one or more Bibles. + Jelenleg nincs telepített Biblia. Kérlek, használd a Bibliaimportáló tündért Bibliák telepítéséhez. @@ -404,7 +413,7 @@ Book Chapter:Verse-Chapter:Verse Note: Changes do not affect verses already in the service. Megjegyzés: -A módosítások nem érintik a már a szolgálatban lévő verseket. +A módosítások nem érintik a már a szolgálati sorrendben lévő verseket. @@ -537,7 +546,7 @@ A módosítások nem érintik a már a szolgálatban lévő verseket. Starting Registering bible... - A Biblia regisztrálása elkezdődött... + A Biblia regisztrálása elkezdődött… @@ -553,42 +562,42 @@ demand and thus an internet connection is required. CSV File - + CSV fájl Bibleserver - + Bible file: - + Biblia fájl: Testaments file: - + Szövetség file: Books file: - + Könyv fájl: Verses file: - + Versek fájl: You have not specified a testaments file. Do you want to proceed with the import? - + Szövetség fájl nincs megadva. Folytaható az importálás? openlp.org 1.x Bible Files - + openlp.org 1.x Biblia fájlok @@ -656,7 +665,7 @@ demand and thus an internet connection is required. Scripture Reference - + Igehely hivatkozás @@ -665,7 +674,7 @@ demand and thus an internet connection is required. Importing %s %s... Importing <book name> <chapter>... - + Importálás: %s %s… @@ -673,13 +682,13 @@ demand and thus an internet connection is required. Detecting encoding (this may take a few minutes)... - Kódolás észlelése (ez eltarthat pár percig)... + Kódolás észlelése (ez eltarthat pár percig)… Importing %s %s... Importing <book name> <chapter>... - + Importálás: %s %s… @@ -687,7 +696,7 @@ demand and thus an internet connection is required. <strong>Custom Plugin</strong><br />The custom plugin provides the ability to set up custom text slides that can be displayed on the screen the same way songs are. This plugin provides greater freedom over the songs plugin. - <strong>Egyedi bővítmény</strong><br />Az egyedi bővítmény dalokhoz hasonló egyedi diák vetítését teszi lehetővé. Ugyanakkor több szabadságot enged meg, mint a dalok bővítmény. + <strong>Speciális bővítmény</strong><br />Az speciális bővítmény dalokhoz hasonló egyéni diák vetítését teszi lehetővé. Ugyanakkor több szabadságot enged meg, mint a dalok bővítmény. @@ -695,7 +704,7 @@ demand and thus an internet connection is required. Custom Display - Egyedi dia megjelenés + Speciális megjelenése @@ -708,7 +717,7 @@ demand and thus an internet connection is required. Edit Custom Slides - Egyedi diák szerkesztése + Speciális diák szerkesztése @@ -733,7 +742,7 @@ demand and thus an internet connection is required. Split Slide - Kettéválasztás + Szétválasztás @@ -771,60 +780,60 @@ demand and thus an internet connection is required. Import a Custom - Egyedi dia importálása + Speciális importálása Load a new Custom - Új egyedi dia betöltése + Új speciális betöltése Add a new Custom - Új egyedi dia hozzáadása + Új speciális hozzáadása Edit the selected Custom - A kijelölt egyedi dia szerkesztése + A kijelölt speciális szerkesztése Delete the selected Custom - A kijelölt egyedi dia törlése + A kijelölt speciális törlése Preview the selected Custom - A kijelölt egyedi dia előnézete + A kijelölt speciális előnézete Send the selected Custom live - A kijelölt egyedi dia élő adásba küldése + A kijelölt speciális élő adásba küldése Add the selected Custom to the service - A kijelölt egyedi dia hozzáadása a szolgálathoz + A kijelölt speciális hozzáadása a szolgálati sorrendhez Custom name singular - Egyedi dia + Speciális Customs name plural - Egyedi diák + Speciálisak Custom container title - Egyedi dia + Speciális @@ -832,7 +841,7 @@ demand and thus an internet connection is required. <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. - <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. + <strong>Kép bővítmény</strong><br />A kép a bővítmény különféle képek 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 sorrendkezelőn csoportba foglalni a képeket, így könnyebbé téve képek tömeges 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. @@ -867,25 +876,25 @@ demand and thus an internet connection is required. Add the selected Image to the service - A kijelölt kép hozzáadása a szolgálathoz + A kijelölt kép hozzáadása a szolgálati sorrendhez Image name singular - Kép + Kép Images name plural - Képek + Képek Images container title - Képek + Képek @@ -893,7 +902,7 @@ demand and thus an internet connection is required. Select Attachment - + Melléklet kijelölése @@ -901,7 +910,7 @@ demand and thus an internet connection is required. Select Image(s) - Kép(ek) kiválasztása + Kép(ek) kijelölése @@ -916,23 +925,24 @@ demand and thus an internet connection is required. Missing Image(s) - + The following image(s) no longer exist: %s - + A következő kép(ek) nem létezik: %s The following image(s) no longer exist: %s Do you want to add the other images anyway? - + A következő kép(ek) nem létezik: %s +Szeretnél más képeket megadni? There was a problem replacing your background, the image file "%s" no longer exists. - + Probléma történt a háttér cseréje során, a(z) „%s” kép nem létezik. @@ -945,55 +955,55 @@ Do you want to add the other images anyway? Load a new Media - Új médiaállomány betöltése + Új médiafájl betöltése Add a new Media - Új médiaállomány hozzáadása + Új médiafájl hozzáadása Edit the selected Media - A kijelölt médiaállomány szerkesztése + A kijelölt médiafájl szerkesztése Delete the selected Media - A kijelölt médiaállomány törlése + A kijelölt médiafájl törlése Preview the selected Media - A kijelölt médiaállomány előnézete + A kijelölt médiafájl előnézete Send the selected Media live - A kijelölt médiaállomány élő adásba küldése + A kijelölt médiafájl élő adásba küldése Add the selected Media to the service - A kijelölt médiaállomány hozzáadása a szolgálathoz + A kijelölt médiafájl hozzáadása a szolgálati sorrendhez Media name singular - Média + Média Media name plural - Média + Média Media container title - Média + Média @@ -1001,37 +1011,37 @@ Do you want to add the other images anyway? Select Media - Médiaállomány kijelölése + Médiafájl kijelölése You must select a media file to delete. - Ki kell választani egy média fájlt a törléshez. - - - - Missing Media File - - - - - The file %s no longer exists. - - - - - You must select a media file to replace the background with. - Ki kell választani média fájlt a háttér cseréjéhez. - - - - There was a problem replacing your background, the media file "%s" no longer exists. - + Ki kell jelölni egy médiafájlt a törléshez. Videos (%s);;Audio (%s);;%s (*) - + Videók (%s);;Hang (%s);;%s (*) + + + + You must select a media file to replace the background with. + Ki kell jelölni médiafájlt a háttér cseréjéhez. + + + + There was a problem replacing your background, the media file "%s" no longer exists. + Probléma történt a háttér cseréje során, a(z) „%s” média fájl nem létezik. + + + + Missing Media File + Hiányzó média fájl + + + + The file %s no longer exists. + A(z) „%s” fájl nem létezik. @@ -1044,7 +1054,7 @@ Do you want to add the other images anyway? Use Phonon for video playback - + A Phonon médiakezelő keretrendszer alkalmazása videók lejátszására @@ -1068,11 +1078,11 @@ 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> – Nyílt forrású dalszöveg vetítő -Az OpenLP egy templomi/gyülekezeti, ill. dalszöveg vetítő szabad szoftver, mely használható daldiák, bibliai versek, videók, képek és bemutatók (ha az OpenOffice.org, PowerPoint vagy a PowerPoint Viewer telepítve van) vetítésére a gyülekezeti dicsőítés alatt egy számítógép és egy projektor segítségével. +Az OpenLP egy templomi/gyülekezeti bemutató, ill. dalszöveg vetítő szabad szoftver, mely használható énekek, bibliai versek, videók, képek és bemutatók (ha az OpenOffice.org, PowerPoint vagy a PowerPoint Viewer telepítve van) vetítésére a gyülekezeti dicsőítés alatt egy számítógép és egy projektor segítségével. 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. +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 projektben való részvételt az alábbi gombbal. @@ -1094,16 +1104,6 @@ Az OpenLP-t önkéntesek készítették és tartják karban. Ha szeretnél több 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. - - Project Lead @@ -1167,7 +1167,67 @@ Final Credit on the cross, setting us free from sin. We bring this software to you for free because He has set us free. - + Projektvezetés + %s + +Fejlesztők + %s + +Hozzájárulók + %s + +Tesztelők + %s + +Csomagkészítők + %s + +Fordítók + Búr (af) + %s + Német (de) + %s + Angol, Egyesült Királyság (en_GB) + %s + Angol, Dél-Afrikai Köztársaság (en_ZA) + %s + Észt (et) + %s + Francia (fr) + %s + Magyar (hu) + %s + Japűn (ja) + %s + Norvég bokmål (nb) + %s + Holland (nl) + %s + Portugál, Brazília (pt_BR) + %s + Orosz (ru) + %s + +Dokumentáció + %s + +Fordítás + Python: http://www.python.org/ + Qt4: http://qt.nokia.com/ + PyQt4: http://www.riverbankcomputing.co.uk/software/pyqt/intro + Oxygen ikonok: http://oxygen-icons.org/ + +Végső köszönet + „Úgy szerette Isten a világot, hogy + egyszülött Fiát adta oda, hogy egyetlen + benne hívő se vesszen el, hanem + örök élete legyen." ‒ János 3,16 + + És végül, de nem utolsósorban, a végső köszönet + Istené, Atyánké, mert elküldte a Fiát, hogy meghaljon + a kereszten, megszabadítva bennünket a bűntől. Ezért + ezt a programot ingyen készítettük neked, mert Ő + tett minket szabaddá. @@ -1176,7 +1236,23 @@ Portions copyright © 2004-2011 Tim Bentley, Jonathan Corwin, Michael Gorven Meinert Jordan, Andreas Preikschat, Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carsten Tinggaard, Frode Woldsund - + Szerzői jog © 2004-2011 Raoul Snyman +Részleges szerzői jogok © 2004-2011 Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri, +Meinert Jordan, Andreas Preikschat, Christian Richter, Philip +Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carsten +Tinggaard, Frode Woldsund + + + + 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. + Ez egy szabad szoftver; terjeszthető illetve módosítható a GNU Általános Közreadási Feltételek dokumentumában leírtak szerint -- 2. verzió --, melyet a Szabad Szoftver Alapítvány ad ki. + + + + + 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. + Ez a program abban a reményben kerül közreadásra, hogy hasznos lesz, de minden egyéb GARANCIA NÉLKÜL, az eladhatóságra vagy valamely célra való alkalmazhatóságra való származtatott garanciát is beleértve. További részletekért lásd a alább. + @@ -1194,52 +1270,52 @@ Tinggaard, Frode Woldsund Remember active media manager tab on startup - Újraindításkor visszaállítsa az aktív médiakezelő fülét + Újraindításkor az aktív médiakezelő fülek visszaállítása Double-click to send items straight to live - Duplakattintás azonnal élő adásba küldi az elemet + Dupla kattintással az elemek azonnali élő adásba küldése Expand new service items on creation - Új szolgálat elemek kibontása létrehozáskor + A sorrendbe kerülő elemek kibontása létrehozáskor Enable application exit confirmation - + Kilépési megerősítés engedélyezése Mouse Cursor - + Egérmutató Hide mouse cursor when over display window - + Egérmutató elrejtése a vetítési képernyő felett Default Image - + Alapértelmezett kép Background color: - Háttérszín: + Háttérszín: Image file: - + Kép fájl: Open File - + Fájl megnyitása @@ -1247,52 +1323,52 @@ Tinggaard, Frode Woldsund Edit Selection - + Kijelölés szerkesztése Update - + Frissítés Description - + Leírás Tag - + Címke Start tag - + Kezdő címke End tag - + Záró címke Default - + Alapértelmezett Tag Id - + Címke ID Start HTML - + Kezdő HTML End HTML - + Befejező HTML @@ -1300,17 +1376,17 @@ Tinggaard, Frode Woldsund Update Error - + Frissítési hiba Tag "n" already defined. - + Az „n” címke már létezik. Tag %s already defined. - + A címke már létezik: %s. @@ -1339,17 +1415,18 @@ Tinggaard, Frode Woldsund Please enter a description of what you were doing to cause this error (Minimum 20 characters) - + Írd le mit tettél, ami a hibát okozta +(minimum 20 karakter) Attach File - + Csatolt fájl Description characters to enter : %s - + Leírás: %s @@ -1358,17 +1435,17 @@ Tinggaard, Frode Woldsund Platform: %s - + Save Crash Report - + Összeomlási jelentés mentése Text files (*.txt *.log *.text) - + Szöveg fájlok (*.txt *.log *.text) @@ -1386,7 +1463,7 @@ Version: %s --- Library Versions --- %s - + @@ -1405,7 +1482,7 @@ Version: %s %s Please add the information that bug reports are favoured written in English. - + @@ -1423,7 +1500,7 @@ Version: %s File Copy - + Fájl másolása @@ -1431,189 +1508,193 @@ Version: %s Select Translation - + Fordítás kijelölése Choose the translation you'd like to use in OpenLP. - + Válassz egy fordítást, amit használni szeretnél az OpenLP-ben. Translation: - + Fordítás: OpenLP.FirstTimeWizard - + Downloading %s... - + Letöltés %s… - + Download complete. Click the finish button to start OpenLP. - + Letöltés kész. Kattints a Befejezés gombra az OpenLP indításához. - + Enabling selected plugins... - + Kijelölt beépülők engedélyezése… + + + + First Time Wizard + Első indítás tündér - First Time Wizard - - - - Welcome to the First Time Wizard - + Üdvözlet az első indítás tündérben - + 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. - + A tündérrel előkészítheti az OpenLP első használatát. Az alább található Tovább gombra való kattintással indítható a folyamat első lépése. + + + + Activate required Plugins + Szükséges beépülők aktiválása - Activate required Plugins - + Select the Plugins you wish to use. + Jelöld ki az alkalmazni kívánt beépülőket. - Select the Plugins you wish to use. - + Songs + Dalok - - Songs - + + Custom Text + Egyedi szöveg - Custom Text - + Bible + Biblia - - Bible - + + Images + Képek - Images - + Presentations + Bemutatók - Presentations - + Media (Audio and Video) + Média (hang és videó) - Media (Audio and Video) - + Allow remote access + Távvezérlés engedélyezése - Allow remote access - + Monitor Song Usage + Dalstatisztika monitorozása - Monitor Song Usage - + Allow Alerts + Értesítések engedélyezése - Allow Alerts - + No Internet Connection + Nincs internet kapcsolat - No Internet Connection - - - - Unable to detect an Internet connection. - + Nem sikerült internet kapcsolatot észlelni. - + 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. To 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. To cancel the First Time Wizard completely, press the finish button now. - + Nem sikerült internetkapcsolatot találni. Az Első indulás tündérnek internetkapcsolatra van szüksége ahhoz, hogy a példa dalokat, Bibliákat és témákat le tudja tölteni. + +Az Első indulás tündér újbóli indításához most a Mégse gobra kattints először, ellenőrizd az internetkapcsolatot és indítsd újra az OpenLP-t. + +Az Első indulás tündér további megkerüléséhez, nyomd meg a Befejezés gombot. + + + + Sample Songs + Példa dalok - Sample Songs - + Select and download public domain songs. + Közkincs dalok kijelölése és letöltése. - Select and download public domain songs. - + Sample Bibles + Példa Bibliák - Sample Bibles - + Select and download free Bibles. + Szabad Bibliák kijelölése és letöltése. - Select and download free Bibles. - + Sample Themes + Példa témák - Sample Themes - + Select and download sample themes. + Példa témák kijelölése és letöltése. - Select and download sample themes. - + Default Settings + Alapértelmezett beállítások - Default Settings - + Set up default settings to be used by OpenLP. + Az OpenLP alapértelmezett beállításai. - Set up default settings to be used by OpenLP. - + Setting Up And Importing + Beállítás és importálás - Setting Up And Importing - + Please wait while OpenLP is set up and your data is imported. + Várj, amíg az OpenLP beállítások érvényre jutnak és míg at adatok importálódnak. - Please wait while OpenLP is set up and your data is imported. - + Default output display: + Alapértelmezett kimeneti képernyő: - Default output display: - + Select default theme: + Alapértelmezett téma kijelölése: - Select default theme: - - - - Starting configuration process... - + Beállítási folyamat kezdése… @@ -1631,7 +1712,7 @@ To cancel the First Time Wizard completely, press the finish button now. Select monitor for output display: - Válaszd ki a vetítési képernyőt: + Jelöld ki a vetítési képernyőt: @@ -1646,12 +1727,12 @@ To cancel the First Time Wizard completely, press the finish button now. Show blank screen warning - Figyelmeztetés megjelenítése a fekete képernyőről + Figyelmeztetés megjelenítése az üres képernyőről Automatically open the last service - Utolsó szolgálat automatikus megnyitása + Utolsó sorrend automatikus megnyitása @@ -1666,12 +1747,12 @@ To cancel the First Time Wizard completely, press the finish button now. Prompt to save before starting a new service - Rákérdezés mentésre új szolgálat kezdése előtt + Rákérdezés mentésre új sorrend létrehozása előtt Automatically preview next item in service - Következő elem automatikus előnézete a szolgálatban + Következő elem automatikus előnézete a sorrendben @@ -1731,18 +1812,18 @@ To cancel the First Time Wizard completely, press the finish button now. Check for updates to OpenLP - + Frissítés keresése az OpenLP-hez OpenLP.LanguageManager - + Language Nyelv - + Please restart OpenLP to use your new language setting. A nyelvi beállítások az OpenLP újraindítása után lépnek érvénybe. @@ -1752,353 +1833,353 @@ To cancel the First Time Wizard completely, press the finish button now. OpenLP Display - + OpenLP megjelenítés OpenLP.MainWindow - + &File &Fájl - + &Import &Importálás - + &Export &Exportálás - + &View &Nézet - + M&ode &Mód - + &Tools &Eszközök - + &Settings &Beállítások - + &Language &Nyelv - + &Help &Súgó - + Media Manager Médiakezelő - + Service Manager - Szolgálatkezelő + Sorrendkezelő - + Theme Manager Témakezelő - + &New &Új - + Ctrl+N - + &Open Meg&nyitás - + Open an existing service. - Meglévő szolgálat megnyitása. + Meglévő sorrend megnyitása. - + Ctrl+O - + &Save &Mentés - + Save the current service to disk. - Aktuális szolgálat mentése lemezre. + Aktuális sorrend mentése lemezre. - + Ctrl+S - + Save &As... - Mentés má&sként... + Mentés má&sként… + + + + Save Service As + Sorrend mentése másként - Save Service As - Szolgálat mentése másként + Save the current service under a new name. + Az aktuális sorrend más néven való mentése. - Save the current service under a new name. - Az aktuális szolgálat más néven való mentése. - - - Ctrl+Shift+S - + E&xit &Kilépés - + Quit OpenLP OpenLP bezárása - + Alt+F4 - + &Theme &Téma - + &Configure OpenLP... - OpenLP &beállítása... + OpenLP &beállítása… - + &Media Manager &Médiakezelő - + Toggle Media Manager Médiakezelő átváltása - + Toggle the visibility of the media manager. A médiakezelő láthatóságának átváltása. - + F8 - + &Theme Manager &Témakezelő - + Toggle Theme Manager Témakezelő átváltása - + Toggle the visibility of the theme manager. A témakezelő láthatóságának átváltása. - + F10 - + &Service Manager - &Szolgálatkezelő + &Sorrendkezelő + + + + Toggle Service Manager + Sorrendkezelő átváltása - Toggle Service Manager - Szolgálatkezelő átváltása + Toggle the visibility of the service manager. + A sorrendkezelő láthatóságának átváltása. - Toggle the visibility of the service manager. - A szolgálatkezelő láthatóságának átváltása. - - - F9 - + &Preview Panel &Előnézet panel - + Toggle Preview Panel Előnézet panel átváltása - + Toggle the visibility of the preview panel. Az előnézet panel láthatóságának átváltása. - + F11 - + &Live Panel &Élő adás panel - + Toggle Live Panel Élő adás panel átváltása - + Toggle the visibility of the live panel. Az élő adás panel láthatóságának átváltása. - + F12 - + &Plugin List &Bővítménylista - + List the Plugins Bővítmények listája - + Alt+F7 - + &User Guide &Felhasználói kézikönyv - + &About &Névjegy - + More information about OpenLP További információ az OpenLP-ről - + Ctrl+F1 - + &Online Help &Online súgó - + &Web Site &Weboldal - + Use the system language, if available. Rendszernyelv használata, ha elérhető. - + Set the interface language to %s A felhasználói felület nyelvének átváltása erre: %s - + Add &Tool... - &Eszköz hozzáadása... + &Eszköz hozzáadása… - + Add an application to the list of tools. Egy alkalmazás hozzáadása az eszközök listához. - + &Default &Alapértelmezett - + Set the view mode back to the default. Nézetmód visszaállítása az alapértelmezettre. - + &Setup &Szerkesztés - + Set the view mode to Setup. Nézetmód váltása a Beállítás módra. - + &Live &Élő adás - + Set the view mode to Live. Nézetmód váltása a Élő módra. - + Version %s of OpenLP is now available for download (you are currently running version %s). You can download the latest version from http://openlp.org/. @@ -2107,29 +2188,29 @@ You can download the latest version from http://openlp.org/. A legfrissebb verzió a http://openlp.org/ oldalról szerezhető be. - + OpenLP Version Updated OpenLP verziófrissítés - + OpenLP Main Display Blanked Sötét OpenLP fő képernyő - + The Main Display has been blanked out A fő képernyő el lett sötétítve - + Default Theme: %s Alapértelmezett téma: %s - + Configure &Shortcuts... - &Gyorsbillentyűk beállítása... + &Gyorsbillentyűk beállítása… @@ -2138,44 +2219,44 @@ A legfrissebb verzió a http://openlp.org/ oldalról szerezhető be.Magyar - - Close OpenLP - - - - - Are you sure you want to close OpenLP? - + + Print the current Service Order. + Az aktuális sorrend nyomtatása. - Print the current Service Order. - - - - Ctrl+P - + - - Open &Data Folder... - - - - - Open the folder where songs, bibles and other data resides. - - - - + &Configure Display Tags - + Megjelenítési &címkek beállítása - + &Autodetect - + &Automatikus felismerés + + + + Open &Data Folder... + &Adatmappa megnyitása… + + + + Open the folder where songs, bibles and other data resides. + A dalokat, Bibliákat és egyéb adatokat tartalmazó mappa megnyitása. + + + + Close OpenLP + OpenLP bezárása + + + + Are you sure you want to close OpenLP? + Biztosan bezárható az OpenLP? @@ -2188,37 +2269,37 @@ A legfrissebb verzió a http://openlp.org/ oldalról szerezhető be. &Add to selected Service Item - &Hozzáadás a kijelölt szolgálat elemhez + &Hozzáadás a kijelölt sorrend elemhez You must select one or more items to preview. - Ki kell választani egy elemet az előnézethez. + Ki kell jelölni egy elemet az előnézethez. You must select one or more items to send live. - Ki kell választani egy élő adásba küldendő elemet. + Ki kell jelölni egy élő adásba küldendő elemet. You must select one or more items. - Ki kell választani egy vagy több elemet. + Ki kell jelölni egy vagy több elemet. You must select an existing service item to add to. - Ki kell választani egy szolgálati elemet, amihez hozzá szeretné adni. + Ki kell jelölni egy sorrend elemet, amihez hozzá szeretné adni. Invalid Service Item - Érvénytelen szolgálat elem + Érvénytelen sorrend elem You must select a %s service item. - Ki kell választani egy %s szolgálati elemet. + Ki kell jelölni egy %s sorrend elemet. @@ -2269,12 +2350,12 @@ A legfrissebb verzió a http://openlp.org/ oldalról szerezhető be. Fit Page - + Oldal kitöltése Fit Width - + Szélesség kitöltése @@ -2282,62 +2363,62 @@ A legfrissebb verzió a http://openlp.org/ oldalról szerezhető be. Options - + Beállítások Close - + Bezárás Copy - + Másolás Copy as HTML - + Másolás HTML-ként Zoom In - + Nagyítás Zoom Out - + Kicsinyítés Zoom Original - + Eredeti nagyítás Other Options - + További beállítások Include slide text if available - + Dia szövegének beillesztése, ha elérhető Include service item notes - + Sorrend elem megjegyzéseinek beillesztése Include play length of media items - + Sorrend elem lejátszási hosszának beillesztése Service Order Sheet - + Szolgálati sorrend adatlap @@ -2345,12 +2426,12 @@ A legfrissebb verzió a http://openlp.org/ oldalról szerezhető be. Screen - + Képernyő primary - + elsődleges @@ -2358,7 +2439,7 @@ A legfrissebb verzió a http://openlp.org/ oldalról szerezhető be. Reorder Service Item - Szolgálati elemek újrarendezése + Sorrend elemek újrarendezése @@ -2366,17 +2447,17 @@ A legfrissebb verzió a http://openlp.org/ oldalról szerezhető be. Load an existing service - Egy meglévő szolgálat betöltése + Egy meglévő szolgálati sorrend betöltése Save this service - Aktuális szolgálat mentése + Aktuális szolgálati sorrend mentése Select a theme for the service - Válasszon egy témát a szolgálathoz + Jelöljön ki egy témát a sorrendhez @@ -2386,7 +2467,7 @@ A legfrissebb verzió a http://openlp.org/ oldalról szerezhető be. Move item to the top of the service. - Elem mozgatása a szolgálat elejére. + Elem mozgatása a sorrend elejére. @@ -2396,7 +2477,7 @@ A legfrissebb verzió a http://openlp.org/ oldalról szerezhető be. Move item up one position in the service. - Elem mozgatása a szolgálatban eggyel feljebb. + Elem mozgatása a sorrendben eggyel feljebb. @@ -2406,7 +2487,7 @@ A legfrissebb verzió a http://openlp.org/ oldalról szerezhető be. Move item down one position in the service. - Elem mozgatása a szolgálatban eggyel lejjebb. + Elem mozgatása a sorrendben eggyel lejjebb. @@ -2416,17 +2497,17 @@ A legfrissebb verzió a http://openlp.org/ oldalról szerezhető be. Move item to the end of the service. - Elem mozgatása a szolgálat végére. + Elem mozgatása a sorrend végére. &Delete From Service - &Törlés a szolgálatból + &Törlés a sorrendből Delete the selected item from the service. - Kijelölt elem törlése a szolgálatból. + Kijelölt elem törlése a sorrendből. @@ -2458,17 +2539,22 @@ A legfrissebb verzió a http://openlp.org/ oldalról szerezhető be.&Change Item Theme Elem témájának &módosítása + + + OpenLP Service Files (*.osz) + OpenLP sorrend fájlok (*.osz) + File is not a valid service. The content encoding is not UTF-8. - A fájl nem érvényes szolgálat. + A fájl nem érvényes sorrend. A tartalom kódolása nem UTF-8. File is not a valid service. - A fájl nem érvényes szolgálat. + A fájl nem érvényes sorrend. @@ -2493,7 +2579,7 @@ A tartalom kódolása nem UTF-8. Expand all the service items. - Minden szolgálat elemet kibont. + Minden sorrend elem kibontása. @@ -2503,72 +2589,67 @@ A tartalom kódolása nem UTF-8. Collapse all the service items. - Minden szolgálat elemet összecsuk. - - - - 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 - + Minden sorrend elem összecsukása. Notes: - + Jegyzetek: + + + + Moves the selection down the window. + A kiválasztás lejjebb mozgatja az ablakot. + + + + Move up + Mozgatás feljebb + + + + Moves the selection up the window. + A kiválasztás feljebb mozgatja az ablakot. + + + + Go Live + Élő adásba + + + + Send the selected item to Live. + A kiválasztott elem élő adásba küldése. &Start Time - + &Kezdő időpont Show &Preview - + &Előnézet megjelenítése Show &Live - + Élő &adás megjelenítése + + + + Open File + Fájl megnyitása + + + + Modified Service + Módosított sorrend The current service has been modified. Would you like to save this service? - + Az aktuális sorrend módosult. Szeretnéd elmenteni? @@ -2576,7 +2657,7 @@ A tartalom kódolása nem UTF-8. Service Item Notes - Szolgálat elem jegyzetek + Sorrend elem jegyzetek @@ -2597,7 +2678,7 @@ A tartalom kódolása nem UTF-8. Action - Művelet + Parancs @@ -2632,7 +2713,7 @@ A tartalom kódolása nem UTF-8. Alternate - + Alternatív @@ -2680,7 +2761,7 @@ A tartalom kódolása nem UTF-8. Go To - Ugrás erre + Ugrás @@ -2705,27 +2786,27 @@ A tartalom kódolása nem UTF-8. Previous Slide - + Előző dia Next Slide - + Következő dia Previous Service - + Előző sorrend Next Service - + Következő sorrend Escape Item - + Kilépés az elemből @@ -2746,32 +2827,32 @@ A tartalom kódolása nem UTF-8. Item Start Time - + Elem kezdő időpontja Hours: - + Óra: h - + ó m - + p Minutes: - + Perc: Seconds: - + Másodperc: @@ -2804,7 +2885,7 @@ A tartalom kódolása nem UTF-8. (%d lines per slide) - (%d sor diánként) + (%d sor diánként) @@ -2877,7 +2958,17 @@ A tartalom kódolása nem UTF-8. You must select a theme to edit. - Ki kell választani témát a szerkesztéshez. + Ki kell jelölni egy témát a szerkesztéshez. + + + + You must select a theme to delete. + Ki kell jelölni egy témát a törléshez. + + + + Delete Confirmation + Törlés megerősítése @@ -2887,7 +2978,7 @@ A tartalom kódolása nem UTF-8. You have not selected a theme. - Nincs kiválasztva egy téma sem. + Nincs kijelölve egy téma sem. @@ -2917,7 +3008,7 @@ A tartalom kódolása nem UTF-8. Select Theme Import File - Importálandó téma fájl kiválasztása + Importálandó téma fájl kijelölése @@ -2951,50 +3042,40 @@ A tartalom kódolása nem UTF-8. &Export Theme Téma e&xportálása + + + Delete %s theme? + Törölhető ez a téma: %s? + You must select a theme to rename. - + Ki kell jelölni egy témát az átnevezéséhez. Rename Confirmation - + Átnevezési megerősítés Rename %s theme? - - - - - You must select a theme to delete. - - - - - Delete Confirmation - - - - - Delete %s theme? - - - - - Validation Error - - - - - A theme with this name already exists. - + A téma átnevezhető: %s? OpenLP Themes (*.theme *.otz) - + OpenLP témák (*.theme *.otz) + + + + Validation Error + Érvényességi hiba + + + + A theme with this name already exists. + Ilyen fájlnéven már létezik egy téma. @@ -3067,7 +3148,7 @@ A tartalom kódolása nem UTF-8. Bottom Left - Top Right - Bal alső sarokbó jobb felső sarokba + Bal alsó sarokból jobb felső sarokba @@ -3219,25 +3300,25 @@ A tartalom kódolása nem UTF-8. Theme name: Téma neve: + + + Edit Theme - %s + Téma szerkesztése – %s + This wizard will help you to create and edit your themes. Click the next button below to start the process by setting up your background. - + A tündérrel témákat lehet létrehozni és módosítani. Az alább található Tovább gombra való kattintással indítható a folyamat első lépése a háttér beállításával. Transitions: - + Átmenetek: &Footer Area - - - - - Edit Theme - %s - + &Lábléc @@ -3260,17 +3341,17 @@ A tartalom kódolása nem UTF-8. Use the theme from each song in the database. If a song doesn't have a theme associated with it, then use the service's theme. If the service doesn't have a theme, then use the global theme. - Minden dalra az adatbázisban tárolt téma alkalmazása. Ha egy dalhoz nincs saját téma beállítva, akkor a szolgálathoz beállított alkalmazása. Ha a szolgálathoz sincs téma beállítva, akkor a globális téma alkalmazása. + Minden dalra az adatbázisban tárolt téma alkalmazása. Ha egy dalhoz nincs saját téma beállítva, akkor a szolgálati sorrendhez beállított alkalmazása. Ha a sorrendhez sincs téma beállítva, akkor a globális téma alkalmazása. &Service Level - Szolgálati &szint + Szolgálati sorrend &szint Use the theme from the service, overriding any of the individual songs' themes. If the service doesn't have a theme, then use the global theme. - A szolgálathoz beállított téma alkalmazása, vagyis az egyes dalokhoz megadott témák felülírása. Ha a szolgálathoz nincs téma beállítva, akkor a globális téma alkalmazása. + A szolgálati sorrendhez beállított téma alkalmazása, vagyis az egyes dalokhoz megadott témák felülírása. Ha a szolgálati sorrendhez nincs téma beállítva, akkor a globális téma alkalmazása. @@ -3280,421 +3361,421 @@ A tartalom kódolása nem UTF-8. Use the global theme, overriding any themes associated with either the service or the songs. - A globális téma alkalmazása, vagyis a szolgálathoz, ill. a dalokhoz beállított témák felülírása. + A globális téma alkalmazása, vagyis a szolgálati sorrendhez, ill. a dalokhoz beállított témák felülírása. OpenLP.Ui - - Error - Hiba - - - - &Delete - &Törlés - - - - Delete the selected item. - - - - - Move selection up one position. - - - - - Move selection down one position. - + + About + Névjegy &Add - &Hozzáadás + &Hozzáadás Advanced - Haladó + Haladó All Files - Minden fájl - - - - Create a new service. - Új szolgálat létrehozása. - - - - &Edit - &Szerkesztés - - - - Import - Importálás - - - - Length %s - - - - - Live - Élő adás - - - - Load - Betöltés - - - - New - - - - - New Service - Új szolgálat - - - - OpenLP 2.0 - - - - - Open Service - Szolgálat megnyitása - - - - Preview - Előnézet - - - - Replace Background - Háttér cseréje - - - - Replace Live Background - Élő adás hátterének cseréje - - - - Reset Background - - - - - Reset Live Background - Élő adás hátterének visszaállítása - - - - Save Service - Szolgálat mentése - - - - Service - Szolgálat - - - - Start %s - - - - - &Vertical Align: - - - - - Top - Felülre - - - - Middle - Középre + Minden fájl Bottom - Alulra - - - - About - Névjegy + Alulra Browse... - Tallózás... + Tallózás… Cancel - Mégsem + Mégsem CCLI number: - CCLI szám: + CCLI szám: + + + + Create a new service. + Új szolgálati sorrend létrehozása. + + + + &Delete + &Törlés + + + + &Edit + &Szerkesztés Empty Field - + Üres mező + + + + Error + Hiba Export - + Exportálás pt Abbreviated font pointsize unit - + Image - Kép + Kép + + + + Import + Importálás + + + + Length %s + Hossz %s + + + + Live + Élő adás Live Background Error - + Élő háttér hiba Live Panel - + Élő panel + + + + Load + Betöltés + + + + Middle + Középre + + + + New + Új + + + + New Service + Új sorrend New Theme - Új téma + Új téma No File Selected Singular - + Nincs kijelölt fájl No Files Selected Plural - + Nincsenek kijelölt fájlok No Item Selected Singular - + Nincs kijelölt elem No Items Selected Plural - Nincs kijelölt elem + Nincsenek kijelölt elemek openlp.org 1.x - + + + + + OpenLP 2.0 + + + + + Open Service + Sorrend megnyitása + + + + Preview + Előnézet Preview Panel - + Előnézet panel Print Service Order - + Szolgálati sorrend nyomtatása + + + + Replace Background + Háttér cseréje + + + + Replace Live Background + Élő adás hátterének cseréje + + + + Reset Background + Háttér visszaállítása + + + + Reset Live Background + Élő adás hátterének visszaállítása s The abbreviated unit for seconds - mp + mp Save && Preview - Mentés és előnézet + Mentés és előnézet Search - Keresés + Keresés You must select an item to delete. - Ki kell választani egy törlendő elemet. + Ki kell jelölni egy törlendő elemet. You must select an item to edit. - Ki kell választani egy szerkesztendő elemet. + Ki kell jelölni egy szerkesztendő elemet. + + + + Save Service + Sorrend mentése + + + + Service + Sorrend + + + + Start %s + Kezdés %s Theme Singular - Téma + Téma Themes Plural - Témák + Témák + + + + Top + Felülre Version - + Verzió + + + + Delete the selected item. + Kiválasztott elem törlése. + + + + Move selection up one position. + Kiválasztás eggyel feljebb helyezése. + + + + Move selection down one position. + Kiválasztás eggyel lejjebb helyezése. + + + + &Vertical Align: + &Függőleges igazítás: Finished import. - Az importálás befejeződött. + Az importálás befejeződött. Format: - Formátum: + Formátum: Importing - Importálás + Importálás Importing "%s"... - Importálás „%s”... + Importálás „%s”… Select Import Source - Válaszd ki az importálandó forrást + Jelölj ki az importálandó forrást Select the import format and the location to import from. - + Jelöld ki az importálás formátumát és az importálás helyét. The openlp.org 1.x importer has been disabled due to a missing Python module. If you want to use this importer, you will need to install the "python-sqlite" module. - Az openlp.org 1.x importáló le lett tiltva egy hiányzó Python modul miatt. Ha szeretnéd használni ezt az importálót, telepíteni kell a „python-sqlite” modult. + Az openlp.org 1.x importáló le lett tiltva egy hiányzó Python modul miatt. Ha szeretnéd használni ezt az importálót, telepíteni kell a „python-sqlite” modult. Open %s File - + % fájl megnyitása %p% - + Ready. - Kész. + Kész. Starting import... - Importálás indítása... + Importálás indítása… You need to specify at least one %s file to import from. A file type e.g. OpenSong - + Ki kell választani legalább egy %s fájlt az importáláshoz. Welcome to the Bible Import Wizard - Üdvözlet a Bibliaimportáló tündérben + Üdvözlet a Bibliaimportáló tündérben Welcome to the Song Export Wizard - + Üdvözlet a dalexportáló tündérben Welcome to the Song Import Wizard - Üdvözlet a dalimportáló tündérben + Üdvözlet a dalimportáló tündérben Author Singular - + Szerző Authors Plural - Szerzők + Szerzők © Copyright symbol. - + Song Book Singular - Énekeskönyv + Énekeskönyv Song Books Plural - Énekeskönyvek + Énekeskönyvek Song Maintenance - Dalok kezelése + Dalok kezelése Topic Singular - Témakör + Témakör Topics Plural - Témakörök + Témakörök @@ -3702,7 +3783,7 @@ A tartalom kódolása nem UTF-8. Configure Display Tags - + Megjelenítési címkék beállítása @@ -3735,25 +3816,25 @@ A tartalom kódolása nem UTF-8. Add the selected Presentation to the service - A kijelölt bemutató hozzáadása a szolgálathoz + A kijelölt bemutató hozzáadása a sorrendhez Presentation name singular - Bemutató + Bemutató Presentations name plural - Bemutatók + Bemutatók Presentations container title - Bemutatók + Bemutatók @@ -3761,7 +3842,7 @@ A tartalom kódolása nem UTF-8. Select Presentation(s) - Bemutató(k) kiválasztása + Bemutató(k) kijelölése @@ -3796,22 +3877,22 @@ A tartalom kódolása nem UTF-8. Presentations (%s) - + Bemutatók (%s) Missing Presentation - - - - - The Presentation %s no longer exists. - + Hiányzó bemutató The Presentation %s is incomplete, please reload. - + A(z) %s bemutató hiányos, újra kell tölteni. + + + + The Presentation %s no longer exists. + A(z) %s bemutató már nem létezik. @@ -3829,7 +3910,7 @@ A tartalom kódolása nem UTF-8. %s (unavailable) - + %s (elérhetetlen) @@ -3843,19 +3924,19 @@ A tartalom kódolása nem UTF-8. Remote name singular - Távvezérlő + Távvezérlő Remotes name plural - Távvezérlők + Távvezérlők Remote container title - Távvezérlő + Távvezérlő @@ -3916,25 +3997,25 @@ A tartalom kódolása nem UTF-8. <strong>SongUsage Plugin</strong><br />This plugin tracks the usage of songs in services. - <strong>Dalstatisztika bővítmény</strong><br />Ez a bővítmény rögzíti, hogy a dalok mikor lettek vetítve egy élő szolgálat során. + <strong>Dalstatisztika bővítmény</strong><br />Ez a bővítmény rögzíti, hogy a dalok mikor lettek vetítve egy élő szolgálat vagy istentisztelet során. SongUsage name singular - Dalstatisztika + Dalstatisztika SongUsage name plural - Dalstatisztika + Dalstatisztika SongUsage container title - Dalstatisztika + Dalstatisztika @@ -3957,12 +4038,12 @@ A tartalom kódolása nem UTF-8. Deletion Successful - + Sikeres törlés All requested data has been deleted successfully. - + Minden kért adat sikeresen törlésre került. @@ -3975,7 +4056,7 @@ A tartalom kódolása nem UTF-8. Select Date Range - Időintervallum megadása + Időintervallum kijelölése @@ -3992,32 +4073,32 @@ A tartalom kódolása nem UTF-8. Output File Location Kimeneti fájl elérési útvonala + + + Output Path Not Selected + Kimeneti útvonal nincs kijelölve + + + + You have not set a valid output location for your song usage report. Please select an existing path on your computer. + Egy nem létező útvonalat adtál meg a dalstatisztika riporthoz. Jelölj ki egy érvényes űtvonalat a számítógépen. + usage_detail_%s_%s.txt - + Dalstatisztika_%s%s.txt Report Creation - + Riport készítése Report %s has been successfully created. - - - - - Output Path Not Selected - - - - - You have not set a valid output location for your song usage report. Please select an existing path on your computer. - + A(z) %s riport sikeresen elkészült. @@ -4050,7 +4131,7 @@ has been successfully created. Reindexing songs... - Dalok indexelése folyamatban... + Dalok indexelése folyamatban… @@ -4080,118 +4161,121 @@ has been successfully created. Add the selected Song to the service - A kijelölt dal hozzáadása a szolgálathoz - - - - Song - name singular - Dal - - - - Songs - name plural - Dalok - - - - Songs - container title - Dalok + A kijelölt dal hozzáadása a sorrendhez Arabic (CP-1256) - Arab (CP-1256) + Arab (CP-1256) Baltic (CP-1257) - Balti (CP-1257) + Balti (CP-1257) Central European (CP-1250) - Közép-európai (CP-1250) + Közép-európai (CP-1250) Cyrillic (CP-1251) - Cirill (CP-1251) + Cirill (CP-1251) Greek (CP-1253) - Görög (CP-1253) + Görög (CP-1253) Hebrew (CP-1255) - Héber (CP-1255) + Héber (CP-1255) Japanese (CP-932) - Japán (CP-932) + Japán (CP-932) Korean (CP-949) - Koreai (CP-949) + Koreai (CP-949) Simplified Chinese (CP-936) - Egyszerűsített kínai (CP-936) + Egyszerűsített kínai (CP-936) Thai (CP-874) - Thai (CP-874) + Thai (CP-874) Traditional Chinese (CP-950) - Hagyományos kínai (CP-950) + Hagyományos kínai (CP-950) Turkish (CP-1254) - Török (CP-1254) + Török (CP-1254) Vietnam (CP-1258) - Vietnámi (CP-1258) + Vietnami (CP-1258) Western European (CP-1252) - Nyugat-európai (CP-1252) + Nyugat-európai (CP-1252) Character Encoding - + Karakterkódolás The codepage setting is responsible for the correct character representation. Usually you are fine with the preselected choice. - + A kódlap beállítás felelős +a karakterek helyes megjelenítéséért. +Általában az előre beállított érték megfelelő. Please choose the character encoding. The encoding is responsible for the correct character representation. - + Válasszd ki a karakterkódolást. +A kódlap felelős a karakterek helyes megjelenítéséért. Exports songs using the export wizard. - + Dalok exportálása a dalexportáló tündérrel. + + + + Song + name singular + Dal + + + + Songs + name plural + Dalok + + + + Songs + container title + Dalok @@ -4237,7 +4321,7 @@ The encoding is responsible for the correct character representation. Importing song %d of %d - + Dalok importálása %d/%d @@ -4280,7 +4364,7 @@ The encoding is responsible for the correct character representation. &Add to Song - &Hozzáadás dalhoz + &Hozzáadás @@ -4295,7 +4379,7 @@ The encoding is responsible for the correct character representation. A&dd to Song - &Hozzáadás dalhoz + H&ozzáadás @@ -4335,7 +4419,7 @@ The encoding is responsible for the correct character representation. Theme, Copyright Info && Comments - Téma, szerzői jogi infók és megjegyzések + Téma, szerzői jog és megjegyzések @@ -4355,7 +4439,7 @@ The encoding is responsible for the correct character representation. You have not selected a valid author. Either select an author from the list, or type in a new author and click the "Add Author to Song" button to add the new author. - Nincs kiválasztva egyetlen szerző sem. Vagy válassz egy szerzőt a listából, vagy írj az új szerző mezőbe és kattints az „Szerző hozzáadása a dalhoz” gombon a szerző megjelöléséhez. + Nincs kijelölve egyetlen szerző sem. Vagy válassz egy szerzőt a listából, vagy írj az új szerző mezőbe és kattints az „Szerző hozzáadása a dalhoz” gombon a szerző megjelöléséhez. @@ -4375,7 +4459,7 @@ The encoding is responsible for the correct character representation. You have not selected a valid topic. Either select a topic from the list, or type in a new topic and click the "Add Topic to Song" button to add the new topic. - Nincs kiválasztva egyetlen témakör sem. Vagy válassz egy témakört a listából, vagy írj az új témakör mezőbe és kattints a Témakör hozzáadása a dalhoz gombon a témakör megjelöléséhez. + Nincs kijelölve egyetlen témakör sem. Vagy válassz egy témakört a listából, vagy írj az új témakör mezőbe és kattints a Témakör hozzáadása a dalhoz gombon a témakör megjelöléséhez. @@ -4415,12 +4499,12 @@ The encoding is responsible for the correct character representation. You need to have an author for this song. - + Egy szerzőt meg kell adnod ehhez a dalhoz. You need to type some text in to the verse. - + Meg kell adnod a versszak szövegét. @@ -4446,82 +4530,82 @@ The encoding is responsible for the correct character representation. Song Export Wizard - + Dalexportáló tündér This wizard will help to export your songs to the open and free OpenLyrics worship song format. - + A tündérrel a szabad OpenLyrics formátumba lehet exportálni a dalokat. 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... - + Dalok kijelölése Check the songs you want to export. - + Jelöld ki az exportálandó dalokat. + + + + Uncheck All + Minden kijelölés eltávolítása + + + + Check All + Mindent kijelöl + + + + Select Directory + Mappa kijelölése + + + + Select the directory you want the songs to be saved. + Jelöld ki a mappát, ahová a dalok mentésre kerülnek. + + + + Directory: + Mappa: + + + + Exporting + Exportálás + + + + Please wait while your songs are exported. + Várj, míg a dalok exportálódnak. + + + + You need to add at least one Song to export. + Ki kell választani legalább egy dalt az exportáláshoz. + + + + No Save Location specified + Nincs megadva a mentési hely You need to specify a directory. - + Egy mappát kell megadni. + + + + Starting export... + Exportálás indítása… Select Destination Folder - + Célmappa kijelölése @@ -4529,7 +4613,7 @@ The encoding is responsible for the correct character representation. Select Document/Presentation Files - Válassz dokumentum vagy bemutató fájlokat + Jelölj ki egy dokumentum vagy egy bemutató fájlokat @@ -4554,7 +4638,7 @@ The encoding is responsible for the correct character representation. Add Files... - Fájlok hozzáadása... + Fájlok hozzáadása… @@ -4601,30 +4685,30 @@ The encoding is responsible for the correct character representation. Administered by %s Adminisztrálta: %s + + + You need to specify at least one document or presentation file to import from. + Ki kell jelölnie legalább egy dokumentumot vagy bemutatót az importáláshoz. + Songs Of Fellowship Song Files - + Songs Of Fellowship dal fájlok SongBeamer Files - + SongBeamer fájlok SongShow Plus Song Files - - - - - You need to specify at least one document or presentation file to import from. - + SongShow Plus dal fájlok Foilpresenter Song Files - + Foilpresenter dal fájlok @@ -4657,13 +4741,13 @@ The encoding is responsible for the correct character representation. Entire Song - + Teljes dal Are you sure you want to delete the %n selected song(s)? - - + + Törölhetők a kijelölt dalok: %n? @@ -4672,7 +4756,7 @@ The encoding is responsible for the correct character representation. Importing song %d of %d. - + Dalok importálása %d/%d. @@ -4680,7 +4764,7 @@ The encoding is responsible for the correct character representation. Exporting "%s"... - + Exportálás „%s”… @@ -4711,12 +4795,12 @@ The encoding is responsible for the correct character representation. Finished export. - + Exportálás befejeződött. Your song export failed. - + Dalexportálás meghiúsult. @@ -4830,17 +4914,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? - + Ez a szerző már létezik: %s. Szeretnéd, hogy a dal – melynek szerzője %s – a már létező szerző (%s) dalai közé kerüljön rögzítésre? The topic %s already exists. Would you like to make songs with topic %s use the existing topic %s? - + Ez a témakör már létezik: %s. Szeretnéd, hogy a dal – melynek témaköre: %s – a már létező témakörben (%s) kerüljön rögzítésre? The book %s already exists. Would you like to make songs with book %s use the existing book %s? - + Ez a könyv már létezik: %s. Szeretnéd, hogy a dal – melynek köynve: %s – a már létező könyvben (%s) kerüljön rögzítésre? @@ -4863,12 +4947,12 @@ The encoding is responsible for the correct character representation. Update service from song edit - Szolgálat frissítése a dal módosításából + Sorrend frissítése a dal módosításából Add missing songs when opening service - Hiányzó dalok hozzáadása a szolgálat megnyitásakor + Hiányzó dalok hozzáadása a sorrend megnyitásakor diff --git a/resources/i18n/id.ts b/resources/i18n/id.ts index ef982cae3..977dba6d8 100644 --- a/resources/i18n/id.ts +++ b/resources/i18n/id.ts @@ -1451,102 +1451,102 @@ Version: %s OpenLP.FirstTimeWizard - + Downloading %s... - + Download complete. Click the finish button to start OpenLP. - + Enabling selected plugins... - + First Time Wizard - + Welcome to the First Time Wizard - + 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. - + Activate required Plugins - + Select the Plugins you wish to use. - + Songs - + Custom Text - + Bible Alkitab - + Images - + Presentations - + Media (Audio and Video) - + Allow remote access - + Monitor Song Usage - + Allow Alerts - + No Internet Connection - + Unable to detect an Internet connection. - + 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. To 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. @@ -1555,67 +1555,67 @@ To cancel the First Time Wizard completely, press the finish button now. - + Sample Songs - + Select and download public domain songs. - + Sample Bibles - + Select and download free Bibles. - + Sample Themes - + Select and download sample themes. - + Default Settings - + Set up default settings to be used by OpenLP. - + Setting Up And Importing - + Please wait while OpenLP is set up and your data is imported. - + Default output display: - + Select default theme: - + Starting configuration process... @@ -1741,12 +1741,12 @@ To cancel the First Time Wizard completely, press the finish button now. OpenLP.LanguageManager - + Language - + Please restart OpenLP to use your new language setting. @@ -1762,369 +1762,369 @@ To cancel the First Time Wizard completely, press the finish button now. OpenLP.MainWindow - + &File - + &Import &Impor - + &Export - + &View - + M&ode - + &Tools - + &Settings - + &Language - + &Help - + Media Manager - + Service Manager - + Theme Manager - + &New &Baru - + Ctrl+N - + &Open - + Open an existing service. - + Ctrl+O - + &Save &Simpan - + Save the current service to disk. - + Ctrl+S - + Save &As... - + Save Service As - + Save the current service under a new name. - + Ctrl+Shift+S - + E&xit - + Quit OpenLP - + Alt+F4 - + &Theme - + &Configure OpenLP... - + &Media Manager - + Toggle Media Manager - + Toggle the visibility of the media manager. - + F8 - + &Theme Manager - + Toggle Theme Manager - + Toggle the visibility of the theme manager. - + F10 - + &Service Manager - + Toggle Service Manager - + Toggle the visibility of the service manager. - + F9 - + &Preview Panel - + Toggle Preview Panel - + Toggle the visibility of the preview panel. - + F11 - + &Live Panel - + Toggle Live Panel - + Toggle the visibility of the live panel. - + F12 - + &Plugin List - + List the Plugins - + Alt+F7 - + &User Guide - + &About - + More information about OpenLP - + Ctrl+F1 - + &Online Help - + &Web Site - + Use the system language, if available. - + Set the interface language to %s - + Add &Tool... - + Add an application to the list of tools. - + &Default - + Set the view mode back to the default. - + &Setup - + Set the view mode to Setup. - + &Live - + Set the view mode to Live. - + Version %s of OpenLP is now available for download (you are currently running version %s). 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 @@ -2135,47 +2135,47 @@ 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 - + &Autodetect diff --git a/resources/i18n/ja.ts b/resources/i18n/ja.ts index 03a2580c7..9ab1f0cbc 100644 --- a/resources/i18n/ja.ts +++ b/resources/i18n/ja.ts @@ -1551,102 +1551,102 @@ Version: %s OpenLP.FirstTimeWizard - + Downloading %s... ダウンロード中 %s... - + Download complete. Click the finish button to start OpenLP. ダウンロードが完了しました。終了ボタンが押下されると、OpenLPを開始します。 - + Enabling selected plugins... 選択されたプラグインを有効化しています... - + First Time Wizard 初回利用ガイド - + Welcome to the First Time Wizard 初回起動ガイドへようこそ - + 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. このガイドは、初回起動時に、OpenLPを設定するお手伝いをします。次へボタンを押下し、OpenLPを設定していきましょう。 - + Activate required Plugins 必要なプラグインを有効化する - + Select the Plugins you wish to use. ご利用になるプラグインを選択してください。 - + Songs 賛美 - + Custom Text カスタムテキスト - + Bible 聖書 - + Images 画像 - + Presentations プレゼンテーション - + Media (Audio and Video) メディア(音声と動画) - + Allow remote access リモートアクセスを許可 - + Monitor Song Usage 賛美利用記録 - + Allow Alerts 警告を許可 - + No Internet Connection インターネット接続が見つかりません - + Unable to detect an Internet connection. インターネット接続が検知されませんでした。 - + 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. To 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. @@ -1659,67 +1659,67 @@ To cancel the First Time Wizard completely, press the finish button now. - + Sample Songs サンプル賛美 - + Select and download public domain songs. - 以下のパブリックドメインの賛美を選択して下さい。 + 以下のキリスト教化において合法的に利用が可能な賛美を選択して下さい。 - + Sample Bibles サンプル聖書 - + Select and download free Bibles. 以下のフリー聖書を選択する事でダウンロードできます。 - + Sample Themes サンプル外観テーマ - + Select and download sample themes. サンプル外観テーマを選択して、ダウンロードして下さい。 - + Default Settings 既定設定 - + Set up default settings to be used by OpenLP. 既定設定がOpenLPに使われるようにセットアップします。 - + Setting Up And Importing セットアップとインポート中 - + Please wait while OpenLP is set up and your data is imported. OpenLPがセットアップされ、あなたのデータがインポートされるまでお待ち下さい。 - + Default output display: 既定出力先: - + Select default theme: 既定外観テーマを選択: - + Starting configuration process... 設定処理を開始しています... @@ -1845,12 +1845,12 @@ To cancel the First Time Wizard completely, press the finish button now. OpenLP.LanguageManager - + Language 言語 - + Please restart OpenLP to use your new language setting. 新しい言語設定を使用するために、OpenLPを再起動してください。 @@ -1866,347 +1866,347 @@ To cancel the First Time Wizard completely, press the finish button now. OpenLP.MainWindow - + &File ファイル(&F) - + &Import インポート(&I) - + &Export エクスポート(&E) - + &View 表示(&V) - + M&ode モード(&O) - + &Tools ツール(&T) - + &Settings 設定(&S) - + &Language 言語(&L) - + &Help ヘルプ(&H) - + Media Manager メディアマネジャー - + Service Manager 礼拝プログラム - + Theme Manager 外観テーママネジャー - + &New 新規作成(&N) - + Ctrl+N - + &Open 開く(&O) - + Open an existing service. 存在する礼拝プログラムを開きます。 - + Ctrl+O - + &Save 保存(&S) - + Save the current service to disk. 現在の礼拝プログラムをディスクに保存します。 - + Ctrl+S - + Save &As... 名前を付けて保存(&A)... - + Save Service As 名前をつけて礼拝プログラムを保存 - + Save the current service under a new name. 現在の礼拝プログラムを新しい名前で保存します。 - + Ctrl+Shift+S - + E&xit 終了(&X) - + Quit OpenLP Open LPを終了 - + Alt+F4 - + &Theme 外観テーマ(&T) - + &Configure OpenLP... OpenLPの設定(&C)... - + &Media Manager メディアマネジャー(&M) - + Toggle Media Manager メディアマネジャーを切り替える - + Toggle the visibility of the media manager. メディアマネジャーの可視性を切り替える。 - + F8 - + &Theme Manager 外観テーママネジャー(&T) - + Toggle Theme Manager 外観テーママネジャーの切り替え - + Toggle the visibility of the theme manager. 外観テーママネジャーの可視性を切り替える。 - + F10 - + &Service Manager 礼拝プログラム(&S) - + Toggle Service Manager 礼拝プログラムを切り替え - + Toggle the visibility of the service manager. 礼拝プログラムの可視性を切り替える。 - + F9 礼拝プログラム - + &Preview Panel プレビューパネル(&P) - + Toggle Preview Panel プレビューパネルの切り替え - + Toggle the visibility of the preview panel. プレビューパネルの可視性を切り替える。 - + F11 - + &Live Panel ライブパネル(&L) - + Toggle Live Panel ライブパネルの切り替え - + Toggle the visibility of the live panel. ライブパネルの可視性を切り替える。 - + F12 - + &Plugin List プラグイン一覧(&P) - + List the Plugins プラグイン一覧 - + Alt+F7 - + &User Guide ユーザガイド(&U) - + &About バージョン情報(&A) - + More information about OpenLP OpenLPの詳細情報 - + Ctrl+F1 - + &Online Help オンラインヘルプ(&O) - + &Web Site ウェブサイト(&W) - + Use the system language, if available. システム言語を可能であれば使用します。 - + Set the interface language to %s インターフェイス言語を%sに設定 - + Add &Tool... ツールの追加(&T)... - + Add an application to the list of tools. ツールの一覧にアプリケーションを追加。 - + &Default デフォルト(&D) - + Set the view mode back to the default. 表示モードを既定に戻す。 - + &Setup 設定(&S) - + Set the view mode to Setup. ビューモードに設定します。 - + &Live ライブ(&L) - + Set the view mode to Live. 表示モードをライブにします。 - + Version %s of OpenLP is now available for download (you are currently running version %s). You can download the latest version from http://openlp.org/. @@ -2215,22 +2215,22 @@ You can download the latest version from http://openlp.org/. http://openlp.org/から最新版がダウンロード可能です。 - + OpenLP Version Updated OpenLPのバージョンアップ完了 - + OpenLP Main Display Blanked OpenLPのプライマリディスプレイがブランクです - + The Main Display has been blanked out OpenLPのプライマリディスプレイがブランクになりました - + Default Theme: %s 既定外観テーマ @@ -2241,47 +2241,47 @@ http://openlp.org/から最新版がダウンロード可能です。日本語 - + Configure &Shortcuts... ショートカットの設定(&S)... - + Close OpenLP OpenLPの終了 - + Are you sure you want to close OpenLP? 本当にOpenLPを終了してもよろしいですか? - + Print the current Service Order. 現在の礼拝プログラム順序を印刷します。 - + Ctrl+P - + &Configure Display Tags 表示タグを設定(&C) - + Open &Data Folder... データフォルダを開く(&D)... - + Open the folder where songs, bibles and other data resides. 賛美、聖書データなどのデータが含まれているフォルダを開く。 - + &Autodetect 自動検出(&A) diff --git a/resources/i18n/ko.ts b/resources/i18n/ko.ts index 1b3164d08..19693e6df 100644 --- a/resources/i18n/ko.ts +++ b/resources/i18n/ko.ts @@ -1441,102 +1441,102 @@ Version: %s OpenLP.FirstTimeWizard - + Downloading %s... - + Download complete. Click the finish button to start OpenLP. - + Enabling selected plugins... - + First Time Wizard - + Welcome to the First Time Wizard - + 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. - + Activate required Plugins - + Select the Plugins you wish to use. - + Songs - + Custom Text - + Bible - + Images - + Presentations - + Media (Audio and Video) - + Allow remote access - + Monitor Song Usage - + Allow Alerts - + No Internet Connection - + Unable to detect an Internet connection. - + 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. To 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. @@ -1545,67 +1545,67 @@ To cancel the First Time Wizard completely, press the finish button now. - + Sample Songs - + Select and download public domain songs. - + Sample Bibles - + Select and download free Bibles. - + Sample Themes - + Select and download sample themes. - + Default Settings - + Set up default settings to be used by OpenLP. - + Setting Up And Importing - + Please wait while OpenLP is set up and your data is imported. - + Default output display: - + Select default theme: - + Starting configuration process... @@ -1731,12 +1731,12 @@ To cancel the First Time Wizard completely, press the finish button now. OpenLP.LanguageManager - + Language - + Please restart OpenLP to use your new language setting. @@ -1752,369 +1752,369 @@ To cancel the First Time Wizard completely, press the finish button now. OpenLP.MainWindow - + &File - + &Import - + &Export - + &View - + M&ode - + &Tools - + &Settings - + &Language - + &Help - + Media Manager - + Service Manager - + Theme Manager - + &New 새로 만들기(&N) - + Ctrl+N - + &Open - + Open an existing service. - + Ctrl+O - + &Save 저장(&S) - + Save the current service to disk. - + Ctrl+S - + Save &As... - + Save Service As - + Save the current service under a new name. - + Ctrl+Shift+S - + E&xit - + Quit OpenLP - + Alt+F4 - + &Theme - + &Configure OpenLP... - + &Media Manager - + Toggle Media Manager - + Toggle the visibility of the media manager. - + F8 - + &Theme Manager - + Toggle Theme Manager - + Toggle the visibility of the theme manager. - + F10 - + &Service Manager - + Toggle Service Manager - + Toggle the visibility of the service manager. - + F9 - + &Preview Panel - + Toggle Preview Panel - + Toggle the visibility of the preview panel. - + F11 - + &Live Panel - + Toggle Live Panel - + Toggle the visibility of the live panel. - + F12 - + &Plugin List - + List the Plugins - + Alt+F7 - + &User Guide - + &About - + More information about OpenLP - + Ctrl+F1 - + &Online Help - + &Web Site - + Use the system language, if available. - + Set the interface language to %s - + Add &Tool... - + Add an application to the list of tools. - + &Default - + Set the view mode back to the default. - + &Setup - + Set the view mode to Setup. - + &Live - + Set the view mode to Live. - + Version %s of OpenLP is now available for download (you are currently running version %s). 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 @@ -2125,47 +2125,47 @@ 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 - + &Autodetect diff --git a/resources/i18n/nb.ts b/resources/i18n/nb.ts index fe11c9e2f..8986f7674 100644 --- a/resources/i18n/nb.ts +++ b/resources/i18n/nb.ts @@ -1440,102 +1440,102 @@ Version: %s OpenLP.FirstTimeWizard - + Downloading %s... - + Download complete. Click the finish button to start OpenLP. - + Enabling selected plugins... - + First Time Wizard - + Welcome to the First Time Wizard - + 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. - + Activate required Plugins - + Select the Plugins you wish to use. - + Songs - + Custom Text - + Bible - + Images - + Presentations - + Media (Audio and Video) - + Allow remote access - + Monitor Song Usage - + Allow Alerts - + No Internet Connection - + Unable to detect an Internet connection. - + 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. To 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. @@ -1544,67 +1544,67 @@ To cancel the First Time Wizard completely, press the finish button now. - + Sample Songs - + Select and download public domain songs. - + Sample Bibles - + Select and download free Bibles. - + Sample Themes - + Select and download sample themes. - + Default Settings - + Set up default settings to be used by OpenLP. - + Setting Up And Importing - + Please wait while OpenLP is set up and your data is imported. - + Default output display: - + Select default theme: - + Starting configuration process... @@ -1730,12 +1730,12 @@ To cancel the First Time Wizard completely, press the finish button now. OpenLP.LanguageManager - + Language - + Please restart OpenLP to use your new language setting. @@ -1751,369 +1751,369 @@ To cancel the First Time Wizard completely, press the finish button now. OpenLP.MainWindow - + &File &Fil - + &Import &Import - + &Export &Eksporter - + &View &Vis - + M&ode - + &Tools - + &Settings &Innstillinger - + &Language &Språk - + &Help &Hjelp - + Media Manager Innholdselementer - + Service Manager - + Theme Manager - + &New &Ny - + Ctrl+N Ctrl+N - + &Open &Åpne - + Open an existing service. - + Ctrl+O Ctrl+O - + &Save &Lagre - + Save the current service to disk. - + Ctrl+S Ctrl+S - + Save &As... - + Save Service As - + Save the current service under a new name. - + Ctrl+Shift+S - + E&xit &Avslutt - + Quit OpenLP Avslutt OpenLP - + Alt+F4 Alt+F4 - + &Theme &Tema - + &Configure OpenLP... - + &Media Manager - + Toggle Media Manager - + Toggle the visibility of the media manager. - + F8 F8 - + &Theme Manager - + Toggle Theme Manager Åpne tema-behandler - + Toggle the visibility of the theme manager. - + F10 F10 - + &Service Manager - + Toggle Service Manager Vis møteplanlegger - + Toggle the visibility of the service manager. - + F9 F9 - + &Preview Panel &Forhåndsvisningspanel - + Toggle Preview Panel Vis forhåndsvisningspanel - + Toggle the visibility of the preview panel. - + F11 F11 - + &Live Panel - + Toggle Live Panel - + Toggle the visibility of the live panel. - + F12 F12 - + &Plugin List &Tillegsliste - + List the Plugins Hent liste over tillegg - + Alt+F7 ALT+F7 - + &User Guide &Brukerveiledning - + &About &Om - + More information about OpenLP - + Ctrl+F1 Ctrl+F1 - + &Online Help - + &Web Site &Internett side - + Use the system language, if available. - + Set the interface language to %s - + Add &Tool... Legg til & Verktøy... - + Add an application to the list of tools. - + &Default - + Set the view mode back to the default. - + &Setup - + Set the view mode to Setup. - + &Live &Direkte - + Set the view mode to Live. - + Version %s of OpenLP is now available for download (you are currently running version %s). You can download the latest version from http://openlp.org/. - + OpenLP Version Updated OpenLP versjonen har blitt oppdatert - + OpenLP Main Display Blanked - + The Main Display has been blanked out - + Default Theme: %s @@ -2124,47 +2124,47 @@ You can download the latest version from http://openlp.org/. Norsk - + 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 - + &Autodetect diff --git a/resources/i18n/nl.ts b/resources/i18n/nl.ts index ed24d6db8..cf7cb8b69 100644 --- a/resources/i18n/nl.ts +++ b/resources/i18n/nl.ts @@ -1370,7 +1370,7 @@ Tinggaard, Frode Woldsund End HTML - End HTML + Eind HTML @@ -1554,175 +1554,175 @@ Schrijf in het Engels, omdat de meeste programmeurs geen Nederlands spreken. OpenLP.FirstTimeWizard - + Downloading %s... Downloaden %s... - + Download complete. Click the finish button to start OpenLP. Download compleet. Klik op afrond om OpenLP te starten. - + Enabling selected plugins... Geselecteerde plugins inschakelen... - + First Time Wizard Eerste keer assistent - + Welcome to the First Time Wizard Welkom bij de Eerste keer Assistent - + 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. Deze assistent helpt je om OpenLP voor de eerste keer in te stellen. Klik op volgende om dit proces te beginnen. - + Activate required Plugins Activeer noodzakelijke plugins - + Select the Plugins you wish to use. Selecteer de plugins die je gaat gebruiken. - + Songs Liederen - + Custom Text Aangepaste tekst - + Bible Bijbel - + Images Afbeeldingen - + Presentations Presentaties - + Media (Audio and Video) Media (Audio en Video) - + Allow remote access Toegang op afstand toestaan - + Monitor Song Usage Liedgebruik bijhouden - + Allow Alerts Toon berichten - + No Internet Connection Geen internetverbinding - + Unable to detect an Internet connection. OpenLP kan geen internetverbinding vinden. - + 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. To 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. To cancel the First Time Wizard completely, press the finish button now. - 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. + Geen internetverbinding gevonden. De Eerste Keer assistent heeft internet nodig om voorbeeld liederen, bijbels en thema's te downloaden. -To 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. +Om deze assistent de volgende keer te starten, klikt u nu annuleren, controleer uw verbinding en herstart OpenLP. -To cancel the First Time Wizard completely, press the finish button now. +Om deze assistent over te slaan, klik op klaar. - + Sample Songs Voorbeeld liederen - + Select and download public domain songs. Selecteer en download liederen uit het publieke domein. - + Sample Bibles Voorbeeld bijbels - + Select and download free Bibles. Selecteer en download (gratis) bijbels uit het publieke domein. - + Sample Themes Voorbeeld thema's - + Select and download sample themes. Selecteer en download voorbeeld thema's. - + Default Settings Standaard instellingen - + Set up default settings to be used by OpenLP. Stel standaardinstellingen in voor OpenLP. - + Setting Up And Importing Instellen en importeren - + Please wait while OpenLP is set up and your data is imported. Even geduld terwijl OpenLP de gegevens importeert. - + Default output display: Standaard weergave scherm: - + Select default theme: Selecteer standaard thema: - + Starting configuration process... Begin het configuratie proces... @@ -1848,12 +1848,12 @@ To cancel the First Time Wizard completely, press the finish button now. OpenLP.LanguageManager - + Language Taal - + Please restart OpenLP to use your new language setting. Start OpenLP opnieuw op om de nieuwe taalinstellingen te gebruiken. @@ -1869,367 +1869,367 @@ To cancel the First Time Wizard completely, press the finish button now. OpenLP.MainWindow - + &File &Bestand - + &Import &Importeren - + &Export &Exporteren - + &View &Weergave - + M&ode M&odus - + &Tools &Hulpmiddelen - + &Settings &Instellingen - + &Language Taa&l - + &Help &Help - + Media Manager Mediabeheer - + Service Manager Liturgie beheer - + Theme Manager Thema beheer - + &New &Nieuw - + Ctrl+N Ctrl+N - + &Open &Open - + Open an existing service. Open een bestaande liturgie. - + Ctrl+O Ctrl+O - + &Save Op&slaan - + Save the current service to disk. Deze liturgie opslaan. - + Ctrl+S Ctrl+S - + Save &As... Opslaan &als... - + Save Service As Liturgie opslaan als - + Save the current service under a new name. Deze liturgie onder een andere naam opslaan. - + Ctrl+Shift+S Ctrl+Shift+S - + E&xit &Afsluiten - + Quit OpenLP OpenLP afsluiten - + Alt+F4 Alt+F4 - + &Theme &Thema - + &Configure OpenLP... &Instellingen... - + &Media Manager &Media beheer - + Toggle Media Manager Media beheer wel / niet tonen - + Toggle the visibility of the media manager. Media beheer wel / niet tonen. - + F8 F8 - + &Theme Manager &Thema beheer - + Toggle Theme Manager Thema beheer wel / niet tonen - + Toggle the visibility of the theme manager. Thema beheer wel / niet tonen. - + F10 F10 - + &Service Manager &Liturgie beheer - + Toggle Service Manager Liturgie beheer wel / niet tonen - + Toggle the visibility of the service manager. Liturgie beheer wel / niet tonen. - + F9 F9 - + &Preview Panel &Voorbeeld - + Toggle Preview Panel Voorbeeld wel / niet tonen - + Toggle the visibility of the preview panel. Voorbeeld wel / niet tonen. - + F11 F11 - + &Live Panel &Live venster - + Toggle Live Panel Live venster wel / niet tonen - + Toggle the visibility of the live panel. Live venster wel / niet tonen. - + F12 F12 - + &Plugin List &Plugin Lijst - + List the Plugins Lijst met plugins =uitbreidingen van OpenLP - + Alt+F7 Alt+F7 - + &User Guide Gebr&uikshandleiding - + &About &Over OpenLP - + More information about OpenLP Meer Informatie over OpenLP - + Ctrl+F1 Ctrl+F1 - + &Online Help &Online help - + &Web Site &Website - + Use the system language, if available. Gebruik systeem standaardtaal, indien mogelijk. - + Set the interface language to %s %s als taal in OpenLP gebruiken - + Add &Tool... Hulpprogramma &toevoegen... - + Add an application to the list of tools. Voeg een hulpprogramma toe aan de lijst. - + &Default &Standaard - + Set the view mode back to the default. Terug naar de standaard weergave modus. - + &Setup &Setup - + Set the view mode to Setup. Weergave modus naar Setup. - + &Live &Live - + Set the view mode to Live. Weergave modus naar Live. - + OpenLP Version Updated Nieuwe OpenLP versie beschikbaar - + OpenLP Main Display Blanked OpenLP projectie op zwart - + The Main Display has been blanked out Projectie is uitgeschakeld: scherm staat op zwart - + Default Theme: %s Standaardthema: %s - + Version %s of OpenLP is now available for download (you are currently running version %s). You can download the latest version from http://openlp.org/. @@ -2244,47 +2244,47 @@ U kunt de laatste versie op http://openlp.org/ downloaden. Nederlands - + Configure &Shortcuts... &Sneltoetsen instellen... - + Close OpenLP OpenLP afsluiten - + Are you sure you want to close OpenLP? OpenLP afsluiten? - + Print the current Service Order. Druk de huidige liturgie af. - + Ctrl+P Ctrl+P - + Open &Data Folder... Open &Data map... - + Open the folder where songs, bibles and other data resides. Open de map waar liederen, bijbels en andere data staat. - + &Configure Display Tags &Configureer Weergave Tags - + &Autodetect &Autodetecteer @@ -3424,12 +3424,12 @@ Tekst codering is geen UTF-8. &Add - &Toevoegen + &Toevoegen Advanced - Geavanceerd + Geavanceerd @@ -4685,62 +4685,62 @@ Meestal voldoet de suggestie van OpenLP. The Songs of Fellowship importer has been disabled because OpenLP cannot find OpenOffice.org on your computer. - The Songs of Fellowship importer has been disabled because OpenLP cannot find OpenOffice.org on your computer. + Songs of Fellowship import is uitgeschakeld omdat OpenLP OpenOffice.org niet kan vinden op deze computer. The generic document/presentation importer has been disabled because OpenLP cannot find OpenOffice.org on your computer. - The generic document/presentation importer has been disabled because OpenLP cannot find OpenOffice.org on your computer. + Algemeen document/presentatie import is uitgeschakeld omdat OpenLP OpenOffice.org niet kan vinden op deze computer. The OpenLyrics importer has not yet been developed, but as you can see, we are still intending to do so. Hopefully it will be in the next release. - The OpenLyrics importer has not yet been developed, but as you can see, we are still intending to do so. Hopefully it will be in the next release. + OpenLyrics import is nog niet gemaakt, maar we hebben het voornemen dit te doen. Hopelijk lukt dit in een volgende versie. Administered by %s - Administered by %s + Beheerd door %s OpenLP 2.0 Databases - OpenLP 2.0 Databases + OpenLP 2.0 Databases openlp.org v1.x Databases - openlp.org v1.x Databases + openlp.org v1.x Databases Words Of Worship Song Files - Words Of Worship Song Files + Words Of Worship Lied bestanden Songs Of Fellowship Song Files - + Songs Of Fellowship lied bestanden SongBeamer Files - + SongBeamer bestanden SongShow Plus Song Files - + SongShow Plus lied bestanden You need to specify at least one document or presentation file to import from. - + Selecteer minimaal een document of presentatie om te importeren. Foilpresenter Song Files - + Foilpresenter lied bestanden @@ -4748,7 +4748,7 @@ Meestal voldoet de suggestie van OpenLP. Maintain the lists of authors, topics and books - Maintain the lists of authors, topics and books + Beheer de lijst met auteurs, onderwerpen en liedboeken @@ -4763,7 +4763,7 @@ Meestal voldoet de suggestie van OpenLP. Delete Song(s)? - Delete Song(s)? + Wis lied(eren)? @@ -4789,7 +4789,7 @@ Meestal voldoet de suggestie van OpenLP. Importing song %d of %d. - Importing song %d of %d. + Importeer lied %d van %d. @@ -4797,7 +4797,7 @@ Meestal voldoet de suggestie van OpenLP. Exporting "%s"... - + Exporteren "%s"... @@ -4828,12 +4828,12 @@ Meestal voldoet de suggestie van OpenLP. Finished export. - + Exporteren afgerond. Your song export failed. - + Liederen export is mislukt. @@ -4922,42 +4922,42 @@ Meestal voldoet de suggestie van OpenLP. Could not save your modified topic, because it already exists. - Could not save your modified topic, because it already exists. + Kan dit onderwerp niet opslaan, omdat het reeds bestaat. This author cannot be deleted, they are currently assigned to at least one song. - This author cannot be deleted, they are currently assigned to at least one song. + Deze auteur kan niet worden verwijderd, omdat er nog een lied aan is gekoppeld. This topic cannot be deleted, it is currently assigned to at least one song. - This topic cannot be deleted, it is currently assigned to at least one song. + Dit onderwerp kan niet worden verwijderd, omdat er nog een lied aan is gekoppeld. This book cannot be deleted, it is currently assigned to at least one song. - This book cannot be deleted, it is currently assigned to at least one song. + Dit liedboek kan niet worden verwijderd, omdat er nog een lied aan is gekoppeld. Could not save your modified author, because the author already exists. - Could not save your modified author, because the author already exists. + Kan de auteur niet opslaan, omdat deze reeds bestaat. The author %s already exists. Would you like to make songs with author %s use the existing author %s? - The author %s already exists. Would you like to make songs with author %s use the existing author %s? + Deze auteur %s bestaat al. Liederen met auteur %s aan deze auteur %s koppelen? The topic %s already exists. Would you like to make songs with topic %s use the existing topic %s? - The topic %s already exists. Would you like to make songs with topic %s use the existing topic %s? + Dit onderwerp %s bestaat al. Liederen met onderwerp %s aan %s koppelen? The book %s already exists. Would you like to make songs with book %s use the existing book %s? - The book %s already exists. Would you like to make songs with book %s use the existing book %s? + Dit liedboek %s bestaat al. Liederen uit het Liedboek %s aan het liedboek %s koppelen? diff --git a/resources/i18n/pt_BR.ts b/resources/i18n/pt_BR.ts index bd547b724..a3905117e 100644 --- a/resources/i18n/pt_BR.ts +++ b/resources/i18n/pt_BR.ts @@ -214,7 +214,7 @@ Você gostaria de continuar de qualquer maneira? You cannot combine single and dual Bible verse search results. Do you want to delete your search results and start a new search? - + Você não pode combinar um versículo simples e um duplo nos resultados das buscas. Você deseja deletar os resultados da sua pesquisa e comecar uma nova? @@ -419,7 +419,7 @@ Mudanças não afetam os versículos que já estão na lista de exibição. Display second Bible verses - + Exibir versículos da Bíblia secundária @@ -1552,102 +1552,102 @@ Agradecemos se for possível escrever seu relatório em inglês. OpenLP.FirstTimeWizard - + Downloading %s... Baixando %s... - + Download complete. Click the finish button to start OpenLP. Download finalizado. Clique no botão terminar para iniciar o OpenLP. - + Enabling selected plugins... Habilitando os plugins selecionados... - + First Time Wizard Assistente de Primeira Utilização - + Welcome to the First Time Wizard Bem vindo ao Assistente de Primeira Utilização - + 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. O assistente irá ajudá-lo na configuração do OpenLP para o primeiro uso. Clique no botão "Próximo" abaixo para iniciar a seleção das opções iniciais. - + Activate required Plugins Ativar os Plugins Requeridos - + Select the Plugins you wish to use. Selecione os Plugins aos quais você deseja utilizar. - + Songs Músicas - + Custom Text Texto Customizado - + Bible Bíblia - + Images Imagens - + Presentations Apresentações - + Media (Audio and Video) Mídia (Áudio e Vídeo) - + Allow remote access Permitir acesso remoto - + Monitor Song Usage Monitor de Utilização das Músicas - + Allow Alerts Permitir Alertas - + No Internet Connection Conexão com a Internet Indisponível - + Unable to detect an Internet connection. Não foi possível detectar uma conexão com a Internet. - + 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. To 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. @@ -1660,67 +1660,67 @@ Para executar o assistente novamente mais tarde e importar os dados de exemplo, Para cancelar o assistente completamente, clique no botão finalizar. - + Sample Songs Músicas de Exemplo - + Select and download public domain songs. Selecione e baixe músicas de domínio público. - + Sample Bibles Bíblias de Exemplo - + Select and download free Bibles. Selecione e baixe Bíblias gratuitas. - + Sample Themes Temas de Exemplo - + Select and download sample themes. Selecione e baixe temas de exemplo. - + Default Settings Configurações Padrão - + Set up default settings to be used by OpenLP. Configure as configurações padrão que serão utilizadas pelo OpenLP. - + Setting Up And Importing Configurando e Importando - + Please wait while OpenLP is set up and your data is imported. Por Favor aguarde enquanto o OpenLP é configurado e os seus dados importados. - + Default output display: Painel de Projeção Padrão: - + Select default theme: Selecione um tema padrão: - + Starting configuration process... Iniciando o processo de configuração... @@ -1846,12 +1846,12 @@ Para cancelar o assistente completamente, clique no botão finalizar. OpenLP.LanguageManager - + Language Idioma - + Please restart OpenLP to use your new language setting. Por favor reinicie o OpenLP para usar a nova configuração de idioma. @@ -1867,347 +1867,347 @@ Para cancelar o assistente completamente, clique no botão finalizar. OpenLP.MainWindow - + &File &Arquivo - + &Import &Importar - + &Export &Exportar - + &View &Visualizar - + M&ode M&odo - + &Tools &Ferramentas - + &Settings &Configurações - + &Language &Idioma - + &Help &Ajuda - + Media Manager Gerenciador de Mídia - + Service Manager Lista de Exibição - + Theme Manager Gerenciador de Temas - + &New &Novo - + Ctrl+N Ctrl+N - + &Open &Abrir - + Open an existing service. Abrir uma Lista de Exibição existente. - + Ctrl+O Ctrl+O - + &Save &Salvar - + Save the current service to disk. Salvar a Lista de Exibição no disco. - + Ctrl+S Ctrl+S - + Save &As... Salvar &Como... - + Save Service As Salvar Lista de Exibição Como - + Save the current service under a new name. Salvar a Lista de Exibição atual com um novo nome. - + Ctrl+Shift+S Ctrl+Shift+S - + E&xit S&air - + Quit OpenLP Fechar o OpenLP - + Alt+F4 Alt+F4 - + &Theme &Tema - + &Configure OpenLP... &Configurar o OpenLP... - + &Media Manager &Gerenciador de Mídia - + Toggle Media Manager Alternar Gerenciador de Mídia - + Toggle the visibility of the media manager. Alternar a visibilidade do gerenciador de mídia. - + F8 F8 - + &Theme Manager &Gerenciador de Temas - + Toggle Theme Manager Alternar para Gerenciamento de Temas - + Toggle the visibility of the theme manager. Alternar a visibilidade do Gerenciador de Temas. - + F10 F10 - + &Service Manager &Lista de Exibição - + Toggle Service Manager Alternar a Lista de Exibição - + Toggle the visibility of the service manager. Alternar visibilidade da Lista de Exibição. - + F9 F9 - + &Preview Panel &Painel de Pré-Visualização - + Toggle Preview Panel Alternar para Painel de Pré-Visualização - + Toggle the visibility of the preview panel. Alternar a visibilidade da coluna de pré-visualização. - + F11 F11 - + &Live Panel &Coluna da Projeção - + Toggle Live Panel Alternar Coluna da Projeção - + Toggle the visibility of the live panel. Alternar a visibilidade da coluna de projeção. - + F12 F12 - + &Plugin List &Lista de Plugins - + List the Plugins Listar os Plugins - + Alt+F7 Alt+F7 - + &User Guide &Guia do Usuário - + &About &Sobre - + More information about OpenLP Mais informações sobre o OpenLP - + Ctrl+F1 Ctrl+F1 - + &Online Help &Ajuda Online - + &Web Site &Web Site - + Use the system language, if available. Usar o idioma do sistema, caso disponível. - + Set the interface language to %s Definir o idioma da interface como %s - + Add &Tool... Adicionar &Ferramenta... - + Add an application to the list of tools. Adicionar uma aplicação à lista de ferramentas. - + &Default &Padrão - + Set the view mode back to the default. Reverter o modo de visualização de volta ao padrão. - + &Setup &Configurar - + Set the view mode to Setup. Configurar o modo de visualização para Setup. - + &Live &Ao Vivo - + Set the view mode to Live. Configurar o modo de visualização como Projeção. - + Version %s of OpenLP is now available for download (you are currently running version %s). You can download the latest version from http://openlp.org/. @@ -2216,22 +2216,22 @@ You can download the latest version from http://openlp.org/. Voce pode baixar a versão mais nova em http://openlp.org/. - + OpenLP Version Updated Versão do OpenLP Atualizada - + OpenLP Main Display Blanked Tela Principal do OpenLP em Branco - + The Main Display has been blanked out A Tela Principal foi apagada - + Default Theme: %s Tema padrão: %s @@ -2242,47 +2242,47 @@ Voce pode baixar a versão mais nova em http://openlp.org/. Português (Brasil) - + Configure &Shortcuts... Configurar &Atalhos... - + Close OpenLP Fechar o OpenLP - + Are you sure you want to close OpenLP? Você tem certeza de que quer fechar o OpenLP? - + Print the current Service Order. Imprimir a Lista de Exibição atual. - + Ctrl+P Ctrl+P - + &Configure Display Tags &Configurar Etiquetas de Exibição - + Open &Data Folder... Abrir Pasta de &Dados... - + Open the folder where songs, bibles and other data resides. Abrir a pasta na qual músicas, Bíblias e outros arquivos são armazenados. - + &Autodetect &Auto detectar @@ -2582,12 +2582,12 @@ A codificação do conteúdo não é UTF-8. Missing Display Handler - + Faltando o Handler de Exibição Your item cannot be displayed as there is no handler to display it - + O seu item não pode ser exibido porque não existe um handler para exibí-lo @@ -2741,7 +2741,7 @@ A codificação do conteúdo não é UTF-8. Alternate - Alternativo + Alternar @@ -2834,7 +2834,7 @@ A codificação do conteúdo não é UTF-8. Escape Item - + Escapar Item @@ -3271,7 +3271,7 @@ A codificação do conteúdo não é UTF-8. Allows you to change and move the main and footer areas. - Permite mudar e modificar as áreas principal e do rodapé. + Permite mudar e modificar as áreas principal e de rodapé. @@ -3508,7 +3508,7 @@ A codificação do conteúdo não é UTF-8. Live Background Error - + Erro no Fundo da Projeção @@ -4123,12 +4123,12 @@ foi criado com sucesso. Output Path Not Selected - + Caminho de saída não foi selecionado You have not set a valid output location for your song usage report. Please select an existing path on your computer. - + Você precisa selecionar uma localização válida para o relatório de uso de músicas. Por favor selecione um caminho existente no seu computador. @@ -4973,7 +4973,7 @@ A codificação é responsável pela correta representação dos caracteres. Display verses on live tool bar - + Exibir versículos na barra de projeção @@ -4983,7 +4983,7 @@ A codificação é responsável pela correta representação dos caracteres. Add missing songs when opening service - + Adicionar músicas não existantes ao abrir lista diff --git a/resources/i18n/ru.ts b/resources/i18n/ru.ts index 3c3dfbd84..a62fdebed 100644 --- a/resources/i18n/ru.ts +++ b/resources/i18n/ru.ts @@ -1478,102 +1478,102 @@ Version: %s OpenLP.FirstTimeWizard - + Downloading %s... - + Download complete. Click the finish button to start OpenLP. - + Enabling selected plugins... - + First Time Wizard - + Welcome to the First Time Wizard - + 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. - + Activate required Plugins - + Select the Plugins you wish to use. - + Songs Псалмы - + Custom Text - + Bible Библия - + Images Изображения - + Presentations - + Media (Audio and Video) - + Allow remote access - + Monitor Song Usage - + Allow Alerts - + No Internet Connection - + Unable to detect an Internet connection. - + 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. To 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. @@ -1582,67 +1582,67 @@ To cancel the First Time Wizard completely, press the finish button now. - + Sample Songs - + Select and download public domain songs. - + Sample Bibles - + Select and download free Bibles. - + Sample Themes - + Select and download sample themes. - + Default Settings - + Set up default settings to be used by OpenLP. - + Setting Up And Importing - + Please wait while OpenLP is set up and your data is imported. - + Default output display: - + Select default theme: - + Starting configuration process... @@ -1768,12 +1768,12 @@ To cancel the First Time Wizard completely, press the finish button now. OpenLP.LanguageManager - + Language - + Please restart OpenLP to use your new language setting. @@ -1789,394 +1789,394 @@ To cancel the First Time Wizard completely, press the finish button now. OpenLP.MainWindow - + &File &Файл - + &Import &Импорт - + &Export &Экспорт - + &View &Вид - + M&ode Р&ежим - + &Tools &Инструменты - + &Settings &Настройки - + &Language &Язык - + &Help &Помощь - + Media Manager Управление Материалами - + Service Manager Управление Служением - + Theme Manager Управление Темами - + &New &Новая - + Ctrl+N Ctrl+N - + &Open &Открыть - + Open an existing service. Открыть существующее служение. - + Ctrl+O Ctrl+O - + &Save &Сохранить - + Save the current service to disk. Сохранить текущее служение на диск. - + Ctrl+S Ctrl+S - + Save &As... Сохранить к&ак... - + Save Service As Сохранить служение как - + Save the current service under a new name. Сохранить текущее служение под новым именем. - + Ctrl+Shift+S Ctrl+Shift+S - + Print the current Service Order. Распечатать текущий Порядок Служения - + Ctrl+P Ctrl+P - + E&xit Вы&ход - + Quit OpenLP Завершить работу OpenLP - + Alt+F4 Alt+F4 - + &Theme Т&ема - + Configure &Shortcuts... Настройки и б&ыстрые клавиши... - + &Configure OpenLP... &Настроить OpenLP... - + &Media Manager Управление &Материалами - + Toggle Media Manager Свернуть Менеджер Медиа - + Toggle the visibility of the media manager. Свернуть видимость Менеджера Медиа. - + F8 F8 - + &Theme Manager Управление &темами - + Toggle Theme Manager Свернуть Менеджер Тем - + Toggle the visibility of the theme manager. Свернуть видимость Менеджера Тем. - + F10 F10 - + &Service Manager Управление &Служением - + Toggle Service Manager Свернуть Менеджер Служения - + Toggle the visibility of the service manager. Свернуть видимость Менеджера Служения. - + F9 F9 - + &Preview Panel Пан&ель предпросмотра - + Toggle Preview Panel Toggle Preview Panel - + Toggle the visibility of the preview panel. Toggle the visibility of the preview panel. - + F11 F11 - + &Live Panel &Панель проектора - + Toggle Live Panel Toggle Live Panel - + Toggle the visibility of the live panel. Toggle the visibility of the live panel. - + F12 F12 - + &Plugin List &Список плагинов - + List the Plugins Выводит список плагинов - + Alt+F7 Alt+F7 - + &User Guide &Руководство пользователя - + &About &О программе - + More information about OpenLP Больше информации про OpenLP - + Ctrl+F1 Ctrl+F1 - + &Online Help &Помощь онлайн - + &Web Site &Веб-сайт - + Use the system language, if available. Использовать системный язык, если доступно. - + Set the interface language to %s Изменить язык интерфеса на %s - + Add &Tool... Добавить &Инструмент... - + Add an application to the list of tools. Добавить приложение к списку инструментов - + &Default &По умолчанию - + Set the view mode back to the default. Установить вид в режим по умолчанию. - + &Setup &Настройка - + Set the view mode to Setup. - + &Live - + Set the view mode to Live. - + Version %s of OpenLP is now available for download (you are currently running version %s). You can download the latest version from http://openlp.org/. - + OpenLP Version Updated - + OpenLP Main Display Blanked - + The Main Display has been blanked out - + Close OpenLP - + Are you sure you want to close OpenLP? - + Default Theme: %s @@ -2187,22 +2187,22 @@ You can download the latest version from http://openlp.org/. Английский - + &Configure Display Tags - + Open &Data Folder... - + Open the folder where songs, bibles and other data resides. - + &Autodetect diff --git a/resources/i18n/sv.ts b/resources/i18n/sv.ts index bb7611319..0aa4011c3 100644 --- a/resources/i18n/sv.ts +++ b/resources/i18n/sv.ts @@ -1444,102 +1444,102 @@ Version: %s OpenLP.FirstTimeWizard - + Downloading %s... - + Download complete. Click the finish button to start OpenLP. - + Enabling selected plugins... - + First Time Wizard - + Welcome to the First Time Wizard - + 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. - + Activate required Plugins - + Select the Plugins you wish to use. - + Songs - + Custom Text - + Bible Bibel - + Images Bilder - + Presentations - + Media (Audio and Video) - + Allow remote access - + Monitor Song Usage - + Allow Alerts - + No Internet Connection - + Unable to detect an Internet connection. - + 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. To 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. @@ -1548,67 +1548,67 @@ To cancel the First Time Wizard completely, press the finish button now. - + Sample Songs - + Select and download public domain songs. - + Sample Bibles - + Select and download free Bibles. - + Sample Themes - + Select and download sample themes. - + Default Settings - + Set up default settings to be used by OpenLP. - + Setting Up And Importing - + Please wait while OpenLP is set up and your data is imported. - + Default output display: - + Select default theme: - + Starting configuration process... @@ -1734,12 +1734,12 @@ To cancel the First Time Wizard completely, press the finish button now. OpenLP.LanguageManager - + Language Språk - + Please restart OpenLP to use your new language setting. Vänligen starta om OpenLP för att aktivera dina nya språkinställningar. @@ -1755,369 +1755,369 @@ To cancel the First Time Wizard completely, press the finish button now. OpenLP.MainWindow - + &File &Fil - + &Import &Importera - + &Export &Exportera - + &View &Visa - + M&ode &Läge - + &Tools &Verktyg - + &Settings &Inställningar - + &Language &Språk - + &Help &Hjälp - + Media Manager Mediahanterare - + Service Manager Planeringshanterare - + Theme Manager Temahanterare - + &New &Ny - + Ctrl+N Ctrl+N - + &Open &Öppna - + Open an existing service. Öppna en befintlig planering. - + Ctrl+O Ctrl+O - + &Save &Spara - + Save the current service to disk. Spara den aktuella planeringen till disk. - + Ctrl+S Ctrl+S - + Save &As... S&para som... - + Save Service As Spara planering som - + Save the current service under a new name. Spara den aktuella planeringen under ett nytt namn. - + Ctrl+Shift+S Ctrl+Shift+S - + E&xit &Avsluta - + Quit OpenLP Avsluta OpenLP - + Alt+F4 Alt+F4 - + &Theme &Tema - + &Configure OpenLP... &Konfigurera OpenLP... - + &Media Manager &Mediahanterare - + Toggle Media Manager Växla mediahanterare - + Toggle the visibility of the media manager. Växla synligheten för mediahanteraren. - + F8 F8 - + &Theme Manager &Temahanterare - + Toggle Theme Manager Växla temahanteraren - + Toggle the visibility of the theme manager. Växla synligheten för temahanteraren. - + F10 F10 - + &Service Manager &Planeringshanterare - + Toggle Service Manager Växla planeringshanterare - + Toggle the visibility of the service manager. Växla synligheten för planeringshanteraren. - + F9 F9 - + &Preview Panel &Förhandsgranskningpanel - + Toggle Preview Panel Växla förhandsgranskningspanel - + Toggle the visibility of the preview panel. Växla synligheten för förhandsgranskningspanelen. - + F11 F11 - + &Live Panel - + Toggle Live Panel - + Toggle the visibility of the live panel. - + F12 F12 - + &Plugin List &Pluginlista - + List the Plugins Lista pluginen - + Alt+F7 Alt+F7 - + &User Guide &Användarguide - + &About &Om - + More information about OpenLP Mer information om OpenLP - + Ctrl+F1 Ctrl+F1 - + &Online Help &Hjälp online - + &Web Site &Webbsida - + Use the system language, if available. Använd systemspråket om möjligt. - + Set the interface language to %s Sätt användargränssnittets språk till %s - + Add &Tool... Lägg till &verktyg... - + Add an application to the list of tools. Lägg till en applikation i verktygslistan. - + &Default &Standard - + Set the view mode back to the default. - + &Setup - + Set the view mode to Setup. - + &Live &Live - + Set the view mode to Live. - + Version %s of OpenLP is now available for download (you are currently running version %s). You can download the latest version from http://openlp.org/. - + OpenLP Version Updated OpenLP-versionen uppdaterad - + OpenLP Main Display Blanked OpenLPs huvuddisplay rensad - + The Main Display has been blanked out Huvuddisplayen har rensats - + Default Theme: %s Standardtema: %s @@ -2128,47 +2128,47 @@ You can download the latest version from http://openlp.org/. Svenska - + 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 - + &Autodetect diff --git a/resources/i18n/zh_CN.ts b/resources/i18n/zh_CN.ts index d4e148399..d2824b41a 100644 --- a/resources/i18n/zh_CN.ts +++ b/resources/i18n/zh_CN.ts @@ -1440,102 +1440,102 @@ Version: %s OpenLP.FirstTimeWizard - + Downloading %s... - + Download complete. Click the finish button to start OpenLP. - + Enabling selected plugins... - + First Time Wizard - + Welcome to the First Time Wizard - + 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. - + Activate required Plugins - + Select the Plugins you wish to use. - + Songs - + Custom Text - + Bible - + Images - + Presentations - + Media (Audio and Video) - + Allow remote access - + Monitor Song Usage - + Allow Alerts - + No Internet Connection - + Unable to detect an Internet connection. - + 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. To 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. @@ -1544,67 +1544,67 @@ To cancel the First Time Wizard completely, press the finish button now. - + Sample Songs - + Select and download public domain songs. - + Sample Bibles - + Select and download free Bibles. - + Sample Themes - + Select and download sample themes. - + Default Settings - + Set up default settings to be used by OpenLP. - + Setting Up And Importing - + Please wait while OpenLP is set up and your data is imported. - + Default output display: - + Select default theme: - + Starting configuration process... @@ -1730,12 +1730,12 @@ To cancel the First Time Wizard completely, press the finish button now. OpenLP.LanguageManager - + Language - + Please restart OpenLP to use your new language setting. @@ -1751,369 +1751,369 @@ To cancel the First Time Wizard completely, press the finish button now. OpenLP.MainWindow - + &File - + &Import - + &Export - + &View - + M&ode - + &Tools - + &Settings - + &Language - + &Help - + Media Manager - + Service Manager - + Theme Manager - + &New - + Ctrl+N - + &Open - + Open an existing service. - + Ctrl+O - + &Save - + Save the current service to disk. - + Ctrl+S - + Save &As... - + Save Service As - + Save the current service under a new name. - + Ctrl+Shift+S - + E&xit - + Quit OpenLP - + Alt+F4 - + &Theme - + &Configure OpenLP... - + &Media Manager - + Toggle Media Manager - + Toggle the visibility of the media manager. - + F8 - + &Theme Manager - + Toggle Theme Manager - + Toggle the visibility of the theme manager. - + F10 - + &Service Manager - + Toggle Service Manager - + Toggle the visibility of the service manager. - + F9 - + &Preview Panel - + Toggle Preview Panel - + Toggle the visibility of the preview panel. - + F11 - + &Live Panel - + Toggle Live Panel - + Toggle the visibility of the live panel. - + F12 - + &Plugin List - + List the Plugins - + Alt+F7 - + &User Guide - + &About - + More information about OpenLP - + Ctrl+F1 - + &Online Help - + &Web Site - + Use the system language, if available. - + Set the interface language to %s - + Add &Tool... - + Add an application to the list of tools. - + &Default - + Set the view mode back to the default. - + &Setup - + Set the view mode to Setup. - + &Live - + Set the view mode to Live. - + Version %s of OpenLP is now available for download (you are currently running version %s). 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 @@ -2124,47 +2124,47 @@ 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 - + &Configure Display Tags - + Open &Data Folder... - + Open the folder where songs, bibles and other data resides. - + &Autodetect diff --git a/resources/openlp.desktop b/resources/openlp.desktop index 684119773..07398ede8 100755 --- a/resources/openlp.desktop +++ b/resources/openlp.desktop @@ -3,11 +3,11 @@ Categories=AudioVideo; Comment[de]= Comment= Encoding=UTF-8 -Exec=openlp +Exec=openlp %F GenericName[de]=Church lyrics projection GenericName=Church lyrics projection Icon=openlp -MimeType= +MimeType=application/x-openlp-service; Name[de]=OpenLP Name=OpenLP Path= diff --git a/resources/openlp.xml b/resources/openlp.xml new file mode 100644 index 000000000..215fa2b6e --- /dev/null +++ b/resources/openlp.xml @@ -0,0 +1,26 @@ + + + + + + + OpenLP Service File + + + + + OpenLP Theme File + + + diff --git a/resources/osx/Info.plist.master b/resources/osx/Info.plist.master index e97e1faf5..45aab92a5 100755 --- a/resources/osx/Info.plist.master +++ b/resources/osx/Info.plist.master @@ -18,9 +18,9 @@ MacOS/openlp CFBundleName %(openlp_appname)s -CFBundleGetInfoString +CFBundleGetInfoString %(openlp_appname)s %(openlp_version)s -LSHasLocalizedDisplayName +LSHasLocalizedDisplayName NSAppleScriptEnabled diff --git a/resources/osx/Makefile b/resources/osx/Makefile index 422749da5..738a27aaa 100644 --- a/resources/osx/Makefile +++ b/resources/osx/Makefile @@ -25,4 +25,4 @@ clean: rm -rf OpenLP.app rm -f warnopenlp.txt rm -f *dmg - + diff --git a/resources/osx/build.py b/resources/osx/build.py index dfe0b897a..ff7f6bdfd 100644 --- a/resources/osx/build.py +++ b/resources/osx/build.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # Copyright (c) 2008-2011 Raoul Snyman # # Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael # -# Gorven, Scott Guerrieri, Meinert Jordan, Armin Khler, Andreas Preikschat, # -# Christian Richter, Philip Ridout, Maikel Stuivenberg, Martin Thompson, Jon # -# Tibble, Carsten Tinggaard, Frode Woldsund # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # @@ -46,31 +46,31 @@ PyInstaller To install PyInstaller, first checkout trunk from Subversion. The easiest way is to do a - + svn co http://svn.pyinstaller.org/trunk Then you need to copy the two hook-*.py files from the "pyinstaller" subdirectory in OpenLP's "resources" directory into PyInstaller's "hooks" directory. - + openlp.cfg The configuration file contains settings of the version string to include in the bundle as well as directory and file settings for different purposes (e.g. PyInstaller location or installer background image) - -To start the build process do a + +To start the build process do a make inside the resources/osx directory. The result should be a {openlp_dmgname}.dmg file in the same directory. If something went wrong - this sometimes happen -with the graphical commands in the Apple script - do a +with the graphical commands in the Apple script - do a make clean - + and start the build process again. If you want to execute only parts of the build process you can specify different make targets - + make view -- runs the Apple scripts to set the icons make package -- creates the dmg file and copies the application files make bundle -- compresses the dmg file and sets the dmg file icon @@ -82,6 +82,7 @@ import ConfigParser import logging import optparse import sys +import glob import platform import re import subprocess as subp @@ -98,12 +99,12 @@ def build_application(settings, app_name_lower, app_dir): logging.error('[%s] The pyinstaller build reported an error, cannot \ continue!', script_name) sys.exit(1) - + logging.info('[%s] copying the qt_menu files...', script_name) # see http://www.pyinstaller.org/ticket/157 result = os.system('cp -R %(qt_menu_directory)s \ %(application_directory)s/Contents/Resources' \ - % { 'qt_menu_directory' : settings['qt_menu_basedir'], + % { 'qt_menu_directory' : settings['qt_menu_basedir'], 'application_directory' : app_dir }) if (result != 0): logging.error('[%s] could not copy the qt_menu files, cannot \ @@ -115,18 +116,27 @@ def build_application(settings, app_name_lower, app_dir): logging.info('[%s] copying the new plugins...', script_name) result = os.system('cp -R %(openlp_directory)s/openlp/plugins \ %(application_directory)s/Contents/MacOS' \ - % { 'openlp_directory' : settings['openlp_basedir'], + % { 'openlp_directory' : settings['openlp_basedir'], 'application_directory' : app_dir }) if (result != 0): logging.error('[%s] could not copy plugins, dmg creation failed!', script_name) sys.exit(1) + logging.info('[%s] removing the presentations plugin...', script_name) + result = os.system('rm -rf \ + %(application_directory)s/Contents/MacOS/plugins/presentations' \ + % { 'application_directory' : app_dir }) + if (result != 0): + logging.error('[%s] could not remove presentations plugins, dmg \ + creation failed!', script_name) + sys.exit(1) + logging.info('[%s] copying the icons to the resource directory...', script_name) result = os.system('cp %(icon_file)s \ %(application_directory)s/Contents/Resources' \ - % { 'icon_file' : settings['openlp_icon_file'], + % { 'icon_file' : settings['openlp_icon_file'], 'application_directory' : app_dir }) if (result != 0): logging.error('[%s] could not copy the icon, dmg creation failed!', @@ -135,22 +145,35 @@ def build_application(settings, app_name_lower, app_dir): logging.info('[%s] copying the version file...', script_name) result = os.system('CpMac %s/.version %s/Contents/MacOS' % (os.getcwd(), - app_dir)) + app_dir)) if (result != 0): logging.error('[%s] could not copy the version file, dmg creation \ failed!', script_name) sys.exit(1) - + logging.info('[%s] copying the new Info.plist...', script_name) result = os.system('cp %(target_directory)s/Info.plist \ %(application_directory)s/Contents' \ - % { 'target_directory' : os.getcwd(), + % { 'target_directory' : os.getcwd(), 'application_directory' : app_dir }) if (result != 0): logging.error('[%s] could not copy the info file, dmg creation \ failed!', script_name) sys.exit(1) + logging.info('[%s] copying the translations...', script_name) + os.mkdir(app_dir + '/Contents/MacOS/i18n') + for ts_file in glob.glob(os.path.join(settings['openlp_basedir'] + + '/resources/i18n/', '*ts')): + result = os.system('lconvert -i %(ts_file)s \ + -o %(target_directory)s/Contents/MacOS/i18n/%(base)s.qm' \ + % { 'ts_file' : ts_file, 'target_directory' : app_dir, + 'base': os.path.splitext(os.path.basename(ts_file))[0] }) + if (result != 0): + logging.error('[%s] could not copy the translations, dmg \ + creation failed!', script_name) + sys.exit(1) + def deploy_qt(settings): logging.info('[%s] running mac deploy qt on %s.app...', script_name, settings['openlp_appname']); @@ -162,7 +185,7 @@ def deploy_qt(settings): def create_dmg(settings): logging.info('[%s] creating the dmg...', script_name) - dmg_file = os.getcwd() + '/' + settings['openlp_dmgname'] + '.dmg' + dmg_file = os.getcwd() + '/' + settings['openlp_dmgname'] + '.dmg' result = os.system('hdiutil create %(dmg_file)s~ -ov -megabytes \ %(vol_size)s -fs HFS+ -volname %(vol_name)s' \ % { 'dmg_file' : dmg_file, @@ -204,7 +227,7 @@ def create_dmg(settings): logging.error('[%s] could not copy the background image, dmg creation\ failed!', script_name) sys.exit(1) - + return (volume_basedir, dmg_file) def unmount_dmg(settings, volume_basedir): @@ -282,7 +305,7 @@ if __name__ == '__main__': do_create_dmg = True do_compress_dmg = True do_deploy_qt = True - + parser = optparse.OptionParser() parser.add_option('-c', '--config', dest='config', help='config file', metavar='CONFIG') @@ -301,9 +324,9 @@ if __name__ == '__main__': parser.add_option('-b', '--basedir', dest='basedir', help='volume basedir like /Volumes/OpenLP', metavar='BASEDIR', default='/Volumes/OpenLP') - + (options, args) = parser.parse_args() - + # if an option is set, false all if (options.package_view is True or options.compress_view is True or options.package is True or options.compress is True): @@ -323,10 +346,10 @@ if __name__ == '__main__': '%a, %d %b %Y %H:%M:%S')) logging.getLogger().addHandler(logHandler) logging.getLogger().setLevel(logging.DEBUG) - + config = ConfigParser.RawConfigParser() config.readfp(open(options.config, 'r')) - + if not config.has_section('openlp'): logging.error('[%s] config file "%s" lacks an [openlp] section', script_name, options.config) @@ -371,10 +394,7 @@ if __name__ == '__main__': --template Info.plist.master \ --expandto %(target_directory)s/Info.plist' \ % { 'config_file' : options.config, 'target_directory' : os.getcwd() }) - os.system('python expander.py --config %(config_file)s \ - --template version.master \ - --expandto %(target_directory)s/.version' \ - % { 'config_file' : options.config, 'target_directory' : os.getcwd() }) + os.system('python get_version.py > .version') # prepare variables app_name_lower = settings['openlp_appname'].lower() @@ -386,7 +406,7 @@ if __name__ == '__main__': if (do_deploy_qt is True): deploy_qt(settings) - + if (do_create_dmg is True): (volume_basedir, dmg_file) = create_dmg(settings) else: diff --git a/resources/osx/expander.py b/resources/osx/expander.py index 77b0d1441..4319f9178 100755 --- a/resources/osx/expander.py +++ b/resources/osx/expander.py @@ -1,9 +1,33 @@ #!/usr/bin/python -# -*- encoding: utf-8 -*- +# -*- 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, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # +############################################################################### # TODOs: # - defaults for non-supplied expansions: -# template contains +# template contains import ConfigParser import logging @@ -20,7 +44,7 @@ import sys # - %(dog=cat) --- if there is an expansion for dog, dog will be used; # otherwise "cat" will be used # re_conf = re.compile(r'(?[^\(]+?)\)s') -re_conf = re.compile(r'(?P%?)%\((?P[^+=:&\)]+?)' +re_conf = re.compile(r'(?P%?)%\((?P[^+=:&\)]+?)' + '(?:(?P[+=:&])(?P[^\)]+))?\)(?Ps|d)') def expand_variable(match, expansions, errors): @@ -65,7 +89,7 @@ def expand_variable(match, expansions, errors): if key in expansions: return expansions[key] - + if not match.group(0) in errors: errors.append(match.group(0)) @@ -122,7 +146,7 @@ if __name__ == '__main__': for override in args: if not '=' in override: continue - + (k, v) = override.split('=', 2) expansions[k] = v @@ -136,7 +160,7 @@ if __name__ == '__main__': # closure to capture expansions and errors variable errors = [] expanded = [] - + try: # try to expand the template line = 0 @@ -148,7 +172,7 @@ if __name__ == '__main__': def _expand(m): return expand_variable(m, expansions = expansions, errors = errors) - + for l in raw: line += 1 exp = re_conf.sub(_expand, l) @@ -196,7 +220,7 @@ if __name__ == '__main__': logging.info('[expander] expanded "%s" to "%s"', options.template, options.expanded) - + except: pass diff --git a/resources/osx/get_version.py b/resources/osx/get_version.py new file mode 100644 index 000000000..30ebd7886 --- /dev/null +++ b/resources/osx/get_version.py @@ -0,0 +1,36 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +import sys +import os +from bzrlib.branch import Branch + +def get_version(path): + b = Branch.open_containing(path)[0] + b.lock_read() + result = '0.0.0' + try: + # Get the branch's latest revision number. + revno = b.revno() + # Convert said revision number into a bzr revision id. + revision_id = b.dotted_revno_to_revision_id((revno,)) + # Get a dict of tags, with the revision id as the key. + tags = b.tags.get_reverse_tag_dict() + # Check if the latest + if revision_id in tags: + result = tags[revision_id][0] + else: + result = '%s-bzr%s' % (sorted(b.tags.get_tag_dict().keys())[-1], revno) + finally: + b.unlock() + return result + +def get_path(): + if len(sys.argv) > 1: + return os.path.abspath(sys.argv[1]) + else: + return os.path.abspath('.') + +if __name__ == u'__main__': + path = get_path() + print get_version(path) + diff --git a/resources/osx/openlp.cfg b/resources/osx/openlp.cfg index 1f04861b5..3be085dc0 100755 --- a/resources/osx/openlp.cfg +++ b/resources/osx/openlp.cfg @@ -2,7 +2,6 @@ openlp_appname = OpenLP openlp_dmgname = OpenLP-1.9.4-bzrXXXX openlp_version = XXXX -openlp_full_version = 1.9.4-latest openlp_basedir = /Users/openlp/trunk openlp_icon_file = openlp-logo-with-text.icns openlp_dmg_icon_file = openlp-logo-420x420.png diff --git a/resources/osx/version.master b/resources/osx/version.master deleted file mode 100755 index d517a51bc..000000000 --- a/resources/osx/version.master +++ /dev/null @@ -1 +0,0 @@ -%(openlp_full_version)s diff --git a/resources/pyinstaller/hook-openlp.plugins.presentations.presentationplugin.py b/resources/pyinstaller/hook-openlp.plugins.presentations.presentationplugin.py index 2f00db438..bf2f0ad07 100644 --- a/resources/pyinstaller/hook-openlp.plugins.presentations.presentationplugin.py +++ b/resources/pyinstaller/hook-openlp.plugins.presentations.presentationplugin.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/resources/pyinstaller/hook-openlp.py b/resources/pyinstaller/hook-openlp.py index 7e954551f..e282f2cf0 100644 --- a/resources/pyinstaller/hook-openlp.py +++ b/resources/pyinstaller/hook-openlp.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/scripts/openlp-remoteclient.py b/scripts/openlp-remoteclient.py index 11868e292..f50a34380 100644 --- a/scripts/openlp-remoteclient.py +++ b/scripts/openlp-remoteclient.py @@ -7,9 +7,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/scripts/resources.patch b/scripts/resources.patch index f80d31d73..8a1b6fefd 100644 --- a/scripts/resources.patch +++ b/scripts/resources.patch @@ -14,9 +14,9 @@ +# --------------------------------------------------------------------------- # +# 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 # ++# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # ++# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # ++# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/scripts/translation_utils.py b/scripts/translation_utils.py index df8d5dc5e..a12ee39d7 100755 --- a/scripts/translation_utils.py +++ b/scripts/translation_utils.py @@ -7,9 +7,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/scripts/windows-builder.py b/scripts/windows-builder.py index c8cb1df06..0bfd0862c 100644 --- a/scripts/windows-builder.py +++ b/scripts/windows-builder.py @@ -6,9 +6,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 # diff --git a/setup.py b/setup.py index 516da89ff..dfe907efd 100755 --- a/setup.py +++ b/setup.py @@ -7,9 +7,9 @@ # --------------------------------------------------------------------------- # # 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 # +# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # +# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, 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 #