reverted changes + r1439

This commit is contained in:
Andreas Preikschat 2011-03-30 22:13:07 +02:00
parent 26f144e1ec
commit c1d77e07a8
17 changed files with 348 additions and 332 deletions

View File

@ -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 ^<target^>` where ^<target^> 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 ^<target^>` where ^<target^> 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

View File

@ -42,7 +42,7 @@ master_doc = 'index'
# General information about the project.
project = u'OpenLP'
copyright = u'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
@ -92,19 +92,30 @@ pygments_style = 'sphinx'
# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
html_theme = 'default'
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.
#html_theme_options = {}
if sys.argv[2] == 'html':
html_theme_options = {
'sidebarbgcolor': '#3a60a9',
'relbarbgcolor': '#203b6f',
'footerbgcolor': '#26437c',
'headtextcolor': '#203b6f',
'linkcolor': '#26437c',
'sidebarlinkcolor': '#ceceff'
}
# Add any paths that contain custom themes here, relative to this directory.
#html_theme_path = []
html_theme_path = [os.path.join(os.path.abspath('..'), 'themes')]
# The name for this set of Sphinx documents. If None, it defaults to
# "<project> v<release> documentation".
#html_title = None
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
@ -125,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.
@ -165,7 +176,7 @@ html_static_path = ['_static']
#html_file_suffix = None
# Output file base name for HTML help builder.
htmlhelp_basename = 'OpenLPdoc'
htmlhelp_basename = 'OpenLP'
# -- Options for LaTeX output --------------------------------------------------
@ -179,7 +190,7 @@ htmlhelp_basename = 'OpenLPdoc'
# 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 Documentation',
('index', 'OpenLP.tex', u'OpenLP Reference Manual',
u'Wesley Stout', 'manual'),
]
@ -212,6 +223,6 @@ latex_documents = [
# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [
('index', 'openlp', u'OpenLP Documentation',
('index', 'openlp', u'OpenLP Reference Manual',
[u'Wesley Stout'], 1)
]

View File

@ -18,4 +18,5 @@ Contents:
bibles
themes
mediamanager
songs
songs
troubleshooting

Binary file not shown.

Before

Width:  |  Height:  |  Size: 104 KiB

After

Width:  |  Height:  |  Size: 58 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 36 KiB

View File

@ -115,7 +115,8 @@ class OpenLP(QtGui.QApplication):
# make sure Qt really display the splash screen
self.processEvents()
# start the main app window
self.mainWindow = MainWindow(screens, self)
self.mainWindow = MainWindow(screens, self.clipboard(),
self.arguments())
self.mainWindow.show()
if show_splash:
# now kill the splashscreen

View File

@ -85,7 +85,12 @@ body {
}
/* lyric css */
%s
sup {
font-size:0.6em;
vertical-align:top;
position:relative;
top:-0.3em;
}
</style>
<script language="javascript">
var timer = null;

View File

@ -406,28 +406,24 @@ class ServiceItem(object):
def get_rendered_frame(self, row):
"""
Returns the correct frame for a given list and renders it if required.
Returns the correct frame for a given list and
renders it if required.
"""
try:
if self.service_item_type == ServiceItemType.Text:
frame = self._display_frames[row][u'html'].split(u'\n')[0]
elif self.service_item_type == ServiceItemType.Image:
frame = self._raw_frames[row][u'title']
else:
frame = self._raw_frames[row][u'image']
except IndexError:
frame = u''
return frame
if self.service_item_type == ServiceItemType.Text:
return self._display_frames[row][u'html'].split(u'\n')[0]
elif self.service_item_type == ServiceItemType.Image:
return self._raw_frames[row][u'title']
else:
return self._raw_frames[row][u'image']
def get_frame_title(self, row=0):
"""
Returns the title of the raw frame
"""
try:
title = self._raw_frames[row][u'title']
return self._raw_frames[row][u'title']
except IndexError:
title = u''
return title
return u''
def get_frame_path(self, row=0):
"""

View File

@ -133,7 +133,7 @@ class Ui_AboutDialog(object):
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\xe9t'],
u'hu': [u'Gyuris Gell\xe9rt'],
u'ja': [u'Kunio "Kunio" Nakamaru'],
u'nb': [u'Atle "pendlaren" Weibell', u'Frode "frodus" Woldsund'],
u'nl': [u'Arjen "typovar" van Voorst'],

View File

@ -57,6 +57,7 @@ except ImportError:
from openlp.core.lib import translate, SettingsManager
from openlp.core.lib.mailto import mailto
from openlp.core.lib.ui import UiStrings
from openlp.core.utils import get_application_version
from exceptiondialog import Ui_ExceptionDialog
@ -78,7 +79,7 @@ class ExceptionForm(QtGui.QDialog, Ui_ExceptionDialog):
return QtGui.QDialog.exec_(self)
def _createReport(self):
openlp_version = self.parent().applicationVersion[u'full']
openlp_version = get_application_version()
description = unicode(self.descriptionTextEdit.toPlainText())
traceback = unicode(self.exceptionTextEdit.toPlainText())
system = unicode(translate('OpenLP.ExceptionForm',

View File

@ -469,15 +469,15 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
actionList = ActionList()
def __init__(self, screens, application):
def __init__(self, screens, clipboard, arguments):
"""
This constructor sets up the interface, the various managers, and the
plugins.
"""
QtGui.QMainWindow.__init__(self)
self.screens = screens
self.application = application
self.clipboard = clipboard
self.arguments = arguments
# Set up settings sections for the main application
# (not for use by plugins)
self.uiSettingsSection = u'user interface'
@ -661,9 +661,13 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
if self.liveController.display.isVisible():
self.liveController.display.setFocus()
self.activateWindow()
if len(self.application.arguments()) > 0:
# On Windows, arguments contains the entire commandline
# So args[0]=='python' args[1]=='openlp.pyw'
# Therefore this approach is not going to work
# Bypass for now.
if len(self.arguments) and os.name != u'nt':
args = []
for a in self.application.arguments():
for a in self.arguments:
args.extend([a])
self.ServiceManagerContents.loadFile(unicode(args[0]))
elif QtCore.QSettings().value(

View File

@ -184,14 +184,14 @@ class PrintServiceForm(QtGui.QDialog, Ui_PrintServiceDialog):
"""
Copies the display text to the clipboard as plain text
"""
self.mainWindow.application.clipboard.setText(
self.mainWindow.clipboard.setText(
self.document.toPlainText())
def copyHtmlText(self):
"""
Copies the display text to the clipboard as Html
"""
self.mainWindow.application.clipboard.setText(self.document.toHtml())
self.mainWindow.clipboard.setText(self.document.toHtml())
def printServiceOrder(self):
"""

View File

@ -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)

