← Back to team overview

openlp-core team mailing list archive

[Merge] lp:~phill-ridout/openlp/bug1222534 into lp:openlp

 

Phill has proposed merging lp:~phill-ridout/openlp/bug1222534 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #1222534 in OpenLP: "KeyError when "Allow presentation application to be overridden" and Spanish language is selected"
  https://bugs.launchpad.net/openlp/+bug/1222534

For more details, see:
https://code.launchpad.net/~phill-ridout/openlp/bug1222534/+merge/225080

Fixes bug 1222534 by using userdata rather than relying on a translated string

lp:~phill-ridout/openlp/bug1222534 (revision 2390)
[SUCCESS] http://ci.openlp.org/job/Branch-01-Pull/496/
[SUCCESS] http://ci.openlp.org/job/Branch-02-Functional-Tests/454/
[SUCCESS] http://ci.openlp.org/job/Branch-03-Interface-Tests/399/
[SUCCESS] http://ci.openlp.org/job/Branch-04-Windows_Tests/358/
[SUCCESS] http://ci.openlp.org/job/Branch-05a-Code_Analysis/238/
[SUCCESS] http://ci.openlp.org/job/Branch-05b-Test_Coverage/112/
-- 
The attached diff has been truncated due to its size.
https://code.launchpad.net/~phill-ridout/openlp/bug1222534/+merge/225080
Your team OpenLP Core is requested to review the proposed merge of lp:~phill-ridout/openlp/bug1222534 into lp:openlp.
=== modified file 'openlp/plugins/presentations/lib/mediaitem.py'
--- openlp/plugins/presentations/lib/mediaitem.py	2014-06-05 16:25:37 +0000
+++ openlp/plugins/presentations/lib/mediaitem.py	2014-06-30 20:23:34 +0000
@@ -145,7 +145,7 @@
             if self.controllers[item].enabled():
                 self.display_type_combo_box.addItem(item)
         if self.display_type_combo_box.count() > 1:
-            self.display_type_combo_box.insertItem(0, self.automatic)
+            self.display_type_combo_box.insertItem(0, self.automatic, userData='automatic')
             self.display_type_combo_box.setCurrentIndex(0)
         if Settings().value(self.settings_section + '/override app') == QtCore.Qt.Checked:
             self.presentation_widget.show()
@@ -312,7 +312,7 @@
                 (path, name) = os.path.split(filename)
                 service_item.title = name
                 if os.path.exists(filename):
-                    if service_item.processor == self.automatic:
+                    if self.display_type_combo_box.itemData(self.display_type_combo_box.currentIndex()) == 'automatic':
                         service_item.processor = self.find_controller_by_type(filename)
                         if not service_item.processor:
                             return False

=== modified file 'resources/i18n/af.ts'
--- resources/i18n/af.ts	2012-11-24 21:19:46 +0000
+++ resources/i18n/af.ts	2014-06-30 20:23:34 +0000
@@ -1,117 +1,117 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="2.0" language="af" sourcelanguage="">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="af" sourcelanguage="" version="2.0">
 <context>
     <name>AlertsPlugin</name>
     <message>
-        <location filename="openlp/plugins/alerts/alertsplugin.py" line="140"/>
+        <location filename="openlp/plugins/alerts/alertsplugin.py" line="154"/>
         <source>&amp;Alert</source>
         <translation>W&amp;aarskuwing</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/alerts/alertsplugin.py" line="140"/>
+        <location filename="openlp/plugins/alerts/alertsplugin.py" line="154"/>
         <source>Show an alert message.</source>
         <translation>Vertoon &apos;n waarskuwing boodskap.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/alerts/alertsplugin.py" line="186"/>
+        <location filename="openlp/plugins/alerts/alertsplugin.py" line="212"/>
         <source>Alert</source>
         <comment>name singular</comment>
         <translation>Waarskuwing</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/alerts/alertsplugin.py" line="187"/>
+        <location filename="openlp/plugins/alerts/alertsplugin.py" line="213"/>
         <source>Alerts</source>
         <comment>name plural</comment>
         <translation>Waarskuwings</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/alerts/alertsplugin.py" line="191"/>
+        <location filename="openlp/plugins/alerts/alertsplugin.py" line="217"/>
         <source>Alerts</source>
         <comment>container title</comment>
         <translation>Waarskuwings</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/alerts/alertsplugin.py" line="175"/>
-        <source>&lt;strong&gt;Alerts Plugin&lt;/strong&gt;&lt;br /&gt;The alert plugin controls the displaying of nursery alerts on the display screen.</source>
-        <translation>&lt;strong&gt;Waarskuwing Mini-program&lt;/strong&gt;&lt;br/&gt;Die waarskuwing mini-program beheer die vertoning van moederskamer inligting op die vertoon skerm.</translation>
+        <location filename="openlp/plugins/alerts/alertsplugin.py" line="202"/>
+        <source>&lt;strong&gt;Alerts Plugin&lt;/strong&gt;&lt;br /&gt;The alert plugin controls the displaying of alerts on the display screen.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>AlertsPlugin.AlertForm</name>
     <message>
-        <location filename="openlp/plugins/alerts/forms/alertdialog.py" line="89"/>
+        <location filename="openlp/plugins/alerts/forms/alertdialog.py" line="102"/>
         <source>Alert Message</source>
         <translation>Waarskuwing Boodskap</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/alerts/forms/alertdialog.py" line="91"/>
+        <location filename="openlp/plugins/alerts/forms/alertdialog.py" line="103"/>
         <source>Alert &amp;text:</source>
         <translation>Waarskuwing &amp;teks:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/alerts/forms/alertdialog.py" line="95"/>
+        <location filename="openlp/plugins/alerts/forms/alertdialog.py" line="105"/>
         <source>&amp;New</source>
         <translation>&amp;Nuwe</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/alerts/forms/alertdialog.py" line="97"/>
+        <location filename="openlp/plugins/alerts/forms/alertdialog.py" line="106"/>
         <source>&amp;Save</source>
         <translation>&amp;Stoor</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/alerts/forms/alertdialog.py" line="99"/>
+        <location filename="openlp/plugins/alerts/forms/alertdialog.py" line="107"/>
         <source>Displ&amp;ay</source>
         <translation>V&amp;ertoon</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/alerts/forms/alertdialog.py" line="101"/>
+        <location filename="openlp/plugins/alerts/forms/alertdialog.py" line="108"/>
         <source>Display &amp;&amp; Cl&amp;ose</source>
         <translation>Vert&amp;oon &amp;&amp; Maak toe</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/alerts/forms/alertform.py" line="111"/>
+        <location filename="openlp/plugins/alerts/forms/alertform.py" line="114"/>
         <source>New Alert</source>
         <translation>Nuwe Waarskuwing</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/alerts/forms/alertform.py" line="111"/>
-        <source>You haven&apos;t specified any text for your alert. Please type in some text before clicking New.</source>
-        <translation>Daar is geen teks vir die waarskuwing gespesifiseer nie. Tik asseblief teks in voordat &apos;n nuwe een bygevoeg word.</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/alerts/forms/alertdialog.py" line="93"/>
+        <location filename="openlp/plugins/alerts/forms/alertdialog.py" line="104"/>
         <source>&amp;Parameter:</source>
         <translation>&amp;Parameter:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/alerts/forms/alertform.py" line="184"/>
+        <location filename="openlp/plugins/alerts/forms/alertform.py" line="185"/>
         <source>No Parameter Found</source>
         <translation>Geen Parameter Gevind nie</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/alerts/forms/alertform.py" line="184"/>
+        <location filename="openlp/plugins/alerts/forms/alertform.py" line="185"/>
         <source>You have not entered a parameter to be replaced.
 Do you want to continue anyway?</source>
         <translation>Daar is nie &apos;n parameter gegee om te vervang nie.
 Gaan steeds voort?</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/alerts/forms/alertform.py" line="195"/>
+        <location filename="openlp/plugins/alerts/forms/alertform.py" line="197"/>
         <source>No Placeholder Found</source>
         <translation>Geen Plekhouer Gevind nie</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/alerts/forms/alertform.py" line="195"/>
-        <source>The alert text does not contain &apos;&lt;&gt;&apos;.
+        <location filename="openlp/plugins/alerts/forms/alertform.py" line="197"/>
+        <source>The alert text does not contain '&lt;&gt;'.
 Do you want to continue anyway?</source>
         <translation>Die attent-teks bevat nie &apos;&lt;&gt;&apos; nie.
 Gaan steeds voort?</translation>
     </message>
+    <message>
+        <location filename="openlp/plugins/alerts/forms/alertform.py" line="114"/>
+        <source>You haven't specified any text for your alert. 
+Please type in some text before clicking New.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AlertsPlugin.AlertsManager</name>
     <message>
-        <location filename="openlp/plugins/alerts/lib/alertsmanager.py" line="73"/>
+        <location filename="openlp/plugins/alerts/lib/alertsmanager.py" line="70"/>
         <source>Alert message created and displayed.</source>
         <translation>Waarskuwing boodskap geskep en vertoon.</translation>
     </message>
@@ -119,32 +119,32 @@
 <context>
     <name>AlertsPlugin.AlertsTab</name>
     <message>
-        <location filename="openlp/plugins/alerts/lib/alertstab.py" line="111"/>
+        <location filename="openlp/plugins/alerts/lib/alertstab.py" line="105"/>
         <source>Font</source>
         <translation>Skrif</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/alerts/lib/alertstab.py" line="113"/>
+        <location filename="openlp/plugins/alerts/lib/alertstab.py" line="106"/>
         <source>Font name:</source>
         <translation>Skrif naam:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/alerts/lib/alertstab.py" line="115"/>
+        <location filename="openlp/plugins/alerts/lib/alertstab.py" line="107"/>
         <source>Font color:</source>
         <translation>Skrif kleur:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/alerts/lib/alertstab.py" line="117"/>
+        <location filename="openlp/plugins/alerts/lib/alertstab.py" line="108"/>
         <source>Background color:</source>
         <translation>Agtergrond kleur:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/alerts/lib/alertstab.py" line="119"/>
+        <location filename="openlp/plugins/alerts/lib/alertstab.py" line="109"/>
         <source>Font size:</source>
         <translation>Skrif grootte:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/alerts/lib/alertstab.py" line="122"/>
+        <location filename="openlp/plugins/alerts/lib/alertstab.py" line="111"/>
         <source>Alert timeout:</source>
         <translation>Waarskuwing verstreke-tyd:</translation>
     </message>
@@ -152,544 +152,543 @@
 <context>
     <name>BiblesPlugin</name>
     <message>
-        <location filename="openlp/plugins/bibles/bibleplugin.py" line="111"/>
+        <location filename="openlp/plugins/bibles/bibleplugin.py" line="137"/>
         <source>&amp;Bible</source>
         <translation>&amp;Bybel</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/bibleplugin.py" line="183"/>
+        <location filename="openlp/plugins/bibles/bibleplugin.py" line="201"/>
         <source>Bible</source>
         <comment>name singular</comment>
         <translation>Bybel</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/bibleplugin.py" line="184"/>
+        <location filename="openlp/plugins/bibles/bibleplugin.py" line="202"/>
         <source>Bibles</source>
         <comment>name plural</comment>
         <translation>Bybels</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/bibleplugin.py" line="188"/>
+        <location filename="openlp/plugins/bibles/bibleplugin.py" line="206"/>
         <source>Bibles</source>
         <comment>container title</comment>
         <translation>Bybels</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/http.py" line="600"/>
+        <location filename="openlp/plugins/bibles/lib/http.py" line="551"/>
         <source>No Book Found</source>
         <translation>Geen Boek Gevind nie</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/http.py" line="600"/>
+        <location filename="openlp/plugins/bibles/lib/http.py" line="551"/>
         <source>No matching book could be found in this Bible. Check that you have spelled the name of the book correctly.</source>
         <translation>Geen passende boek kon in hierdie Bybel gevind word nie. Gaan na dat die naam van die boek korrek gespel is.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/bibleplugin.py" line="193"/>
+        <location filename="openlp/plugins/bibles/bibleplugin.py" line="211"/>
         <source>Import a Bible.</source>
         <translation>Voer &apos;n Bybel in.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/bibleplugin.py" line="194"/>
+        <location filename="openlp/plugins/bibles/bibleplugin.py" line="212"/>
         <source>Add a new Bible.</source>
         <translation>Voeg &apos;n nuwe Bybel by.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/bibleplugin.py" line="195"/>
+        <location filename="openlp/plugins/bibles/bibleplugin.py" line="213"/>
         <source>Edit the selected Bible.</source>
         <translation>Redigeer geselekteerde Bybel.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/bibleplugin.py" line="196"/>
+        <location filename="openlp/plugins/bibles/bibleplugin.py" line="214"/>
         <source>Delete the selected Bible.</source>
         <translation>Wis die geselekteerde Bybel uit.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/bibleplugin.py" line="197"/>
+        <location filename="openlp/plugins/bibles/bibleplugin.py" line="215"/>
         <source>Preview the selected Bible.</source>
         <translation>Voorskou die geselekteerde Bybel.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/bibleplugin.py" line="199"/>
+        <location filename="openlp/plugins/bibles/bibleplugin.py" line="216"/>
         <source>Send the selected Bible live.</source>
         <translation>Stuur die geselekteerde Bybel regstreeks.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/bibleplugin.py" line="200"/>
+        <location filename="openlp/plugins/bibles/bibleplugin.py" line="217"/>
         <source>Add the selected Bible to the service.</source>
         <translation>Voeg die geselekteerde Bybel by die diens.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/bibleplugin.py" line="149"/>
+        <location filename="openlp/plugins/bibles/bibleplugin.py" line="170"/>
         <source>&lt;strong&gt;Bible Plugin&lt;/strong&gt;&lt;br /&gt;The Bible plugin provides the ability to display Bible verses from different sources during the service.</source>
         <translation>&lt;strong&gt;Bybel Mini-program&lt;/strong&lt;br /&gt;Die Bybel mini-program verskaf die vermoë om Bybelverse vanaf verskillende bronne te vertoon tydens die diens.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/bibleplugin.py" line="126"/>
+        <location filename="openlp/plugins/bibles/bibleplugin.py" line="148"/>
         <source>&amp;Upgrade older Bibles</source>
         <translation>&amp;Opgradeer ouer Bybels</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/bibleplugin.py" line="126"/>
+        <location filename="openlp/plugins/bibles/bibleplugin.py" line="148"/>
         <source>Upgrade the Bible databases to the latest format.</source>
         <translation>Opgradeer die Bybel databasisse na die nuutste formaat.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="93"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="94"/>
         <source>Genesis</source>
         <translation>Genesis</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="94"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="95"/>
         <source>Exodus</source>
         <translation>Eksodus</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="95"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="96"/>
         <source>Leviticus</source>
         <translation>Livitikus</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="96"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="97"/>
         <source>Numbers</source>
         <translation>Numeri</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="97"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="98"/>
         <source>Deuteronomy</source>
         <translation>Deuterononium</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="98"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="99"/>
         <source>Joshua</source>
         <translation>Josua</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="99"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="100"/>
         <source>Judges</source>
         <translation>Rigters</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="100"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="101"/>
         <source>Ruth</source>
         <translation>Rut</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="101"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="102"/>
         <source>1 Samuel</source>
         <translation>1 Samuel</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="102"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="103"/>
         <source>2 Samuel</source>
         <translation>2 Samuel</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="103"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="104"/>
         <source>1 Kings</source>
         <translation>1 Konings</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="104"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="105"/>
         <source>2 Kings</source>
         <translation>2 Konings</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="105"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="106"/>
         <source>1 Chronicles</source>
         <translation>1 Kronieke</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="106"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="107"/>
         <source>2 Chronicles</source>
         <translation>2 Kronieke</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="107"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="108"/>
         <source>Ezra</source>
         <translation>Esra</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="108"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="109"/>
         <source>Nehemiah</source>
         <translation>Nehemia</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="109"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="110"/>
         <source>Esther</source>
         <translation>Ester</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="110"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="111"/>
         <source>Job</source>
         <translation>Job</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="111"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="112"/>
         <source>Psalms</source>
         <translation>Psalms</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="112"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="113"/>
         <source>Proverbs</source>
         <translation>Spreuke van Salomo</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="113"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="114"/>
         <source>Ecclesiastes</source>
         <translation>Prediker</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="114"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="115"/>
         <source>Song of Solomon</source>
         <translation>Hooglied van Salomo</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="115"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="116"/>
         <source>Isaiah</source>
         <translation>Jesaja</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="116"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="117"/>
         <source>Jeremiah</source>
         <translation>Jeremia</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="117"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="118"/>
         <source>Lamentations</source>
         <translation>Klaagliedere van Jeremia</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="118"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="119"/>
         <source>Ezekiel</source>
         <translation>Esegiël</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="119"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="120"/>
         <source>Daniel</source>
         <translation>Daniël</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="120"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="121"/>
         <source>Hosea</source>
         <translation>Hosea</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="121"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="122"/>
         <source>Joel</source>
         <translation>Joël</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="122"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="123"/>
         <source>Amos</source>
         <translation>Amos</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="123"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="124"/>
         <source>Obadiah</source>
         <translation>Obadja</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="124"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="125"/>
         <source>Jonah</source>
         <translation>Jona</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="125"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="126"/>
         <source>Micah</source>
         <translation>Miga</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="126"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="127"/>
         <source>Nahum</source>
         <translation>Nahum</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="127"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="128"/>
         <source>Habakkuk</source>
         <translation>Habakuk</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="128"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="129"/>
         <source>Zephaniah</source>
         <translation>Sefanja</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="129"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="130"/>
         <source>Haggai</source>
         <translation>Haggai</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="130"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="131"/>
         <source>Zechariah</source>
         <translation>Sagaria</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="131"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="132"/>
         <source>Malachi</source>
         <translation>Maleagi</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="132"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="133"/>
         <source>Matthew</source>
         <translation>Matteus</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="133"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="134"/>
         <source>Mark</source>
         <translation>Markus</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="134"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="135"/>
         <source>Luke</source>
         <translation>Lukas</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="135"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="136"/>
         <source>John</source>
         <translation>Johannes</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="136"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="137"/>
         <source>Acts</source>
         <translation>Handelinge</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="137"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="138"/>
         <source>Romans</source>
         <translation>Romeine</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="138"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="139"/>
         <source>1 Corinthians</source>
         <translation>1 Korintiërs</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="139"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="140"/>
         <source>2 Corinthians</source>
         <translation>2 Korintiërs</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="140"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="141"/>
         <source>Galatians</source>
         <translation>Galasiërs</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="141"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="142"/>
         <source>Ephesians</source>
         <translation>Effesiërs</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="142"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="143"/>
         <source>Philippians</source>
         <translation>Filippense</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="143"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="144"/>
         <source>Colossians</source>
         <translation>Kolossense</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="144"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="145"/>
         <source>1 Thessalonians</source>
         <translation>1 Tessalonisense</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="145"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="146"/>
         <source>2 Thessalonians</source>
         <translation>2 Tessalonisense</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="146"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="147"/>
         <source>1 Timothy</source>
         <translation>1 Timoteus</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="147"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="148"/>
         <source>2 Timothy</source>
         <translation>2 Timoteus</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="148"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="149"/>
         <source>Titus</source>
         <translation>Titus</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="149"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="150"/>
         <source>Philemon</source>
         <translation>Filemon</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="150"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="151"/>
         <source>Hebrews</source>
         <translation>Hebreërs</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="151"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="152"/>
         <source>James</source>
         <translation>Jakobus</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="152"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="153"/>
         <source>1 Peter</source>
         <translation>1 Petrus</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="153"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="154"/>
         <source>2 Peter</source>
         <translation>2 Petrus</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="154"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="155"/>
         <source>1 John</source>
         <translation>1 Johannes</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="155"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="156"/>
         <source>2 John</source>
         <translation>2 Johannes</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="156"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="157"/>
         <source>3 John</source>
         <translation>3 Johannes</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="157"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="158"/>
         <source>Jude</source>
         <translation>Judas</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="158"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="159"/>
         <source>Revelation</source>
         <translation>Openbaring</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="159"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="160"/>
         <source>Judith</source>
         <translation>Judit</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="160"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="161"/>
         <source>Wisdom</source>
         <translation>Wysheid van Salomo</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="161"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="162"/>
         <source>Tobit</source>
         <translation>Tobit</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="162"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="163"/>
         <source>Sirach</source>
         <translation>Sirag</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="163"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="164"/>
         <source>Baruch</source>
         <translation>Barug</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="164"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="165"/>
         <source>1 Maccabees</source>
         <translation>1 Makkabeërs</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="165"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="166"/>
         <source>2 Maccabees</source>
         <translation>2 Makkabeërs</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="166"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="167"/>
         <source>3 Maccabees</source>
         <translation>3 Makkabeërs</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="167"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="168"/>
         <source>4 Maccabees</source>
         <translation>4 Makkabeërs</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="168"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="169"/>
         <source>Rest of Daniel</source>
         <translation>Byvoegings tot Daniël</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="169"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="170"/>
         <source>Rest of Esther</source>
         <translation>Byvoegings tot Ester</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="170"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="171"/>
         <source>Prayer of Manasses</source>
         <translation>Gebed van Manasse</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="171"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="172"/>
         <source>Letter of Jeremiah</source>
         <translation>Brief van Jeremia</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="172"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="173"/>
         <source>Prayer of Azariah</source>
         <translation>Gebed van Asarja</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="173"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="174"/>
         <source>Susanna</source>
         <translation>Susanna</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="174"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="175"/>
         <source>Bel</source>
         <translation>Bel en die Draak</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="175"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="176"/>
         <source>1 Esdras</source>
         <translation>1 Esdras</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="176"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="177"/>
         <source>2 Esdras</source>
         <translation>2 Esdras</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="185"/>
-        <source>:|v|V|verse|verses;;-|to;;,|and;;end</source>
-        <comment>Double-semicolon delimited separators for parsing references. Consult the developers for further information.</comment>
-        <translation>:|v|V|verse|verses;;-|to;;,|and;;end</translation>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="186"/>
+        <source>:|v|V|verse|verses;;-|to;;,|and;;end Double-semicolon delimited separators for parsing references. Consult the developers for further information.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>BiblesPlugin.BibleEditForm</name>
     <message>
-        <location filename="openlp/plugins/bibles/forms/editbibleform.py" line="157"/>
+        <location filename="openlp/plugins/bibles/forms/editbibleform.py" line="148"/>
         <source>You need to specify a version name for your Bible.</source>
         <translation>Dit is nodig dat &apos;n weergawe naam vir die Bybel gespesifiseer word.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/editbibleform.py" line="163"/>
+        <location filename="openlp/plugins/bibles/forms/editbibleform.py" line="154"/>
         <source>You need to set a copyright for your Bible. Bibles in the Public Domain need to be marked as such.</source>
         <translation>&apos;n Kopiereg moet vir jou Bybel ingestel word. Bybels in die Publieke Domein moet sodanig gemerk word. </translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/editbibleform.py" line="172"/>
+        <location filename="openlp/plugins/bibles/forms/editbibleform.py" line="162"/>
         <source>Bible Exists</source>
         <translation>Bybel Bestaan</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/editbibleform.py" line="172"/>
+        <location filename="openlp/plugins/bibles/forms/editbibleform.py" line="162"/>
         <source>This Bible already exists. Please import a different Bible or first delete the existing one.</source>
         <translation>Hierdie Bybel bestaan reeds. Voer asseblief &apos;n ander Bybel in, of wis eerstens die bestaande een uit.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/editbibleform.py" line="187"/>
+        <location filename="openlp/plugins/bibles/forms/editbibleform.py" line="176"/>
         <source>You need to specify a book name for &quot;%s&quot;.</source>
         <translation>&apos;n Boek naam moet vir &quot;%s&quot; gespesifiseer word.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/editbibleform.py" line="194"/>
+        <location filename="openlp/plugins/bibles/forms/editbibleform.py" line="183"/>
         <source>The book name &quot;%s&quot; is not correct.
 Numbers can only be used at the beginning and must
 be followed by one or more non-numeric characters.</source>
@@ -699,12 +698,12 @@
 karrakters.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/editbibleform.py" line="206"/>
+        <location filename="openlp/plugins/bibles/forms/editbibleform.py" line="195"/>
         <source>Duplicate Book Name</source>
         <translation>Duplikaat Boek Naam</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/editbibleform.py" line="206"/>
+        <location filename="openlp/plugins/bibles/forms/editbibleform.py" line="195"/>
         <source>The Book Name &quot;%s&quot; has been entered more than once.</source>
         <translation>Die Boek Naam &quot;%s&quot; is meer as een keer ingevoer.</translation>
     </message>
@@ -712,39 +711,39 @@
 <context>
     <name>BiblesPlugin.BibleManager</name>
     <message>
-        <location filename="openlp/plugins/bibles/lib/manager.py" line="428"/>
+        <location filename="openlp/plugins/bibles/lib/manager.py" line="356"/>
         <source>Scripture Reference Error</source>
         <translation>Skrif Verwysing Fout</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/manager.py" line="418"/>
+        <location filename="openlp/plugins/bibles/lib/manager.py" line="348"/>
         <source>Web Bible cannot be used</source>
         <translation>Web Bybel kan nie gebruik word nie</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/manager.py" line="418"/>
+        <location filename="openlp/plugins/bibles/lib/manager.py" line="348"/>
         <source>Text Search is not available with Web Bibles.</source>
         <translation>Teks Soektog is nie beskikbaar met Web Bybels nie.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/manager.py" line="428"/>
+        <location filename="openlp/plugins/bibles/lib/manager.py" line="356"/>
         <source>You did not enter a search keyword.
 You can separate different keywords by a space to search for all of your keywords and you can separate them by a comma to search for one of them.</source>
         <translation>Daar is nie &apos;n soek sleutelwoord ingevoer nie.
 Vir &apos;n soektog wat alle sleutelwoorde bevat, skei die woorde deur middel van &apos;n spasie. Vir &apos;n soektog wat een van die sleutelwoorde bevat, skei die woorde deur middel van &apos;n komma.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/manager.py" line="402"/>
+        <location filename="openlp/plugins/bibles/lib/manager.py" line="334"/>
         <source>There are no Bibles currently installed. Please use the Import Wizard to install one or more Bibles.</source>
         <translation>Huidig is daar geen Bybels geïnstalleer nie. Gebruik asseblief die Invoer Gids om een of meer Bybels te installeer.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/manager.py" line="402"/>
+        <location filename="openlp/plugins/bibles/lib/manager.py" line="334"/>
         <source>No Bibles Available</source>
         <translation>Geeb Bybels Beskikbaar nie</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/manager.py" line="340"/>
+        <location filename="openlp/plugins/bibles/lib/manager.py" line="285"/>
         <source>Your scripture reference is either not supported by OpenLP or is invalid. Please make sure your reference conforms to one of the following patterns or consult the manual:
 
 Book Chapter
@@ -767,79 +766,79 @@
 <context>
     <name>BiblesPlugin.BiblesTab</name>
     <message>
-        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="225"/>
+        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="163"/>
         <source>Verse Display</source>
         <translation>Vers Vertoning</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="227"/>
+        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="165"/>
         <source>Only show new chapter numbers</source>
         <translation>Vertoon net nuwe hoofstuk nommers</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="232"/>
+        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="168"/>
         <source>Bible theme:</source>
         <translation>Bybel tema:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="240"/>
+        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="172"/>
         <source>No Brackets</source>
         <translation>Geen Hakkies</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="242"/>
+        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="174"/>
         <source>( And )</source>
         <translation>( En )</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="244"/>
+        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="176"/>
         <source>{ And }</source>
         <translation>{ En }</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="246"/>
+        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="178"/>
         <source>[ And ]</source>
         <translation>[ En ]</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="248"/>
+        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="180"/>
         <source>Note:
 Changes do not affect verses already in the service.</source>
         <translation>Nota:
 Veranderinge affekteer nie verse wat reeds in die diens is nie.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="250"/>
+        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="182"/>
         <source>Display second Bible verses</source>
         <translation>Vertoon tweede Bybel se verse</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="252"/>
+        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="183"/>
         <source>Custom Scripture References</source>
         <translation>Aangepasde Skrifgedeelte Verwysing</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="254"/>
+        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="184"/>
         <source>Verse Separator:</source>
         <translation>Vers Verdeler:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="256"/>
+        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="185"/>
         <source>Range Separator:</source>
         <translation>Reeks Verdeler:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="258"/>
+        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="186"/>
         <source>List Separator:</source>
         <translation>Lys Verdeler:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="260"/>
+        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="187"/>
         <source>End Mark:</source>
         <translation>End Merk:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="262"/>
+        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="188"/>
         <source>Multiple alternative verse separators may be defined.
 They have to be separated by a vertical bar &quot;|&quot;.
 Please clear this edit line to use the default value.</source>
@@ -848,59 +847,37 @@
 Maak asseblief hierdie redigeer lyn skoon om die verstek waarde te gebruik.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="267"/>
-        <source>Multiple alternative range separators may be defined.
-They have to be separated by a vertical bar &quot;|&quot;.
-Please clear this edit line to use the default value.</source>
-        <translation>Veelvoudige alternatiewe reeks verdelers mag gedefinieer word.
-Hulle moet geskei word deur &apos;n vertikale staaf &quot;|&quot;.
-Maak asseblief hierdie redigeer lyn skoon om die verstek waarde te gebruik.</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="272"/>
-        <source>Multiple alternative list separators may be defined.
-They have to be separated by a vertical bar &quot;|&quot;.
-Please clear this edit line to use the default value.</source>
-        <translation>Veelvoudige alternatiewe lys verdelers mag gedefinieer word.
-Hulle moet geskei word deur &apos;n vertikale staaf &quot;|&quot;.
-Maak asseblief hierdie redigeer lyn skoon om die verstek waarde te gebruik.</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="277"/>
-        <source>Multiple alternative end marks may be defined.
-They have to be separated by a vertical bar &quot;|&quot;.
-Please clear this edit line to use the default value.</source>
-        <translation>Veelvoudige alternatiewe end merkers mag gedefinieer word.
-Hulle moet geskei word deur &apos;n vertikale staaf &quot;|&quot;.
-Maak asseblief hierdie redigeer lyn skoon om die verstek waarde te gebruik.</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="292"/>
+        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="202"/>
         <source>English</source>
         <translation>Engels</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="282"/>
+        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="195"/>
         <source>Default Bible Language</source>
         <translation>Verstek Bybel Taal</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="284"/>
+        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="196"/>
         <source>Book name language in search field,
 search results and on display:</source>
         <translation>Boek naam taal in soek veld,
 soek resultate en op die vertoning:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="287"/>
+        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="198"/>
         <source>Bible Language</source>
         <translation>Bybel Taal</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="289"/>
+        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="200"/>
         <source>Application Language</source>
         <translation>Program Taal</translation>
     </message>
+    <message>
+        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="164"/>
+        <source>Show verse numbers</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>BiblesPlugin.BookNameDialog</name>
@@ -910,37 +887,37 @@
         <translation>Selekteer Boek Naam</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/booknamedialog.py" line="97"/>
+        <location filename="openlp/plugins/bibles/forms/booknamedialog.py" line="96"/>
         <source>Current name:</source>
         <translation>Huidige naam:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/booknamedialog.py" line="99"/>
+        <location filename="openlp/plugins/bibles/forms/booknamedialog.py" line="97"/>
         <source>Corresponding name:</source>
         <translation>Ooreenstemmende naam:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/booknamedialog.py" line="101"/>
+        <location filename="openlp/plugins/bibles/forms/booknamedialog.py" line="98"/>
         <source>Show Books From</source>
         <translation>Wys Boeke Van</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/booknamedialog.py" line="103"/>
+        <location filename="openlp/plugins/bibles/forms/booknamedialog.py" line="99"/>
         <source>Old Testament</source>
         <translation>Ou Testament</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/booknamedialog.py" line="105"/>
+        <location filename="openlp/plugins/bibles/forms/booknamedialog.py" line="100"/>
         <source>New Testament</source>
         <translation>Nuwe Testament</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/booknamedialog.py" line="107"/>
+        <location filename="openlp/plugins/bibles/forms/booknamedialog.py" line="101"/>
         <source>Apocrypha</source>
         <translation>Apokriewe</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/booknamedialog.py" line="94"/>
+        <location filename="openlp/plugins/bibles/forms/booknamedialog.py" line="93"/>
         <source>The following book name cannot be matched up internally. Please select the corresponding name from the list.</source>
         <translation>Die volgende boek name kon nie intern gepas word nie. Kies asseblief die ooreenstemmende naam van die lys.</translation>
     </message>
@@ -948,7 +925,7 @@
 <context>
     <name>BiblesPlugin.BookNameForm</name>
     <message>
-        <location filename="openlp/plugins/bibles/forms/booknameform.py" line="125"/>
+        <location filename="openlp/plugins/bibles/forms/booknameform.py" line="115"/>
         <source>You need to select a book.</source>
         <translation>Kies asseblief &apos;n boek.</translation>
     </message>
@@ -956,88 +933,87 @@
 <context>
     <name>BiblesPlugin.CSVBible</name>
     <message>
-        <location filename="openlp/plugins/bibles/lib/csvbible.py" line="112"/>
+        <location filename="openlp/plugins/bibles/lib/csvbible.py" line="113"/>
         <source>Importing books... %s</source>
         <translation>Boek invoer... %s</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/csvbible.py" line="156"/>
-        <source>Importing verses from %s...</source>
-        <comment>Importing verses from &lt;book name&gt;...</comment>
-        <translation>Vers invoer vanaf %s...</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/bibles/lib/csvbible.py" line="165"/>
+        <location filename="openlp/plugins/bibles/lib/csvbible.py" line="161"/>
         <source>Importing verses... done.</source>
         <translation>Vers invoer... voltooi.</translation>
     </message>
+    <message>
+        <location filename="openlp/plugins/bibles/lib/csvbible.py" line="152"/>
+        <source>Importing verses from %s... Importing verses from &lt;book name&gt;...</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>BiblesPlugin.EditBibleForm</name>
     <message>
-        <location filename="openlp/plugins/bibles/forms/editbibledialog.py" line="147"/>
+        <location filename="openlp/plugins/bibles/forms/editbibledialog.py" line="132"/>
         <source>Bible Editor</source>
         <translation>Bybel Redigeerder</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/editbibledialog.py" line="153"/>
+        <location filename="openlp/plugins/bibles/forms/editbibledialog.py" line="136"/>
         <source>License Details</source>
         <translation>Lisensie Besonderhede</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/editbibledialog.py" line="155"/>
+        <location filename="openlp/plugins/bibles/forms/editbibledialog.py" line="137"/>
         <source>Version name:</source>
         <translation>Weergawe naam:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/editbibledialog.py" line="157"/>
+        <location filename="openlp/plugins/bibles/forms/editbibledialog.py" line="138"/>
         <source>Copyright:</source>
         <translation>Kopiereg:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/editbibledialog.py" line="159"/>
+        <location filename="openlp/plugins/bibles/forms/editbibledialog.py" line="139"/>
         <source>Permissions:</source>
         <translation>Toestemming:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/editbibledialog.py" line="161"/>
+        <location filename="openlp/plugins/bibles/forms/editbibledialog.py" line="140"/>
         <source>Default Bible Language</source>
         <translation>Verstek Bybel Taal</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/editbibledialog.py" line="163"/>
+        <location filename="openlp/plugins/bibles/forms/editbibledialog.py" line="141"/>
         <source>Book name language in search field, search results and on display:</source>
         <translation>Boek naam taal in soek veld, soek resultate en op die vertoning:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/editbibledialog.py" line="167"/>
+        <location filename="openlp/plugins/bibles/forms/editbibledialog.py" line="144"/>
         <source>Global Settings</source>
         <translation>Globale Instellings</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/editbibledialog.py" line="169"/>
+        <location filename="openlp/plugins/bibles/forms/editbibledialog.py" line="145"/>
         <source>Bible Language</source>
         <translation>Bybel Taal</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/editbibledialog.py" line="171"/>
+        <location filename="openlp/plugins/bibles/forms/editbibledialog.py" line="148"/>
         <source>Application Language</source>
         <translation>Program Taal</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/editbibledialog.py" line="174"/>
+        <location filename="openlp/plugins/bibles/forms/editbibledialog.py" line="150"/>
         <source>English</source>
         <translation>Engels</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/editbibleform.py" line="83"/>
+        <location filename="openlp/plugins/bibles/forms/editbibleform.py" line="80"/>
         <source>This is a Web Download Bible.
 It is not possible to customize the Book Names.</source>
         <translation>Hierdie is &apos;n Web Aflaai Bybel.
 Dit is nie moontlik om die Boek Name aan te pas nie.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/editbibleform.py" line="88"/>
+        <location filename="openlp/plugins/bibles/forms/editbibleform.py" line="85"/>
         <source>To use the customized book names, &quot;Bible language&quot; must be selected on the Meta Data tab or, if &quot;Global settings&quot; is selected, on the Bible page in Configure OpenLP.</source>
         <translation>Om eie boek name te gebruik, &quot;Bybel taal&quot; moet in die Meta Data blad gekies wees, of wanneer &quot;Globale instellings&quot; geselekteer is, op die Bybel bladsy OpenLP Instelling.</translation>
     </message>
@@ -1045,38 +1021,38 @@
 <context>
     <name>BiblesPlugin.HTTPBible</name>
     <message>
-        <location filename="openlp/plugins/bibles/lib/http.py" line="514"/>
+        <location filename="openlp/plugins/bibles/lib/http.py" line="474"/>
         <source>Registering Bible and loading books...</source>
         <translation>Registreer Bybel en laai boeke...</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/http.py" line="539"/>
+        <location filename="openlp/plugins/bibles/lib/http.py" line="498"/>
         <source>Registering Language...</source>
         <translation>Taal registrasie...</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/http.py" line="555"/>
+        <location filename="openlp/plugins/bibles/lib/http.py" line="511"/>
         <source>Importing %s...</source>
         <comment>Importing &lt;book name&gt;...</comment>
         <translation>Voer %s in...</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/http.py" line="722"/>
+        <location filename="openlp/plugins/bibles/lib/http.py" line="655"/>
         <source>Download Error</source>
         <translation>Aflaai Fout</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/http.py" line="722"/>
+        <location filename="openlp/plugins/bibles/lib/http.py" line="655"/>
         <source>There was a problem downloading your verse selection. Please check your Internet connection, and if this error continues to occur please consider reporting a bug.</source>
         <translation>Daar was &apos;n probleem om die vers seleksie af te laai. Gaan die Internet konneksie na en as hierdie probleem voortduur, oorweeg dit asseblief om &apos;n gogga te rapporteer.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/http.py" line="729"/>
+        <location filename="openlp/plugins/bibles/lib/http.py" line="661"/>
         <source>Parse Error</source>
         <translation>Ontleed Fout</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/http.py" line="729"/>
+        <location filename="openlp/plugins/bibles/lib/http.py" line="661"/>
         <source>There was a problem extracting your verse selection. If this error continues to occur please consider reporting a bug.</source>
         <translation>Daar was &apos;n probleem om die vers seleksie te onttrek. As hierdie probleem voortduur, oorweeg dit asseblief om &apos;n gogga te rapporteer.</translation>
     </message>
