openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #31033
[Merge] lp:~trb143/openlp/about into lp:openlp
Tim Bentley has proposed merging lp:~trb143/openlp/about into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~trb143/openlp/about/+merge/315397
More translations
fix the about form for iso8956 to utf8 bug. We can generate translations again!
--
The attached diff has been truncated due to its size.
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/about into lp:openlp.
=== modified file 'openlp/core/ui/aboutdialog.py'
--- openlp/core/ui/aboutdialog.py 2017-01-11 20:03:04 +0000
+++ openlp/core/ui/aboutdialog.py 2017-01-23 18:27:54 +0000
@@ -312,10 +312,11 @@
'Martin Thompson, Jon Tibble, Dave Warnock, Frode Woldsund, '
'Martin Zibricky, Patrick Zimmermann')
copyright_note = translate('OpenLP.AboutForm',
- 'Copyright \xa9 2004-{yr} {cr}\n\n'
- 'Portions copyright \xa9 2004-{yr} {others}').format(cr='Raoul Snyman',
- yr=datetime.date.today().year,
- others=cr_others)
+ 'Copyright {crs} 2004-{yr} {cr}\n\n'
+ 'Portions copyright {crs} 2004-{yr} {others}').format(cr='Raoul Snyman',
+ yr=datetime.date.today().year,
+ others=cr_others,
+ crs='\xa9')
licence = translate('OpenLP.AboutForm',
'This program is free software; you can redistribute it and/or '
'modify it under the terms of the GNU General Public License as '
=== modified file 'resources/i18n/af.ts'
--- resources/i18n/af.ts 2017-01-11 19:09:00 +0000
+++ resources/i18n/af.ts 2017-01-23 18:27:54 +0000
@@ -1,4 +1,5 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="af" sourcelanguage="" version="2.0">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS><TS version="2.0" language="af" sourcelanguage="">
<context>
<name>AlertsPlugin</name>
<message>
@@ -96,14 +97,14 @@
</message>
<message>
<location filename="../../openlp/plugins/alerts/forms/alertform.py" line="192"/>
- <source>The alert text does not contain '<>'.
+ <source>The alert text does not contain '<>'.
Do you want to continue anyway?</source>
<translation>Die waarskuwing-teks bevat nie '<>' nie.
Wil jy steeds voortgaan?</translation>
</message>
<message>
<location filename="../../openlp/plugins/alerts/forms/alertform.py" line="108"/>
- <source>You haven't specified any text for your alert.
+ <source>You haven't specified any text for your alert.
Please type in some text before clicking New.</source>
<translation>Daar is geen teks vir die waarskuwing ingesluetel nie.
Voer asseblief enige teks in voordat die Nuwe balkie gekliek word.</translation>
@@ -738,6 +739,7 @@
<source>The book name "{name}" is not correct.
Numbers can only be used at the beginning and must
be followed by one or more non-numeric characters.</source>
+<<<<<<< TREE
<translation>Die boek naam "{name}" is verkeerd.
Nommers kan slegs gebruik word aan die begin en moet
word gevolg deur een of meer nie-numeriese karakters.</translation>
@@ -746,16 +748,45 @@
<location filename="../../openlp/plugins/bibles/forms/editbibleform.py" line="189"/>
<source>The Book Name "{name}" has been entered more than once.</source>
<translation type="unfinished"/>
+=======
+ <translation>Die boek naam "{name}" is verkeerd.
+Nommers kan slegs gebruik word aan die begin en moet
+word gevolg deur een of meer nie-numeriese karakters.</translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/forms/editbibleform.py" line="189"/>
+ <source>The Book Name "{name}" has been entered more than once.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>BiblesPlugin.BibleImport</name>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/bibleimport.py" line="51"/>
+ <source>The file "{file}" you supplied is compressed. You must decompress it before import.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/bibleimport.py" line="220"/>
+ <source>unknown type of</source>
+ <comment>This looks like an unknown type of XML bible.</comment>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
</context>
<context>
<name>BiblesPlugin.BibleManager</name>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="816"/>
+=======
+ <location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="812"/>
+>>>>>>> MERGE-SOURCE
<source>Scripture Reference Error</source>
<translation>Skrif Verwysing Fout</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/lib/manager.py" line="330"/>
<source>Web Bible cannot be used in Text Search</source>
<translation type="unfinished"/>
@@ -776,6 +807,28 @@
<location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="859"/>
<source>Nothing found</source>
<translation type="unfinished"/>
+=======
+ <location filename="../../openlp/plugins/bibles/lib/manager.py" line="335"/>
+ <source>Web Bible cannot be used in Text Search</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/manager.py" line="335"/>
+ <source>Text Search is not available with Web Bibles.
+Please use the Scripture Reference Search instead.
+
+This means that the currently used Bible
+or Second Bible is installed as Web Bible.
+
+If you were trying to perform a Reference search
+in Combined Search, your reference is invalid.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="855"/>
+ <source>Nothing found</source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
</context>
<context>
@@ -866,52 +919,101 @@
<source>Show verse numbers</source>
<translation>Wys versnommers</translation>
</message>
- <message>
- <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="193"/>
- <source>Note: Changes do not affect verses in the Service</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="197"/>
- <source>Verse separator:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="198"/>
- <source>Range separator:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="199"/>
- <source>List separator:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="200"/>
- <source>End mark:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="217"/>
- <source>Quick Search Settings</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="218"/>
- <source>Reset search type to "Text or Scripture Reference" on startup</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="221"/>
- <source>Don't show error if nothing is found in "Text or Scripture Reference"</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="224"/>
- <source>Search automatically while typing (Text search must contain a
-minimum of {count} characters and a space for performance reasons)</source>
- <translation type="unfinished"/>
- </message>
+<<<<<<< TREE
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="193"/>
+ <source>Note: Changes do not affect verses in the Service</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="197"/>
+ <source>Verse separator:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="198"/>
+ <source>Range separator:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="199"/>
+ <source>List separator:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="200"/>
+ <source>End mark:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="217"/>
+ <source>Quick Search Settings</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="218"/>
+ <source>Reset search type to "Text or Scripture Reference" on startup</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="221"/>
+ <source>Don't show error if nothing is found in "Text or Scripture Reference"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="224"/>
+ <source>Search automatically while typing (Text search must contain a
+minimum of {count} characters and a space for performance reasons)</source>
+ <translation type="unfinished"/>
+ </message>
+=======
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="193"/>
+ <source>Note: Changes do not affect verses in the Service</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="197"/>
+ <source>Verse separator:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="198"/>
+ <source>Range separator:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="199"/>
+ <source>List separator:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="200"/>
+ <source>End mark:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="217"/>
+ <source>Quick Search Settings</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="218"/>
+ <source>Reset search type to "Text or Scripture Reference" on startup</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="221"/>
+ <source>Don't show error if nothing is found in "Text or Scripture Reference"</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="224"/>
+ <source>Search automatically while typing (Text search must contain a
+minimum of {count} characters and a space for performance reasons)</source>
+ <translation type="unfinished"></translation>
+ </message>
+>>>>>>> MERGE-SOURCE
</context>
<context>
<name>BiblesPlugin.BookNameDialog</name>
@@ -967,9 +1069,21 @@
<context>
<name>BiblesPlugin.CSVBible</name>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/lib/importers/csvbible.py" line="157"/>
<source>Importing verses... done.</source>
<translation>Vers invoer... voltooi.</translation>
+=======
+ <location filename="../../openlp/plugins/bibles/lib/importers/csvbible.py" line="124"/>
+ <source>Importing books... {book}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/importers/csvbible.py" line="146"/>
+ <source>Importing verses from {book}...</source>
+ <comment>Importing verses from <book name>...</comment>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
<message>
<location filename="../../openlp/plugins/bibles/lib/importers/csvbible.py" line="129"/>
@@ -1083,6 +1197,7 @@
<message>
<location filename="../../openlp/plugins/bibles/lib/importers/http.py" line="815"/>
<source>There was a problem extracting your verse selection. If this error continues to occur please consider reporting a bug.</source>
+<<<<<<< TREE
<translation>Daar was 'n probleem om die gekose verse te onttrek. As hierdie probleem voortduur, oorweeg dit asseblief om 'n gogga te rapporteer.</translation>
</message>
<message>
@@ -1090,188 +1205,342 @@
<source>Importing {book}...</source>
<comment>Importing <book name>...</comment>
<translation type="unfinished"/>
+=======
+ <translation>Daar was 'n probleem om die gekose verse te onttrek. As hierdie probleem voortduur, oorweeg dit asseblief om 'n gogga te rapporteer.</translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/importers/http.py" line="659"/>
+ <source>Importing {book}...</source>
+ <comment>Importing <book name>...</comment>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
</context>
<context>
<name>BiblesPlugin.ImportWizardForm</name>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="387"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="417"/>
+>>>>>>> MERGE-SOURCE
<source>Bible Import Wizard</source>
<translation>Bybel Invoer Gids</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="390"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="420"/>
+>>>>>>> MERGE-SOURCE
<source>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.</source>
<translation>Hierdie gids sal u help om Bybels van 'n verskeidenheid formate in te voer. Kliek die volgende knoppie hieronder om die proses te begin deur 'n formaat te kies om in te voer.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="401"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="432"/>
+>>>>>>> MERGE-SOURCE
<source>Web Download</source>
<translation>Web Aflaai</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="409"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="440"/>
+>>>>>>> MERGE-SOURCE
<source>Location:</source>
<translation>Ligging:</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="413"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="445"/>
+>>>>>>> MERGE-SOURCE
<source>Crosswalk</source>
<translation>Crosswalk</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="415"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="447"/>
+>>>>>>> MERGE-SOURCE
<source>BibleGateway</source>
<translation>BibleGateway</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="419"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="451"/>
+>>>>>>> MERGE-SOURCE
<source>Bible:</source>
<translation>Bybel:</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="420"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="452"/>
+>>>>>>> MERGE-SOURCE
<source>Download Options</source>
<translation>Aflaai Opsies</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="422"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="454"/>
+>>>>>>> MERGE-SOURCE
<source>Server:</source>
<translation>Bediener:</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="423"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="455"/>
+>>>>>>> MERGE-SOURCE
<source>Username:</source>
<translation>Gebruikersnaam:</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="424"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="456"/>
+>>>>>>> MERGE-SOURCE
<source>Password:</source>
<translation>Wagwoord:</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="425"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="457"/>
+>>>>>>> MERGE-SOURCE
<source>Proxy Server (Optional)</source>
<translation>Tussenganger Bediener (Opsioneel)</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="444"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="476"/>
+>>>>>>> MERGE-SOURCE
<source>License Details</source>
<translation>Lisensie Besonderhede</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="446"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="478"/>
+>>>>>>> MERGE-SOURCE
<source>Set up the Bible's license details.</source>
<translation>Stel hierdie Bybel se lisensie besonderhede op.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="448"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="480"/>
+>>>>>>> MERGE-SOURCE
<source>Version name:</source>
<translation>Weergawe naam:</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="449"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="481"/>
+>>>>>>> MERGE-SOURCE
<source>Copyright:</source>
<translation>Kopiereg:</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="452"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="484"/>
+>>>>>>> MERGE-SOURCE
<source>Please wait while your Bible is imported.</source>
<translation>Wag asseblief terwyl u Bybel ingevoer word.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="482"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="515"/>
+>>>>>>> MERGE-SOURCE
<source>You need to specify a file with books of the Bible to use in the import.</source>
<translation>'n Lêer met boeke van die Bybel moet gespesifiseer word vir gebruik tydens die invoer.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="489"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="522"/>
+>>>>>>> MERGE-SOURCE
<source>You need to specify a file of Bible verses to import.</source>
<translation>'n Lêer met Bybel verse moet gespesifiseer word om in te voer.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="542"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="581"/>
+>>>>>>> MERGE-SOURCE
<source>You need to specify a version name for your Bible.</source>
<translation>Jy moet 'n weergawe naam vir die Bybel spesifiseer.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="548"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="587"/>
+>>>>>>> MERGE-SOURCE
<source>You need to set a copyright for your Bible. Bibles in the Public Domain need to be marked as such.</source>
<translation>Kopiereg moet vir jou Bybel ingestel word. Bybels in die Publieke Domein moet sodanig gemerk word. </translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="563"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="602"/>
+>>>>>>> MERGE-SOURCE
<source>Bible Exists</source>
<translation>Bybel Bestaan reeds</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="563"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="602"/>
+>>>>>>> MERGE-SOURCE
<source>This Bible already exists. Please import a different Bible or first delete the existing one.</source>
<translation>Hierdie Bybel bestaan reeds. Voer asseblief 'n ander Bybel in, of wis eers die bestaande een uit.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="822"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="880"/>
+>>>>>>> MERGE-SOURCE
<source>Your Bible import failed.</source>
<translation>Die Bybel invoer het misluk.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="608"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="647"/>
+>>>>>>> MERGE-SOURCE
<source>CSV File</source>
<translation>KGW Lêer</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="417"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="449"/>
+>>>>>>> MERGE-SOURCE
<source>Bibleserver</source>
<translation>Bybelbediener</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="450"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="482"/>
+>>>>>>> MERGE-SOURCE
<source>Permissions:</source>
<translation>Toestemming:</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="410"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="442"/>
+>>>>>>> MERGE-SOURCE
<source>Bible file:</source>
<translation>Bybel lêer:</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="406"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="437"/>
+>>>>>>> MERGE-SOURCE
<source>Books file:</source>
<translation>Boeke lêer:</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="407"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="438"/>
+>>>>>>> MERGE-SOURCE
<source>Verses file:</source>
<translation>Verse lêer:</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="754"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="802"/>
+>>>>>>> MERGE-SOURCE
<source>Registering Bible...</source>
<translation>Bybel word geregistreer...</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="816"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="870"/>
+>>>>>>> MERGE-SOURCE
<source>Registered Bible. Please note, that verses will be downloaded on demand and thus an internet connection is required.</source>
<translation>Geregistreerde Bybel. Neem asseblief kennis dat verse op aanvraag afgelaai sal word en sal derhalwe 'n internet-verbinding benodig.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="411"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="443"/>
+>>>>>>> MERGE-SOURCE
<source>Click to download bible list</source>
<translation>Klik om die Bybel lys af te laai</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="412"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="444"/>
+>>>>>>> MERGE-SOURCE
<source>Download bible list</source>
<translation>Laai Bybel lys af</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="647"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="694"/>
+>>>>>>> MERGE-SOURCE
<source>Error during download</source>
<translation>Fout tydens aflaai</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="647"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="694"/>
+>>>>>>> MERGE-SOURCE
<source>An error occurred while downloading the list of bibles from %s.</source>
+<<<<<<< TREE
<translation>Daar was 'n probleem om die lys van bybels af te laai vanaf %s.</translation>
</message>
<message>
@@ -1308,6 +1577,44 @@
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="441"/>
<source>To import SWORD bibles the pysword python module must be installed. Please read the manual for instructions.</source>
<translation type="unfinished"/>
+=======
+ <translation>Daar was 'n probleem om die lys van bybels af te laai vanaf %s.</translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="465"/>
+ <source>Bibles:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="461"/>
+ <source>SWORD data folder:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="462"/>
+ <source>SWORD zip-file:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="463"/>
+ <source>Defaults to the standard SWORD data folder</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="466"/>
+ <source>Import from folder</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="468"/>
+ <source>Import from Zip-file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="473"/>
+ <source>To import SWORD bibles the pysword python module must be installed. Please read the manual for instructions.</source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
</context>
<context>
@@ -1339,81 +1646,142 @@
<context>
<name>BiblesPlugin.MediaItem</name>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="294"/>
+=======
+ <location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="289"/>
+>>>>>>> MERGE-SOURCE
<source>Find:</source>
<translation>Vind:</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="305"/>
+=======
+ <location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="300"/>
+>>>>>>> MERGE-SOURCE
<source>Book:</source>
<translation>Boek:</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="306"/>
+=======
+ <location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="301"/>
+>>>>>>> MERGE-SOURCE
<source>Chapter:</source>
<translation>Hoofstuk:</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="307"/>
+=======
+ <location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="302"/>
+>>>>>>> MERGE-SOURCE
<source>Verse:</source>
<translation>Vers:</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="308"/>
+=======
+ <location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="303"/>
+>>>>>>> MERGE-SOURCE
<source>From:</source>
<translation>Vanaf:</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="309"/>
+=======
+ <location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="304"/>
+>>>>>>> MERGE-SOURCE
<source>To:</source>
<translation>Tot:</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="325"/>
+=======
+ <location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="320"/>
+>>>>>>> MERGE-SOURCE
<source>Text Search</source>
<translation>Teks Soektog</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="311"/>
+=======
+ <location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="306"/>
+>>>>>>> MERGE-SOURCE
<source>Second:</source>
<translation>Tweede:</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="325"/>
+=======
+ <location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="320"/>
+>>>>>>> MERGE-SOURCE
<source>Scripture Reference</source>
<translation>Skrif Verwysing</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="317"/>
+=======
+ <location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="312"/>
+>>>>>>> MERGE-SOURCE
<source>Toggle to keep or clear the previous results.</source>
<translation>Wissel om die vorige resultate te behou of te verwyder.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="95"/>
+=======
+ <location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="90"/>
+>>>>>>> MERGE-SOURCE
<source>You cannot combine single and dual Bible verse search results. Do you want to delete your search results and start a new search?</source>
<translation>Enkel en dubbel Bybel-vers soek-resultate kan nie gekombineer word nie. Wis die resultate uit en begin 'n nuwe soektog?</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="433"/>
+=======
+ <location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="429"/>
+>>>>>>> MERGE-SOURCE
<source>Bible not fully loaded.</source>
<translation>Die Bybel is nie ten volle gelaai nie.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="745"/>
+=======
+ <location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="741"/>
+>>>>>>> MERGE-SOURCE
<source>Information</source>
<translation>Informasie</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="325"/>
+=======
+ <location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="320"/>
+>>>>>>> MERGE-SOURCE
<source>Search Scripture Reference...</source>
<translation>Soek Bybel Verwysing...</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="325"/>
+=======
+ <location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="320"/>
+>>>>>>> MERGE-SOURCE
<source>Search Text...</source>
<translation>Soek Teks...</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="207"/>
<source>Search</source>
<translation>Soek</translation>
@@ -1441,15 +1809,54 @@
<message>
<location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="529"/>
<source>Are you sure you want to completely delete "{bible}" Bible from OpenLP?
+=======
+ <location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="202"/>
+ <source>Search</source>
+ <translation>Soek</translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="205"/>
+ <source>Select</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="311"/>
+ <source>Clear the search results.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="320"/>
+ <source>Text or Reference</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="320"/>
+ <source>Text or Reference...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="516"/>
+ <source>Are you sure you want to completely delete "{bible}" Bible from OpenLP?
+>>>>>>> MERGE-SOURCE
You will need to re-import this Bible to use it again.</source>
+<<<<<<< TREE
<translation type="unfinished"/>
</message>
<message>
<location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="745"/>
<source>The second Bible does not contain all the verses that are in the main Bible.
Only verses found in both Bibles will be shown.
+=======
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="741"/>
+ <source>The second Bible does not contain all the verses that are in the main Bible.
+Only verses found in both Bibles will be shown.
+>>>>>>> MERGE-SOURCE
+<<<<<<< TREE
{count:d} verses have not been included in the results.</source>
<translation type="unfinished"/>
</message>
@@ -1473,13 +1880,22 @@
<location filename="../../openlp/plugins/bibles/lib/importers/opensong.py" line="110"/>
<source>Importing {name} {chapter}...</source>
<translation type="unfinished"/>
+=======
+{count:d} verses have not been included in the results.</source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
</context>
<context>
<name>BiblesPlugin.OsisImport</name>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/lib/importers/osis.py" line="93"/>
+=======
+ <location filename="../../openlp/plugins/bibles/lib/bibleimport.py" line="167"/>
+>>>>>>> MERGE-SOURCE
<source>Removing unused tags (this may take a few minutes)...</source>
+<<<<<<< TREE
<translation>Verwydering van ongebruikte tags (dit mag 'n paar minuute neem)...</translation>
</message>
<message>
@@ -1509,12 +1925,41 @@
<source>An unexpected error happened while importing the SWORD bible, please report this to the OpenLP developers.
{error}</source>
<translation type="unfinished"/>
+=======
+ <translation>Verwydering van ongebruikte tags (dit mag 'n paar minuute neem)...</translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/bibleimport.py" line="196"/>
+ <source>Importing {book} {chapter}...</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>BiblesPlugin.Sword</name>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/importers/sword.py" line="88"/>
+ <source>Importing {name}...</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>BiblesPlugin.SwordImport</name>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/importers/sword.py" line="93"/>
+ <source>An unexpected error happened while importing the SWORD bible, please report this to the OpenLP developers.
+{error}</source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
</context>
<context>
<name>BiblesPlugin.ZefaniaImport</name>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/lib/importers/zefania.py" line="90"/>
+=======
+ <location filename="../../openlp/plugins/bibles/lib/importers/zefania.py" line="91"/>
+>>>>>>> MERGE-SOURCE
<source>Incorrect Bible file type supplied. Zefania Bibles may be compressed. You must decompress them before import.</source>
<translation>Ongeldige Bybel lêertipe verskaf. Zefania Bybels mag dalk saamgeperste lêers wees. Jy moet hulle eers ontpers voordat hulle ingevoer word.</translation>
</message>
@@ -1522,9 +1967,15 @@
<context>
<name>BiblesPlugin.Zefnia</name>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/lib/importers/zefania.py" line="83"/>
<source>Importing {book} {chapter}...</source>
<translation type="unfinished"/>
+=======
+ <location filename="../../openlp/plugins/bibles/lib/importers/zefania.py" line="84"/>
+ <source>Importing {book} {chapter}...</source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
</context>
<context>
@@ -1685,9 +2136,15 @@
<context>
<name>CustomPlugin.MediaItem</name>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/custom/lib/mediaitem.py" line="191"/>
<source>Are you sure you want to delete the "{items:d}" selected custom slide(s)?</source>
<translation type="unfinished"/>
+=======
+ <location filename="../../openlp/plugins/custom/lib/mediaitem.py" line="188"/>
+ <source>Are you sure you want to delete the "{items:d}" selected custom slide(s)?</source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
</context>
<context>
@@ -1745,16 +2202,29 @@
<source>Add the selected image to the service.</source>
<translation>Voeg die geselekteerde beeld by die diens.</translation>
</message>
- <message>
- <location filename="../../openlp/plugins/images/imageplugin.py" line="91"/>
- <source>Add new image(s).</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/plugins/images/lib/mediaitem.py" line="181"/>
- <source>Add new image(s)</source>
- <translation type="unfinished"/>
- </message>
+<<<<<<< TREE
+ <message>
+ <location filename="../../openlp/plugins/images/imageplugin.py" line="91"/>
+ <source>Add new image(s).</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/images/lib/mediaitem.py" line="181"/>
+ <source>Add new image(s)</source>
+ <translation type="unfinished"/>
+ </message>
+=======
+ <message>
+ <location filename="../../openlp/plugins/images/imageplugin.py" line="91"/>
+ <source>Add new image(s).</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/images/lib/mediaitem.py" line="181"/>
+ <source>Add new image(s)</source>
+ <translation type="unfinished"></translation>
+ </message>
+>>>>>>> MERGE-SOURCE
</context>
<context>
<name>ImagePlugin.AddGroupForm</name>
@@ -1860,28 +2330,53 @@
<message>
<location filename="../../openlp/plugins/images/lib/mediaitem.py" line="244"/>
<source>Remove group</source>
- <translation>Verwyder groep</translation>
- </message>
- <message>
- <location filename="../../openlp/plugins/images/lib/mediaitem.py" line="244"/>
- <source>Are you sure you want to remove "{name}" and everything in it?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/plugins/images/lib/mediaitem.py" line="590"/>
- <source>The following image(s) no longer exist: {names}</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/plugins/images/lib/mediaitem.py" line="596"/>
- <source>The following image(s) no longer exist: {names}
-Do you want to add the other images anyway?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/plugins/images/lib/mediaitem.py" line="689"/>
- <source>There was a problem replacing your background, the image file "{name}" no longer exists.</source>
- <translation type="unfinished"/>
+<<<<<<< TREE
+ <translation>Verwyder groep</translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/images/lib/mediaitem.py" line="244"/>
+ <source>Are you sure you want to remove "{name}" and everything in it?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/images/lib/mediaitem.py" line="590"/>
+ <source>The following image(s) no longer exist: {names}</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/images/lib/mediaitem.py" line="596"/>
+ <source>The following image(s) no longer exist: {names}
+Do you want to add the other images anyway?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/images/lib/mediaitem.py" line="689"/>
+ <source>There was a problem replacing your background, the image file "{name}" no longer exists.</source>
+ <translation type="unfinished"/>
+=======
+ <translation>Verwyder groep</translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/images/lib/mediaitem.py" line="244"/>
+ <source>Are you sure you want to remove "{name}" and everything in it?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/images/lib/mediaitem.py" line="590"/>
+ <source>The following image(s) no longer exist: {names}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/images/lib/mediaitem.py" line="596"/>
+ <source>The following image(s) no longer exist: {names}
+Do you want to add the other images anyway?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/images/lib/mediaitem.py" line="689"/>
+ <source>There was a problem replacing your background, the image file "{name}" no longer exists.</source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
</context>
<context>
@@ -1915,7 +2410,11 @@
<translation>WebKit is 'n media-speler wat loop in 'n webblaaier. Hierdie speler toelaat teks oor video gelewer moet word.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/media/systemplayer.py" line="272"/>
+=======
+ <location filename="../../openlp/core/ui/media/systemplayer.py" line="283"/>
+>>>>>>> MERGE-SOURCE
<source>This media player uses your operating system to provide media capabilities.</source>
<translation>Hierdie media-speler gebruik jou bedryfstelsel om media vermoëns.</translation>
</message>
@@ -2145,22 +2644,38 @@
<translation>Selekteer Media</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/media/lib/mediaitem.py" line="347"/>
+=======
+ <location filename="../../openlp/plugins/media/lib/mediaitem.py" line="348"/>
+>>>>>>> MERGE-SOURCE
<source>You must select a media file to delete.</source>
<translation>'n Media lêer om uit te wis moet geselekteer word.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/media/lib/mediaitem.py" line="214"/>
+=======
+ <location filename="../../openlp/plugins/media/lib/mediaitem.py" line="215"/>
+>>>>>>> MERGE-SOURCE
<source>You must select a media file to replace the background with.</source>
<translation>'n Media lêer wat die agtergrond vervang moet gekies word.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/media/lib/mediaitem.py" line="278"/>
+=======
+ <location filename="../../openlp/plugins/media/lib/mediaitem.py" line="279"/>
+>>>>>>> MERGE-SOURCE
<source>Missing Media File</source>
<translation>Vermisde Media Lêer</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/media/lib/mediaitem.py" line="229"/>
+=======
+ <location filename="../../openlp/plugins/media/lib/mediaitem.py" line="230"/>
+>>>>>>> MERGE-SOURCE
<source>There was no display item to amend.</source>
<translation>Daar was geen vertoon item om by te voeg nie.</translation>
</message>
@@ -2187,16 +2702,28 @@
<message>
<location filename="../../openlp/plugins/media/lib/mediaitem.py" line="135"/>
<source>Load CD/DVD</source>
+<<<<<<< TREE
<translation>Laai CD/DVD</translation>
</message>
<message>
<location filename="../../openlp/plugins/media/lib/mediaitem.py" line="451"/>
+=======
+ <translation>Laai CD/DVD</translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/media/lib/mediaitem.py" line="452"/>
+>>>>>>> MERGE-SOURCE
<source>Mediaclip already saved</source>
<translation>Media gedeelte alreeds gestoor</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/media/lib/mediaitem.py" line="451"/>
+=======
+ <location filename="../../openlp/plugins/media/lib/mediaitem.py" line="452"/>
+>>>>>>> MERGE-SOURCE
<source>This mediaclip has already been saved</source>
+<<<<<<< TREE
<translation>Hierdie media gedeelte is alreeds gestoor</translation>
</message>
<message>
@@ -2233,6 +2760,44 @@
<location filename="../../openlp/plugins/media/lib/mediaitem.py" line="313"/>
<source>Videos ({video});;Audio ({audio});;{files} (*)</source>
<translation type="unfinished"/>
+=======
+ <translation>Hierdie media gedeelte is alreeds gestoor</translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/media/mediacontroller.py" line="481"/>
+ <source>File %s not supported using player %s</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/media/mediacontroller.py" line="481"/>
+ <source>Unsupported Media File</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/media/lib/mediaitem.py" line="136"/>
+ <source>CD/DVD playback is only supported if VLC is installed and enabled.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/media/lib/mediaitem.py" line="234"/>
+ <source>There was a problem replacing your background, the media file "{name}" no longer exists.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/media/lib/mediaitem.py" line="261"/>
+ <source>The optical disc {name} is no longer available.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/media/lib/mediaitem.py" line="279"/>
+ <source>The file {name} no longer exists.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/media/lib/mediaitem.py" line="314"/>
+ <source>Videos ({video});;Audio ({audio});;{files} (*)</source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
</context>
<context>
@@ -2244,8 +2809,13 @@
</message>
<message>
<location filename="../../openlp/plugins/media/lib/mediatab.py" line="57"/>
+<<<<<<< TREE
<source>Start new Live media automatically</source>
<translation type="unfinished"/>
+=======
+ <source>Start new Live media automatically</source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
</context>
<context>
@@ -2256,24 +2826,66 @@
<translation>Beeld Lêers</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/__init__.py" line="229"/>
+=======
+ <location filename="../../openlp/core/__init__.py" line="270"/>
+>>>>>>> MERGE-SOURCE
<source>Backup</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/__init__.py" line="211"/>
- <source>OpenLP has been upgraded, do you want to create a backup of OpenLPs data folder?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/__init__.py" line="223"/>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/__init__.py" line="264"/>
<source>Backup of the data folder failed!</source>
+<<<<<<< TREE
<translation type="unfinished"/>
</message>
<message>
<location filename="../../openlp/core/ui/projector/manager.py" line="658"/>
+=======
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/projector/manager.py" line="658"/>
+>>>>>>> MERGE-SOURCE
<source>Open</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/themeform.py" line="474"/>
+ <source>Video Files</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/__init__.py" line="188"/>
+ <source>Data Directory Error</source>
+ <translation type="unfinished">Data Lêer Fout</translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/__init__.py" line="188"/>
+ <source>OpenLP data folder was not found in:
+
+{path}
+
+The location of the data folder was previously changed from the OpenLP's default location. If the data was stored on removable device, that device needs to be made available.
+
+You may reset the data location back to the default location, or you can try to make the current location available.
+
+Do you want to reset to the default data location? If not, OpenLP will be closed so you can try to fix the the problem.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/__init__.py" line="252"/>
+ <source>OpenLP has been upgraded, do you want to create
+a backup of the old data folder?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/__init__.py" line="267"/>
+ <source>A backup of the data folder has been created at:
+
+{text}</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/__init__.py" line="226"/>
@@ -2289,27 +2901,35 @@
<context>
<name>OpenLP.AboutForm</name>
<message>
- <location filename="../../openlp/core/ui/aboutdialog.py" line="298"/>
+ <location filename="../../openlp/core/ui/aboutdialog.py" line="304"/>
<source>Credits</source>
<translation>Krediete</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/aboutdialog.py" line="698"/>
+=======
+ <location filename="../../openlp/core/ui/aboutdialog.py" line="706"/>
+>>>>>>> MERGE-SOURCE
<source>License</source>
<translation>Lisensie</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/aboutdialog.py" line="312"/>
+=======
+ <location filename="../../openlp/core/ui/aboutdialog.py" line="320"/>
+>>>>>>> MERGE-SOURCE
<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>Hierdie program is gratis sagteware, u kan dit herversprei en / of wysig onder die voorwaardes van die GNU General Public License, soos gepubliseer deur die Free Software Foundation; weergawe 2 van die lisensie.</translation>
</message>
<message>
- <location filename="../../openlp/core/ui/aboutdialog.py" line="317"/>
+ <location filename="../../openlp/core/ui/aboutdialog.py" line="325"/>
<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>Hierdie program word versprei in die hoop dat dit nuttig sal wees, maar SONDER ENIGE WAARBORG; sonder die geïmpliseerde waarborg van VERHANDELBAARHEID of GESKIKTHEID VIR 'N SPESIFIEKE DOEL. Sien hieronder vir meer inligting.</translation>
</message>
<message>
- <location filename="../../openlp/core/ui/aboutdialog.py" line="92"/>
+ <location filename="../../openlp/core/ui/aboutdialog.py" line="94"/>
<source>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 Impress, PowerPoint or PowerPoint Viewer is installed) for church worship using a computer and a data projector.
@@ -2326,168 +2946,161 @@
OpenLP is geskryf en word onderhou deur vrywilligers. As jy meer gratis Christelike sagteware wil sien, oorweeg dit asseblief om ook vrywillig te wees deur die knoppie hieronder te gebruik.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/aboutdialog.py" line="700"/>
+=======
+ <location filename="../../openlp/core/ui/aboutdialog.py" line="708"/>
+>>>>>>> MERGE-SOURCE
<source>Volunteer</source>
<translation>Vrywilliger</translation>
</message>
<message>
- <location filename="../../openlp/core/ui/aboutdialog.py" line="157"/>
+ <location filename="../../openlp/core/ui/aboutdialog.py" line="162"/>
<source>Project Lead</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../openlp/core/ui/aboutdialog.py" line="158"/>
+ <location filename="../../openlp/core/ui/aboutdialog.py" line="163"/>
<source>Developers</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../openlp/core/ui/aboutdialog.py" line="159"/>
+ <location filename="../../openlp/core/ui/aboutdialog.py" line="164"/>
<source>Contributors</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../openlp/core/ui/aboutdialog.py" line="160"/>
+ <location filename="../../openlp/core/ui/aboutdialog.py" line="165"/>
<source>Packagers</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../openlp/core/ui/aboutdialog.py" line="161"/>
+ <location filename="../../openlp/core/ui/aboutdialog.py" line="166"/>
<source>Testers</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../openlp/core/ui/aboutdialog.py" line="162"/>
+ <location filename="../../openlp/core/ui/aboutdialog.py" line="167"/>
<source>Translators</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../openlp/core/ui/aboutdialog.py" line="163"/>
+ <location filename="../../openlp/core/ui/aboutdialog.py" line="168"/>
<source>Afrikaans (af)</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../openlp/core/ui/aboutdialog.py" line="164"/>
+ <location filename="../../openlp/core/ui/aboutdialog.py" line="169"/>
<source>Czech (cs)</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../openlp/core/ui/aboutdialog.py" line="165"/>
+ <location filename="../../openlp/core/ui/aboutdialog.py" line="170"/>
<source>Danish (da)</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../openlp/core/ui/aboutdialog.py" line="166"/>
+ <location filename="../../openlp/core/ui/aboutdialog.py" line="171"/>
<source>German (de)</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../openlp/core/ui/aboutdialog.py" line="167"/>
+ <location filename="../../openlp/core/ui/aboutdialog.py" line="172"/>
<source>Greek (el)</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../openlp/core/ui/aboutdialog.py" line="168"/>
+ <location filename="../../openlp/core/ui/aboutdialog.py" line="173"/>
<source>English, United Kingdom (en_GB)</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../openlp/core/ui/aboutdialog.py" line="169"/>
+ <location filename="../../openlp/core/ui/aboutdialog.py" line="174"/>
<source>English, South Africa (en_ZA)</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../openlp/core/ui/aboutdialog.py" line="170"/>
+ <location filename="../../openlp/core/ui/aboutdialog.py" line="175"/>
<source>Spanish (es)</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../openlp/core/ui/aboutdialog.py" line="171"/>
+ <location filename="../../openlp/core/ui/aboutdialog.py" line="176"/>
<source>Estonian (et)</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../openlp/core/ui/aboutdialog.py" line="172"/>
+ <location filename="../../openlp/core/ui/aboutdialog.py" line="177"/>
<source>Finnish (fi)</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../openlp/core/ui/aboutdialog.py" line="173"/>
+ <location filename="../../openlp/core/ui/aboutdialog.py" line="178"/>
<source>French (fr)</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../openlp/core/ui/aboutdialog.py" line="174"/>
+ <location filename="../../openlp/core/ui/aboutdialog.py" line="179"/>
<source>Hungarian (hu)</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../openlp/core/ui/aboutdialog.py" line="175"/>
+ <location filename="../../openlp/core/ui/aboutdialog.py" line="180"/>
<source>Indonesian (id)</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../openlp/core/ui/aboutdialog.py" line="176"/>
+ <location filename="../../openlp/core/ui/aboutdialog.py" line="181"/>
<source>Japanese (ja)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/ui/aboutdialog.py" line="177"/>
- <source>Norwegian Bokmål (nb)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/ui/aboutdialog.py" line="178"/>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/aboutdialog.py" line="182"/>
+ <source>Norwegian Bokmål (nb)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/aboutdialog.py" line="183"/>
<source>Dutch (nl)</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../openlp/core/ui/aboutdialog.py" line="179"/>
+ <location filename="../../openlp/core/ui/aboutdialog.py" line="184"/>
<source>Polish (pl)</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../openlp/core/ui/aboutdialog.py" line="180"/>
+ <location filename="../../openlp/core/ui/aboutdialog.py" line="185"/>
<source>Portuguese, Brazil (pt_BR)</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../openlp/core/ui/aboutdialog.py" line="181"/>
+ <location filename="../../openlp/core/ui/aboutdialog.py" line="186"/>
<source>Russian (ru)</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../openlp/core/ui/aboutdialog.py" line="182"/>
+ <location filename="../../openlp/core/ui/aboutdialog.py" line="187"/>
<source>Swedish (sv)</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../openlp/core/ui/aboutdialog.py" line="183"/>
+ <location filename="../../openlp/core/ui/aboutdialog.py" line="188"/>
<source>Tamil(Sri-Lanka) (ta_LK)</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../openlp/core/ui/aboutdialog.py" line="184"/>
+ <location filename="../../openlp/core/ui/aboutdialog.py" line="189"/>
<source>Chinese(China) (zh_CN)</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../openlp/core/ui/aboutdialog.py" line="185"/>
+ <location filename="../../openlp/core/ui/aboutdialog.py" line="190"/>
<source>Documentation</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/ui/aboutdialog.py" line="186"/>
- <source>Built With
- Python: http://www.python.org/
- Qt5: http://qt.io
- PyQt5: http://www.riverbankcomputing.co.uk/software/pyqt/intro
- Oxygen Icons: http://techbase.kde.org/Projects/Oxygen/
- MuPDF: http://www.mupdf.com/
-</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/ui/aboutdialog.py" line="192"/>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/aboutdialog.py" line="198"/>
<source>Final Credit
"For God so loved the world that He gave
His one and only Son, so that whoever
@@ -2499,6 +3112,7 @@
on the cross, setting us free from sin. We
bring this software to you for free because
He has set us free.</source>
+<<<<<<< TREE
<translation type="unfinished"/>
</message>
<message>
@@ -2512,6 +3126,33 @@
<location filename="../../openlp/core/ui/aboutform.py" line="55"/>
<source> build {version}</source>
<translation type="unfinished"/>
+=======
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/aboutform.py" line="55"/>
+ <source> build {version}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/aboutdialog.py" line="191"/>
+ <source>Built With
+ Python: http://www.python.org/
+ Qt5: http://qt.io
+ PyQt5: http://www.riverbankcomputing.co.uk/software/pyqt/intro
+ Oxygen Icons: http://techbase.kde.org/Projects/Oxygen/
+ MuPDF: http://www.mupdf.com/
+ MediaInfo: https://mediaarea.net/en/MediaInfo
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/aboutdialog.py" line="314"/>
+ <source>Copyright {crs} 2004-{yr} {cr}
+
+Portions copyright {crs} 2004-{yr} {others}</source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
</context>
<context>
@@ -2627,7 +3268,11 @@
<translation>Werk om X11 Venster Bestuurder</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/advancedtab.py" line="507"/>
+=======
+ <location filename="../../openlp/core/ui/advancedtab.py" line="486"/>
+>>>>>>> MERGE-SOURCE
<source>Syntax error.</source>
<translation>Sintaks fout.</translation>
</message>
@@ -2682,31 +3327,48 @@
<translation><strong>WAARSKUWING:</strong> Nuwe data lêer ligging bevat OpenLP data lêers. Hierdie lêers SAL vervang word gedurende kopiëring.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/advancedtab.py" line="402"/>
<source>Data Directory Error</source>
<translation>Data Lêer Fout</translation>
</message>
<message>
<location filename="../../openlp/core/ui/advancedtab.py" line="539"/>
+=======
+ <location filename="../../openlp/core/ui/advancedtab.py" line="518"/>
+>>>>>>> MERGE-SOURCE
<source>Select Data Directory Location</source>
<translation>Selekteer Data Lêer Ligging</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/advancedtab.py" line="552"/>
+=======
+ <location filename="../../openlp/core/ui/advancedtab.py" line="531"/>
+>>>>>>> MERGE-SOURCE
<source>Confirm Data Directory Change</source>
<translation>Bevestig Data Lêer Verandering</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/advancedtab.py" line="577"/>
+=======
+ <location filename="../../openlp/core/ui/advancedtab.py" line="556"/>
+>>>>>>> MERGE-SOURCE
<source>Reset Data Directory</source>
<translation>Herstel Data Lêer</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/advancedtab.py" line="617"/>
+=======
+ <location filename="../../openlp/core/ui/advancedtab.py" line="596"/>
+>>>>>>> MERGE-SOURCE
<source>Overwrite Existing Data</source>
<translation>Oorskryf Bestaande Data</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/advancedtab.py" line="306"/>
<source>Thursday</source>
<translation type="unfinished"/>
@@ -2884,6 +3546,172 @@
appears to contain OpenLP data files. Do you wish to replace these files with the current data files?</source>
<translation type="unfinished"/>
</message>
+=======
+ <location filename="../../openlp/core/ui/advancedtab.py" line="306"/>
+ <source>Thursday</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/advancedtab.py" line="335"/>
+ <source>Display Workarounds</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/advancedtab.py" line="337"/>
+ <source>Use alternating row colours in lists</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/advancedtab.py" line="635"/>
+ <source>Restart Required</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/advancedtab.py" line="635"/>
+ <source>This change will only take effect once OpenLP has been restarted.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/advancedtab.py" line="556"/>
+ <source>Are you sure you want to change the location of the OpenLP data directory to the default location?
+
+This location will be used after OpenLP is closed.</source>
+ <translation>Verander die OpenLP data lêer sekerlik na die verstek ligging toe?
+
+Hierdie ligging sal gebruik word nadat OpenLP toegemaak is.</translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/advancedtab.py" line="269"/>
+ <source>Max height for non-text slides
+in slide controller:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/advancedtab.py" line="271"/>
+ <source>Disabled</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/advancedtab.py" line="273"/>
+ <source>When changing slides:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/advancedtab.py" line="275"/>
+ <source>Do not auto-scroll</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/advancedtab.py" line="276"/>
+ <source>Auto-scroll the previous slide into view</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/advancedtab.py" line="278"/>
+ <source>Auto-scroll the previous slide to top</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/advancedtab.py" line="280"/>
+ <source>Auto-scroll the previous slide to middle</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/advancedtab.py" line="282"/>
+ <source>Auto-scroll the current slide into view</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/advancedtab.py" line="284"/>
+ <source>Auto-scroll the current slide to top</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/advancedtab.py" line="286"/>
+ <source>Auto-scroll the current slide to middle</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/advancedtab.py" line="288"/>
+ <source>Auto-scroll the current slide to bottom</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/advancedtab.py" line="290"/>
+ <source>Auto-scroll the next slide into view</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/advancedtab.py" line="292"/>
+ <source>Auto-scroll the next slide to top</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/advancedtab.py" line="294"/>
+ <source>Auto-scroll the next slide to middle</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/advancedtab.py" line="296"/>
+ <source>Auto-scroll the next slide to bottom</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/advancedtab.py" line="258"/>
+ <source>Number of recent service files to display:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/advancedtab.py" line="259"/>
+ <source>Open the last used Library tab on startup</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/advancedtab.py" line="261"/>
+ <source>Double-click to send items straight to Live</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/advancedtab.py" line="263"/>
+ <source>Preview items when clicked in Library</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/advancedtab.py" line="265"/>
+ <source>Preview items when clicked in Service</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/advancedtab.py" line="272"/>
+ <source>Automatic</source>
+ <translation>Automaties</translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/advancedtab.py" line="314"/>
+ <source>Revert to the default service name "{name}".</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/advancedtab.py" line="531"/>
+ <source>Are you sure you want to change the location of the OpenLP data directory to:
+
+{path}
+
+The data directory will be changed when OpenLP is closed.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/advancedtab.py" line="596"/>
+ <source>WARNING:
+
+The location you have selected
+
+{path}
+
+appears to contain OpenLP data files. Do you wish to replace these files with the current data files?</source>
+ <translation type="unfinished"></translation>
+ </message>
+>>>>>>> MERGE-SOURCE
</context>
<context>
<name>OpenLP.ColorButton</name>
@@ -2898,7 +3726,7 @@
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="320"/>
<source>RGB</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="321"/>
@@ -2908,242 +3736,242 @@
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="322"/>
<source>Digital</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="323"/>
<source>Storage</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="324"/>
<source>Network</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="328"/>
<source>RGB 1</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="329"/>
<source>RGB 2</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="330"/>
<source>RGB 3</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="331"/>
<source>RGB 4</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="332"/>
<source>RGB 5</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="333"/>
<source>RGB 6</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="334"/>
<source>RGB 7</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="335"/>
<source>RGB 8</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="336"/>
<source>RGB 9</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="337"/>
<source>Video 1</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="338"/>
<source>Video 2</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="339"/>
<source>Video 3</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="340"/>
<source>Video 4</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="341"/>
<source>Video 5</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="342"/>
<source>Video 6</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="343"/>
<source>Video 7</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="344"/>
<source>Video 8</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="345"/>
<source>Video 9</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="346"/>
<source>Digital 1</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="347"/>
<source>Digital 2</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="348"/>
<source>Digital 3</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="349"/>
<source>Digital 4</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="350"/>
<source>Digital 5</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="351"/>
<source>Digital 6</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="352"/>
<source>Digital 7</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="353"/>
<source>Digital 8</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="354"/>
<source>Digital 9</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="355"/>
<source>Storage 1</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="356"/>
<source>Storage 2</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="357"/>
<source>Storage 3</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="358"/>
<source>Storage 4</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="359"/>
<source>Storage 5</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="360"/>
<source>Storage 6</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="361"/>
<source>Storage 7</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="362"/>
<source>Storage 8</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="363"/>
<source>Storage 9</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="364"/>
<source>Network 1</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="365"/>
<source>Network 2</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="366"/>
<source>Network 3</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="367"/>
<source>Network 4</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="368"/>
<source>Network 5</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="369"/>
<source>Network 6</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="370"/>
<source>Network 7</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="371"/>
<source>Network 8</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="372"/>
<source>Network 9</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -3170,6 +3998,7 @@
</message>
<message>
<location filename="../../openlp/core/ui/exceptiondialog.py" line="96"/>
+<<<<<<< TREE
<source><strong>Please describe what you were trying to do.</strong> &nbsp;If possible, write in English.</source>
<translation type="unfinished"/>
</message>
@@ -3197,6 +4026,35 @@
<location filename="../../openlp/core/ui/exceptionform.py" line="211"/>
<source><strong>Please enter a more detailed description of the situation</source>
<translation type="unfinished"/>
+=======
+ <source><strong>Please describe what you were trying to do.</strong> &nbsp;If possible, write in English.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/exceptionform.py" line="203"/>
+ <source><strong>Thank you for your description!</strong></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/exceptionform.py" line="207"/>
+ <source><strong>Tell us what you were doing when this happened.</strong></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/exceptiondialog.py" line="99"/>
+ <source><strong>Oops, OpenLP hit a problem and couldn't recover!<br><br>You can help </strong> the OpenLP developers to <strong>fix this</strong> by<br> sending them a <strong>bug report to {email}</strong>{newlines}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/exceptiondialog.py" line="105"/>
+ <source>{first_part}<strong>No email app? </strong> You can <strong>save</strong> this information to a <strong>file</strong> and<br>send it from your <strong>mail on browser</strong> via an <strong>attachment.</strong><br><br><strong>Thank you</strong> for being part of making OpenLP better!<br></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/exceptionform.py" line="211"/>
+ <source><strong>Please enter a more detailed description of the situation</strong></source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
</context>
<context>
@@ -3211,12 +4069,21 @@
<source>Text files (*.txt *.log *.text)</source>
<translation>Teks lêers (*.txt *.log *.text)</translation>
</message>
+<<<<<<< TREE
<message>
<location filename="../../openlp/core/ui/exceptionform.py" line="116"/>
<source>Platform: {platform}
</source>
<translation type="unfinished"/>
</message>
+=======
+ <message>
+ <location filename="../../openlp/core/ui/exceptionform.py" line="116"/>
+ <source>Platform: {platform}
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+>>>>>>> MERGE-SOURCE
</context>
<context>
<name>OpenLP.FileRenameForm</name>
@@ -3277,7 +4144,11 @@
<translation>Verstek Instellings</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/firsttimeform.py" line="598"/>
+=======
+ <location filename="../../openlp/core/ui/firsttimeform.py" line="529"/>
+>>>>>>> MERGE-SOURCE
<source>Enabling selected plugins...</source>
<translation>Skakel geselekteerde miniprogramme aan...</translation>
</message>
@@ -3342,74 +4213,222 @@
<translation>Konfigurasie proses begin...</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/firsttimeform.py" line="548"/>
+=======
+ <location filename="../../openlp/core/ui/firsttimeform.py" line="479"/>
+>>>>>>> MERGE-SOURCE
<source>Setting Up And Downloading</source>
<translation>Opstel en Afliaai</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/firsttimeform.py" line="549"/>
+=======
+ <location filename="../../openlp/core/ui/firsttimeform.py" line="480"/>
+>>>>>>> MERGE-SOURCE
<source>Please wait while OpenLP is set up and your data is downloaded.</source>
<translation>Wag asseblief terwyl OpenLP opgestel en die data afgelaai word.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/firsttimeform.py" line="553"/>
+=======
+ <location filename="../../openlp/core/ui/firsttimeform.py" line="484"/>
+>>>>>>> MERGE-SOURCE
<source>Setting Up</source>
<translation>Opstel</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/firsttimeform.py" line="610"/>
+=======
+ <location filename="../../openlp/core/ui/firsttimeform.py" line="541"/>
+>>>>>>> MERGE-SOURCE
<source>Download Error</source>
<translation>Aflaai Fout</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/firsttimeform.py" line="536"/>
+=======
+ <location filename="../../openlp/core/ui/firsttimeform.py" line="467"/>
+>>>>>>> MERGE-SOURCE
<source>There was a connection problem during download, so further downloads will be skipped. Try to re-run the First Time Wizard later.</source>
+<<<<<<< TREE
<translation type="unfinished"/>
</message>
<message>
<location filename="../../openlp/core/ui/firsttimeform.py" line="610"/>
+=======
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/firsttimeform.py" line="541"/>
+>>>>>>> MERGE-SOURCE
<source>There was a connection problem while downloading, so further downloads will be skipped. Try to re-run the First Time Wizard later.</source>
+<<<<<<< TREE
<translation type="unfinished"/>
</message>
<message>
<location filename="../../openlp/core/ui/firsttimewizard.py" line="238"/>
+=======
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/firsttimewizard.py" line="238"/>
+>>>>>>> MERGE-SOURCE
<source>Downloading Resource Index</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/firsttimewizard.py" line="239"/>
<source>Please wait while the resource index is downloaded.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/firsttimewizard.py" line="241"/>
<source>Please wait while OpenLP downloads the resource index file...</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/firsttimewizard.py" line="292"/>
<source>Downloading and Configuring</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/firsttimewizard.py" line="293"/>
<source>Please wait while resources are downloaded and OpenLP is configured.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/firsttimeform.py" line="676"/>
+=======
+ <location filename="../../openlp/core/ui/firsttimeform.py" line="607"/>
+>>>>>>> MERGE-SOURCE
<source>Network Error</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/firsttimeform.py" line="191"/>
+=======
+ <location filename="../../openlp/core/ui/firsttimeform.py" line="190"/>
+>>>>>>> MERGE-SOURCE
<source>There was a network error attempting to connect to retrieve initial configuration information</source>
+<<<<<<< TREE
<translation type="unfinished"/>
</message>
<message>
<location filename="../../openlp/core/ui/firsttimeform.py" line="677"/>
+=======
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/firsttimeform.py" line="608"/>
+>>>>>>> MERGE-SOURCE
<source>Unable to download some files</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/firsttimewizard.py" line="243"/>
+ <source>Select parts of the program you wish to use</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/firsttimewizard.py" line="244"/>
+ <source>You can also change these settings after the Wizard.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message encoding="UTF-8">
+ <location filename="../../openlp/core/ui/firsttimewizard.py" line="247"/>
+ <source>Custom Slides – Easier to manage than songs and they have their own list of slides</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message encoding="UTF-8">
+ <location filename="../../openlp/core/ui/firsttimewizard.py" line="250"/>
+ <source>Bibles – Import and show Bibles</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message encoding="UTF-8">
+ <location filename="../../openlp/core/ui/firsttimewizard.py" line="252"/>
+ <source>Images – Show images or replace background with them</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message encoding="UTF-8">
+ <location filename="../../openlp/core/ui/firsttimewizard.py" line="254"/>
+ <source>Presentations – Show .ppt, .odp and .pdf files</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message encoding="UTF-8">
+ <location filename="../../openlp/core/ui/firsttimewizard.py" line="256"/>
+ <source>Media – Playback of Audio and Video files</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message encoding="UTF-8">
+ <location filename="../../openlp/core/ui/firsttimewizard.py" line="257"/>
+ <source>Remote – Control OpenLP via browser or smartphone app</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/firsttimewizard.py" line="259"/>
+ <source>Song Usage Monitor</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message encoding="UTF-8">
+ <location filename="../../openlp/core/ui/firsttimewizard.py" line="260"/>
+ <source>Alerts – Display informative messages while showing other slides</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message encoding="UTF-8">
+ <location filename="../../openlp/core/ui/firsttimewizard.py" line="262"/>
+ <source>Projectors – Control PJLink compatible projects on your network from OpenLP</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/firsttimeform.py" line="211"/>
+ <source>Downloading {name}...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/firsttimeform.py" line="498"/>
+ <source>Download complete. Click the {button} button to return to OpenLP.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/firsttimeform.py" line="503"/>
+ <source>Download complete. Click the {button} button to start OpenLP.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/firsttimeform.py" line="509"/>
+ <source>Click the {button} button to return to OpenLP.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/firsttimeform.py" line="514"/>
+ <source>Click the {button} button to start OpenLP.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/firsttimewizard.py" line="235"/>
+ <source>This wizard will help you to configure OpenLP for initial use. Click the {button} button below to start.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/firsttimewizard.py" line="269"/>
+ <source>No Internet connection was found. The First Time Wizard needs an Internet connection in order to be able to download sample songs, Bibles and themes. Click the {button} button now to start OpenLP with initial settings and no sample data.
+
+To re-run the First Time Wizard and import this sample data at a later time, check your Internet connection and re-run this wizard by selecting "Tools/Re-run First Time Wizard" from OpenLP.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/firsttimewizard.py" line="278"/>
+ <source>
+
+To cancel the First Time Wizard completely (and not start OpenLP), click the {button} button now.</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/firsttimewizard.py" line="243"/>
@@ -3541,12 +4560,12 @@
<message>
<location filename="../../openlp/core/ui/formattingtagdialog.py" line="115"/>
<source>Default Formatting</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/formattingtagdialog.py" line="125"/>
<source>Custom Formatting</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -3564,37 +4583,62 @@
<message>
<location filename="../../openlp/core/ui/formattingtagform.py" line="181"/>
<source>Description is missing</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/formattingtagform.py" line="184"/>
<source>Tag is missing</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/formattingtagcontroller.py" line="80"/>
+<<<<<<< TREE
<source>Tag {tag} already defined.</source>
<translation type="unfinished"/>
+=======
+ <source>Tag {tag} already defined.</source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
<message>
<location filename="../../openlp/core/ui/formattingtagcontroller.py" line="82"/>
- <source>Description {tag} already defined.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/ui/formattingtagcontroller.py" line="150"/>
- <source>Start tag {tag} is not valid HTML</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/ui/formattingtagcontroller.py" line="170"/>
- <source>End tag {end} does not match end tag for start tag {start}</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/ui/formattingtagform.py" line="93"/>
- <source>New Tag {row:d}</source>
- <translation type="unfinished"/>
+<<<<<<< TREE
+ <source>Description {tag} already defined.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/formattingtagcontroller.py" line="150"/>
+ <source>Start tag {tag} is not valid HTML</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/formattingtagcontroller.py" line="170"/>
+ <source>End tag {end} does not match end tag for start tag {start}</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/formattingtagform.py" line="93"/>
+ <source>New Tag {row:d}</source>
+ <translation type="unfinished"/>
+=======
+ <source>Description {tag} already defined.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/formattingtagcontroller.py" line="150"/>
+ <source>Start tag {tag} is not valid HTML</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/formattingtagcontroller.py" line="170"/>
+ <source>End tag {end} does not match end tag for start tag {start}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/formattingtagform.py" line="93"/>
+ <source>New Tag {row:d}</source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
</context>
<context>
@@ -3822,51 +4866,99 @@
<source>&Move to next/previous service item</source>
<translation>Beweeg na volgende/vorige diens ite&m</translation>
</message>
- <message>
- <location filename="../../openlp/core/ui/generaltab.py" line="254"/>
- <source>Logo</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/ui/generaltab.py" line="256"/>
- <source>Logo file:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/ui/generaltab.py" line="257"/>
- <source>Browse for an image file to display.</source>
- <translation>Blaai vir 'n beeld lêer om te vertoon.</translation>
- </message>
- <message>
- <location filename="../../openlp/core/ui/generaltab.py" line="258"/>
- <source>Revert to the default OpenLP logo.</source>
- <translation>Verander terug na die verstek OpenLP logo.</translation>
- </message>
- <message>
- <location filename="../../openlp/core/ui/generaltab.py" line="259"/>
- <source>Don't show logo on startup</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/ui/generaltab.py" line="252"/>
- <source>Automatically open the previous service file</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/ui/generaltab.py" line="264"/>
- <source>Unblank display when changing slide in Live</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/ui/generaltab.py" line="266"/>
- <source>Unblank display when sending items to Live</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/ui/generaltab.py" line="268"/>
- <source>Automatically preview the next item in service</source>
- <translation type="unfinished"/>
- </message>
+<<<<<<< TREE
+ <message>
+ <location filename="../../openlp/core/ui/generaltab.py" line="254"/>
+ <source>Logo</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/generaltab.py" line="256"/>
+ <source>Logo file:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/generaltab.py" line="257"/>
+ <source>Browse for an image file to display.</source>
+ <translation>Blaai vir 'n beeld lêer om te vertoon.</translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/generaltab.py" line="258"/>
+ <source>Revert to the default OpenLP logo.</source>
+ <translation>Verander terug na die verstek OpenLP logo.</translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/generaltab.py" line="259"/>
+ <source>Don't show logo on startup</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/generaltab.py" line="252"/>
+ <source>Automatically open the previous service file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/generaltab.py" line="264"/>
+ <source>Unblank display when changing slide in Live</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/generaltab.py" line="266"/>
+ <source>Unblank display when sending items to Live</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/generaltab.py" line="268"/>
+ <source>Automatically preview the next item in service</source>
+ <translation type="unfinished"/>
+ </message>
+=======
+ <message>
+ <location filename="../../openlp/core/ui/generaltab.py" line="254"/>
+ <source>Logo</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/generaltab.py" line="256"/>
+ <source>Logo file:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/generaltab.py" line="257"/>
+ <source>Browse for an image file to display.</source>
+ <translation>Blaai vir 'n beeld lêer om te vertoon.</translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/generaltab.py" line="258"/>
+ <source>Revert to the default OpenLP logo.</source>
+ <translation>Verander terug na die verstek OpenLP logo.</translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/generaltab.py" line="259"/>
+ <source>Don't show logo on startup</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/generaltab.py" line="252"/>
+ <source>Automatically open the previous service file</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/generaltab.py" line="264"/>
+ <source>Unblank display when changing slide in Live</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/generaltab.py" line="266"/>
+ <source>Unblank display when sending items to Live</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/generaltab.py" line="268"/>
+ <source>Automatically preview the next item in service</source>
+ <translation type="unfinished"></translation>
+ </message>
+>>>>>>> MERGE-SOURCE
</context>
<context>
<name>OpenLP.LanguageManager</name>
@@ -3892,137 +4984,189 @@
<context>
<name>OpenLP.MainWindow</name>
<message>
- <location filename="../../openlp/core/ui/mainwindow.py" line="390"/>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="373"/>
<source>&File</source>
<translation>&Lêer</translation>
</message>
<message>
- <location filename="../../openlp/core/ui/mainwindow.py" line="391"/>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="374"/>
<source>&Import</source>
<translation>&Invoer</translation>
</message>
<message>
- <location filename="../../openlp/core/ui/mainwindow.py" line="392"/>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="375"/>
<source>&Export</source>
<translation>Uitvo&er</translation>
</message>
<message>
- <location filename="../../openlp/core/ui/mainwindow.py" line="394"/>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="377"/>
<source>&View</source>
<translation>&Bekyk</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/mainwindow.py" line="396"/>
+=======
+ <location filename="../../openlp/core/ui/mainwindow.py" line="379"/>
+>>>>>>> MERGE-SOURCE
<source>&Tools</source>
<translation>&Gereedskap</translation>
</message>
<message>
- <location filename="../../openlp/core/ui/mainwindow.py" line="397"/>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="380"/>
<source>&Settings</source>
<translation>Ver&stellings</translation>
</message>
<message>
- <location filename="../../openlp/core/ui/mainwindow.py" line="424"/>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="407"/>
<source>&Language</source>
<translation>Taa&l</translation>
</message>
<message>
- <location filename="../../openlp/core/ui/mainwindow.py" line="399"/>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="382"/>
<source>&Help</source>
<translation>&Hulp</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/mainwindow.py" line="409"/>
+=======
+ <location filename="../../openlp/core/ui/mainwindow.py" line="392"/>
+>>>>>>> MERGE-SOURCE
<source>Open an existing service.</source>
<translation>Maak 'n bestaande diens oop.</translation>
</message>
<message>
- <location filename="../../openlp/core/ui/mainwindow.py" line="412"/>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="395"/>
<source>Save the current service to disk.</source>
<translation>Stoor die huidige diens na skyf.</translation>
</message>
<message>
- <location filename="../../openlp/core/ui/mainwindow.py" line="414"/>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="397"/>
<source>Save Service As</source>
<translation>Stoor Diens As</translation>
</message>
<message>
- <location filename="../../openlp/core/ui/mainwindow.py" line="415"/>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="398"/>
<source>Save the current service under a new name.</source>
<translation>Stoor die huidige diens onder 'n nuwe naam.</translation>
</message>
<message>
- <location filename="../../openlp/core/ui/mainwindow.py" line="419"/>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="402"/>
<source>E&xit</source>
<translation>&Uitgang</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/mainwindow.py" line="423"/>
+=======
+ <location filename="../../openlp/core/ui/mainwindow.py" line="406"/>
+>>>>>>> MERGE-SOURCE
<source>&Theme</source>
<translation>&Tema</translation>
</message>
<message>
- <location filename="../../openlp/core/ui/mainwindow.py" line="427"/>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="410"/>
<source>&Configure OpenLP...</source>
<translation>&Konfigureer OpenLP...</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/mainwindow.py" line="466"/>
<source>&User Guide</source>
<translation>Gebr&uikers Gids</translation>
</message>
<message>
<location filename="../../openlp/core/ui/mainwindow.py" line="463"/>
+=======
+ <location filename="../../openlp/core/ui/mainwindow.py" line="446"/>
+>>>>>>> MERGE-SOURCE
<source>&About</source>
<translation>&Aangaande</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/mainwindow.py" line="467"/>
<source>&Online Help</source>
<translation>&Aanlyn Hulp</translation>
</message>
<message>
<location filename="../../openlp/core/ui/mainwindow.py" line="471"/>
+=======
+ <location filename="../../openlp/core/ui/mainwindow.py" line="452"/>
+>>>>>>> MERGE-SOURCE
<source>&Web Site</source>
<translation>&Web Tuiste</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/mainwindow.py" line="477"/>
+=======
+ <location filename="../../openlp/core/ui/mainwindow.py" line="458"/>
+>>>>>>> MERGE-SOURCE
<source>Use the system language, if available.</source>
<translation>Gebruik die sisteem se taal as dit beskikbaar is.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/mainwindow.py" line="478"/>
+=======
+ <location filename="../../openlp/core/ui/mainwindow.py" line="459"/>
+>>>>>>> MERGE-SOURCE
<source>Add &Tool...</source>
<translation>Voeg Gereedskaps&tuk by...</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/mainwindow.py" line="479"/>
+=======
+ <location filename="../../openlp/core/ui/mainwindow.py" line="460"/>
+>>>>>>> MERGE-SOURCE
<source>Add an application to the list of tools.</source>
<translation>Voeg 'n applikasie by die lys van gereedskapstukke.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/mainwindow.py" line="493"/>
+=======
+ <location filename="../../openlp/core/ui/mainwindow.py" line="474"/>
+>>>>>>> MERGE-SOURCE
<source>&Setup</source>
<translation>Op&stel</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/mainwindow.py" line="496"/>
+=======
+ <location filename="../../openlp/core/ui/mainwindow.py" line="477"/>
+>>>>>>> MERGE-SOURCE
<source>&Live</source>
<translation>&Regstreeks</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/mainwindow.py" line="631"/>
+=======
+ <location filename="../../openlp/core/ui/mainwindow.py" line="612"/>
+>>>>>>> MERGE-SOURCE
<source>OpenLP Version Updated</source>
<translation>OpenLP Weergawe is Opdateer</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/mainwindow.py" line="738"/>
+=======
+ <location filename="../../openlp/core/ui/mainwindow.py" line="719"/>
+>>>>>>> MERGE-SOURCE
<source>OpenLP Main Display Blanked</source>
<translation>OpenLP Hoof Vertoning Blanko</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/mainwindow.py" line="738"/>
+=======
+ <location filename="../../openlp/core/ui/mainwindow.py" line="719"/>
+>>>>>>> MERGE-SOURCE
<source>The Main Display has been blanked out</source>
<translation>Die Hoof Skerm is afgeskakel</translation>
</message>
@@ -4033,57 +5177,93 @@
<translation>Engels</translation>
</message>
<message>
- <location filename="../../openlp/core/ui/mainwindow.py" line="425"/>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="408"/>
<source>Configure &Shortcuts...</source>
<translation>Konfigureer Kor&tpaaie...</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/mainwindow.py" line="481"/>
+=======
+ <location filename="../../openlp/core/ui/mainwindow.py" line="462"/>
+>>>>>>> MERGE-SOURCE
<source>Open &Data Folder...</source>
<translation>Maak &Data Lêer oop...</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/mainwindow.py" line="482"/>
+=======
+ <location filename="../../openlp/core/ui/mainwindow.py" line="463"/>
+>>>>>>> MERGE-SOURCE
<source>Open the folder where songs, bibles and other data resides.</source>
<translation>Maak die lêer waar liedere, bybels en ander data is, oop.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/mainwindow.py" line="476"/>
+=======
+ <location filename="../../openlp/core/ui/mainwindow.py" line="457"/>
+>>>>>>> MERGE-SOURCE
<source>&Autodetect</source>
<translation>Spoor outom&aties op</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/mainwindow.py" line="487"/>
+=======
+ <location filename="../../openlp/core/ui/mainwindow.py" line="468"/>
+>>>>>>> MERGE-SOURCE
<source>Update Theme Images</source>
<translation>Opdateer Tema Beelde</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/mainwindow.py" line="488"/>
+=======
+ <location filename="../../openlp/core/ui/mainwindow.py" line="469"/>
+>>>>>>> MERGE-SOURCE
<source>Update the preview images for all themes.</source>
<translation>Opdateer die voorskou beelde vir alle temas.</translation>
</message>
<message>
- <location filename="../../openlp/core/ui/mainwindow.py" line="418"/>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="401"/>
<source>Print the current service.</source>
<translation>Druk die huidige diens.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/mainwindow.py" line="484"/>
+=======
+ <location filename="../../openlp/core/ui/mainwindow.py" line="465"/>
+>>>>>>> MERGE-SOURCE
<source>Re-run First Time Wizard</source>
<translation>Her-gebruik Eerste Keer Gids</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/mainwindow.py" line="485"/>
+=======
+ <location filename="../../openlp/core/ui/mainwindow.py" line="466"/>
+>>>>>>> MERGE-SOURCE
<source>Re-run the First Time Wizard, importing songs, Bibles and themes.</source>
<translation>Her-gebruik die Eerste Keer Gids om liedere, Bybels en tema's in te voer.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/mainwindow.py" line="686"/>
+=======
+ <location filename="../../openlp/core/ui/mainwindow.py" line="667"/>
+>>>>>>> MERGE-SOURCE
<source>Re-run First Time Wizard?</source>
<translation>Her-gebruik Eerste Keer Gids?</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/mainwindow.py" line="686"/>
+=======
+ <location filename="../../openlp/core/ui/mainwindow.py" line="667"/>
+>>>>>>> MERGE-SOURCE
<source>Are you sure you want to re-run the First Time Wizard?
Re-running this wizard may make changes to your current OpenLP configuration and possibly add songs to your existing songs list and change your default theme.</source>
@@ -4092,131 +5272,419 @@
Her-gebruik van hierdie gids mag veranderinge aan die huidige OpenLP konfigurasie aanbring en kan moontlik liedere byvoeg by die bestaande liedere lys en kan ook die verstek tema verander.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/mainwindow.py" line="1347"/>
+=======
+ <location filename="../../openlp/core/ui/mainwindow.py" line="1326"/>
+>>>>>>> MERGE-SOURCE
<source>Clear List</source>
<comment>Clear List of recent files</comment>
<translation>Maak Lys Skoon</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/mainwindow.py" line="1347"/>
+=======
+ <location filename="../../openlp/core/ui/mainwindow.py" line="1326"/>
+>>>>>>> MERGE-SOURCE
<source>Clear the list of recent files.</source>
<translation>Maak die lys van onlangse lêers skoon.</translation>
</message>
<message>
- <location filename="../../openlp/core/ui/mainwindow.py" line="426"/>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="409"/>
<source>Configure &Formatting Tags...</source>
<translation>Konfigureer &Formattering Etikette...</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/mainwindow.py" line="434"/>
+=======
+ <location filename="../../openlp/core/ui/mainwindow.py" line="417"/>
+>>>>>>> MERGE-SOURCE
<source>Settings</source>
<translation>Instellings</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/mainwindow.py" line="850"/>
+=======
+ <location filename="../../openlp/core/ui/mainwindow.py" line="829"/>
+>>>>>>> MERGE-SOURCE
<source>Import settings?</source>
<translation>Voer verstellings in?</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/mainwindow.py" line="941"/>
+=======
+ <location filename="../../openlp/core/ui/mainwindow.py" line="920"/>
+>>>>>>> MERGE-SOURCE
<source>Import settings</source>
<translation>Voer verstellings in</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/mainwindow.py" line="941"/>
+=======
+ <location filename="../../openlp/core/ui/mainwindow.py" line="920"/>
+>>>>>>> MERGE-SOURCE
<source>OpenLP will now close. Imported settings will be applied the next time you start OpenLP.</source>
<translation>OpenLP sal nou toe maak. Ingevoerde verstellings sal toegepas word die volgende keer as OpenLP begin word.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/mainwindow.py" line="954"/>
+=======
+ <location filename="../../openlp/core/ui/mainwindow.py" line="933"/>
+>>>>>>> MERGE-SOURCE
<source>Export Settings File</source>
<translation>Voer Verstellings Lêer Uit</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/mainwindow.py" line="1452"/>
+=======
+ <location filename="../../openlp/core/ui/mainwindow.py" line="1431"/>
+>>>>>>> MERGE-SOURCE
<source>New Data Directory Error</source>
<translation>Nuwe Data Lêer Fout</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/mainwindow.py" line="329"/>
+=======
+ <location filename="../../openlp/core/ui/mainwindow.py" line="316"/>
+>>>>>>> MERGE-SOURCE
<source>General</source>
<translation>Algemeen</translation>
</message>
<message>
- <location filename="../../openlp/core/ui/mainwindow.py" line="400"/>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="383"/>
<source>Library</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/mainwindow.py" line="469"/>
+=======
+ <location filename="../../openlp/core/ui/mainwindow.py" line="450"/>
+>>>>>>> MERGE-SOURCE
<source>Jump to the search box of the current active plugin.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/mainwindow.py" line="850"/>
+=======
+ <location filename="../../openlp/core/ui/mainwindow.py" line="829"/>
+>>>>>>> MERGE-SOURCE
<source>Are you sure you want to import settings?
Importing settings will make permanent changes to your current OpenLP configuration.
Importing incorrect settings may cause erratic behaviour or OpenLP to terminate abnormally.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/mainwindow.py" line="900"/>
+=======
+ <location filename="../../openlp/core/ui/mainwindow.py" line="879"/>
+>>>>>>> MERGE-SOURCE
<source>The file you have selected does not appear to be a valid OpenLP settings file.
Processing has terminated and no changes have been made.</source>
+<<<<<<< TREE
<translation type="unfinished"/>
</message>
<message>
<location filename="../../openlp/core/ui/mainwindow.py" line="1032"/>
+=======
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="1011"/>
+>>>>>>> MERGE-SOURCE
<source>Export setting error</source>
+<<<<<<< TREE
<translation type="unfinished"/>
</message>
<message>
<location filename="../../openlp/core/ui/mainwindow.py" line="393"/>
+=======
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="376"/>
+>>>>>>> MERGE-SOURCE
<source>&Recent Services</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../openlp/core/ui/mainwindow.py" line="404"/>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="387"/>
<source>&New Service</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../openlp/core/ui/mainwindow.py" line="407"/>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="390"/>
<source>&Open Service</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../openlp/core/ui/mainwindow.py" line="410"/>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="393"/>
<source>&Save Service</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../openlp/core/ui/mainwindow.py" line="413"/>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="396"/>
<source>Save Service &As...</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../openlp/core/ui/mainwindow.py" line="460"/>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="443"/>
<source>&Manage Plugins</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/mainwindow.py" line="1118"/>
+=======
+ <location filename="../../openlp/core/ui/mainwindow.py" line="1097"/>
+>>>>>>> MERGE-SOURCE
<source>Exit OpenLP</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/mainwindow.py" line="1118"/>
+=======
+ <location filename="../../openlp/core/ui/mainwindow.py" line="1097"/>
+>>>>>>> MERGE-SOURCE
<source>Are you sure you want to exit OpenLP?</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/mainwindow.py" line="1125"/>
+=======
+ <location filename="../../openlp/core/ui/mainwindow.py" line="1104"/>
+>>>>>>> MERGE-SOURCE
<source>&Exit OpenLP</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="609"/>
+ <source>Version {new} of OpenLP is now available for download (you are currently running version {current}).
+
+You can download the latest version from http://openlp.org/.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="987"/>
+ <source>The key "{key}" does not have a default value so it will be skipped in this export.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="1011"/>
+ <source>An error occurred while exporting the settings: {err}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="1170"/>
+ <source>Default Theme: {theme}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="1421"/>
+ <source>Copying OpenLP data to new data directory location - {path} - Please wait for copy to finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="1429"/>
+ <source>OpenLP Data directory copy failed
+
+{err}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="378"/>
+ <source>&Layout Presets</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="384"/>
+ <source>Service</source>
+ <translation>Diens</translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="385"/>
+ <source>Themes</source>
+ <translation>Temas</translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="386"/>
+ <source>Projectors</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="403"/>
+ <source>Close OpenLP - Shut down the program.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="411"/>
+ <source>Export settings to a *.config file.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="414"/>
+ <source>Import settings from a *.config file previously exported from this or another machine.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="418"/>
+ <source>&Projectors</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="419"/>
+ <source>Hide or show Projectors.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="420"/>
+ <source>Toggle visibility of the Projectors.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="422"/>
+ <source>L&ibrary</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="423"/>
+ <source>Hide or show the Library.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="424"/>
+ <source>Toggle the visibility of the Library.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="426"/>
+ <source>&Themes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="427"/>
+ <source>Hide or show themes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="428"/>
+ <source>Toggle visibility of the Themes.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="430"/>
+ <source>&Service</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="431"/>
+ <source>Hide or show Service.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="432"/>
+ <source>Toggle visibility of the Service.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="434"/>
+ <source>&Preview</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="435"/>
+ <source>Hide or show Preview.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="436"/>
+ <source>Toggle visibility of the Preview.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="438"/>
+ <source>Li&ve</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="439"/>
+ <source>Hide or show Live</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="440"/>
+ <source>L&ock visibility of the panels</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="441"/>
+ <source>Lock visibility of the panels.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="442"/>
+ <source>Toggle visibility of the Live.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="444"/>
+ <source>You can enable and disable plugins from here.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="447"/>
+ <source>More information about OpenLP.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="455"/>
+ <source>Set the interface language to {name}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="471"/>
+ <source>&Show all</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="472"/>
+ <source>Reset the interface back to the default layout and show all the panels.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="475"/>
+ <source>Use layout that focuses on setting up the Service.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="478"/>
+ <source>Use layout that focuses on Live.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="933"/>
+ <source>OpenLP Settings (*.conf)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/mainwindow.py" line="448"/>
+ <source>&User Manual</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/mainwindow.py" line="628"/>
@@ -4439,15 +5907,29 @@
<location filename="../../openlp/core/lib/db.py" line="88"/>
<source>OpenLP cannot load your database.
+<<<<<<< TREE
Database: {db}</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../../openlp/core/lib/db.py" line="245"/>
<source>The database being loaded was created in a more recent version of OpenLP. The database is version {db_ver}, while OpenLP expects version {db_up}. The database will not be loaded.
+=======
+Database: {db}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/lib/db.py" line="245"/>
+ <source>The database being loaded was created in a more recent version of OpenLP. The database is version {db_ver}, while OpenLP expects version {db_up}. The database will not be loaded.
+>>>>>>> MERGE-SOURCE
+<<<<<<< TREE
Database: {db_name}</source>
<translation type="unfinished"/>
+=======
+Database: {db_name}</source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
</context>
<context>
@@ -4463,42 +5945,70 @@
<translation>&Voeg by die geselekteerde Diens item</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/lib/mediamanageritem.py" line="486"/>
+=======
+ <location filename="../../openlp/core/lib/mediamanageritem.py" line="484"/>
+>>>>>>> MERGE-SOURCE
<source>You must select one or more items to preview.</source>
<translation>Kies een of meer items vir die voorskou.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/lib/mediamanageritem.py" line="504"/>
+=======
+ <location filename="../../openlp/core/lib/mediamanageritem.py" line="502"/>
+>>>>>>> MERGE-SOURCE
<source>You must select one or more items to send live.</source>
<translation>Kies een of meer items vir regstreekse uitsending.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/lib/mediamanageritem.py" line="597"/>
+=======
+ <location filename="../../openlp/core/lib/mediamanageritem.py" line="595"/>
+>>>>>>> MERGE-SOURCE
<source>You must select one or more items.</source>
<translation>Kies een of meer items.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/lib/mediamanageritem.py" line="604"/>
+=======
+ <location filename="../../openlp/core/lib/mediamanageritem.py" line="602"/>
+>>>>>>> MERGE-SOURCE
<source>You must select an existing service item to add to.</source>
<translation>'n Bestaande diens item moet geselekteer word om by by te voeg.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/lib/mediamanageritem.py" line="612"/>
+=======
+ <location filename="../../openlp/core/lib/mediamanageritem.py" line="610"/>
+>>>>>>> MERGE-SOURCE
<source>Invalid Service Item</source>
<translation>Ongeldige Diens Item</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/lib/mediamanageritem.py" line="553"/>
+=======
+ <location filename="../../openlp/core/lib/mediamanageritem.py" line="551"/>
+>>>>>>> MERGE-SOURCE
<source>You must select one or more items to add.</source>
<translation>Kies een of meer items om by te voeg.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/lib/mediamanageritem.py" line="647"/>
<source>No Search Results</source>
<translation>Geen Soek Resultate</translation>
</message>
<message>
<location filename="../../openlp/core/lib/mediamanageritem.py" line="338"/>
+=======
+ <location filename="../../openlp/core/lib/mediamanageritem.py" line="338"/>
+>>>>>>> MERGE-SOURCE
<source>Invalid File Type</source>
<translation>Ongeldige Lêer Tipe</translation>
</message>
@@ -4512,6 +6022,7 @@
<source>Duplicate files were found on import and were ignored.</source>
<translation>Duplikaat lêers gevind tydens invoer en is geïgnoreer.</translation>
</message>
+<<<<<<< TREE
<message>
<location filename="../../openlp/core/lib/mediamanageritem.py" line="338"/>
<source>Invalid File {name}.
@@ -4528,6 +6039,19 @@
<source>Search is too short to be used in: "Search while typing"</source>
<translation type="unfinished"/>
</message>
+=======
+ <message>
+ <location filename="../../openlp/core/lib/mediamanageritem.py" line="338"/>
+ <source>Invalid File {name}.
+Suffix not supported</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/lib/mediamanageritem.py" line="610"/>
+ <source>You must select a {title} service item.</source>
+ <translation type="unfinished"></translation>
+ </message>
+>>>>>>> MERGE-SOURCE
</context>
<context>
<name>OpenLP.OpenLyricsImportError</name>
@@ -4547,22 +6071,22 @@
<message>
<location filename="../../openlp/core/lib/projector/pjlink1.py" line="263"/>
<source>Unknown status</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/pjlink1.py" line="273"/>
<source>No message</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/pjlink1.py" line="550"/>
<source>Error while sending data to projector</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/pjlink1.py" line="572"/>
<source>Undefined command:</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -4570,7 +6094,7 @@
<message>
<location filename="../../openlp/core/ui/media/playertab.py" line="57"/>
<source>Players</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/media/playertab.py" line="126"/>
@@ -4580,12 +6104,12 @@
<message>
<location filename="../../openlp/core/ui/media/playertab.py" line="127"/>
<source>Player Search Order</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/media/playertab.py" line="130"/>
<source>Visible background for videos with aspect ratio different to screen.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/media/playertab.py" line="261"/>
@@ -4596,7 +6120,7 @@
<location filename="../../openlp/core/ui/media/playertab.py" line="263"/>
<source>NOTE: To use VLC you must install the %s version</source>
<comment>Will insert "32bit" or "64bit"</comment>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -4617,24 +6141,45 @@
<translation>Aktief</translation>
</message>
<message>
- <location filename="../../openlp/core/ui/plugindialog.py" line="75"/>
- <source>Manage Plugins</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/ui/pluginform.py" line="147"/>
- <source>{name} (Disabled)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/ui/pluginform.py" line="143"/>
- <source>{name} (Active)</source>
- <translation type="unfinished"/>
+<<<<<<< TREE
+ <location filename="../../openlp/core/ui/plugindialog.py" line="75"/>
+ <source>Manage Plugins</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/pluginform.py" line="147"/>
+ <source>{name} (Disabled)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/pluginform.py" line="143"/>
+ <source>{name} (Active)</source>
+ <translation type="unfinished"/>
+=======
+ <location filename="../../openlp/core/ui/plugindialog.py" line="75"/>
+ <source>Manage Plugins</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/pluginform.py" line="147"/>
+ <source>{name} (Disabled)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/pluginform.py" line="143"/>
+ <source>{name} (Active)</source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
<message>
<location filename="../../openlp/core/ui/pluginform.py" line="145"/>
+<<<<<<< TREE
<source>{name} (Inactive)</source>
<translation type="unfinished"/>
+=======
+ <source>{name} (Inactive)</source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
</context>
<context>
@@ -4733,257 +6278,257 @@
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="219"/>
<source>OK</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="220"/>
<source>General projector error</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="221"/>
<source>Not connected error</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="222"/>
<source>Lamp error</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="223"/>
<source>Fan error</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="224"/>
<source>High temperature detected</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="225"/>
<source>Cover open detected</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="226"/>
<source>Check filter</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="227"/>
<source>Authentication Error</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="228"/>
<source>Undefined Command</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="229"/>
<source>Invalid Parameter</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="230"/>
<source>Projector Busy</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="231"/>
<source>Projector/Display Error</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="232"/>
<source>Invalid packet received</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="233"/>
<source>Warning condition detected</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="234"/>
<source>Error condition detected</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="235"/>
<source>PJLink class not supported</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="236"/>
<source>Invalid prefix character</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="237"/>
<source>The connection was refused by the peer (or timed out)</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="239"/>
<source>The remote host closed the connection</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="241"/>
<source>The host address was not found</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="242"/>
<source>The socket operation failed because the application lacked the required privileges</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="245"/>
<source>The local system ran out of resources (e.g., too many sockets)</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="247"/>
<source>The socket operation timed out</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="249"/>
<source>The datagram was larger than the operating system's limit</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="251"/>
<source>An error occurred with the network (Possibly someone pulled the plug?)</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="253"/>
<source>The address specified with socket.bind() is already in use and was set to be exclusive</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="256"/>
<source>The address specified to socket.bind() does not belong to the host</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="259"/>
<source>The requested socket operation is not supported by the local operating system (e.g., lack of IPv6 support)</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="262"/>
<source>The socket is using a proxy, and the proxy requires authentication</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="265"/>
<source>The SSL/TLS handshake failed</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="267"/>
<source>The last operation attempted has not finished yet (still in progress in the background)</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="270"/>
<source>Could not contact the proxy server because the connection to that server was denied</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="273"/>
<source>The connection to the proxy server was closed unexpectedly (before the connection to the final peer was established)</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="276"/>
<source>The connection to the proxy server timed out or the proxy server stopped responding in the authentication phase.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="279"/>
<source>The proxy address set with setProxy() was not found</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="284"/>
<source>An unidentified error occurred</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="285"/>
<source>Not connected</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="286"/>
<source>Connecting</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="287"/>
<source>Connected</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="288"/>
<source>Getting status</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="289"/>
<source>Off</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="290"/>
<source>Initialize in progress</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="291"/>
<source>Power in standby</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="292"/>
<source>Warmup in progress</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="293"/>
<source>Power is on</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="294"/>
<source>Cooldown in progress</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="295"/>
<source>Projector Information available</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="296"/>
<source>Sending data</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="297"/>
<source>Received data</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/constants.py" line="281"/>
<source>The connection negotiation with the proxy server failed because the response from the proxy server could not be understood</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -4991,17 +6536,17 @@
<message>
<location filename="../../openlp/core/ui/projector/editform.py" line="170"/>
<source>Name Not Set</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/projector/editform.py" line="170"/>
<source>You must enter a name for this entry.<br />Please enter a new name for this entry.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/projector/editform.py" line="180"/>
<source>Duplicate Name</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -5009,7 +6554,12 @@
<message>
<location filename="../../openlp/core/ui/projector/editform.py" line="108"/>
<source>Add New Projector</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/projector/editform.py" line="111"/>
+ <source>Edit Projector</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/projector/editform.py" line="111"/>
@@ -5019,7 +6569,12 @@
<message>
<location filename="../../openlp/core/ui/projector/editform.py" line="113"/>
<source>IP Address</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/projector/editform.py" line="116"/>
+ <source>Port Number</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/projector/editform.py" line="116"/>
@@ -5028,18 +6583,33 @@
</message>
<message>
<location filename="../../openlp/core/ui/projector/editform.py" line="118"/>
+<<<<<<< TREE
<source>PIN</source>
<translation type="unfinished"/>
+=======
+ <source>PIN</source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
<message>
<location filename="../../openlp/core/ui/projector/editform.py" line="120"/>
+<<<<<<< TREE
<source>Name</source>
<translation type="unfinished"/>
+=======
+ <source>Name</source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
<message>
<location filename="../../openlp/core/ui/projector/editform.py" line="122"/>
+<<<<<<< TREE
<source>Location</source>
<translation type="unfinished"/>
+=======
+ <source>Location</source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
<message>
<location filename="../../openlp/core/ui/projector/editform.py" line="124"/>
@@ -5054,7 +6624,7 @@
<message>
<location filename="../../openlp/core/ui/projector/editform.py" line="236"/>
<source>There was an error saving projector information. See the log for the error</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -5062,127 +6632,169 @@
<message>
<location filename="../../openlp/core/ui/projector/manager.py" line="86"/>
<source>Add Projector</source>
+<<<<<<< TREE
<translation type="unfinished"/>
</message>
<message>
<location filename="../../openlp/core/ui/projector/manager.py" line="92"/>
+=======
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/projector/manager.py" line="92"/>
+>>>>>>> MERGE-SOURCE
<source>Edit Projector</source>
+<<<<<<< TREE
<translation type="unfinished"/>
</message>
<message>
<location filename="../../openlp/core/ui/projector/manager.py" line="97"/>
+=======
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/projector/manager.py" line="97"/>
+>>>>>>> MERGE-SOURCE
<source>Delete Projector</source>
+<<<<<<< TREE
<translation type="unfinished"/>
</message>
<message>
<location filename="../../openlp/core/ui/projector/manager.py" line="103"/>
+=======
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/projector/manager.py" line="103"/>
+>>>>>>> MERGE-SOURCE
<source>Select Input Source</source>
+<<<<<<< TREE
<translation type="unfinished"/>
</message>
<message>
<location filename="../../openlp/core/ui/projector/manager.py" line="109"/>
+=======
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/projector/manager.py" line="109"/>
+>>>>>>> MERGE-SOURCE
<source>View Projector</source>
+<<<<<<< TREE
<translation type="unfinished"/>
</message>
<message>
<location filename="../../openlp/core/ui/projector/manager.py" line="123"/>
+=======
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/projector/manager.py" line="123"/>
+>>>>>>> MERGE-SOURCE
<source>Connect to selected projectors</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/projector/manager.py" line="130"/>
<source>Disconnect from selected projectors</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/projector/manager.py" line="137"/>
<source>Disconnect from selected projector</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/projector/manager.py" line="152"/>
<source>Power on selected projector</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/projector/manager.py" line="165"/>
<source>Standby selected projector</source>
+<<<<<<< TREE
<translation type="unfinished"/>
</message>
<message>
<location filename="../../openlp/core/ui/projector/manager.py" line="172"/>
+=======
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/projector/manager.py" line="172"/>
+>>>>>>> MERGE-SOURCE
<source>Blank selected projector screen</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/projector/manager.py" line="193"/>
<source>Show selected projector screen</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/projector/manager.py" line="215"/>
<source>&View Projector Information</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/projector/manager.py" line="220"/>
<source>&Edit Projector</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/projector/manager.py" line="226"/>
<source>&Connect Projector</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/projector/manager.py" line="231"/>
<source>D&isconnect Projector</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/projector/manager.py" line="237"/>
<source>Power &On Projector</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/projector/manager.py" line="242"/>
<source>Power O&ff Projector</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/projector/manager.py" line="248"/>
<source>Select &Input</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/projector/manager.py" line="253"/>
<source>Edit Input Source</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/projector/manager.py" line="258"/>
<source>&Blank Projector Screen</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/projector/manager.py" line="263"/>
<source>&Show Projector Screen</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/projector/manager.py" line="269"/>
<source>&Delete Projector</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/projector/manager.py" line="634"/>
<source>Name</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/projector/manager.py" line="636"/>
<source>IP</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/projector/manager.py" line="638"/>
@@ -5197,87 +6809,225 @@
<message>
<location filename="../../openlp/core/ui/projector/manager.py" line="644"/>
<source>Projector information not available at this time.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/projector/manager.py" line="646"/>
<source>Projector Name</source>
+<<<<<<< TREE
<translation type="unfinished"/>
</message>
<message>
+=======
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+>>>>>>> MERGE-SOURCE
<location filename="../../openlp/core/ui/projector/manager.py" line="649"/>
- <source>Manufacturer</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/ui/projector/manager.py" line="651"/>
- <source>Model</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/ui/projector/manager.py" line="653"/>
+<<<<<<< TREE
+ <source>Manufacturer</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/projector/manager.py" line="651"/>
+ <source>Model</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/projector/manager.py" line="653"/>
+=======
+ <source>Manufacturer</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/projector/manager.py" line="651"/>
+ <source>Model</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/projector/manager.py" line="653"/>
+>>>>>>> MERGE-SOURCE
<source>Other info</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/projector/manager.py" line="656"/>
<source>Power status</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/projector/manager.py" line="658"/>
<source>Shutter is</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/projector/manager.py" line="658"/>
<source>Closed</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/projector/manager.py" line="662"/>
<source>Current source input is</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/projector/manager.py" line="667"/>
<source>Lamp</source>
+<<<<<<< TREE
<translation type="unfinished"/>
</message>
<message>
<location filename="../../openlp/core/ui/projector/manager.py" line="676"/>
+=======
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/projector/manager.py" line="676"/>
+>>>>>>> MERGE-SOURCE
<source>Hours</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/projector/manager.py" line="681"/>
<source>No current errors or warnings</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/projector/manager.py" line="683"/>
<source>Current errors/warnings</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/projector/manager.py" line="686"/>
<source>Projector Information</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/projector/manager.py" line="818"/>
<source>No message</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/projector/manager.py" line="985"/>
<source>Not Implemented Yet</source>
+<<<<<<< TREE
<translation type="unfinished"/>
</message>
<message>
<location filename="../../openlp/core/ui/projector/manager.py" line="482"/>
+=======
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/projector/manager.py" line="482"/>
+>>>>>>> MERGE-SOURCE
<source>Are you sure you want to delete this projector?</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/projector/manager.py" line="86"/>
+ <source>Add a new projector.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/projector/manager.py" line="92"/>
+ <source>Edit selected projector.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/projector/manager.py" line="97"/>
+ <source>Delete selected projector.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/projector/manager.py" line="103"/>
+ <source>Choose input source on selected projector.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/projector/manager.py" line="109"/>
+ <source>View selected projector information.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/projector/manager.py" line="116"/>
+ <source>Connect to selected projector.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/projector/manager.py" line="123"/>
+ <source>Connect to selected projectors.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/projector/manager.py" line="130"/>
+ <source>Disconnect from selected projector.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/projector/manager.py" line="137"/>
+ <source>Disconnect from selected projectors.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/projector/manager.py" line="145"/>
+ <source>Power on selected projector.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/projector/manager.py" line="152"/>
+ <source>Power on selected projectors.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/projector/manager.py" line="159"/>
+ <source>Put selected projector in standby.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/projector/manager.py" line="165"/>
+ <source>Put selected projectors in standby.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/projector/manager.py" line="179"/>
+ <source>Blank selected projectors screen</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/projector/manager.py" line="179"/>
+ <source>Blank selected projectors screen.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/projector/manager.py" line="186"/>
+ <source>Show selected projector screen.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/projector/manager.py" line="193"/>
+ <source>Show selected projectors screen.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/projector/manager.py" line="667"/>
+ <source> is on</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/projector/manager.py" line="667"/>
+ <source>is off</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/projector/manager.py" line="932"/>
+ <source>Authentication Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/projector/manager.py" line="947"/>
+ <source>No Authentication Error</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/projector/manager.py" line="86"/>
@@ -5390,27 +7140,27 @@
<message>
<location filename="../../openlp/core/lib/projector/pjlink1.py" line="789"/>
<source>Fan</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/pjlink1.py" line="793"/>
<source>Lamp</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/pjlink1.py" line="797"/>
<source>Temperature</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/pjlink1.py" line="801"/>
<source>Cover</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/pjlink1.py" line="805"/>
<source>Filter</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/lib/projector/pjlink1.py" line="809"/>
@@ -5423,37 +7173,37 @@
<message>
<location filename="../../openlp/core/ui/projector/tab.py" line="50"/>
<source>Projector</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/projector/tab.py" line="99"/>
<source>Communication Options</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/projector/tab.py" line="101"/>
<source>Connect to projectors on startup</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/projector/tab.py" line="103"/>
<source>Socket timeout (seconds)</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/projector/tab.py" line="105"/>
<source>Poll time (seconds)</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/projector/tab.py" line="109"/>
<source>Tabbed dialog box</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/projector/tab.py" line="111"/>
<source>Single dialog box</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -5461,17 +7211,17 @@
<message>
<location filename="../../openlp/core/ui/projector/editform.py" line="197"/>
<source>Duplicate IP Address</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/projector/editform.py" line="206"/>
<source>Invalid IP Address</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/projector/editform.py" line="215"/>
<source>Invalid Port Number</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -5491,18 +7241,33 @@
<name>OpenLP.ServiceItem</name>
<message>
<location filename="../../openlp/core/lib/serviceitem.py" line="334"/>
- <source>[slide {frame:d}]</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/lib/serviceitem.py" line="621"/>
- <source><strong>Start</strong>: {start}</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/lib/serviceitem.py" line="625"/>
- <source><strong>Length</strong>: {length}</source>
- <translation type="unfinished"/>
+<<<<<<< TREE
+ <source>[slide {frame:d}]</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/lib/serviceitem.py" line="621"/>
+ <source><strong>Start</strong>: {start}</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/lib/serviceitem.py" line="625"/>
+ <source><strong>Length</strong>: {length}</source>
+ <translation type="unfinished"/>
+=======
+ <source>[slide {frame:d}]</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/lib/serviceitem.py" line="621"/>
+ <source><strong>Start</strong>: {start}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/lib/serviceitem.py" line="625"/>
+ <source><strong>Length</strong>: {length}</source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
</context>
<context>
@@ -5778,79 +7543,79 @@
<message>
<location filename="../../openlp/core/ui/servicemanager.py" line="231"/>
<source>&Rename...</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/servicemanager.py" line="247"/>
<source>Create New &Custom Slide</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/servicemanager.py" line="254"/>
<source>&Auto play slides</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/servicemanager.py" line="258"/>
<source>Auto play slides &Loop</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/servicemanager.py" line="263"/>
<source>Auto play slides &Once</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/servicemanager.py" line="884"/>
<source>&Delay between slides</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/servicemanager.py" line="432"/>
<source>OpenLP Service Files (*.osz *.oszl)</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/servicemanager.py" line="698"/>
<source>OpenLP Service Files (*.osz);; OpenLP Service Files - lite (*.oszl)</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/servicemanager.py" line="703"/>
<source>OpenLP Service Files (*.osz);;</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/servicemanager.py" line="748"/>
<source>File is not a valid service.
The content encoding is not UTF-8.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/servicemanager.py" line="763"/>
<source>The service file you are trying to open is in an old format.
Please save it using OpenLP 2.0.2 or greater.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/servicemanager.py" line="793"/>
<source>This file is either corrupt or it is not an OpenLP 2 service file.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/servicemanager.py" line="895"/>
<source>&Auto Start - inactive</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/servicemanager.py" line="897"/>
<source>&Auto Start - active</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/servicemanager.py" line="984"/>
<source>Input delay</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/servicemanager.py" line="984"/>
@@ -5860,7 +7625,7 @@
<message>
<location filename="../../openlp/core/ui/servicemanager.py" line="1549"/>
<source>Rename item title</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/servicemanager.py" line="1549"/>
@@ -5872,7 +7637,12 @@
<source>The following file(s) in the service are missing: {name}
These files will be removed if you continue to save.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/servicemanager.py" line="605"/>
+ <source>An error occurred while writing the service file: {error}</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/servicemanager.py" line="605"/>
@@ -5958,11 +7728,20 @@
<source>Configure Shortcuts</source>
<translation>Konfigureer Kortpaaie</translation>
</message>
+<<<<<<< TREE
<message>
<location filename="../../openlp/core/ui/shortcutlistform.py" line="438"/>
<source>The shortcut "{key}" is already assigned to another action, please use a different shortcut.</source>
<translation type="unfinished"/>
</message>
+=======
+ <message>
+ <location filename="../../openlp/core/ui/shortcutlistform.py" line="438"/>
+ <source>The shortcut "{key}" is already assigned to another action,
+please use a different shortcut.</source>
+ <translation type="unfinished"></translation>
+ </message>
+>>>>>>> MERGE-SOURCE
</context>
<context>
<name>OpenLP.SlideController</name>
@@ -5972,11 +7751,16 @@
<translation>Verskuil</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/slidecontroller.py" line="319"/>
+=======
+ <location filename="../../openlp/core/ui/slidecontroller.py" line="326"/>
+>>>>>>> MERGE-SOURCE
<source>Go To</source>
<translation>Gaan Na</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/slidecontroller.py" line="237"/>
<source>Blank Screen</source>
<translation>Blanko Skerm</translation>
@@ -5988,26 +7772,41 @@
</message>
<message>
<location filename="../../openlp/core/ui/slidecontroller.py" line="247"/>
+=======
+ <location filename="../../openlp/core/ui/slidecontroller.py" line="238"/>
+>>>>>>> MERGE-SOURCE
<source>Show Desktop</source>
<translation>Wys Werkskerm</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/slidecontroller.py" line="509"/>
+=======
+ <location filename="../../openlp/core/ui/slidecontroller.py" line="516"/>
+>>>>>>> MERGE-SOURCE
<source>Previous Service</source>
<translation>Vorige Diens</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/slidecontroller.py" line="514"/>
+=======
+ <location filename="../../openlp/core/ui/slidecontroller.py" line="521"/>
+>>>>>>> MERGE-SOURCE
<source>Next Service</source>
<translation>Volgende Diens</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/slidecontroller.py" line="519"/>
<source>Escape Item</source>
<translation>Ontsnap Item</translation>
</message>
<message>
<location filename="../../openlp/core/ui/slidecontroller.py" line="212"/>
+=======
+ <location filename="../../openlp/core/ui/slidecontroller.py" line="212"/>
+>>>>>>> MERGE-SOURCE
<source>Move to previous.</source>
<translation>Skuif terug.</translation>
</message>
@@ -6017,27 +7816,48 @@
<translation>Skuif volgende.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/slidecontroller.py" line="275"/>
+=======
+ <location filename="../../openlp/core/ui/slidecontroller.py" line="282"/>
+>>>>>>> MERGE-SOURCE
<source>Play Slides</source>
<translation>Speel Skyfies</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/slidecontroller.py" line="295"/>
<source>Delay between slides in seconds.</source>
<translation>Vertraging tussen skyfies in sekondes.</translation>
</message>
<message>
<location filename="../../openlp/core/ui/slidecontroller.py" line="299"/>
+=======
+ <location filename="../../openlp/core/ui/slidecontroller.py" line="302"/>
+ <source>Delay between slides in seconds.</source>
+ <translation>Vertraging tussen skyfies in sekondes.</translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/slidecontroller.py" line="306"/>
+>>>>>>> MERGE-SOURCE
<source>Move to live.</source>
<translation>Skuif na regstreeks.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/slidecontroller.py" line="302"/>
+=======
+ <location filename="../../openlp/core/ui/slidecontroller.py" line="309"/>
+>>>>>>> MERGE-SOURCE
<source>Add to Service.</source>
<translation>Voeg by Diens.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/slidecontroller.py" line="306"/>
+=======
+ <location filename="../../openlp/core/ui/slidecontroller.py" line="313"/>
+>>>>>>> MERGE-SOURCE
<source>Edit and reload song preview.</source>
<translation>Redigeer en herlaai lied voorskou.</translation>
</message>
@@ -6047,7 +7867,11 @@
<translation>Begin media speel.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/slidecontroller.py" line="323"/>
+=======
+ <location filename="../../openlp/core/ui/slidecontroller.py" line="330"/>
+>>>>>>> MERGE-SOURCE
<source>Pause audio.</source>
<translation>Stop oudio.</translation>
</message>
@@ -6072,37 +7896,65 @@
<translation>Oudio Volume.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/slidecontroller.py" line="390"/>
+=======
+ <location filename="../../openlp/core/ui/slidecontroller.py" line="397"/>
+>>>>>>> MERGE-SOURCE
<source>Go to "Verse"</source>
<translation>Gaan na "Vers"</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/slidecontroller.py" line="391"/>
+=======
+ <location filename="../../openlp/core/ui/slidecontroller.py" line="398"/>
+>>>>>>> MERGE-SOURCE
<source>Go to "Chorus"</source>
<translation>Gaan na "Koor"</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/slidecontroller.py" line="392"/>
+=======
+ <location filename="../../openlp/core/ui/slidecontroller.py" line="399"/>
+>>>>>>> MERGE-SOURCE
<source>Go to "Bridge"</source>
<translation>Gaan na "Brug"</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/slidecontroller.py" line="394"/>
+=======
+ <location filename="../../openlp/core/ui/slidecontroller.py" line="401"/>
+>>>>>>> MERGE-SOURCE
<source>Go to "Pre-Chorus"</source>
<translation>Gaan na "Pre-Koor"</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/slidecontroller.py" line="395"/>
+=======
+ <location filename="../../openlp/core/ui/slidecontroller.py" line="402"/>
+>>>>>>> MERGE-SOURCE
<source>Go to "Intro"</source>
<translation>Gaan na "Inleiding"</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/slidecontroller.py" line="396"/>
+=======
+ <location filename="../../openlp/core/ui/slidecontroller.py" line="403"/>
+>>>>>>> MERGE-SOURCE
<source>Go to "Ending"</source>
<translation>Gaan na "Einde"</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/slidecontroller.py" line="397"/>
+=======
+ <location filename="../../openlp/core/ui/slidecontroller.py" line="404"/>
+>>>>>>> MERGE-SOURCE
<source>Go to "Other"</source>
<translation>Gaan na "Ander"</translation>
</message>
@@ -6117,47 +7969,97 @@
<translation>Volgende Skyfie</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/slidecontroller.py" line="323"/>
+=======
+ <location filename="../../openlp/core/ui/slidecontroller.py" line="330"/>
+>>>>>>> MERGE-SOURCE
<source>Pause Audio</source>
<translation>Hou Oudio</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/slidecontroller.py" line="329"/>
<source>Background Audio</source>
<translation>Agtergrond Oudio</translation>
</message>
<message>
<location filename="../../openlp/core/ui/slidecontroller.py" line="333"/>
+=======
+ <location filename="../../openlp/core/ui/slidecontroller.py" line="336"/>
+ <source>Background Audio</source>
+ <translation>Agtergrond Oudio</translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/slidecontroller.py" line="340"/>
+>>>>>>> MERGE-SOURCE
<source>Go to next audio track.</source>
<translation>Gaan na die volgende oudio snit.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/slidecontroller.py" line="341"/>
+=======
+ <location filename="../../openlp/core/ui/slidecontroller.py" line="348"/>
+>>>>>>> MERGE-SOURCE
<source>Tracks</source>
<translation>Snitte</translation>
</message>
- <message>
- <location filename="../../openlp/core/ui/media/mediacontroller.py" line="302"/>
- <source>Loop playing media.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/ui/media/mediacontroller.py" line="308"/>
- <source>Video timer.</source>
- <translation type="unfinished"/>
- </message>
+<<<<<<< TREE
+ <message>
+ <location filename="../../openlp/core/ui/media/mediacontroller.py" line="302"/>
+ <source>Loop playing media.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/media/mediacontroller.py" line="308"/>
+ <source>Video timer.</source>
+ <translation type="unfinished"/>
+ </message>
+=======
+ <message>
+ <location filename="../../openlp/core/ui/media/mediacontroller.py" line="302"/>
+ <source>Loop playing media.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/media/mediacontroller.py" line="308"/>
+ <source>Video timer.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/slidecontroller.py" line="243"/>
+ <source>Toggle Desktop</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/slidecontroller.py" line="248"/>
+ <source>Toggle Blank to Theme</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/slidecontroller.py" line="253"/>
+ <source>Toggle Blank Screen</source>
+ <translation type="unfinished"></translation>
+ </message>
+>>>>>>> MERGE-SOURCE
</context>
<context>
<name>OpenLP.SourceSelectForm</name>
<message>
<location filename="../../openlp/core/ui/projector/sourceselectform.py" line="396"/>
<source>Select Projector Source</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/projector/sourceselectform.py" line="394"/>
<source>Edit Projector Source Text</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/projector/sourceselectform.py" line="149"/>
+ <source>Ignoring current changes and return to OpenLP</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/projector/sourceselectform.py" line="149"/>
@@ -6166,28 +8068,38 @@
</message>
<message>
<location filename="../../openlp/core/ui/projector/sourceselectform.py" line="152"/>
+<<<<<<< TREE
<source>Delete all user-defined text and revert to PJLink default text</source>
<translation type="unfinished"/>
+=======
+ <source>Delete all user-defined text and revert to PJLink default text</source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
<message>
<location filename="../../openlp/core/ui/projector/sourceselectform.py" line="155"/>
+<<<<<<< TREE
<source>Discard changes and reset to previous user-defined text</source>
<translation type="unfinished"/>
+=======
+ <source>Discard changes and reset to previous user-defined text</source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
<message>
<location filename="../../openlp/core/ui/projector/sourceselectform.py" line="158"/>
<source>Save changes and return to OpenLP</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/projector/sourceselectform.py" line="478"/>
<source>Delete entries for this projector</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/projector/sourceselectform.py" line="479"/>
<source>Are you sure you want to delete ALL user-defined source input text for this projector?</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -6452,12 +8364,50 @@
<message>
<location filename="../../openlp/core/ui/thememanager.py" line="428"/>
<source>OpenLP Themes (*.otz)</source>
+<<<<<<< TREE
<translation type="unfinished"/>
</message>
<message>
<location filename="../../openlp/core/ui/thememanager.py" line="775"/>
+=======
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/thememanager.py" line="775"/>
+>>>>>>> MERGE-SOURCE
<source>Unable to delete theme</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/thememanager.py" line="236"/>
+ <source>{text} (default)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/thememanager.py" line="287"/>
+ <source>Copy of {name}</source>
+ <comment>Copy of <theme name></comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/thememanager.py" line="381"/>
+ <source>Save Theme - ({name})</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/thememanager.py" line="414"/>
+ <source>The theme export failed because this error occurred: {err}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/thememanager.py" line="479"/>
+ <source>{name} (default)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/thememanager.py" line="529"/>
+ <source>Theme {name} already exists. Do you want to replace it?</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/thememanager.py" line="236"/>
@@ -6492,15 +8442,28 @@
</message>
<message>
<location filename="../../openlp/core/ui/thememanager.py" line="768"/>
+<<<<<<< TREE
<source>{count} time(s) by {plugin}</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../../openlp/core/ui/thememanager.py" line="775"/>
+=======
+ <source>{count} time(s) by {plugin}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/thememanager.py" line="775"/>
+>>>>>>> MERGE-SOURCE
<source>Theme is currently used
+<<<<<<< TREE
{text}</source>
<translation type="unfinished"/>
+=======
+{text}</source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
</context>
<context>
@@ -6788,33 +8751,46 @@
<message>
<location filename="../../openlp/core/ui/themewizard.py" line="417"/>
<source>Solid color</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/themewizard.py" line="462"/>
<source>color:</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/themewizard.py" line="475"/>
<source>Allows you to change and move the Main and Footer areas.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/themeform.py" line="185"/>
<source>You have not selected a background image. Please select one before continuing.</source>
<translation>'n Agtergrond beeld is nie gekies nie. Kies asseblief een voor jy aangaan.</translation>
</message>
- <message>
- <location filename="../../openlp/core/ui/themeform.py" line="277"/>
- <source>Edit Theme - {name}</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/ui/themeform.py" line="477"/>
- <source>Select Video</source>
- <translation type="unfinished"/>
- </message>
+<<<<<<< TREE
+ <message>
+ <location filename="../../openlp/core/ui/themeform.py" line="277"/>
+ <source>Edit Theme - {name}</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/themeform.py" line="477"/>
+ <source>Select Video</source>
+ <translation type="unfinished"/>
+ </message>
+=======
+ <message>
+ <location filename="../../openlp/core/ui/themeform.py" line="277"/>
+ <source>Edit Theme - {name}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/themeform.py" line="477"/>
+ <source>Select Video</source>
+ <translation type="unfinished"></translation>
+ </message>
+>>>>>>> MERGE-SOURCE
</context>
<context>
<name>OpenLP.ThemesTab</name>
@@ -6866,12 +8842,12 @@
<message>
<location filename="../../openlp/core/ui/themestab.py" line="116"/>
<source>Universal Settings</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/themestab.py" line="117"/>
<source>&Wrap footer text</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -6897,63 +8873,111 @@
<translation>&Vertikale Sporing:</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/lib/wizard.py" line="50"/>
+=======
+ <location filename="../../openlp/core/ui/lib/wizard.py" line="51"/>
+>>>>>>> MERGE-SOURCE
<source>Finished import.</source>
<translation>Invoer voltooi.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/lib/wizard.py" line="51"/>
+=======
+ <location filename="../../openlp/core/ui/lib/wizard.py" line="52"/>
+>>>>>>> MERGE-SOURCE
<source>Format:</source>
<translation>Formaat:</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/lib/wizard.py" line="53"/>
+=======
+ <location filename="../../openlp/core/ui/lib/wizard.py" line="54"/>
+>>>>>>> MERGE-SOURCE
<source>Importing</source>
<translation>Invoer</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/lib/wizard.py" line="54"/>
+=======
+ <location filename="../../openlp/core/ui/lib/wizard.py" line="55"/>
+>>>>>>> MERGE-SOURCE
<source>Importing "%s"...</source>
<translation>"%s" ingevoer...</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/lib/wizard.py" line="55"/>
+=======
+ <location filename="../../openlp/core/ui/lib/wizard.py" line="56"/>
+>>>>>>> MERGE-SOURCE
<source>Select Import Source</source>
<translation>Selekteer Invoer Bron</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/lib/wizard.py" line="56"/>
+=======
+ <location filename="../../openlp/core/ui/lib/wizard.py" line="57"/>
+>>>>>>> MERGE-SOURCE
<source>Select the import format and the location to import from.</source>
<translation>Selekteer die invoer vormaat en die ligging vanwaar invoer geskied.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/lib/wizard.py" line="57"/>
+=======
+ <location filename="../../openlp/core/ui/lib/wizard.py" line="58"/>
+>>>>>>> MERGE-SOURCE
<source>Open %s File</source>
<translation>Maak %s Lêer Oop</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/lib/wizard.py" line="59"/>
+=======
+ <location filename="../../openlp/core/ui/lib/wizard.py" line="60"/>
+>>>>>>> MERGE-SOURCE
<source>%p%</source>
<translation>%p%</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/lib/wizard.py" line="60"/>
+=======
+ <location filename="../../openlp/core/ui/lib/wizard.py" line="61"/>
+>>>>>>> MERGE-SOURCE
<source>Ready.</source>
<translation>Gereed.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/songs/songsplugin.py" line="307"/>
+=======
+ <location filename="../../openlp/plugins/songs/songsplugin.py" line="326"/>
+>>>>>>> MERGE-SOURCE
<source>Starting import...</source>
<translation>Invoer begin...</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/lib/wizard.py" line="64"/>
+=======
+ <location filename="../../openlp/core/ui/lib/wizard.py" line="65"/>
+>>>>>>> MERGE-SOURCE
<source>You need to specify at least one %s file to import from.</source>
<comment>A file type e.g. OpenSong</comment>
<translation>Spesifiseer ten minste een %s lêer om vanaf in te voer.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="388"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="418"/>
+>>>>>>> MERGE-SOURCE
<source>Welcome to the Bible Import Wizard</source>
<translation>Welkom by die Bybel Invoer Gids</translation>
</message>
@@ -6981,7 +9005,7 @@
</message>
<message>
<location filename="../../openlp/plugins/songs/lib/ui.py" line="37"/>
- <source>©</source>
+ <source>©</source>
<comment>Copyright symbol.</comment>
<translation>©</translation>
</message>
@@ -7013,41 +9037,61 @@
<translation>XML sintaks fout</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/lib/wizard.py" line="58"/>
+=======
+ <location filename="../../openlp/core/ui/lib/wizard.py" line="59"/>
+>>>>>>> MERGE-SOURCE
<source>Open %s Folder</source>
<translation>Maak %s Gids Oop</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/lib/wizard.py" line="62"/>
+=======
+ <location filename="../../openlp/core/ui/lib/wizard.py" line="63"/>
+>>>>>>> MERGE-SOURCE
<source>You need to specify one %s file to import from.</source>
<comment>A file type e.g. OpenSong</comment>
<translation>Een %s lêer moet gespesifiseer word om vanaf in te voer.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/lib/wizard.py" line="66"/>
+=======
+ <location filename="../../openlp/core/ui/lib/wizard.py" line="67"/>
+>>>>>>> MERGE-SOURCE
<source>You need to specify one %s folder to import from.</source>
<comment>A song format e.g. PowerSong</comment>
<translation>Een %s gids moet gespesifiseer word om vanaf in te voer.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/songs/songsplugin.py" line="306"/>
+=======
+ <location filename="../../openlp/plugins/songs/songsplugin.py" line="325"/>
+>>>>>>> MERGE-SOURCE
<source>Importing Songs</source>
<translation>Voer Liedere In</translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/forms/duplicatesongremovalform.py" line="134"/>
<source>Welcome to the Duplicate Song Removal Wizard</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/songs/lib/mediaitem.py" line="649"/>
+=======
+ <location filename="../../openlp/plugins/songs/lib/mediaitem.py" line="643"/>
+>>>>>>> MERGE-SOURCE
<source>Written by</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/lib/ui.py" line="36"/>
<source>Author Unknown</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/common/uistrings.py" line="53"/>
@@ -7255,25 +9299,25 @@
<location filename="../../openlp/core/common/uistrings.py" line="100"/>
<source>Manufacturer</source>
<comment>Singular</comment>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/common/uistrings.py" line="101"/>
<source>Manufacturers</source>
<comment>Plural</comment>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/common/uistrings.py" line="102"/>
<source>Model</source>
<comment>Singular</comment>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/common/uistrings.py" line="103"/>
<source>Models</source>
<comment>Plural</comment>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/common/uistrings.py" line="104"/>
@@ -7332,222 +9376,460 @@
</message>
<message>
<location filename="../../openlp/core/common/uistrings.py" line="114"/>
+<<<<<<< TREE
<source>No Items Selected</source>
<comment>Plural</comment>
<translation>Geen items geselekteer nie</translation>
</message>
<message>
<location filename="../../openlp/core/common/uistrings.py" line="118"/>
+=======
+ <source>No Items Selected</source>
+ <comment>Plural</comment>
+ <translation>Geen items geselekteer nie</translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/uistrings.py" line="119"/>
+>>>>>>> MERGE-SOURCE
<source>OpenLP is already running. Do you wish to continue?</source>
<translation>OpenLP is reeds ana die gang. Gaan voort?</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/common/uistrings.py" line="119"/>
+=======
+ <location filename="../../openlp/core/common/uistrings.py" line="120"/>
+>>>>>>> MERGE-SOURCE
<source>Open service.</source>
<translation>Maak 'n diens oop.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/common/uistrings.py" line="120"/>
+=======
+ <location filename="../../openlp/core/common/uistrings.py" line="121"/>
+>>>>>>> MERGE-SOURCE
<source>Play Slides in Loop</source>
<translation>Speel Skyfies in Herhaling</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/common/uistrings.py" line="121"/>
+=======
+ <location filename="../../openlp/core/common/uistrings.py" line="122"/>
+>>>>>>> MERGE-SOURCE
<source>Play Slides to End</source>
<translation>Speel Skyfies tot Einde</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/common/uistrings.py" line="122"/>
+=======
+ <location filename="../../openlp/core/common/uistrings.py" line="123"/>
+>>>>>>> MERGE-SOURCE
<source>Preview</source>
<translation>Voorskou</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/common/uistrings.py" line="124"/>
+=======
+ <location filename="../../openlp/core/common/uistrings.py" line="125"/>
+>>>>>>> MERGE-SOURCE
<source>Print Service</source>
<translation>Druk Diens uit</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/common/uistrings.py" line="125"/>
+=======
+ <location filename="../../openlp/core/common/uistrings.py" line="126"/>
+>>>>>>> MERGE-SOURCE
<source>Projector</source>
<comment>Singular</comment>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/common/uistrings.py" line="126"/>
+=======
+ <location filename="../../openlp/core/common/uistrings.py" line="127"/>
+>>>>>>> MERGE-SOURCE
<source>Projectors</source>
<comment>Plural</comment>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/common/uistrings.py" line="127"/>
+=======
+ <location filename="../../openlp/core/common/uistrings.py" line="128"/>
+>>>>>>> MERGE-SOURCE
<source>Replace Background</source>
<translation>Vervang Agtergrond</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/common/uistrings.py" line="128"/>
+=======
+ <location filename="../../openlp/core/common/uistrings.py" line="129"/>
+>>>>>>> MERGE-SOURCE
<source>Replace live background.</source>
<translation>Vervang regstreekse agtergrond.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/common/uistrings.py" line="131"/>
+=======
+ <location filename="../../openlp/core/common/uistrings.py" line="132"/>
+>>>>>>> MERGE-SOURCE
<source>Reset Background</source>
<translation>Herstel Agtergrond</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/common/uistrings.py" line="132"/>
+=======
+ <location filename="../../openlp/core/common/uistrings.py" line="133"/>
+>>>>>>> MERGE-SOURCE
<source>Reset live background.</source>
<translation>Herstel regstreekse agtergrond.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/common/uistrings.py" line="133"/>
+=======
+ <location filename="../../openlp/core/common/uistrings.py" line="134"/>
+>>>>>>> MERGE-SOURCE
<source>s</source>
<comment>The abbreviated unit for seconds</comment>
<translation>s</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/common/uistrings.py" line="134"/>
+=======
+ <location filename="../../openlp/core/common/uistrings.py" line="135"/>
+>>>>>>> MERGE-SOURCE
<source>Save && Preview</source>
<translation>Stoor && Voorskou</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/common/uistrings.py" line="135"/>
+=======
+ <location filename="../../openlp/core/common/uistrings.py" line="136"/>
+>>>>>>> MERGE-SOURCE
<source>Search</source>
<translation>Soek</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/common/uistrings.py" line="136"/>
+=======
+ <location filename="../../openlp/core/common/uistrings.py" line="137"/>
+>>>>>>> MERGE-SOURCE
<source>Search Themes...</source>
<comment>Search bar place holder text </comment>
<translation>Soek Temas...</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/common/uistrings.py" line="137"/>
+=======
+ <location filename="../../openlp/core/common/uistrings.py" line="138"/>
+>>>>>>> MERGE-SOURCE
<source>You must select an item to delete.</source>
<translation>Kies 'n item om uit te wis.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/common/uistrings.py" line="138"/>
+=======
+ <location filename="../../openlp/core/common/uistrings.py" line="139"/>
+>>>>>>> MERGE-SOURCE
<source>You must select an item to edit.</source>
<translation>Selekteer 'n item om te regideer.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/common/uistrings.py" line="139"/>
+=======
+ <location filename="../../openlp/core/common/uistrings.py" line="140"/>
+>>>>>>> MERGE-SOURCE
<source>Settings</source>
<translation>Instellings</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/common/uistrings.py" line="140"/>
+=======
+ <location filename="../../openlp/core/common/uistrings.py" line="141"/>
+>>>>>>> MERGE-SOURCE
<source>Save Service</source>
<translation>Stoor Diens</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/common/uistrings.py" line="141"/>
+=======
+ <location filename="../../openlp/core/common/uistrings.py" line="142"/>
+>>>>>>> MERGE-SOURCE
<source>Service</source>
<translation>Diens</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/common/uistrings.py" line="142"/>
+=======
+ <location filename="../../openlp/core/common/uistrings.py" line="144"/>
+>>>>>>> MERGE-SOURCE
<source>Optional &Split</source>
<translation>Op&sionele Verdeling</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/common/uistrings.py" line="143"/>
+=======
+ <location filename="../../openlp/core/common/uistrings.py" line="145"/>
+>>>>>>> MERGE-SOURCE
<source>Split a slide into two only if it does not fit on the screen as one slide.</source>
<translation>Verdeel 'n skyfie slegs in twee wanneer dit nie op die skerm as 'n enkele skyfie sal pas nie.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/common/uistrings.py" line="147"/>
+=======
+ <location filename="../../openlp/core/common/uistrings.py" line="149"/>
+>>>>>>> MERGE-SOURCE
<source>Stop Play Slides in Loop</source>
<translation>Staak Skyfies in Herhaling</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/common/uistrings.py" line="148"/>
+=======
+ <location filename="../../openlp/core/common/uistrings.py" line="150"/>
+>>>>>>> MERGE-SOURCE
<source>Stop Play Slides to End</source>
<translation>Staak Skyfies tot Einde</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/common/uistrings.py" line="149"/>
+=======
+ <location filename="../../openlp/core/common/uistrings.py" line="151"/>
+>>>>>>> MERGE-SOURCE
<source>Theme</source>
<comment>Singular</comment>
<translation>Tema</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/common/uistrings.py" line="150"/>
+=======
+ <location filename="../../openlp/core/common/uistrings.py" line="152"/>
+>>>>>>> MERGE-SOURCE
<source>Themes</source>
<comment>Plural</comment>
<translation>Temas</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/common/uistrings.py" line="151"/>
+=======
+ <location filename="../../openlp/core/common/uistrings.py" line="153"/>
+>>>>>>> MERGE-SOURCE
<source>Tools</source>
<translation>Gereedskap</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/common/uistrings.py" line="152"/>
+=======
+ <location filename="../../openlp/core/common/uistrings.py" line="154"/>
+>>>>>>> MERGE-SOURCE
<source>Top</source>
<translation>Bo</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/common/uistrings.py" line="153"/>
+=======
+ <location filename="../../openlp/core/common/uistrings.py" line="155"/>
+>>>>>>> MERGE-SOURCE
<source>Unsupported File</source>
<translation>Lêer nie Ondersteun nie</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/common/uistrings.py" line="154"/>
+=======
+ <location filename="../../openlp/core/common/uistrings.py" line="156"/>
+>>>>>>> MERGE-SOURCE
<source>Verse Per Slide</source>
<translation>Vers Per Skyfie</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/common/uistrings.py" line="155"/>
+=======
+ <location filename="../../openlp/core/common/uistrings.py" line="157"/>
+>>>>>>> MERGE-SOURCE
<source>Verse Per Line</source>
<translation>Vers Per Lyn</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/common/uistrings.py" line="156"/>
+=======
+ <location filename="../../openlp/core/common/uistrings.py" line="158"/>
+>>>>>>> MERGE-SOURCE
<source>Version</source>
<translation>Weergawe</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/common/uistrings.py" line="157"/>
+=======
+ <location filename="../../openlp/core/common/uistrings.py" line="159"/>
+>>>>>>> MERGE-SOURCE
<source>View</source>
<translation>Vertoon</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/common/uistrings.py" line="158"/>
+=======
+ <location filename="../../openlp/core/common/uistrings.py" line="160"/>
+>>>>>>> MERGE-SOURCE
<source>View Mode</source>
<translation>Vertoon Modus</translation>
</message>
<message>
<location filename="../../openlp/core/common/uistrings.py" line="66"/>
<source>CCLI song number:</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/common/uistrings.py" line="123"/>
+=======
+ <location filename="../../openlp/core/common/uistrings.py" line="124"/>
+>>>>>>> MERGE-SOURCE
<source>Preview Toolbar</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/common/uistrings.py" line="115"/>
+=======
+ <location filename="../../openlp/core/common/uistrings.py" line="116"/>
+>>>>>>> MERGE-SOURCE
<source>OpenLP</source>
<translation>OpenLP</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/common/uistrings.py" line="129"/>
+=======
+ <location filename="../../openlp/core/common/uistrings.py" line="130"/>
+>>>>>>> MERGE-SOURCE
<source>Replace live background is not available when the WebKit player is disabled.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/lib/ui.py" line="38"/>
<source>Songbook</source>
<comment>Singular</comment>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/lib/ui.py" line="39"/>
<source>Songbooks</source>
<comment>Plural</comment>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/uistrings.py" line="61"/>
+ <source>Background color:</source>
+ <translation>Agtergrond kleur:</translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/uistrings.py" line="56"/>
+ <source>Add group.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/uistrings.py" line="85"/>
+ <source>File {name} not found.
+Please try selecting it individually.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/uistrings.py" line="148"/>
+ <source>Start {code}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/uistrings.py" line="161"/>
+ <source>Video</source>
+ <translation>Video</translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/uistrings.py" line="162"/>
+ <source>Search is Empty or too Short</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/uistrings.py" line="163"/>
+ <source><strong>The search you have entered is empty or shorter than 3 characters long.</strong><br><br>Please try again with a longer search.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/uistrings.py" line="166"/>
+ <source>No Bibles Available</source>
+ <translation>Geeb Bybels Beskikbaar nie</translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/uistrings.py" line="167"/>
+ <source><strong>There are no Bibles currently installed.</strong><br><br>Please use the Import Wizard to install one or more Bibles.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/uistrings.py" line="169"/>
+ <source>Book Chapter</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/uistrings.py" line="170"/>
+ <source>Chapter</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/uistrings.py" line="171"/>
+ <source>Verse</source>
+ <translation>Vers</translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/uistrings.py" line="173"/>
+ <source>Psalm</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/uistrings.py" line="174"/>
+ <source>Book names may be shortened from full names, for an example Ps 23 = Psalm 23</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/uistrings.py" line="115"/>
+ <source>No Search Results</source>
+ <translation type="unfinished">Geen Soek Resultate</translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/uistrings.py" line="143"/>
+ <source>Please type more text to use 'Search As You Type'</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/common/uistrings.py" line="61"/>
@@ -7624,6 +9906,7 @@
<context>
<name>OpenLP.core.lib</name>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/lib/__init__.py" line="330"/>
<source>%s and %s</source>
<comment>Locale list separator: 2 items</comment>
@@ -7646,6 +9929,16 @@
<source>%s, %s</source>
<comment>Locale list separator: start</comment>
<translation type="unfinished"/>
+=======
+ <location filename="../../openlp/core/lib/__init__.py" line="323"/>
+ <source>{one} and {two}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/lib/__init__.py" line="325"/>
+ <source>{first} and {last}</source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
</context>
<context>
@@ -7653,7 +9946,7 @@
<message>
<location filename="../../openlp/core/ui/projector/tab.py" line="107"/>
<source>Source select dialog interface</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -7745,27 +10038,49 @@
<translation>Vermisde Aanbieding</translation>
</message>
<message>
- <location filename="../../openlp/plugins/presentations/lib/mediaitem.py" line="94"/>
- <source>Presentations ({text})</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/plugins/presentations/lib/mediaitem.py" line="381"/>
- <source>The presentation {name} no longer exists.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/plugins/presentations/lib/mediaitem.py" line="372"/>
- <source>The presentation {name} is incomplete, please reload.</source>
- <translation type="unfinished"/>
+<<<<<<< TREE
+ <location filename="../../openlp/plugins/presentations/lib/mediaitem.py" line="94"/>
+ <source>Presentations ({text})</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/presentations/lib/mediaitem.py" line="381"/>
+ <source>The presentation {name} no longer exists.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/presentations/lib/mediaitem.py" line="372"/>
+ <source>The presentation {name} is incomplete, please reload.</source>
+ <translation type="unfinished"/>
+=======
+ <location filename="../../openlp/plugins/presentations/lib/mediaitem.py" line="94"/>
+ <source>Presentations ({text})</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/presentations/lib/mediaitem.py" line="381"/>
+ <source>The presentation {name} no longer exists.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/presentations/lib/mediaitem.py" line="372"/>
+ <source>The presentation {name} is incomplete, please reload.</source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
</context>
<context>
<name>PresentationPlugin.PowerpointDocument</name>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/presentations/lib/powerpointcontroller.py" line="526"/>
<source>An error occurred in the PowerPoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
<translation type="unfinished"/>
+=======
+ <location filename="../../openlp/plugins/presentations/lib/powerpointcontroller.py" line="526"/>
+ <source>An error occurred in the PowerPoint integration and the presentation will be stopped. Restart the presentation if you wish to present it.</source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
</context>
<context>
@@ -7783,43 +10098,59 @@
<message>
<location filename="../../openlp/plugins/presentations/lib/presentationtab.py" line="122"/>
<source>PDF options</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/presentations/lib/presentationtab.py" line="133"/>
<source>Use given full path for mudraw or ghostscript binary:</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/presentations/lib/presentationtab.py" line="235"/>
<source>Select mudraw or ghostscript binary.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/presentations/lib/presentationtab.py" line="241"/>
<source>The program is not ghostscript or mudraw which is required.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/presentations/lib/presentationtab.py" line="123"/>
<source>PowerPoint options</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/presentations/lib/presentationtab.py" line="126"/>
+<<<<<<< TREE
<source>Clicking on the current slide advances to the next effect</source>
<translation type="unfinished"/>
+=======
+ <source>Clicking on the current slide advances to the next effect</source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
<message>
<location filename="../../openlp/plugins/presentations/lib/presentationtab.py" line="129"/>
- <source>Let PowerPoint control the size and monitor of the presentations
-(This may fix PowerPoint scaling issues in Windows 8 and 10)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/plugins/presentations/lib/presentationtab.py" line="140"/>
- <source>{name} (unavailable)</source>
- <translation type="unfinished"/>
+<<<<<<< TREE
+ <source>Let PowerPoint control the size and monitor of the presentations
+(This may fix PowerPoint scaling issues in Windows 8 and 10)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/presentations/lib/presentationtab.py" line="140"/>
+ <source>{name} (unavailable)</source>
+ <translation type="unfinished"/>
+=======
+ <source>Let PowerPoint control the size and monitor of the presentations
+(This may fix PowerPoint scaling issues in Windows 8 and 10)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/presentations/lib/presentationtab.py" line="140"/>
+ <source>{name} (unavailable)</source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
</context>
<context>
@@ -7850,12 +10181,12 @@
<message>
<location filename="../../openlp/plugins/remotes/remoteplugin.py" line="121"/>
<source>Server Config Change</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/remotes/remoteplugin.py" line="121"/>
<source>Server configuration changes will require a restart to take effect.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -8026,27 +10357,27 @@
<message>
<location filename="../../openlp/plugins/remotes/lib/remotetab.py" line="189"/>
<source>Live view URL:</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/remotes/lib/remotetab.py" line="203"/>
<source>HTTPS Server</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/remotes/lib/remotetab.py" line="204"/>
<source>Could not find an SSL certificate. The HTTPS server will not be available unless an SSL certificate is found. Please see the manual for more information.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/remotes/lib/remotetab.py" line="211"/>
<source>User Authentication</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/remotes/lib/remotetab.py" line="212"/>
<source>User id:</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/remotes/lib/remotetab.py" line="213"/>
@@ -8056,22 +10387,92 @@
<message>
<location filename="../../openlp/plugins/remotes/lib/remotetab.py" line="191"/>
<source>Show thumbnails of non-text slides in remote and stage view.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/plugins/remotes/lib/remotetab.py" line="198"/>
- <source>iOS App</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/plugins/remotes/lib/remotetab.py" line="194"/>
- <source>Scan the QR code or click <a href="{qr}">download</a> to install the Android app from Google Play.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/plugins/remotes/lib/remotetab.py" line="199"/>
- <source>Scan the QR code or click <a href="{qr}">download</a> to install the iOS app from the App Store.</source>
- <translation type="unfinished"/>
+<<<<<<< TREE
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/remotes/lib/remotetab.py" line="198"/>
+ <source>iOS App</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/remotes/lib/remotetab.py" line="194"/>
+ <source>Scan the QR code or click <a href="{qr}">download</a> to install the Android app from Google Play.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/remotes/lib/remotetab.py" line="199"/>
+ <source>Scan the QR code or click <a href="{qr}">download</a> to install the iOS app from the App Store.</source>
+ <translation type="unfinished"/>
+=======
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/remotes/lib/remotetab.py" line="198"/>
+ <source>iOS App</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/remotes/lib/remotetab.py" line="194"/>
+ <source>Scan the QR code or click <a href="{qr}">download</a> to install the Android app from Google Play.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/remotes/lib/remotetab.py" line="199"/>
+ <source>Scan the QR code or click <a href="{qr}">download</a> to install the iOS app from the App Store.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>SongPlugin.ReportSongList</name>
+ <message>
+ <location filename="../../openlp/plugins/songs/reporting.py" line="45"/>
+ <source>Save File</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/reporting.py" line="45"/>
+ <source>song_extract.csv</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/reporting.py" line="45"/>
+ <source>CSV format (*.csv)</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/reporting.py" line="52"/>
+ <source>Output Path Not Selected</source>
+ <translation type="unfinished">Skryf Ligging Nie Gekies Nie</translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/reporting.py" line="52"/>
+ <source>You have not set a valid output location for your report.
+Please select an existing path on your computer.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/reporting.py" line="92"/>
+ <source>Report Creation</source>
+ <translation type="unfinished">Verslag Skepping</translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/reporting.py" line="92"/>
+ <source>Report
+{name}
+has been successfully created. </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/reporting.py" line="100"/>
+ <source>Song Extraction Failed</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/reporting.py" line="100"/>
+ <source>An error occurred while extracting: {error}</source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
</context>
<context>
@@ -8186,12 +10587,12 @@
<location filename="../../openlp/plugins/songusage/forms/songusagedeletedialog.py" line="67"/>
<source>Select the date up to which the song usage data should be deleted.
All data recorded before this date will be permanently deleted.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songusage/forms/songusagedeleteform.py" line="62"/>
<source>All requested data has been deleted successfully.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -8235,29 +10636,50 @@
<location filename="../../openlp/plugins/songusage/forms/songusagedetailform.py" line="77"/>
<source>You have not set a valid output location for your song usage report.
Please select an existing path on your computer.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songusage/forms/songusagedetailform.py" line="112"/>
<source>Report Creation Failed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/plugins/songusage/forms/songusagedetailform.py" line="84"/>
- <source>usage_detail_{old}_{new}.txt</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/plugins/songusage/forms/songusagedetailform.py" line="105"/>
- <source>Report
-{name}
-has been successfully created. </source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/plugins/songusage/forms/songusagedetailform.py" line="112"/>
- <source>An error occurred while creating the report: {error}</source>
- <translation type="unfinished"/>
+<<<<<<< TREE
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songusage/forms/songusagedetailform.py" line="84"/>
+ <source>usage_detail_{old}_{new}.txt</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songusage/forms/songusagedetailform.py" line="105"/>
+ <source>Report
+{name}
+has been successfully created. </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songusage/forms/songusagedetailform.py" line="112"/>
+ <source>An error occurred while creating the report: {error}</source>
+ <translation type="unfinished"/>
+=======
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songusage/forms/songusagedetailform.py" line="84"/>
+ <source>usage_detail_{old}_{new}.txt</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songusage/forms/songusagedetailform.py" line="105"/>
+ <source>Report
+{name}
+has been successfully created. </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songusage/forms/songusagedetailform.py" line="112"/>
+ <source>An error occurred while creating the report: {error}</source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
</context>
<context>
@@ -8273,102 +10695,118 @@
<translation>Voer liedere in deur van die invoer helper gebruik te maak.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/songs/songsplugin.py" line="221"/>
+=======
+ <location filename="../../openlp/plugins/songs/songsplugin.py" line="240"/>
+>>>>>>> MERGE-SOURCE
<source><strong>Songs Plugin</strong><br />The songs plugin provides the ability to display and manage songs.</source>
<translation><strong>Liedere Mini-program</strong><br/>Die liedere mini-program verskaf die vermoë om liedere te vertoon en te bestuur.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/songs/songsplugin.py" line="155"/>
+=======
+ <location filename="../../openlp/plugins/songs/songsplugin.py" line="160"/>
+>>>>>>> MERGE-SOURCE
<source>&Re-index Songs</source>
<translation>He&r-indeks Liedere</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/songs/songsplugin.py" line="155"/>
+=======
+ <location filename="../../openlp/plugins/songs/songsplugin.py" line="160"/>
+>>>>>>> MERGE-SOURCE
<source>Re-index the songs database to improve searching and ordering.</source>
<translation>Her-indeks die liedere databasis om lied-soektogte en organisering te verbeter.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/songs/songsplugin.py" line="176"/>
+=======
+ <location filename="../../openlp/plugins/songs/songsplugin.py" line="195"/>
+>>>>>>> MERGE-SOURCE
<source>Reindexing songs...</source>
<translation>Besig om liedere indek te herskep...</translation>
</message>
<message>
- <location filename="../../openlp/plugins/songs/lib/__init__.py" line="301"/>
+ <location filename="../../openlp/plugins/songs/lib/__init__.py" line="300"/>
<source>Arabic (CP-1256)</source>
<translation>Arabies (CP-1256)</translation>
</message>
<message>
- <location filename="../../openlp/plugins/songs/lib/__init__.py" line="302"/>
+ <location filename="../../openlp/plugins/songs/lib/__init__.py" line="301"/>
<source>Baltic (CP-1257)</source>
<translation>Balties (CP-1257)</translation>
</message>
<message>
- <location filename="../../openlp/plugins/songs/lib/__init__.py" line="303"/>
+ <location filename="../../openlp/plugins/songs/lib/__init__.py" line="302"/>
<source>Central European (CP-1250)</source>
<translation>Sentraal Europees (CP-1250)</translation>
</message>
<message>
- <location filename="../../openlp/plugins/songs/lib/__init__.py" line="304"/>
+ <location filename="../../openlp/plugins/songs/lib/__init__.py" line="303"/>
<source>Cyrillic (CP-1251)</source>
<translation>Cyrillies (CP-1251)</translation>
</message>
<message>
- <location filename="../../openlp/plugins/songs/lib/__init__.py" line="305"/>
+ <location filename="../../openlp/plugins/songs/lib/__init__.py" line="304"/>
<source>Greek (CP-1253)</source>
<translation>Grieks (CP-1253)</translation>
</message>
<message>
- <location filename="../../openlp/plugins/songs/lib/__init__.py" line="306"/>
+ <location filename="../../openlp/plugins/songs/lib/__init__.py" line="305"/>
<source>Hebrew (CP-1255)</source>
<translation>Hebreeus (CP-1255)</translation>
</message>
<message>
- <location filename="../../openlp/plugins/songs/lib/__init__.py" line="307"/>
+ <location filename="../../openlp/plugins/songs/lib/__init__.py" line="306"/>
<source>Japanese (CP-932)</source>
<translation>Japanees (CP-932)</translation>
</message>
<message>
- <location filename="../../openlp/plugins/songs/lib/__init__.py" line="308"/>
+ <location filename="../../openlp/plugins/songs/lib/__init__.py" line="307"/>
<source>Korean (CP-949)</source>
<translation>Koreaans (CP-949)</translation>
</message>
<message>
- <location filename="../../openlp/plugins/songs/lib/__init__.py" line="309"/>
+ <location filename="../../openlp/plugins/songs/lib/__init__.py" line="308"/>
<source>Simplified Chinese (CP-936)</source>
<translation>Vereenvoudigde Chinees (CP-936)</translation>
</message>
<message>
- <location filename="../../openlp/plugins/songs/lib/__init__.py" line="310"/>
+ <location filename="../../openlp/plugins/songs/lib/__init__.py" line="309"/>
<source>Thai (CP-874)</source>
<translation>Thai (CP-874)</translation>
</message>
<message>
- <location filename="../../openlp/plugins/songs/lib/__init__.py" line="311"/>
+ <location filename="../../openlp/plugins/songs/lib/__init__.py" line="310"/>
<source>Traditional Chinese (CP-950)</source>
<translation>Tradisionele Chinees (CP-950)</translation>
</message>
<message>
- <location filename="../../openlp/plugins/songs/lib/__init__.py" line="312"/>
+ <location filename="../../openlp/plugins/songs/lib/__init__.py" line="311"/>
<source>Turkish (CP-1254)</source>
<translation>Turks (CP-1254)</translation>
</message>
<message>
- <location filename="../../openlp/plugins/songs/lib/__init__.py" line="313"/>
+ <location filename="../../openlp/plugins/songs/lib/__init__.py" line="312"/>
<source>Vietnam (CP-1258)</source>
<translation>Viëtnamees (CP-1258)</translation>
</message>
<message>
- <location filename="../../openlp/plugins/songs/lib/__init__.py" line="314"/>
+ <location filename="../../openlp/plugins/songs/lib/__init__.py" line="313"/>
<source>Western European (CP-1252)</source>
<translation>Wes-Europees (CP-1252)</translation>
</message>
<message>
- <location filename="../../openlp/plugins/songs/lib/__init__.py" line="331"/>
+ <location filename="../../openlp/plugins/songs/lib/__init__.py" line="330"/>
<source>Character Encoding</source>
<translation>Karrakter Enkodering</translation>
</message>
<message>
- <location filename="../../openlp/plugins/songs/lib/__init__.py" line="323"/>
+ <location filename="../../openlp/plugins/songs/lib/__init__.py" line="322"/>
<source>The codepage setting is responsible
for the correct character representation.
Usually you are fine with the preselected choice.</source>
@@ -8378,26 +10816,38 @@
keuse voldoende.</translation>
</message>
<message>
- <location filename="../../openlp/plugins/songs/lib/__init__.py" line="331"/>
+ <location filename="../../openlp/plugins/songs/lib/__init__.py" line="330"/>
<source>Please choose the character encoding.
The encoding is responsible for the correct character representation.</source>
<translation>Kies asseblief die karrakter enkodering.
Die enkodering is verantwoordelik vir die korrekte karrakter voorstelling.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/songs/songsplugin.py" line="264"/>
+=======
+ <location filename="../../openlp/plugins/songs/songsplugin.py" line="283"/>
+>>>>>>> MERGE-SOURCE
<source>Song</source>
<comment>name singular</comment>
<translation>Lied</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/songs/songsplugin.py" line="265"/>
+=======
+ <location filename="../../openlp/plugins/songs/songsplugin.py" line="284"/>
+>>>>>>> MERGE-SOURCE
<source>Songs</source>
<comment>name plural</comment>
<translation>Liedere</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/songs/songsplugin.py" line="269"/>
+=======
+ <location filename="../../openlp/plugins/songs/songsplugin.py" line="288"/>
+>>>>>>> MERGE-SOURCE
<source>Songs</source>
<comment>container title</comment>
<translation>Liedere</translation>
@@ -8408,59 +10858,110 @@
<translation>Voer liedere uit deur gebruik te maak van die uitvoer gids.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/songs/songsplugin.py" line="275"/>
+=======
+ <location filename="../../openlp/plugins/songs/songsplugin.py" line="294"/>
+>>>>>>> MERGE-SOURCE
<source>Add a new song.</source>
<translation>Voeg 'n nuwe lied by.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/songs/songsplugin.py" line="276"/>
+=======
+ <location filename="../../openlp/plugins/songs/songsplugin.py" line="295"/>
+>>>>>>> MERGE-SOURCE
<source>Edit the selected song.</source>
<translation>Redigeer die geselekteerde lied.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/songs/songsplugin.py" line="277"/>
+=======
+ <location filename="../../openlp/plugins/songs/songsplugin.py" line="296"/>
+>>>>>>> MERGE-SOURCE
<source>Delete the selected song.</source>
<translation>Wis die geselekteerde lied uit.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/songs/songsplugin.py" line="278"/>
+=======
+ <location filename="../../openlp/plugins/songs/songsplugin.py" line="297"/>
+>>>>>>> MERGE-SOURCE
<source>Preview the selected song.</source>
<translation>Skou die geselekteerde lied.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/songs/songsplugin.py" line="279"/>
+=======
+ <location filename="../../openlp/plugins/songs/songsplugin.py" line="298"/>
+>>>>>>> MERGE-SOURCE
<source>Send the selected song live.</source>
<translation>Stuur die geselekteerde lied regstreeks.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/songs/songsplugin.py" line="280"/>
+=======
+ <location filename="../../openlp/plugins/songs/songsplugin.py" line="299"/>
+>>>>>>> MERGE-SOURCE
<source>Add the selected song to the service.</source>
<translation>Voeg die geselekteerde lied by die diens.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/songs/songsplugin.py" line="178"/>
+=======
+ <location filename="../../openlp/plugins/songs/songsplugin.py" line="197"/>
+>>>>>>> MERGE-SOURCE
<source>Reindexing songs</source>
<translation>Her-indekseer liedere</translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/songsplugin.py" line="127"/>
<source>CCLI SongSelect</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/songsplugin.py" line="127"/>
<source>Import songs from CCLI's SongSelect service.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/songs/songsplugin.py" line="162"/>
+=======
+ <location filename="../../openlp/plugins/songs/songsplugin.py" line="166"/>
+>>>>>>> MERGE-SOURCE
<source>Find &Duplicate Songs</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/songs/songsplugin.py" line="162"/>
+=======
+ <location filename="../../openlp/plugins/songs/songsplugin.py" line="166"/>
+>>>>>>> MERGE-SOURCE
<source>Find and remove duplicate songs in the song database.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/songsplugin.py" line="159"/>
+ <source>Songs</source>
+ <translation type="unfinished">Liedere</translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/songsplugin.py" line="171"/>
+ <source>Song List Report</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/songsplugin.py" line="171"/>
+ <source>Produce a CSV file of all the songs in the database.</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -8469,25 +10970,25 @@
<location filename="../../openlp/plugins/songs/lib/db.py" line="71"/>
<source>Words</source>
<comment>Author who wrote the lyrics of a song</comment>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/lib/db.py" line="72"/>
<source>Music</source>
<comment>Author who wrote the music of a song</comment>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/lib/db.py" line="73"/>
<source>Words and Music</source>
<comment>Author who wrote both lyrics and music of a song</comment>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/lib/db.py" line="75"/>
<source>Translation</source>
<comment>Author who translated the song</comment>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -8541,7 +11042,7 @@
<message>
<location filename="../../openlp/plugins/songs/lib/importers/dreambeam.py" line="100"/>
<source>Invalid DreamBeam song file. Missing DreamSong tag.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -8549,38 +11050,53 @@
<message>
<location filename="../../openlp/plugins/songs/lib/importers/easyworship.py" line="368"/>
<source>Unexpected data formatting.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/lib/importers/easyworship.py" line="373"/>
<source>No song text found.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/lib/importers/easyworship.py" line="413"/>
<source>
[above are Song Tags with notes imported from EasyWorship]</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/lib/importers/easyworship.py" line="203"/>
<source>This file does not exist.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/lib/importers/easyworship.py" line="207"/>
<source>Could not find the "Songs.MB" file. It must be in the same folder as the "Songs.DB" file.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/lib/importers/easyworship.py" line="223"/>
<source>This file is not a valid EasyWorship database.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/lib/importers/easyworship.py" line="252"/>
<source>Could not retrieve encoding.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/lib/importers/easyworship.py" line="314"/>
+ <source>Administered by {admin}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/lib/importers/easyworship.py" line="328"/>
+ <source>"{title}" could not be imported. {entry}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/lib/importers/easyworship.py" line="337"/>
+ <source>"{title}" could not be imported. {error}</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/lib/importers/easyworship.py" line="314"/>
@@ -8689,42 +11205,74 @@
<translation>Tema, Kopiereg Informasie && Kommentaar</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/songs/forms/editsongform.py" line="580"/>
+=======
+ <location filename="../../openlp/plugins/songs/forms/editsongform.py" line="579"/>
+>>>>>>> MERGE-SOURCE
<source>Add Author</source>
<translation>Voeg Skrywer By</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/songs/forms/editsongform.py" line="580"/>
+=======
+ <location filename="../../openlp/plugins/songs/forms/editsongform.py" line="579"/>
+>>>>>>> MERGE-SOURCE
<source>This author does not exist, do you want to add them?</source>
<translation>Hierdie skrywer bestaan nie, moet die skrywer bygevoeg word?</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/songs/forms/editsongform.py" line="601"/>
+=======
+ <location filename="../../openlp/plugins/songs/forms/editsongform.py" line="600"/>
+>>>>>>> MERGE-SOURCE
<source>This author is already in the list.</source>
<translation>Hierdie skrywer is alreeds in die lys.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/songs/forms/editsongform.py" line="607"/>
+=======
+ <location filename="../../openlp/plugins/songs/forms/editsongform.py" line="606"/>
+>>>>>>> MERGE-SOURCE
<source>You have not selected a valid author. Either select an author from the list, or type in a new author and click the "Add Author to Song" button to add the new author.</source>
<translation>Die geselekteerde skrywer is ongeldig. Kies 'n skrywer vanaf die lys of voer 'n nuwe skrywer in en kliek op die "Voeg Skrywer by Lied" knoppie om die skrywer by te voeg.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/songs/forms/editsongform.py" line="658"/>
+=======
+ <location filename="../../openlp/plugins/songs/forms/editsongform.py" line="657"/>
+>>>>>>> MERGE-SOURCE
<source>Add Topic</source>
<translation>Voeg Onderwerp by</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/songs/forms/editsongform.py" line="658"/>
+=======
+ <location filename="../../openlp/plugins/songs/forms/editsongform.py" line="657"/>
+>>>>>>> MERGE-SOURCE
<source>This topic does not exist, do you want to add it?</source>
<translation>Die onderwerp bestaan nie. Voeg dit by?</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/songs/forms/editsongform.py" line="676"/>
+=======
+ <location filename="../../openlp/plugins/songs/forms/editsongform.py" line="675"/>
+>>>>>>> MERGE-SOURCE
<source>This topic is already in the list.</source>
<translation>Die onderwerp is reeds in die lys.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/songs/forms/editsongform.py" line="684"/>
+=======
+ <location filename="../../openlp/plugins/songs/forms/editsongform.py" line="683"/>
+>>>>>>> MERGE-SOURCE
<source>You have not selected a valid topic. Either select a topic from the list, or type in a new topic and click the "Add Topic to Song" button to add the new topic.</source>
<translation>Geselekteerde onderwerp is ongeldig. Kies 'n onderwerp vanaf die lys of voer 'n nuwe onderwerp in en kliek die "Voeg Onderwerp by Lied" knoppie om die onderwerp by te voeg.</translation>
</message>
@@ -8764,7 +11312,11 @@
<translation>Verwyder &Alles</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/songs/forms/editsongform.py" line="929"/>
+=======
+ <location filename="../../openlp/plugins/songs/forms/editsongform.py" line="928"/>
+>>>>>>> MERGE-SOURCE
<source>Open File(s)</source>
<translation>Maak Lêer(s) Oop</translation>
</message>
@@ -8781,62 +11333,118 @@
<message>
<location filename="../../openlp/plugins/songs/forms/editsongform.py" line="205"/>
<source>Invalid Verse Order</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/forms/editsongdialog.py" line="315"/>
<source>&Edit Author Type</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/songs/forms/editsongform.py" line="631"/>
+=======
+ <location filename="../../openlp/plugins/songs/forms/editsongform.py" line="630"/>
+>>>>>>> MERGE-SOURCE
<source>Edit Author Type</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/songs/forms/editsongform.py" line="631"/>
+=======
+ <location filename="../../openlp/plugins/songs/forms/editsongform.py" line="630"/>
+>>>>>>> MERGE-SOURCE
<source>Choose type for this author</source>
+<<<<<<< TREE
<translation type="unfinished"/>
</message>
<message>
+=======
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+>>>>>>> MERGE-SOURCE
<location filename="../../openlp/plugins/songs/forms/editsongdialog.py" line="317"/>
<source>&Manage Authors, Topics, Songbooks</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/forms/editsongdialog.py" line="322"/>
<source>Add &to Song</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/forms/editsongdialog.py" line="323"/>
<source>Re&move</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/forms/editsongdialog.py" line="324"/>
<source>Authors, Topics && Songbooks</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/songs/forms/editsongform.py" line="703"/>
+=======
+ <location filename="../../openlp/plugins/songs/forms/editsongform.py" line="702"/>
+>>>>>>> MERGE-SOURCE
<source>Add Songbook</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/songs/forms/editsongform.py" line="703"/>
+=======
+ <location filename="../../openlp/plugins/songs/forms/editsongform.py" line="702"/>
+>>>>>>> MERGE-SOURCE
<source>This Songbook does not exist, do you want to add it?</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/songs/forms/editsongform.py" line="720"/>
+=======
+ <location filename="../../openlp/plugins/songs/forms/editsongform.py" line="719"/>
+>>>>>>> MERGE-SOURCE
<source>This Songbook is already in the list.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/songs/forms/editsongform.py" line="727"/>
+=======
+ <location filename="../../openlp/plugins/songs/forms/editsongform.py" line="726"/>
+>>>>>>> MERGE-SOURCE
<source>You have not selected a valid Songbook. Either select a Songbook from the list, or type in a new Songbook and click the "Add to Song" button to add the new Songbook.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/forms/editsongform.py" line="196"/>
+ <source>There are no verses corresponding to "{invalid}". Valid entries are {valid}.
+Please enter the verses separated by spaces.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/forms/editsongform.py" line="201"/>
+ <source>There is no verse corresponding to "{invalid}". Valid entries are {valid}.
+Please enter the verses separated by spaces.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/forms/editsongform.py" line="251"/>
+ <source>There are misplaced formatting tags in the following verses:
+
+{tag}
+
+Please correct these tags before continuing.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/forms/editsongform.py" line="260"/>
+ <source>You have {count} verses named {name} {number}. You can have at most 26 verses with the same name</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/forms/editsongform.py" line="196"/>
@@ -8968,7 +11576,7 @@
<message>
<location filename="../../openlp/plugins/songs/forms/songexportform.py" line="149"/>
<source>This wizard will help to export your songs to the open and free <strong>OpenLyrics </strong> worship song format.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -9147,105 +11755,146 @@
<message>
<location filename="../../openlp/plugins/songs/lib/importer.py" line="253"/>
<source>EasyWorship Service File</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/lib/importer.py" line="400"/>
<source>WorshipCenter Pro Song Files</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/lib/importer.py" line="402"/>
<source>The WorshipCenter Pro importer is only supported on Windows. It has been disabled due to a missing Python module. If you want to use this importer, you will need to install the "pyodbc" module.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/lib/importer.py" line="302"/>
<source>PowerPraise Song Files</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/lib/importer.py" line="316"/>
<source>PresentationManager Song Files</source>
+<<<<<<< TREE
<translation type="unfinished"/>
</message>
<message>
<location filename="../../openlp/plugins/songs/lib/importer.py" line="389"/>
+=======
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/lib/importer.py" line="389"/>
+>>>>>>> MERGE-SOURCE
<source>Worship Assistant Files</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/lib/importer.py" line="391"/>
<source>Worship Assistant (CSV)</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/lib/importer.py" line="392"/>
<source>In Worship Assistant, export your Database to a CSV file.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/lib/importer.py" line="202"/>
<source>OpenLyrics or OpenLP 2 Exported Song</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/lib/importer.py" line="209"/>
<source>OpenLP 2 Databases</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/lib/importer.py" line="267"/>
<source>LyriX Files</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/lib/importer.py" line="268"/>
<source>LyriX (Exported TXT-files)</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/lib/importer.py" line="371"/>
<source>VideoPsalm Files</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/lib/importer.py" line="372"/>
<source>VideoPsalm</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/plugins/songs/lib/importer.py" line="292"/>
- <source>OPS Pro database</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/plugins/songs/lib/importer.py" line="293"/>
- <source>The OPS Pro importer is only supported on Windows. It has been disabled due to a missing Python module. If you want to use this importer, you will need to install the "pyodbc" module.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/plugins/songs/lib/importer.py" line="323"/>
- <source>ProPresenter Song Files</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/plugins/songs/lib/importer.py" line="373"/>
- <source>The VideoPsalm songbooks are normally located in {path}</source>
- <translation type="unfinished"/>
+<<<<<<< TREE
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/lib/importer.py" line="292"/>
+ <source>OPS Pro database</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/lib/importer.py" line="293"/>
+ <source>The OPS Pro importer is only supported on Windows. It has been disabled due to a missing Python module. If you want to use this importer, you will need to install the "pyodbc" module.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/lib/importer.py" line="323"/>
+ <source>ProPresenter Song Files</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/lib/importer.py" line="373"/>
+ <source>The VideoPsalm songbooks are normally located in {path}</source>
+ <translation type="unfinished"/>
+=======
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/lib/importer.py" line="292"/>
+ <source>OPS Pro database</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/lib/importer.py" line="293"/>
+ <source>The OPS Pro importer is only supported on Windows. It has been disabled due to a missing Python module. If you want to use this importer, you will need to install the "pyodbc" module.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/lib/importer.py" line="323"/>
+ <source>ProPresenter Song Files</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/lib/importer.py" line="373"/>
+ <source>The VideoPsalm songbooks are normally located in {path}</source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
</context>
<context>
<name>SongsPlugin.LyrixImport</name>
<message>
<location filename="../../openlp/plugins/songs/lib/importers/lyrix.py" line="109"/>
- <source>File {name}</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/plugins/songs/lib/importers/lyrix.py" line="109"/>
- <source>Error: {error}</source>
- <translation type="unfinished"/>
+<<<<<<< TREE
+ <source>File {name}</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/lib/importers/lyrix.py" line="109"/>
+ <source>Error: {error}</source>
+ <translation type="unfinished"/>
+=======
+ <source>File {name}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/lib/importers/lyrix.py" line="109"/>
+ <source>Error: {error}</source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
</context>
<context>
@@ -9274,7 +11923,11 @@
<translation>Lirieke</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/songs/lib/mediaitem.py" line="673"/>
+=======
+ <location filename="../../openlp/plugins/songs/lib/mediaitem.py" line="667"/>
+>>>>>>> MERGE-SOURCE
<source>CCLI License: </source>
<translation>CCLI Lisensie:</translation>
</message>
@@ -9289,7 +11942,11 @@
<translation>Onderhou die lys van skrywers, onderwerpe en boeke.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/songs/lib/mediaitem.py" line="532"/>
+=======
+ <location filename="../../openlp/plugins/songs/lib/mediaitem.py" line="526"/>
+>>>>>>> MERGE-SOURCE
<source>copy</source>
<comment>For song cloning</comment>
<translation>kopieër</translation>
@@ -9317,7 +11974,37 @@
<message>
<location filename="../../openlp/plugins/songs/lib/mediaitem.py" line="145"/>
<source>Search Songbooks...</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/lib/mediaitem.py" line="145"/>
+ <source>Search Topics...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/lib/mediaitem.py" line="145"/>
+ <source>Copyright</source>
+ <translation>Kopiereg</translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/lib/mediaitem.py" line="145"/>
+ <source>Search Copyright...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/lib/mediaitem.py" line="145"/>
+ <source>CCLI number</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/lib/mediaitem.py" line="145"/>
+ <source>Search CCLI number...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/lib/mediaitem.py" line="497"/>
+ <source>Are you sure you want to delete the "{items:d}" selected song(s)?</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/lib/mediaitem.py" line="145"/>
@@ -9359,32 +12046,54 @@
</message>
</context>
<context>
- <name>SongsPlugin.OPSProImport</name>
- <message>
- <location filename="../../openlp/plugins/songs/lib/importers/opspro.py" line="64"/>
- <source>Unable to connect the OPS Pro database.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/plugins/songs/lib/importers/opspro.py" line="86"/>
- <source>"{title}" could not be imported. {error}</source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
+<<<<<<< TREE
+ <name>SongsPlugin.OPSProImport</name>
+ <message>
+ <location filename="../../openlp/plugins/songs/lib/importers/opspro.py" line="64"/>
+ <source>Unable to connect the OPS Pro database.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/lib/importers/opspro.py" line="86"/>
+ <source>"{title}" could not be imported. {error}</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+=======
+ <name>SongsPlugin.OPSProImport</name>
+ <message>
+ <location filename="../../openlp/plugins/songs/lib/importers/opspro.py" line="64"/>
+ <source>Unable to connect the OPS Pro database.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/lib/importers/opspro.py" line="86"/>
+ <source>"{title}" could not be imported. {error}</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+>>>>>>> MERGE-SOURCE
<name>SongsPlugin.OpenLPSongImport</name>
<message>
<location filename="../../openlp/plugins/songs/lib/importers/openlp.py" line="102"/>
<source>Not a valid OpenLP 2 song database.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
<name>SongsPlugin.OpenLyricsExport</name>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/songs/lib/openlyricsexport.py" line="63"/>
<source>Exporting "{title}"...</source>
<translation type="unfinished"/>
+=======
+ <location filename="../../openlp/plugins/songs/lib/openlyricsexport.py" line="63"/>
+ <source>Exporting "{title}"...</source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
</context>
<context>
@@ -9392,7 +12101,7 @@
<message>
<location filename="../../openlp/plugins/songs/lib/importers/opensong.py" line="139"/>
<source>Invalid OpenSong song file. Missing song tag.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -9409,31 +12118,59 @@
</message>
<message>
<location filename="../../openlp/plugins/songs/lib/importers/powersong.py" line="99"/>
+<<<<<<< TREE
<source>No {text} files found.</source>
<translation type="unfinished"/>
+=======
+ <source>No {text} files found.</source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
<message>
<location filename="../../openlp/plugins/songs/lib/importers/powersong.py" line="117"/>
+<<<<<<< TREE
<source>Invalid {text} file. Unexpected byte value.</source>
<translation type="unfinished"/>
+=======
+ <source>Invalid {text} file. Unexpected byte value.</source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
<message>
<location filename="../../openlp/plugins/songs/lib/importers/powersong.py" line="135"/>
- <source>Invalid {text} file. Missing "TITLE" header.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/plugins/songs/lib/importers/powersong.py" line="141"/>
- <source>Invalid {text} file. Missing "COPYRIGHTLINE" header.</source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
- <name>SongsPlugin.PresentationManagerImport</name>
- <message>
- <location filename="../../openlp/plugins/songs/lib/importers/presentationmanager.py" line="63"/>
- <source>File is not in XML-format, which is the only format supported.</source>
- <translation type="unfinished"/>
+<<<<<<< TREE
+ <source>Invalid {text} file. Missing "TITLE" header.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/lib/importers/powersong.py" line="141"/>
+ <source>Invalid {text} file. Missing "COPYRIGHTLINE" header.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>SongsPlugin.PresentationManagerImport</name>
+ <message>
+ <location filename="../../openlp/plugins/songs/lib/importers/presentationmanager.py" line="63"/>
+ <source>File is not in XML-format, which is the only format supported.</source>
+ <translation type="unfinished"/>
+=======
+ <source>Invalid {text} file. Missing "TITLE" header.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/lib/importers/powersong.py" line="141"/>
+ <source>Invalid {text} file. Missing "COPYRIGHTLINE" header.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>SongsPlugin.PresentationManagerImport</name>
+ <message>
+ <location filename="../../openlp/plugins/songs/lib/importers/presentationmanager.py" line="63"/>
+ <source>File is not in XML-format, which is the only format supported.</source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
</context>
<context>
@@ -9456,7 +12193,7 @@
<message>
<location filename="../../openlp/plugins/songs/forms/songbookdialog.py" line="66"/>
<source>Songbook Maintenance</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -9472,9 +12209,15 @@
<translation>Uitvoer voltooi. Om hierdie lêers in te voer, gebruik die <strong>OpenLyrics</strong> invoerder.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/songs/forms/songexportform.py" line="260"/>
<source>Your song export failed because this error occurred: {error}</source>
<translation type="unfinished"/>
+=======
+ <location filename="../../openlp/plugins/songs/forms/songexportform.py" line="260"/>
+ <source>Your song export failed because this error occurred: {error}</source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
</context>
<context>
@@ -9598,19 +12341,35 @@
<translation>Die boek kan nie uitgewis word nie, omdat dit aan ten minste een lied toegeken is.</translation>
</message>
<message>
- <location filename="../../openlp/plugins/songs/forms/songmaintenanceform.py" line="314"/>
- <source>The author {original} already exists. Would you like to make songs with author {new} use the existing author {original}?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/plugins/songs/forms/songmaintenanceform.py" line="350"/>
- <source>The topic {original} already exists. Would you like to make songs with topic {new} use the existing topic {original}?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/plugins/songs/forms/songmaintenanceform.py" line="390"/>
- <source>The book {original} already exists. Would you like to make songs with book {new} use the existing book {original}?</source>
- <translation type="unfinished"/>
+<<<<<<< TREE
+ <location filename="../../openlp/plugins/songs/forms/songmaintenanceform.py" line="314"/>
+ <source>The author {original} already exists. Would you like to make songs with author {new} use the existing author {original}?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/forms/songmaintenanceform.py" line="350"/>
+ <source>The topic {original} already exists. Would you like to make songs with topic {new} use the existing topic {original}?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/forms/songmaintenanceform.py" line="390"/>
+ <source>The book {original} already exists. Would you like to make songs with book {new} use the existing book {original}?</source>
+ <translation type="unfinished"/>
+=======
+ <location filename="../../openlp/plugins/songs/forms/songmaintenanceform.py" line="314"/>
+ <source>The author {original} already exists. Would you like to make songs with author {new} use the existing author {original}?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/forms/songmaintenanceform.py" line="350"/>
+ <source>The topic {original} already exists. Would you like to make songs with topic {new} use the existing topic {original}?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/forms/songmaintenanceform.py" line="390"/>
+ <source>The book {original} already exists. Would you like to make songs with book {new} use the existing book {original}?</source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
</context>
<context>
@@ -9618,12 +12377,12 @@
<message>
<location filename="../../openlp/plugins/songs/forms/songselectdialog.py" line="233"/>
<source>CCLI SongSelect Importer</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/forms/songselectdialog.py" line="234"/>
<source><strong>Note:</strong> An Internet connection is required in order to import songs from CCLI SongSelect.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/forms/songselectdialog.py" line="238"/>
@@ -9638,17 +12397,17 @@
<message>
<location filename="../../openlp/plugins/songs/forms/songselectdialog.py" line="240"/>
<source>Save username and password</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/forms/songselectdialog.py" line="241"/>
<source>Login</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/forms/songselectdialog.py" line="242"/>
<source>Search Text:</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/forms/songselectdialog.py" line="243"/>
@@ -9658,9 +12417,15 @@
<message>
<location filename="../../openlp/plugins/songs/forms/songselectdialog.py" line="247"/>
<source>Logout</source>
+<<<<<<< TREE
<translation type="unfinished"/>
</message>
<message>
+=======
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+>>>>>>> MERGE-SOURCE
<location filename="../../openlp/plugins/songs/forms/songselectdialog.py" line="248"/>
<source>View</source>
<translation>Vertoon</translation>
@@ -9673,9 +12438,15 @@
<message>
<location filename="../../openlp/plugins/songs/forms/songselectdialog.py" line="250"/>
<source>Author(s):</source>
+<<<<<<< TREE
<translation type="unfinished"/>
</message>
<message>
+=======
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+>>>>>>> MERGE-SOURCE
<location filename="../../openlp/plugins/songs/forms/songselectdialog.py" line="251"/>
<source>Copyright:</source>
<translation>Kopiereg:</translation>
@@ -9683,12 +12454,12 @@
<message>
<location filename="../../openlp/plugins/songs/forms/songselectdialog.py" line="252"/>
<source>CCLI Number:</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/forms/songselectdialog.py" line="253"/>
<source>Lyrics:</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/forms/songselectdialog.py" line="254"/>
@@ -9703,62 +12474,67 @@
<message>
<location filename="../../openlp/plugins/songs/forms/songselectform.py" line="61"/>
<source>More than 1000 results</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/forms/songselectform.py" line="61"/>
<source>Your search has returned more than 1000 results, it has been stopped. Please refine your search to fetch better results.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/forms/songselectform.py" line="142"/>
<source>Logging out...</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/forms/songselectform.py" line="246"/>
<source>Save Username and Password</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/forms/songselectform.py" line="246"/>
<source>WARNING: Saving your username and password is INSECURE, your password is stored in PLAIN TEXT. Click Yes to save your password or No to cancel this.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/forms/songselectform.py" line="271"/>
<source>Error Logging In</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/forms/songselectform.py" line="271"/>
<source>There was a problem logging in, perhaps your username or password is incorrect?</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/forms/songselectform.py" line="396"/>
<source>Song Imported</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/forms/songselectform.py" line="205"/>
<source>Incomplete song</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/forms/songselectform.py" line="205"/>
<source>This song is missing some information, like the lyrics, and cannot be imported.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/forms/songselectform.py" line="396"/>
<source>Your song has been imported, would you like to import more songs?</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/forms/songselectdialog.py" line="244"/>
<source>Stop</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/forms/songselectform.py" line="347"/>
+ <source>Found {count:d} song(s)</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/forms/songselectform.py" line="347"/>
@@ -9781,7 +12557,17 @@
<message>
<location filename="../../openlp/plugins/songs/lib/songstab.py" line="75"/>
<source>Display songbook in footer</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/lib/songstab.py" line="70"/>
+ <source>Enable "Go to verse" button in Live panel</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/lib/songstab.py" line="73"/>
+ <source>Import missing songs from Service files</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/lib/songstab.py" line="70"/>
@@ -9795,8 +12581,13 @@
</message>
<message>
<location filename="../../openlp/plugins/songs/lib/songstab.py" line="76"/>
+<<<<<<< TREE
<source>Display "{symbol}" symbol before copyright info</source>
<translation type="unfinished"/>
+=======
+ <source>Display "{symbol}" symbol before copyright info</source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
</context>
<context>
@@ -9820,37 +12611,66 @@
<context>
<name>SongsPlugin.VerseType</name>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/songs/lib/__init__.py" line="149"/>
<source>Verse</source>
<translation>Vers</translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/lib/__init__.py" line="150"/>
+=======
+ <location filename="../../openlp/plugins/songs/lib/__init__.py" line="148"/>
+ <source>Verse</source>
+ <translation>Vers</translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/lib/__init__.py" line="149"/>
+>>>>>>> MERGE-SOURCE
<source>Chorus</source>
<translation>Koor</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/songs/lib/__init__.py" line="151"/>
+=======
+ <location filename="../../openlp/plugins/songs/lib/__init__.py" line="150"/>
+>>>>>>> MERGE-SOURCE
<source>Bridge</source>
<translation>Brug</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/songs/lib/__init__.py" line="152"/>
+=======
+ <location filename="../../openlp/plugins/songs/lib/__init__.py" line="151"/>
+>>>>>>> MERGE-SOURCE
<source>Pre-Chorus</source>
<translation>Voor-Refrein</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/songs/lib/__init__.py" line="153"/>
+=======
+ <location filename="../../openlp/plugins/songs/lib/__init__.py" line="152"/>
+>>>>>>> MERGE-SOURCE
<source>Intro</source>
<translation>Inleiding</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/songs/lib/__init__.py" line="154"/>
+=======
+ <location filename="../../openlp/plugins/songs/lib/__init__.py" line="153"/>
+>>>>>>> MERGE-SOURCE
<source>Ending</source>
<translation>Slot</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/songs/lib/__init__.py" line="155"/>
+=======
+ <location filename="../../openlp/plugins/songs/lib/__init__.py" line="154"/>
+>>>>>>> MERGE-SOURCE
<source>Other</source>
<translation>Ander</translation>
</message>
@@ -9858,22 +12678,38 @@
<context>
<name>SongsPlugin.VideoPsalmImport</name>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/songs/lib/importers/videopsalm.py" line="129"/>
<source>Error: {error}</source>
<translation type="unfinished"/>
+=======
+ <location filename="../../openlp/plugins/songs/lib/importers/videopsalm.py" line="129"/>
+ <source>Error: {error}</source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
</context>
<context>
<name>SongsPlugin.WordsofWorshipSongImport</name>
<message>
<location filename="../../openlp/plugins/songs/lib/importers/wordsofworship.py" line="109"/>
+<<<<<<< TREE
<source>Invalid Words of Worship song file. Missing "{text}" header.</source>
<translation type="unfinished"/>
+=======
+ <source>Invalid Words of Worship song file. Missing "{text}" header.</source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
<message>
<location filename="../../openlp/plugins/songs/lib/importers/wordsofworship.py" line="119"/>
+<<<<<<< TREE
<source>Invalid Words of Worship song file. Missing "{text}" string.</source>
<translation type="unfinished"/>
+=======
+ <source>Invalid Words of Worship song file. Missing "{text}" string.</source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
</context>
<context>
@@ -9884,32 +12720,56 @@
<translation>Probleem om CSV lêer te lees.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/songs/lib/importers/worshipassistant.py" line="130"/>
<source>File not valid WorshipAssistant CSV format.</source>
<translation type="unfinished"/>
</message>
<message>
+=======
+ <location filename="../../openlp/plugins/songs/lib/importers/worshipassistant.py" line="130"/>
+ <source>File not valid WorshipAssistant CSV format.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+>>>>>>> MERGE-SOURCE
<location filename="../../openlp/plugins/songs/lib/importers/worshipassistant.py" line="93"/>
- <source>Line {number:d}: {error}</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/plugins/songs/lib/importers/worshipassistant.py" line="187"/>
- <source>Record {count:d}</source>
- <translation type="unfinished"/>
+<<<<<<< TREE
+ <source>Line {number:d}: {error}</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/lib/importers/worshipassistant.py" line="187"/>
+ <source>Record {count:d}</source>
+ <translation type="unfinished"/>
+=======
+ <source>Line {number:d}: {error}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/lib/importers/worshipassistant.py" line="187"/>
+ <source>Record {count:d}</source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
<message>
<location filename="../../openlp/plugins/songs/lib/importers/worshipassistant.py" line="125"/>
+<<<<<<< TREE
<source>Decoding error: {error}</source>
<translation type="unfinished"/>
</message>
+=======
+ <source>Decoding error: {error}</source>
+ <translation type="unfinished"></translation>
+ </message>
+>>>>>>> MERGE-SOURCE
</context>
<context>
<name>SongsPlugin.WorshipCenterProImport</name>
<message>
<location filename="../../openlp/plugins/songs/lib/importers/worshipcenterpro.py" line="58"/>
<source>Unable to connect the WorshipCenter Pro database.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -9929,984 +12789,1941 @@
<source>Record %d</source>
<translation>Opname %d</translation>
</message>
- <message>
- <location filename="../../openlp/plugins/songs/lib/importers/zionworx.py" line="86"/>
- <source>Line {number:d}: {error}</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/plugins/songs/lib/importers/zionworx.py" line="105"/>
- <source>Record {index}</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/plugins/songs/lib/importers/zionworx.py" line="105"/>
- <source>Decoding error: {error}</source>
- <translation type="unfinished"/>
- </message>
+<<<<<<< TREE
+ <message>
+ <location filename="../../openlp/plugins/songs/lib/importers/zionworx.py" line="86"/>
+ <source>Line {number:d}: {error}</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/lib/importers/zionworx.py" line="105"/>
+ <source>Record {index}</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/lib/importers/zionworx.py" line="105"/>
+ <source>Decoding error: {error}</source>
+ <translation type="unfinished"/>
+ </message>
+=======
+ <message>
+ <location filename="../../openlp/plugins/songs/lib/importers/zionworx.py" line="86"/>
+ <source>Line {number:d}: {error}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/lib/importers/zionworx.py" line="105"/>
+ <source>Record {index}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/lib/importers/zionworx.py" line="105"/>
+ <source>Decoding error: {error}</source>
+ <translation type="unfinished"></translation>
+ </message>
+>>>>>>> MERGE-SOURCE
</context>
<context>
<name>Wizard</name>
<message>
<location filename="../../openlp/plugins/songs/forms/duplicatesongremovalform.py" line="132"/>
<source>Wizard</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/forms/duplicatesongremovalform.py" line="136"/>
<source>This wizard will help you to remove duplicate songs from the song database. You will have a chance to review every potential duplicate song before it is deleted. So no songs will be deleted without your explicit approval.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/forms/duplicatesongremovalform.py" line="141"/>
<source>Searching for duplicate songs.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/forms/duplicatesongremovalform.py" line="142"/>
<source>Please wait while your songs database is analyzed.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/forms/duplicatesongremovalform.py" line="144"/>
<source>Here you can decide which songs to remove and which ones to keep.</source>
+<<<<<<< TREE
<translation type="unfinished"/>
</message>
<message>
<location filename="../../openlp/plugins/songs/forms/duplicatesongremovalform.py" line="217"/>
+=======
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/forms/duplicatesongremovalform.py" line="217"/>
+>>>>>>> MERGE-SOURCE
<source>Information</source>
<translation>Informasie</translation>
</message>
<message>
<location filename="../../openlp/plugins/songs/forms/duplicatesongremovalform.py" line="217"/>
<source>No duplicate songs have been found in the database.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/plugins/songs/forms/duplicatesongremovalform.py" line="151"/>
- <source>Review duplicate songs ({current}/{total})</source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
- <name>common.languages</name>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>(Afan) Oromo</source>
- <comment>Language code: om</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Abkhazian</source>
- <comment>Language code: ab</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Afar</source>
- <comment>Language code: aa</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Afrikaans</source>
- <comment>Language code: af</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Albanian</source>
- <comment>Language code: sq</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Amharic</source>
- <comment>Language code: am</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Amuzgo</source>
- <comment>Language code: amu</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Ancient Greek</source>
- <comment>Language code: grc</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Arabic</source>
- <comment>Language code: ar</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Armenian</source>
- <comment>Language code: hy</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Assamese</source>
- <comment>Language code: as</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Aymara</source>
- <comment>Language code: ay</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Azerbaijani</source>
- <comment>Language code: az</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Bashkir</source>
- <comment>Language code: ba</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Basque</source>
- <comment>Language code: eu</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Bengali</source>
- <comment>Language code: bn</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Bhutani</source>
- <comment>Language code: dz</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Bihari</source>
- <comment>Language code: bh</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Bislama</source>
- <comment>Language code: bi</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Breton</source>
- <comment>Language code: br</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Bulgarian</source>
- <comment>Language code: bg</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Burmese</source>
- <comment>Language code: my</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Byelorussian</source>
- <comment>Language code: be</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Cakchiquel</source>
- <comment>Language code: cak</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Cambodian</source>
- <comment>Language code: km</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Catalan</source>
- <comment>Language code: ca</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Chinese</source>
- <comment>Language code: zh</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Comaltepec Chinantec</source>
- <comment>Language code: cco</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Corsican</source>
- <comment>Language code: co</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Croatian</source>
- <comment>Language code: hr</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Czech</source>
- <comment>Language code: cs</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Danish</source>
- <comment>Language code: da</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Dutch</source>
- <comment>Language code: nl</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>English</source>
- <comment>Language code: en</comment>
- <translation>Engels</translation>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Esperanto</source>
- <comment>Language code: eo</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Estonian</source>
- <comment>Language code: et</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Faeroese</source>
- <comment>Language code: fo</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Fiji</source>
- <comment>Language code: fj</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Finnish</source>
- <comment>Language code: fi</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>French</source>
- <comment>Language code: fr</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Frisian</source>
- <comment>Language code: fy</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Galician</source>
- <comment>Language code: gl</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Georgian</source>
- <comment>Language code: ka</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>German</source>
- <comment>Language code: de</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Greek</source>
- <comment>Language code: el</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Greenlandic</source>
- <comment>Language code: kl</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Guarani</source>
- <comment>Language code: gn</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Gujarati</source>
- <comment>Language code: gu</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Haitian Creole</source>
- <comment>Language code: ht</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Hausa</source>
- <comment>Language code: ha</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Hebrew (former iw)</source>
- <comment>Language code: he</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Hiligaynon</source>
- <comment>Language code: hil</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Hindi</source>
- <comment>Language code: hi</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Hungarian</source>
- <comment>Language code: hu</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Icelandic</source>
- <comment>Language code: is</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Indonesian (former in)</source>
- <comment>Language code: id</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Interlingua</source>
- <comment>Language code: ia</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Interlingue</source>
- <comment>Language code: ie</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Inuktitut (Eskimo)</source>
- <comment>Language code: iu</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Inupiak</source>
- <comment>Language code: ik</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Irish</source>
- <comment>Language code: ga</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Italian</source>
- <comment>Language code: it</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Jakalteko</source>
- <comment>Language code: jac</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Japanese</source>
- <comment>Language code: ja</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Javanese</source>
- <comment>Language code: jw</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>K'iche'</source>
- <comment>Language code: quc</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Kannada</source>
- <comment>Language code: kn</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Kashmiri</source>
- <comment>Language code: ks</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Kazakh</source>
- <comment>Language code: kk</comment>
- <translation type="unfinished"/>
- </message>
- <message encoding="UTF-8">
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Kekchí </source>
- <comment>Language code: kek</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Kinyarwanda</source>
- <comment>Language code: rw</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Kirghiz</source>
- <comment>Language code: ky</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Kirundi</source>
- <comment>Language code: rn</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Korean</source>
- <comment>Language code: ko</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Kurdish</source>
- <comment>Language code: ku</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Laothian</source>
- <comment>Language code: lo</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Latin</source>
- <comment>Language code: la</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Latvian, Lettish</source>
- <comment>Language code: lv</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Lingala</source>
- <comment>Language code: ln</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Lithuanian</source>
- <comment>Language code: lt</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Macedonian</source>
- <comment>Language code: mk</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Malagasy</source>
- <comment>Language code: mg</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Malay</source>
- <comment>Language code: ms</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Malayalam</source>
- <comment>Language code: ml</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Maltese</source>
- <comment>Language code: mt</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Mam</source>
- <comment>Language code: mam</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Maori</source>
- <comment>Language code: mi</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Maori</source>
- <comment>Language code: mri</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Marathi</source>
- <comment>Language code: mr</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Moldavian</source>
- <comment>Language code: mo</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Mongolian</source>
- <comment>Language code: mn</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Nahuatl</source>
- <comment>Language code: nah</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Nauru</source>
- <comment>Language code: na</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Nepali</source>
- <comment>Language code: ne</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Norwegian</source>
- <comment>Language code: no</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Occitan</source>
- <comment>Language code: oc</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Oriya</source>
- <comment>Language code: or</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Pashto, Pushto</source>
- <comment>Language code: ps</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Persian</source>
- <comment>Language code: fa</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Plautdietsch</source>
- <comment>Language code: pdt</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Polish</source>
- <comment>Language code: pl</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Portuguese</source>
- <comment>Language code: pt</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Punjabi</source>
- <comment>Language code: pa</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Quechua</source>
- <comment>Language code: qu</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Rhaeto-Romance</source>
- <comment>Language code: rm</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Romanian</source>
- <comment>Language code: ro</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Russian</source>
- <comment>Language code: ru</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Samoan</source>
- <comment>Language code: sm</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Sangro</source>
- <comment>Language code: sg</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Sanskrit</source>
- <comment>Language code: sa</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Scots Gaelic</source>
- <comment>Language code: gd</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Serbian</source>
- <comment>Language code: sr</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Serbo-Croatian</source>
- <comment>Language code: sh</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Sesotho</source>
- <comment>Language code: st</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Setswana</source>
- <comment>Language code: tn</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Shona</source>
- <comment>Language code: sn</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Sindhi</source>
- <comment>Language code: sd</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Singhalese</source>
- <comment>Language code: si</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Siswati</source>
- <comment>Language code: ss</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Slovak</source>
- <comment>Language code: sk</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Slovenian</source>
- <comment>Language code: sl</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Somali</source>
- <comment>Language code: so</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Spanish</source>
- <comment>Language code: es</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Sudanese</source>
- <comment>Language code: su</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Swahili</source>
- <comment>Language code: sw</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Swedish</source>
- <comment>Language code: sv</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Tagalog</source>
- <comment>Language code: tl</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Tajik</source>
- <comment>Language code: tg</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Tamil</source>
- <comment>Language code: ta</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Tatar</source>
- <comment>Language code: tt</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Tegulu</source>
- <comment>Language code: te</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Thai</source>
- <comment>Language code: th</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Tibetan</source>
- <comment>Language code: bo</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Tigrinya</source>
- <comment>Language code: ti</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Tonga</source>
- <comment>Language code: to</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Tsonga</source>
- <comment>Language code: ts</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Turkish</source>
- <comment>Language code: tr</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Turkmen</source>
- <comment>Language code: tk</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Twi</source>
- <comment>Language code: tw</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Uigur</source>
- <comment>Language code: ug</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Ukrainian</source>
- <comment>Language code: uk</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Urdu</source>
- <comment>Language code: ur</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Uspanteco</source>
- <comment>Language code: usp</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Uzbek</source>
- <comment>Language code: uz</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Vietnamese</source>
- <comment>Language code: vi</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Volapuk</source>
- <comment>Language code: vo</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Welch</source>
- <comment>Language code: cy</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Wolof</source>
- <comment>Language code: wo</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Xhosa</source>
- <comment>Language code: xh</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Yiddish (former ji)</source>
- <comment>Language code: yi</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Yoruba</source>
- <comment>Language code: yo</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Zhuang</source>
- <comment>Language code: za</comment>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/common/languages.py" line="31"/>
- <source>Zulu</source>
- <comment>Language code: zu</comment>
- <translation type="unfinished"/>
- </message>
-</context>
-</TS>
\ No newline at end of file
+<<<<<<< TREE
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/forms/duplicatesongremovalform.py" line="151"/>
+ <source>Review duplicate songs ({current}/{total})</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>common.languages</name>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>(Afan) Oromo</source>
+ <comment>Language code: om</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Abkhazian</source>
+ <comment>Language code: ab</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Afar</source>
+ <comment>Language code: aa</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Afrikaans</source>
+ <comment>Language code: af</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Albanian</source>
+ <comment>Language code: sq</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Amharic</source>
+ <comment>Language code: am</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Amuzgo</source>
+ <comment>Language code: amu</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Ancient Greek</source>
+ <comment>Language code: grc</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Arabic</source>
+ <comment>Language code: ar</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Armenian</source>
+ <comment>Language code: hy</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Assamese</source>
+ <comment>Language code: as</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Aymara</source>
+ <comment>Language code: ay</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Azerbaijani</source>
+ <comment>Language code: az</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Bashkir</source>
+ <comment>Language code: ba</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Basque</source>
+ <comment>Language code: eu</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Bengali</source>
+ <comment>Language code: bn</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Bhutani</source>
+ <comment>Language code: dz</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Bihari</source>
+ <comment>Language code: bh</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Bislama</source>
+ <comment>Language code: bi</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Breton</source>
+ <comment>Language code: br</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Bulgarian</source>
+ <comment>Language code: bg</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Burmese</source>
+ <comment>Language code: my</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Byelorussian</source>
+ <comment>Language code: be</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Cakchiquel</source>
+ <comment>Language code: cak</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Cambodian</source>
+ <comment>Language code: km</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Catalan</source>
+ <comment>Language code: ca</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Chinese</source>
+ <comment>Language code: zh</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Comaltepec Chinantec</source>
+ <comment>Language code: cco</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Corsican</source>
+ <comment>Language code: co</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Croatian</source>
+ <comment>Language code: hr</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Czech</source>
+ <comment>Language code: cs</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Danish</source>
+ <comment>Language code: da</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Dutch</source>
+ <comment>Language code: nl</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>English</source>
+ <comment>Language code: en</comment>
+ <translation>Engels</translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Esperanto</source>
+ <comment>Language code: eo</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Estonian</source>
+ <comment>Language code: et</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Faeroese</source>
+ <comment>Language code: fo</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Fiji</source>
+ <comment>Language code: fj</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Finnish</source>
+ <comment>Language code: fi</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>French</source>
+ <comment>Language code: fr</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Frisian</source>
+ <comment>Language code: fy</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Galician</source>
+ <comment>Language code: gl</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Georgian</source>
+ <comment>Language code: ka</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>German</source>
+ <comment>Language code: de</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Greek</source>
+ <comment>Language code: el</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Greenlandic</source>
+ <comment>Language code: kl</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Guarani</source>
+ <comment>Language code: gn</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Gujarati</source>
+ <comment>Language code: gu</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Haitian Creole</source>
+ <comment>Language code: ht</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Hausa</source>
+ <comment>Language code: ha</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Hebrew (former iw)</source>
+ <comment>Language code: he</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Hiligaynon</source>
+ <comment>Language code: hil</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Hindi</source>
+ <comment>Language code: hi</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Hungarian</source>
+ <comment>Language code: hu</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Icelandic</source>
+ <comment>Language code: is</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Indonesian (former in)</source>
+ <comment>Language code: id</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Interlingua</source>
+ <comment>Language code: ia</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Interlingue</source>
+ <comment>Language code: ie</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Inuktitut (Eskimo)</source>
+ <comment>Language code: iu</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Inupiak</source>
+ <comment>Language code: ik</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Irish</source>
+ <comment>Language code: ga</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Italian</source>
+ <comment>Language code: it</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Jakalteko</source>
+ <comment>Language code: jac</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Japanese</source>
+ <comment>Language code: ja</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Javanese</source>
+ <comment>Language code: jw</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>K'iche'</source>
+ <comment>Language code: quc</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Kannada</source>
+ <comment>Language code: kn</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Kashmiri</source>
+ <comment>Language code: ks</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Kazakh</source>
+ <comment>Language code: kk</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message encoding="UTF-8">
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Kekchí </source>
+ <comment>Language code: kek</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Kinyarwanda</source>
+ <comment>Language code: rw</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Kirghiz</source>
+ <comment>Language code: ky</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Kirundi</source>
+ <comment>Language code: rn</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Korean</source>
+ <comment>Language code: ko</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Kurdish</source>
+ <comment>Language code: ku</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Laothian</source>
+ <comment>Language code: lo</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Latin</source>
+ <comment>Language code: la</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Latvian, Lettish</source>
+ <comment>Language code: lv</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Lingala</source>
+ <comment>Language code: ln</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Lithuanian</source>
+ <comment>Language code: lt</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Macedonian</source>
+ <comment>Language code: mk</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Malagasy</source>
+ <comment>Language code: mg</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Malay</source>
+ <comment>Language code: ms</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Malayalam</source>
+ <comment>Language code: ml</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Maltese</source>
+ <comment>Language code: mt</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Mam</source>
+ <comment>Language code: mam</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Maori</source>
+ <comment>Language code: mi</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Maori</source>
+ <comment>Language code: mri</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Marathi</source>
+ <comment>Language code: mr</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Moldavian</source>
+ <comment>Language code: mo</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Mongolian</source>
+ <comment>Language code: mn</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Nahuatl</source>
+ <comment>Language code: nah</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Nauru</source>
+ <comment>Language code: na</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Nepali</source>
+ <comment>Language code: ne</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Norwegian</source>
+ <comment>Language code: no</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Occitan</source>
+ <comment>Language code: oc</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Oriya</source>
+ <comment>Language code: or</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Pashto, Pushto</source>
+ <comment>Language code: ps</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Persian</source>
+ <comment>Language code: fa</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Plautdietsch</source>
+ <comment>Language code: pdt</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Polish</source>
+ <comment>Language code: pl</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Portuguese</source>
+ <comment>Language code: pt</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Punjabi</source>
+ <comment>Language code: pa</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Quechua</source>
+ <comment>Language code: qu</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Rhaeto-Romance</source>
+ <comment>Language code: rm</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Romanian</source>
+ <comment>Language code: ro</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Russian</source>
+ <comment>Language code: ru</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Samoan</source>
+ <comment>Language code: sm</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Sangro</source>
+ <comment>Language code: sg</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Sanskrit</source>
+ <comment>Language code: sa</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Scots Gaelic</source>
+ <comment>Language code: gd</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Serbian</source>
+ <comment>Language code: sr</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Serbo-Croatian</source>
+ <comment>Language code: sh</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Sesotho</source>
+ <comment>Language code: st</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Setswana</source>
+ <comment>Language code: tn</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Shona</source>
+ <comment>Language code: sn</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Sindhi</source>
+ <comment>Language code: sd</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Singhalese</source>
+ <comment>Language code: si</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Siswati</source>
+ <comment>Language code: ss</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Slovak</source>
+ <comment>Language code: sk</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Slovenian</source>
+ <comment>Language code: sl</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Somali</source>
+ <comment>Language code: so</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Spanish</source>
+ <comment>Language code: es</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Sudanese</source>
+ <comment>Language code: su</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Swahili</source>
+ <comment>Language code: sw</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Swedish</source>
+ <comment>Language code: sv</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Tagalog</source>
+ <comment>Language code: tl</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Tajik</source>
+ <comment>Language code: tg</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Tamil</source>
+ <comment>Language code: ta</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Tatar</source>
+ <comment>Language code: tt</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Tegulu</source>
+ <comment>Language code: te</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Thai</source>
+ <comment>Language code: th</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Tibetan</source>
+ <comment>Language code: bo</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Tigrinya</source>
+ <comment>Language code: ti</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Tonga</source>
+ <comment>Language code: to</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Tsonga</source>
+ <comment>Language code: ts</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Turkish</source>
+ <comment>Language code: tr</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Turkmen</source>
+ <comment>Language code: tk</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Twi</source>
+ <comment>Language code: tw</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Uigur</source>
+ <comment>Language code: ug</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Ukrainian</source>
+ <comment>Language code: uk</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Urdu</source>
+ <comment>Language code: ur</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Uspanteco</source>
+ <comment>Language code: usp</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Uzbek</source>
+ <comment>Language code: uz</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Vietnamese</source>
+ <comment>Language code: vi</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Volapuk</source>
+ <comment>Language code: vo</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Welch</source>
+ <comment>Language code: cy</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Wolof</source>
+ <comment>Language code: wo</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Xhosa</source>
+ <comment>Language code: xh</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Yiddish (former ji)</source>
+ <comment>Language code: yi</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Yoruba</source>
+ <comment>Language code: yo</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Zhuang</source>
+ <comment>Language code: za</comment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Zulu</source>
+ <comment>Language code: zu</comment>
+ <translation type="unfinished"/>
+ </message>
+</context>
+</TS>=======
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/songs/forms/duplicatesongremovalform.py" line="151"/>
+ <source>Review duplicate songs ({current}/{total})</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>common.languages</name>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>(Afan) Oromo</source>
+ <comment>Language code: om</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Abkhazian</source>
+ <comment>Language code: ab</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Afar</source>
+ <comment>Language code: aa</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Afrikaans</source>
+ <comment>Language code: af</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Albanian</source>
+ <comment>Language code: sq</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Amharic</source>
+ <comment>Language code: am</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Amuzgo</source>
+ <comment>Language code: amu</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Ancient Greek</source>
+ <comment>Language code: grc</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Arabic</source>
+ <comment>Language code: ar</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Armenian</source>
+ <comment>Language code: hy</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Assamese</source>
+ <comment>Language code: as</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Aymara</source>
+ <comment>Language code: ay</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Azerbaijani</source>
+ <comment>Language code: az</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Bashkir</source>
+ <comment>Language code: ba</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Basque</source>
+ <comment>Language code: eu</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Bengali</source>
+ <comment>Language code: bn</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Bhutani</source>
+ <comment>Language code: dz</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Bihari</source>
+ <comment>Language code: bh</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Bislama</source>
+ <comment>Language code: bi</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Breton</source>
+ <comment>Language code: br</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Bulgarian</source>
+ <comment>Language code: bg</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Burmese</source>
+ <comment>Language code: my</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Byelorussian</source>
+ <comment>Language code: be</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Cakchiquel</source>
+ <comment>Language code: cak</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Cambodian</source>
+ <comment>Language code: km</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Catalan</source>
+ <comment>Language code: ca</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Chinese</source>
+ <comment>Language code: zh</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Comaltepec Chinantec</source>
+ <comment>Language code: cco</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Corsican</source>
+ <comment>Language code: co</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Croatian</source>
+ <comment>Language code: hr</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Czech</source>
+ <comment>Language code: cs</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Danish</source>
+ <comment>Language code: da</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Dutch</source>
+ <comment>Language code: nl</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>English</source>
+ <comment>Language code: en</comment>
+ <translation>Engels</translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Esperanto</source>
+ <comment>Language code: eo</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Estonian</source>
+ <comment>Language code: et</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Faeroese</source>
+ <comment>Language code: fo</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Fiji</source>
+ <comment>Language code: fj</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Finnish</source>
+ <comment>Language code: fi</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>French</source>
+ <comment>Language code: fr</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Frisian</source>
+ <comment>Language code: fy</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Galician</source>
+ <comment>Language code: gl</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Georgian</source>
+ <comment>Language code: ka</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>German</source>
+ <comment>Language code: de</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Greek</source>
+ <comment>Language code: el</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Greenlandic</source>
+ <comment>Language code: kl</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Guarani</source>
+ <comment>Language code: gn</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Gujarati</source>
+ <comment>Language code: gu</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Haitian Creole</source>
+ <comment>Language code: ht</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Hausa</source>
+ <comment>Language code: ha</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Hebrew (former iw)</source>
+ <comment>Language code: he</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Hiligaynon</source>
+ <comment>Language code: hil</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Hindi</source>
+ <comment>Language code: hi</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Hungarian</source>
+ <comment>Language code: hu</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Icelandic</source>
+ <comment>Language code: is</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Indonesian (former in)</source>
+ <comment>Language code: id</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Interlingua</source>
+ <comment>Language code: ia</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Interlingue</source>
+ <comment>Language code: ie</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Inuktitut (Eskimo)</source>
+ <comment>Language code: iu</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Inupiak</source>
+ <comment>Language code: ik</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Irish</source>
+ <comment>Language code: ga</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Italian</source>
+ <comment>Language code: it</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Jakalteko</source>
+ <comment>Language code: jac</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Japanese</source>
+ <comment>Language code: ja</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Javanese</source>
+ <comment>Language code: jw</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>K'iche'</source>
+ <comment>Language code: quc</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Kannada</source>
+ <comment>Language code: kn</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Kashmiri</source>
+ <comment>Language code: ks</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Kazakh</source>
+ <comment>Language code: kk</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message encoding="UTF-8">
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Kekchí </source>
+ <comment>Language code: kek</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Kinyarwanda</source>
+ <comment>Language code: rw</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Kirghiz</source>
+ <comment>Language code: ky</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Kirundi</source>
+ <comment>Language code: rn</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Korean</source>
+ <comment>Language code: ko</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Kurdish</source>
+ <comment>Language code: ku</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Laothian</source>
+ <comment>Language code: lo</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Latin</source>
+ <comment>Language code: la</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Latvian, Lettish</source>
+ <comment>Language code: lv</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Lingala</source>
+ <comment>Language code: ln</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Lithuanian</source>
+ <comment>Language code: lt</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Macedonian</source>
+ <comment>Language code: mk</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Malagasy</source>
+ <comment>Language code: mg</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Malay</source>
+ <comment>Language code: ms</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Malayalam</source>
+ <comment>Language code: ml</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Maltese</source>
+ <comment>Language code: mt</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Mam</source>
+ <comment>Language code: mam</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Maori</source>
+ <comment>Language code: mi</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Maori</source>
+ <comment>Language code: mri</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Marathi</source>
+ <comment>Language code: mr</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Moldavian</source>
+ <comment>Language code: mo</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Mongolian</source>
+ <comment>Language code: mn</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Nahuatl</source>
+ <comment>Language code: nah</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Nauru</source>
+ <comment>Language code: na</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Nepali</source>
+ <comment>Language code: ne</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Norwegian</source>
+ <comment>Language code: no</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Occitan</source>
+ <comment>Language code: oc</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Oriya</source>
+ <comment>Language code: or</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Pashto, Pushto</source>
+ <comment>Language code: ps</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Persian</source>
+ <comment>Language code: fa</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Plautdietsch</source>
+ <comment>Language code: pdt</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Polish</source>
+ <comment>Language code: pl</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Portuguese</source>
+ <comment>Language code: pt</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Punjabi</source>
+ <comment>Language code: pa</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Quechua</source>
+ <comment>Language code: qu</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Rhaeto-Romance</source>
+ <comment>Language code: rm</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Romanian</source>
+ <comment>Language code: ro</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Russian</source>
+ <comment>Language code: ru</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Samoan</source>
+ <comment>Language code: sm</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Sangro</source>
+ <comment>Language code: sg</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Sanskrit</source>
+ <comment>Language code: sa</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Scots Gaelic</source>
+ <comment>Language code: gd</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Serbian</source>
+ <comment>Language code: sr</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Serbo-Croatian</source>
+ <comment>Language code: sh</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Sesotho</source>
+ <comment>Language code: st</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Setswana</source>
+ <comment>Language code: tn</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Shona</source>
+ <comment>Language code: sn</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Sindhi</source>
+ <comment>Language code: sd</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Singhalese</source>
+ <comment>Language code: si</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Siswati</source>
+ <comment>Language code: ss</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Slovak</source>
+ <comment>Language code: sk</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Slovenian</source>
+ <comment>Language code: sl</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Somali</source>
+ <comment>Language code: so</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Spanish</source>
+ <comment>Language code: es</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Sudanese</source>
+ <comment>Language code: su</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Swahili</source>
+ <comment>Language code: sw</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Swedish</source>
+ <comment>Language code: sv</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Tagalog</source>
+ <comment>Language code: tl</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Tajik</source>
+ <comment>Language code: tg</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Tamil</source>
+ <comment>Language code: ta</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Tatar</source>
+ <comment>Language code: tt</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Tegulu</source>
+ <comment>Language code: te</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Thai</source>
+ <comment>Language code: th</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Tibetan</source>
+ <comment>Language code: bo</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Tigrinya</source>
+ <comment>Language code: ti</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Tonga</source>
+ <comment>Language code: to</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Tsonga</source>
+ <comment>Language code: ts</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Turkish</source>
+ <comment>Language code: tr</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Turkmen</source>
+ <comment>Language code: tk</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Twi</source>
+ <comment>Language code: tw</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Uigur</source>
+ <comment>Language code: ug</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Ukrainian</source>
+ <comment>Language code: uk</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Urdu</source>
+ <comment>Language code: ur</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Uspanteco</source>
+ <comment>Language code: usp</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Uzbek</source>
+ <comment>Language code: uz</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Vietnamese</source>
+ <comment>Language code: vi</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Volapuk</source>
+ <comment>Language code: vo</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Welch</source>
+ <comment>Language code: cy</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Wolof</source>
+ <comment>Language code: wo</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Xhosa</source>
+ <comment>Language code: xh</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Yiddish (former ji)</source>
+ <comment>Language code: yi</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Yoruba</source>
+ <comment>Language code: yo</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Zhuang</source>
+ <comment>Language code: za</comment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/common/languages.py" line="31"/>
+ <source>Zulu</source>
+ <comment>Language code: zu</comment>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+</TS>
+>>>>>>> MERGE-SOURCE
=== modified file 'resources/i18n/bg.ts'
--- resources/i18n/bg.ts 2017-01-11 19:09:00 +0000
+++ resources/i18n/bg.ts 2017-01-23 18:27:54 +0000
@@ -1,4 +1,5 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="bg" sourcelanguage="" version="2.0">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS><TS version="2.0" language="bg" sourcelanguage="">
<context>
<name>AlertsPlugin</name>
<message>
@@ -96,13 +97,13 @@
</message>
<message>
<location filename="../../openlp/plugins/alerts/forms/alertform.py" line="192"/>
- <source>The alert text does not contain '<>'.
+ <source>The alert text does not contain '<>'.
Do you want to continue anyway?</source>
<translation>Сигналът не съдържа '<>'.⏎ Искате ли да продължите все пак?</translation>
</message>
<message>
<location filename="../../openlp/plugins/alerts/forms/alertform.py" line="108"/>
- <source>You haven't specified any text for your alert.
+ <source>You haven't specified any text for your alert.
Please type in some text before clicking New.</source>
<translation>Не сте дали никакъв текст на вашия сигнал.
Моля напишете нещо преди да натиснете бутона Нов.</translation>
@@ -729,30 +730,63 @@
</message>
<message>
<location filename="../../openlp/plugins/bibles/forms/editbibleform.py" line="169"/>
+<<<<<<< TREE
<source>You need to specify a book name for "{text}".</source>
<translation type="unfinished"/>
+=======
+ <source>You need to specify a book name for "{text}".</source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
<message>
<location filename="../../openlp/plugins/bibles/forms/editbibleform.py" line="176"/>
<source>The book name "{name}" is not correct.
Numbers can only be used at the beginning and must
be followed by one or more non-numeric characters.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/plugins/bibles/forms/editbibleform.py" line="189"/>
- <source>The Book Name "{name}" has been entered more than once.</source>
- <translation type="unfinished"/>
+<<<<<<< TREE
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/forms/editbibleform.py" line="189"/>
+ <source>The Book Name "{name}" has been entered more than once.</source>
+ <translation type="unfinished"/>
+=======
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/forms/editbibleform.py" line="189"/>
+ <source>The Book Name "{name}" has been entered more than once.</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>BiblesPlugin.BibleImport</name>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/bibleimport.py" line="51"/>
+ <source>The file "{file}" you supplied is compressed. You must decompress it before import.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/bibleimport.py" line="220"/>
+ <source>unknown type of</source>
+ <comment>This looks like an unknown type of XML bible.</comment>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
</context>
<context>
<name>BiblesPlugin.BibleManager</name>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="816"/>
+=======
+ <location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="812"/>
+>>>>>>> MERGE-SOURCE
<source>Scripture Reference Error</source>
<translation>Грешна препратка</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/lib/manager.py" line="330"/>
<source>Web Bible cannot be used in Text Search</source>
<translation type="unfinished"/>
@@ -773,6 +807,28 @@
<location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="859"/>
<source>Nothing found</source>
<translation type="unfinished"/>
+=======
+ <location filename="../../openlp/plugins/bibles/lib/manager.py" line="335"/>
+ <source>Web Bible cannot be used in Text Search</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/manager.py" line="335"/>
+ <source>Text Search is not available with Web Bibles.
+Please use the Scripture Reference Search instead.
+
+This means that the currently used Bible
+or Second Bible is installed as Web Bible.
+
+If you were trying to perform a Reference search
+in Combined Search, your reference is invalid.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="855"/>
+ <source>Nothing found</source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
</context>
<context>
@@ -860,52 +916,101 @@
<source>Show verse numbers</source>
<translation>Покажи номерата на стиховете</translation>
</message>
- <message>
- <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="193"/>
- <source>Note: Changes do not affect verses in the Service</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="197"/>
- <source>Verse separator:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="198"/>
- <source>Range separator:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="199"/>
- <source>List separator:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="200"/>
- <source>End mark:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="217"/>
- <source>Quick Search Settings</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="218"/>
- <source>Reset search type to "Text or Scripture Reference" on startup</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="221"/>
- <source>Don't show error if nothing is found in "Text or Scripture Reference"</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="224"/>
- <source>Search automatically while typing (Text search must contain a
-minimum of {count} characters and a space for performance reasons)</source>
- <translation type="unfinished"/>
- </message>
+<<<<<<< TREE
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="193"/>
+ <source>Note: Changes do not affect verses in the Service</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="197"/>
+ <source>Verse separator:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="198"/>
+ <source>Range separator:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="199"/>
+ <source>List separator:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="200"/>
+ <source>End mark:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="217"/>
+ <source>Quick Search Settings</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="218"/>
+ <source>Reset search type to "Text or Scripture Reference" on startup</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="221"/>
+ <source>Don't show error if nothing is found in "Text or Scripture Reference"</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="224"/>
+ <source>Search automatically while typing (Text search must contain a
+minimum of {count} characters and a space for performance reasons)</source>
+ <translation type="unfinished"/>
+ </message>
+=======
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="193"/>
+ <source>Note: Changes do not affect verses in the Service</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="197"/>
+ <source>Verse separator:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="198"/>
+ <source>Range separator:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="199"/>
+ <source>List separator:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="200"/>
+ <source>End mark:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="217"/>
+ <source>Quick Search Settings</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="218"/>
+ <source>Reset search type to "Text or Scripture Reference" on startup</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="221"/>
+ <source>Don't show error if nothing is found in "Text or Scripture Reference"</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/biblestab.py" line="224"/>
+ <source>Search automatically while typing (Text search must contain a
+minimum of {count} characters and a space for performance reasons)</source>
+ <translation type="unfinished"></translation>
+ </message>
+>>>>>>> MERGE-SOURCE
</context>
<context>
<name>BiblesPlugin.BookNameDialog</name>
@@ -961,9 +1066,21 @@
<context>
<name>BiblesPlugin.CSVBible</name>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/lib/importers/csvbible.py" line="157"/>
<source>Importing verses... done.</source>
<translation>Импортиране на стихове... готво.</translation>
+=======
+ <location filename="../../openlp/plugins/bibles/lib/importers/csvbible.py" line="124"/>
+ <source>Importing books... {book}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/importers/csvbible.py" line="146"/>
+ <source>Importing verses from {book}...</source>
+ <comment>Importing verses from <book name>...</comment>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
<message>
<location filename="../../openlp/plugins/bibles/lib/importers/csvbible.py" line="129"/>
@@ -1079,195 +1196,349 @@
<source>There was a problem extracting your verse selection. If this error continues to occur please consider reporting a bug.</source>
<translation>Имаше проблем при извличането на избрания от вас стихове. В случай, че грешката продължи да се получава, моля обмислете възможността да съобщите за грешка в програмата.</translation>
</message>
+<<<<<<< TREE
<message>
<location filename="../../openlp/plugins/bibles/lib/importers/http.py" line="659"/>
<source>Importing {book}...</source>
<comment>Importing <book name>...</comment>
<translation type="unfinished"/>
</message>
+=======
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/importers/http.py" line="659"/>
+ <source>Importing {book}...</source>
+ <comment>Importing <book name>...</comment>
+ <translation type="unfinished"></translation>
+ </message>
+>>>>>>> MERGE-SOURCE
</context>
<context>
<name>BiblesPlugin.ImportWizardForm</name>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="387"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="417"/>
+>>>>>>> MERGE-SOURCE
<source>Bible Import Wizard</source>
<translation>Помощник за импортиране на Библии</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="390"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="420"/>
+>>>>>>> MERGE-SOURCE
<source>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.</source>
<translation>Тази поредица от екрани ще ви помогне да вмъкнете Библии от множество формати. Щракнете на следващият бутон отдолу за да започнете процеса чрез избор на формат от който ще вмъквате.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="401"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="432"/>
+>>>>>>> MERGE-SOURCE
<source>Web Download</source>
<translation>Сваляне от Мрежата</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="409"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="440"/>
+>>>>>>> MERGE-SOURCE
<source>Location:</source>
<translation>Място:</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="413"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="445"/>
+>>>>>>> MERGE-SOURCE
<source>Crosswalk</source>
<translation>Crosswalk</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="415"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="447"/>
+>>>>>>> MERGE-SOURCE
<source>BibleGateway</source>
<translation>BibleGateway</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="419"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="451"/>
+>>>>>>> MERGE-SOURCE
<source>Bible:</source>
<translation>Библия:</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="420"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="452"/>
+>>>>>>> MERGE-SOURCE
<source>Download Options</source>
<translation>Опции за сваляне</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="422"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="454"/>
+>>>>>>> MERGE-SOURCE
<source>Server:</source>
<translation>Сървър:</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="423"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="455"/>
+>>>>>>> MERGE-SOURCE
<source>Username:</source>
<translation>Потребителско име:</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="424"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="456"/>
+>>>>>>> MERGE-SOURCE
<source>Password:</source>
<translation>Парола:</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="425"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="457"/>
+>>>>>>> MERGE-SOURCE
<source>Proxy Server (Optional)</source>
<translation>Прокси сървър (Optional)</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="444"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="476"/>
+>>>>>>> MERGE-SOURCE
<source>License Details</source>
<translation>Детайли за лиценза</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="446"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="478"/>
+>>>>>>> MERGE-SOURCE
<source>Set up the Bible's license details.</source>
<translation>Задайте детайлите за лиценза на библейския превод.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="448"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="480"/>
+>>>>>>> MERGE-SOURCE
<source>Version name:</source>
<translation>Версия:</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="449"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="481"/>
+>>>>>>> MERGE-SOURCE
<source>Copyright:</source>
<translation>Копирайт:</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="452"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="484"/>
+>>>>>>> MERGE-SOURCE
<source>Please wait while your Bible is imported.</source>
<translation>Моля изчакайте докато се внася превода.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="482"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="515"/>
+>>>>>>> MERGE-SOURCE
<source>You need to specify a file with books of the Bible to use in the import.</source>
<translation>Трябва да посочите файл с библейски книги за внасяне</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="489"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="522"/>
+>>>>>>> MERGE-SOURCE
<source>You need to specify a file of Bible verses to import.</source>
<translation>Трябва да посочите файл с библейски стихове за внасяне</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="542"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="581"/>
+>>>>>>> MERGE-SOURCE
<source>You need to specify a version name for your Bible.</source>
<translation>Трябва да укажеш версията на Библията</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="548"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="587"/>
+>>>>>>> MERGE-SOURCE
<source>You need to set a copyright for your Bible. Bibles in the Public Domain need to be marked as such.</source>
<translation>Трябва да се въведе копирайт за тази Библия. Библиите в Публичния домейн следва да се маркират така.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="563"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="602"/>
+>>>>>>> MERGE-SOURCE
<source>Bible Exists</source>
<translation>Библията е налична</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="563"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="602"/>
+>>>>>>> MERGE-SOURCE
<source>This Bible already exists. Please import a different Bible or first delete the existing one.</source>
<translation>Тази Библия вече е налична. Моля импортирайте друга Библия или първо изтрийте наличната.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="822"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="880"/>
+>>>>>>> MERGE-SOURCE
<source>Your Bible import failed.</source>
<translation>Внасянето на Библията се провали.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="608"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="647"/>
+>>>>>>> MERGE-SOURCE
<source>CSV File</source>
<translation>CSV Фаил</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="417"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="449"/>
+>>>>>>> MERGE-SOURCE
<source>Bibleserver</source>
<translation>Bibleserver</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="450"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="482"/>
+>>>>>>> MERGE-SOURCE
<source>Permissions:</source>
<translation>Разрешения:</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="410"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="442"/>
+>>>>>>> MERGE-SOURCE
<source>Bible file:</source>
<translation>Файл с Библия</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="406"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="437"/>
+>>>>>>> MERGE-SOURCE
<source>Books file:</source>
<translation>Файл с книги:</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="407"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="438"/>
+>>>>>>> MERGE-SOURCE
<source>Verses file:</source>
<translation>Файл със стихове:</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="754"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="802"/>
+>>>>>>> MERGE-SOURCE
<source>Registering Bible...</source>
<translation>Регистриране на Библията</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="816"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="870"/>
+>>>>>>> MERGE-SOURCE
<source>Registered Bible. Please note, that verses will be downloaded on demand and thus an internet connection is required.</source>
<translation>Регистрирана Библия. Моля имайте в предвид, че показваните стихове не се запомнят на компютъра и за това е нужна постоянна връзка към Интернет.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="411"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="443"/>
+>>>>>>> MERGE-SOURCE
<source>Click to download bible list</source>
<translation>Кликни и свали листа с библии за сваляне.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="412"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="444"/>
+>>>>>>> MERGE-SOURCE
<source>Download bible list</source>
<translation>Сваляне на списък с библии</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="647"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="694"/>
+>>>>>>> MERGE-SOURCE
<source>Error during download</source>
<translation>Грешка по време на свалянето</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="647"/>
+=======
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="694"/>
+>>>>>>> MERGE-SOURCE
<source>An error occurred while downloading the list of bibles from %s.</source>
<translation>В процеса на сваляне на списъка с библии от %s се появи грешка.</translation>
</message>
+<<<<<<< TREE
<message>
<location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="433"/>
<source>Bibles:</source>
@@ -1303,6 +1574,43 @@
<source>To import SWORD bibles the pysword python module must be installed. Please read the manual for instructions.</source>
<translation type="unfinished"/>
</message>
+=======
+ <message>
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="465"/>
+ <source>Bibles:</source>
+ <translation>Библии:</translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="461"/>
+ <source>SWORD data folder:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="462"/>
+ <source>SWORD zip-file:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="463"/>
+ <source>Defaults to the standard SWORD data folder</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="466"/>
+ <source>Import from folder</source>
+ <translation>Импорт от директория</translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="468"/>
+ <source>Import from Zip-file</source>
+ <translation>Импорт от Zip-файл</translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/forms/bibleimportform.py" line="473"/>
+ <source>To import SWORD bibles the pysword python module must be installed. Please read the manual for instructions.</source>
+ <translation type="unfinished"></translation>
+ </message>
+>>>>>>> MERGE-SOURCE
</context>
<context>
<name>BiblesPlugin.LanguageDialog</name>
@@ -1333,81 +1641,142 @@
<context>
<name>BiblesPlugin.MediaItem</name>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="294"/>
+=======
+ <location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="289"/>
+>>>>>>> MERGE-SOURCE
<source>Find:</source>
<translation>Търси:</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="305"/>
+=======
+ <location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="300"/>
+>>>>>>> MERGE-SOURCE
<source>Book:</source>
<translation>Песнарка:</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="306"/>
+=======
+ <location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="301"/>
+>>>>>>> MERGE-SOURCE
<source>Chapter:</source>
<translation>Глава:</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="307"/>
+=======
+ <location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="302"/>
+>>>>>>> MERGE-SOURCE
<source>Verse:</source>
<translation>Стих:</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="308"/>
+=======
+ <location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="303"/>
+>>>>>>> MERGE-SOURCE
<source>From:</source>
<translation>От:</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="309"/>
+=======
+ <location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="304"/>
+>>>>>>> MERGE-SOURCE
<source>To:</source>
<translation>До:</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="325"/>
+=======
+ <location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="320"/>
+>>>>>>> MERGE-SOURCE
<source>Text Search</source>
<translation>Търси в текста</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="311"/>
+=======
+ <location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="306"/>
+>>>>>>> MERGE-SOURCE
<source>Second:</source>
<translation>Втори:</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="325"/>
+=======
+ <location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="320"/>
+>>>>>>> MERGE-SOURCE
<source>Scripture Reference</source>
<translation>Препратка</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="317"/>
+=======
+ <location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="312"/>
+>>>>>>> MERGE-SOURCE
<source>Toggle to keep or clear the previous results.</source>
<translation>Изберете за да запазите или да изчистите предишните резултати.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="95"/>
+=======
+ <location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="90"/>
+>>>>>>> MERGE-SOURCE
<source>You cannot combine single and dual Bible verse search results. Do you want to delete your search results and start a new search?</source>
<translation>Не може да комбинирате резултатите от търсене на стихове между търсене в една и две Библии. Желаете ли да изтриете сегашните резултати от търсенето и да започнете ново?</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="433"/>
+=======
+ <location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="429"/>
+>>>>>>> MERGE-SOURCE
<source>Bible not fully loaded.</source>
<translation>Библията не е напълно заредена</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="745"/>
+=======
+ <location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="741"/>
+>>>>>>> MERGE-SOURCE
<source>Information</source>
<translation>Информация</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="325"/>
+=======
+ <location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="320"/>
+>>>>>>> MERGE-SOURCE
<source>Search Scripture Reference...</source>
<translation>Търси препратка...</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="325"/>
+=======
+ <location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="320"/>
+>>>>>>> MERGE-SOURCE
<source>Search Text...</source>
<translation>Търси текст...</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="207"/>
<source>Search</source>
<translation>Търсене</translation>
@@ -1435,8 +1804,38 @@
<message>
<location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="529"/>
<source>Are you sure you want to completely delete "{bible}" Bible from OpenLP?
+=======
+ <location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="202"/>
+ <source>Search</source>
+ <translation>Търсене</translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="205"/>
+ <source>Select</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="311"/>
+ <source>Clear the search results.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="320"/>
+ <source>Text or Reference</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="320"/>
+ <source>Text or Reference...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="516"/>
+ <source>Are you sure you want to completely delete "{bible}" Bible from OpenLP?
+>>>>>>> MERGE-SOURCE
You will need to re-import this Bible to use it again.</source>
+<<<<<<< TREE
<translation type="unfinished"/>
</message>
<message>
@@ -1467,13 +1866,29 @@
<location filename="../../openlp/plugins/bibles/lib/importers/opensong.py" line="110"/>
<source>Importing {name} {chapter}...</source>
<translation type="unfinished"/>
+=======
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/mediaitem.py" line="741"/>
+ <source>The second Bible does not contain all the verses that are in the main Bible.
+Only verses found in both Bibles will be shown.
+
+{count:d} verses have not been included in the results.</source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
</context>
<context>
<name>BiblesPlugin.OsisImport</name>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/lib/importers/osis.py" line="93"/>
+=======
+ <location filename="../../openlp/plugins/bibles/lib/bibleimport.py" line="167"/>
+>>>>>>> MERGE-SOURCE
<source>Removing unused tags (this may take a few minutes)...</source>
+<<<<<<< TREE
<translation type="unfinished"/>
</message>
<message>
@@ -1503,22 +1918,57 @@
<source>An unexpected error happened while importing the SWORD bible, please report this to the OpenLP developers.
{error}</source>
<translation type="unfinished"/>
+=======
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/bibleimport.py" line="196"/>
+ <source>Importing {book} {chapter}...</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>BiblesPlugin.Sword</name>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/importers/sword.py" line="88"/>
+ <source>Importing {name}...</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>BiblesPlugin.SwordImport</name>
+ <message>
+ <location filename="../../openlp/plugins/bibles/lib/importers/sword.py" line="93"/>
+ <source>An unexpected error happened while importing the SWORD bible, please report this to the OpenLP developers.
+{error}</source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
</context>
<context>
<name>BiblesPlugin.ZefaniaImport</name>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/lib/importers/zefania.py" line="90"/>
+=======
+ <location filename="../../openlp/plugins/bibles/lib/importers/zefania.py" line="91"/>
+>>>>>>> MERGE-SOURCE
<source>Incorrect Bible file type supplied. Zefania Bibles may be compressed. You must decompress them before import.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
<name>BiblesPlugin.Zefnia</name>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/bibles/lib/importers/zefania.py" line="83"/>
<source>Importing {book} {chapter}...</source>
<translation type="unfinished"/>
+=======
+ <location filename="../../openlp/plugins/bibles/lib/importers/zefania.py" line="84"/>
+ <source>Importing {book} {chapter}...</source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
</context>
<context>
@@ -1680,9 +2130,15 @@
<context>
<name>CustomPlugin.MediaItem</name>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/custom/lib/mediaitem.py" line="191"/>
<source>Are you sure you want to delete the "{items:d}" selected custom slide(s)?</source>
<translation type="unfinished"/>
+=======
+ <location filename="../../openlp/plugins/custom/lib/mediaitem.py" line="188"/>
+ <source>Are you sure you want to delete the "{items:d}" selected custom slide(s)?</source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
</context>
<context>
@@ -1740,16 +2196,29 @@
<source>Add the selected image to the service.</source>
<translation>Добавете избраната картина към службата.</translation>
</message>
- <message>
- <location filename="../../openlp/plugins/images/imageplugin.py" line="91"/>
- <source>Add new image(s).</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/plugins/images/lib/mediaitem.py" line="181"/>
- <source>Add new image(s)</source>
- <translation type="unfinished"/>
- </message>
+<<<<<<< TREE
+ <message>
+ <location filename="../../openlp/plugins/images/imageplugin.py" line="91"/>
+ <source>Add new image(s).</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/images/lib/mediaitem.py" line="181"/>
+ <source>Add new image(s)</source>
+ <translation type="unfinished"/>
+ </message>
+=======
+ <message>
+ <location filename="../../openlp/plugins/images/imageplugin.py" line="91"/>
+ <source>Add new image(s).</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/images/lib/mediaitem.py" line="181"/>
+ <source>Add new image(s)</source>
+ <translation type="unfinished"></translation>
+ </message>
+>>>>>>> MERGE-SOURCE
</context>
<context>
<name>ImagePlugin.AddGroupForm</name>
@@ -1858,25 +2327,47 @@
<translation>Премахни група</translation>
</message>
<message>
- <location filename="../../openlp/plugins/images/lib/mediaitem.py" line="244"/>
- <source>Are you sure you want to remove "{name}" and everything in it?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/plugins/images/lib/mediaitem.py" line="590"/>
- <source>The following image(s) no longer exist: {names}</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/plugins/images/lib/mediaitem.py" line="596"/>
- <source>The following image(s) no longer exist: {names}
-Do you want to add the other images anyway?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/plugins/images/lib/mediaitem.py" line="689"/>
- <source>There was a problem replacing your background, the image file "{name}" no longer exists.</source>
- <translation type="unfinished"/>
+<<<<<<< TREE
+ <location filename="../../openlp/plugins/images/lib/mediaitem.py" line="244"/>
+ <source>Are you sure you want to remove "{name}" and everything in it?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/images/lib/mediaitem.py" line="590"/>
+ <source>The following image(s) no longer exist: {names}</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/images/lib/mediaitem.py" line="596"/>
+ <source>The following image(s) no longer exist: {names}
+Do you want to add the other images anyway?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/images/lib/mediaitem.py" line="689"/>
+ <source>There was a problem replacing your background, the image file "{name}" no longer exists.</source>
+ <translation type="unfinished"/>
+=======
+ <location filename="../../openlp/plugins/images/lib/mediaitem.py" line="244"/>
+ <source>Are you sure you want to remove "{name}" and everything in it?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/images/lib/mediaitem.py" line="590"/>
+ <source>The following image(s) no longer exist: {names}</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/images/lib/mediaitem.py" line="596"/>
+ <source>The following image(s) no longer exist: {names}
+Do you want to add the other images anyway?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/images/lib/mediaitem.py" line="689"/>
+ <source>There was a problem replacing your background, the image file "{name}" no longer exists.</source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
</context>
<context>
@@ -1910,9 +2401,13 @@
<translation>Webkit е медия плеър, който върви в уеб браузър. Той позволява визуализирането на текста върху видеото.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/media/systemplayer.py" line="272"/>
+=======
+ <location filename="../../openlp/core/ui/media/systemplayer.py" line="283"/>
+>>>>>>> MERGE-SOURCE
<source>This media player uses your operating system to provide media capabilities.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -2006,7 +2501,7 @@
<message>
<location filename="../../openlp/plugins/media/forms/mediaclipselectordialog.py" line="191"/>
<source>Track Details</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/media/forms/mediaclipselectordialog.py" line="192"/>
@@ -2016,12 +2511,12 @@
<message>
<location filename="../../openlp/plugins/media/forms/mediaclipselectordialog.py" line="193"/>
<source>Audio track:</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/media/forms/mediaclipselectordialog.py" line="194"/>
<source>Subtitle track:</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/media/forms/mediaclipselectordialog.py" line="202"/>
@@ -2046,22 +2541,22 @@
<message>
<location filename="../../openlp/plugins/media/forms/mediaclipselectordialog.py" line="200"/>
<source>Jump to start point</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/media/forms/mediaclipselectordialog.py" line="201"/>
<source>End point:</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/media/forms/mediaclipselectordialog.py" line="203"/>
<source>Set end point</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/media/forms/mediaclipselectordialog.py" line="204"/>
<source>Jump to end point</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -2079,7 +2574,7 @@
<message>
<location filename="../../openlp/plugins/media/forms/mediaclipselectorform.py" line="218"/>
<source>An error happened during initialization of VLC player</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/media/forms/mediaclipselectorform.py" line="239"/>
@@ -2094,7 +2589,7 @@
<message>
<location filename="../../openlp/plugins/media/forms/mediaclipselectorform.py" line="569"/>
<source>The CD was not loaded correctly, please re-load and try again.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/media/forms/mediaclipselectorform.py" line="582"/>
@@ -2104,7 +2599,7 @@
<message>
<location filename="../../openlp/plugins/media/forms/mediaclipselectorform.py" line="582"/>
<source>The DVD was not loaded correctly, please re-load and try again.</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/media/forms/mediaclipselectorform.py" line="593"/>
@@ -2119,17 +2614,17 @@
<message>
<location filename="../../openlp/plugins/media/forms/mediaclipselectorform.py" line="603"/>
<source>Enter a valid name or cancel</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/media/forms/mediaclipselectorform.py" line="609"/>
<source>Invalid character</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/media/forms/mediaclipselectorform.py" line="609"/>
<source>The name of the mediaclip must not contain the character ":"</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -2140,22 +2635,38 @@
<translation>Избери Медия</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/media/lib/mediaitem.py" line="347"/>
+=======
+ <location filename="../../openlp/plugins/media/lib/mediaitem.py" line="348"/>
+>>>>>>> MERGE-SOURCE
<source>You must select a media file to delete.</source>
<translation>Трябва да изберете медиен файл за да го изтриете.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/media/lib/mediaitem.py" line="214"/>
+=======
+ <location filename="../../openlp/plugins/media/lib/mediaitem.py" line="215"/>
+>>>>>>> MERGE-SOURCE
<source>You must select a media file to replace the background with.</source>
<translation>Трябва да изберете медиен файл с който да замените фона.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/media/lib/mediaitem.py" line="278"/>
+=======
+ <location filename="../../openlp/plugins/media/lib/mediaitem.py" line="279"/>
+>>>>>>> MERGE-SOURCE
<source>Missing Media File</source>
<translation>Липсващ медиен файл.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/media/lib/mediaitem.py" line="229"/>
+=======
+ <location filename="../../openlp/plugins/media/lib/mediaitem.py" line="230"/>
+>>>>>>> MERGE-SOURCE
<source>There was no display item to amend.</source>
<translation>Няма какво да се коригира.</translation>
</message>
@@ -2172,26 +2683,38 @@
<message>
<location filename="../../openlp/core/ui/media/mediacontroller.py" line="532"/>
<source>VLC player required</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/ui/media/mediacontroller.py" line="532"/>
<source>VLC player required for playback of optical devices</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/plugins/media/lib/mediaitem.py" line="135"/>
<source>Load CD/DVD</source>
+<<<<<<< TREE
<translation type="unfinished"/>
</message>
<message>
<location filename="../../openlp/plugins/media/lib/mediaitem.py" line="451"/>
+=======
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/media/lib/mediaitem.py" line="452"/>
+>>>>>>> MERGE-SOURCE
<source>Mediaclip already saved</source>
<translation>Клипа вече е запазен</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/plugins/media/lib/mediaitem.py" line="451"/>
+=======
+ <location filename="../../openlp/plugins/media/lib/mediaitem.py" line="452"/>
+>>>>>>> MERGE-SOURCE
<source>This mediaclip has already been saved</source>
+<<<<<<< TREE
<translation>Този клипа вече е бил запазен</translation>
</message>
<message>
@@ -2228,6 +2751,44 @@
<location filename="../../openlp/plugins/media/lib/mediaitem.py" line="313"/>
<source>Videos ({video});;Audio ({audio});;{files} (*)</source>
<translation type="unfinished"/>
+=======
+ <translation>Този клипа вече е бил запазен</translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/media/mediacontroller.py" line="481"/>
+ <source>File %s not supported using player %s</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/media/mediacontroller.py" line="481"/>
+ <source>Unsupported Media File</source>
+ <translation>Медия-файла не се поддържа</translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/media/lib/mediaitem.py" line="136"/>
+ <source>CD/DVD playback is only supported if VLC is installed and enabled.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/media/lib/mediaitem.py" line="234"/>
+ <source>There was a problem replacing your background, the media file "{name}" no longer exists.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/media/lib/mediaitem.py" line="261"/>
+ <source>The optical disc {name} is no longer available.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/media/lib/mediaitem.py" line="279"/>
+ <source>The file {name} no longer exists.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/plugins/media/lib/mediaitem.py" line="314"/>
+ <source>Videos ({video});;Audio ({audio});;{files} (*)</source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
</context>
<context>
@@ -2239,8 +2800,13 @@
</message>
<message>
<location filename="../../openlp/plugins/media/lib/mediatab.py" line="57"/>
+<<<<<<< TREE
<source>Start new Live media automatically</source>
<translation type="unfinished"/>
+=======
+ <source>Start new Live media automatically</source>
+ <translation type="unfinished"></translation>
+>>>>>>> MERGE-SOURCE
</message>
</context>
<context>
@@ -2251,24 +2817,66 @@
<translation>Файлове с изображения</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/__init__.py" line="229"/>
+=======
+ <location filename="../../openlp/core/__init__.py" line="270"/>
+>>>>>>> MERGE-SOURCE
<source>Backup</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/__init__.py" line="211"/>
- <source>OpenLP has been upgraded, do you want to create a backup of OpenLPs data folder?</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../../openlp/core/__init__.py" line="223"/>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/__init__.py" line="264"/>
<source>Backup of the data folder failed!</source>
+<<<<<<< TREE
<translation type="unfinished"/>
</message>
<message>
<location filename="../../openlp/core/ui/projector/manager.py" line="658"/>
+=======
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/projector/manager.py" line="658"/>
+>>>>>>> MERGE-SOURCE
<source>Open</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/ui/themeform.py" line="474"/>
+ <source>Video Files</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/__init__.py" line="188"/>
+ <source>Data Directory Error</source>
+ <translation type="unfinished">Грешка с директорията с данни</translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/__init__.py" line="188"/>
+ <source>OpenLP data folder was not found in:
+
+{path}
+
+The location of the data folder was previously changed from the OpenLP's default location. If the data was stored on removable device, that device needs to be made available.
+
+You may reset the data location back to the default location, or you can try to make the current location available.
+
+Do you want to reset to the default data location? If not, OpenLP will be closed so you can try to fix the the problem.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/__init__.py" line="252"/>
+ <source>OpenLP has been upgraded, do you want to create
+a backup of the old data folder?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../openlp/core/__init__.py" line="267"/>
+ <source>A backup of the data folder has been created at:
+
+{text}</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../../openlp/core/__init__.py" line="226"/>
@@ -2284,27 +2892,35 @@
<context>
<name>OpenLP.AboutForm</name>
<message>
- <location filename="../../openlp/core/ui/aboutdialog.py" line="298"/>
+ <location filename="../../openlp/core/ui/aboutdialog.py" line="304"/>
<source>Credits</source>
<translation>Заслуги</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/aboutdialog.py" line="698"/>
+=======
+ <location filename="../../openlp/core/ui/aboutdialog.py" line="706"/>
+>>>>>>> MERGE-SOURCE
<source>License</source>
<translation>Лиценз</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/aboutdialog.py" line="312"/>
+=======
+ <location filename="../../openlp/core/ui/aboutdialog.py" line="320"/>
+>>>>>>> MERGE-SOURCE
<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>Тази програма е свободно приложение, можете да да я разпространявате и/или да внасяте промени в нея спазвайки условията на ГНУ Общ Публичен Лиценз, както е публикуван от Фондация Свободен Софтуер; версия 2 на Лиценза.</translation>
</message>
<message>
- <location filename="../../openlp/core/ui/aboutdialog.py" line="317"/>
+ <location filename="../../openlp/core/ui/aboutdialog.py" line="325"/>
<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>Тази програма се разпространява с надеждата, че ще бъде полезна, но за това не се дава никаква гаранция; без дори косвена гаранция като ПРОДУКТ ГОДЕН ЗА ПРОДАЖБА или ВЪВ ВЪЗМОЖНОСТ ДА СЛУЖИ ЗА ОПРЕДЕЛЕНА ЦЕЛ. За повече информация, погледнете по-долу.</translation>
</message>
<message>
- <location filename="../../openlp/core/ui/aboutdialog.py" line="92"/>
+ <location filename="../../openlp/core/ui/aboutdialog.py" line="94"/>
<source>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 Impress, PowerPoint or PowerPoint Viewer is installed) for church worship using a computer and a data projector.
@@ -2319,168 +2935,161 @@
OpenLP се програмира и разработва от доброволци. Ако искате да разберете повече за програмиране на свободен християнски софтуер, моля обмислете вашето доброволчество като ползвате бутона по-долу.</translation>
</message>
<message>
+<<<<<<< TREE
<location filename="../../openlp/core/ui/aboutdialog.py" line="700"/>
+=======
+ <location filename="../../openlp/core/ui/aboutdialog.py" line="708"/>
+>>>>>>> MERGE-SOURCE
<source>Volunteer</source>
<translation>Доброволец</translation>
</message>
<message>
- <location filename="../../openlp/core/ui/aboutdialog.py" line="157"/>
+ <location filename="../../openlp/core/ui/aboutdialog.py" line="162"/>
<source>Project Lead</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../openlp/core/ui/aboutdialog.py" line="158"/>
+ <location filename="../../openlp/core/ui/aboutdialog.py" line="163"/>
<source>Developers</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../openlp/core/ui/aboutdialog.py" line="159"/>
+ <location filename="../../openlp/core/ui/aboutdialog.py" line="164"/>
<source>Contributors</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../openlp/core/ui/aboutdialog.py" line="160"/>
+ <location filename="../../openlp/core/ui/aboutdialog.py" line="165"/>
<source>Packagers</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../openlp/core/ui/aboutdialog.py" line="161"/>
+ <location filename="../../openlp/core/ui/aboutdialog.py" line="166"/>
<source>Testers</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../openlp/core/ui/aboutdialog.py" line="162"/>
+ <location filename="../../openlp/core/ui/aboutdialog.py" line="167"/>
<source>Translators</source>
- <translation type="unfinished"/>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location filename="../../openlp/core/ui/aboutdialog.py" line="163"/>
+ <location filename="../../o
Follow ups