View File

@ -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
`<http://www.ccli.com/>`_ 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()

View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS><TS version="1.1" language="hu_HU">
<!DOCTYPE TS>
<TS version="2.0" language="hu_HU">
<context>
<name>AlertPlugin.AlertForm</name>
<message>
@ -696,7 +697,7 @@ demand and thus an internet connection is required.</source>
<message>
<location filename="openlp/plugins/custom/customplugin.py" line="59"/>
<source>&lt;strong&gt;Custom Plugin&lt;/strong&gt;&lt;br /&gt;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.</source>
<translation>&lt;strong&gt;Speciális bővítmény&lt;/strong&gt;&lt;br /&gt;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.</translation>
<translation>&lt;strong&gt;Speciális bővítmény&lt;/strong&gt;&lt;br /&gt;Az speciális bővítmény dalokhoz hasonló egyéni diasor vetítését teszi lehetővé. Ugyanakkor több szabadságot enged meg, mint a dalok bővítmény.</translation>
</message>
</context>
<context>
@ -717,7 +718,7 @@ demand and thus an internet connection is required.</source>
<message>
<location filename="openlp/plugins/custom/forms/editcustomdialog.py" line="106"/>
<source>Edit Custom Slides</source>
<translation>Speciális diák szerkesztése</translation>
<translation>Speciális diasor szerkesztése</translation>
</message>
<message>
<location filename="openlp/plugins/custom/forms/editcustomdialog.py" line="108"/>
@ -841,7 +842,7 @@ demand and thus an internet connection is required.</source>
<message>
<location filename="openlp/plugins/images/imageplugin.py" line="44"/>
<source>&lt;strong&gt;Image Plugin&lt;/strong&gt;&lt;br /&gt;The image plugin provides displaying of images.&lt;br /&gt;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&apos;s &quot;timed looping&quot; 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&apos;s background, which renders text-based items like songs with the selected image as a background instead of the background provided by the theme.</source>
<translation>&lt;strong&gt;Kép bővítmény&lt;/strong&gt;&lt;br /&gt;A kép a bővítmény különféle képek vetítését teszi lehetővé.&lt;br /&gt;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.</translation>
<translation>&lt;strong&gt;Kép bővítmény&lt;/strong&gt;&lt;br /&gt;A kép a bővítmény különféle képek vetítését teszi lehetővé.&lt;br /&gt;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 diasort 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.</translation>
</message>
<message>
<location filename="openlp/plugins/images/imageplugin.py" line="72"/>
@ -1078,7 +1079,7 @@ 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.</source>
<translation>OpenLP &lt;version&gt; &lt;revision&gt; Nyílt forrású dalszöveg vetítő
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.
Az OpenLP egy templomi/gyülekezeti bemutató, ill. dalszöveg vetítő szabad szoftver, mely é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 használható 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/
@ -1221,12 +1222,12 @@ 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.&quot; János 3,16
örök élete legyen. (Jn 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 Ő
ezt a programot szabadnak és ingyenesnek készítettük, mert Ő
tett minket szabaddá.</translation>
</message>
<message>
@ -1245,14 +1246,12 @@ Tinggaard, Frode Woldsund</translation>
<message>
<location filename="openlp/core/ui/aboutdialog.py" line="231"/>
<source>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.</source>
<translation>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.
</translation>
<translation>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.</translation>
</message>
<message>
<location filename="openlp/core/ui/aboutdialog.py" line="236"/>
<source>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.</source>
<translation>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.
</translation>
<translation>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.</translation>
</message>
</context>
<context>
@ -1343,7 +1342,7 @@ Tinggaard, Frode Woldsund</translation>
<message>
<location filename="openlp/core/ui/displaytagdialog.py" line="135"/>
<source>Start tag</source>
<translation>Kezdő címke</translation>
<translation>Nyitó címke</translation>
</message>
<message>
<location filename="openlp/core/ui/displaytagdialog.py" line="137"/>
@ -1358,12 +1357,12 @@ Tinggaard, Frode Woldsund</translation>
<message>
<location filename="openlp/core/ui/displaytagdialog.py" line="145"/>
<source>Tag Id</source>
<translation>Címke ID</translation>
<translation>ID</translation>
</message>
<message>
<location filename="openlp/core/ui/displaytagdialog.py" line="147"/>
<source>Start HTML</source>
<translation>Kezdő HTML</translation>
<translation>Nyitó HTML</translation>
</message>
<message>
<location filename="openlp/core/ui/displaytagdialog.py" line="149"/>
@ -1394,7 +1393,7 @@ Tinggaard, Frode Woldsund</translation>
<message>
<location filename="openlp/core/ui/exceptiondialog.py" line="102"/>
<source>Oops! OpenLP hit a problem, and couldn&apos;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.</source>
<translation>Hoppá! Az OpenLP hibába ütközött, és nem tudta lekezelni. Az alábbi dobozban található szöveg olyan információkat tartalmaz, amelyek hasznosak lehetnek az OpenLP fejlesztői számára, tehát kérjük, küld el bugs@openlp.org email címre egy részletes leírás mellett, amely tartalmazza, hogy éppen merre és mit tettél, amikor a hiba történt.</translation>
<translation>Hoppá! Az OpenLP hibába ütközött, és nem tudta lekezelni. Az alszövegdoboz olyan információkat tartalmaz, amelyek hasznosak lehetnek az OpenLP fejlesztői számára, tehát kérjük, küld el a bugs@openlp.org email címre egy részletes leírás mellett, amely tartalmazza, hogy éppen hol és mit tettél, amikor a hiba történt.</translation>
</message>
<message>
<location filename="openlp/core/ui/exceptiondialog.py" line="97"/>
@ -1415,13 +1414,12 @@ Tinggaard, Frode Woldsund</translation>
<location filename="openlp/core/ui/exceptiondialog.py" line="99"/>
<source>Please enter a description of what you were doing to cause this error
(Minimum 20 characters)</source>
<translation>Írd le mit tettél, ami a hibát okozta
(minimum 20 karakter)</translation>
<translation>Írd le mit tettél, ami a hibához vezetett (minimum 20 karakter)</translation>
</message>
<message>
<location filename="openlp/core/ui/exceptiondialog.py" line="112"/>
<source>Attach File</source>
<translation>Csatolt fájl</translation>
<translation>Fájl csatolása</translation>
</message>
<message>
<location filename="openlp/core/ui/exceptionform.py" line="171"/>
@ -1536,7 +1534,7 @@ Version: %s
<message>
<location filename="openlp/core/ui/firsttimeform.py" line="252"/>
<source>Enabling selected plugins...</source>
<translation>Kijelölt beépülők engedélyezése</translation>
<translation>Kijelölt bővítmények engedélyezése</translation>
</message>
<message>
<location filename="openlp/core/ui/firsttimewizard.py" line="191"/>
@ -1556,12 +1554,12 @@ Version: %s
<message>
<location filename="openlp/core/ui/firsttimewizard.py" line="201"/>
<source>Activate required Plugins</source>
<translation>Szükséges beépülők aktiválása</translation>
<translation>Igényelt bővítmények aktiválása</translation>
</message>
<message>
<location filename="openlp/core/ui/firsttimewizard.py" line="203"/>
<source>Select the Plugins you wish to use. </source>
<translation>Jelöld ki az alkalmazni kívánt beépülőket.</translation>
<translation>Jelöld ki az alkalmazni kívánt bővítményeket.</translation>
</message>
<message>
<location filename="openlp/core/ui/firsttimewizard.py" line="205"/>
@ -1571,7 +1569,7 @@ Version: %s
<message>
<location filename="openlp/core/ui/firsttimewizard.py" line="206"/>
<source>Custom Text</source>
<translation>Egyedi szöveg</translation>
<translation>Speciális</translation>
</message>
<message>
<location filename="openlp/core/ui/firsttimewizard.py" line="208"/>
@ -1596,17 +1594,17 @@ Version: %s
<message>
<location filename="openlp/core/ui/firsttimewizard.py" line="215"/>
<source>Allow remote access</source>
<translation>Távvezérlés engedélyezése</translation>
<translation>Távvezérlő</translation>
</message>
<message>
<location filename="openlp/core/ui/firsttimewizard.py" line="217"/>
<source>Monitor Song Usage</source>
<translation>Dalstatisztika monitorozása</translation>
<translation>Dalstatisztika</translation>
</message>
<message>
<location filename="openlp/core/ui/firsttimewizard.py" line="219"/>
<source>Allow Alerts</source>
<translation>Értesítések engedélyezése</translation>
<translation>Értesítések</translation>
</message>
<message>
<location filename="openlp/core/ui/firsttimewizard.py" line="221"/>
@ -1679,7 +1677,7 @@ Az Első indulás tündér további megkerüléséhez, nyomd meg a Befejezés go
<message>
<location filename="openlp/core/ui/firsttimewizard.py" line="252"/>
<source>Please wait while OpenLP is set up and your data is imported.</source>
<translation>Várj, amíg az OpenLP beállítások érvényre jutnak és míg at adatok importálódnak.</translation>
<translation>Várj, amíg az OpenLP beállítások érvényre jutnak és míg az adatok importálódnak.</translation>
</message>
<message>
<location filename="openlp/core/ui/firsttimewizard.py" line="254"/>
@ -1757,7 +1755,7 @@ Az Első indulás tündér további megkerüléséhez, nyomd meg a Befejezés go
<message>
<location filename="openlp/core/ui/generaltab.py" line="229"/>
<source>Slide loop delay:</source>
<translation>Időzített diák késleltetése:</translation>
<translation>Időzített dia késleltetése:</translation>
</message>
<message>
<location filename="openlp/core/ui/generaltab.py" line="231"/>
@ -1818,12 +1816,12 @@ Az Első indulás tündér további megkerüléséhez, nyomd meg a Befejezés go
<context>
<name>OpenLP.LanguageManager</name>
<message>
<location filename="openlp/core/utils/languagemanager.py" line="130"/>
<location filename="openlp/core/utils/languagemanager.py" line="132"/>
<source>Language</source>
<translation>Nyelv</translation>
</message>
<message>
<location filename="openlp/core/utils/languagemanager.py" line="130"/>
<location filename="openlp/core/utils/languagemanager.py" line="132"/>
<source>Please restart OpenLP to use your new language setting.</source>
<translation>A nyelvi beállítások az OpenLP újraindítása után lépnek érvénybe.</translation>
</message>
@ -1839,347 +1837,347 @@ Az Első indulás tündér további megkerüléséhez, nyomd meg a Befejezés go
<context>
<name>OpenLP.MainWindow</name>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="313"/>
<location filename="openlp/core/ui/mainwindow.py" line="315"/>
<source>&amp;File</source>
<translation>&amp;Fájl</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="314"/>
<location filename="openlp/core/ui/mainwindow.py" line="316"/>
<source>&amp;Import</source>
<translation>&amp;Importálás</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="315"/>
<location filename="openlp/core/ui/mainwindow.py" line="317"/>
<source>&amp;Export</source>
<translation>&amp;Exportálás</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="316"/>
<location filename="openlp/core/ui/mainwindow.py" line="318"/>
<source>&amp;View</source>
<translation>&amp;Nézet</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="317"/>
<location filename="openlp/core/ui/mainwindow.py" line="319"/>
<source>M&amp;ode</source>
<translation>&amp;Mód</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="318"/>
<location filename="openlp/core/ui/mainwindow.py" line="320"/>
<source>&amp;Tools</source>
<translation>&amp;Eszközök</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="319"/>
<location filename="openlp/core/ui/mainwindow.py" line="321"/>
<source>&amp;Settings</source>
<translation>&amp;Beállítások</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="368"/>
<location filename="openlp/core/ui/mainwindow.py" line="370"/>
<source>&amp;Language</source>
<translation>&amp;Nyelv</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="322"/>
<location filename="openlp/core/ui/mainwindow.py" line="324"/>
<source>&amp;Help</source>
<translation>&amp;Súgó</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="323"/>
<location filename="openlp/core/ui/mainwindow.py" line="325"/>
<source>Media Manager</source>
<translation>Médiakezelő</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="325"/>
<location filename="openlp/core/ui/mainwindow.py" line="327"/>
<source>Service Manager</source>
<translation>Sorrendkezelő</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="327"/>
<location filename="openlp/core/ui/mainwindow.py" line="329"/>
<source>Theme Manager</source>
<translation>Témakezelő</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="329"/>
<location filename="openlp/core/ui/mainwindow.py" line="331"/>
<source>&amp;New</source>
<translation>&amp;Új</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="332"/>
<location filename="openlp/core/ui/mainwindow.py" line="334"/>
<source>Ctrl+N</source>
<translation></translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="333"/>
<location filename="openlp/core/ui/mainwindow.py" line="335"/>
<source>&amp;Open</source>
<translation>Meg&amp;nyitás</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="335"/>
<location filename="openlp/core/ui/mainwindow.py" line="337"/>
<source>Open an existing service.</source>
<translation>Meglévő sorrend megnyitása.</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="337"/>
<location filename="openlp/core/ui/mainwindow.py" line="339"/>
<source>Ctrl+O</source>
<translation></translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="338"/>
<location filename="openlp/core/ui/mainwindow.py" line="340"/>
<source>&amp;Save</source>
<translation>&amp;Mentés</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="340"/>
<location filename="openlp/core/ui/mainwindow.py" line="342"/>
<source>Save the current service to disk.</source>
<translation>Aktuális sorrend mentése lemezre.</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="342"/>
<location filename="openlp/core/ui/mainwindow.py" line="344"/>
<source>Ctrl+S</source>
<translation></translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="343"/>
<location filename="openlp/core/ui/mainwindow.py" line="345"/>
<source>Save &amp;As...</source>
<translation>Mentés &amp;sként</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="345"/>
<location filename="openlp/core/ui/mainwindow.py" line="347"/>
<source>Save Service As</source>
<translation>Sorrend mentése másként</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="347"/>
<location filename="openlp/core/ui/mainwindow.py" line="349"/>
<source>Save the current service under a new name.</source>
<translation>Az aktuális sorrend más néven való mentése.</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="349"/>
<location filename="openlp/core/ui/mainwindow.py" line="351"/>
<source>Ctrl+Shift+S</source>
<translation></translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="356"/>
<location filename="openlp/core/ui/mainwindow.py" line="358"/>
<source>E&amp;xit</source>
<translation>&amp;Kilépés</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="358"/>
<location filename="openlp/core/ui/mainwindow.py" line="360"/>
<source>Quit OpenLP</source>
<translation>OpenLP bezárása</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="360"/>
<location filename="openlp/core/ui/mainwindow.py" line="362"/>
<source>Alt+F4</source>
<translation></translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="366"/>
<location filename="openlp/core/ui/mainwindow.py" line="368"/>
<source>&amp;Theme</source>
<translation>&amp;Téma</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="374"/>
<location filename="openlp/core/ui/mainwindow.py" line="376"/>
<source>&amp;Configure OpenLP...</source>
<translation>OpenLP &amp;beállítása</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="376"/>
<location filename="openlp/core/ui/mainwindow.py" line="378"/>
<source>&amp;Media Manager</source>
<translation>&amp;Médiakezelő</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="378"/>
<location filename="openlp/core/ui/mainwindow.py" line="380"/>
<source>Toggle Media Manager</source>
<translation>Médiakezelő átváltása</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="380"/>
<location filename="openlp/core/ui/mainwindow.py" line="382"/>
<source>Toggle the visibility of the media manager.</source>
<translation>A médiakezelő láthatóságának átváltása.</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="382"/>
<location filename="openlp/core/ui/mainwindow.py" line="384"/>
<source>F8</source>
<translation></translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="384"/>
<location filename="openlp/core/ui/mainwindow.py" line="386"/>
<source>&amp;Theme Manager</source>
<translation>&amp;Témakezelő</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="386"/>
<location filename="openlp/core/ui/mainwindow.py" line="388"/>
<source>Toggle Theme Manager</source>
<translation>Témakezelő átváltása</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="388"/>
<location filename="openlp/core/ui/mainwindow.py" line="390"/>
<source>Toggle the visibility of the theme manager.</source>
<translation>A témakezelő láthatóságának átváltása.</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="390"/>
<location filename="openlp/core/ui/mainwindow.py" line="392"/>
<source>F10</source>
<translation></translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="392"/>
<location filename="openlp/core/ui/mainwindow.py" line="394"/>
<source>&amp;Service Manager</source>
<translation>&amp;Sorrendkezelő</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="394"/>
<location filename="openlp/core/ui/mainwindow.py" line="396"/>
<source>Toggle Service Manager</source>
<translation>Sorrendkezelő átváltása</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="396"/>
<location filename="openlp/core/ui/mainwindow.py" line="398"/>
<source>Toggle the visibility of the service manager.</source>
<translation>A sorrendkezelő láthatóságának átváltása.</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="398"/>
<location filename="openlp/core/ui/mainwindow.py" line="400"/>
<source>F9</source>
<translation></translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="400"/>
<location filename="openlp/core/ui/mainwindow.py" line="402"/>
<source>&amp;Preview Panel</source>
<translation>&amp;Előnézet panel</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="402"/>
<location filename="openlp/core/ui/mainwindow.py" line="404"/>
<source>Toggle Preview Panel</source>
<translation>Előnézet panel átváltása</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="404"/>
<location filename="openlp/core/ui/mainwindow.py" line="406"/>
<source>Toggle the visibility of the preview panel.</source>
<translation>Az előnézet panel láthatóságának átváltása.</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="406"/>
<location filename="openlp/core/ui/mainwindow.py" line="408"/>
<source>F11</source>
<translation></translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="408"/>
<location filename="openlp/core/ui/mainwindow.py" line="410"/>
<source>&amp;Live Panel</source>
<translation>&amp;É adás panel</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="410"/>
<location filename="openlp/core/ui/mainwindow.py" line="412"/>
<source>Toggle Live Panel</source>
<translation>É adás panel átváltása</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="412"/>
<location filename="openlp/core/ui/mainwindow.py" line="414"/>
<source>Toggle the visibility of the live panel.</source>
<translation>Az é adás panel láthatóságának átváltása.</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="414"/>
<location filename="openlp/core/ui/mainwindow.py" line="416"/>
<source>F12</source>
<translation></translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="416"/>
<location filename="openlp/core/ui/mainwindow.py" line="418"/>
<source>&amp;Plugin List</source>
<translation>&amp;Bővítménylista</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="418"/>
<location filename="openlp/core/ui/mainwindow.py" line="420"/>
<source>List the Plugins</source>
<translation>Bővítmények listája</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="420"/>
<location filename="openlp/core/ui/mainwindow.py" line="422"/>
<source>Alt+F7</source>
<translation></translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="422"/>
<location filename="openlp/core/ui/mainwindow.py" line="424"/>
<source>&amp;User Guide</source>
<translation>&amp;Felhasználói kézikönyv</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="424"/>
<location filename="openlp/core/ui/mainwindow.py" line="426"/>
<source>&amp;About</source>
<translation>&amp;Névjegy</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="425"/>
<location filename="openlp/core/ui/mainwindow.py" line="427"/>
<source>More information about OpenLP</source>
<translation>További információ az OpenLP-ről</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="427"/>
<location filename="openlp/core/ui/mainwindow.py" line="429"/>
<source>Ctrl+F1</source>
<translation></translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="429"/>
<location filename="openlp/core/ui/mainwindow.py" line="431"/>
<source>&amp;Online Help</source>
<translation>&amp;Online súgó</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="434"/>
<location filename="openlp/core/ui/mainwindow.py" line="433"/>
<source>&amp;Web Site</source>
<translation>&amp;Weboldal</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="442"/>
<location filename="openlp/core/ui/mainwindow.py" line="441"/>
<source>Use the system language, if available.</source>
<translation>Rendszernyelv használata, ha elérhető.</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="438"/>
<location filename="openlp/core/ui/mainwindow.py" line="437"/>
<source>Set the interface language to %s</source>
<translation>A felhasználói felület nyelvének átváltása erre: %s</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="444"/>
<location filename="openlp/core/ui/mainwindow.py" line="443"/>
<source>Add &amp;Tool...</source>
<translation>&amp;Eszköz hozzáadása</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="446"/>
<location filename="openlp/core/ui/mainwindow.py" line="445"/>
<source>Add an application to the list of tools.</source>
<translation>Egy alkalmazás hozzáadása az eszközök listához.</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="452"/>
<location filename="openlp/core/ui/mainwindow.py" line="451"/>
<source>&amp;Default</source>
<translation>&amp;Alapértelmezett</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="454"/>
<location filename="openlp/core/ui/mainwindow.py" line="453"/>
<source>Set the view mode back to the default.</source>
<translation>Nézetmód visszaállítása az alapértelmezettre.</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="456"/>
<location filename="openlp/core/ui/mainwindow.py" line="455"/>
<source>&amp;Setup</source>
<translation>&amp;Szerkesztés</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="457"/>
<location filename="openlp/core/ui/mainwindow.py" line="456"/>
<source>Set the view mode to Setup.</source>
<translation>Nézetmód váltása a Beállítás módra.</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="459"/>
<location filename="openlp/core/ui/mainwindow.py" line="458"/>
<source>&amp;Live</source>
<translation>&amp;É adás</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="460"/>
<location filename="openlp/core/ui/mainwindow.py" line="459"/>
<source>Set the view mode to Live.</source>
<translation>Nézetmód váltása a É módra.</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="648"/>
<location filename="openlp/core/ui/mainwindow.py" line="645"/>
<source>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/.</source>
@ -2188,27 +2186,27 @@ You can download the latest version from http://openlp.org/.</source>
A legfrissebb verzió a http://openlp.org/ oldalról szerezhető be.</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="652"/>
<location filename="openlp/core/ui/mainwindow.py" line="649"/>
<source>OpenLP Version Updated</source>
<translation>OpenLP verziófrissítés</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="704"/>
<location filename="openlp/core/ui/mainwindow.py" line="701"/>
<source>OpenLP Main Display Blanked</source>
<translation>Sötét OpenLP képernyő</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="704"/>
<location filename="openlp/core/ui/mainwindow.py" line="701"/>
<source>The Main Display has been blanked out</source>
<translation>A képernyő el lett sötétítve</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="920"/>
<location filename="openlp/core/ui/mainwindow.py" line="910"/>
<source>Default Theme: %s</source>
<translation>Alapértelmezett téma: %s</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="370"/>
<location filename="openlp/core/ui/mainwindow.py" line="372"/>
<source>Configure &amp;Shortcuts...</source>
<translation>&amp;Gyorsbillentyűk beállítása</translation>
</message>
@ -2219,42 +2217,42 @@ A legfrissebb verzió a http://openlp.org/ oldalról szerezhető be.</translatio
<translation>Magyar</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="352"/>
<location filename="openlp/core/ui/mainwindow.py" line="354"/>
<source>Print the current Service Order.</source>
<translation>Az aktuális sorrend nyomtatása.</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="354"/>
<location filename="openlp/core/ui/mainwindow.py" line="356"/>
<source>Ctrl+P</source>
<translation></translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="372"/>
<location filename="openlp/core/ui/mainwindow.py" line="374"/>
<source>&amp;Configure Display Tags</source>
<translation>Megjelenítési &amp;címkek beállítása</translation>
<translation>Megjelenítési &amp;címkék beállítása</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="440"/>
<location filename="openlp/core/ui/mainwindow.py" line="439"/>
<source>&amp;Autodetect</source>
<translation>&amp;Automatikus felismerés</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="448"/>
<location filename="openlp/core/ui/mainwindow.py" line="447"/>
<source>Open &amp;Data Folder...</source>
<translation>&amp;Adatmappa megnyitása</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="450"/>
<location filename="openlp/core/ui/mainwindow.py" line="449"/>
<source>Open the folder where songs, bibles and other data resides.</source>
<translation>A dalokat, Bibliákat és egyéb adatokat tartalmazó mappa megnyitása.</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="842"/>
<location filename="openlp/core/ui/mainwindow.py" line="832"/>
<source>Close OpenLP</source>
<translation>OpenLP bezárása</translation>
</message>
<message>
<location filename="openlp/core/ui/mainwindow.py" line="842"/>
<location filename="openlp/core/ui/mainwindow.py" line="832"/>
<source>Are you sure you want to close OpenLP?</source>
<translation>Biztosan bezárható az OpenLP?</translation>
</message>
@ -3158,7 +3156,7 @@ A tartalom kódolása nem UTF-8.</translation>
<message>
<location filename="openlp/core/ui/themewizard.py" line="448"/>
<source>Define the font and display characteristics for the Display text</source>
<translation>A szöveg betűkészlete és a megjelenési tulajdonságai</translation>
<translation>A szöveg betűkészlete és megjelenési tulajdonságai</translation>
</message>
<message>
<location filename="openlp/core/ui/themewizard.py" line="473"/>
@ -3203,7 +3201,7 @@ A tartalom kódolása nem UTF-8.</translation>
<message>
<location filename="openlp/core/ui/themewizard.py" line="470"/>
<source>Define the font and display characteristics for the Footer text</source>
<translation>A lábléc szöveg betűkészlete és a megjelenési tulajdonságai</translation>
<translation>A lábléc szöveg betűkészlete és megjelenési tulajdonságai</translation>
</message>
<message>
<location filename="openlp/core/ui/themewizard.py" line="477"/>
@ -3293,7 +3291,7 @@ A tartalom kódolása nem UTF-8.</translation>
<message>
<location filename="openlp/core/ui/themewizard.py" line="530"/>
<source>View the theme and save it replacing the current one or change the name to create a new theme</source>
<translation>A téma előnézete és mentése. Felülírható már egy meglévő vagy egy új név megadásával új téma hozható létre</translation>
<translation>A téma előnézete és mentése: egy már meglévő téma felülírható vagy egy új név megadásával új téma hozható létre</translation>
</message>
<message>
<location filename="openlp/core/ui/themewizard.py" line="534"/>
@ -4439,7 +4437,7 @@ A kódlap felelős a karakterek helyes megjelenítéséért.</translation>
<message>
<location filename="openlp/plugins/songs/forms/editsongform.py" line="367"/>
<source>You have not selected a valid author. Either select an author from the list, or type in a new author and click the &quot;Add Author to Song&quot; button to add the new author.</source>
<translation>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.</translation>
<translation>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 a Hozzáadás gombra a szerző megjelöléséhez.</translation>
</message>
<message>
<location filename="openlp/plugins/songs/forms/editsongform.py" line="395"/>
@ -4459,7 +4457,7 @@ A kódlap felelős a karakterek helyes megjelenítéséért.</translation>
<message>
<location filename="openlp/plugins/songs/forms/editsongform.py" line="426"/>
<source>You have not selected a valid topic. Either select a topic from the list, or type in a new topic and click the &quot;Add Topic to Song&quot; button to add the new topic.</source>
<translation>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.</translation>
<translation>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 Hozzáadás gombraa témakör megjelöléséhez.</translation>
</message>
<message>
<location filename="openlp/plugins/songs/forms/editsongform.py" line="561"/>

View File

@ -394,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()

View File

@ -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