@@ -1084,167 +1060,162 @@
 <context>
     <name>BiblesPlugin.ImportWizardForm</name>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="351"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="281"/>
         <source>Bible Import Wizard</source>
         <translation>Bybel Invoer Gids</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="355"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="284"/>
         <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 &apos;n verskeidenheid formate in te voer. Kliek die volgende knoppie hieronder om die proses te begin deur &apos;n formaat te kies om in te voer.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="366"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="295"/>
         <source>Web Download</source>
         <translation>Web Aflaai</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="379"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="301"/>
         <source>Location:</source>
         <translation>Ligging:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="381"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="302"/>
         <source>Crosswalk</source>
         <translation>Crosswalk</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="383"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="304"/>
         <source>BibleGateway</source>
         <translation>BibleGateway</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="387"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="308"/>
         <source>Bible:</source>
         <translation>Bybel:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="389"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="309"/>
         <source>Download Options</source>
         <translation>Aflaai Opsies</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="392"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="311"/>
         <source>Server:</source>
         <translation>Bediener:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="394"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="312"/>
         <source>Username:</source>
         <translation>Gebruikersnaam:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="396"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="313"/>
         <source>Password:</source>
         <translation>Wagwoord:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="398"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="314"/>
         <source>Proxy Server (Optional)</source>
         <translation>Tussenganger Bediener (Opsioneel)</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="402"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="317"/>
         <source>License Details</source>
         <translation>Lisensie Besonderhede</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="404"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="319"/>
         <source>Set up the Bible&apos;s license details.</source>
         <translation>Stel hierdie Bybel se lisensie besonderhede op.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="407"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="321"/>
         <source>Version name:</source>
         <translation>Weergawe naam:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="409"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="322"/>
         <source>Copyright:</source>
         <translation>Kopiereg:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="414"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="325"/>
         <source>Please wait while your Bible is imported.</source>
         <translation>Wag asseblief terwyl u Bybel ingevoer word.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="445"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="351"/>
         <source>You need to specify a file with books of the Bible to use in the import.</source>
         <translation>&apos;n Lêer met boeke van die Bybel moet gespesifiseer word vir gebruik tydens die invoer.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="452"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="358"/>
         <source>You need to specify a file of Bible verses to import.</source>
         <translation>&apos;n Lêer met Bybel verse moet gespesifiseer word om in te voer.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="483"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="378"/>
         <source>You need to specify a version name for your Bible.</source>
-        <translation>&apos;n Weergawe naam moet vir die Bybel gespesifiseer word.</translation>
+        <translation>Dit is nodig dat &apos;n weergawe naam vir die Bybel gespesifiseer word.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="489"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="384"/>
         <source>You need to set a copyright for your Bible. Bibles in the Public Domain need to be marked as such.</source>
-        <translation>Die Bybel benodig &apos;n kopiereg. Bybels in die Publieke Domein moet daarvolgens gemerk word.</translation>
+        <translation>&apos;n Kopiereg moet vir jou Bybel ingestel word. Bybels in die Publieke Domein moet sodanig gemerk word. </translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="505"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="399"/>
         <source>Bible Exists</source>
-        <translation>Bybel Bestaan reeds</translation>
+        <translation>Bybel Bestaan</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="505"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="399"/>
         <source>This Bible already exists. Please import a different Bible or first delete the existing one.</source>
-        <translation>Hierdie Bybel bestaan reeds. Voer asseblief &apos;n ander Bybel in of wis eers die bestaande een uit.</translation>
+        <translation>Hierdie Bybel bestaan reeds. Voer asseblief &apos;n ander Bybel in, of wis eerstens die bestaande een uit.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="726"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="575"/>
         <source>Your Bible import failed.</source>
         <translation>Die Bybel invoer het misluk.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="548"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="439"/>
         <source>CSV File</source>
         <translation>KGW Lêer</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="385"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="306"/>
         <source>Bibleserver</source>
         <translation>Bybelbediener</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="411"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="323"/>
         <source>Permissions:</source>
         <translation>Toestemming:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="377"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="300"/>
         <source>Bible file:</source>
         <translation>Bybel lêer:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="373"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="298"/>
         <source>Books file:</source>
         <translation>Boeke lêer:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="375"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="299"/>
         <source>Verses file:</source>
         <translation>Verse lêer:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="563"/>
-        <source>openlp.org 1.x Bible Files</source>
-        <translation>openlp.org 1.x Bybel Lêers</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="657"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="524"/>
         <source>Registering Bible...</source>
         <translation>Bybel word geregistreer...</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="719"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="569"/>
         <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 aan-
@@ -1259,7 +1230,7 @@
         <translation>Kies &apos;n Taal</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/languagedialog.py" line="77"/>
+        <location filename="openlp/plugins/bibles/forms/languagedialog.py" line="76"/>
         <source>OpenLP is unable to determine the language of this translation of the Bible. Please select the language from the list below.</source>
         <translation>OpenLP is nie in staat om die taal van hierdie vertaling Bybel te bepaal nie. Kies asseblief die taal van die lys hieronder.</translation>
     </message>
@@ -1272,7 +1243,7 @@
 <context>
     <name>BiblesPlugin.LanguageForm</name>
     <message>
-        <location filename="openlp/plugins/bibles/forms/languageform.py" line="68"/>
+        <location filename="openlp/plugins/bibles/forms/languageform.py" line="69"/>
         <source>You need to choose a language.</source>
         <translation>Kies asseblief &apos;n taal.</translation>
     </message>
@@ -1280,57 +1251,57 @@
 <context>
     <name>BiblesPlugin.MediaItem</name>
     <message>
-        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="211"/>
+        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="200"/>
         <source>Quick</source>
         <translation>Vinnig</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="316"/>
+        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="284"/>
         <source>Find:</source>
         <translation>Vind:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="331"/>
+        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="294"/>
         <source>Book:</source>
         <translation>Boek:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="333"/>
+        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="295"/>
         <source>Chapter:</source>
         <translation>Hoofstuk:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="335"/>
+        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="296"/>
         <source>Verse:</source>
         <translation>Vers:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="337"/>
+        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="297"/>
         <source>From:</source>
         <translation>Vanaf:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="339"/>
+        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="298"/>
         <source>To:</source>
         <translation>Tot:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="359"/>
+        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="313"/>
         <source>Text Search</source>
         <translation>Teks Soektog</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="342"/>
+        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="300"/>
         <source>Second:</source>
         <translation>Tweede:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="359"/>
+        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="313"/>
         <source>Scripture Reference</source>
         <translation>Skrif Verwysing</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="351"/>
+        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="305"/>
         <source>Toggle to keep or clear the previous results.</source>
         <translation>Wissel om die vorige resultate te behou of te verwyder.</translation>
     </message>
@@ -1340,32 +1311,32 @@
         <translation>Enkel en dubbel Bybel-vers soek-resultate kan nie gekombineer word nie. Wis die resultate uit en begin &apos;n nuwe soektog?</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="485"/>
+        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="417"/>
         <source>Bible not fully loaded.</source>
         <translation>Die Bybel is nie ten volle gelaai nie.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="793"/>
+        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="691"/>
         <source>Information</source>
         <translation>Informasie</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="793"/>
+        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="691"/>
         <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. %d verses have not been included in the results.</source>
         <translation>Die tweede Bybel het nie al die verse wat in die hoof Bybel is nie. Slegs verse wat in beide Bybels voorkom, sal gewys word. %d verse is nie by die resultate ingesluit nie.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="359"/>
+        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="313"/>
         <source>Search Scripture Reference...</source>
         <translation>Soek Skriflesing Verwysing...</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="359"/>
+        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="313"/>
         <source>Search Text...</source>
         <translation>Soek Teks...</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="571"/>
+        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="505"/>
         <source>Are you sure you want to completely delete &quot;%s&quot; Bible from OpenLP?
 
 You will need to re-import this Bible to use it again.</source>
@@ -1377,29 +1348,20 @@
 <context>
     <name>BiblesPlugin.OpenSongImport</name>
     <message>
-        <location filename="openlp/plugins/bibles/lib/opensong.py" line="140"/>
+        <location filename="openlp/plugins/bibles/lib/opensong.py" line="131"/>
         <source>Incorrect Bible file type supplied. OpenSong Bibles may be compressed. You must decompress them before import.</source>
         <translation>Ongeldige Bybel lêer</translation>
     </message>
 </context>
 <context>
-    <name>BiblesPlugin.Opensong</name>
-    <message>
-        <location filename="openlp/plugins/bibles/lib/opensong.py" line="133"/>
-        <source>Importing %s %s...</source>
-        <comment>Importing &lt;book name&gt; &lt;chapter&gt;...</comment>
-        <translation>Invoer %s %s...</translation>
-    </message>
-</context>
-<context>
     <name>BiblesPlugin.OsisImport</name>
     <message>
-        <location filename="openlp/plugins/bibles/lib/osis.py" line="89"/>
+        <location filename="openlp/plugins/bibles/lib/osis.py" line="87"/>
         <source>Detecting encoding (this may take a few minutes)...</source>
         <translation>Bepaal enkodering (dit mag &apos;n paar minuute neem)...</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/osis.py" line="162"/>
+        <location filename="openlp/plugins/bibles/lib/osis.py" line="157"/>
         <source>Importing %s %s...</source>
         <comment>Importing &lt;book name&gt; &lt;chapter&gt;...</comment>
         <translation>Invoer %s %s...</translation>
@@ -1408,122 +1370,122 @@
 <context>
     <name>BiblesPlugin.UpgradeWizardForm</name>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="124"/>
+        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="114"/>
         <source>Select a Backup Directory</source>
         <translation>Kies &apos;n Rugsteun Ligging</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="261"/>
+        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="240"/>
         <source>Bible Upgrade Wizard</source>
         <translation>Bybel Opgradeer Gids</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="265"/>
+        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="243"/>
         <source>This wizard will help you to upgrade your existing Bibles from a prior version of OpenLP 2. Click the next button below to start the upgrade process.</source>
         <translation>Hierdie gids sal help om die bestaande Bybels vanaf &apos;n vorige weergawe van OpenLP 2.0 op te gradeer. Kliek die volgende knoppie hier-onder om die opgradeer proses te begin.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="270"/>
+        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="247"/>
         <source>Select Backup Directory</source>
         <translation>Kies Rugsteun Ligging</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="273"/>
+        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="248"/>
         <source>Please select a backup directory for your Bibles</source>
         <translation>Kies asseblief &apos;n rugsteun liging vir die Bybels</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="276"/>
+        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="250"/>
         <source>Previous releases of OpenLP 2.0 are unable to use upgraded Bibles. This will create a backup of your current Bibles so that you can simply copy the files back to your OpenLP data directory if you need to revert to a previous release of OpenLP. Instructions on how to restore the files can be found in our &lt;a href=&quot;http://wiki.openlp.org/faq&quot;&gt;Frequently Asked Questions&lt;/a&gt;.</source>
         <translation>Vorige weergawes van OpenLP 2.0 is nie in staat om opgegradeerde Bybels te gebruik nie. Hierdie sal &apos;n rugsteun van die bestaande Bybels maak sodat indien dit nodig is om terug te gaan na &apos;n vorige weergawe van OpenLP, die Bybels net terug gekopiër kan word. Instruksies oor hoe om lêers te herstel kan gevind word by ons &lt;a href=&quot;http://wiki.openlp.org/faq&quot;&gt;Gereelde Vrae&lt;/a&gt;.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="283"/>
+        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="258"/>
         <source>Please select a backup location for your Bibles.</source>
         <translation>Kies asseblief &apos;n rugsteun ligging vir die Bybels.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="285"/>
+        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="260"/>
         <source>Backup Directory:</source>
         <translation>Rugsteun Ligging:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="287"/>
+        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="261"/>
         <source>There is no need to backup my Bibles</source>
         <translation>Dit is nie nodig om die Bybels op te gradeer nie</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="290"/>
+        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="263"/>
         <source>Select Bibles</source>
         <translation>Kies Bybels</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="293"/>
+        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="264"/>
         <source>Please select the Bibles to upgrade</source>
         <translation>Kies asseblief die Bybels om op te gradeer</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="296"/>
+        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="266"/>
         <source>Upgrading</source>
         <translation>Opgradeer</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="298"/>
+        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="267"/>
         <source>Please wait while your Bibles are upgraded.</source>
         <translation>Wag asseblief terwyl die Bybels opgradeer word.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="322"/>
+        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="290"/>
         <source>The backup was not successful.
 To backup your Bibles you need permission to write to the given directory.</source>
         <translation>Die rugsteun was nie suksesvol nie.
 Om die Bybels op te gradeer word skryf-toestemming benodig vir die gegewe lêer.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="580"/>
+        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="518"/>
         <source>Upgrading Bible %s of %s: &quot;%s&quot;
 Failed</source>
         <translation>Opgradeer Bybel %s van %s: &quot;%s&quot;
 Gevaal</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="409"/>
+        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="372"/>
         <source>Upgrading Bible %s of %s: &quot;%s&quot;
 Upgrading ...</source>
         <translation>Opgradeer Bybel %s van %s: &quot;%s&quot;
 Opgradeer ...</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="450"/>
+        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="408"/>
         <source>Download Error</source>
         <translation>Aflaai Fout</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="450"/>
+        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="408"/>
         <source>To upgrade your Web Bibles an Internet connection is required.</source>
         <translation>Om die Web Bybels op te gradeer is &apos;n Internet verbinding nodig.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="546"/>
+        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="490"/>
         <source>Upgrading Bible %s of %s: &quot;%s&quot;
 Upgrading %s ...</source>
         <translation>Opgradeer Bybel %s van %s: &quot;%s&quot;
 Opgradering %s...</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="588"/>
+        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="525"/>
         <source>Upgrading Bible %s of %s: &quot;%s&quot;
 Complete</source>
         <translation>Opgradeer Bybel %s van %s: &quot;%s&quot;
 Volledig</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="615"/>
+        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="550"/>
         <source>, %s failed</source>
         <translation>, %s het gevaal</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="622"/>
+        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="556"/>
         <source>Upgrading Bible(s): %s successful%s
 Please note that verses from Web Bibles will be downloaded on demand and so an Internet connection is required.</source>
         <translation>Opgradeer Bybel(s): %s suksesvol %s
@@ -1531,27 +1493,27 @@
 word en dus is &apos;n Internet verbinding nodig.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="629"/>
+        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="562"/>
         <source>Upgrading Bible(s): %s successful%s</source>
         <translation>Opgradeer Bybel(s): %s suksesvol %s</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="634"/>
+        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="566"/>
         <source>Upgrade failed.</source>
         <translation>Opgradeer het gevaal.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="314"/>
+        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="282"/>
         <source>You need to specify a backup directory for your Bibles.</source>
         <translation>&apos;n Rugsteun Ligging moet vir die Bybels gespesifiseer word.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="371"/>
+        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="337"/>
         <source>Starting upgrade...</source>
         <translation>Opgradering begin...</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="382"/>
+        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="347"/>
         <source>There are no Bibles that need to be upgraded.</source>
         <translation>Daar is geen Bybels wat opgradering benodig nie.</translation>
     </message>
@@ -1559,18 +1521,13 @@
 <context>
     <name>CustomPlugin</name>
     <message>
-        <location filename="openlp/plugins/custom/customplugin.py" line="59"/>
-        <source>&lt;strong&gt;Custom Slide Plugin&lt;/strong&gt;&lt;br /&gt;The custom slide plugin provides the ability to set up custom text slides that can be displayed on the screen the same way songs are. This plugin provides greater freedom over the songs plugin.</source>
-        <translation>&lt;strong&gt;Aanpas Skyfie Mini-program&lt;/strong&gt;&lt;br/&gt;Die aanpas syfie mini-program verskaf die vermoë om aangepasde teks skyfies op te stel wat in dieselfde manier gebruik word as die liedere mini-program. Dié mini-program verskaf grooter vryheid as die liedere mini-program.</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/custom/customplugin.py" line="100"/>
+        <location filename="openlp/plugins/custom/customplugin.py" line="102"/>
         <source>Custom Slide</source>
         <comment>name singular</comment>
         <translation>Aangepasde Skyfie</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/custom/customplugin.py" line="102"/>
+        <location filename="openlp/plugins/custom/customplugin.py" line="103"/>
         <source>Custom Slides</source>
         <comment>name plural</comment>
         <translation>Aangepasde Skyfies</translation>
@@ -1582,73 +1539,83 @@
         <translation>Aangepasde Skyfies</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/custom/customplugin.py" line="112"/>
+        <location filename="openlp/plugins/custom/customplugin.py" line="111"/>
         <source>Load a new custom slide.</source>
         <translation>Laai &apos;n nuwe aangepasde skyfie.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/custom/customplugin.py" line="113"/>
+        <location filename="openlp/plugins/custom/customplugin.py" line="112"/>
         <source>Import a custom slide.</source>
         <translation>Voer &apos;n aangepasde skyfie in.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/custom/customplugin.py" line="114"/>
+        <location filename="openlp/plugins/custom/customplugin.py" line="113"/>
         <source>Add a new custom slide.</source>
         <translation>Voeg &apos;n nuwe aangepasde skyfie by.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/custom/customplugin.py" line="115"/>
+        <location filename="openlp/plugins/custom/customplugin.py" line="114"/>
         <source>Edit the selected custom slide.</source>
         <translation>Redigeer die geselekteerde aangepasde skyfie.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/custom/customplugin.py" line="117"/>
+        <location filename="openlp/plugins/custom/customplugin.py" line="115"/>
         <source>Delete the selected custom slide.</source>
         <translation>Wis die geselekteerde aangepasde skyfie uit.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/custom/customplugin.py" line="119"/>
+        <location filename="openlp/plugins/custom/customplugin.py" line="116"/>
         <source>Preview the selected custom slide.</source>
         <translation>Skou die geselekteerde aangepasde skyfie.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/custom/customplugin.py" line="121"/>
+        <location filename="openlp/plugins/custom/customplugin.py" line="117"/>
         <source>Send the selected custom slide live.</source>
         <translation>Stuur die geselekteerde aangepasde skuifie regstreeks.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/custom/customplugin.py" line="123"/>
+        <location filename="openlp/plugins/custom/customplugin.py" line="118"/>
         <source>Add the selected custom slide to the service.</source>
         <translation>Voeg die geselekteerde aangepasde skyfie by die diens.</translation>
     </message>
+    <message>
+        <location filename="openlp/plugins/custom/customplugin.py" line="69"/>
+        <source>&lt;strong&gt;Custom Slide Plugin &lt;/strong&gt;&lt;br /&gt;The custom slide plugin provides the ability to set up custom text slides that can be displayed on the screen the same way songs are. This plugin provides greater freedom over the songs plugin.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>CustomPlugin.CustomTab</name>
     <message>
-        <location filename="openlp/plugins/custom/lib/customtab.py" line="60"/>
+        <location filename="openlp/plugins/custom/lib/customtab.py" line="67"/>
         <source>Custom Display</source>
         <translation>Aangepasde Vertoning</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/custom/lib/customtab.py" line="62"/>
+        <location filename="openlp/plugins/custom/lib/customtab.py" line="68"/>
         <source>Display footer</source>
         <translation>Vertoon voetspasie</translation>
     </message>
+    <message>
+        <location filename="openlp/plugins/custom/lib/customtab.py" line="69"/>
+        <source>Import missing custom slides from service files</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>CustomPlugin.EditCustomForm</name>
     <message>
-        <location filename="openlp/plugins/custom/forms/editcustomdialog.py" line="108"/>
+        <location filename="openlp/plugins/custom/forms/editcustomdialog.py" line="112"/>
         <source>Edit Custom Slides</source>
         <translation>Redigeer Aangepaste Skyfies</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/custom/forms/editcustomdialog.py" line="110"/>
-        <source>&amp;Title:</source>
-        <translation>&amp;Titel:</translation>
-    </message>
-    <message>
         <location filename="openlp/plugins/custom/forms/editcustomdialog.py" line="113"/>
+        <source>&amp;Title:</source>
+        <translation>&amp;Titel:</translation>
+    </message>
+    <message>
+        <location filename="openlp/plugins/custom/forms/editcustomdialog.py" line="115"/>
         <source>Add a new slide at bottom.</source>
         <translation>Voeg nuwe skyfie by aan die onderkant.</translation>
     </message>
@@ -1658,7 +1625,7 @@
         <translation>Redigeer die geselekteerde skyfie.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/custom/forms/editcustomdialog.py" line="122"/>
+        <location filename="openlp/plugins/custom/forms/editcustomdialog.py" line="119"/>
         <source>Edit all the slides at once.</source>
         <translation>Redigeer al die skyfies tegelyk.</translation>
     </message>
@@ -1668,40 +1635,40 @@
         <translation>Verdeel &apos;n skyfie deur &apos;n skyfie-verdeler te gebruik.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/custom/forms/editcustomdialog.py" line="125"/>
+        <location filename="openlp/plugins/custom/forms/editcustomdialog.py" line="120"/>
         <source>The&amp;me:</source>
         <translation>Te&amp;ma:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/custom/forms/editcustomdialog.py" line="127"/>
+        <location filename="openlp/plugins/custom/forms/editcustomdialog.py" line="121"/>
         <source>&amp;Credits:</source>
         <translation>&amp;Krediete:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/custom/forms/editcustomform.py" line="261"/>
+        <location filename="openlp/plugins/custom/forms/editcustomform.py" line="245"/>
         <source>You need to type in a title.</source>
         <translation>&apos;n Titel word benodig.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/custom/forms/editcustomform.py" line="267"/>
-        <source>You need to add at least one slide</source>
-        <translation>Ten minste een skyfie moet bygevoeg word</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/custom/forms/editcustomdialog.py" line="120"/>
+        <location filename="openlp/plugins/custom/forms/editcustomdialog.py" line="118"/>
         <source>Ed&amp;it All</source>
         <translation>Red&amp;igeer Alles</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/custom/forms/editcustomslidedialog.py" line="57"/>
+        <location filename="openlp/plugins/custom/forms/editcustomslidedialog.py" line="58"/>
         <source>Insert Slide</source>
         <translation>Voeg &apos;n Skyfie in</translation>
     </message>
+    <message>
+        <location filename="openlp/plugins/custom/forms/editcustomform.py" line="249"/>
+        <source>You need to add at least one slide.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>CustomPlugin.EditVerseForm</name>
     <message>
-        <location filename="openlp/plugins/custom/forms/editcustomslidedialog.py" line="53"/>
+        <location filename="openlp/plugins/custom/forms/editcustomslidedialog.py" line="55"/>
         <source>Edit Slide</source>
         <translation>Redigeer Skyfie</translation>
     </message>
@@ -1709,79 +1676,137 @@
 <context>
     <name>CustomPlugin.MediaItem</name>
     <message numerus="yes">
-        <location filename="openlp/plugins/custom/lib/mediaitem.py" line="176"/>
+        <location filename="openlp/plugins/custom/lib/mediaitem.py" line="189"/>
         <source>Are you sure you want to delete the %n selected custom slide(s)?</source>
-        <translation>
-            <numerusform>Wis sekerlik die %n gekose aangepasde skyfie uit?</numerusform>
-            <numerusform>Wis sekerlik die %n gekose aangepasde skyfies uit?</numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
     <name>ImagePlugin</name>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="54"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="59"/>
         <source>&lt;strong&gt;Image Plugin&lt;/strong&gt;&lt;br /&gt;The image plugin provides displaying of images.&lt;br /&gt;One of the distinguishing features of this plugin is the ability to group a number of images together in the service manager, making the displaying of multiple images easier. This plugin can also make use of OpenLP&apos;s &quot;timed looping&quot; feature to create a slide show that runs automatically. In addition to this, images from the plugin can be used to override the current theme&apos;s background, which renders text-based items like songs with the selected image as a background instead of the background provided by the theme.</source>
         <translation>&lt;strong&gt;Beeld Mini-program&lt;/strong&gt;&lt;br/&gt;Die beeld mini-program verskaf vertoning van beelde.&lt;br/&gt;Een van die onderskeidende kenmerke van hierdie mini-program is die vermoë om beelde te groepeer in die diensbestuurder wat dit maklik maak om verskeie beelde te vertoon. Die mini-program kan ook van OpenLP se &quot;tydgebonde herhaling&quot;-funksie gebruik maak om &apos;n automatiese skyfe-vertoning te verkry. Verder kan beelde van hierdie mini-program gebruik word om die huidige tema se agtergrond te vervang hoewel &apos;n tema sy eie agtergrond het.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="73"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="100"/>
         <source>Image</source>
         <comment>name singular</comment>
         <translation>Beeld</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="74"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="101"/>
         <source>Images</source>
         <comment>name plural</comment>
         <translation>Beelde</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="78"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="104"/>
         <source>Images</source>
         <comment>container title</comment>
         <translation>Beelde</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="82"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="107"/>
         <source>Load a new image.</source>
         <translation>Laai &apos;n nuwe beeld.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="84"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="109"/>
         <source>Add a new image.</source>
         <translation>Voeg &apos;n nuwe beeld by.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="85"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="110"/>
         <source>Edit the selected image.</source>
         <translation>Redigeer die geselekteerde beeld.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="86"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="111"/>
         <source>Delete the selected image.</source>
         <translation>Wis die geselekteerde beeld uit.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="87"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="112"/>
         <source>Preview the selected image.</source>
         <translation>Skou die geselekteerde beeld.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="88"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="113"/>
         <source>Send the selected image live.</source>
         <translation>Stuur die geselekteerde beeld regstreeks.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="89"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="114"/>
         <source>Add the selected image to the service.</source>
         <translation>Voeg die geselekteerde beeld by die diens.</translation>
     </message>
 </context>
 <context>
+    <name>ImagePlugin.AddGroupForm</name>
+    <message>
+        <location filename="openlp/plugins/images/forms/addgroupdialog.py" line="62"/>
+        <source>Add group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/plugins/images/forms/addgroupdialog.py" line="63"/>
+        <source>Parent group:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/plugins/images/forms/addgroupdialog.py" line="64"/>
+        <source>Group name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/plugins/images/forms/addgroupform.py" line="74"/>
+        <source>You need to type in a group name.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/plugins/images/lib/mediaitem.py" line="634"/>
+        <source>Could not add the new group.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/plugins/images/lib/mediaitem.py" line="637"/>
+        <source>This group already exists.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ImagePlugin.ChooseGroupForm</name>
+    <message>
+        <location filename="openlp/plugins/images/forms/choosegroupdialog.py" line="88"/>
+        <source>Select Image Group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/plugins/images/forms/choosegroupdialog.py" line="89"/>
+        <source>Add images to group:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/plugins/images/forms/choosegroupdialog.py" line="90"/>
+        <source>No group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/plugins/images/forms/choosegroupdialog.py" line="91"/>
+        <source>Existing group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/plugins/images/forms/choosegroupdialog.py" line="92"/>
+        <source>New group</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ImagePlugin.ExceptionDialog</name>
     <message>
-        <location filename="openlp/core/ui/exceptionform.py" line="218"/>
+        <location filename="openlp/core/ui/exceptionform.py" line="231"/>
         <source>Select Attachment</source>
         <translation>Selekteer Aanhangsel</translation>
     </message>
@@ -1789,123 +1814,156 @@
 <context>
     <name>ImagePlugin.MediaItem</name>
     <message>
-        <location filename="openlp/plugins/images/lib/mediaitem.py" line="62"/>
+        <location filename="openlp/plugins/images/lib/mediaitem.py" line="76"/>
         <source>Select Image(s)</source>
         <translation>Selekteer beeld(e)</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/lib/mediaitem.py" line="107"/>
-        <source>You must select an image to delete.</source>
-        <translation>&apos;n Beeld om uit te wis moet geselekteer word.</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/images/lib/mediaitem.py" line="223"/>
+        <location filename="openlp/plugins/images/lib/mediaitem.py" line="656"/>
         <source>You must select an image to replace the background with.</source>
         <translation>&apos;n Beeld wat die agtergrond vervang moet gekies word.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/lib/mediaitem.py" line="191"/>
+        <location filename="openlp/plugins/images/lib/mediaitem.py" line="582"/>
         <source>Missing Image(s)</source>
         <translation>Vermisde Beeld(e)</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/lib/mediaitem.py" line="184"/>
+        <location filename="openlp/plugins/images/lib/mediaitem.py" line="576"/>
         <source>The following image(s) no longer exist: %s</source>
         <translation>Die volgende beeld(e) bestaan nie meer nie: %s</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/lib/mediaitem.py" line="191"/>
+        <location filename="openlp/plugins/images/lib/mediaitem.py" line="582"/>
         <source>The following image(s) no longer exist: %s
 Do you want to add the other images anyway?</source>
         <translation>Die volgende beeld(e) bestaan nie meer nie: %s
 Voeg steeds die ander beelde by?</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/lib/mediaitem.py" line="241"/>
+        <location filename="openlp/plugins/images/lib/mediaitem.py" line="673"/>
         <source>There was a problem replacing your background, the image file &quot;%s&quot; no longer exists.</source>
         <translation>Daar was &apos;n probleem om die agtergrond te vervang. Die beeld lêer &quot;%s&quot; bestaan ine meer nie.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/lib/mediaitem.py" line="237"/>
+        <location filename="openlp/plugins/images/lib/mediaitem.py" line="669"/>
         <source>There was no display item to amend.</source>
         <translation>Daar was geen vertoon item om by te voeg nie.</translation>
     </message>
+    <message>
+        <location filename="openlp/plugins/images/forms/addgroupform.py" line="61"/>
+        <source>-- Top-level group --</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/plugins/images/lib/mediaitem.py" line="227"/>
+        <source>You must select an image or group to delete.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/plugins/images/lib/mediaitem.py" line="243"/>
+        <source>Remove group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/plugins/images/lib/mediaitem.py" line="243"/>
+        <source>Are you sure you want to remove &quot;%s&quot; and everything in it?</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ImagesPlugin.ImageTab</name>
     <message>
-        <location filename="openlp/plugins/images/lib/imagetab.py" line="71"/>
-        <source>Background Color</source>
-        <translation>Agtergrond Kleur</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/images/lib/imagetab.py" line="73"/>
-        <source>Default Color:</source>
-        <translation>Verstek Kleur:</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/images/lib/imagetab.py" line="75"/>
+        <location filename="openlp/plugins/images/lib/imagetab.py" line="72"/>
         <source>Visible background for images with aspect ratio different to screen.</source>
         <translation>Visuele agtergrond vir beelde met &apos;n aspek verhouding wat verskil met dié van die skerm.</translation>
     </message>
 </context>
 <context>
+    <name>Media.player</name>
+    <message>
+        <location filename="openlp/core/ui/media/phononplayer.py" line="260"/>
+        <source>Phonon is a media player which interacts with the operating system to provide media capabilities.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/media/webkitplayer.py" line="393"/>
+        <source>Audio</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/media/webkitplayer.py" line="394"/>
+        <source>Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/media/vlcplayer.py" line="290"/>
+        <source>VLC is an external player which supports a number of different formats.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/media/webkitplayer.py" line="391"/>
+        <source>Webkit is a media player which runs inside a web browser. This player allows text over video to be rendered.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>MediaPlugin</name>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="69"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="68"/>
         <source>&lt;strong&gt;Media Plugin&lt;/strong&gt;&lt;br /&gt;The media plugin provides playback of audio and video.</source>
         <translation>&lt;strong&gt;Media Mini-program&lt;/strong&gt;&lt;br/&gt;Die media mini-program verskaf speel funksies van audio en video.</translation>
     </message>
     <message>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="78"/>
+        <source>Media</source>
+        <comment>name singular</comment>
+        <translation>Media</translation>
+    </message>
+    <message>
         <location filename="openlp/plugins/media/mediaplugin.py" line="79"/>
         <source>Media</source>
-        <comment>name singular</comment>
-        <translation>Media</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="80"/>
-        <source>Media</source>
         <comment>name plural</comment>
         <translation>Media</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="84"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="83"/>
         <source>Media</source>
         <comment>container title</comment>
         <translation>Media</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="88"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="87"/>
         <source>Load new media.</source>
         <translation>Laai nuwe media.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="90"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="89"/>
         <source>Add new media.</source>
         <translation>Voeg nuwe media by.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="91"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="90"/>
         <source>Edit the selected media.</source>
         <translation>Redigeer di geselekteerde media.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="92"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="91"/>
         <source>Delete the selected media.</source>
         <translation>Wis die giselekteerde media uit.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="93"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="92"/>
         <source>Preview the selected media.</source>
         <translation>Skou die geselekteerde media.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="94"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="93"/>
         <source>Send the selected media live.</source>
         <translation>Stuur die geselekteerde media regstreeks.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="95"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="94"/>
         <source>Add the selected media to the service.</source>
         <translation>Voeg die geselekteerde media by die diens.</translation>
     </message>
@@ -1913,57 +1971,52 @@
 <context>
     <name>MediaPlugin.MediaItem</name>
     <message>
-        <location filename="openlp/plugins/media/lib/mediaitem.py" line="100"/>
+        <location filename="openlp/plugins/media/lib/mediaitem.py" line="92"/>
         <source>Select Media</source>
         <translation>Selekteer Media</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/lib/mediaitem.py" line="289"/>
+        <location filename="openlp/plugins/media/lib/mediaitem.py" line="275"/>
         <source>You must select a media file to delete.</source>
         <translation>&apos;n Media lêer om uit te wis moet geselekteer word.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/lib/mediaitem.py" line="174"/>
+        <location filename="openlp/plugins/media/lib/mediaitem.py" line="163"/>
         <source>You must select a media file to replace the background with.</source>
         <translation>&apos;n Media lêer wat die agtergrond vervang moet gekies word.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/lib/mediaitem.py" line="188"/>
+        <location filename="openlp/plugins/media/lib/mediaitem.py" line="181"/>
         <source>There was a problem replacing your background, the media file &quot;%s&quot; no longer exists.</source>
         <translation>Daar was &apos;n probleem om die agtergrond te vervang. Die media lêer &quot;%s&quot; bestaan nie meer nie.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/lib/mediaitem.py" line="203"/>
+        <location filename="openlp/plugins/media/lib/mediaitem.py" line="205"/>
         <source>Missing Media File</source>
         <translation>Vermisde Media Lêer</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/lib/mediaitem.py" line="203"/>
+        <location filename="openlp/plugins/media/lib/mediaitem.py" line="205"/>
         <source>The file %s no longer exists.</source>
         <translation>Die lêer %s bestaan nie meer nie.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/lib/mediaitem.py" line="250"/>
+        <location filename="openlp/plugins/media/lib/mediaitem.py" line="240"/>
         <source>Videos (%s);;Audio (%s);;%s (*)</source>
         <translation>Videos (%s);;Audio (%s);;%s (*)</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/lib/mediaitem.py" line="184"/>
+        <location filename="openlp/plugins/media/lib/mediaitem.py" line="177"/>
         <source>There was no display item to amend.</source>
         <translation>Daar was geen vertoon item om by te voeg nie.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/media/mediacontroller.py" line="361"/>
+        <location filename="openlp/core/ui/media/mediacontroller.py" line="435"/>
         <source>Unsupported File</source>
         <translation>Lêer nie Ondersteun nie</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/lib/mediaitem.py" line="109"/>
-        <source>Automatic</source>
-        <translation>Automaties</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/media/lib/mediaitem.py" line="111"/>
+        <location filename="openlp/plugins/media/lib/mediaitem.py" line="98"/>
         <source>Use Player:</source>
         <translation>Gebruik Speler:</translation>
     </message>
@@ -1971,40 +2024,30 @@
 <context>
     <name>MediaPlugin.MediaTab</name>
     <message>
-        <location filename="openlp/plugins/media/lib/mediatab.py" line="120"/>
-        <source>Available Media Players</source>
-        <translation>Beskikbare Media Spelers</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/media/lib/mediatab.py" line="129"/>
-        <source>%s (unavailable)</source>
-        <translation>%s (onbeskikbaar)</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/media/lib/mediatab.py" line="132"/>
-        <source>Player Order</source>
-        <translation>Speler Orde</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/media/lib/mediatab.py" line="135"/>
+        <location filename="openlp/plugins/media/lib/mediatab.py" line="63"/>
         <source>Allow media player to be overridden</source>
         <translation>Laat toe dat media speler oorheers word</translation>
     </message>
+    <message>
+        <location filename="openlp/plugins/media/lib/mediatab.py" line="64"/>
+        <source>Start Live items automatically</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>OpenLP</name>
     <message>
-        <location filename="openlp/core/utils/__init__.py" line="362"/>
+        <location filename="openlp/core/utils/__init__.py" line="260"/>
         <source>Image Files</source>
         <translation>Beeld Lêers</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/bibleplugin.py" line="89"/>
+        <location filename="openlp/plugins/bibles/bibleplugin.py" line="114"/>
         <source>Information</source>
         <translation>Informasie</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/bibleplugin.py" line="89"/>
+        <location filename="openlp/plugins/bibles/bibleplugin.py" line="114"/>
         <source>Bible format has changed.
 You have to upgrade your existing Bibles.
 Should OpenLP upgrade now?</source>
@@ -2014,39 +2057,32 @@
 <context>
     <name>OpenLP.AboutForm</name>
     <message>
-        <location filename="openlp/core/ui/aboutdialog.py" line="247"/>
+        <location filename="openlp/core/ui/aboutdialog.py" line="267"/>
         <source>Credits</source>
         <translation>Krediete</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/aboutdialog.py" line="644"/>
+        <location filename="openlp/core/ui/aboutdialog.py" line="663"/>
         <source>License</source>
         <translation>Lisensie</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/aboutform.py" line="52"/>
+        <location filename="openlp/core/ui/aboutform.py" line="55"/>
         <source> build %s</source>
         <translation>bou %s</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/aboutdialog.py" line="261"/>
+        <location filename="openlp/core/ui/aboutdialog.py" line="281"/>
         <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; dit kan verspei en/of verander word onder die terme van die GNU Algemene Publieke Lisensie soos deur die Gratis Sagteware Vondasie gepubliseer is; weergawe 2 van die Lisensie.</translation>
+        <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="266"/>
+        <location filename="openlp/core/ui/aboutdialog.py" line="286"/>
         <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 &apos;N SPESIFIEKE DOEL. Sien hieronder vir meer inligting.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/aboutdialog.py" line="250"/>
-        <source>Copyright &#xa9; 2004-2012 %s
-Portions copyright &#xa9; 2004-2012 %s</source>
-        <translation>Kopiereg © 2004-2012 %s
-Gedeeltelike kopiereg © 2004-2012 %s</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/aboutdialog.py" line="86"/>
+        <location filename="openlp/core/ui/aboutdialog.py" line="95"/>
         <source>OpenLP &lt;version&gt;&lt;revision&gt; - 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.
@@ -2063,12 +2099,12 @@
 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>
-        <location filename="openlp/core/ui/aboutdialog.py" line="647"/>
+        <location filename="openlp/core/ui/aboutdialog.py" line="665"/>
         <source>Volunteer</source>
         <translation>Vrywilliger</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/aboutdialog.py" line="156"/>
+        <location filename="openlp/core/ui/aboutdialog.py" line="162"/>
         <source>Project Lead
     %s
 
@@ -2087,7 +2123,7 @@
 Translators
     Afrikaans (af)
         %s
-    Czeck (cs)
+    Czech (cs)
         %s
     Danish (da)
         %s
@@ -2103,13 +2139,17 @@
         %s
     Estonian (et)
         %s
+    Finnish (fi)
+        %s
     French (fr)
         %s
     Hungarian (hu)
         %s
+    Indonesian (id)
+        %s
     Japanese (ja)
         %s
-    Norwegian Bokm&#xe5;l (nb)
+    Norwegian Bokmål (nb)
         %s
     Dutch (nl)
         %s
@@ -2119,6 +2159,10 @@
         %s
     Swedish (sv)
         %s
+    Tamil(Sri-Lanka) (ta_LK)
+        %s
+    Chinese(China) (zh_CN)
+        %s
 
 Documentation
     %s
@@ -2140,355 +2184,264 @@
     on the cross, setting us free from sin. We
     bring this software to you for free because
     He has set us free.</source>
-        <translation>Projek Leier
- %s
- 
-Ontwikkelaars
- %s 
-
-Bydraers
- %s 
-
-Toetsers
- %s 
-
-Verpakkers
- %s 
-
-Vertalers 
-Afrikaans (af)
- %s
-Szech (cs)
- %s
-Deens (da)
- %s
-Duits (de)
- %s
-Grieks (el)
- %s 
-Engels, Verenigde Koningkryk (en_GB)
- %s 
-Engels, Suid-Afrika (en_ZA)
- %s
-Spaans (es)
- %s 
-Estonian (et)
- %s 
-Frans (fr)
- %s 
-Hongaars (hu)
- %s 
-Japanees (ja)
- %s 
-Noors Bokmål (nb)
- %s 
-Nederlands (nl)
- %s 
-Portugees, Brazilië (pt_BR)
- %s 
-Russies (ru)
- %s 
-Sweeds (sv)
- %s
-
-Dokumentasie
- %s 
-Gebou Met 
-Python: http://www.python.org/ 
-Qt4: http://qt.nokia.com/ 
-PyQt4: http://www.riverbankcomputing.co.uk/software/pyqt/intro 
-Oxygen Ikone: http://oxygen-icons.org/ 
-
-Finale Krediet 
-&quot;Want so lief het God die wêreld gehad,
-dat Hy sy eniggebore Seun gegee het, 
-sodat elkeen wat in Hom glo, nie verlore
-mag gaan nie, maar die ewige lewe kan 
-hê.&quot; -- Johannes 3:16 
-
-En laaste maar nie die minste nie. Finale 
-krediet gaan aan God ons Vader, wat Sy 
-Seun vir ons gestuur het om aan die kruis
-te sterf en ons vry te maak van sonde. 
-Ons bring hierdie sagteware gratis voort
-omdat Hy ons vry gemaak het.</translation>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/aboutdialog.py" line="272"/>
+        <source>Copyright © 2004-2014 %s
+Portions copyright © 2004-2014 %s</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>OpenLP.AdvancedTab</name>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="343"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="267"/>
         <source>UI Settings</source>
         <translation>GK (UI) Verstellings</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="347"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="269"/>
         <source>Number of recent files to display:</source>
         <translation>Hoeveelheid onlangse lêers om te vertoon:</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="350"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="270"/>
         <source>Remember active media manager tab on startup</source>
         <translation>Onthou die laaste media bestuurder oortjie wanneer die program begin</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="352"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="272"/>
         <source>Double-click to send items straight to live</source>
         <translation>Dubbel-kliek om die items regstreeks te stuur</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="356"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="276"/>
         <source>Expand new service items on creation</source>
         <translation>Sit die nuwe diens items uit wanneer dit geskep word</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="358"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="278"/>
         <source>Enable application exit confirmation</source>
         <translation>Stel die program in staat om die uitgang bevestiging te vertoon</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="394"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="298"/>
         <source>Mouse Cursor</source>
         <translation>Muis Wyser</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="396"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="299"/>
         <source>Hide mouse cursor when over display window</source>
         <translation>Steek die muis wyser weg wanneer dit oor die vertoon venster beweeg</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="398"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="300"/>
         <source>Default Image</source>
         <translation>Verstek Beeld</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="400"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="301"/>
         <source>Background color:</source>
         <translation>Agtergrond kleur:</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="404"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="303"/>
         <source>Image file:</source>
         <translation>Beeld lêer:</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="664"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="515"/>
         <source>Open File</source>
         <translation>Maak Lêer oop</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="72"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="59"/>
         <source>Advanced</source>
         <translation>Gevorderd</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="354"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="274"/>
         <source>Preview items when clicked in Media Manager</source>
         <translation>Skou items wanneer gekliek word in die Media Bestuurder</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="402"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="302"/>
         <source>Click to select a color.</source>
         <translation>Kliek om &apos;n kleur te kies.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="406"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="304"/>
         <source>Browse for an image file to display.</source>
         <translation>Blaai vir &apos;n beeld lêer om te vertoon.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="408"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="305"/>
         <source>Revert to the default OpenLP logo.</source>
         <translation>Verander terug na die verstek OpenLP logo.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="622"/>
-        <source>Service %Y-%m-%d %H-%M</source>
-        <comment>This may not contain any of the following characters: /\?*|&lt;&gt;[]&quot;:+
-See http://docs.python.org/library/datetime.html#strftime-strptime-behavior for more information.</comment>
-        <translation>Diens %Y-%m-%d %H-%M</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="360"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="280"/>
         <source>Default Service Name</source>
         <translation>Verstek Diens Naam</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="362"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="281"/>
         <source>Enable default service name</source>
         <translation>Laat verstek diens naam toe</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="364"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="282"/>
         <source>Date and Time:</source>
         <translation>Datum en Tyd:</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="366"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="283"/>
         <source>Monday</source>
         <translation>Maandag</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="368"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="284"/>
         <source>Tuesday</source>
         <translation>Dinsdag</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="370"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="285"/>
         <source>Wednesday</source>
         <translation>Woensdag</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="372"/>
-        <source>Thurdsday</source>
-        <translation>Donderdag</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="374"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="287"/>
         <source>Friday</source>
         <translation>Vrydag</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="376"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="288"/>
         <source>Saturday</source>
         <translation>Saterdag</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="378"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="289"/>
         <source>Sunday</source>
         <translation>Sondag</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="380"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="290"/>
         <source>Now</source>
         <translation>Nou</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="382"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="291"/>
         <source>Time when usual service starts.</source>
         <translation>Tyd wanneer gewone diens begin.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="384"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="292"/>
         <source>Name:</source>
         <translation>Naam:</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="386"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="293"/>
         <source>Consult the OpenLP manual for usage.</source>
         <translation>Konsulteer die OpenLP handleiding vir gebruik.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="388"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="294"/>
         <source>Revert to the default service name &quot;%s&quot;.</source>
         <translation>Herstel tot die verstek diens naam &quot;%s&quot;.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="392"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="297"/>
         <source>Example:</source>
         <translation>Voorbeeld:</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="436"/>
-        <source>X11</source>
-        <translation>X11</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="437"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="322"/>
         <source>Bypass X11 Window Manager</source>
         <translation>Werk om X11 Venster Bestuurder</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="635"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="475"/>
         <source>Syntax error.</source>
         <translation>Sintaks fout.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="345"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="268"/>
         <source>Data Location</source>
         <translation>Data Ligging</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="410"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="306"/>
         <source>Current path:</source>
         <translation>Huidige pad:</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="412"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="307"/>
         <source>Custom path:</source>
         <translation>Eie pad:</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="414"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="308"/>
         <source>Browse for new data file location.</source>
         <translation>Blaai vir nuwe data lêer ligging.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="417"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="310"/>
         <source>Set the data location to the default.</source>
         <translation>Stel die data ligging na die verstek ligging.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="420"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="312"/>
         <source>Cancel</source>
         <translation>Kanselleer</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="423"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="313"/>
         <source>Cancel OpenLP data directory location change.</source>
         <translation>Kanselleer OpenLP data lêer ligging verandering.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="426"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="315"/>
         <source>Copy data to new location.</source>
         <translation>Kopiër data na nuwe ligging.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="429"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="316"/>
         <source>Copy the OpenLP data files to the new location.</source>
         <translation>Kopiër die OpenLP data lêers na die nuwe ligging.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="432"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="318"/>
         <source>&lt;strong&gt;WARNING:&lt;/strong&gt; New data directory location contains OpenLP data files.  These files WILL be replaced during a copy.</source>
         <translation>&lt;strong&gt;WAARSKUWING:&lt;/strong&gt; Nuwe data lêer ligging bevat OpenLP data lêers.  Hierdie lêers SAL vervang word gedurende kopiëring.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="525"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="378"/>
         <source>Data Directory Error</source>
         <translation>Data Lêer Fout</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="677"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="527"/>
         <source>Select Data Directory Location</source>
         <translation>Selekteer Data Lêer Ligging</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="690"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="539"/>
         <source>Confirm Data Directory Change</source>
         <translation>Bevestig Data Lêer Verandering</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="717"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="564"/>
         <source>Reset Data Directory</source>
         <translation>Herstel Data Lêer</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="717"/>
-        <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="753"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="603"/>
         <source>Overwrite Existing Data</source>
         <translation>Oorskryf Bestaande Data</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="525"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="378"/>
         <source>OpenLP data directory was not found
 
 %s
@@ -2507,7 +2460,7 @@
 Kliek &quot;Nee&quot; om die laai van OpenLP te staak, en jou toe te laat om die probleem op te los.  Kliek &quot;Ja&quot; om die data gids na die verstek ligging te herstel.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="690"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="539"/>
         <source>Are you sure you want to change the location of the OpenLP data directory to:
 
 %s
@@ -2520,59 +2473,85 @@
 Die data gids sal verander word wanneer OpenLP toe gemaak word.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="753"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="286"/>
+        <source>Thursday</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/advancedtab.py" line="321"/>
+        <source>Display Workarounds</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/advancedtab.py" line="323"/>
+        <source>Use alternating row colours in lists</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/advancedtab.py" line="564"/>
+        <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 type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/advancedtab.py" line="603"/>
         <source>WARNING: 
 
 The location you have selected 
 
 %s
 
-appears to contain OpenLP data files.  Do you wish to replace these files with the current data files?</source>
-        <translation>WAARSKUWING:
-
-Die ligging wat gekies is
-
-%s
-
-blyk of dit OpenLP data lêers bevat. Wil jy graag hierdie lêers vervang met die huidige data lêers?</translation>
+appears to contain OpenLP data files. Do you wish to replace these files with the current data files?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/advancedtab.py" line="649"/>
+        <source>Restart Required</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/advancedtab.py" line="649"/>
+        <source>This change will only take effect once OpenLP has been restarted.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>OpenLP.ExceptionDialog</name>
     <message>
-        <location filename="openlp/core/ui/exceptiondialog.py" line="87"/>
+        <location filename="openlp/core/ui/exceptiondialog.py" line="98"/>
         <source>Error Occurred</source>
         <translation>&apos;n Fout het opgeduik</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/exceptiondialog.py" line="92"/>
+        <location filename="openlp/core/ui/exceptiondialog.py" line="102"/>
         <source>Oops! OpenLP hit a problem, and couldn&apos;t recover. The text in the box below contains information that might be helpful to the OpenLP developers, so please e-mail it to bugs@xxxxxxxxxx, along with a detailed description of what you were doing when the problem occurred.</source>
         <translation>Oeps! OpenLP het &apos;n probleem ondervind en kon nie daarvanaf herstel nie. Die teks in die boks hieronder bevat inligting wat van hulp kan wees aan die OpenLP ontwikkelaars, so stuur dit asseblief per e-pos na bugs@xxxxxxxxxx saam met &apos;n gedetaileerde beskrywing van wat gedoen was toe die probleem plaasgevind het.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/exceptiondialog.py" line="98"/>
+        <location filename="openlp/core/ui/exceptiondialog.py" line="108"/>
         <source>Send E-Mail</source>
         <translation>Stuur E-pos</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/exceptiondialog.py" line="100"/>
+        <location filename="openlp/core/ui/exceptiondialog.py" line="109"/>
         <source>Save to File</source>
         <translation>Stoor na Lêer</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/exceptiondialog.py" line="89"/>
+        <location filename="openlp/core/ui/exceptiondialog.py" line="99"/>
         <source>Please enter a description of what you were doing to cause this error 
 (Minimum 20 characters)</source>
         <translation>Voer asseblief &apos;n beskrywing in van waarmee jy besig was toe de probleem ontstaan het 
 (Mimimum 20 karrakters)</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/exceptiondialog.py" line="102"/>
+        <location filename="openlp/core/ui/exceptiondialog.py" line="110"/>
         <source>Attach File</source>
         <translation>Heg &apos;n Lêer aan</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/exceptionform.py" line="213"/>
+        <location filename="openlp/core/ui/exceptionform.py" line="224"/>
         <source>Description characters to enter : %s</source>
         <translation>Beskrywende karakters om in te voer: %s</translation>
     </message>
@@ -2580,24 +2559,24 @@
 <context>
     <name>OpenLP.ExceptionForm</name>
     <message>
-        <location filename="openlp/core/ui/exceptionform.py" line="117"/>
+        <location filename="openlp/core/ui/exceptionform.py" line="124"/>
         <source>Platform: %s
 </source>
         <translation>Platvorm: %s
 </translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/exceptionform.py" line="151"/>
+        <location filename="openlp/core/ui/exceptionform.py" line="160"/>
         <source>Save Crash Report</source>
         <translation>Stoor Bots Verslag</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/exceptionform.py" line="151"/>
+        <location filename="openlp/core/ui/exceptionform.py" line="160"/>
         <source>Text files (*.txt *.log *.text)</source>
         <translation>Teks lêers (*.txt *.log *.text)</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/exceptionform.py" line="144"/>
+        <location filename="openlp/core/ui/exceptionform.py" line="153"/>
         <source>**OpenLP Bug Report**
 Version: %s
 
@@ -2628,7 +2607,7 @@
 </translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/exceptionform.py" line="181"/>
+        <location filename="openlp/core/ui/exceptionform.py" line="188"/>
         <source>*OpenLP Bug Report*
 Version: %s
 
@@ -2663,17 +2642,17 @@
 <context>
     <name>OpenLP.FileRenameForm</name>
     <message>
-        <location filename="openlp/core/ui/filerenameform.py" line="52"/>
+        <location filename="openlp/core/ui/filerenameform.py" line="58"/>
         <source>File Rename</source>
         <translation>Lêer Hernoem</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/filerenamedialog.py" line="56"/>
+        <location filename="openlp/core/ui/filerenamedialog.py" line="67"/>
         <source>New File Name:</source>
         <translation>Nuwe Lêer Naam:</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/filerenameform.py" line="49"/>
+        <location filename="openlp/core/ui/filerenameform.py" line="56"/>
         <source>File Copy</source>
         <translation>Lêer Kopieër</translation>
     </message>
@@ -2681,17 +2660,17 @@
 <context>
     <name>OpenLP.FirstTimeLanguageForm</name>
     <message>
-        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="65"/>
+        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="76"/>
         <source>Select Translation</source>
         <translation>Kies Vertaling</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="67"/>
+        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="77"/>
         <source>Choose the translation you&apos;d like to use in OpenLP.</source>
         <translation>Kies die taal wat gebruik moet word in OpenLP.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="69"/>
+        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="79"/>
         <source>Translation:</source>
         <translation>Vertaling:</translation>
     </message>
@@ -2699,187 +2678,187 @@
 <context>
     <name>OpenLP.FirstTimeWizard</name>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="212"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="221"/>
         <source>Songs</source>
         <translation>Liedere</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="199"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="213"/>
         <source>First Time Wizard</source>
         <translation>Eerste Keer Gids</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="201"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="214"/>
         <source>Welcome to the First Time Wizard</source>
         <translation>Welkom by die Eerste Keer Gids</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="208"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="219"/>
         <source>Activate required Plugins</source>
         <translation>Aktiveer nodige Miniprogramme</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="210"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="220"/>
         <source>Select the Plugins you wish to use. </source>
         <translation>Kies die Miniprogramme wat gebruik moet word.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="215"/>
-        <source>Bible</source>
-        <translation>Bybel</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="216"/>
-        <source>Images</source>
-        <translation>Beelde</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="221"/>
-        <source>Presentations</source>
-        <translation>Aanbiedinge</translation>
-    </message>
-    <message>
         <location filename="openlp/core/ui/firsttimewizard.py" line="223"/>
+        <source>Bible</source>
+        <translation>Bybel</translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="224"/>
+        <source>Images</source>
+        <translation>Beelde</translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="228"/>
+        <source>Presentations</source>
+        <translation>Aanbiedinge</translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="229"/>
         <source>Media (Audio and Video)</source>
         <translation>Media (Klank en Video)</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="225"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="230"/>
         <source>Allow remote access</source>
         <translation>Laat afgeleë toegang toe</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="227"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="231"/>
         <source>Monitor Song Usage</source>
         <translation>Monitor Lied-Gebruik</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="229"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="232"/>
         <source>Allow Alerts</source>
         <translation>Laat Waarskuwings Toe</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="259"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="252"/>
         <source>Default Settings</source>
         <translation>Verstek Instellings</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="97"/>
+        <location filename="openlp/core/ui/firsttimeform.py" line="107"/>
         <source>Downloading %s...</source>
         <translation>Aflaai %s...</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="409"/>
+        <location filename="openlp/core/ui/firsttimeform.py" line="392"/>
         <source>Download complete. Click the finish button to start OpenLP.</source>
         <translation>Aflaai voltooi. Klik op die klaar knoppie om OpenLP te begin.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="430"/>
+        <location filename="openlp/core/ui/firsttimeform.py" line="412"/>
         <source>Enabling selected plugins...</source>
         <translation>Skakel geselekteerde miniprogramme aan...</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="231"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="233"/>
         <source>No Internet Connection</source>
         <translation>Geen Internet Verbinding</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="233"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="234"/>
         <source>Unable to detect an Internet connection.</source>
         <translation>Nie in staat om &apos;n Internet verbinding op te spoor nie.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="247"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="246"/>
         <source>Sample Songs</source>
         <translation>Voorbeeld Liedere</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="249"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="247"/>
         <source>Select and download public domain songs.</source>
         <translation>Kies en laai liedere vanaf die publieke domein.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="251"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="248"/>
         <source>Sample Bibles</source>
         <translation>Voorbeeld Bybels</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="253"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="249"/>
         <source>Select and download free Bibles.</source>
         <translation>Kies en laai gratis Bybels af.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="255"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="250"/>
         <source>Sample Themes</source>
         <translation>Voorbeeld Temas</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="257"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="251"/>
         <source>Select and download sample themes.</source>
         <translation>Kies en laai voorbeeld temas af.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="261"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="253"/>
         <source>Set up default settings to be used by OpenLP.</source>
         <translation>Stel verstek instellings wat deur OpenLP gebruik moet word.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="263"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="255"/>
         <source>Default output display:</source>
         <translation>Verstek uitgaande vertoning:</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="265"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="256"/>
         <source>Select default theme:</source>
         <translation>Kies verstek tema:</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="267"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="257"/>
         <source>Starting configuration process...</source>
         <translation>Konfigurasie proses begin...</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="205"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="216"/>
         <source>This wizard will help you to configure OpenLP for initial use. Click the next button below to start.</source>
         <translation>Hierdie gids sal bystand verleen in die proses om OpenLP op te stel vir eerste gebruik. Klik die volgende knoppie hieronder om die seleksie proses te begin.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="383"/>
+        <location filename="openlp/core/ui/firsttimeform.py" line="370"/>
         <source>Setting Up And Downloading</source>
         <translation>Opstel en Afliaai</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="385"/>
+        <location filename="openlp/core/ui/firsttimeform.py" line="371"/>
         <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>
-        <location filename="openlp/core/ui/firsttimeform.py" line="390"/>
+        <location filename="openlp/core/ui/firsttimeform.py" line="375"/>
         <source>Setting Up</source>
         <translation>Opstel</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="417"/>
+        <location filename="openlp/core/ui/firsttimeform.py" line="399"/>
         <source>Click the finish button to start OpenLP.</source>
         <translation>Kliek die voltooi knoppie om OpenLP te begin.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="405"/>
+        <location filename="openlp/core/ui/firsttimeform.py" line="389"/>
         <source>Download complete. Click the finish button to return to OpenLP.</source>
         <translation>Aflaai voltooi. Klik op die klaar knoppie om na OpenLP terug te keer.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="414"/>
+        <location filename="openlp/core/ui/firsttimeform.py" line="396"/>
         <source>Click the finish button to return to OpenLP.</source>
         <translation>Kliek die voltooi knoppie om na OpenLP terug te keer.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="213"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="222"/>
         <source>Custom Slides</source>
         <translation>Aangepasde Skyfies</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="269"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="258"/>
         <source>Finish</source>
         <translation>Eindig</translation>
     </message>
@@ -2893,7 +2872,7 @@
 Om weer die Eerste Keer Gids te gebruik en hierdie voorbeeld data om &apos;n latere stadium in te voer, gaan jou Internet konneksie na en begin weer hierdie gids deur &quot;Gereedskap/Eerste Keer Gids&quot; vanaf OpenLP te begin.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="244"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="243"/>
         <source>
 
 To cancel the First Time Wizard completely (and not start OpenLP), click the Cancel button now.</source>
@@ -2905,153 +2884,148 @@
 <context>
     <name>OpenLP.FormattingTagDialog</name>
     <message>
-        <location filename="openlp/core/ui/formattingtagdialog.py" line="124"/>
+        <location filename="openlp/core/ui/formattingtagdialog.py" line="119"/>
         <source>Configure Formatting Tags</source>
         <translation>Konfigureer Formattering Etiket</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/formattingtagdialog.py" line="126"/>
-        <source>Edit Selection</source>
-        <translation>Redigeer Seleksie</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/formattingtagdialog.py" line="128"/>
-        <source>Save</source>
-        <translation>Stoor</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/formattingtagdialog.py" line="139"/>
+        <location filename="openlp/core/ui/formattingtagdialog.py" line="133"/>
         <source>Description</source>
         <translation>Beskrywing</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/formattingtagdialog.py" line="141"/>
+        <location filename="openlp/core/ui/formattingtagdialog.py" line="134"/>
         <source>Tag</source>
         <translation>Etiket</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/formattingtagdialog.py" line="143"/>
+        <location filename="openlp/core/ui/formattingtagdialog.py" line="135"/>
         <source>Start HTML</source>
         <translation>Begin HTML</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/formattingtagdialog.py" line="145"/>
+        <location filename="openlp/core/ui/formattingtagdialog.py" line="136"/>
         <source>End HTML</source>
         <translation>Eindig HTML</translation>
     </message>
+    <message>
+        <location filename="openlp/core/ui/formattingtagdialog.py" line="122"/>
+        <source>Default Formatting</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/formattingtagdialog.py" line="132"/>
+        <source>Custom Formatting</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>OpenLP.FormattingTagForm</name>
     <message>
-        <location filename="openlp/core/ui/formattingtagform.py" line="167"/>
-        <source>Update Error</source>
-        <translation>Opdateer Fout</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/formattingtagform.py" line="119"/>
-        <source>Tag &quot;n&quot; already defined.</source>
-        <translation>Etiket &quot;n&quot; alreeds gedefinieër.</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/formattingtagform.py" line="126"/>
-        <source>New Tag</source>
-        <translation>Nuwe Etiket</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/formattingtagform.py" line="128"/>
+        <location filename="openlp/core/ui/formattingtagform.py" line="98"/>
         <source>&lt;HTML here&gt;</source>
         <translation>&lt;HTML hier&gt;</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/formattingtagform.py" line="130"/>
-        <source>&lt;/and here&gt;</source>
-        <translation>&lt;/en hier&gt;</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/formattingtagform.py" line="167"/>
-        <source>Tag %s already defined.</source>
-        <translation>Etiket %s alreeds gedefinieër.</translation>
+        <location filename="openlp/core/ui/formattingtagform.py" line="94"/>
+        <source>New Tag%s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/formattingtagform.py" line="202"/>
+        <source>Validation Error</source>
+        <translation>Validerings Fout</translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/formattingtagform.py" line="182"/>
+        <source>Description is missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/formattingtagform.py" line="185"/>
+        <source>Tag is missing</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>OpenLP.FormattingTags</name>
     <message>
-        <location filename="openlp/core/lib/formattingtags.py" line="89"/>
+        <location filename="openlp/core/lib/formattingtags.py" line="71"/>
         <source>Red</source>
         <translation>Rooi</translation>
     </message>
     <message>
-        <location filename="openlp/core/lib/formattingtags.py" line="94"/>
+        <location filename="openlp/core/lib/formattingtags.py" line="77"/>
         <source>Black</source>
         <translation>Swart</translation>
     </message>
     <message>
-        <location filename="openlp/core/lib/formattingtags.py" line="99"/>
+        <location filename="openlp/core/lib/formattingtags.py" line="83"/>
         <source>Blue</source>
         <translation>Blou</translation>
     </message>
     <message>
-        <location filename="openlp/core/lib/formattingtags.py" line="104"/>
+        <location filename="openlp/core/lib/formattingtags.py" line="89"/>
         <source>Yellow</source>
         <translation>Geel</translation>
     </message>
     <message>
-        <location filename="openlp/core/lib/formattingtags.py" line="109"/>
+        <location filename="openlp/core/lib/formattingtags.py" line="95"/>
         <source>Green</source>
         <translation>Groen</translation>
     </message>
     <message>
-        <location filename="openlp/core/lib/formattingtags.py" line="114"/>
+        <location filename="openlp/core/lib/formattingtags.py" line="101"/>
         <source>Pink</source>
         <translation>Pienk</translation>
     </message>
     <message>
-        <location filename="openlp/core/lib/formattingtags.py" line="119"/>
+        <location filename="openlp/core/lib/formattingtags.py" line="107"/>
         <source>Orange</source>
         <translation>Oranje</translation>
     </message>
     <message>
-        <location filename="openlp/core/lib/formattingtags.py" line="124"/>
+        <location filename="openlp/core/lib/formattingtags.py" line="113"/>
         <source>Purple</source>
         <translation>Pers</translation>
     </message>
     <message>
-        <location filename="openlp/core/lib/formattingtags.py" line="129"/>
+        <location filename="openlp/core/lib/formattingtags.py" line="119"/>
         <source>White</source>
         <translation>Wit</translation>
     </message>
     <message>
-        <location filename="openlp/core/lib/formattingtags.py" line="134"/>
+        <location filename="openlp/core/lib/formattingtags.py" line="125"/>
         <source>Superscript</source>
         <translation>Bo-skrif</translation>
     </message>
     <message>
-        <location filename="openlp/core/lib/formattingtags.py" line="139"/>
+        <location filename="openlp/core/lib/formattingtags.py" line="130"/>
         <source>Subscript</source>
         <translation>Onder-skrif</translation>
     </message>
     <message>
-        <location filename="openlp/core/lib/formattingtags.py" line="144"/>
+        <location filename="openlp/core/lib/formattingtags.py" line="135"/>
         <source>Paragraph</source>
         <translation>Paragraaf</translation>
     </message>
     <message>
+        <location filename="openlp/core/lib/formattingtags.py" line="140"/>
+        <source>Bold</source>
+        <translation>Vetdruk</translation>
+    </message>
+    <message>
+        <location filename="openlp/core/lib/formattingtags.py" line="145"/>
+        <source>Italics</source>
+        <translation>Italiaans</translation>
+    </message>
+    <message>
         <location filename="openlp/core/lib/formattingtags.py" line="149"/>
-        <source>Bold</source>
-        <translation>Vetdruk</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/formattingtags.py" line="153"/>
-        <source>Italics</source>
-        <translation>Italiaans</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/formattingtags.py" line="157"/>
         <source>Underline</source>
         <translation>Onderlyn</translation>
     </message>
     <message>
-        <location filename="openlp/core/lib/formattingtags.py" line="163"/>
+        <location filename="openlp/core/lib/formattingtags.py" line="155"/>
         <source>Break</source>
         <translation>Breek</translation>
     </message>
@@ -3059,157 +3033,157 @@
 <context>
     <name>OpenLP.GeneralTab</name>
     <message>
-        <location filename="openlp/core/ui/generaltab.py" line="218"/>
+        <location filename="openlp/core/ui/generaltab.py" line="213"/>
         <source>General</source>
         <translation>Algemeen</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/generaltab.py" line="219"/>
+        <location filename="openlp/core/ui/generaltab.py" line="214"/>
         <source>Monitors</source>
         <translation>Monitors</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/generaltab.py" line="221"/>
+        <location filename="openlp/core/ui/generaltab.py" line="215"/>
         <source>Select monitor for output display:</source>
         <translation>Selekteer monitor vir uitgaande vertoning:</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/generaltab.py" line="223"/>
+        <location filename="openlp/core/ui/generaltab.py" line="216"/>
         <source>Display if a single screen</source>
         <translation>Vertoon as dit &apos;n enkel skerm is</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/generaltab.py" line="225"/>
+        <location filename="openlp/core/ui/generaltab.py" line="217"/>
         <source>Application Startup</source>
         <translation>Applikasie Aanskakel</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/generaltab.py" line="227"/>
+        <location filename="openlp/core/ui/generaltab.py" line="218"/>
         <source>Show blank screen warning</source>
         <translation>Vertoon leë skerm waarskuwing</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/generaltab.py" line="229"/>
+        <location filename="openlp/core/ui/generaltab.py" line="219"/>
         <source>Automatically open the last service</source>
         <translation>Maak vanself die laaste diens oop</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/generaltab.py" line="231"/>
+        <location filename="openlp/core/ui/generaltab.py" line="220"/>
         <source>Show the splash screen</source>
         <translation>Wys die spatsel skerm</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/generaltab.py" line="235"/>
+        <location filename="openlp/core/ui/generaltab.py" line="222"/>
         <source>Application Settings</source>
         <translation>Program Verstellings</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/generaltab.py" line="237"/>
+        <location filename="openlp/core/ui/generaltab.py" line="223"/>
         <source>Prompt to save before starting a new service</source>
         <translation>Vra om te stoor voordat &apos;n nuwe diens begin word</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/generaltab.py" line="241"/>
+        <location filename="openlp/core/ui/generaltab.py" line="226"/>
         <source>Automatically preview next item in service</source>
         <translation>Wys voorskou van volgende item in diens automaties</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/generaltab.py" line="245"/>
+        <location filename="openlp/core/ui/generaltab.py" line="229"/>
         <source> sec</source>
         <translation>sek</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/generaltab.py" line="246"/>
+        <location filename="openlp/core/ui/generaltab.py" line="230"/>
         <source>CCLI Details</source>
         <translation>CCLI Inligting</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/generaltab.py" line="249"/>
+        <location filename="openlp/core/ui/generaltab.py" line="232"/>
         <source>SongSelect username:</source>
         <translation>SongSelect gebruikersnaam:</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/generaltab.py" line="251"/>
+        <location filename="openlp/core/ui/generaltab.py" line="233"/>
         <source>SongSelect password:</source>
         <translation>SongSelect wagwoord:</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/generaltab.py" line="256"/>
+        <location filename="openlp/core/ui/generaltab.py" line="236"/>
         <source>X</source>
         <translation>X</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/generaltab.py" line="257"/>
+        <location filename="openlp/core/ui/generaltab.py" line="237"/>
         <source>Y</source>
         <translation>Y</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/generaltab.py" line="258"/>
+        <location filename="openlp/core/ui/generaltab.py" line="238"/>
         <source>Height</source>
         <translation>Hoogte</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/generaltab.py" line="259"/>
+        <location filename="openlp/core/ui/generaltab.py" line="239"/>
         <source>Width</source>
         <translation>Wydte</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/generaltab.py" line="233"/>
+        <location filename="openlp/core/ui/generaltab.py" line="221"/>
         <source>Check for updates to OpenLP</source>
         <translation>Kyk vir opdaterings van OpenLP</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/generaltab.py" line="239"/>
+        <location filename="openlp/core/ui/generaltab.py" line="225"/>
         <source>Unblank display when adding new live item</source>
         <translation>Verwyder blanko vertoning wanneer &apos;n nuwe regstreekse item bygevoeg word</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/generaltab.py" line="243"/>
+        <location filename="openlp/core/ui/generaltab.py" line="228"/>
         <source>Timed slide interval:</source>
         <translation>Tyd-gedrewe skyfie interval:</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/generaltab.py" line="260"/>
+        <location filename="openlp/core/ui/generaltab.py" line="240"/>
         <source>Background Audio</source>
         <translation>Agtergrond Oudio</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/generaltab.py" line="262"/>
+        <location filename="openlp/core/ui/generaltab.py" line="241"/>
         <source>Start background audio paused</source>
         <translation>Begin agtergrond oudio gestop</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="440"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="325"/>
         <source>Service Item Slide Limits</source>
         <translation>Diens Item Skyfie Limiete</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/generaltab.py" line="254"/>
+        <location filename="openlp/core/ui/generaltab.py" line="235"/>
         <source>Override display position:</source>
         <translation>Oorheers vertoon ligging:</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/generaltab.py" line="264"/>
+        <location filename="openlp/core/ui/generaltab.py" line="242"/>
         <source>Repeat track list</source>
         <translation>Herhaal snit lys</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="442"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="326"/>
         <source>Behavior of next/previous on the last/first slide:</source>
         <translation>Gedrag van die vorige/volgende op die laaste/eerste skyfie:</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="444"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="327"/>
         <source>&amp;Remain on Slide</source>
         <translation>&amp;Bly op Skyfie</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="446"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="328"/>
         <source>&amp;Wrap around</source>
         <translation>Omvou</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/advancedtab.py" line="448"/>
+        <location filename="openlp/core/ui/advancedtab.py" line="329"/>
         <source>&amp;Move to next/previous service item</source>
         <translation>Beweeg na volgende/vorige diens ite&amp;m</translation>
     </message>
@@ -3217,12 +3191,12 @@
 <context>
     <name>OpenLP.LanguageManager</name>
     <message>
-        <location filename="openlp/core/utils/languagemanager.py" line="143"/>
+        <location filename="openlp/core/utils/languagemanager.py" line="128"/>
         <source>Language</source>
         <translation>Taal</translation>
     </message>
     <message>
-        <location filename="openlp/core/utils/languagemanager.py" line="143"/>
+        <location filename="openlp/core/utils/languagemanager.py" line="128"/>
         <source>Please restart OpenLP to use your new language setting.</source>
         <translation>Herlaai asseblief OpenLP om die nuwe taal instelling te gebruik.</translation>
     </message>
@@ -3230,7 +3204,7 @@
 <context>
     <name>OpenLP.MainDisplay</name>
     <message>
-        <location filename="openlp/core/ui/maindisplay.py" line="200"/>
+        <location filename="openlp/core/ui/maindisplay.py" line="189"/>
         <source>OpenLP Display</source>
         <translation>OpenLP Vertooning</translation>
     </message>
@@ -3238,287 +3212,282 @@
 <context>
     <name>OpenLP.MainWindow</name>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="400"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="360"/>
         <source>&amp;File</source>
         <translation>&amp;Lêer</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="401"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="361"/>
         <source>&amp;Import</source>
         <translation>&amp;Invoer</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="402"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="362"/>
         <source>&amp;Export</source>
         <translation>Uitvo&amp;er</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="405"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="364"/>
         <source>&amp;View</source>
         <translation>&amp;Bekyk</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="406"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="365"/>
         <source>M&amp;ode</source>
         <translation>M&amp;odus</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="407"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="366"/>
         <source>&amp;Tools</source>
         <translation>&amp;Gereedskap</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="408"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="367"/>
         <source>&amp;Settings</source>
         <translation>Ver&amp;stellings</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="448"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="393"/>
         <source>&amp;Language</source>
         <translation>Taa&amp;l</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="411"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="369"/>
         <source>&amp;Help</source>
         <translation>&amp;Hulp</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="412"/>
-        <source>Media Manager</source>
-        <translation>Media Bestuurder</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="414"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="371"/>
         <source>Service Manager</source>
         <translation>Diens Bestuurder</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="416"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="372"/>
         <source>Theme Manager</source>
         <translation>Tema Bestuurder</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="418"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="373"/>
         <source>&amp;New</source>
         <translation>&amp;Nuwe</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="421"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="376"/>
         <source>&amp;Open</source>
         <translation>Maak &amp;Oop</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="423"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="378"/>
         <source>Open an existing service.</source>
         <translation>Maak &apos;n bestaande diens oop.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="425"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="379"/>
         <source>&amp;Save</source>
         <translation>&amp;Stoor</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="427"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="381"/>
         <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="429"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="382"/>
         <source>Save &amp;As...</source>
         <translation>Stoor &amp;As...</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="431"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="383"/>
         <source>Save Service As</source>
         <translation>Stoor Diens As</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="433"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="384"/>
         <source>Save the current service under a new name.</source>
         <translation>Stoor die huidige diens onder &apos;n nuwe naam.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="438"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="388"/>
         <source>E&amp;xit</source>
         <translation>&amp;Uitgang</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="440"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="389"/>
         <source>Quit OpenLP</source>
         <translation>Sluit OpenLP Af</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="446"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="392"/>
         <source>&amp;Theme</source>
         <translation>&amp;Tema</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="454"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="396"/>
         <source>&amp;Configure OpenLP...</source>
         <translation>&amp;Konfigureer OpenLP...</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="465"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="404"/>
         <source>&amp;Media Manager</source>
         <translation>&amp;Media Bestuurder</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="467"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="405"/>
         <source>Toggle Media Manager</source>
         <translation>Wissel Media Bestuurder</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="469"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="406"/>
         <source>Toggle the visibility of the media manager.</source>
         <translation>Wissel sigbaarheid van die media bestuurder.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="471"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="408"/>
         <source>&amp;Theme Manager</source>
         <translation>&amp;Tema Bestuurder</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="473"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="409"/>
         <source>Toggle Theme Manager</source>
         <translation>Wissel Tema Bestuurder</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="475"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="410"/>
         <source>Toggle the visibility of the theme manager.</source>
         <translation>Wissel sigbaarheid van die tema bestuurder.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="477"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="412"/>
         <source>&amp;Service Manager</source>
         <translation>&amp;Diens Bestuurder</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="479"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="413"/>
         <source>Toggle Service Manager</source>
         <translation>Wissel Diens Bestuurder</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="481"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="414"/>
         <source>Toggle the visibility of the service manager.</source>
         <translation>Wissel sigbaarheid van die diens bestuurder.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="483"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="416"/>
         <source>&amp;Preview Panel</source>
         <translation>Voorskou &amp;Paneel</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="485"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="417"/>
         <source>Toggle Preview Panel</source>
         <translation>Wissel Voorskou Paneel</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="487"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="418"/>
         <source>Toggle the visibility of the preview panel.</source>
         <translation>Wissel sigbaarheid van die voorskou paneel.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="489"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="420"/>
         <source>&amp;Live Panel</source>
         <translation>Regstreekse Panee&amp;l</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="491"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="421"/>
         <source>Toggle Live Panel</source>
         <translation>Wissel Regstreekse Paneel</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="497"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="424"/>
         <source>Toggle the visibility of the live panel.</source>
         <translation>Wissel sigbaarheid van die regstreekse paneel.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="499"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="425"/>
         <source>&amp;Plugin List</source>
         <translation>Mini-&amp;program Lys</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="501"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="426"/>
         <source>List the Plugins</source>
         <translation>Lys die Mini-programme</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="507"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="430"/>
         <source>&amp;User Guide</source>
         <translation>Gebr&amp;uikers Gids</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="503"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="427"/>
         <source>&amp;About</source>
         <translation>&amp;Aangaande</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="504"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="428"/>
         <source>More information about OpenLP</source>
         <translation>Meer inligting aangaande OpenLP</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="509"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="431"/>
         <source>&amp;Online Help</source>
         <translation>&amp;Aanlyn Hulp</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="511"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="435"/>
         <source>&amp;Web Site</source>
         <translation>&amp;Web Tuiste</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="519"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="440"/>
         <source>Use the system language, if available.</source>
         <translation>Gebruik die sisteem se taal as dit beskikbaar is.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="515"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="438"/>
         <source>Set the interface language to %s</source>
         <translation>Verstel die koppelvlak taal na %s</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="521"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="441"/>
         <source>Add &amp;Tool...</source>
         <translation>Voeg Gereedskaps&amp;tuk by...</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="523"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="442"/>
         <source>Add an application to the list of tools.</source>
         <translation>Voeg &apos;n applikasie by die lys van gereedskapstukke.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="539"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="453"/>
         <source>&amp;Default</source>
         <translation>&amp;Verstek</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="541"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="454"/>
         <source>Set the view mode back to the default.</source>
         <translation>Verstel skou modus terug na verstek modus.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="543"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="455"/>
         <source>&amp;Setup</source>
         <translation>Op&amp;stel</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="544"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="456"/>
         <source>Set the view mode to Setup.</source>
         <translation>Verstel die skou modus na Opstel modus.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="546"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="457"/>
         <source>&amp;Live</source>
         <translation>&amp;Regstreeks</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="547"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="458"/>
         <source>Set the view mode to Live.</source>
         <translation>Verstel die skou modus na Regstreeks.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="738"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="585"/>
         <source>Version %s of OpenLP is now available for download (you are currently running version %s). 
 
 You can download the latest version from http://openlp.org/.</source>
@@ -3527,108 +3496,108 @@
 Die nuutste weergawe kan afgelaai word vanaf http://openlp.org/.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="742"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="1307"/>
         <source>OpenLP Version Updated</source>
         <translation>OpenLP Weergawe is Opdateer</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="853"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="685"/>
         <source>OpenLP Main Display Blanked</source>
         <translation>OpenLP Hoof Vertoning Blanko</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="853"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="685"/>
         <source>The Main Display has been blanked out</source>
         <translation>Die Hoof Skerm is afgeskakel</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="1277"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="1104"/>
         <source>Default Theme: %s</source>
         <translation>Verstek Tema: %s</translation>
     </message>
     <message>
-        <location filename="openlp/core/utils/languagemanager.py" line="99"/>
+        <location filename="openlp/core/utils/languagemanager.py" line="91"/>
         <source>English</source>
         <comment>Please add the name of your language here</comment>
-        <translation>Afrikaans</translation>
+        <translation>Engels</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="450"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="394"/>
         <source>Configure &amp;Shortcuts...</source>
         <translation>Konfigureer Kor&amp;tpaaie...</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="1185"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="1035"/>
         <source>Close OpenLP</source>
         <translation>Mook OpenLP toe</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="1185"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="1035"/>
         <source>Are you sure you want to close OpenLP?</source>
         <translation>Maak OpenLP sekerlik toe?</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="525"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="444"/>
         <source>Open &amp;Data Folder...</source>
         <translation>Maak &amp;Data Lêer oop...</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="527"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="445"/>
         <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>
-        <location filename="openlp/core/ui/mainwindow.py" line="517"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="439"/>
         <source>&amp;Autodetect</source>
         <translation>Spoor outom&amp;aties op</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="534"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="450"/>
         <source>Update Theme Images</source>
         <translation>Opdateer Tema Beelde</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="536"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="451"/>
         <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="436"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="387"/>
         <source>Print the current service.</source>
         <translation>Druk die huidige diens.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="403"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="363"/>
         <source>&amp;Recent Files</source>
         <translation>Onlangse Lêe&amp;rs</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="493"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="422"/>
         <source>L&amp;ock Panels</source>
         <translation>Sl&amp;uit Panele</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="495"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="423"/>
         <source>Prevent the panels being moved.</source>
         <translation>Voorkom dat die panele rondgeskuif word.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="529"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="447"/>
         <source>Re-run First Time Wizard</source>
         <translation>Her-gebruik Eerste Keer Gids</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="531"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="448"/>
         <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&apos;s in te voer.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="805"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="642"/>
         <source>Re-run First Time Wizard?</source>
         <translation>Her-gebruik Eerste Keer Gids?</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="805"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="642"/>
         <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>
@@ -3637,109 +3606,83 @@
 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>
-        <location filename="openlp/core/ui/mainwindow.py" line="1438"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="1234"/>
         <source>Clear List</source>
         <comment>Clear List of recent files</comment>
         <translation>Maak Lys Skoon</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="1438"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="1234"/>
         <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="452"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="395"/>
         <source>Configure &amp;Formatting Tags...</source>
         <translation>Konfigureer &amp;Formattering Etikette...</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="456"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="397"/>
         <source>Export OpenLP settings to a specified *.config file</source>
         <translation>Voer OpenLP verstellings uit na &apos;n spesifieke *.config lêer</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="463"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="403"/>
         <source>Settings</source>
-        <translation>Verstellings</translation>
+        <translation>Instellings</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="460"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="400"/>
         <source>Import OpenLP settings from a specified *.config file previously exported on this or another machine</source>
         <translation>Voer OpenLP verstellings in vanaf &apos;n gespesifiseerde *.config lêer wat voorheen op hierdie of &apos;n ander masjien uitgevoer is</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="947"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="797"/>
         <source>Import settings?</source>
         <translation>Voer verstellings in?</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="947"/>
-        <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>Voer werklik verstellings in?
-
-Deur verstellings in te voer, sal permanente veranderinge aan die huidige OpenLP konfigurasie aangebring word.
-
-As verkeerde verstellings ingevoer word, mag dit onvoorspelbare optrede tot gevolg hê, of OpenLP kan abnormaal termineer.</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="961"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="810"/>
         <source>Open File</source>
         <translation>Maak Lêer oop</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="961"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="810"/>
         <source>OpenLP Export Settings Files (*.conf)</source>
         <translation>OpenLP Uitvoer Verstelling Lêers (*.conf)</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="1025"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="881"/>
         <source>Import settings</source>
         <translation>Voer verstellings in</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="1025"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="881"/>
         <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>
-        <location filename="openlp/core/ui/mainwindow.py" line="1040"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="893"/>
         <source>Export Settings File</source>
         <translation>Voer Verstellings Lêer Uit</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="1040"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="893"/>
         <source>OpenLP Export Settings File (*.conf)</source>
         <translation>OpenLP Uitvoer Verstellings Lêer (*.conf)</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="1531"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="1346"/>
         <source>New Data Directory Error</source>
         <translation>Nuwe Data Lêer Fout</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="999"/>
-        <source>The file you selected does appear to be a valid OpenLP settings file.
-
-Section [%s] is not valid 
-
-Processing has terminated and no changed have been made.</source>
-        <translation>Die lêer wat gekies is blyk nie &apos;n geldige OpenLP instellings lêer te wees nie.
-
-Seksie [%s] is ongeldig.
-
-Verwerking is getermineer en verandering was gemaak nie.</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="1521"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="1338"/>
         <source>Copying OpenLP data to new data directory location - %s - Please wait for copy to finish</source>
         <translation>OpenLP data word na &apos;n nuwe data gids - %s - gekopiër. Wag asseblief totdat dit voltooi is.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="1531"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="1346"/>
         <source>OpenLP Data directory copy failed
 
 %s</source>
@@ -3747,16 +3690,47 @@
 
 %s</translation>
     </message>
+    <message>
+        <location filename="openlp/core/ui/mainwindow.py" line="304"/>
+        <source>General</source>
+        <translation>Algemeen</translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/mainwindow.py" line="370"/>
+        <source>Library</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/mainwindow.py" line="433"/>
+        <source>Jump to the search box of the current active plugin.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/mainwindow.py" line="797"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/mainwindow.py" line="844"/>
+        <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>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>OpenLP.Manager</name>
     <message>
-        <location filename="openlp/core/lib/db.py" line="232"/>
+        <location filename="openlp/core/lib/db.py" line="211"/>
         <source>Database Error</source>
         <translation>Databasis Fout</translation>
     </message>
     <message>
-        <location filename="openlp/core/lib/db.py" line="218"/>
+        <location filename="openlp/core/lib/db.py" line="200"/>
         <source>The database being loaded was created in a more recent version of OpenLP. The database is version %d, while OpenLP expects version %d. The database will not be loaded.
 
 Database: %s</source>
@@ -3765,7 +3739,7 @@
 Databasis: %s</translation>
     </message>
     <message>
-        <location filename="openlp/core/lib/db.py" line="232"/>
+        <location filename="openlp/core/lib/db.py" line="211"/>
         <source>OpenLP cannot load your database.
 
 Database: %s</source>
@@ -3777,73 +3751,73 @@
 <context>
     <name>OpenLP.MediaManagerItem</name>
     <message>
-        <location filename="openlp/core/lib/__init__.py" line="309"/>
+        <location filename="openlp/core/lib/__init__.py" line="257"/>
         <source>No Items Selected</source>
-        <translation>Geen item geselekteer nie</translation>
+        <translation>Geen items geselekteer nie</translation>
     </message>
     <message>
-        <location filename="openlp/core/lib/mediamanageritem.py" line="258"/>
+        <location filename="openlp/plugins/images/lib/mediaitem.py" line="160"/>
         <source>&amp;Add to selected Service Item</source>
         <translation>&amp;Voeg by die geselekteerde Diens item</translation>
     </message>
     <message>
-        <location filename="openlp/core/lib/mediamanageritem.py" line="491"/>
+        <location filename="openlp/core/lib/mediamanageritem.py" line="489"/>
         <source>You must select one or more items to preview.</source>
         <translation>Kies een of meer items vir die voorskou.</translation>
     </message>
     <message>
-        <location filename="openlp/core/lib/mediamanageritem.py" line="509"/>
+        <location filename="openlp/core/lib/mediamanageritem.py" line="506"/>
         <source>You must select one or more items to send live.</source>
         <translation>Kies een of meer items vir regstreekse uitsending.</translation>
     </message>
     <message>
-        <location filename="openlp/core/lib/mediamanageritem.py" line="562"/>
+        <location filename="openlp/core/lib/mediamanageritem.py" line="594"/>
         <source>You must select one or more items.</source>
         <translation>Kies een of meer items.</translation>
     </message>
     <message>
-        <location filename="openlp/core/lib/mediamanageritem.py" line="569"/>
+        <location filename="openlp/core/lib/mediamanageritem.py" line="600"/>
         <source>You must select an existing service item to add to.</source>
         <translation>&apos;n Bestaande diens item moet geselekteer word om by by te voeg.</translation>
     </message>
     <message>
-        <location filename="openlp/core/lib/mediamanageritem.py" line="578"/>
+        <location filename="openlp/core/lib/mediamanageritem.py" line="608"/>
         <source>Invalid Service Item</source>
         <translation>Ongeldige Diens Item</translation>
     </message>
     <message>
-        <location filename="openlp/core/lib/mediamanageritem.py" line="578"/>
+        <location filename="openlp/core/lib/mediamanageritem.py" line="608"/>
         <source>You must select a %s service item.</source>
         <translation>Kies &apos;n %s diens item.</translation>
     </message>
     <message>
-        <location filename="openlp/core/lib/mediamanageritem.py" line="536"/>
+        <location filename="openlp/core/lib/mediamanageritem.py" line="554"/>
         <source>You must select one or more items to add.</source>
         <translation>Kies een of meer items om by te voeg.</translation>
     </message>
     <message>
-        <location filename="openlp/core/lib/mediamanageritem.py" line="608"/>
+        <location filename="openlp/core/lib/mediamanageritem.py" line="642"/>
         <source>No Search Results</source>
         <translation>Geen Soek Resultate</translation>
     </message>
     <message>
-        <location filename="openlp/core/lib/mediamanageritem.py" line="364"/>
+        <location filename="openlp/core/lib/mediamanageritem.py" line="343"/>
         <source>Invalid File Type</source>
         <translation>Ongeldige Lêer Tipe</translation>
     </message>
     <message>
-        <location filename="openlp/core/lib/mediamanageritem.py" line="364"/>
+        <location filename="openlp/core/lib/mediamanageritem.py" line="343"/>
         <source>Invalid File %s.
 Suffix not supported</source>
         <translation>Ongeldige Lêer %s. Agtervoegsel nie ondersteun nie</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="166"/>
+        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="113"/>
         <source>&amp;Clone</source>
         <translation>&amp;Kloon</translation>
     </message>
     <message>
-        <location filename="openlp/core/lib/mediamanageritem.py" line="407"/>
+        <location filename="openlp/core/lib/mediamanageritem.py" line="390"/>
         <source>Duplicate files were found on import and were ignored.</source>
         <translation>Duplikaat lêers gevind tydens invoer en is geïgnoreer.</translation>
     </message>
@@ -3851,55 +3825,83 @@
 <context>
     <name>OpenLP.OpenLyricsImportError</name>
     <message>
-        <location filename="openlp/plugins/songs/lib/xml.py" line="733"/>
+        <location filename="openlp/plugins/songs/lib/xml.py" line="708"/>
         <source>&lt;lyrics&gt; tag is missing.</source>
         <translation>&lt;lyrics&gt; etiket is vermis.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/xml.py" line="740"/>
+        <location filename="openlp/plugins/songs/lib/xml.py" line="713"/>
         <source>&lt;verse&gt; tag is missing.</source>
         <translation>&lt;verse&gt; etiket is vermis.</translation>
     </message>
 </context>
 <context>
+    <name>OpenLP.PlayerTab</name>
+    <message>
+        <location filename="openlp/core/ui/media/playertab.py" line="62"/>
+        <source>Players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/media/playertab.py" line="133"/>
+        <source>Available Media Players</source>
+        <translation>Beskikbare Media Spelers</translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/media/playertab.py" line="134"/>
+        <source>Player Search Order</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/media/playertab.py" line="137"/>
+        <source>Visible background for videos with aspect ratio different to screen.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/media/playertab.py" line="265"/>
+        <source>%s (unavailable)</source>
+        <translation>%s (onbeskikbaar)</translation>
+    </message>
+</context>
+<context>
     <name>OpenLP.PluginForm</name>
     <message>
-        <location filename="openlp/core/ui/plugindialog.py" line="76"/>
+        <location filename="openlp/core/ui/plugindialog.py" line="88"/>
         <source>Plugin List</source>
         <translation>Mini-program Lys</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/plugindialog.py" line="78"/>
+        <location filename="openlp/core/ui/plugindialog.py" line="89"/>
         <source>Plugin Details</source>
         <translation>Mini-program Besonderhede</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/plugindialog.py" line="82"/>
+        <location filename="openlp/core/ui/plugindialog.py" line="92"/>
         <source>Status:</source>
         <translation>Status:</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/plugindialog.py" line="84"/>
+        <location filename="openlp/core/ui/plugindialog.py" line="93"/>
         <source>Active</source>
         <translation>Aktief</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/plugindialog.py" line="86"/>
+        <location filename="openlp/core/ui/plugindialog.py" line="94"/>
         <source>Inactive</source>
         <translation>Onaktief</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/pluginform.py" line="147"/>
+        <location filename="openlp/core/ui/pluginform.py" line="152"/>
         <source>%s (Inactive)</source>
         <translation>%s (Onaktief)</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/pluginform.py" line="144"/>
+        <location filename="openlp/core/ui/pluginform.py" line="150"/>
         <source>%s (Active)</source>
         <translation>%s (Aktief)</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/pluginform.py" line="150"/>
+        <location filename="openlp/core/ui/pluginform.py" line="154"/>
         <source>%s (Disabled)</source>
         <translation>%s (Onaktief)</translation>
     </message>
@@ -3907,12 +3909,12 @@
 <context>
     <name>OpenLP.PrintServiceDialog</name>
     <message>
-        <location filename="openlp/core/ui/printservicedialog.py" line="160"/>
+        <location filename="openlp/core/ui/printservicedialog.py" line="155"/>
         <source>Fit Page</source>
         <translation>Pas Blaai</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/printservicedialog.py" line="160"/>
+        <location filename="openlp/core/ui/printservicedialog.py" line="155"/>
         <source>Fit Width</source>
         <translation>Pas Wydte</translation>
     </message>
@@ -3920,37 +3922,37 @@
 <context>
     <name>OpenLP.PrintServiceForm</name>
     <message>
-        <location filename="openlp/core/ui/printservicedialog.py" line="142"/>
+        <location filename="openlp/core/ui/printservicedialog.py" line="145"/>
         <source>Options</source>
         <translation>Opsies</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/printservicedialog.py" line="68"/>
+        <location filename="openlp/core/ui/printservicedialog.py" line="76"/>
         <source>Copy</source>
         <translation>Kopieër</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/printservicedialog.py" line="71"/>
+        <location filename="openlp/core/ui/printservicedialog.py" line="78"/>
         <source>Copy as HTML</source>
         <translation>Kopieër as HTML</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/printservicedialog.py" line="140"/>
+        <location filename="openlp/core/ui/printservicedialog.py" line="144"/>
         <source>Zoom In</source>
         <translation>Zoom In</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/printservicedialog.py" line="136"/>
+        <location filename="openlp/core/ui/printservicedialog.py" line="142"/>
         <source>Zoom Out</source>
         <translation>Zoem Uit</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/printservicedialog.py" line="138"/>
+        <location filename="openlp/core/ui/printservicedialog.py" line="143"/>
         <source>Zoom Original</source>
         <translation>Zoem Oorspronklike</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/printservicedialog.py" line="147"/>
+        <location filename="openlp/core/ui/printservicedialog.py" line="148"/>
         <source>Other Options</source>
         <translation>Ander Opsies</translation>
     </message>
@@ -3960,37 +3962,37 @@
         <translation>Sluit skyfie teks in indien beskikbaar</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/printservicedialog.py" line="153"/>
+        <location filename="openlp/core/ui/printservicedialog.py" line="151"/>
         <source>Include service item notes</source>
         <translation>Sluit diens item notas in</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/printservicedialog.py" line="155"/>
+        <location filename="openlp/core/ui/printservicedialog.py" line="152"/>
         <source>Include play length of media items</source>
         <translation>Sluit die speel tyd van die media items in</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/printservicedialog.py" line="151"/>
+        <location filename="openlp/core/ui/printservicedialog.py" line="150"/>
         <source>Add page break before each text item</source>
         <translation>Voeg &apos;n bladsy-breking voor elke teks item</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/printservicedialog.py" line="157"/>
+        <location filename="openlp/core/ui/printservicedialog.py" line="153"/>
         <source>Service Sheet</source>
         <translation>Diens Blad</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/printservicedialog.py" line="58"/>
+        <location filename="openlp/core/ui/printservicedialog.py" line="68"/>
         <source>Print</source>
         <translation>Druk</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/printservicedialog.py" line="144"/>
+        <location filename="openlp/core/ui/printservicedialog.py" line="146"/>
         <source>Title:</source>
         <translation>Titel:</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/printservicedialog.py" line="145"/>
+        <location filename="openlp/core/ui/printservicedialog.py" line="147"/>
         <source>Custom Footer Text:</source>
         <translation>Verpersoonlike Voetskrif Teks:</translation>
     </message>
@@ -3998,12 +4000,12 @@
 <context>
     <name>OpenLP.ScreenList</name>
     <message>
-        <location filename="openlp/core/ui/screen.py" line="143"/>
+        <location filename="openlp/core/lib/screen.py" line="142"/>
         <source>Screen</source>
         <translation>Skerm</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/screen.py" line="146"/>
+        <location filename="openlp/core/lib/screen.py" line="144"/>
         <source>primary</source>
         <translation>primêr</translation>
     </message>
@@ -4011,12 +4013,12 @@
 <context>
     <name>OpenLP.ServiceItem</name>
     <message>
-        <location filename="openlp/core/lib/serviceitem.py" line="484"/>
+        <location filename="openlp/core/lib/serviceitem.py" line="584"/>
         <source>&lt;strong&gt;Start&lt;/strong&gt;: %s</source>
         <translation>&lt;strong&gt;Begin&lt;/strong&gt;: %s</translation>
     </message>
     <message>
-        <location filename="openlp/core/lib/serviceitem.py" line="488"/>
+        <location filename="openlp/core/lib/serviceitem.py" line="587"/>
         <source>&lt;strong&gt;Length&lt;/strong&gt;: %s</source>
         <translation>&lt;strong&gt;Durasie&lt;/strong&gt;: %s</translation>
     </message>
@@ -4024,7 +4026,7 @@
 <context>
     <name>OpenLP.ServiceItemEditForm</name>
     <message>
-        <location filename="openlp/core/ui/serviceitemeditdialog.py" line="66"/>
+        <location filename="openlp/core/ui/serviceitemeditdialog.py" line="78"/>
         <source>Reorder Service Item</source>
         <translation>Hergroepeer Diens Item</translation>
     </message>
@@ -4032,284 +4034,267 @@
 <context>
     <name>OpenLP.ServiceManager</name>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="183"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="162"/>
         <source>Move to &amp;top</source>
         <translation>Skuif boon&amp;toe</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="183"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="162"/>
         <source>Move item to the top of the service.</source>
         <translation>Skuif item tot heel bo in die diens.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="189"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="167"/>
         <source>Move &amp;up</source>
         <translation>Sk&amp;uif op</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="189"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="167"/>
         <source>Move item up one position in the service.</source>
         <translation>Skuif item een posisie boontoe in die diens.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="210"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="182"/>
         <source>Move &amp;down</source>
         <translation>Skuif &amp;af</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="196"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="172"/>
         <source>Move item down one position in the service.</source>
         <translation>Skuif item een posisie af in die diens.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="203"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="177"/>
         <source>Move to &amp;bottom</source>
         <translation>Skuif &amp;tot heel onder</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="203"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="177"/>
         <source>Move item to the end of the service.</source>
         <translation>Skuif item tot aan die einde van die diens.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="223"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="195"/>
         <source>&amp;Delete From Service</source>
         <translation>Wis uit vanaf die &amp;Diens</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="223"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="195"/>
         <source>Delete the selected item from the service.</source>
         <translation>Wis geselekteerde item van die diens af.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="288"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="229"/>
         <source>&amp;Add New Item</source>
         <translation>&amp;Voeg Nuwe Item By</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="291"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="231"/>
         <source>&amp;Add to Selected Item</source>
         <translation>&amp;Voeg by Geselekteerde Item</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="296"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="235"/>
         <source>&amp;Edit Item</source>
         <translation>R&amp;edigeer Item</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="299"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="240"/>
         <source>&amp;Reorder Item</source>
         <translation>Ve&amp;rander Item orde</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="303"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="243"/>
         <source>&amp;Notes</source>
         <translation>&amp;Notas</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="319"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="285"/>
         <source>&amp;Change Item Theme</source>
         <translation>&amp;Verander Item Tema</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="635"/>
-        <source>OpenLP Service Files (*.osz)</source>
-        <translation>OpenLP Diens Lêers (*.osz)</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="664"/>
-        <source>File is not a valid service.
-The content encoding is not UTF-8.</source>
-        <translation>Lêer is nie &apos;n geldige diens nie.
-Die inhoud enkodering is nie UTF-8 nie.</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="706"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="776"/>
         <source>File is not a valid service.</source>
         <translation>Lêer is nie &apos;n geldige diens nie.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="1313"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="1476"/>
         <source>Missing Display Handler</source>
         <translation>Vermisde Vertoon Hanteerder</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="1261"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="1430"/>
         <source>Your item cannot be displayed as there is no handler to display it</source>
         <translation>Die item kan nie vertoon word nie omdat daar nie &apos;n hanteerder is om dit te vertoon nie</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="1313"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="1476"/>
         <source>Your item cannot be displayed as the plugin required to display it is missing or inactive</source>
         <translation>Die item kan nie vertoon word nie omdat die mini-program wat dit moet vertoon vermis of onaktief is</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="232"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="201"/>
         <source>&amp;Expand all</source>
         <translation>Br&amp;ei alles uit</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="232"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="201"/>
         <source>Expand all the service items.</source>
         <translation>Brei al die diens items uit.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="238"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="206"/>
         <source>&amp;Collapse all</source>
         <translation>Sto&amp;rt alles ineen</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="238"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="206"/>
         <source>Collapse all the service items.</source>
         <translation>Stort al die diens items ineen.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="421"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="436"/>
         <source>Open File</source>
         <translation>Maak Lêer oop</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="210"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="182"/>
         <source>Moves the selection down the window.</source>
         <translation>Skuif die geselekteerde afwaarts in die venster.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="216"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="188"/>
         <source>Move up</source>
         <translation>Skuif op</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="216"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="188"/>
         <source>Moves the selection up the window.</source>
         <translation>Skuif die geselekteerde opwaarts in die venster.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="246"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="212"/>
         <source>Go Live</source>
         <translation>Gaan Regstreeks</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="246"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="212"/>
         <source>Send the selected item to Live.</source>
         <translation>Stuur die geselekteerde item Regstreeks.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="307"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="246"/>
         <source>&amp;Start Time</source>
         <translation>&amp;Begin Tyd</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="313"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="280"/>
         <source>Show &amp;Preview</source>
         <translation>Wys &amp;Voorskou</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="438"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="454"/>
         <source>Modified Service</source>
         <translation>Redigeer Diens</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="438"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="454"/>
         <source>The current service has been modified. Would you like to save this service?</source>
         <translation>Die huidige diens was verander. Stoor hierdie diens?</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/printserviceform.py" line="198"/>
+        <location filename="openlp/core/ui/printserviceform.py" line="184"/>
         <source>Custom Service Notes: </source>
         <translation>Aangepasde Diens Notas:</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/printserviceform.py" line="245"/>
+        <location filename="openlp/core/ui/printserviceform.py" line="228"/>
         <source>Notes: </source>
         <translation>Notas:</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/printserviceform.py" line="257"/>
+        <location filename="openlp/core/ui/printserviceform.py" line="236"/>
         <source>Playing time: </source>
         <translation>Speel tyd:</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="343"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="360"/>
         <source>Untitled Service</source>
         <translation>Ongetitelde Diens</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="712"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="780"/>
         <source>File could not be opened because it is corrupt.</source>
         <translation>Lêer kon nie oopgemaak word nie omdat dit korrup is.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="718"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="785"/>
         <source>Empty File</source>
         <translation>Leë Lêer</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="718"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="785"/>
         <source>This service file does not contain any data.</source>
         <translation>Die diens lêer het geen data inhoud nie.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="725"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="790"/>
         <source>Corrupt File</source>
         <translation>Korrupte Lêer</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="132"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="119"/>
         <source>Load an existing service.</source>
         <translation>Laai &apos;n bestaande diens.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="136"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="123"/>
         <source>Save this service.</source>
         <translation>Stoor die diens.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="146"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="133"/>
         <source>Select a theme for the service.</source>
         <translation>Kies &apos;n tema vir die diens.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="725"/>
-        <source>This file is either corrupt or it is not an OpenLP 2.0 service file.</source>
-        <translation>Die lêer is óf korrup óf is nie &apos;n OpenLP 2.0 diens lêer nie.</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="1066"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="1269"/>
         <source>Slide theme</source>
         <translation>Skyfie tema</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="1070"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="1272"/>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="1061"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="1266"/>
         <source>Edit</source>
         <translation>Redigeer</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="1061"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="1266"/>
         <source>Service copy only</source>
         <translation>Slegs diens kopie.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="577"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="649"/>
         <source>Error Saving File</source>
         <translation>Fout gedurende Lêer Stooring</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="577"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="649"/>
         <source>There was an error saving your file.</source>
         <translation>Daar was &apos;n probleem om die lêer te stoor.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="507"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="537"/>
         <source>Service File(s) Missing</source>
         <translation>Diens Lêer(s) Vermis</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="509"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="538"/>
         <source>The following file(s) in the service are missing:
 <byte value="x9"/>%s
 
@@ -4319,11 +4304,103 @@
 
 Hierdie lêers sal verwyder word as jy voortgaan om te stoor.</translation>
     </message>
+    <message>
+        <location filename="openlp/core/ui/servicemanager.py" line="237"/>
+        <source>&amp;Rename...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/servicemanager.py" line="253"/>
+        <source>Create New &amp;Custom Slide</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/servicemanager.py" line="260"/>
+        <source>&amp;Auto play slides</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/servicemanager.py" line="264"/>
+        <source>Auto play slides &amp;Loop</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/servicemanager.py" line="269"/>
+        <source>Auto play slides &amp;Once</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/servicemanager.py" line="881"/>
+        <source>&amp;Delay between slides</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/servicemanager.py" line="436"/>
+        <source>OpenLP Service Files (*.osz *.oszl)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/servicemanager.py" line="695"/>
+        <source>OpenLP Service Files (*.osz);; OpenLP Service Files - lite (*.oszl)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/servicemanager.py" line="700"/>
+        <source>OpenLP Service Files (*.osz);;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/servicemanager.py" line="745"/>
+        <source>File is not a valid service.
+ The content encoding is not UTF-8.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/servicemanager.py" line="761"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/servicemanager.py" line="790"/>
+        <source>This file is either corrupt or it is not an OpenLP 2 service file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/servicemanager.py" line="891"/>
+        <source>&amp;Auto Start - inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/servicemanager.py" line="893"/>
+        <source>&amp;Auto Start - active</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/servicemanager.py" line="980"/>
+        <source>Input delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/servicemanager.py" line="980"/>
+        <source>Delay between slides in seconds.</source>
+        <translation>Vertraging tussen skyfies in sekondes.</translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/servicemanager.py" line="1504"/>
+        <source>Rename item title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/servicemanager.py" line="1504"/>
+        <source>Title:</source>
+        <translation>Titel:</translation>
+    </message>
 </context>
 <context>
     <name>OpenLP.ServiceNoteForm</name>
     <message>
-        <location filename="openlp/core/ui/servicenoteform.py" line="65"/>
+        <location filename="openlp/core/ui/servicenoteform.py" line="77"/>
         <source>Service Item Notes</source>
         <translation>Diens Item Notas</translation>
     </message>
@@ -4331,7 +4408,7 @@
 <context>
     <name>OpenLP.SettingsForm</name>
     <message>
-        <location filename="openlp/core/ui/settingsdialog.py" line="63"/>
+        <location filename="openlp/core/ui/settingsdialog.py" line="71"/>
         <source>Configure OpenLP</source>
         <translation>Konfigureer OpenLP</translation>
     </message>
@@ -4339,67 +4416,67 @@
 <context>
     <name>OpenLP.ShortcutListDialog</name>
     <message>
-        <location filename="openlp/core/ui/shortcutlistdialog.py" line="126"/>
+        <location filename="openlp/core/ui/shortcutlistdialog.py" line="137"/>
         <source>Action</source>
         <translation>Aksie</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/shortcutlistdialog.py" line="126"/>
+        <location filename="openlp/core/ui/shortcutlistdialog.py" line="137"/>
         <source>Shortcut</source>
         <translation>Kortpad</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/shortcutlistform.py" line="446"/>
+        <location filename="openlp/core/ui/shortcutlistform.py" line="432"/>
         <source>Duplicate Shortcut</source>
         <translation>Duplikaat Kortpad</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/shortcutlistform.py" line="446"/>
+        <location filename="openlp/core/ui/shortcutlistform.py" line="432"/>
         <source>The shortcut &quot;%s&quot; is already assigned to another action, please use a different shortcut.</source>
         <translation>Die kortpad &quot;%s&quot; is alreeds toegeken aan &apos;n ander aksie, kies asseblief &apos;n ander kortpad.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/shortcutlistdialog.py" line="126"/>
+        <location filename="openlp/core/ui/shortcutlistdialog.py" line="137"/>
         <source>Alternate</source>
         <translation>Alternatief</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/shortcutlistdialog.py" line="123"/>
+        <location filename="openlp/core/ui/shortcutlistdialog.py" line="134"/>
         <source>Select an action and click one of the buttons below to start capturing a new primary or alternate shortcut, respectively.</source>
         <translation>Kies &apos;n aksie en kliek een van die knoppies hieronder om &apos;n primêre of alternatiewe kortpad vas te vang.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/shortcutlistdialog.py" line="130"/>
+        <location filename="openlp/core/ui/shortcutlistdialog.py" line="140"/>
         <source>Default</source>
         <translation>Verstek</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/shortcutlistdialog.py" line="132"/>
+        <location filename="openlp/core/ui/shortcutlistdialog.py" line="141"/>
         <source>Custom</source>
         <translation>Aanpasing</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/shortcutlistdialog.py" line="136"/>
+        <location filename="openlp/core/ui/shortcutlistdialog.py" line="143"/>
         <source>Capture shortcut.</source>
         <translation>Vang kortpad.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/shortcutlistdialog.py" line="141"/>
+        <location filename="openlp/core/ui/shortcutlistdialog.py" line="146"/>
         <source>Restore the default shortcut of this action.</source>
         <translation>Stel die verstek kortpad terug vir hierdie aksie.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/shortcutlistform.py" line="290"/>
+        <location filename="openlp/core/ui/shortcutlistform.py" line="291"/>
         <source>Restore Default Shortcuts</source>
         <translation>Herstel Verstek Kortpaaie</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/shortcutlistform.py" line="290"/>
+        <location filename="openlp/core/ui/shortcutlistform.py" line="291"/>
         <source>Do you want to restore all shortcuts to their defaults?</source>
         <translation>Herstel alle kortpaaie na hul verstek waarde?</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/shortcutlistdialog.py" line="121"/>
+        <location filename="openlp/core/ui/shortcutlistdialog.py" line="133"/>
         <source>Configure Shortcuts</source>
         <translation>Konfigureer Kortpaaie</translation>
     </message>
@@ -4407,172 +4484,172 @@
 <context>
     <name>OpenLP.SlideController</name>
     <message>
-        <location filename="openlp/core/ui/slidecontroller.py" line="202"/>
+        <location filename="openlp/core/ui/slidecontroller.py" line="195"/>
         <source>Hide</source>
         <translation>Verskuil</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/slidecontroller.py" line="281"/>
+        <location filename="openlp/core/ui/slidecontroller.py" line="277"/>
         <source>Go To</source>
         <translation>Gaan Na</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/slidecontroller.py" line="205"/>
+        <location filename="openlp/core/ui/slidecontroller.py" line="197"/>
         <source>Blank Screen</source>
         <translation>Blanko Skerm</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/slidecontroller.py" line="210"/>
+        <location filename="openlp/core/ui/slidecontroller.py" line="202"/>
         <source>Blank to Theme</source>
         <translation>Blanko na Tema</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/slidecontroller.py" line="215"/>
+        <location filename="openlp/core/ui/slidecontroller.py" line="207"/>
         <source>Show Desktop</source>
         <translation>Wys Werkskerm</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/slidecontroller.py" line="509"/>
+        <location filename="openlp/core/ui/slidecontroller.py" line="462"/>
         <source>Previous Service</source>
         <translation>Vorige Diens</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/slidecontroller.py" line="514"/>
+        <location filename="openlp/core/ui/slidecontroller.py" line="467"/>
         <source>Next Service</source>
         <translation>Volgende Diens</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/slidecontroller.py" line="519"/>
+        <location filename="openlp/core/ui/slidecontroller.py" line="472"/>
         <source>Escape Item</source>
         <translation>Ontsnap Item</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/slidecontroller.py" line="178"/>
+        <location filename="openlp/core/ui/slidecontroller.py" line="172"/>
         <source>Move to previous.</source>
         <translation>Skuif terug.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/slidecontroller.py" line="187"/>
+        <location filename="openlp/core/ui/slidecontroller.py" line="179"/>
         <source>Move to next.</source>
         <translation>Skuif volgende.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/slidecontroller.py" line="231"/>
+        <location filename="openlp/core/ui/slidecontroller.py" line="235"/>
         <source>Play Slides</source>
         <translation>Speel Skyfies</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/slidecontroller.py" line="255"/>
+        <location filename="openlp/core/ui/slidecontroller.py" line="254"/>
         <source>Delay between slides in seconds.</source>
         <translation>Vertraging tussen skyfies in sekondes.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/slidecontroller.py" line="259"/>
+        <location filename="openlp/core/ui/slidecontroller.py" line="257"/>
         <source>Move to live.</source>
         <translation>Skuif na regstreeks.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/slidecontroller.py" line="263"/>
+        <location filename="openlp/core/ui/slidecontroller.py" line="260"/>
         <source>Add to Service.</source>
         <translation>Voeg by Diens.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/slidecontroller.py" line="268"/>
+        <location filename="openlp/core/ui/slidecontroller.py" line="264"/>
         <source>Edit and reload song preview.</source>
         <translation>Redigeer en herlaai lied voorskou.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/media/mediacontroller.py" line="207"/>
+        <location filename="openlp/core/ui/media/mediacontroller.py" line="272"/>
         <source>Start playing media.</source>
         <translation>Begin media speel.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/slidecontroller.py" line="285"/>
+        <location filename="openlp/core/ui/slidecontroller.py" line="281"/>
         <source>Pause audio.</source>
         <translation>Stop oudio.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/media/mediacontroller.py" line="212"/>
+        <location filename="openlp/core/ui/media/mediacontroller.py" line="276"/>
         <source>Pause playing media.</source>
         <translation>Halt spelende media.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/media/mediacontroller.py" line="217"/>
+        <location filename="openlp/core/ui/media/mediacontroller.py" line="280"/>
         <source>Stop playing media.</source>
         <translation>Stop spelende media.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/media/mediacontroller.py" line="226"/>
+        <location filename="openlp/core/ui/media/mediacontroller.py" line="289"/>
         <source>Video position.</source>
         <translation>Video posisie.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/media/mediacontroller.py" line="238"/>
+        <location filename="openlp/core/ui/media/mediacontroller.py" line="300"/>
         <source>Audio Volume.</source>
         <translation>Oudio Volume.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/slidecontroller.py" line="367"/>
+        <location filename="openlp/core/ui/slidecontroller.py" line="350"/>
         <source>Go to &quot;Verse&quot;</source>
         <translation>Gaan na &quot;Vers&quot;</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/slidecontroller.py" line="369"/>
+        <location filename="openlp/core/ui/slidecontroller.py" line="351"/>
         <source>Go to &quot;Chorus&quot;</source>
         <translation>Gaan na &quot;Koor&quot;</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/slidecontroller.py" line="371"/>
+        <location filename="openlp/core/ui/slidecontroller.py" line="352"/>
         <source>Go to &quot;Bridge&quot;</source>
         <translation>Gaan na &quot;Brug&quot;</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/slidecontroller.py" line="373"/>
+        <location filename="openlp/core/ui/slidecontroller.py" line="354"/>
         <source>Go to &quot;Pre-Chorus&quot;</source>
         <translation>Gaan na &quot;Pre-Koor&quot;</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/slidecontroller.py" line="376"/>
+        <location filename="openlp/core/ui/slidecontroller.py" line="355"/>
         <source>Go to &quot;Intro&quot;</source>
         <translation>Gaan na &quot;Inleiding&quot;</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/slidecontroller.py" line="378"/>
+        <location filename="openlp/core/ui/slidecontroller.py" line="356"/>
         <source>Go to &quot;Ending&quot;</source>
         <translation>Gaan na &quot;Einde&quot;</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/slidecontroller.py" line="380"/>
+        <location filename="openlp/core/ui/slidecontroller.py" line="357"/>
         <source>Go to &quot;Other&quot;</source>
         <translation>Gaan na &quot;Ander&quot;</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/slidecontroller.py" line="178"/>
+        <location filename="openlp/core/ui/slidecontroller.py" line="172"/>
         <source>Previous Slide</source>
         <translation>Vorige Skyfie</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/slidecontroller.py" line="187"/>
+        <location filename="openlp/core/ui/slidecontroller.py" line="179"/>
         <source>Next Slide</source>
         <translation>Volgende Skyfie</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/slidecontroller.py" line="285"/>
+        <location filename="openlp/core/ui/slidecontroller.py" line="281"/>
         <source>Pause Audio</source>
         <translation>Hou Oudio</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/slidecontroller.py" line="292"/>
+        <location filename="openlp/core/ui/slidecontroller.py" line="287"/>
         <source>Background Audio</source>
         <translation>Agtergrond Oudio</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/slidecontroller.py" line="298"/>
+        <location filename="openlp/core/ui/slidecontroller.py" line="291"/>
         <source>Go to next audio track.</source>
         <translation>Gaan na die volgende oudio snit.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/slidecontroller.py" line="305"/>
+        <location filename="openlp/core/ui/slidecontroller.py" line="299"/>
         <source>Tracks</source>
         <translation>Snitte</translation>
     </message>
@@ -4580,7 +4657,7 @@
 <context>
     <name>OpenLP.SpellTextEdit</name>
     <message>
-        <location filename="openlp/core/lib/spelltextedit.py" line="107"/>
+        <location filename="openlp/core/lib/spelltextedit.py" line="109"/>
         <source>Spelling Suggestions</source>
         <translation>Spelling Voorstelle</translation>
     </message>
@@ -4590,7 +4667,7 @@
         <translation>Uitleg Hakkies</translation>
     </message>
     <message>
-        <location filename="openlp/core/lib/spelltextedit.py" line="92"/>
+        <location filename="openlp/core/lib/spelltextedit.py" line="98"/>
         <source>Language:</source>
         <translation>Taal:</translation>
     </message>
@@ -4598,255 +4675,266 @@
 <context>
     <name>OpenLP.StartTimeForm</name>
     <message>
-        <location filename="openlp/core/ui/starttimedialog.py" line="119"/>
+        <location filename="openlp/core/ui/themelayoutdialog.py" line="78"/>
+        <source>Theme Layout</source>
+        <translation>Tema Uitleg</translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/themelayoutdialog.py" line="79"/>
+        <source>The blue box shows the main area.</source>
+        <translation>Die blou boks wys die hoof area.</translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/themelayoutdialog.py" line="80"/>
+        <source>The red box shows the footer.</source>
+        <translation>Die rooi boks wys die voet area.</translation>
+    </message>
+</context>
+<context>
+    <name>OpenLP.StartTime_form</name>
+    <message>
+        <location filename="openlp/core/ui/starttimedialog.py" line="124"/>
+        <source>Item Start and Finish Time</source>
+        <translation>Item Begin en End Tyd</translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/starttimedialog.py" line="131"/>
         <source>Hours:</source>
         <translation>Ure:</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/starttimedialog.py" line="120"/>
+        <location filename="openlp/core/ui/starttimedialog.py" line="132"/>
         <source>Minutes:</source>
         <translation>Minute:</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/starttimedialog.py" line="121"/>
+        <location filename="openlp/core/ui/starttimedialog.py" line="133"/>
         <source>Seconds:</source>
         <translation>Sekondes:</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/starttimedialog.py" line="111"/>
-        <source>Item Start and Finish Time</source>
-        <translation>Item Begin en End Tyd</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/starttimedialog.py" line="122"/>
+        <location filename="openlp/core/ui/starttimedialog.py" line="134"/>
         <source>Start</source>
         <translation>Begin</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/starttimedialog.py" line="123"/>
+        <location filename="openlp/core/ui/starttimedialog.py" line="135"/>
         <source>Finish</source>
         <translation>Eindig</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/starttimedialog.py" line="124"/>
+        <location filename="openlp/core/ui/starttimedialog.py" line="136"/>
         <source>Length</source>
         <translation>Lengte</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/starttimeform.py" line="82"/>
+        <location filename="openlp/core/ui/starttimeform.py" line="81"/>
         <source>Time Validation Error</source>
         <translation>Tyd Validasie Fout</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/starttimeform.py" line="75"/>
+        <location filename="openlp/core/ui/starttimeform.py" line="76"/>
         <source>Finish time is set after the end of the media item</source>
         <translation>End tyd is na die einde van die media item gestel</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/starttimeform.py" line="82"/>
+        <location filename="openlp/core/ui/starttimeform.py" line="81"/>
         <source>Start time is after the finish time of the media item</source>
         <translation>Begin tyd is na die eind tyd van die media item</translation>
     </message>
-    <message>
-        <location filename="openlp/core/ui/themelayoutdialog.py" line="67"/>
-        <source>Theme Layout</source>
-        <translation>Tema Uitleg</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/themelayoutdialog.py" line="69"/>
-        <source>The blue box shows the main area.</source>
-        <translation>Die blou boks wys die hoof area.</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/themelayoutdialog.py" line="71"/>
-        <source>The red box shows the footer.</source>
-        <translation>Die rooi boks wys die voet area.</translation>
+</context>
+<context>
+    <name>OpenLP.ThemeForm</name>
+    <message>
+        <location filename="openlp/core/ui/themeform.py" line="154"/>
+        <source>(approximately %d lines per slide)</source>
+        <translation>(ongeveer %d lyne per skyfie)</translation>
     </message>
 </context>
 <context>
     <name>OpenLP.ThemeManager</name>
     <message>
-        <location filename="openlp/core/ui/thememanager.py" line="71"/>
+        <location filename="openlp/core/ui/thememanager.py" line="65"/>
         <source>Create a new theme.</source>
         <translation>Skep &apos;n nuwe tema.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/thememanager.py" line="75"/>
+        <location filename="openlp/core/ui/thememanager.py" line="69"/>
         <source>Edit Theme</source>
         <translation>Redigeer Tema</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/thememanager.py" line="75"/>
+        <location filename="openlp/core/ui/thememanager.py" line="69"/>
         <source>Edit a theme.</source>
         <translation>Redigeer &apos;n tema.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/thememanager.py" line="80"/>
+        <location filename="openlp/core/ui/thememanager.py" line="74"/>
         <source>Delete Theme</source>
         <translation>Wis Tema Uit</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/thememanager.py" line="80"/>
+        <location filename="openlp/core/ui/thememanager.py" line="74"/>
         <source>Delete a theme.</source>
         <translation>Wis &apos;n tema uit.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/thememanager.py" line="86"/>
+        <location filename="openlp/core/ui/thememanager.py" line="82"/>
         <source>Import Theme</source>
         <translation>Voer Tema In</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/thememanager.py" line="86"/>
+        <location filename="openlp/core/ui/thememanager.py" line="82"/>
         <source>Import a theme.</source>
         <translation>Voer &apos;n tema in.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/thememanager.py" line="91"/>
+        <location filename="openlp/core/ui/thememanager.py" line="87"/>
         <source>Export Theme</source>
         <translation>Voer Tema Uit</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/thememanager.py" line="91"/>
+        <location filename="openlp/core/ui/thememanager.py" line="87"/>
         <source>Export a theme.</source>
         <translation>Voer &apos;n tema uit.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/thememanager.py" line="111"/>
+        <location filename="openlp/core/ui/thememanager.py" line="105"/>
         <source>&amp;Edit Theme</source>
         <translation>R&amp;edigeer Tema</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/thememanager.py" line="120"/>
+        <location filename="openlp/core/ui/thememanager.py" line="114"/>
         <source>&amp;Delete Theme</source>
         <translation>&amp;Wis Tema uit</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/thememanager.py" line="124"/>
+        <location filename="openlp/core/ui/thememanager.py" line="118"/>
         <source>Set As &amp;Global Default</source>
         <translation>Stel in As &amp;Globale Standaard</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/thememanager.py" line="471"/>
+        <location filename="openlp/core/ui/thememanager.py" line="468"/>
         <source>%s (default)</source>
         <translation>%s (standaard)</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/thememanager.py" line="326"/>
+        <location filename="openlp/core/ui/thememanager.py" line="323"/>
         <source>You must select a theme to edit.</source>
         <translation>Kies &apos;n tema om te redigeer.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/thememanager.py" line="793"/>
+        <location filename="openlp/core/ui/thememanager.py" line="743"/>
         <source>You are unable to delete the default theme.</source>
         <translation>Die standaard tema kan nie uitgewis word nie.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/thememanager.py" line="801"/>
+        <location filename="openlp/core/ui/thememanager.py" line="750"/>
         <source>Theme %s is used in the %s plugin.</source>
         <translation>Tema %s is in gebruik deur die %s mini-program.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/thememanager.py" line="380"/>
+        <location filename="openlp/core/ui/thememanager.py" line="377"/>
         <source>You have not selected a theme.</source>
         <translation>Geen tema is geselekteer nie.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/thememanager.py" line="384"/>
+        <location filename="openlp/core/ui/thememanager.py" line="380"/>
         <source>Save Theme - (%s)</source>
         <translation>Stoor Tema - (%s)</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/thememanager.py" line="402"/>
+        <location filename="openlp/core/ui/thememanager.py" line="397"/>
         <source>Theme Exported</source>
         <translation>Tema Uitvoer</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/thememanager.py" line="402"/>
+        <location filename="openlp/core/ui/thememanager.py" line="397"/>
         <source>Your theme has been successfully exported.</source>
         <translation>Die tema was suksesvol uitgevoer.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/thememanager.py" line="408"/>
+        <location filename="openlp/core/ui/thememanager.py" line="403"/>
         <source>Theme Export Failed</source>
         <translation>Tema Uitvoer het Misluk</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/thememanager.py" line="408"/>
+        <location filename="openlp/core/ui/thememanager.py" line="403"/>
         <source>Your theme could not be exported due to an error.</source>
         <translation>Die tema kon nie uitgevoer word nie weens &apos;n fout.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/thememanager.py" line="423"/>
+        <location filename="openlp/core/ui/thememanager.py" line="417"/>
         <source>Select Theme Import File</source>
         <translation>Kies Tema Invoer Lêer</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/thememanager.py" line="608"/>
+        <location filename="openlp/core/ui/thememanager.py" line="594"/>
         <source>File is not a valid theme.</source>
         <translation>Lêer is nie &apos;n geldige tema nie.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/thememanager.py" line="114"/>
+        <location filename="openlp/core/ui/thememanager.py" line="108"/>
         <source>&amp;Copy Theme</source>
         <translation>&amp;Kopieër Tema</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/thememanager.py" line="117"/>
+        <location filename="openlp/core/ui/thememanager.py" line="111"/>
         <source>&amp;Rename Theme</source>
         <translation>He&amp;rnoem Tema</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/thememanager.py" line="128"/>
+        <location filename="openlp/core/ui/thememanager.py" line="122"/>
         <source>&amp;Export Theme</source>
         <translation>Vo&amp;er Tema uit</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/thememanager.py" line="267"/>
+        <location filename="openlp/core/ui/thememanager.py" line="265"/>
         <source>You must select a theme to rename.</source>
         <translation>Kies &apos;n tema om te hernoem.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/thememanager.py" line="267"/>
+        <location filename="openlp/core/ui/thememanager.py" line="265"/>
         <source>Rename Confirmation</source>
         <translation>Hernoem Bevestiging</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/thememanager.py" line="267"/>
+        <location filename="openlp/core/ui/thememanager.py" line="265"/>
         <source>Rename %s theme?</source>
         <translation>Hernoem %s tema?</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/thememanager.py" line="343"/>
+        <location filename="openlp/core/ui/thememanager.py" line="340"/>
         <source>You must select a theme to delete.</source>
         <translation>Kies &apos;n tema om uit te wis.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/thememanager.py" line="343"/>
+        <location filename="openlp/core/ui/thememanager.py" line="340"/>
         <source>Delete Confirmation</source>
         <translation>Uitwis Bevestiging</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/thememanager.py" line="343"/>
+        <location filename="openlp/core/ui/thememanager.py" line="340"/>
         <source>Delete %s theme?</source>
         <translation>Wis %s tema uit?</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/thememanager.py" line="801"/>
+        <location filename="openlp/core/ui/thememanager.py" line="750"/>
         <source>Validation Error</source>
         <translation>Validerings Fout</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/thememanager.py" line="659"/>
+        <location filename="openlp/core/ui/thememanager.py" line="608"/>
         <source>A theme with this name already exists.</source>
         <translation>&apos;n Tema met hierdie naam bestaan alreeds.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/thememanager.py" line="423"/>
+        <location filename="openlp/core/ui/thememanager.py" line="417"/>
         <source>OpenLP Themes (*.theme *.otz)</source>
         <translation>OpenLP Temas (*.theme *.otz)</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/thememanager.py" line="296"/>
+        <location filename="openlp/core/ui/thememanager.py" line="292"/>
         <source>Copy of %s</source>
         <comment>Copy of &lt;theme name&gt;</comment>
         <translation>Duplikaat van %s</translation>
@@ -4865,315 +4953,310 @@
 <context>
     <name>OpenLP.ThemeWizard</name>
     <message>
-        <location filename="openlp/core/ui/themewizard.py" line="424"/>
+        <location filename="openlp/core/ui/themewizard.py" line="398"/>
         <source>Theme Wizard</source>
         <translation>Tema Gids</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themewizard.py" line="426"/>
+        <location filename="openlp/core/ui/themewizard.py" line="399"/>
         <source>Welcome to the Theme Wizard</source>
         <translation>Welkom by die Tema Gids</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themewizard.py" line="433"/>
+        <location filename="openlp/core/ui/themewizard.py" line="404"/>
         <source>Set Up Background</source>
         <translation>Stel die Agtergrond Op</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themewizard.py" line="435"/>
+        <location filename="openlp/core/ui/themewizard.py" line="405"/>
         <source>Set up your theme&apos;s background according to the parameters below.</source>
         <translation>Stel jou tema se agtergrond op volgens die parameters hier onder.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themewizard.py" line="438"/>
+        <location filename="openlp/core/ui/themewizard.py" line="407"/>
         <source>Background type:</source>
         <translation>Agtergrond tipe:</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themewizard.py" line="440"/>
-        <source>Solid Color</source>
-        <translation>Soliede Kleur</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/themewizard.py" line="442"/>
+        <location filename="openlp/core/ui/themewizard.py" line="410"/>
         <source>Gradient</source>
         <translation>Gradiënt</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themewizard.py" line="496"/>
-        <source>Color:</source>
-        <translation>Kleur:</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/themewizard.py" line="453"/>
+        <location filename="openlp/core/ui/themewizard.py" line="418"/>
         <source>Gradient:</source>
         <translation>Gradiënt:</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themewizard.py" line="455"/>
+        <location filename="openlp/core/ui/themewizard.py" line="419"/>
         <source>Horizontal</source>
         <translation>Horisontaal</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themewizard.py" line="457"/>
+        <location filename="openlp/core/ui/themewizard.py" line="421"/>
         <source>Vertical</source>
         <translation>Vertikaal</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themewizard.py" line="459"/>
+        <location filename="openlp/core/ui/themewizard.py" line="423"/>
         <source>Circular</source>
         <translation>Sirkelvormig</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themewizard.py" line="461"/>
+        <location filename="openlp/core/ui/themewizard.py" line="425"/>
         <source>Top Left - Bottom Right</source>
         <translation>Links Bo - Regs Onder</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themewizard.py" line="463"/>
+        <location filename="openlp/core/ui/themewizard.py" line="427"/>
         <source>Bottom Left - Top Right</source>
         <translation>Links Onder - Regs Bo</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themewizard.py" line="468"/>
+        <location filename="openlp/core/ui/themewizard.py" line="431"/>
         <source>Main Area Font Details</source>
         <translation>Hoof Area Skrif Gegewens</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themewizard.py" line="470"/>
+        <location filename="openlp/core/ui/themewizard.py" line="432"/>
         <source>Define the font and display characteristics for the Display text</source>
         <translation>Definieër die skrif en vertoon karrakters vir die Vertoon teks</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themewizard.py" line="495"/>
+        <location filename="openlp/core/ui/themewizard.py" line="451"/>
         <source>Font:</source>
         <translation>Skrif:</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themewizard.py" line="497"/>
+        <location filename="openlp/core/ui/themewizard.py" line="453"/>
         <source>Size:</source>
         <translation>Grootte:</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themewizard.py" line="477"/>
+        <location filename="openlp/core/ui/themewizard.py" line="438"/>
         <source>Line Spacing:</source>
         <translation>Lyn Spasiëring:</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themewizard.py" line="480"/>
+        <location filename="openlp/core/ui/themewizard.py" line="440"/>
         <source>&amp;Outline:</source>
         <translation>&amp;Buitelyn:</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themewizard.py" line="484"/>
+        <location filename="openlp/core/ui/themewizard.py" line="443"/>
         <source>&amp;Shadow:</source>
         <translation>&amp;Skaduwee:</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themewizard.py" line="487"/>
+        <location filename="openlp/core/ui/themewizard.py" line="446"/>
         <source>Bold</source>
         <translation>Vetdruk</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themewizard.py" line="488"/>
+        <location filename="openlp/core/ui/themewizard.py" line="447"/>
         <source>Italic</source>
         <translation>Italiaans</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themewizard.py" line="490"/>
+        <location filename="openlp/core/ui/themewizard.py" line="448"/>
         <source>Footer Area Font Details</source>
         <translation>Voetskrif Area Skrif Gegewens</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themewizard.py" line="492"/>
+        <location filename="openlp/core/ui/themewizard.py" line="449"/>
         <source>Define the font and display characteristics for the Footer text</source>
         <translation>Definieër die skrif en vertoon karraktereienskappe vir die Voetskrif teks</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themewizard.py" line="499"/>
+        <location filename="openlp/core/ui/themewizard.py" line="455"/>
         <source>Text Formatting Details</source>
         <translation>Teks Formattering Gegewens</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themewizard.py" line="501"/>
+        <location filename="openlp/core/ui/themewizard.py" line="456"/>
         <source>Allows additional display formatting information to be defined</source>
         <translation>Laat toe dat addisionele vertoon formattering inligting gedifinieër word</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themewizard.py" line="504"/>
+        <location filename="openlp/core/ui/themewizard.py" line="458"/>
         <source>Horizontal Align:</source>
         <translation>Horisontale Sporing:</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themewizard.py" line="506"/>
+        <location filename="openlp/core/ui/themewizard.py" line="459"/>
         <source>Left</source>
         <translation>Links</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themewizard.py" line="508"/>
+        <location filename="openlp/core/ui/themewizard.py" line="460"/>
         <source>Right</source>
         <translation>Regs</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themewizard.py" line="510"/>
+        <location filename="openlp/core/ui/themewizard.py" line="461"/>
         <source>Center</source>
         <translation>Middel</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themewizard.py" line="516"/>
+        <location filename="openlp/core/ui/themewizard.py" line="464"/>
         <source>Output Area Locations</source>
         <translation>Uitvoer Area Liggings</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themewizard.py" line="518"/>
-        <source>Allows you to change and move the main and footer areas.</source>
-        <translation>Laat toe dat die hoof en voetskrif areas verander en geskuif word.</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/themewizard.py" line="521"/>
+        <location filename="openlp/core/ui/themewizard.py" line="467"/>
         <source>&amp;Main Area</source>
         <translation>&amp;Hoof Area</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themewizard.py" line="523"/>
+        <location filename="openlp/core/ui/themewizard.py" line="468"/>
         <source>&amp;Use default location</source>
         <translation>Gebr&amp;uik verstek ligging</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themewizard.py" line="536"/>
+        <location filename="openlp/core/ui/themewizard.py" line="478"/>
         <source>X position:</source>
         <translation>X posisie:</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themewizard.py" line="548"/>
+        <location filename="openlp/core/ui/themewizard.py" line="485"/>
         <source>px</source>
         <translation>px</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themewizard.py" line="539"/>
+        <location filename="openlp/core/ui/themewizard.py" line="480"/>
         <source>Y position:</source>
         <translation>Y posisie:</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themewizard.py" line="542"/>
+        <location filename="openlp/core/ui/themewizard.py" line="482"/>
         <source>Width:</source>
         <translation>Wydte:</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themewizard.py" line="546"/>
+        <location filename="openlp/core/ui/themewizard.py" line="484"/>
         <source>Height:</source>
         <translation>Hoogte:</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themewizard.py" line="550"/>
+        <location filename="openlp/core/ui/themewizard.py" line="486"/>
         <source>Use default location</source>
         <translation>Gebruik verstek ligging</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themewizard.py" line="559"/>
+        <location filename="openlp/core/ui/themewizard.py" line="491"/>
         <source>Theme name:</source>
         <translation>Tema naam:</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themeform.py" line="329"/>
+        <location filename="openlp/core/ui/themeform.py" line="272"/>
         <source>Edit Theme - %s</source>
         <translation>Redigeer Tema - %s</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themewizard.py" line="429"/>
+        <location filename="openlp/core/ui/themewizard.py" line="401"/>
         <source>This wizard will help you to create and edit your themes. Click the next button below to start the process by setting up your background.</source>
         <translation>Hierdie gids sal help om temas te skep en te redigeer. Klik die volgende knoppie hieronder om die proses te begin deur jou agtergrond op te stel.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themewizard.py" line="514"/>
+        <location filename="openlp/core/ui/themewizard.py" line="463"/>
         <source>Transitions:</source>
         <translation>Oorskakel effekte:</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themewizard.py" line="534"/>
+        <location filename="openlp/core/ui/themewizard.py" line="477"/>
         <source>&amp;Footer Area</source>
         <translation>&amp;Voetskrif Area</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themewizard.py" line="449"/>
+        <location filename="openlp/core/ui/themewizard.py" line="416"/>
         <source>Starting color:</source>
         <translation>Begin Kleur:</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themewizard.py" line="451"/>
+        <location filename="openlp/core/ui/themewizard.py" line="417"/>
         <source>Ending color:</source>
         <translation>Eind Kleur:</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themewizard.py" line="465"/>
+        <location filename="openlp/core/ui/themewizard.py" line="429"/>
         <source>Background color:</source>
         <translation>Agtergrond kleur:</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themewizard.py" line="512"/>
+        <location filename="openlp/core/ui/themewizard.py" line="462"/>
         <source>Justify</source>
         <translation>Uitsgespan</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themewizard.py" line="553"/>
+        <location filename="openlp/core/ui/themewizard.py" line="488"/>
         <source>Layout Preview</source>
         <translation>Uitleg Voorskou</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themewizard.py" line="446"/>
+        <location filename="openlp/core/ui/themewizard.py" line="413"/>
         <source>Transparent</source>
         <translation>Deurskynend</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themewizard.py" line="555"/>
+        <location filename="openlp/core/ui/themewizard.py" line="489"/>
         <source>Preview and Save</source>
         <translation>Skou en Stoor</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themewizard.py" line="557"/>
+        <location filename="openlp/core/ui/themewizard.py" line="490"/>
         <source>Preview the theme and save it.</source>
         <translation>Skou die tema en stoor dit.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themeform.py" line="209"/>
-        <source>(approximately %d lines per slide)</source>
-        <translation>(ongeveer %d lyne per skyfie)</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/themeform.py" line="237"/>
+        <location filename="openlp/core/ui/themeform.py" line="182"/>
         <source>Background Image Empty</source>
         <translation>Leë Agtergrond Beeld</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themeform.py" line="237"/>
-        <source>You have not selected a background image. Please select one before continuing.</source>
-        <translation>&apos;n Agtergrond beeld is nie gekies nie. Kies asseblief een voor jy aangaan.</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/themeform.py" line="541"/>
+        <location filename="openlp/core/ui/themeform.py" line="440"/>
         <source>Select Image</source>
         <translation>Selekteer Beeld</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themeform.py" line="623"/>
+        <location filename="openlp/core/ui/themeform.py" line="520"/>
         <source>Theme Name Missing</source>
         <translation>Tema Naam Vermis</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themeform.py" line="623"/>
+        <location filename="openlp/core/ui/themeform.py" line="520"/>
         <source>There is no name for this theme. Please enter one.</source>
         <translation>Daar is geen naam vir hierdie tema nie. Voer asseblief een in.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themeform.py" line="629"/>
+        <location filename="openlp/core/ui/themeform.py" line="525"/>
         <source>Theme Name Invalid</source>
         <translation>Tema Naam Ongeldig</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themeform.py" line="629"/>
+        <location filename="openlp/core/ui/themeform.py" line="525"/>
         <source>Invalid theme name. Please enter one.</source>
         <translation>Ongeldige tema naam. Voer asseblief een in.</translation>
     </message>
+    <message>
+        <location filename="openlp/core/ui/themeform.py" line="182"/>
+        <source>_you have not selected a background image. Please select one before continuing.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/themewizard.py" line="408"/>
+        <source>Solid color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/themewizard.py" line="452"/>
+        <source>color:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/themewizard.py" line="465"/>
+        <source>Allows you to change and move the Main and Footer areas.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>OpenLP.ThemesTab</name>
@@ -5183,42 +5266,42 @@
         <translation>Globale Tema</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themestab.py" line="116"/>
+        <location filename="openlp/core/ui/themestab.py" line="115"/>
         <source>Theme Level</source>
         <translation>Tema Vlak</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themestab.py" line="118"/>
+        <location filename="openlp/core/ui/themestab.py" line="116"/>
         <source>S&amp;ong Level</source>
         <translation>Lied Vl&amp;ak</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themestab.py" line="120"/>
+        <location filename="openlp/core/ui/themestab.py" line="117"/>
         <source>Use the theme from each song in the database. If a song doesn&apos;t have a theme associated with it, then use the service&apos;s theme. If the service doesn&apos;t have a theme, then use the global theme.</source>
         <translation>Gebruik die tema van elke lied in die lied-databasis. As &apos;n lied nie &apos;n geassosieërde tema het nie, gebruik die diens se tema. As die diens nie &apos;n tema het nie, gebruik dan die globale tema.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themestab.py" line="125"/>
+        <location filename="openlp/core/ui/themestab.py" line="121"/>
         <source>&amp;Service Level</source>
         <translation>Dien&amp;s Vlak</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themestab.py" line="127"/>
+        <location filename="openlp/core/ui/themestab.py" line="122"/>
         <source>Use the theme from the service, overriding any of the individual songs&apos; themes. If the service doesn&apos;t have a theme, then use the global theme.</source>
         <translation>Gebruik die tema van die diens en verplaas enige van die individuele liedere se temas. As die diens nie &apos;n tema het nie, gebruik dan die globale tema.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themestab.py" line="131"/>
+        <location filename="openlp/core/ui/themestab.py" line="126"/>
         <source>&amp;Global Level</source>
         <translation>&amp;Globale Vlak</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themestab.py" line="133"/>
+        <location filename="openlp/core/ui/themestab.py" line="127"/>
         <source>Use the global theme, overriding any themes associated with either the service or the songs.</source>
         <translation>Gebruik die globale tema om enige temas wat met die diens of liedere geassosieer is te vervang.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/themestab.py" line="43"/>
+        <location filename="openlp/core/ui/themestab.py" line="50"/>
         <source>Themes</source>
         <translation>Temas</translation>
     </message>
@@ -5226,649 +5309,264 @@
 <context>
     <name>OpenLP.Ui</name>
     <message>
-        <location filename="openlp/core/lib/ui.py" line="77"/>
-        <source>Error</source>
-        <translation>Fout</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="60"/>
-        <source>About</source>
-        <translation>Aangaande</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="61"/>
-        <source>&amp;Add</source>
-        <translation>&amp;Voeg by</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="62"/>
-        <source>Advanced</source>
-        <translation>Gevorderd</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="63"/>
-        <source>All Files</source>
-        <translation>Alle Lêers</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="64"/>
-        <source>Bottom</source>
-        <translation>Onder</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="65"/>
-        <source>Browse...</source>
-        <translation>Deursoek...</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="66"/>
-        <source>Cancel</source>
-        <translation>Kanselleer</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="67"/>
-        <source>CCLI number:</source>
-        <translation>CCLI nommer:</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="68"/>
-        <source>Create a new service.</source>
-        <translation>Skep &apos;n nuwe diens.</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="72"/>
-        <source>&amp;Delete</source>
-        <translation>&amp;Wis Uit</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="75"/>
-        <source>&amp;Edit</source>
-        <translation>R&amp;edigeer</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="76"/>
-        <source>Empty Field</source>
-        <translation>Leë Veld</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="78"/>
-        <source>Export</source>
-        <translation>Uitvoer</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="80"/>
-        <source>pt</source>
-        <comment>Abbreviated font pointsize unit</comment>
-        <translation>pt</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="89"/>
-        <source>Image</source>
-        <translation>Beeld</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="90"/>
-        <source>Import</source>
-        <translation>Voer in</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="92"/>
-        <source>Live</source>
-        <translation>Regstreeks</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="93"/>
-        <source>Live Background Error</source>
-        <translation>Regstreekse Agtergrond Fout</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="95"/>
-        <source>Load</source>
-        <translation>Laai</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="98"/>
-        <source>Middle</source>
-        <translation>Middel</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="99"/>
-        <source>New</source>
-        <translation>Nuwe</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="100"/>
-        <source>New Service</source>
-        <translation>Nuwe Diens</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="101"/>
-        <source>New Theme</source>
-        <translation>Nuwe Tema</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="104"/>
-        <source>No File Selected</source>
-        <comment>Singular</comment>
-        <translation>Geen Lêer Geselekteer nie</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="105"/>
-        <source>No Files Selected</source>
-        <comment>Plural</comment>
-        <translation>Geen Leêrs Geselekteer nie</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="106"/>
-        <source>No Item Selected</source>
-        <comment>Singular</comment>
-        <translation>Geen Item Geselekteer nie</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="107"/>
-        <source>No Items Selected</source>
-        <comment>Plural</comment>
-        <translation>Geen items geselekteer nie</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="108"/>
-        <source>openlp.org 1.x</source>
-        <translation>openlp.org 1.x</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="109"/>
-        <source>OpenLP 2.0</source>
-        <translation>OpenLP 2.0</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="115"/>
-        <source>Preview</source>
-        <translation>Voorskou</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="117"/>
-        <source>Replace Background</source>
-        <translation>Vervang Agtergrond</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="119"/>
-        <source>Reset Background</source>
-        <translation>Herstel Agtergrond</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="121"/>
-        <source>s</source>
-        <comment>The abbreviated unit for seconds</comment>
-        <translation>s</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="123"/>
-        <source>Save &amp;&amp; Preview</source>
-        <translation>Stoor &amp;&amp; Voorskou</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="124"/>
-        <source>Search</source>
-        <translation>Soek</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="127"/>
-        <source>You must select an item to delete.</source>
-        <translation>Kies &apos;n item om uit te wis.</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="129"/>
-        <source>You must select an item to edit.</source>
-        <translation>Selekteer &apos;n item om te regideer.</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="132"/>
-        <source>Save Service</source>
-        <translation>Stoor Diens</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="133"/>
-        <source>Service</source>
-        <translation>Diens</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="137"/>
-        <source>Start %s</source>
-        <translation>Begin %s</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="142"/>
-        <source>Theme</source>
-        <comment>Singular</comment>
-        <translation>Tema</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="143"/>
-        <source>Themes</source>
-        <comment>Plural</comment>
-        <translation>Temas</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="145"/>
-        <source>Top</source>
-        <translation>Bo</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="149"/>
-        <source>Version</source>
-        <translation>Weergawe</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="305"/>
+        <location filename="openlp/core/lib/ui.py" line="167"/>
         <source>Delete the selected item.</source>
         <translation>Wis die geselekteerde item uit.</translation>
     </message>
     <message>
-        <location filename="openlp/core/lib/ui.py" line="309"/>
+        <location filename="openlp/core/lib/ui.py" line="170"/>
         <source>Move selection up one position.</source>
         <translation>Skuif die seleksie een posisie op.</translation>
     </message>
     <message>
-        <location filename="openlp/core/lib/ui.py" line="313"/>
+        <location filename="openlp/core/lib/ui.py" line="173"/>
         <source>Move selection down one position.</source>
         <translation>Skuif die seleksie een posisie af.</translation>
     </message>
     <message>
-        <location filename="openlp/core/lib/ui.py" line="466"/>
+        <location filename="openlp/core/lib/ui.py" line="312"/>
         <source>&amp;Vertical Align:</source>
         <translation>&amp;Vertikale Sporing:</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/wizard.py" line="53"/>
+        <location filename="openlp/core/ui/wizard.py" line="55"/>
         <source>Finished import.</source>
         <translation>Invoer voltooi.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/wizard.py" line="54"/>
+        <location filename="openlp/core/ui/wizard.py" line="56"/>
         <source>Format:</source>
         <translation>Formaat:</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/wizard.py" line="56"/>
+        <location filename="openlp/core/ui/wizard.py" line="58"/>
         <source>Importing</source>
         <translation>Invoer</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/wizard.py" line="57"/>
+        <location filename="openlp/core/ui/wizard.py" line="59"/>
         <source>Importing &quot;%s&quot;...</source>
         <translation>&quot;%s&quot; ingevoer...</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/wizard.py" line="58"/>
+        <location filename="openlp/core/ui/wizard.py" line="60"/>
         <source>Select Import Source</source>
         <translation>Selekteer Invoer Bron</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/wizard.py" line="59"/>
+        <location filename="openlp/core/ui/wizard.py" line="61"/>
         <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>
-        <location filename="openlp/core/ui/wizard.py" line="61"/>
-        <source>The openlp.org 1.x importer has been disabled due to a missing Python module. If you want to use this importer, you will need to install the &quot;python-sqlite&quot; module.</source>
-        <translation>Die openlp.org 1.x invoerder is onaktief gestel weens &apos;n vermisde Python module. Om van hierdie invoerder gebruik te maak moet die &quot;python-sqlite&quot; module installeer word.</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/wizard.py" line="65"/>
+        <location filename="openlp/core/ui/wizard.py" line="62"/>
         <source>Open %s File</source>
         <translation>Maak %s Lêer Oop</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/wizard.py" line="67"/>
+        <location filename="openlp/core/ui/wizard.py" line="64"/>
         <source>%p%</source>
         <translation>%p%</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/wizard.py" line="68"/>
+        <location filename="openlp/core/ui/wizard.py" line="65"/>
         <source>Ready.</source>
         <translation>Gereed.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="260"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="311"/>
         <source>Starting import...</source>
         <translation>Invoer begin...</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/wizard.py" line="72"/>
+        <location filename="openlp/core/ui/wizard.py" line="69"/>
         <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>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="353"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="282"/>
         <source>Welcome to the Bible Import Wizard</source>
         <translation>Welkom by die Bybel Invoer Gids</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/songexportform.py" line="172"/>
+        <location filename="openlp/plugins/songs/forms/songexportform.py" line="153"/>
         <source>Welcome to the Song Export Wizard</source>
         <translation>Welkom by die Lied Uitvoer Gids</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/songimportform.py" line="158"/>
+        <location filename="openlp/plugins/songs/forms/songimportform.py" line="141"/>
         <source>Welcome to the Song Import Wizard</source>
         <translation>Welkom by die Lied Invoer Gids</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/ui.py" line="40"/>
+        <location filename="openlp/plugins/songs/lib/ui.py" line="41"/>
         <source>Author</source>
         <comment>Singular</comment>
         <translation>Outeur</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/ui.py" line="41"/>
+        <location filename="openlp/plugins/songs/lib/ui.py" line="42"/>
         <source>Authors</source>
         <comment>Plural</comment>
         <translation>Outeure</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/ui.py" line="43"/>
-        <source>&#xa9;</source>
+        <location filename="openlp/plugins/songs/lib/ui.py" line="44"/>
+        <source>©</source>
         <comment>Copyright symbol.</comment>
         <translation>©</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/ui.py" line="44"/>
+        <location filename="openlp/plugins/songs/lib/ui.py" line="45"/>
         <source>Song Book</source>
         <comment>Singular</comment>
         <translation>Lied Boek</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/ui.py" line="45"/>
+        <location filename="openlp/plugins/songs/lib/ui.py" line="46"/>
         <source>Song Books</source>
         <comment>Plural</comment>
         <translation>Lied Boeke</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/ui.py" line="47"/>
+        <location filename="openlp/plugins/songs/lib/ui.py" line="48"/>
         <source>Song Maintenance</source>
         <translation>Lied Onderhoud</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/ui.py" line="48"/>
+        <location filename="openlp/plugins/songs/lib/ui.py" line="49"/>
         <source>Topic</source>
         <comment>Singular</comment>
         <translation>Onderwerp</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/ui.py" line="49"/>
+        <location filename="openlp/plugins/songs/lib/ui.py" line="50"/>
         <source>Topics</source>
         <comment>Plural</comment>
         <translation>Onderwerpe</translation>
     </message>
     <message>
-        <location filename="openlp/core/lib/ui.py" line="70"/>
-        <source>Continuous</source>
-        <translation>Aaneen-lopend</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="71"/>
-        <source>Default</source>
-        <translation>Verstek</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="73"/>
-        <source>Display style:</source>
-        <translation>Vertoon styl:</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="74"/>
-        <source>Duplicate Error</source>
-        <translation>Dupliseer Fout</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="79"/>
-        <source>File</source>
-        <translation>Lêer</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="82"/>
-        <source>Help</source>
-        <translation>Hulp</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="83"/>
-        <source>h</source>
-        <comment>The abbreviated unit for hours</comment>
-        <translation>h</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="91"/>
-        <source>Layout style:</source>
-        <translation>Uitleg styl:</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="94"/>
-        <source>Live Toolbar</source>
-        <translation>Regstreekse Gereedskapsbalk</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="96"/>
-        <source>m</source>
-        <comment>The abbreviated unit for minutes</comment>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="110"/>
-        <source>OpenLP is already running. Do you wish to continue?</source>
-        <translation>OpenLP is reeds ana die gang. Gaan voort?</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="131"/>
-        <source>Settings</source>
-        <translation>Verstellings</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="144"/>
-        <source>Tools</source>
-        <translation>Gereedskap</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="146"/>
-        <source>Unsupported File</source>
-        <translation>Lêer nie Ondersteun nie</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="147"/>
-        <source>Verse Per Slide</source>
-        <translation>Vers Per Skyfie</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="148"/>
-        <source>Verse Per Line</source>
-        <translation>Vers Per Lyn</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="150"/>
-        <source>View</source>
-        <translation>Vertoon</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/songs/lib/ui.py" line="46"/>
+        <location filename="openlp/plugins/songs/lib/ui.py" line="47"/>
         <source>Title and/or verses not found</source>
         <translation>Titel en/of verse nie gevind</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/ui.py" line="50"/>
+        <location filename="openlp/plugins/songs/lib/ui.py" line="51"/>
         <source>XML syntax error</source>
         <translation>XML sintaks fout</translation>
     </message>
     <message>
-        <location filename="openlp/core/lib/ui.py" line="151"/>
-        <source>View Mode</source>
-        <translation>Vertoon Modus</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="112"/>
-        <source>Open service.</source>
-        <translation>Maak &apos;n diens oop.</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="116"/>
-        <source>Print Service</source>
-        <translation>Druk Diens uit</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="118"/>
-        <source>Replace live background.</source>
-        <translation>Vervang regstreekse agtergrond.</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="120"/>
-        <source>Reset live background.</source>
-        <translation>Herstel regstreekse agtergrond.</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="135"/>
-        <source>Split a slide into two only if it does not fit on the screen as one slide.</source>
-        <translation>Verdeel &apos;n skyfie slegs in twee wanneer dit nie op die skerm as &apos;n enkele skyfie sal pas nie.</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="263"/>
+        <location filename="openlp/plugins/bibles/forms/bibleupgradeform.py" line="241"/>
         <source>Welcome to the Bible Upgrade Wizard</source>
         <translation>Welkom by die Bybel Opgradeer Gids</translation>
     </message>
     <message>
-        <location filename="openlp/core/lib/ui.py" line="69"/>
-        <source>Confirm Delete</source>
-        <translation>Bevesting Uitwissing</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="113"/>
-        <source>Play Slides in Loop</source>
-        <translation>Speel Skyfies in Herhaling</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="114"/>
-        <source>Play Slides to End</source>
-        <translation>Speel Skyfies tot Einde</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="138"/>
-        <source>Stop Play Slides in Loop</source>
-        <translation>Staak Skyfies in Herhaling</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="140"/>
-        <source>Stop Play Slides to End</source>
-        <translation>Staak Skyfies tot Einde</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="102"/>
-        <source>Next Track</source>
-        <translation>Volgende Snit</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="125"/>
-        <source>Search Themes...</source>
-        <comment>Search bar place holder text </comment>
-        <translation>Soek Temas...</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="134"/>
-        <source>Optional &amp;Split</source>
-        <translation>Op&amp;sionele Verdeling</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="85"/>
-        <source>Invalid Folder Selected</source>
-        <comment>Singular</comment>
-        <translation>Ongeldige Gids Geselekteer</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="87"/>
-        <source>Invalid File Selected</source>
-        <comment>Singular</comment>
-        <translation>Ongeldige Lêer Geselekteer</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="88"/>
-        <source>Invalid Files Selected</source>
-        <comment>Plural</comment>
-        <translation>Ongeldige Lêer Geselekteer</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/lib/ui.py" line="103"/>
-        <source>No Folder Selected</source>
-        <comment>Singular</comment>
-        <translation>Geen Gids Geselekteer nie</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/wizard.py" line="66"/>
+        <location filename="openlp/core/ui/wizard.py" line="63"/>
         <source>Open %s Folder</source>
         <translation>Maak %s Gids Oop</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/wizard.py" line="70"/>
+        <location filename="openlp/core/ui/wizard.py" line="67"/>
         <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>
-        <location filename="openlp/core/ui/wizard.py" line="74"/>
+        <location filename="openlp/core/ui/wizard.py" line="71"/>
         <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>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="259"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="310"/>
         <source>Importing Songs</source>
         <translation>Voer Liedere In</translation>
     </message>
+    <message>
+        <location filename="openlp/plugins/songs/forms/duplicatesongremovalform.py" line="139"/>
+        <source>Welcome to the Duplicate Song Removal Wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songs/lib/db.py" line="77"/>
+        <source>Words</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songs/lib/db.py" line="78"/>
+        <source>Music</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songs/lib/db.py" line="79"/>
+        <source>Words and Music</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songs/lib/db.py" line="80"/>
+        <source>Translation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="495"/>
+        <source>Written by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songs/lib/ui.py" line="43"/>
+        <source>Author Unknown</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>OpenLP.core.lib</name>
     <message>
-        <location filename="openlp/core/lib/__init__.py" line="370"/>
-        <source>%1 and %2</source>
+        <location filename="openlp/core/lib/__init__.py" line="308"/>
+        <source>%s and %s</source>
         <comment>Locale list separator: 2 items</comment>
-        <translation>%1 en %2</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="openlp/core/lib/__init__.py" line="373"/>
-        <source>%1, and %2</source>
+        <location filename="openlp/core/lib/__init__.py" line="311"/>
+        <source>%s, and %s</source>
         <comment>Locale list separator: end</comment>
-        <translation>%1, en %2</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="openlp/core/lib/__init__.py" line="376"/>
-        <source>%1, %2</source>
+        <location filename="openlp/core/lib/__init__.py" line="314"/>
+        <source>%s, %s</source>
         <comment>Locale list separator: middle</comment>
-        <translation>%1, %2</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="openlp/core/lib/__init__.py" line="378"/>
-        <source>%1, %2</source>
+        <location filename="openlp/core/lib/__init__.py" line="315"/>
+        <source>%s, %s</source>
         <comment>Locale list separator: start</comment>
-        <translation>%1, %2</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PresentationPlugin</name>
     <message>
-        <location filename="openlp/plugins/presentations/presentationplugin.py" line="145"/>
+        <location filename="openlp/plugins/presentations/presentationplugin.py" line="148"/>
         <source>&lt;strong&gt;Presentation Plugin&lt;/strong&gt;&lt;br /&gt;The presentation plugin provides the ability to show presentations using a number of different programs. The choice of available presentation programs is available to the user in a drop down box.</source>
         <translation>&lt;strong&gt;Aanbieding Mini-program&lt;/strong&gt;&lt;br/&gt;Die aanbieding mini-program bied die vermoë om aanbiedings van verskillende programme te vertoon. Die keuse van beskikbare aanbieding-programme word aan die gebruiker vertoon deur &apos;n hangkieslys.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/presentations/presentationplugin.py" line="158"/>
+        <location filename="openlp/plugins/presentations/presentationplugin.py" line="161"/>
         <source>Presentation</source>
         <comment>name singular</comment>
         <translation>Aanbieding</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/presentations/presentationplugin.py" line="160"/>
+        <location filename="openlp/plugins/presentations/presentationplugin.py" line="162"/>
         <source>Presentations</source>
         <comment>name plural</comment>
         <translation>Aanbiedinge</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/presentations/presentationplugin.py" line="165"/>
+        <location filename="openlp/plugins/presentations/presentationplugin.py" line="166"/>
         <source>Presentations</source>
         <comment>container title</comment>
         <translation>Aanbiedinge</translation>
@@ -5879,22 +5577,22 @@
         <translation>Laai &apos;n nuwe aanbieding.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/presentations/presentationplugin.py" line="175"/>
+        <location filename="openlp/plugins/presentations/presentationplugin.py" line="174"/>
         <source>Delete the selected presentation.</source>
         <translation>Wis die geselekteerde aanbieding uit.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/presentations/presentationplugin.py" line="177"/>
+        <location filename="openlp/plugins/presentations/presentationplugin.py" line="175"/>
         <source>Preview the selected presentation.</source>
         <translation>Skou die geselekteerde aanbieding.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/presentations/presentationplugin.py" line="179"/>
+        <location filename="openlp/plugins/presentations/presentationplugin.py" line="176"/>
         <source>Send the selected presentation live.</source>
         <translation>Stuur die geselekteerde aanbieding regstreeks.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/presentations/presentationplugin.py" line="181"/>
+        <location filename="openlp/plugins/presentations/presentationplugin.py" line="177"/>
         <source>Add the selected presentation to the service.</source>
         <translation>Voeg die geselekteerde aanabieding by die diens.</translation>
     </message>
@@ -5902,52 +5600,52 @@
 <context>
     <name>PresentationPlugin.MediaItem</name>
     <message>
-        <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="75"/>
+        <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="68"/>
         <source>Select Presentation(s)</source>
         <translation>Selekteer Aanbieding(e)</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="77"/>
+        <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="69"/>
         <source>Automatic</source>
-        <translation>Outomaties</translation>
+        <translation>Automaties</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="79"/>
+        <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="70"/>
         <source>Present using:</source>
         <translation>Bied aan met:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="194"/>
+        <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="183"/>
         <source>File Exists</source>
         <translation>Lêer Bestaan Reeds</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="194"/>
+        <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="183"/>
         <source>A presentation with that filename already exists.</source>
         <translation>&apos;n Aanbieding met daardie lêernaam bestaan reeds.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="223"/>
+        <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="208"/>
         <source>This type of presentation is not supported.</source>
         <translation>Hierdie tipe aanbieding word nie ondersteun nie.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="95"/>
+        <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="97"/>
         <source>Presentations (%s)</source>
         <translation>Aanbiedinge (%s)</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="317"/>
+        <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="345"/>
         <source>Missing Presentation</source>
         <translation>Vermisde Aanbieding</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="306"/>
+        <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="336"/>
         <source>The presentation %s is incomplete, please reload.</source>
         <translation>Die aanbieding %s is onvolledig, herlaai asseblief.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="317"/>
+        <location filename="openlp/plugins/presentations/lib/mediaitem.py" line="345"/>
         <source>The presentation %s no longer exists.</source>
         <translation>Die aanbieding %s bestaan nie meer nie.</translation>
     </message>
@@ -5955,290 +5653,232 @@
 <context>
     <name>PresentationPlugin.PresentationTab</name>
     <message>
-        <location filename="openlp/plugins/presentations/lib/presentationtab.py" line="81"/>
+        <location filename="openlp/plugins/presentations/lib/presentationtab.py" line="111"/>
         <source>Available Controllers</source>
         <translation>Beskikbare Beheerders</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/presentations/lib/presentationtab.py" line="97"/>
+        <location filename="openlp/plugins/presentations/lib/presentationtab.py" line="127"/>
         <source>%s (unavailable)</source>
-        <translation>%s (nie beskikbaar nie)</translation>
+        <translation>%s (onbeskikbaar)</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/presentations/lib/presentationtab.py" line="89"/>
+        <location filename="openlp/plugins/presentations/lib/presentationtab.py" line="118"/>
         <source>Allow presentation application to be overridden</source>
         <translation>Laat toe dat die program oorheers word</translation>
     </message>
+    <message>
+        <location filename="openlp/plugins/presentations/lib/presentationtab.py" line="117"/>
+        <source>PDF options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/plugins/presentations/lib/presentationtab.py" line="120"/>
+        <source>Use given full path for mudraw or ghostscript binary:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/plugins/presentations/lib/presentationtab.py" line="203"/>
+        <source>Select mudraw or ghostscript binary.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/plugins/presentations/lib/presentationtab.py" line="209"/>
+        <source>The program is not ghostscript or mudraw which is required.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>RemotePlugin</name>
     <message>
-        <location filename="openlp/plugins/remotes/remoteplugin.py" line="72"/>
+        <location filename="openlp/plugins/remotes/remoteplugin.py" line="101"/>
         <source>&lt;strong&gt;Remote Plugin&lt;/strong&gt;&lt;br /&gt;The remote plugin provides the ability to send messages to a running version of OpenLP on a different computer via a web browser or through the remote API.</source>
         <translation>&lt;strong&gt;Afgeleë Mini-program&lt;/strong&gt;&lt;br/&gt;Die afgeleë mini-program verskaf die vermoë om boodskappe na &apos;n lopende weergawe van OpenLP op &apos;n ander rekenaar te stuur deur &apos;n web-blaaier of deur die afgeleë PPK (API).</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/remotes/remoteplugin.py" line="84"/>
+        <location filename="openlp/plugins/remotes/remoteplugin.py" line="113"/>
         <source>Remote</source>
         <comment>name singular</comment>
         <translation>Afstandbeheer</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/remotes/remoteplugin.py" line="85"/>
+        <location filename="openlp/plugins/remotes/remoteplugin.py" line="114"/>
         <source>Remotes</source>
         <comment>name plural</comment>
         <translation>Afstandbehere</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/remotes/remoteplugin.py" line="89"/>
+        <location filename="openlp/plugins/remotes/remoteplugin.py" line="118"/>
         <source>Remote</source>
         <comment>container title</comment>
         <translation>Afstandbeheer</translation>
     </message>
-</context>
-<context>
-    <name>RemotePlugin.Mobile</name>
-    <message>
-        <location filename="openlp/plugins/remotes/lib/httpserver.py" line="287"/>
-        <source>OpenLP 2.0 Remote</source>
-        <translation>OpenLP 2.0 Afgelië</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/remotes/lib/httpserver.py" line="288"/>
-        <source>OpenLP 2.0 Stage View</source>
-        <translation>OpenLP 2.0 Verhoog Aansig</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/remotes/lib/httpserver.py" line="290"/>
-        <source>Service Manager</source>
-        <translation>Diens Bestuurder</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/remotes/lib/httpserver.py" line="292"/>
-        <source>Slide Controller</source>
-        <translation>Skyfie Beheerder</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/remotes/lib/httpserver.py" line="294"/>
-        <source>Alerts</source>
-        <translation>Waarskuwings</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/remotes/lib/httpserver.py" line="295"/>
-        <source>Search</source>
-        <translation>Soek</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/remotes/lib/httpserver.py" line="297"/>
-        <source>Refresh</source>
-        <translation>Verfris</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/remotes/lib/httpserver.py" line="298"/>
-        <source>Blank</source>
-        <translation>Blanko</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/remotes/lib/httpserver.py" line="301"/>
-        <source>Show</source>
-        <translation>Wys</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/remotes/lib/httpserver.py" line="302"/>
-        <source>Prev</source>
-        <translation>Vorige</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/remotes/lib/httpserver.py" line="303"/>
-        <source>Next</source>
-        <translation>Volgende</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/remotes/lib/httpserver.py" line="304"/>
-        <source>Text</source>
-        <translation>Teks</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/remotes/lib/httpserver.py" line="305"/>
-        <source>Show Alert</source>
-        <translation>Wys Waarskuwing</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/remotes/lib/httpserver.py" line="306"/>
-        <source>Go Live</source>
-        <translation>Gaan Regstreeks</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/remotes/lib/httpserver.py" line="311"/>
-        <source>No Results</source>
-        <translation>Geen Resultate</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/remotes/lib/httpserver.py" line="312"/>
-        <source>Options</source>
-        <translation>Opsies</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/remotes/lib/httpserver.py" line="307"/>
-        <source>Add to Service</source>
-        <translation>Voeg By Diens</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/remotes/lib/httpserver.py" line="296"/>
-        <source>Home</source>
-        <translation>Tuis</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/remotes/lib/httpserver.py" line="299"/>
-        <source>Theme</source>
-        <translation>Tema</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/remotes/lib/httpserver.py" line="300"/>
-        <source>Desktop</source>
-        <translation>Werkskerm</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/remotes/lib/httpserver.py" line="309"/>
-        <source>Add &amp;amp; Go to Service</source>
-        <translation>Voeg by &amp;amp; Gaan na Diens</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/remotes/lib/httpserver.py" line="313"/>
-        <source>Service</source>
-        <translation>Diens</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/remotes/lib/httpserver.py" line="314"/>
-        <source>Slides</source>
-        <translation>Skyfies</translation>
+    <message>
+        <location filename="openlp/plugins/remotes/remoteplugin.py" line="126"/>
+        <source>Server Config Change</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/plugins/remotes/remoteplugin.py" line="126"/>
+        <source>Server configuration changes will require a restart to take effect.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>RemotePlugin.RemoteTab</name>
     <message>
-        <location filename="openlp/plugins/remotes/lib/remotetab.py" line="112"/>
+        <location filename="openlp/plugins/remotes/lib/remotetab.py" line="173"/>
         <source>Serve on IP address:</source>
         <translation>Bedien op hierdie IP adres:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/remotes/lib/remotetab.py" line="114"/>
+        <location filename="openlp/plugins/remotes/lib/remotetab.py" line="174"/>
         <source>Port number:</source>
         <translation>Poort nommer:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/remotes/lib/remotetab.py" line="110"/>
+        <location filename="openlp/plugins/remotes/lib/remotetab.py" line="172"/>
         <source>Server Settings</source>
         <translation>Bediener Verstellings</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/remotes/lib/remotetab.py" line="116"/>
+        <location filename="openlp/plugins/remotes/lib/remotetab.py" line="175"/>
         <source>Remote URL:</source>
         <translation>Afgeleë URL:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/remotes/lib/remotetab.py" line="118"/>
+        <location filename="openlp/plugins/remotes/lib/remotetab.py" line="176"/>
         <source>Stage view URL:</source>
         <translation>Verhoog vertoning URL:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/remotes/lib/remotetab.py" line="120"/>
+        <location filename="openlp/plugins/remotes/lib/remotetab.py" line="178"/>
         <source>Display stage time in 12h format</source>
         <translation>Vertoon verhoog tyd in 12 uur formaat</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/remotes/lib/remotetab.py" line="123"/>
+        <location filename="openlp/plugins/remotes/lib/remotetab.py" line="179"/>
         <source>Android App</source>
         <translation>Android Program</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/remotes/lib/remotetab.py" line="125"/>
+        <location filename="openlp/plugins/remotes/lib/remotetab.py" line="180"/>
         <source>Scan the QR code or click &lt;a href=&quot;https://play.google.com/store/apps/details?id=org.openlp.android&quot;&gt;download&lt;/a&gt; to install the Android app from Google Play.</source>
         <translation>Tas die QR kode af of kliek &lt;a href=&quot;https://play.google.com/store/apps/details?id=org.openlp.android&quot;&gt;aflaai&lt;/a&gt; om die Android program vanaf Google Play te installeer.</translation>
     </message>
+    <message>
+        <location filename="openlp/plugins/remotes/lib/remotetab.py" line="177"/>
+        <source>Live view URL:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/plugins/remotes/lib/remotetab.py" line="183"/>
+        <source>HTTPS Server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/plugins/remotes/lib/remotetab.py" line="184"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="openlp/plugins/remotes/lib/remotetab.py" line="191"/>
+        <source>User Authentication</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/plugins/remotes/lib/remotetab.py" line="192"/>
+        <source>User id:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/plugins/remotes/lib/remotetab.py" line="193"/>
+        <source>Password:</source>
+        <translation>Wagwoord:</translation>
+    </message>
 </context>
 <context>
     <name>SongUsagePlugin</name>
     <message>
-        <location filename="openlp/plugins/songusage/songusageplugin.py" line="76"/>
+        <location filename="openlp/plugins/songusage/songusageplugin.py" line="92"/>
         <source>&amp;Song Usage Tracking</source>
         <translation>&amp;Volg Lied Gebruik</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/songusageplugin.py" line="79"/>
+        <location filename="openlp/plugins/songusage/songusageplugin.py" line="94"/>
         <source>&amp;Delete Tracking Data</source>
         <translation>Wis Volg &amp;Data Uit</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/songusageplugin.py" line="79"/>
+        <location filename="openlp/plugins/songusage/songusageplugin.py" line="94"/>
         <source>Delete song usage data up to a specified date.</source>
         <translation>Wis lied volg data uit tot en met &apos;n spesifieke datum.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/songusageplugin.py" line="85"/>
+        <location filename="openlp/plugins/songusage/songusageplugin.py" line="100"/>
         <source>&amp;Extract Tracking Data</source>
         <translation>Onttr&amp;ek Volg Data</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/songusageplugin.py" line="85"/>
+        <location filename="openlp/plugins/songusage/songusageplugin.py" line="100"/>
         <source>Generate a report on song usage.</source>
         <translation>Genereer &apos;n verslag oor lied-gebruik.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/songusageplugin.py" line="91"/>
+        <location filename="openlp/plugins/songusage/songusageplugin.py" line="106"/>
         <source>Toggle Tracking</source>
         <translation>Wissel Volging</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/songusageplugin.py" line="107"/>
+        <location filename="openlp/plugins/songusage/songusageplugin.py" line="120"/>
         <source>Toggle the tracking of song usage.</source>
         <translation>Wissel lied-gebruik volging.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/songusageplugin.py" line="237"/>
+        <location filename="openlp/plugins/songusage/songusageplugin.py" line="241"/>
         <source>&lt;strong&gt;SongUsage Plugin&lt;/strong&gt;&lt;br /&gt;This plugin tracks the usage of songs in services.</source>
         <translation>&lt;strong&gt;LiedGebruik Mini-program&lt;/strong&gt;&lt;br/&gt;Die mini-program volg die gebruik van liedere in dienste.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/songusageplugin.py" line="248"/>
+        <location filename="openlp/plugins/songusage/songusageplugin.py" line="252"/>
         <source>SongUsage</source>
         <comment>name singular</comment>
         <translation>Lied Gebruik</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/songusageplugin.py" line="250"/>
+        <location filename="openlp/plugins/songusage/songusageplugin.py" line="253"/>
         <source>SongUsage</source>
         <comment>name plural</comment>
         <translation>Lied Gebruik</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/songusageplugin.py" line="255"/>
+        <location filename="openlp/plugins/songusage/songusageplugin.py" line="257"/>
         <source>SongUsage</source>
         <comment>container title</comment>
         <translation>Lied Gebruik</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/songusageplugin.py" line="162"/>
+        <location filename="openlp/plugins/songusage/songusageplugin.py" line="158"/>
         <source>Song Usage</source>
         <translation>Lied Gebruik</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/songusageplugin.py" line="189"/>
+        <location filename="openlp/plugins/songusage/songusageplugin.py" line="182"/>
         <source>Song usage tracking is active.</source>
         <translation>Lied gebruik volging is aktief.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/songusageplugin.py" line="195"/>
+        <location filename="openlp/plugins/songusage/songusageplugin.py" line="187"/>
         <source>Song usage tracking is inactive.</source>
         <translation>Lied gebruik volging is onaktief.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/songusageplugin.py" line="205"/>
+        <location filename="openlp/plugins/songusage/songusageplugin.py" line="197"/>
         <source>display</source>
         <translation>vertoon</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/songusageplugin.py" line="212"/>
+        <location filename="openlp/plugins/songusage/songusageplugin.py" line="205"/>
         <source>printed</source>
         <translation>gedruk</translation>
     </message>
@@ -6246,17 +5886,17 @@
 <context>
     <name>SongUsagePlugin.SongUsageDeleteForm</name>
     <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedeletedialog.py" line="59"/>
+        <location filename="openlp/plugins/songusage/forms/songusagedeletedialog.py" line="72"/>
         <source>Delete Song Usage Data</source>
         <translation>Wis Lied Gebruik Data Uit</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedeleteform.py" line="53"/>
+        <location filename="openlp/plugins/songusage/forms/songusagedeleteform.py" line="57"/>
         <source>Delete Selected Song Usage Events?</source>
         <translation>Wis Geselekteerde Lied Gebruik Gebeure uit?</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedeleteform.py" line="53"/>
+        <location filename="openlp/plugins/songusage/forms/songusagedeleteform.py" line="57"/>
         <source>Are you sure you want to delete selected Song Usage data?</source>
         <translation>Wis regtig die geselekteerde Diens Gebruik data uit?</translation>
     </message>
@@ -6266,55 +5906,56 @@
         <translation>Uitwissing Suksesvol</translation>
     </message>
     <message>
+        <location filename="openlp/plugins/songusage/forms/songusagedeletedialog.py" line="74"/>
+        <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"/>
+    </message>
+    <message>
         <location filename="openlp/plugins/songusage/forms/songusagedeleteform.py" line="66"/>
-        <source>All requested data has been deleted successfully. </source>
-        <translation>Al die gevraagde data is suksesvol uitgewis.</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedeletedialog.py" line="62"/>
-        <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>Selekteer die datum tot waarop die liedere gebruik uitgewis moet word. Alle opgeneemde data voor hierdie datum sal permanent verwyder word.</translation>
+        <source>All requested data has been deleted successfully.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>SongUsagePlugin.SongUsageDetailForm</name>
     <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedetaildialog.py" line="88"/>
+        <location filename="openlp/plugins/songusage/forms/songusagedetaildialog.py" line="99"/>
         <source>Song Usage Extraction</source>
         <translation>Diens Gebruik Ontrekking</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedetaildialog.py" line="91"/>
+        <location filename="openlp/plugins/songusage/forms/songusagedetaildialog.py" line="101"/>
         <source>Select Date Range</source>
         <translation>Selekteer Datum Grense</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedetaildialog.py" line="94"/>
+        <location filename="openlp/plugins/songusage/forms/songusagedetaildialog.py" line="102"/>
         <source>to</source>
         <translation>tot</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedetaildialog.py" line="96"/>
+        <location filename="openlp/plugins/songusage/forms/songusagedetaildialog.py" line="103"/>
         <source>Report Location</source>
         <translation>Rapporteer Ligging</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="80"/>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="69"/>
         <source>Output File Location</source>
         <translation>Uitvoer Lêer Ligging</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="105"/>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="91"/>
         <source>usage_detail_%s_%s.txt</source>
         <translation>usage_detail_%s_%s.txt</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="129"/>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="109"/>
         <source>Report Creation</source>
         <translation>Verslag Skepping</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="129"/>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="109"/>
         <source>Report 
 %s 
 has been successfully created. </source>
@@ -6323,125 +5964,126 @@
 was suksesvol geskep.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="96"/>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="83"/>
         <source>Output Path Not Selected</source>
         <translation>Skryf Ligging Nie Gekies Nie</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="96"/>
-        <source>You have not set a valid output location for your song usage report. Please select an existing path on your computer.</source>
-        <translation>Daar is nie &apos;n geldige skryf ligging gespesifiseer vir die lied-gebruik verslag nie. Kies asseblief &apos;n bestaande pad op die rekenaar.</translation>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="83"/>
+        <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"/>
     </message>
 </context>
 <context>
     <name>SongsPlugin</name>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="117"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="144"/>
         <source>&amp;Song</source>
         <translation>&amp;Lied</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="100"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="124"/>
         <source>Import songs using the import wizard.</source>
         <translation>Voer liedere in deur van die invoer helper gebruik te maak.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="170"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="223"/>
         <source>&lt;strong&gt;Songs Plugin&lt;/strong&gt;&lt;br /&gt;The songs plugin provides the ability to display and manage songs.</source>
         <translation>&lt;strong&gt;Liedere Mini-program&lt;/strong&gt;&lt;br/&gt;Die liedere mini-program verskaf die vermoë om liedere te vertoon en te bestuur.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="134"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="158"/>
         <source>&amp;Re-index Songs</source>
         <translation>He&amp;r-indeks Liedere</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="134"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="158"/>
         <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>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="149"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="179"/>
         <source>Reindexing songs...</source>
         <translation>Besig om liedere indek te herskep...</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/__init__.py" line="319"/>
+        <location filename="openlp/plugins/songs/lib/__init__.py" line="308"/>
         <source>Arabic (CP-1256)</source>
         <translation>Arabies (CP-1256)</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/__init__.py" line="320"/>
+        <location filename="openlp/plugins/songs/lib/__init__.py" line="309"/>
         <source>Baltic (CP-1257)</source>
         <translation>Balties (CP-1257)</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/__init__.py" line="321"/>
+        <location filename="openlp/plugins/songs/lib/__init__.py" line="310"/>
         <source>Central European (CP-1250)</source>
         <translation>Sentraal Europees (CP-1250)</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/__init__.py" line="322"/>
+        <location filename="openlp/plugins/songs/lib/__init__.py" line="311"/>
         <source>Cyrillic (CP-1251)</source>
         <translation>Cyrillies (CP-1251)</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/__init__.py" line="323"/>
+        <location filename="openlp/plugins/songs/lib/__init__.py" line="312"/>
         <source>Greek (CP-1253)</source>
         <translation>Grieks (CP-1253)</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/__init__.py" line="324"/>
+        <location filename="openlp/plugins/songs/lib/__init__.py" line="313"/>
         <source>Hebrew (CP-1255)</source>
         <translation>Hebreeus (CP-1255)</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/__init__.py" line="325"/>
+        <location filename="openlp/plugins/songs/lib/__init__.py" line="314"/>
         <source>Japanese (CP-932)</source>
         <translation>Japanees (CP-932)</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/__init__.py" line="326"/>
+        <location filename="openlp/plugins/songs/lib/__init__.py" line="315"/>
         <source>Korean (CP-949)</source>
         <translation>Koreaans (CP-949)</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/__init__.py" line="327"/>
+        <location filename="openlp/plugins/songs/lib/__init__.py" line="316"/>
         <source>Simplified Chinese (CP-936)</source>
         <translation>Vereenvoudigde Chinees (CP-936)</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/__init__.py" line="328"/>
+        <location filename="openlp/plugins/songs/lib/__init__.py" line="317"/>
         <source>Thai (CP-874)</source>
         <translation>Thai (CP-874)</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/__init__.py" line="329"/>
+        <location filename="openlp/plugins/songs/lib/__init__.py" line="318"/>
         <source>Traditional Chinese (CP-950)</source>
         <translation>Tradisionele Chinees (CP-950)</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/__init__.py" line="330"/>
+        <location filename="openlp/plugins/songs/lib/__init__.py" line="319"/>
         <source>Turkish (CP-1254)</source>
         <translation>Turks (CP-1254)</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/__init__.py" line="331"/>
+        <location filename="openlp/plugins/songs/lib/__init__.py" line="320"/>
         <source>Vietnam (CP-1258)</source>
         <translation>Viëtnamees (CP-1258)</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/__init__.py" line="332"/>
+        <location filename="openlp/plugins/songs/lib/__init__.py" line="321"/>
         <source>Western European (CP-1252)</source>
         <translation>Wes-Europees (CP-1252)</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/__init__.py" line="347"/>
+        <location filename="openlp/plugins/songs/lib/__init__.py" line="338"/>
         <source>Character Encoding</source>
         <translation>Karrakter Enkodering</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/__init__.py" line="340"/>
+        <location filename="openlp/plugins/songs/lib/__init__.py" line="330"/>
         <source>The codepage setting is responsible
 for the correct character representation.
 Usually you are fine with the preselected choice.</source>
@@ -6451,105 +6093,125 @@
 keuse voldoende.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/__init__.py" line="347"/>
+        <location filename="openlp/plugins/songs/lib/__init__.py" line="338"/>
         <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>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="214"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="268"/>
         <source>Song</source>
         <comment>name singular</comment>
         <translation>Lied</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="215"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="269"/>
         <source>Songs</source>
         <comment>name plural</comment>
         <translation>Liedere</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="219"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="273"/>
         <source>Songs</source>
         <comment>container title</comment>
         <translation>Liedere</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="117"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="144"/>
         <source>Exports songs using the export wizard.</source>
         <translation>Voer liedere uit deur gebruik te maak van die uitvoer gids.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="225"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="279"/>
         <source>Add a new song.</source>
         <translation>Voeg &apos;n nuwe lied by.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="226"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="280"/>
         <source>Edit the selected song.</source>
         <translation>Redigeer die geselekteerde lied.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="227"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="281"/>
         <source>Delete the selected song.</source>
         <translation>Wis die geselekteerde lied uit.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="228"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="282"/>
         <source>Preview the selected song.</source>
         <translation>Skou die geselekteerde lied.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="229"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="283"/>
         <source>Send the selected song live.</source>
         <translation>Stuur die geselekteerde lied regstreeks.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="230"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="284"/>
         <source>Add the selected song to the service.</source>
         <translation>Voeg die geselekteerde lied by die diens.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="152"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="181"/>
         <source>Reindexing songs</source>
         <translation>Her-indekseer liedere</translation>
     </message>
+    <message>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="130"/>
+        <source>CCLI SongSelect</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="130"/>
+        <source>Import songs from CCLI&apos;s SongSelect service.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="165"/>
+        <source>Find &amp;Duplicate Songs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="165"/>
+        <source>Find and remove duplicate songs in the song database.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>SongsPlugin.AuthorsForm</name>
     <message>
-        <location filename="openlp/plugins/songs/forms/authorsdialog.py" line="69"/>
+        <location filename="openlp/plugins/songs/forms/authorsdialog.py" line="81"/>
         <source>Author Maintenance</source>
         <translation>Outeur Onderhoud</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/authorsdialog.py" line="71"/>
+        <location filename="openlp/plugins/songs/forms/authorsdialog.py" line="82"/>
         <source>Display name:</source>
         <translation>Vertoon naam:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/authorsdialog.py" line="73"/>
+        <location filename="openlp/plugins/songs/forms/authorsdialog.py" line="83"/>
         <source>First name:</source>
         <translation>Voornaam:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/authorsdialog.py" line="75"/>
+        <location filename="openlp/plugins/songs/forms/authorsdialog.py" line="84"/>
         <source>Last name:</source>
         <translation>Van:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/authorsform.py" line="84"/>
+        <location filename="openlp/plugins/songs/forms/authorsform.py" line="99"/>
         <source>You need to type in the first name of the author.</source>
         <translation>U moet die naam van die skrywer invul.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/authorsform.py" line="90"/>
+        <location filename="openlp/plugins/songs/forms/authorsform.py" line="104"/>
         <source>You need to type in the last name of the author.</source>
         <translation>U moet ten minste die skrywer se naam invoer.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/authorsform.py" line="96"/>
+        <location filename="openlp/plugins/songs/forms/authorsform.py" line="109"/>
         <source>You have not set a display name for the author, combine the first and last names?</source>
         <translation>&apos;n Vertoon naam vir die skrywer is nie opgestel nie. Kan die naam en van gekombineer word?</translation>
     </message>
@@ -6557,37 +6219,57 @@
 <context>
     <name>SongsPlugin.CCLIFileImport</name>
     <message>
-        <location filename="openlp/plugins/songs/lib/cclifileimport.py" line="95"/>
+        <location filename="openlp/plugins/songs/lib/cclifileimport.py" line="92"/>
         <source>The file does not have a valid extension.</source>
         <translation>Die lêer het nie &apos;n geldige verlening nie.</translation>
     </message>
 </context>
 <context>
+    <name>SongsPlugin.DreamBeamImport</name>
+    <message>
+        <location filename="openlp/plugins/songs/lib/dreambeamimport.py" line="108"/>
+        <source>Invalid DreamBeam song file. Missing DreamSong tag.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SongsPlugin.EasyWorshipSongImport</name>
     <message>
-        <location filename="openlp/plugins/songs/lib/ewimport.py" line="168"/>
+        <location filename="openlp/plugins/songs/lib/ewimport.py" line="304"/>
         <source>Administered by %s</source>
         <translation>Toegedien deur %s</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/ewimport.py" line="220"/>
+        <location filename="openlp/plugins/songs/lib/ewimport.py" line="318"/>
+        <source>&quot;%s&quot; could not be imported. %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songs/lib/ewimport.py" line="352"/>
+        <source>Unexpected data formatting.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songs/lib/ewimport.py" line="357"/>
+        <source>No song text found.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songs/lib/ewimport.py" line="394"/>
         <source>
-[above are Song Tags with notes imported from 
-                        EasyWorship]</source>
-        <translation>
-[hier-bo is Lied Merkers met notas ingevoer vanaf 
-                       EasyWorship]</translation>
+[above are Song Tags with notes imported from EasyWorship]</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>SongsPlugin.EditBibleForm</name>
     <message>
-        <location filename="openlp/plugins/bibles/forms/editbibledialog.py" line="150"/>
+        <location filename="openlp/plugins/bibles/forms/editbibledialog.py" line="134"/>
         <source>Meta Data</source>
         <translation>Meta Data</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/editbibledialog.py" line="178"/>
+        <location filename="openlp/plugins/bibles/forms/editbibledialog.py" line="154"/>
         <source>Custom Book Names</source>
         <translation>Eie Boek Name</translation>
     </message>
@@ -6600,205 +6282,217 @@
         <translation>Lied Redigeerder</translation>
     </message>
     <message>
+        <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="296"/>
+        <source>&amp;Title:</source>
+        <translation>&amp;Titel:</translation>
+    </message>
+    <message>
         <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="297"/>
-        <source>&amp;Title:</source>
-        <translation>&amp;Titel:</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="299"/>
         <source>Alt&amp;ernate title:</source>
         <translation>Alt&amp;ernatiewe titel:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="301"/>
+        <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="298"/>
         <source>&amp;Lyrics:</source>
         <translation>&amp;Lirieke:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="303"/>
+        <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="299"/>
         <source>&amp;Verse order:</source>
         <translation>&amp;Vers orde:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="307"/>
+        <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="302"/>
         <source>Ed&amp;it All</source>
         <translation>Red&amp;igeer Alles</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="310"/>
+        <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="304"/>
         <source>Title &amp;&amp; Lyrics</source>
         <translation>Titel &amp;&amp; Lirieke</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="314"/>
+        <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="307"/>
         <source>&amp;Add to Song</source>
         <translation>&amp;Voeg by Lied</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="354"/>
+        <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="330"/>
         <source>&amp;Remove</source>
         <translation>Ve&amp;rwyder</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="318"/>
+        <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="309"/>
         <source>&amp;Manage Authors, Topics, Song Books</source>
         <translation>&amp;Bestuur Skrywers, Onderwerpe en Lied Boeke</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="321"/>
+        <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="311"/>
         <source>A&amp;dd to Song</source>
         <translation>Voeg by Lie&amp;d</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="323"/>
+        <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="312"/>
         <source>R&amp;emove</source>
         <translation>V&amp;erwyder</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="326"/>
+        <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="314"/>
         <source>Book:</source>
         <translation>Boek:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="328"/>
+        <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="315"/>
         <source>Number:</source>
         <translation>Nommer:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="330"/>
+        <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="316"/>
         <source>Authors, Topics &amp;&amp; Song Book</source>
         <translation>Skrywers, Onderwerpe &amp;&amp; Lied Boek</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="335"/>
+        <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="319"/>
         <source>New &amp;Theme</source>
         <translation>Nuwe &amp;Tema</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="337"/>
+        <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="320"/>
         <source>Copyright Information</source>
         <translation>Kopiereg Informasie</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="341"/>
+        <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="323"/>
         <source>Comments</source>
         <translation>Kommentaar</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="343"/>
+        <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="324"/>
         <source>Theme, Copyright Info &amp;&amp; Comments</source>
         <translation>Tema, Kopiereg Informasie &amp;&amp; Kommentaar</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/editsongform.py" line="357"/>
+        <location filename="openlp/plugins/songs/forms/editsongform.py" line="563"/>
         <source>Add Author</source>
         <translation>Voeg Skrywer By</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/editsongform.py" line="357"/>
+        <location filename="openlp/plugins/songs/forms/editsongform.py" line="563"/>
         <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>
-        <location filename="openlp/plugins/songs/forms/editsongform.py" line="380"/>
+        <location filename="openlp/plugins/songs/forms/editsongform.py" line="583"/>
         <source>This author is already in the list.</source>
         <translation>Hierdie skrywer is alreeds in die lys.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/editsongform.py" line="387"/>
+        <location filename="openlp/plugins/songs/forms/editsongform.py" line="589"/>
         <source>You have not selected a valid author. Either select an author from the list, or type in a new author and click the &quot;Add Author to Song&quot; button to add the new author.</source>
         <translation>Die geselekteerde skrywer is ongeldig. Kies &apos;n skrywer vanaf die lys of voer &apos;n nuwe skrywer in en kliek op die &quot;Voeg Skrywer by Lied&quot; knoppie om die skrywer by te voeg.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/editsongform.py" line="415"/>
+        <location filename="openlp/plugins/songs/forms/editsongform.py" line="615"/>
         <source>Add Topic</source>
         <translation>Voeg Onderwerp by</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/editsongform.py" line="415"/>
+        <location filename="openlp/plugins/songs/forms/editsongform.py" line="615"/>
         <source>This topic does not exist, do you want to add it?</source>
         <translation>Die onderwerp bestaan nie. Voeg dit by?</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/editsongform.py" line="436"/>
+        <location filename="openlp/plugins/songs/forms/editsongform.py" line="632"/>
         <source>This topic is already in the list.</source>
         <translation>Die onderwerp is reeds in die lys.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/editsongform.py" line="446"/>
+        <location filename="openlp/plugins/songs/forms/editsongform.py" line="640"/>
         <source>You have not selected a valid topic. Either select a topic from the list, or type in a new topic and click the &quot;Add Topic to Song&quot; button to add the new topic.</source>
         <translation>Geselekteerde onderwerp is ongeldig. Kies &apos;n onderwerp vanaf die lys of voer &apos;n nuwe onderwerp in en kliek die &quot;Voeg Onderwerp by Lied&quot; knoppie om die onderwerp by te voeg.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/editsongform.py" line="656"/>
+        <location filename="openlp/plugins/songs/forms/editsongform.py" line="209"/>
         <source>You need to type in a song title.</source>
         <translation>Tik &apos;n lied titel in.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/editsongform.py" line="663"/>
+        <location filename="openlp/plugins/songs/forms/editsongform.py" line="215"/>
         <source>You need to type in at least one verse.</source>
         <translation>Ten minste een vers moet ingevoer word.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/editsongform.py" line="639"/>
-        <source>The verse order is invalid. There is no verse corresponding to %s. Valid entries are %s.</source>
-        <translation>Die vers orde is ongeldig. Daar is geen vers wat ooreenstem met %s nie. Geldige opsies is %s.</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/songs/forms/editsongform.py" line="681"/>
+        <location filename="openlp/plugins/songs/forms/editsongform.py" line="230"/>
         <source>Add Book</source>
         <translation>Voeg Boek by</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/editsongform.py" line="681"/>
+        <location filename="openlp/plugins/songs/forms/editsongform.py" line="230"/>
         <source>This song book does not exist, do you want to add it?</source>
         <translation>Die lied boek bestaan nie. Voeg dit by?</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/editsongform.py" line="670"/>
+        <location filename="openlp/plugins/songs/forms/editsongform.py" line="221"/>
         <source>You need to have an author for this song.</source>
         <translation>Daar word &apos;n outeur benodig vir hierdie lied.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="347"/>
+        <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="326"/>
         <source>Linked Audio</source>
         <translation>Geskakelde Oudio</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="350"/>
+        <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="328"/>
         <source>Add &amp;File(s)</source>
         <translation>&amp;Voeg Leêr(s) By</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="352"/>
+        <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="329"/>
         <source>Add &amp;Media</source>
         <translation>Voeg &amp;Media By</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="356"/>
+        <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="331"/>
         <source>Remove &amp;All</source>
         <translation>Verwyder &amp;Alles</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/editsongform.py" line="733"/>
+        <location filename="openlp/plugins/songs/forms/editsongform.py" line="846"/>
         <source>Open File(s)</source>
         <translation>Maak Lêer(s) Oop</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="358"/>
+        <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="333"/>
         <source>&lt;strong&gt;Warning:&lt;/strong&gt; Not all of the verses are in use.</source>
         <translation>&lt;strong&gt;Waarskuwing:&lt;/strong&gt; Nie al die verse is in gebruik nie.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/editsongform.py" line="634"/>
-        <source>The verse order is invalid. There are no verses corresponding to %s. Valid entries are %s.</source>
-        <translation>Die vers orde is ongeldig. Daar is geen verse wat ooreenstem met %s nie. Geldige inskrywings is %s.</translation>
+        <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="335"/>
+        <source>&lt;strong&gt;Warning:&lt;/strong&gt; You have not entered a verse order.</source>
+        <translation>&lt;strong&gt;Waarskuwing:&lt;/strong&gt;&apos;n Vers orde is nie ingevoer nie.</translation>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songs/forms/editsongform.py" line="187"/>
+        <source>There are no verses corresponding to &quot;%(invalid)s&quot;.Valid entries are %(valid)s.
+Please enter the verses separated by spaces.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songs/forms/editsongform.py" line="191"/>
+        <source>There is no verse corresponding to &quot;%(invalid)s&quot;.Valid entries are %(valid)s.
+Please enter the verses separated by spaces.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songs/forms/editsongform.py" line="194"/>
+        <source>Invalid Verse Order</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>SongsPlugin.EditVerseForm</name>
     <message>
-        <location filename="openlp/plugins/songs/forms/editversedialog.py" line="76"/>
+        <location filename="openlp/plugins/songs/forms/editversedialog.py" line="77"/>
         <source>Edit Verse</source>
         <translation>Redigeer Vers</translation>
     </message>
@@ -6808,12 +6502,12 @@
         <translation>&amp;Vers tipe:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/editversedialog.py" line="96"/>
+        <location filename="openlp/plugins/songs/forms/editversedialog.py" line="88"/>
         <source>&amp;Insert</source>
         <translation>Sit Tussen-&amp;in</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/editversedialog.py" line="98"/>
+        <location filename="openlp/plugins/songs/forms/editversedialog.py" line="89"/>
         <source>Split a slide into two by inserting a verse splitter.</source>
         <translation>Verdeel &apos;n skyfie in twee deur &apos;n vers-verdeler in te sit.</translation>
     </message>
@@ -6821,268 +6515,286 @@
 <context>
     <name>SongsPlugin.ExportWizardForm</name>
     <message>
-        <location filename="openlp/plugins/songs/forms/songexportform.py" line="170"/>
+        <location filename="openlp/plugins/songs/forms/songexportform.py" line="152"/>
         <source>Song Export Wizard</source>
         <translation>Lied Uitvoer Gids</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/songexportform.py" line="178"/>
+        <location filename="openlp/plugins/songs/forms/songexportform.py" line="158"/>
         <source>Select Songs</source>
         <translation>Kies Liedere</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/songexportform.py" line="180"/>
+        <location filename="openlp/plugins/songs/forms/songexportform.py" line="159"/>
         <source>Check the songs you want to export.</source>
         <translation>Merk die liediere wat uitgevoer moet vord.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/songexportform.py" line="184"/>
+        <location filename="openlp/plugins/songs/forms/songexportform.py" line="162"/>
         <source>Uncheck All</source>
         <translation>Merk Alles Af</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/songexportform.py" line="186"/>
+        <location filename="openlp/plugins/songs/forms/songexportform.py" line="163"/>
         <source>Check All</source>
         <translation>Merk Alles Aan</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/songexportform.py" line="188"/>
+        <location filename="openlp/plugins/songs/forms/songexportform.py" line="164"/>
         <source>Select Directory</source>
         <translation>Kies Lêer-gids</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/songexportform.py" line="193"/>
+        <location filename="openlp/plugins/songs/forms/songexportform.py" line="167"/>
         <source>Directory:</source>
         <translation>Lêer Gids:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/songexportform.py" line="195"/>
+        <location filename="openlp/plugins/songs/forms/songexportform.py" line="168"/>
         <source>Exporting</source>
         <translation>Uitvoer</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/songexportform.py" line="197"/>
+        <location filename="openlp/plugins/songs/forms/songexportform.py" line="169"/>
         <source>Please wait while your songs are exported.</source>
         <translation>Wag asseblief terwyl die liedere uitgevoer word.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/songexportform.py" line="215"/>
+        <location filename="openlp/plugins/songs/forms/songexportform.py" line="185"/>
         <source>You need to add at least one Song to export.</source>
         <translation>Ten minste een lied moet bygevoeg word om uit te voer.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/songexportform.py" line="230"/>
+        <location filename="openlp/plugins/songs/forms/songexportform.py" line="199"/>
         <source>No Save Location specified</source>
         <translation>Geen Stoor Ligging gespesifiseer nie</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/songexportform.py" line="278"/>
+        <location filename="openlp/plugins/songs/forms/songexportform.py" line="242"/>
         <source>Starting export...</source>
         <translation>Uitvoer begin...</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/songexportform.py" line="230"/>
+        <location filename="openlp/plugins/songs/forms/songexportform.py" line="199"/>
         <source>You need to specify a directory.</source>
         <translation>&apos;n Lêer gids moet gespesifiseer word.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/songexportform.py" line="369"/>
+        <location filename="openlp/plugins/songs/forms/songexportform.py" line="320"/>
         <source>Select Destination Folder</source>
         <translation>Kies Bestemming Lêer gids</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/songexportform.py" line="190"/>
+        <location filename="openlp/plugins/songs/forms/songexportform.py" line="165"/>
         <source>Select the directory where you want the songs to be saved.</source>
         <translation>Kies die gids waar die liedere gestoor moet word.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/songexportform.py" line="174"/>
-        <source>This wizard will help to export your songs to the open and free &lt;strong&gt;OpenLyrics&lt;/strong&gt; worship song format.</source>
-        <translation>Hierdie gids sal help om die liedere na die oop en gratis &lt;strong&gt;OpenLyrics&lt;/strong&gt; aanbiddigs-formaat uit te voer.</translation>
+        <location filename="openlp/plugins/songs/forms/songexportform.py" line="155"/>
+        <source>This wizard will help to export your songs to the open and free &lt;strong&gt;OpenLyrics &lt;/strong&gt; worship song format.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SongsPlugin.FoilPresenterSongImport</name>
+    <message>
+        <location filename="openlp/plugins/songs/lib/foilpresenterimport.py" line="414"/>
+        <source>Invalid Foilpresenter song file. No verses found.</source>
+        <translation>Ongeldige Foilpresenter lied lêer. Geen verse gevin die.</translation>
     </message>
 </context>
 <context>
     <name>SongsPlugin.ImportWizardForm</name>
     <message>
-        <location filename="openlp/plugins/songs/lib/importer.py" line="216"/>
+        <location filename="openlp/plugins/songs/lib/importer.py" line="207"/>
         <source>Select Document/Presentation Files</source>
         <translation>Selekteer Dokument/Aanbieding Lêers</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/songimportform.py" line="156"/>
+        <location filename="openlp/plugins/songs/forms/songimportform.py" line="140"/>
         <source>Song Import Wizard</source>
         <translation>Lied Invoer Gids</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/songimportform.py" line="160"/>
+        <location filename="openlp/plugins/songs/forms/songimportform.py" line="143"/>
         <source>This wizard will help you to import songs from a variety of formats. Click the next button below to start the process by selecting a format to import from.</source>
         <translation>Hierdie gids help met die invoer van liedere in verskillende formate. Kliek die volgende knoppie hieronder om die proses te begin deur &apos;n formaat te kies wat gebruik moet word vir invoer.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/importer.py" line="209"/>
+        <location filename="openlp/plugins/songs/lib/importer.py" line="201"/>
         <source>Generic Document/Presentation</source>
         <translation>Generiese Dokumentasie/Aanbieding</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/songimportform.py" line="179"/>
+        <location filename="openlp/plugins/songs/forms/songimportform.py" line="158"/>
         <source>Add Files...</source>
         <translation>Voeg Lêers by...</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/songimportform.py" line="181"/>
+        <location filename="openlp/plugins/songs/forms/songimportform.py" line="160"/>
         <source>Remove File(s)</source>
         <translation>Verwyder Lêer(s)</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/songimportform.py" line="195"/>
+        <location filename="openlp/plugins/songs/forms/songimportform.py" line="172"/>
         <source>Please wait while your songs are imported.</source>
         <translation>Wag asseblief terwyl die liedere ingevoer word.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/importer.py" line="196"/>
+        <location filename="openlp/plugins/songs/lib/importer.py" line="198"/>
         <source>OpenLP 2.0 Databases</source>
         <translation>OpenLP 2.0 Databasisse</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/importer.py" line="204"/>
-        <source>openlp.org v1.x Databases</source>
-        <translation>openlp.org v1.x Databasisse</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/songs/lib/importer.py" line="329"/>
+        <location filename="openlp/plugins/songs/lib/importer.py" line="314"/>
         <source>Words Of Worship Song Files</source>
         <translation>Words Of Worship Lied Lêers</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/importer.py" line="312"/>
+        <location filename="openlp/plugins/songs/lib/importer.py" line="299"/>
         <source>Songs Of Fellowship Song Files</source>
         <translation>Songs Of Fellowship Lied Lêers</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/importer.py" line="286"/>
+        <location filename="openlp/plugins/songs/lib/importer.py" line="277"/>
         <source>SongBeamer Files</source>
         <translation>SongBeamer Lêers</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/importer.py" line="305"/>
+        <location filename="openlp/plugins/songs/lib/importer.py" line="293"/>
         <source>SongShow Plus Song Files</source>
         <translation>SongShow Plus Lied Lêers</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/importer.py" line="253"/>
+        <location filename="openlp/plugins/songs/lib/importer.py" line="246"/>
         <source>Foilpresenter Song Files</source>
         <translation>Foilpresenter Lied Lêers</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/songimportform.py" line="200"/>
+        <location filename="openlp/plugins/songs/forms/songimportform.py" line="176"/>
         <source>Copy</source>
         <translation>Kopieër</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/songimportform.py" line="202"/>
+        <location filename="openlp/plugins/songs/forms/songimportform.py" line="177"/>
         <source>Save to File</source>
         <translation>Stoor na Lêer</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/importer.py" line="314"/>
+        <location filename="openlp/plugins/songs/lib/importer.py" line="300"/>
         <source>The Songs of Fellowship importer has been disabled because OpenLP cannot access OpenOffice or LibreOffice.</source>
         <translation>Die Liedere van Volgelinge invoerder is onaktief gestel omdat OpenLP nie toegang tot OpenOffice of LibreOffice het nie.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/importer.py" line="213"/>
+        <location filename="openlp/plugins/songs/lib/importer.py" line="204"/>
         <source>The generic document/presentation importer has been disabled because OpenLP cannot access OpenOffice or LibreOffice.</source>
         <translation>Die generiese dokument/aanbieding invoerder is onaktief gestel omdat OpenLP nie toegang tot OpenOffice of LibreOffice het nie.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/importer.py" line="188"/>
+        <location filename="openlp/plugins/songs/lib/importer.py" line="191"/>
         <source>OpenLyrics or OpenLP 2.0 Exported Song</source>
         <translation>OpenLyrics of OpenLP 2.0 Uitgevoerde Lied</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/importer.py" line="186"/>
+        <location filename="openlp/plugins/songs/lib/importer.py" line="190"/>
         <source>OpenLyrics Files</source>
         <translation>OpenLyrics Lêers</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/importer.py" line="223"/>
+        <location filename="openlp/plugins/songs/lib/importer.py" line="213"/>
         <source>CCLI SongSelect Files</source>
         <translation>CCLI SongSelect Lêers</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/importer.py" line="238"/>
+        <location filename="openlp/plugins/songs/lib/importer.py" line="226"/>
         <source>EasySlides XML File</source>
         <translation>EeasySlides XML Lêer</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/importer.py" line="246"/>
+        <location filename="openlp/plugins/songs/lib/importer.py" line="233"/>
         <source>EasyWorship Song Database</source>
         <translation>EasyWorship Lied Databasis</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/importer.py" line="230"/>
+        <location filename="openlp/plugins/songs/lib/importer.py" line="219"/>
         <source>DreamBeam Song Files</source>
         <translation>DreamBeam Lied Lêers</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/importer.py" line="279"/>
+        <location filename="openlp/plugins/songs/lib/importer.py" line="270"/>
         <source>You need to specify a valid PowerSong 1.0 database folder.</source>
         <translation>&apos;n Geldige PowerSong 1.0 databasis gids moet gespesifiseer word.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/importer.py" line="337"/>
+        <location filename="openlp/plugins/songs/lib/importer.py" line="332"/>
         <source>ZionWorx (CSV)</source>
         <translation>ZionWorx (CSV)</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/importer.py" line="339"/>
+        <location filename="openlp/plugins/songs/lib/importer.py" line="333"/>
         <source>First convert your ZionWorx database to a CSV text file, as explained in the &lt;a href=&quot;http://manual.openlp.org/songs.html#importing-from-zionworx&quot;&gt;User Manual&lt;/a&gt;.</source>
         <translation>Verwerk eers jou ZionWorx databasis na &apos;n CSV teks lêer, soos verduidelik word in die &lt;a href=&quot;http://manual.openlp.org/songs.html#importing-from-zionworx&quot;&gt;Gebruikers Handleiding&lt;/a&gt;.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/importer.py" line="322"/>
+        <location filename="openlp/plugins/songs/lib/importer.py" line="308"/>
         <source>SundayPlus Song Files</source>
         <translation>SundayPlus Lied Leêrs</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/importer.py" line="173"/>
+        <location filename="openlp/plugins/songs/lib/importer.py" line="178"/>
         <source>This importer has been disabled.</source>
         <translation>Hierdie invoerder is onaktief gestel.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/importer.py" line="261"/>
+        <location filename="openlp/plugins/songs/lib/importer.py" line="253"/>
         <source>MediaShout Database</source>
         <translation>MediaShout Databasis</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/importer.py" line="263"/>
+        <location filename="openlp/plugins/songs/lib/importer.py" line="254"/>
         <source>The MediaShout 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 &quot;pyodbc&quot; module.</source>
         <translation>Die MediaShout invoerder word slegs ondersteun op Windows. Dit is vanweë  &apos;n vermiste Python module, gedeaktiveer. As jy hierdie invoerder wil gebruik, sal jy die &quot;pyodbc&quot; module moet installeer.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/importer.py" line="294"/>
+        <location filename="openlp/plugins/songs/lib/importer.py" line="284"/>
         <source>SongPro Text Files</source>
         <translation>SongPro Teks Leêrs</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/importer.py" line="296"/>
+        <location filename="openlp/plugins/songs/lib/importer.py" line="285"/>
         <source>SongPro (Export File)</source>
         <translation>SongPro (Voer Leêr uit)</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/importer.py" line="298"/>
+        <location filename="openlp/plugins/songs/lib/importer.py" line="286"/>
         <source>In SongPro, export your songs using the File -&gt; Export menu</source>
         <translation>In SongPro, voer liedere uit deur middel van die Leêr -&gt; Uitvoer spyskaart</translation>
     </message>
+    <message>
+        <location filename="openlp/plugins/songs/lib/importer.py" line="240"/>
+        <source>EasyWorship Service File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songs/lib/importer.py" line="321"/>
+        <source>WorshipCenter Pro Song Files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songs/lib/importer.py" line="322"/>
+        <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 &quot;pyodbc&quot; module.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>SongsPlugin.MediaFilesForm</name>
     <message>
-        <location filename="openlp/plugins/songs/forms/mediafilesdialog.py" line="64"/>
+        <location filename="openlp/plugins/songs/forms/mediafilesdialog.py" line="72"/>
         <source>Select Media File(s)</source>
         <translation>Selekteer Media Lêer(s)</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/mediafilesdialog.py" line="66"/>
+        <location filename="openlp/plugins/songs/forms/mediafilesdialog.py" line="73"/>
         <source>Select one or more audio files from the list below, and click OK to import them into this song.</source>
         <translation>Selekteer een of meer oudio lêers van die lys hieronder, en kliek OK om hulle na hierdie lied in te voer.</translation>
     </message>
@@ -7090,66 +6802,63 @@
 <context>
     <name>SongsPlugin.MediaItem</name>
     <message>
-        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="192"/>
+        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="144"/>
         <source>Titles</source>
         <translation>Titels</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="192"/>
+        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="144"/>
         <source>Lyrics</source>
         <translation>Lirieke</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="557"/>
+        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="513"/>
         <source>CCLI License: </source>
         <translation>CCLI Lisensie:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="192"/>
+        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="144"/>
         <source>Entire Song</source>
         <translation>Volledige Lied</translation>
     </message>
     <message numerus="yes">
-        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="439"/>
+        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="364"/>
         <source>Are you sure you want to delete the %n selected song(s)?</source>
-        <translation>
-            <numerusform>Wis regtig die %n geselekteerde lied uit?</numerusform>
-            <numerusform>Wis regtig die %n geselekteerde liedere uit?</numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="188"/>
+        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="134"/>
         <source>Maintain the lists of authors, topics and books.</source>
         <translation>Onderhou die lys van skrywers, onderwerpe en boeke.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="484"/>
+        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="393"/>
         <source>copy</source>
         <comment>For song cloning</comment>
         <translation>kopieër</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="192"/>
+        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="144"/>
         <source>Search Titles...</source>
         <translation>Soek Titels...</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="192"/>
+        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="144"/>
         <source>Search Entire Song...</source>
         <translation>Soek deur hele Lied...</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="192"/>
+        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="144"/>
         <source>Search Lyrics...</source>
         <translation>Soek Lirieke...</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="192"/>
+        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="144"/>
         <source>Search Authors...</source>
         <translation>Soek Outeure...</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="192"/>
+        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="144"/>
         <source>Search Song Books...</source>
         <translation>Soek Lied Boeke...</translation>
     </message>
@@ -7157,23 +6866,15 @@
 <context>
     <name>SongsPlugin.MediaShoutImport</name>
     <message>
-        <location filename="openlp/plugins/songs/lib/mediashoutimport.py" line="62"/>
+        <location filename="openlp/plugins/songs/lib/mediashoutimport.py" line="61"/>
         <source>Unable to open the MediaShout database.</source>
         <translation>Die MediaShout databasis kan nie oopgemaak word nie.</translation>
     </message>
 </context>
 <context>
-    <name>SongsPlugin.OpenLP1SongImport</name>
-    <message>
-        <location filename="openlp/plugins/songs/lib/olp1import.py" line="72"/>
-        <source>Not a valid openlp.org 1.x song database.</source>
-        <translation>Nie &apos;n geldige openlp.org 1.x lied databasis.</translation>
-    </message>
-</context>
-<context>
     <name>SongsPlugin.OpenLPSongImport</name>
     <message>
-        <location filename="openlp/plugins/songs/lib/olpimport.py" line="111"/>
+        <location filename="openlp/plugins/songs/lib/olpimport.py" line="103"/>
         <source>Not a valid OpenLP 2.0 song database.</source>
         <translation>Nie &apos;n geldige OpenLP 2.0 lied databasis.</translation>
     </message>
@@ -7181,25 +6882,33 @@
 <context>
     <name>SongsPlugin.OpenLyricsExport</name>
     <message>
-        <location filename="openlp/plugins/songs/lib/openlyricsexport.py" line="70"/>
+        <location filename="openlp/plugins/songs/lib/openlyricsexport.py" line="71"/>
         <source>Exporting &quot;%s&quot;...</source>
         <translation>Uitvoer &quot;%s&quot;...</translation>
     </message>
 </context>
 <context>
+    <name>SongsPlugin.OpenSongImport</name>
+    <message>
+        <location filename="openlp/plugins/songs/lib/opensongimport.py" line="134"/>
+        <source>Invalid OpenSong song file. Missing song tag.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SongsPlugin.PowerSongImport</name>
     <message>
-        <location filename="openlp/plugins/songs/lib/powersongimport.py" line="104"/>
+        <location filename="openlp/plugins/songs/lib/powersongimport.py" line="106"/>
         <source>No songs to import.</source>
         <translation>Geen liedere om in te voer nie.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/powersongimport.py" line="156"/>
+        <location filename="openlp/plugins/songs/lib/powersongimport.py" line="153"/>
         <source>Verses not found. Missing &quot;PART&quot; header.</source>
         <translation>Verse nie gevind nie. Vermis &quot;PART&quot; opskrif.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/powersongimport.py" line="104"/>
+        <location filename="openlp/plugins/songs/lib/powersongimport.py" line="106"/>
         <source>No %s files found.</source>
         <translation>Geen %s lêers gevind nie.</translation>
     </message>
@@ -7209,12 +6918,12 @@
         <translation>Ongeldige %s lêer. Onverwagse greep waarde.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/powersongimport.py" line="143"/>
+        <location filename="openlp/plugins/songs/lib/powersongimport.py" line="142"/>
         <source>Invalid %s file. Missing &quot;TITLE&quot; header.</source>
         <translation>Ongeldige %s lêer. Vermis &quot;TITLE&quot; hofie.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/powersongimport.py" line="149"/>
+        <location filename="openlp/plugins/songs/lib/powersongimport.py" line="147"/>
         <source>Invalid %s file. Missing &quot;COPYRIGHTLINE&quot; header.</source>
         <translation>Ongeldige %s lêer. Vermis &quot;COPYRIGHTLINE&quot; hofie.</translation>
     </message>
@@ -7222,22 +6931,22 @@
 <context>
     <name>SongsPlugin.SongBookForm</name>
     <message>
-        <location filename="openlp/plugins/songs/forms/songbookdialog.py" line="63"/>
+        <location filename="openlp/plugins/songs/forms/songbookdialog.py" line="73"/>
         <source>Song Book Maintenance</source>
         <translation>Lied Boek Onderhoud</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/songbookdialog.py" line="65"/>
+        <location filename="openlp/plugins/songs/forms/songbookdialog.py" line="74"/>
         <source>&amp;Name:</source>
         <translation>&amp;Naam:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/songbookdialog.py" line="66"/>
+        <location filename="openlp/plugins/songs/forms/songbookdialog.py" line="75"/>
         <source>&amp;Publisher:</source>
         <translation>&amp;Uitgewer:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/songbookform.py" line="56"/>
+        <location filename="openlp/plugins/songs/forms/songbookform.py" line="68"/>
         <source>You need to type in a name for the book.</source>
         <translation>&apos;n Naam vir die boek moet ingevoer word.</translation>
     </message>
@@ -7245,12 +6954,12 @@
 <context>
     <name>SongsPlugin.SongExportForm</name>
     <message>
-        <location filename="openlp/plugins/songs/forms/songexportform.py" line="299"/>
+        <location filename="openlp/plugins/songs/forms/songexportform.py" line="259"/>
         <source>Your song export failed.</source>
         <translation>Die lied uitvoer het misluk.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/songexportform.py" line="294"/>
+        <location filename="openlp/plugins/songs/forms/songexportform.py" line="255"/>
         <source>Finished export. To import these files use the &lt;strong&gt;OpenLyrics&lt;/strong&gt; importer.</source>
         <translation>Uitvoer voltooi. Om hierdie lêers in te voer, gebruik die &lt;strong&gt;OpenLyrics&lt;/strong&gt; invoerder.</translation>
     </message>
@@ -7258,12 +6967,12 @@
 <context>
     <name>SongsPlugin.SongImport</name>
     <message>
-        <location filename="openlp/plugins/songs/lib/songimport.py" line="112"/>
+        <location filename="openlp/plugins/songs/lib/songimport.py" line="117"/>
         <source>copyright</source>
         <translation>kopiereg</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/songimport.py" line="132"/>
+        <location filename="openlp/plugins/songs/lib/songimport.py" line="131"/>
         <source>The following songs could not be imported:</source>
         <translation>Die volgende liedere kon nie ingevoer word nie:</translation>
     </message>
@@ -7273,12 +6982,12 @@
         <translation>Het nie toegang tot OpenOffice of LibreOffice nie</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/oooimport.py" line="90"/>
+        <location filename="openlp/plugins/songs/lib/oooimport.py" line="89"/>
         <source>Unable to open file</source>
         <translation>Kan nie lêer oopmaak nie</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/oooimport.py" line="94"/>
+        <location filename="openlp/plugins/songs/lib/oooimport.py" line="91"/>
         <source>File not found</source>
         <translation>Lêer nie gevind nie</translation>
     </message>
@@ -7286,107 +6995,107 @@
 <context>
     <name>SongsPlugin.SongMaintenanceForm</name>
     <message>
-        <location filename="openlp/plugins/songs/forms/songmaintenanceform.py" line="228"/>
+        <location filename="openlp/plugins/songs/forms/songmaintenanceform.py" line="236"/>
         <source>Could not add your author.</source>
         <translation>Skrywer kon nie bygevoeg word nie.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/songmaintenanceform.py" line="232"/>
+        <location filename="openlp/plugins/songs/forms/songmaintenanceform.py" line="239"/>
         <source>This author already exists.</source>
         <translation>Die skrywer bestaan reeds.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/songmaintenanceform.py" line="243"/>
+        <location filename="openlp/plugins/songs/forms/songmaintenanceform.py" line="252"/>
         <source>Could not add your topic.</source>
         <translation>Onderwerp kon nie bygevoeg word nie.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/songmaintenanceform.py" line="247"/>
+        <location filename="openlp/plugins/songs/forms/songmaintenanceform.py" line="255"/>
         <source>This topic already exists.</source>
         <translation>Hierdie onderwerp bestaan reeds.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/songmaintenanceform.py" line="259"/>
+        <location filename="openlp/plugins/songs/forms/songmaintenanceform.py" line="269"/>
         <source>Could not add your book.</source>
         <translation>Boek kon nie bygevoeg word nie.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/songmaintenanceform.py" line="263"/>
+        <location filename="openlp/plugins/songs/forms/songmaintenanceform.py" line="272"/>
         <source>This book already exists.</source>
         <translation>Hierdie boek bestaan reeds.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/songmaintenanceform.py" line="365"/>
+        <location filename="openlp/plugins/songs/forms/songmaintenanceform.py" line="376"/>
         <source>Could not save your changes.</source>
         <translation>Veranderinge kon nie gestoor word nie.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/songmaintenanceform.py" line="308"/>
+        <location filename="openlp/plugins/songs/forms/songmaintenanceform.py" line="316"/>
         <source>Could not save your modified author, because the author already exists.</source>
         <translation>Geredigeerde skrywer kon nie gestoor word nie, omdat die skrywer reeds bestaan.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/songmaintenanceform.py" line="340"/>
+        <location filename="openlp/plugins/songs/forms/songmaintenanceform.py" line="348"/>
         <source>Could not save your modified topic, because it already exists.</source>
         <translation>Geredigeerde onderwerp kon nie gestoor word nie, want dit bestaan alreeds.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/songmaintenanceform.py" line="462"/>
+        <location filename="openlp/plugins/songs/forms/songmaintenanceform.py" line="475"/>
         <source>Delete Author</source>
         <translation>Wis Skrywer Uit</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/songmaintenanceform.py" line="462"/>
+        <location filename="openlp/plugins/songs/forms/songmaintenanceform.py" line="475"/>
         <source>Are you sure you want to delete the selected author?</source>
         <translation>Wis die geselekteerde skrywer uit?</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/songmaintenanceform.py" line="462"/>
+        <location filename="openlp/plugins/songs/forms/songmaintenanceform.py" line="475"/>
         <source>This author cannot be deleted, they are currently assigned to at least one song.</source>
         <translation>Die skrywer kan nie uitgewis word nie, omdat die skrywer aan ten minste een lied toegeken is.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/songmaintenanceform.py" line="473"/>
+        <location filename="openlp/plugins/songs/forms/songmaintenanceform.py" line="487"/>
         <source>Delete Topic</source>
         <translation>Wis Onderwerp Uit</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/songmaintenanceform.py" line="473"/>
+        <location filename="openlp/plugins/songs/forms/songmaintenanceform.py" line="487"/>
         <source>Are you sure you want to delete the selected topic?</source>
         <translation>Wis die geselekteerde onderwerp uit?</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/songmaintenanceform.py" line="473"/>
+        <location filename="openlp/plugins/songs/forms/songmaintenanceform.py" line="487"/>
         <source>This topic cannot be deleted, it is currently assigned to at least one song.</source>
         <translation>Die onderwerp 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="484"/>
+        <location filename="openlp/plugins/songs/forms/songmaintenanceform.py" line="498"/>
         <source>Delete Book</source>
         <translation>Wis Boek Uit</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/songmaintenanceform.py" line="484"/>
+        <location filename="openlp/plugins/songs/forms/songmaintenanceform.py" line="498"/>
         <source>Are you sure you want to delete the selected book?</source>
         <translation>Wis die geselekteerde boek uit?</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/songmaintenanceform.py" line="484"/>
+        <location filename="openlp/plugins/songs/forms/songmaintenanceform.py" line="498"/>
         <source>This book cannot be deleted, it is currently assigned to at least one song.</source>
         <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="294"/>
+        <location filename="openlp/plugins/songs/forms/songmaintenanceform.py" line="304"/>
         <source>The author %s already exists. Would you like to make songs with author %s use the existing author %s?</source>
         <translation>Die outeur %s bestaan alreeds. Moet liedere met die outeur %s die bestaande outeur %s gebruik?</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/songmaintenanceform.py" line="330"/>
+        <location filename="openlp/plugins/songs/forms/songmaintenanceform.py" line="339"/>
         <source>The topic %s already exists. Would you like to make songs with topic %s use the existing topic %s?</source>
         <translation>Die onderwerp %s bestaan alreeds. Moet liedere met die onderwerp %s die bestaande onderwerp %s gebruik?</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/songmaintenanceform.py" line="368"/>
+        <location filename="openlp/plugins/songs/forms/songmaintenanceform.py" line="378"/>
         <source>The book %s already exists. Would you like to make songs with book %s use the existing book %s?</source>
         <translation>Die boek %s bestaan reeds. Moed liedere met die doek %s gebruik maak van bestaande boek %s?</translation>
     </message>
@@ -7394,45 +7103,50 @@
 <context>
     <name>SongsPlugin.SongsTab</name>
     <message>
-        <location filename="openlp/plugins/songs/lib/songstab.py" line="80"/>
+        <location filename="openlp/plugins/songs/lib/songstab.py" line="75"/>
         <source>Songs Mode</source>
         <translation>Liedere Modus</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/songstab.py" line="82"/>
+        <location filename="openlp/plugins/songs/lib/songstab.py" line="76"/>
         <source>Enable search as you type</source>
         <translation>Bekragtig soek soos getik word</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/songstab.py" line="84"/>
+        <location filename="openlp/plugins/songs/lib/songstab.py" line="77"/>
         <source>Display verses on live tool bar</source>
         <translation>Vertoon verse op regstreekse gereedskap staaf</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/songstab.py" line="86"/>
+        <location filename="openlp/plugins/songs/lib/songstab.py" line="79"/>
         <source>Update service from song edit</source>
         <translation>Opdateer diens van lied-redigering</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/songstab.py" line="88"/>
+        <location filename="openlp/plugins/songs/lib/songstab.py" line="80"/>
         <source>Import missing songs from service files</source>
         <translation>Voer vermisde liedere in vanaf diens lêers</translation>
     </message>
+    <message>
+        <location filename="openlp/plugins/songs/lib/songstab.py" line="82"/>
+        <source>Display songbook in footer</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>SongsPlugin.TopicsForm</name>
     <message>
-        <location filename="openlp/plugins/songs/forms/topicsdialog.py" line="57"/>
+        <location filename="openlp/plugins/songs/forms/topicsdialog.py" line="67"/>
         <source>Topic Maintenance</source>
         <translation>Onderwerp Onderhoud</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/topicsdialog.py" line="59"/>
+        <location filename="openlp/plugins/songs/forms/topicsdialog.py" line="68"/>
         <source>Topic name:</source>
         <translation>Onderwerp naam:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/forms/topicsform.py" line="55"/>
+        <location filename="openlp/plugins/songs/forms/topicsform.py" line="65"/>
         <source>You need to type in a topic name.</source>
         <translation>&apos;n Onderwerp naam moet ingevoer word.</translation>
     </message>
@@ -7440,67 +7154,131 @@
 <context>
     <name>SongsPlugin.VerseType</name>
     <message>
-        <location filename="openlp/plugins/songs/lib/__init__.py" line="163"/>
+        <location filename="openlp/plugins/songs/lib/__init__.py" line="157"/>
         <source>Verse</source>
         <translation>Vers</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/__init__.py" line="164"/>
+        <location filename="openlp/plugins/songs/lib/__init__.py" line="158"/>
         <source>Chorus</source>
         <translation>Koor</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/__init__.py" line="165"/>
+        <location filename="openlp/plugins/songs/lib/__init__.py" line="159"/>
         <source>Bridge</source>
         <translation>Brug</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/__init__.py" line="166"/>
+        <location filename="openlp/plugins/songs/lib/__init__.py" line="160"/>
         <source>Pre-Chorus</source>
         <translation>Voor-Refrein</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/__init__.py" line="167"/>
+        <location filename="openlp/plugins/songs/lib/__init__.py" line="161"/>
         <source>Intro</source>
         <translation>Inleiding</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/__init__.py" line="168"/>
+        <location filename="openlp/plugins/songs/lib/__init__.py" line="162"/>
         <source>Ending</source>
         <translation>Slot</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/__init__.py" line="169"/>
+        <location filename="openlp/plugins/songs/lib/__init__.py" line="163"/>
         <source>Other</source>
         <translation>Ander</translation>
     </message>
 </context>
 <context>
+    <name>SongsPlugin.WordsofWorshipSongImport</name>
+    <message>
+        <location filename="openlp/plugins/songs/lib/wowimport.py" line="117"/>
+        <source>Invalid Words of Worship song file. Missing &quot;Wow File\nSong Words&quot; header.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songs/lib/wowimport.py" line="127"/>
+        <source>Invalid Words of Worship song file. Missing &quot;CSongDoc::CBlock&quot; string.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SongsPlugin.WorshipCenterProImport</name>
+    <message>
+        <location filename="openlp/plugins/songs/lib/worshipcenterproimport.py" line="63"/>
+        <source>Unable to connect the WorshipCenter Pro database.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SongsPlugin.ZionWorxImport</name>
     <message>
-        <location filename="openlp/plugins/songs/lib/zionworximport.py" line="92"/>
+        <location filename="openlp/plugins/songs/lib/zionworximport.py" line="93"/>
         <source>Error reading CSV file.</source>
         <translation>Probleem om CSV lêer te lees.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/zionworximport.py" line="118"/>
+        <location filename="openlp/plugins/songs/lib/zionworximport.py" line="115"/>
         <source>File not valid ZionWorx CSV format.</source>
         <translation>Lêer nie geldige ZionWorx CSV formaat nie.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/zionworximport.py" line="92"/>
+        <location filename="openlp/plugins/songs/lib/zionworximport.py" line="93"/>
         <source>Line %d: %s</source>
         <translation>Lyn %d: %s</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/zionworximport.py" line="112"/>
+        <location filename="openlp/plugins/songs/lib/zionworximport.py" line="111"/>
         <source>Decoding error: %s</source>
         <translation>Dekodering fout: %s</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/zionworximport.py" line="133"/>
+        <location filename="openlp/plugins/songs/lib/zionworximport.py" line="131"/>
         <source>Record %d</source>
         <translation>Opname %d</translation>
     </message>
 </context>
-</TS>
+<context>
+    <name>Wizard</name>
+    <message>
+        <location filename="openlp/plugins/songs/forms/duplicatesongremovalform.py" line="138"/>
+        <source>Wizard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songs/forms/duplicatesongremovalform.py" line="141"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songs/forms/duplicatesongremovalform.py" line="146"/>
+        <source>Searching for duplicate songs.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songs/forms/duplicatesongremovalform.py" line="147"/>
+        <source>Please wait while your songs database is analyzed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songs/forms/duplicatesongremovalform.py" line="149"/>
+        <source>Here you can decide which songs to remove and which ones to keep.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songs/forms/duplicatesongremovalform.py" line="156"/>
+        <source>Review duplicate songs (%s/%s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songs/forms/duplicatesongremovalform.py" line="221"/>
+        <source>Information</source>
+        <translation>Informasie</translation>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songs/forms/duplicatesongremovalform.py" line="221"/>
+        <source>No duplicate songs have been found in the database.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+</TS>
\ No newline at end of file

=== modified file 'resources/i18n/cs.ts'
--- resources/i18n/cs.ts	2012-11-24 21:19:46 +0000
+++ resources/i18n/cs.ts	2014-06-30 20:23:34 +0000
@@ -1,117 +1,117 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="2.0" language="cs" sourcelanguage="">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="cs" sourcelanguage="" version="2.0">
 <context>
     <name>AlertsPlugin</name>
     <message>
-        <location filename="openlp/plugins/alerts/alertsplugin.py" line="140"/>
+        <location filename="openlp/plugins/alerts/alertsplugin.py" line="154"/>
         <source>&amp;Alert</source>
         <translation>&amp;Upozornění</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/alerts/alertsplugin.py" line="140"/>
+        <location filename="openlp/plugins/alerts/alertsplugin.py" line="154"/>
         <source>Show an alert message.</source>
         <translation>Zobrazit vzkaz upozornění.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/alerts/alertsplugin.py" line="186"/>
+        <location filename="openlp/plugins/alerts/alertsplugin.py" line="212"/>
         <source>Alert</source>
         <comment>name singular</comment>
         <translation>Upozornění</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/alerts/alertsplugin.py" line="187"/>
+        <location filename="openlp/plugins/alerts/alertsplugin.py" line="213"/>
         <source>Alerts</source>
         <comment>name plural</comment>
         <translation>Upozornění</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/alerts/alertsplugin.py" line="191"/>
+        <location filename="openlp/plugins/alerts/alertsplugin.py" line="217"/>
         <source>Alerts</source>
         <comment>container title</comment>
         <translation>Upozornění</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/alerts/alertsplugin.py" line="175"/>
-        <source>&lt;strong&gt;Alerts Plugin&lt;/strong&gt;&lt;br /&gt;The alert plugin controls the displaying of nursery alerts on the display screen.</source>
-        <translation>&lt;strong&gt;Modul upozornění&lt;/strong&gt;&lt;br /&gt;Modul upozornění umožňuje zobrazovat různé hlášky a upozornění na zobrazovací obrazovce.</translation>
+        <location filename="openlp/plugins/alerts/alertsplugin.py" line="202"/>
+        <source>&lt;strong&gt;Alerts Plugin&lt;/strong&gt;&lt;br /&gt;The alert plugin controls the displaying of alerts on the display screen.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>AlertsPlugin.AlertForm</name>
     <message>
-        <location filename="openlp/plugins/alerts/forms/alertdialog.py" line="89"/>
+        <location filename="openlp/plugins/alerts/forms/alertdialog.py" line="102"/>
         <source>Alert Message</source>
         <translation>Vzkaz upozornění</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/alerts/forms/alertdialog.py" line="91"/>
+        <location filename="openlp/plugins/alerts/forms/alertdialog.py" line="103"/>
         <source>Alert &amp;text:</source>
         <translation>&amp;Text upozornění:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/alerts/forms/alertdialog.py" line="95"/>
+        <location filename="openlp/plugins/alerts/forms/alertdialog.py" line="105"/>
         <source>&amp;New</source>
         <translation>&amp;Nový</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/alerts/forms/alertdialog.py" line="97"/>
+        <location filename="openlp/plugins/alerts/forms/alertdialog.py" line="106"/>
         <source>&amp;Save</source>
         <translation>&amp;Uložit</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/alerts/forms/alertdialog.py" line="99"/>
+        <location filename="openlp/plugins/alerts/forms/alertdialog.py" line="107"/>
         <source>Displ&amp;ay</source>
         <translation>&amp;Zobrazit</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/alerts/forms/alertdialog.py" line="101"/>
+        <location filename="openlp/plugins/alerts/forms/alertdialog.py" line="108"/>
         <source>Display &amp;&amp; Cl&amp;ose</source>
         <translation>Zobrazit a za&amp;vřít</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/alerts/forms/alertform.py" line="111"/>
+        <location filename="openlp/plugins/alerts/forms/alertform.py" line="114"/>
         <source>New Alert</source>
         <translation>Nové upozornění</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/alerts/forms/alertform.py" line="111"/>
-        <source>You haven&apos;t specified any text for your alert. Please type in some text before clicking New.</source>
-        <translation>Nebyl zadán žádný text upozornění. Před klepnutím na Nový prosím zadejte nějaký text.</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/alerts/forms/alertdialog.py" line="93"/>
+        <location filename="openlp/plugins/alerts/forms/alertdialog.py" line="104"/>
         <source>&amp;Parameter:</source>
         <translation>&amp;Parametr:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/alerts/forms/alertform.py" line="184"/>
+        <location filename="openlp/plugins/alerts/forms/alertform.py" line="185"/>
         <source>No Parameter Found</source>
         <translation>Parametr nenalezen</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/alerts/forms/alertform.py" line="184"/>
+        <location filename="openlp/plugins/alerts/forms/alertform.py" line="185"/>
         <source>You have not entered a parameter to be replaced.
 Do you want to continue anyway?</source>
         <translation>Nebyl zadán žádný parametr pro nahrazení.
 Chcete přesto pokračovat?</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/alerts/forms/alertform.py" line="195"/>
+        <location filename="openlp/plugins/alerts/forms/alertform.py" line="197"/>
         <source>No Placeholder Found</source>
         <translation>Zástupný znak nenalezen</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/alerts/forms/alertform.py" line="195"/>
-        <source>The alert text does not contain &apos;&lt;&gt;&apos;.
+        <location filename="openlp/plugins/alerts/forms/alertform.py" line="197"/>
+        <source>The alert text does not contain '&lt;&gt;'.
 Do you want to continue anyway?</source>
         <translation>Text upozornění neobsahuje &apos;&lt;&gt;&apos;.
 Chcete přesto pokračovat?</translation>
     </message>
+    <message>
+        <location filename="openlp/plugins/alerts/forms/alertform.py" line="114"/>
+        <source>You haven't specified any text for your alert. 
+Please type in some text before clicking New.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AlertsPlugin.AlertsManager</name>
     <message>
-        <location filename="openlp/plugins/alerts/lib/alertsmanager.py" line="73"/>
+        <location filename="openlp/plugins/alerts/lib/alertsmanager.py" line="70"/>
         <source>Alert message created and displayed.</source>
         <translation>Vzkaz upozornění byl vytvořen a zobrazen.</translation>
     </message>
@@ -119,32 +119,32 @@
 <context>
     <name>AlertsPlugin.AlertsTab</name>
     <message>
-        <location filename="openlp/plugins/alerts/lib/alertstab.py" line="111"/>
+        <location filename="openlp/plugins/alerts/lib/alertstab.py" line="105"/>
         <source>Font</source>
         <translation>Písmo</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/alerts/lib/alertstab.py" line="113"/>
+        <location filename="openlp/plugins/alerts/lib/alertstab.py" line="106"/>
         <source>Font name:</source>
         <translation>Název písma:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/alerts/lib/alertstab.py" line="115"/>
+        <location filename="openlp/plugins/alerts/lib/alertstab.py" line="107"/>
         <source>Font color:</source>
         <translation>Barva písma:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/alerts/lib/alertstab.py" line="117"/>
+        <location filename="openlp/plugins/alerts/lib/alertstab.py" line="108"/>
         <source>Background color:</source>
         <translation>Barva pozadí:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/alerts/lib/alertstab.py" line="119"/>
+        <location filename="openlp/plugins/alerts/lib/alertstab.py" line="109"/>
         <source>Font size:</source>
         <translation>Velikost písma:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/alerts/lib/alertstab.py" line="122"/>
+        <location filename="openlp/plugins/alerts/lib/alertstab.py" line="111"/>
         <source>Alert timeout:</source>
         <translation>Čas vypršení upozornění:</translation>
     </message>
@@ -152,544 +152,543 @@
 <context>
     <name>BiblesPlugin</name>
     <message>
-        <location filename="openlp/plugins/bibles/bibleplugin.py" line="111"/>
+        <location filename="openlp/plugins/bibles/bibleplugin.py" line="137"/>
         <source>&amp;Bible</source>
         <translation>&amp;Bible</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/bibleplugin.py" line="183"/>
+        <location filename="openlp/plugins/bibles/bibleplugin.py" line="201"/>
         <source>Bible</source>
         <comment>name singular</comment>
         <translation>Bible</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/bibleplugin.py" line="184"/>
+        <location filename="openlp/plugins/bibles/bibleplugin.py" line="202"/>
         <source>Bibles</source>
         <comment>name plural</comment>
-        <translation>Více Biblí</translation>
+        <translation>Bible</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/bibleplugin.py" line="188"/>
+        <location filename="openlp/plugins/bibles/bibleplugin.py" line="206"/>
         <source>Bibles</source>
         <comment>container title</comment>
         <translation>Bible</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/http.py" line="600"/>
+        <location filename="openlp/plugins/bibles/lib/http.py" line="551"/>
         <source>No Book Found</source>
         <translation>Kniha nenalezena</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/http.py" line="600"/>
+        <location filename="openlp/plugins/bibles/lib/http.py" line="551"/>
         <source>No matching book could be found in this Bible. Check that you have spelled the name of the book correctly.</source>
         <translation>V Bibli nebyla nalezena odpovídající kniha. Prověřte, že název knihy byl zadán správně.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/bibleplugin.py" line="193"/>
+        <location filename="openlp/plugins/bibles/bibleplugin.py" line="211"/>
         <source>Import a Bible.</source>
         <translation>Import Bible.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/bibleplugin.py" line="194"/>
+        <location filename="openlp/plugins/bibles/bibleplugin.py" line="212"/>
         <source>Add a new Bible.</source>
         <translation>Přidat novou Bibli.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/bibleplugin.py" line="195"/>
+        <location filename="openlp/plugins/bibles/bibleplugin.py" line="213"/>
         <source>Edit the selected Bible.</source>
         <translation>Upravit vybranou Bibli.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/bibleplugin.py" line="196"/>
+        <location filename="openlp/plugins/bibles/bibleplugin.py" line="214"/>
         <source>Delete the selected Bible.</source>
         <translation>Smazat vybranou Bibli.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/bibleplugin.py" line="197"/>
+        <location filename="openlp/plugins/bibles/bibleplugin.py" line="215"/>
         <source>Preview the selected Bible.</source>
         <translation>Náhled vybrané Bible.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/bibleplugin.py" line="199"/>
+        <location filename="openlp/plugins/bibles/bibleplugin.py" line="216"/>
         <source>Send the selected Bible live.</source>
         <translation>Zobrazit vybranou Bibli naživo.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/bibleplugin.py" line="200"/>
+        <location filename="openlp/plugins/bibles/bibleplugin.py" line="217"/>
         <source>Add the selected Bible to the service.</source>
         <translation>Přidat vybranou Bibli ke službě.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/bibleplugin.py" line="149"/>
+        <location filename="openlp/plugins/bibles/bibleplugin.py" line="170"/>
         <source>&lt;strong&gt;Bible Plugin&lt;/strong&gt;&lt;br /&gt;The Bible plugin provides the ability to display Bible verses from different sources during the service.</source>
         <translation>&lt;strong&gt;Modul Bible&lt;/strong&gt;&lt;br /&gt;Modul Bible umožňuje během služby zobrazovat verše z různých zdrojů.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/bibleplugin.py" line="126"/>
+        <location filename="openlp/plugins/bibles/bibleplugin.py" line="148"/>
         <source>&amp;Upgrade older Bibles</source>
         <translation>&amp;Aktualizovat starší Bibles</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/bibleplugin.py" line="126"/>
+        <location filename="openlp/plugins/bibles/bibleplugin.py" line="148"/>
         <source>Upgrade the Bible databases to the latest format.</source>
         <translation>Povýšit databáze Bible na nejnovější formát.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="93"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="94"/>
         <source>Genesis</source>
         <translation>1. Mojžíšova</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="94"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="95"/>
         <source>Exodus</source>
         <translation>2. Mojžíšova</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="95"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="96"/>
         <source>Leviticus</source>
         <translation>3. Mojžíšova</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="96"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="97"/>
         <source>Numbers</source>
         <translation>4. Mojžíšova</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="97"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="98"/>
         <source>Deuteronomy</source>
         <translation>5. Mojžíšova</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="98"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="99"/>
         <source>Joshua</source>
         <translation>Jozue</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="99"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="100"/>
         <source>Judges</source>
         <translation>Soudců</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="100"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="101"/>
         <source>Ruth</source>
         <translation>Rút</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="101"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="102"/>
         <source>1 Samuel</source>
         <translation>1. Samuelova</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="102"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="103"/>
         <source>2 Samuel</source>
         <translation>2. Samuelova</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="103"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="104"/>
         <source>1 Kings</source>
         <translation>1. Královská</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="104"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="105"/>
         <source>2 Kings</source>
         <translation>2. Královská</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="105"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="106"/>
         <source>1 Chronicles</source>
         <translation>1. Paralipomenon</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="106"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="107"/>
         <source>2 Chronicles</source>
         <translation>2. Paralipomenon</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="107"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="108"/>
         <source>Ezra</source>
         <translation>Ezdráš</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="108"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="109"/>
         <source>Nehemiah</source>
         <translation>Nehemjáš</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="109"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="110"/>
         <source>Esther</source>
         <translation>Ester</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="110"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="111"/>
         <source>Job</source>
         <translation>Jób</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="111"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="112"/>
         <source>Psalms</source>
         <translation>Žalmy</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="112"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="113"/>
         <source>Proverbs</source>
         <translation>Přísloví</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="113"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="114"/>
         <source>Ecclesiastes</source>
         <translation>Kazatel</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="114"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="115"/>
         <source>Song of Solomon</source>
         <translation>Píseň písní</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="115"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="116"/>
         <source>Isaiah</source>
         <translation>Izajáš</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="116"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="117"/>
         <source>Jeremiah</source>
         <translation>Jeremjáš</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="117"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="118"/>
         <source>Lamentations</source>
         <translation>Pláč</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="118"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="119"/>
         <source>Ezekiel</source>
         <translation>Ezechiel</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="119"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="120"/>
         <source>Daniel</source>
         <translation>Daniel</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="120"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="121"/>
         <source>Hosea</source>
         <translation>Ozeáš</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="121"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="122"/>
         <source>Joel</source>
         <translation>Jóel</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="122"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="123"/>
         <source>Amos</source>
         <translation>Ámos</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="123"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="124"/>
         <source>Obadiah</source>
         <translation>Abdijáš</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="124"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="125"/>
         <source>Jonah</source>
         <translation>Jonáš</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="125"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="126"/>
         <source>Micah</source>
         <translation>Micheáš</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="126"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="127"/>
         <source>Nahum</source>
         <translation>Nahum</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="127"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="128"/>
         <source>Habakkuk</source>
         <translation>Abakuk</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="128"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="129"/>
         <source>Zephaniah</source>
         <translation>Sofonjáš</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="129"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="130"/>
         <source>Haggai</source>
         <translation>Ageus</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="130"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="131"/>
         <source>Zechariah</source>
         <translation>Zacharjáš</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="131"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="132"/>
         <source>Malachi</source>
         <translation>Malachiáš</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="132"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="133"/>
         <source>Matthew</source>
         <translation>Matouš</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="133"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="134"/>
         <source>Mark</source>
         <translation>Marek</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="134"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="135"/>
         <source>Luke</source>
         <translation>Lukáš</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="135"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="136"/>
         <source>John</source>
         <translation>Jan</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="136"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="137"/>
         <source>Acts</source>
         <translation>Skutky apoštolské</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="137"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="138"/>
         <source>Romans</source>
         <translation>Římanům</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="138"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="139"/>
         <source>1 Corinthians</source>
         <translation>1. Korintským</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="139"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="140"/>
         <source>2 Corinthians</source>
         <translation>2. Korintským</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="140"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="141"/>
         <source>Galatians</source>
         <translation>Galatským</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="141"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="142"/>
         <source>Ephesians</source>
         <translation>Efezským</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="142"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="143"/>
         <source>Philippians</source>
         <translation>Filipským</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="143"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="144"/>
         <source>Colossians</source>
         <translation>Koloským</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="144"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="145"/>
         <source>1 Thessalonians</source>
         <translation>1. Tesalonickým</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="145"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="146"/>
         <source>2 Thessalonians</source>
         <translation>2. Tesalonickým</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="146"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="147"/>
         <source>1 Timothy</source>
         <translation>1. Timoteovi</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="147"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="148"/>
         <source>2 Timothy</source>
         <translation>2. Timoteovi</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="148"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="149"/>
         <source>Titus</source>
         <translation>Titovi</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="149"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="150"/>
         <source>Philemon</source>
         <translation>Filemonovi</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="150"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="151"/>
         <source>Hebrews</source>
         <translation>Židům</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="151"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="152"/>
         <source>James</source>
         <translation>List Jakubův</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="152"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="153"/>
         <source>1 Peter</source>
         <translation>1. list Petrův</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="153"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="154"/>
         <source>2 Peter</source>
         <translation>2. list Petrův</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="154"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="155"/>
         <source>1 John</source>
         <translation>1. list Janův</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="155"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="156"/>
         <source>2 John</source>
         <translation>2. list Janův</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="156"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="157"/>
         <source>3 John</source>
         <translation>3. list Janův</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="157"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="158"/>
         <source>Jude</source>
         <translation>List Judův</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="158"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="159"/>
         <source>Revelation</source>
         <translation>Zjevení Janovo</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="159"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="160"/>
         <source>Judith</source>
         <translation>Júdit</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="160"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="161"/>
         <source>Wisdom</source>
         <translation>Kniha moudrosti</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="161"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="162"/>
         <source>Tobit</source>
         <translation>Tobijáš</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="162"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="163"/>
         <source>Sirach</source>
         <translation>Sírachovec</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="163"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="164"/>
         <source>Baruch</source>
         <translation>Báruk</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="164"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="165"/>
         <source>1 Maccabees</source>
         <translation>1. Makabejská</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="165"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="166"/>
         <source>2 Maccabees</source>
         <translation>2. Makabejská</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="166"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="167"/>
         <source>3 Maccabees</source>
         <translation>3. Makabejská</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="167"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="168"/>
         <source>4 Maccabees</source>
         <translation>4. Makabejská</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="168"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="169"/>
         <source>Rest of Daniel</source>
         <translation>Zbytek Daniele</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="169"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="170"/>
         <source>Rest of Esther</source>
         <translation>Zbytek Ester</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="170"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="171"/>
         <source>Prayer of Manasses</source>
         <translation>Modlitba Manasese</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="171"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="172"/>
         <source>Letter of Jeremiah</source>
         <translation>Jeremiášův Dopis</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="172"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="173"/>
         <source>Prayer of Azariah</source>
         <translation>Modlitba Azarjáše</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="173"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="174"/>
         <source>Susanna</source>
         <translation>Zuzana</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="174"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="175"/>
         <source>Bel</source>
         <translation>Bel</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="175"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="176"/>
         <source>1 Esdras</source>
         <translation>1. Ezdrášova</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="176"/>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="177"/>
         <source>2 Esdras</source>
         <translation>2. Ezdrášova</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/__init__.py" line="185"/>
-        <source>:|v|V|verse|verses;;-|to;;,|and;;end</source>
-        <comment>Double-semicolon delimited separators for parsing references. Consult the developers for further information.</comment>
-        <translation>:|v|V|verse|verses;;-|to;;,|and;;end</translation>
+        <location filename="openlp/plugins/bibles/lib/__init__.py" line="186"/>
+        <source>:|v|V|verse|verses;;-|to;;,|and;;end Double-semicolon delimited separators for parsing references. Consult the developers for further information.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>BiblesPlugin.BibleEditForm</name>
     <message>
-        <location filename="openlp/plugins/bibles/forms/editbibleform.py" line="157"/>
+        <location filename="openlp/plugins/bibles/forms/editbibleform.py" line="148"/>
         <source>You need to specify a version name for your Bible.</source>
         <translation>Je nutno uvést název verze Bible.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/editbibleform.py" line="163"/>
+        <location filename="openlp/plugins/bibles/forms/editbibleform.py" line="154"/>
         <source>You need to set a copyright for your Bible. Bibles in the Public Domain need to be marked as such.</source>
         <translation>K Bibli je potřeba nastavit autorská práva. Bible, které jsou volná díla (Public Domain), je nutno takto označit.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/editbibleform.py" line="172"/>
+        <location filename="openlp/plugins/bibles/forms/editbibleform.py" line="162"/>
         <source>Bible Exists</source>
         <translation>Bible existuje</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/editbibleform.py" line="172"/>
+        <location filename="openlp/plugins/bibles/forms/editbibleform.py" line="162"/>
         <source>This Bible already exists. Please import a different Bible or first delete the existing one.</source>
         <translation>Tato Bible už existuje. Importujte prosím jinou Bibli nebo nejdříve smažte tu existující.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/editbibleform.py" line="187"/>
+        <location filename="openlp/plugins/bibles/forms/editbibleform.py" line="176"/>
         <source>You need to specify a book name for &quot;%s&quot;.</source>
         <translation>Je nutno uvést název knihy pro &quot;%s&quot;.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/editbibleform.py" line="194"/>
+        <location filename="openlp/plugins/bibles/forms/editbibleform.py" line="183"/>
         <source>The book name &quot;%s&quot; is not correct.
 Numbers can only be used at the beginning and must
 be followed by one or more non-numeric characters.</source>
@@ -698,12 +697,12 @@
 následovat jeden nebo více nečíslných znaků.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/editbibleform.py" line="206"/>
+        <location filename="openlp/plugins/bibles/forms/editbibleform.py" line="195"/>
         <source>Duplicate Book Name</source>
         <translation>Duplicitní název knihy</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/editbibleform.py" line="206"/>
+        <location filename="openlp/plugins/bibles/forms/editbibleform.py" line="195"/>
         <source>The Book Name &quot;%s&quot; has been entered more than once.</source>
         <translation>&quot;%s&quot; jako název knihy byl zadán více než jednou.</translation>
     </message>
@@ -711,39 +710,39 @@
 <context>
     <name>BiblesPlugin.BibleManager</name>
     <message>
-        <location filename="openlp/plugins/bibles/lib/manager.py" line="428"/>
+        <location filename="openlp/plugins/bibles/lib/manager.py" line="356"/>
         <source>Scripture Reference Error</source>
         <translation>Chyba v odkazu do Bible</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/manager.py" line="418"/>
+        <location filename="openlp/plugins/bibles/lib/manager.py" line="348"/>
         <source>Web Bible cannot be used</source>
         <translation>Bibli z www nelze použít</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/manager.py" line="418"/>
+        <location filename="openlp/plugins/bibles/lib/manager.py" line="348"/>
         <source>Text Search is not available with Web Bibles.</source>
         <translation>Hledání textu není dostupné v Bibli z www.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/manager.py" line="428"/>
+        <location filename="openlp/plugins/bibles/lib/manager.py" line="356"/>
         <source>You did not enter a search keyword.
 You can separate different keywords by a space to search for all of your keywords and you can separate them by a comma to search for one of them.</source>
         <translation>Nebylo zadáno slovo pro hledání.
 K hledání textu obsahující všechna slova je nutno tato slova oddělit mezerou. Oddělením slov čárkou se bude hledat text obsahující alespoň jedno ze zadaných slov.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/manager.py" line="402"/>
+        <location filename="openlp/plugins/bibles/lib/manager.py" line="334"/>
         <source>There are no Bibles currently installed. Please use the Import Wizard to install one or more Bibles.</source>
         <translation>Žádné Bible nejsou nainstalovány. K p?idání jedné nebo více Biblí prosím použijte Pr?vodce importem.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/manager.py" line="402"/>
+        <location filename="openlp/plugins/bibles/lib/manager.py" line="334"/>
         <source>No Bibles Available</source>
         <translation>Žádné Bible k dispozici</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/manager.py" line="340"/>
+        <location filename="openlp/plugins/bibles/lib/manager.py" line="285"/>
         <source>Your scripture reference is either not supported by OpenLP or is invalid. Please make sure your reference conforms to one of the following patterns or consult the manual:
 
 Book Chapter
@@ -766,79 +765,79 @@
 <context>
     <name>BiblesPlugin.BiblesTab</name>
     <message>
-        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="225"/>
+        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="163"/>
         <source>Verse Display</source>
         <translation>Zobrazit verš</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="227"/>
+        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="165"/>
         <source>Only show new chapter numbers</source>
         <translation>Zobrazit jen číslo nové kapitoly</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="232"/>
+        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="168"/>
         <source>Bible theme:</source>
         <translation>Motiv Bible:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="240"/>
+        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="172"/>
         <source>No Brackets</source>
         <translation>Žádné závorky</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="242"/>
+        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="174"/>
         <source>( And )</source>
         <translation>( A )</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="244"/>
+        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="176"/>
         <source>{ And }</source>
         <translation>{ A }</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="246"/>
+        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="178"/>
         <source>[ And ]</source>
         <translation>[ A ]</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="248"/>
+        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="180"/>
         <source>Note:
 Changes do not affect verses already in the service.</source>
         <translation>Poznámka:
 Verše, které jsou už ve službě, nejsou změnami ovlivněny.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="250"/>
+        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="182"/>
         <source>Display second Bible verses</source>
         <translation>Zobrazit druhé verše z Bible</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="252"/>
+        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="183"/>
         <source>Custom Scripture References</source>
         <translation>Uživatelské odkazy z Bible</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="254"/>
+        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="184"/>
         <source>Verse Separator:</source>
         <translation>Oddělovač veršů:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="256"/>
+        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="185"/>
         <source>Range Separator:</source>
         <translation>Oddělovač rozsahů:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="258"/>
+        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="186"/>
         <source>List Separator:</source>
         <translation>Oddělovač seznamů:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="260"/>
+        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="187"/>
         <source>End Mark:</source>
         <translation>Ukončovací značka:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="262"/>
+        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="188"/>
         <source>Multiple alternative verse separators may be defined.
 They have to be separated by a vertical bar &quot;|&quot;.
 Please clear this edit line to use the default value.</source>
@@ -847,59 +846,37 @@
 Pro použití výchozí hodnoty smažte tento řádek.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="267"/>
-        <source>Multiple alternative range separators may be defined.
-They have to be separated by a vertical bar &quot;|&quot;.
-Please clear this edit line to use the default value.</source>
-        <translation>Lze definovat více oddělovačů rozsahu.
-Musí být odděleny vislou čárou &quot;|&quot;.
-Pro použití výchozí hodnoty smažte tento řádek.</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="272"/>
-        <source>Multiple alternative list separators may be defined.
-They have to be separated by a vertical bar &quot;|&quot;.
-Please clear this edit line to use the default value.</source>
-        <translation>Lze definovat více oddělovačů seznamu.
-Musí být odděleny vislou čárou &quot;|&quot;.
-Pro použití výchozí hodnoty smažte tento řádek.</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="277"/>
-        <source>Multiple alternative end marks may be defined.
-They have to be separated by a vertical bar &quot;|&quot;.
-Please clear this edit line to use the default value.</source>
-        <translation>Lze definovat více ukončovacích značek.
-Musí být odděleny vislou čárou &quot;|&quot;.
-Pro použití výchozí hodnoty smažte tento řádek.</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="292"/>
+        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="202"/>
         <source>English</source>
         <translation>Čeština</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="282"/>
+        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="195"/>
         <source>Default Bible Language</source>
         <translation>Výchozí jazyk Bible</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="284"/>
+        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="196"/>
         <source>Book name language in search field,
 search results and on display:</source>
         <translation>Jazyk názvů knih ve vyhledávacím poli,
 výsledcích vyhledávání a při zobrazení:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="287"/>
+        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="198"/>
         <source>Bible Language</source>
         <translation>Jazyk Bible</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="289"/>
+        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="200"/>
         <source>Application Language</source>
         <translation>Jazyk aplikace</translation>
     </message>
+    <message>
+        <location filename="openlp/plugins/bibles/lib/biblestab.py" line="164"/>
+        <source>Show verse numbers</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>BiblesPlugin.BookNameDialog</name>
@@ -909,37 +886,37 @@
         <translation>Vybrat název knihy</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/booknamedialog.py" line="97"/>
+        <location filename="openlp/plugins/bibles/forms/booknamedialog.py" line="96"/>
         <source>Current name:</source>
         <translation>Současný název:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/booknamedialog.py" line="99"/>
+        <location filename="openlp/plugins/bibles/forms/booknamedialog.py" line="97"/>
         <source>Corresponding name:</source>
         <translation>Odpovídající název:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/booknamedialog.py" line="101"/>
+        <location filename="openlp/plugins/bibles/forms/booknamedialog.py" line="98"/>
         <source>Show Books From</source>
         <translation>Zobrazit knihy od</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/booknamedialog.py" line="103"/>
+        <location filename="openlp/plugins/bibles/forms/booknamedialog.py" line="99"/>
         <source>Old Testament</source>
         <translation>Starý zákon</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/booknamedialog.py" line="105"/>
+        <location filename="openlp/plugins/bibles/forms/booknamedialog.py" line="100"/>
         <source>New Testament</source>
         <translation>Nový zákon</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/booknamedialog.py" line="107"/>
+        <location filename="openlp/plugins/bibles/forms/booknamedialog.py" line="101"/>
         <source>Apocrypha</source>
         <translation>Apokryfy</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/booknamedialog.py" line="94"/>
+        <location filename="openlp/plugins/bibles/forms/booknamedialog.py" line="93"/>
         <source>The following book name cannot be matched up internally. Please select the corresponding name from the list.</source>
         <translation>Pro následující název knihy není odpovídající vnitřní název. Vyberte prosím odpovídající název ze seznamu.    </translation>
     </message>
@@ -947,7 +924,7 @@
 <context>
     <name>BiblesPlugin.BookNameForm</name>
     <message>
-        <location filename="openlp/plugins/bibles/forms/booknameform.py" line="125"/>
+        <location filename="openlp/plugins/bibles/forms/booknameform.py" line="115"/>
         <source>You need to select a book.</source>
         <translation>Je potřeba vybrat knihu.</translation>
     </message>
@@ -955,88 +932,87 @@
 <context>
     <name>BiblesPlugin.CSVBible</name>
     <message>
-        <location filename="openlp/plugins/bibles/lib/csvbible.py" line="112"/>
+        <location filename="openlp/plugins/bibles/lib/csvbible.py" line="113"/>
         <source>Importing books... %s</source>
         <translation>Importuji knihy... %s</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/csvbible.py" line="156"/>
-        <source>Importing verses from %s...</source>
-        <comment>Importing verses from &lt;book name&gt;...</comment>
-        <translation>Importuji verše z %s...</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/bibles/lib/csvbible.py" line="165"/>
+        <location filename="openlp/plugins/bibles/lib/csvbible.py" line="161"/>
         <source>Importing verses... done.</source>
         <translation>Importuji verše... hotovo.</translation>
     </message>
+    <message>
+        <location filename="openlp/plugins/bibles/lib/csvbible.py" line="152"/>
+        <source>Importing verses from %s... Importing verses from &lt;book name&gt;...</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>BiblesPlugin.EditBibleForm</name>
     <message>
-        <location filename="openlp/plugins/bibles/forms/editbibledialog.py" line="147"/>
+        <location filename="openlp/plugins/bibles/forms/editbibledialog.py" line="132"/>
         <source>Bible Editor</source>
         <translation>Editor Bible</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/editbibledialog.py" line="153"/>
+        <location filename="openlp/plugins/bibles/forms/editbibledialog.py" line="136"/>
         <source>License Details</source>
         <translation>Podrobnosti k licenci</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/editbibledialog.py" line="155"/>
+        <location filename="openlp/plugins/bibles/forms/editbibledialog.py" line="137"/>
         <source>Version name:</source>
         <translation>Název verze:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/editbibledialog.py" line="157"/>
+        <location filename="openlp/plugins/bibles/forms/editbibledialog.py" line="138"/>
         <source>Copyright:</source>
         <translation>Autorská práva:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/editbibledialog.py" line="159"/>
+        <location filename="openlp/plugins/bibles/forms/editbibledialog.py" line="139"/>
         <source>Permissions:</source>
         <translation>Povolení:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/editbibledialog.py" line="161"/>
+        <location filename="openlp/plugins/bibles/forms/editbibledialog.py" line="140"/>
         <source>Default Bible Language</source>
         <translation>Výchozí jazyk Bible</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/editbibledialog.py" line="163"/>
+        <location filename="openlp/plugins/bibles/forms/editbibledialog.py" line="141"/>
         <source>Book name language in search field, search results and on display:</source>
         <translation>Jazyk názvů knih ve vyhledávacím poli, výsledcích vyhledávání a při zobrazení:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/editbibledialog.py" line="167"/>
+        <location filename="openlp/plugins/bibles/forms/editbibledialog.py" line="144"/>
         <source>Global Settings</source>
         <translation>Globální nastavení</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/editbibledialog.py" line="169"/>
+        <location filename="openlp/plugins/bibles/forms/editbibledialog.py" line="145"/>
         <source>Bible Language</source>
         <translation>Jazyk Bible</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/editbibledialog.py" line="171"/>
+        <location filename="openlp/plugins/bibles/forms/editbibledialog.py" line="148"/>
         <source>Application Language</source>
         <translation>Jazyk aplikace</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/editbibledialog.py" line="174"/>
+        <location filename="openlp/plugins/bibles/forms/editbibledialog.py" line="150"/>
         <source>English</source>
-        <translation>Angličtina</translation>
+        <translation>Čeština</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/editbibleform.py" line="83"/>
+        <location filename="openlp/plugins/bibles/forms/editbibleform.py" line="80"/>
         <source>This is a Web Download Bible.
 It is not possible to customize the Book Names.</source>
         <translation>Toto je Bible stahovaná z Internetu.
 Není možné přizpůsobit si názvy knih.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/editbibleform.py" line="88"/>
+        <location filename="openlp/plugins/bibles/forms/editbibleform.py" line="85"/>
         <source>To use the customized book names, &quot;Bible language&quot; must be selected on the Meta Data tab or, if &quot;Global settings&quot; is selected, on the Bible page in Configure OpenLP.</source>
         <translation>Pro přizpůsobení názvů knih musí být vybrán &quot;Jazyk Bible&quot; v kartě Meta Data nebo na stránce Bible v Nastavení OpenLP, pokud je vybráno &quot;Globální nastavení&quot;.</translation>
     </message>
@@ -1044,38 +1020,38 @@
 <context>
     <name>BiblesPlugin.HTTPBible</name>
     <message>
-        <location filename="openlp/plugins/bibles/lib/http.py" line="514"/>
+        <location filename="openlp/plugins/bibles/lib/http.py" line="474"/>
         <source>Registering Bible and loading books...</source>
         <translation>Registruji Bibli a stahuji knihy...</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/http.py" line="539"/>
+        <location filename="openlp/plugins/bibles/lib/http.py" line="498"/>
         <source>Registering Language...</source>
         <translation>Registruji jazyk...</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/http.py" line="555"/>
+        <location filename="openlp/plugins/bibles/lib/http.py" line="511"/>
         <source>Importing %s...</source>
         <comment>Importing &lt;book name&gt;...</comment>
         <translation>Importuji %s...</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/http.py" line="722"/>
+        <location filename="openlp/plugins/bibles/lib/http.py" line="655"/>
         <source>Download Error</source>
         <translation>Chyba stahování</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/http.py" line="722"/>
+        <location filename="openlp/plugins/bibles/lib/http.py" line="655"/>
         <source>There was a problem downloading your verse selection. Please check your Internet connection, and if this error continues to occur please consider reporting a bug.</source>
         <translation>Při stahování výběru veršů se vyskytl problém. Prosím prověřte své internetové připojení. Pokud se tato chyba stále objevuje, zvašte prosím nahlášení chyby.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/http.py" line="729"/>
+        <location filename="openlp/plugins/bibles/lib/http.py" line="661"/>
         <source>Parse Error</source>
         <translation>Chyba zpracování</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/http.py" line="729"/>
+        <location filename="openlp/plugins/bibles/lib/http.py" line="661"/>
         <source>There was a problem extracting your verse selection. If this error continues to occur please consider reporting a bug.</source>
         <translation>Při rozbalování výběru veršů se vyskytl problém. Pokud se tato chyba stále objevuje, zvašte prosím nahlášení chyby.</translation>
     </message>
@@ -1083,167 +1059,162 @@
 <context>
     <name>BiblesPlugin.ImportWizardForm</name>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="351"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="281"/>
         <source>Bible Import Wizard</source>
         <translation>Průvodce importem Bible</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="355"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="284"/>
         <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>Tento průvodce usnadní import Biblí z různých formátů. Proces importu se spustí klepnutím níže na tlačítko další. Potom vyberte formát, ze kterého se bude Bible importovat.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="366"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="295"/>
         <source>Web Download</source>
         <translation>Stáhnutí z www</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="379"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="301"/>
         <source>Location:</source>
         <translation>Umístění:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="381"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="302"/>
         <source>Crosswalk</source>
         <translation>Crosswalk</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="383"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="304"/>
         <source>BibleGateway</source>
         <translation>BibleGateway</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="387"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="308"/>
         <source>Bible:</source>
         <translation>Bible:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="389"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="309"/>
         <source>Download Options</source>
         <translation>Volby stahování</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="392"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="311"/>
         <source>Server:</source>
         <translation>Server:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="394"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="312"/>
         <source>Username:</source>
         <translation>Uživatelské jméno:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="396"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="313"/>
         <source>Password:</source>
         <translation>Heslo:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="398"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="314"/>
         <source>Proxy Server (Optional)</source>
         <translation>Proxy Server (Volitelné)</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="402"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="317"/>
         <source>License Details</source>
-        <translation>Podrobnosti licence</translation>
+        <translation>Podrobnosti k licenci</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="404"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="319"/>
         <source>Set up the Bible&apos;s license details.</source>
         <translation>Nastavit podrobnosti k licenci Bible.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="407"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="321"/>
         <source>Version name:</source>
         <translation>Název verze:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="409"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="322"/>
         <source>Copyright:</source>
         <translation>Autorská práva:</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="414"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="325"/>
         <source>Please wait while your Bible is imported.</source>
         <translation>Prosím vyčkejte, než se Bible importuje.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="445"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="351"/>
         <source>You need to specify a file with books of the Bible to use in the import.</source>
         <translation>Je potřeba určit soubor s knihami Bible. Tento soubor se použije při importu.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="452"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="358"/>
         <source>You need to specify a file of Bible verses to import.</source>
         <translation>K importu je třeba určit soubor s veršemi Bible.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="483"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="378"/>
         <source>You need to specify a version name for your Bible.</source>
         <translation>Je nutno uvést název verze Bible.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="489"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="384"/>
         <source>You need to set a copyright for your Bible. Bibles in the Public Domain need to be marked as such.</source>
-        <translation>K Bibli je potřeba nastavit autorská práva. Bible, které jsou volná díla, je nutno takto označit.</translation>
+        <translation>K Bibli je potřeba nastavit autorská práva. Bible, které jsou volná díla (Public Domain), je nutno takto označit.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="505"/>
+        <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="399"/>
         <source>Bible Exists</source>
         <translation>Bible existuje</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/fo

Follow ups