openlp-core team mailing list archive

Thread
Date

[Merge] lp:~raoul-snyman/openlp/i18n into lp:openlp

To: mp+53167@xxxxxxxxxxxxxxxxxx
From: Raoul Snyman <raoul.snyman@xxxxxxxxxxxxxxxxxxxxxxxx>
Date: Sun, 13 Mar 2011 10:54:31 -0000
Reply-to: mp+53167@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/i18n into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/i18n/+merge/53167

Updated the translations.
-- 
The attached diff has been truncated due to its size.
https://code.launchpad.net/~raoul-snyman/openlp/i18n/+merge/53167
Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/i18n into lp:openlp.

=== modified file 'openlp/core/ui/displaytagdialog.py'
--- openlp/core/ui/displaytagdialog.py	2011-02-24 15:54:21 +0000
+++ openlp/core/ui/displaytagdialog.py	2011-03-13 10:53:56 +0000
@@ -143,11 +143,11 @@
         self.tagTableWidget.horizontalHeaderItem(0).setText(
             translate('OpenLP.DisplayTagDialog', 'Description'))
         self.tagTableWidget.horizontalHeaderItem(1).setText(
-            translate('OpenLP.DisplayTagDialog', 'Tag id'))
+            translate('OpenLP.DisplayTagDialog', 'Tag Id'))
         self.tagTableWidget.horizontalHeaderItem(2).setText(
-            translate('OpenLP.DisplayTagDialog', 'Start Html'))
+            translate('OpenLP.DisplayTagDialog', 'Start HTML'))
         self.tagTableWidget.horizontalHeaderItem(3).setText(
-            translate('OpenLP.DisplayTagDialog', 'End Html'))
+            translate('OpenLP.DisplayTagDialog', 'End HTML'))
         self.tagTableWidget.setColumnWidth(0, 120)
         self.tagTableWidget.setColumnWidth(1, 40)
         self.tagTableWidget.setColumnWidth(2, 240)

=== modified file 'resources/i18n/af.ts'
--- resources/i18n/af.ts	2011-03-09 16:16:40 +0000
+++ resources/i18n/af.ts	2011-03-13 10:53:56 +0000
@@ -212,7 +212,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="540"/>
+        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="539"/>
         <source>You cannot combine single and dual Bible verse search results. Do you want to delete your search results and start a new search?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -841,59 +841,59 @@
 <context>
     <name>ImagePlugin</name>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="45"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="44"/>
         <source>&lt;strong&gt;Image Plugin&lt;/strong&gt;&lt;br /&gt;The image plugin provides displaying of images.&lt;br /&gt;One of the distinguishing features of this plugin is the ability to group a number of images together in the service manager, making the displaying of multiple images easier. This plugin can also make use of OpenLP&apos;s &quot;timed looping&quot; feature to create a slide show that runs automatically. In addition to this, images from the plugin can be used to override the current theme&apos;s background, which renders text-based items like songs with the selected image as a background instead of the background provided by the theme.</source>
         <translation>&lt;strong&gt;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="72"/>
         <source>Load a new Image</source>
         <translation>Laai &apos;n nuwe Beeld</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="75"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="74"/>
         <source>Add a new Image</source>
         <translation>Voeg &apos;n nuwe Beeld by</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="76"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="75"/>
         <source>Edit the selected Image</source>
         <translation>Redigeer die geselekteerde Beeld</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="77"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="76"/>
         <source>Delete the selected Image</source>
         <translation>Wis die geselekteerde Beeld uit</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="78"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="77"/>
         <source>Preview the selected Image</source>
         <translation>Sien voorskou van die geselekteerde Beeld</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="79"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="78"/>
         <source>Send the selected Image live</source>
         <translation>Stuur die geselekteerde Beeld regstreeks</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="80"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="79"/>
         <source>Add the selected Image to the service</source>
         <translation>Voeg die geselekteerde Beeld by die diens</translation>
     </message>
     <message>
+        <location filename="openlp/plugins/images/imageplugin.py" line="63"/>
+        <source>Image</source>
+        <comment>name singular</comment>
+        <translation type="unfinished">Beeld</translation>
+    </message>
+    <message>
         <location filename="openlp/plugins/images/imageplugin.py" line="64"/>
-        <source>Image</source>
-        <comment>name singular</comment>
-        <translation type="unfinished">Beeld</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="65"/>
         <source>Images</source>
         <comment>name plural</comment>
         <translation type="unfinished">Beelde</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="69"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="68"/>
         <source>Images</source>
         <comment>container title</comment>
         <translation>Beelde</translation>
@@ -950,59 +950,59 @@
 <context>
     <name>MediaPlugin</name>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="70"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="93"/>
         <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="89"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="112"/>
         <source>Load a new Media</source>
         <translation>Laai nuwe Media</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="91"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="114"/>
         <source>Add a new Media</source>
         <translation>Voeg nuwe Media by</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="92"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="115"/>
         <source>Edit the selected Media</source>
         <translation>Redigeer die geselekteerde Media</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="93"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="116"/>
         <source>Delete the selected Media</source>
         <translation>Wis die geselekteerde Media uit</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="94"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="117"/>
         <source>Preview the selected Media</source>
         <translation>Sien voorskou van die geselekteerde Media</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="95"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="118"/>
         <source>Send the selected Media live</source>
         <translation>Stuur die geselekteerde Media regstreeks</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="96"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="119"/>
         <source>Add the selected Media to the service</source>
         <translation>Voeg die geselekteerde Media by die diens</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="80"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="103"/>
         <source>Media</source>
         <comment>name singular</comment>
         <translation type="unfinished">Media</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="81"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="104"/>
         <source>Media</source>
         <comment>name plural</comment>
         <translation type="unfinished">Media</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="85"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="108"/>
         <source>Media</source>
         <comment>container title</comment>
         <translation type="unfinished">Media</translation>
@@ -1107,17 +1107,6 @@
         <translation>bou %s</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/aboutdialog.py" line="224"/>
-        <source>Copyright &#xa9; 2004-2011 Raoul Snyman
-Portions copyright &#xa9; 2004-2011 Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri,
-Meinert Jordan, Andreas Preikschat, Christian Richter, Philip
-Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, CarstennTinggaard, Frode Woldsund</source>
-        <translation>Kopiereg Â© 2004-2011 Raoul Snyman
-Gedeeltelike kopiereg Â© 2004-2011 Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri,
-Meinert Jordan, Andreas Preikschat, Christian Richter, Philip
-Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, CarstennTinggaard, Frode Woldsund</translation>
-    </message>
-    <message>
         <location filename="openlp/core/ui/aboutdialog.py" line="231"/>
         <source>This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.</source>
         <translation>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>
@@ -1192,6 +1181,15 @@
     He has set us free.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="openlp/core/ui/aboutdialog.py" line="224"/>
+        <source>Copyright &#xa9; 2004-2011 Raoul Snyman
+Portions copyright &#xa9; 2004-2011 Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri,
+Meinert Jordan, Andreas Preikschat, Christian Richter, Philip
+Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carsten
+Tinggaard, Frode Woldsund</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OpenLP.AdvancedTab</name>
@@ -1295,18 +1293,18 @@
     </message>
     <message>
         <location filename="openlp/core/ui/displaytagdialog.py" line="145"/>
-        <source>Tag id</source>
-        <translation>Etiket id</translation>
+        <source>Tag Id</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/core/ui/displaytagdialog.py" line="147"/>
-        <source>Start Html</source>
-        <translation>Begin Html</translation>
+        <source>Start HTML</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/core/ui/displaytagdialog.py" line="149"/>
-        <source>End Html</source>
-        <translation>Eind-Html</translation>
+        <source>End HTML</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1471,151 +1469,200 @@
 <context>
     <name>OpenLP.FirstTimeLanguageForm</name>
     <message>
-        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="60"/>
-        <source>Initial Set up Language</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="62"/>
-        <source>Select the language you&apos;d like to use in OpenLP.</source>
+        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="61"/>
+        <source>Select Translation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="63"/>
+        <source>Choose the translation you&apos;d like to use in OpenLP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="65"/>
+        <source>Translation:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpenLP.FirstTimeWizard</name>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="154"/>
-        <source>Songs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="63"/>
-        <source>Bibles</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="64"/>
-        <source>Themes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="65"/>
-        <source>Starting Updates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="67"/>
-        <source>Downloading %s</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="140"/>
+        <location filename="openlp/core/ui/firsttimeform.py" line="61"/>
+        <source>Downloading %s...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="212"/>
+        <source>Download complete. Click the finish button to start OpenLP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="221"/>
+        <source>Enabling selected plugins...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="244"/>
+        <source>Overwrite Existing Songs?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="244"/>
+        <source>Your songs database already exists and your current songs will be permanently lost, are you sure you want to replace it ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="193"/>
         <source>First Time Wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="142"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="195"/>
         <source>Welcome to the First Time Wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="146"/>
-        <source>This wizard will help you to configure OpenLP for initial use . Click the next button below to start the process of selection your initial options. </source>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="199"/>
+        <source>This wizard will help you to configure OpenLP for initial use. Click the next button below to start the process of selection your initial options. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="150"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="203"/>
         <source>Activate required Plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="152"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="205"/>
         <source>Select the Plugins you wish to use. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="155"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="207"/>
+        <source>Songs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="208"/>
         <source>Custom Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="157"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="210"/>
         <source>Bible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="158"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="211"/>
         <source>Images</source>
         <translation type="unfinished">Beelde</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="160"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="213"/>
         <source>Presentations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="162"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="215"/>
         <source>Media (Audio and Video)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="164"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="217"/>
         <source>Allow remote access</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="166"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="219"/>
         <source>Monitor Song Usage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="168"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="221"/>
         <source>Allow Alerts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="170"/>
-        <source>Download Samples from OpenLP.org</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="172"/>
-        <source>Select samples to downlaod and install for use.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="175"/>
-        <source>No Internet connection found so unable to download any default files.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="178"/>
-        <source>Download Example Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="180"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="223"/>
+        <source>No Internet Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="225"/>
+        <source>Unable to detect an Internet connection.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="228"/>
+        <source>No Internet connection was found. The First Time Wizard needs an Internet connection in order to be able to download sample songs, Bibles and themes.
+
+To re-run the First Time Wizard and import this sample data at a later stage, press the cancel button now, check your Internet connection, and restart OpenLP.
+
+To cancel the First Time Wizard completely, press the finish button now.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="236"/>
+        <source>Sample Songs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="238"/>
+        <source>Select and download public domain songs.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="240"/>
+        <source>Sample Bibles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="242"/>
+        <source>Select and download free Bibles.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="244"/>
+        <source>Sample Themes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="246"/>
+        <source>Select and download sample themes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="248"/>
         <source>Default Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="182"/>
-        <source>Set up default values to be used by OpenLP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="184"/>
-        <source>Default output display</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="186"/>
-        <source>Select the default Theme</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="188"/>
-        <source>Press finish to apply all your changes and start OpenLP</source>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="250"/>
+        <source>Set up default settings to be used by OpenLP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="252"/>
+        <source>Setting Up And Importing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="254"/>
+        <source>Please wait while OpenLP is set up and your data is imported.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="256"/>
+        <source>Default output display:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="258"/>
+        <source>Select default theme:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="260"/>
+        <source>Starting configuration process...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1740,12 +1787,12 @@
 <context>
     <name>OpenLP.LanguageManager</name>
     <message>
-        <location filename="openlp/core/utils/languagemanager.py" line="126"/>
+        <location filename="openlp/core/utils/languagemanager.py" line="130"/>
         <source>Language</source>
         <translation>Taal</translation>
     </message>
     <message>
-        <location filename="openlp/core/utils/languagemanager.py" line="126"/>
+        <location filename="openlp/core/utils/languagemanager.py" line="130"/>
         <source>Please restart OpenLP to use your new language setting.</source>
         <translation>Herlaai asseblief OpenLP om die nuwe taal instelling te gebruik.</translation>
     </message>
@@ -2051,17 +2098,12 @@
         <translation>&amp;Web Tuiste</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="428"/>
-        <source>&amp;Auto Detect</source>
-        <translation>Verklik Outom&amp;aties</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="430"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="434"/>
         <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="434"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="430"/>
         <source>Set the interface language to %s</source>
         <translation>Verstel die koppelvlak taal na %s</translation>
     </message>
@@ -2106,7 +2148,7 @@
         <translation>Verstel die skou modus na Regstreeks.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="644"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="642"/>
         <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>
@@ -2115,22 +2157,22 @@
 Die nuutste weergawe kan afgelaai word vanaf http://openlp.org/.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="648"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="646"/>
         <source>OpenLP Version Updated</source>
         <translation>OpenLP Weergawe is Opdateer</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="686"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="684"/>
         <source>OpenLP Main Display Blanked</source>
         <translation>OpenLP Hoof Vertoning Blanko</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="686"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="684"/>
         <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="895"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="893"/>
         <source>Default Theme: %s</source>
         <translation>Verstek Tema: %s</translation>
     </message>
@@ -2146,12 +2188,12 @@
         <translation>Konfigureer Kortpaaie</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="817"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="815"/>
         <source>Close OpenLP</source>
         <translation>Mook OpenLP toe</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="817"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="815"/>
         <source>Are you sure you want to close OpenLP?</source>
         <translation>Maak OpenLP sekerlik toe?</translation>
     </message>
@@ -2180,11 +2222,16 @@
         <source>&amp;Configure Display Tags</source>
         <translation>Konfigureer Vertoon Haakies</translation>
     </message>
+    <message>
+        <location filename="openlp/core/ui/mainwindow.py" line="432"/>
+        <source>&amp;Autodetect</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OpenLP.MediaManagerItem</name>
     <message>
-        <location filename="openlp/core/lib/__init__.py" line="287"/>
+        <location filename="openlp/core/lib/__init__.py" line="286"/>
         <source>No Items Selected</source>
         <translation>Geen item geselekteer nie</translation>
     </message>
@@ -2462,29 +2509,29 @@
         <translation>&amp;Verander Item Tema</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="493"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="521"/>
         <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="525"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="553"/>
         <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="1051"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="1079"/>
         <source>Missing Display Handler</source>
         <translation>Vermisde Vertoon Hanteerder</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="1017"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="1045"/>
         <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="1051"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="1079"/>
         <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>
@@ -2514,7 +2561,7 @@
         <translation type="unfinished">Maak LÃªer oop</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="466"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="494"/>
         <source>OpenLP Service Files (*.osz)</source>
         <translation>OpenLP Diens LÃªers (*.osz)</translation>
     </message>
@@ -3996,17 +4043,17 @@
         <translation>Uitvoer LÃªer Ligging</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="92"/>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="101"/>
         <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="114"/>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="123"/>
         <source>Report Creation</source>
         <translation>Verslag Skepping</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="114"/>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="123"/>
         <source>Report 
 %s 
 has been successfully created. </source>
@@ -4014,83 +4061,93 @@
  %s 
 was suksesvol geskep.</translation>
     </message>
+    <message>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="92"/>
+        <source>Output Path Not Selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="92"/>
+        <source>You have not set a valid output location for your song usage report. Please select an existing path on your computer.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SongsPlugin</name>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="104"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="103"/>
         <source>&amp;Song</source>
         <translation>&amp;Lied</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="85"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="84"/>
         <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="183"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="182"/>
         <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="126"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="125"/>
         <source>&amp;Re-index Songs</source>
         <translation>He&amp;r-indeks Liedere</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="128"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="127"/>
         <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="141"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="140"/>
         <source>Reindexing songs...</source>
         <translation>Besig om liedere indek te herskep...</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="238"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="237"/>
         <source>Add a new Song</source>
         <translation>Voeg &apos;n nuwe Lied by</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="239"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="238"/>
         <source>Edit the selected Song</source>
         <translation>Redigeer die geselekteerde Lied</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="240"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="239"/>
         <source>Delete the selected Song</source>
         <translation>Wis die geselekteerde Lied uit</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="241"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="240"/>
         <source>Preview the selected Song</source>
         <translation>Skou die geselekteerde Lied</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="242"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="241"/>
         <source>Send the selected Song live</source>
         <translation>Stuur die geselekteerde Lied regstreeks</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="243"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="242"/>
         <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="227"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="226"/>
         <source>Song</source>
         <comment>name singular</comment>
         <translation type="unfinished">Lied</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="228"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="227"/>
         <source>Songs</source>
         <comment>name plural</comment>
         <translation type="unfinished">Liedere</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="232"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="231"/>
         <source>Songs</source>
         <comment>container title</comment>
         <translation type="unfinished">Liedere</translation>
@@ -4188,7 +4245,7 @@
 Die enkodering is verantwoordelik vir die korrekte karrakter voorstelling.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="106"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="105"/>
         <source>Exports songs using the export wizard.</source>
         <translation>Voer liedere uit deur gebruik te maak van die uitvoer gids.</translation>
     </message>
@@ -4644,12 +4701,12 @@
         <translation>Lirieke</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="318"/>
+        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="321"/>
         <source>Delete Song(s)?</source>
         <translation>Wis Lied(ere) uit?</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="400"/>
+        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="403"/>
         <source>CCLI License: </source>
         <translation>CCLI Lisensie:</translation>
     </message>
@@ -4659,7 +4716,7 @@
         <translation>Volledige Lied</translation>
     </message>
     <message numerus="yes">
-        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="318"/>
+        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="321"/>
         <source>Are you sure you want to delete the %n selected song(s)?</source>
         <translation>
             <numerusform>Wis regtig die %n geselekteerde lied(ere)?</numerusform>

=== modified file 'resources/i18n/de.ts'
--- resources/i18n/de.ts	2011-03-09 16:16:40 +0000
+++ resources/i18n/de.ts	2011-03-13 10:53:56 +0000
@@ -211,7 +211,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="540"/>
+        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="539"/>
         <source>You cannot combine single and dual Bible verse search results. Do you want to delete your search results and start a new search?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -834,60 +834,60 @@
 <context>
     <name>ImagePlugin</name>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="45"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="44"/>
         <source>&lt;strong&gt;Image Plugin&lt;/strong&gt;&lt;br /&gt;The image plugin provides displaying of images.&lt;br /&gt;One of the distinguishing features of this plugin is the ability to group a number of images together in the service manager, making the displaying of multiple images easier. This plugin can also make use of OpenLP&apos;s &quot;timed looping&quot; feature to create a slide show that runs automatically. In addition to this, images from the plugin can be used to override the current theme&apos;s background, which renders text-based items like songs with the selected image as a background instead of the background provided by the theme.</source>
         <translation>&lt;strong&gt;Bilder Erweiterung&lt;/strong&gt;&lt;br /&gt;Die Erweiterung Bilder ermÃ¶glicht die Anzeige von Bildern.&lt;br /&gt;Eine der besonderen Eigenschaften dieser Erweiterung ist die MÃ¶glichkeit, in der Ablaufverwaltung, mehrere Bilder zu einer Gruppe zusammen zu fassen. Dies vereinfacht die die Anzeige mehrerer Bilder. Ebenso kann mit Hilfe der Zeitschleife, sehr einfach eine Diaschau erzeugt werden, welche dann automatisch ablÃ¤uft. Des weiteren kÃ¶nnen mit dieser Erweiterung Bilder benutzt werden, um das Hintergrundbild des aktuellen Design zu ersetzen.</translation>
     </message>
     <message>
+        <location filename="openlp/plugins/images/imageplugin.py" line="63"/>
+        <source>Image</source>
+        <comment>name singular</comment>
+        <translation>Bild</translation>
+    </message>
+    <message>
         <location filename="openlp/plugins/images/imageplugin.py" line="64"/>
-        <source>Image</source>
-        <comment>name singular</comment>
-        <translation>Bild</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="65"/>
         <source>Images</source>
         <comment>name plural</comment>
         <translation>Bilder</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="69"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="68"/>
         <source>Images</source>
         <comment>container title</comment>
         <translation>Bilder</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="73"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="72"/>
         <source>Load a new Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="75"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="74"/>
         <source>Add a new Image</source>
         <translation>FÃ¼ge eine neues Bild hinzu</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="76"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="75"/>
         <source>Edit the selected Image</source>
         <translation>Bearbeite das ausgewÃ¤hlte Bild</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="77"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="76"/>
         <source>Delete the selected Image</source>
         <translation>LÃ¶sche da ausgewÃ¤hlte Bild</translation>
     </message>
     <message>
+        <location filename="openlp/plugins/images/imageplugin.py" line="77"/>
+        <source>Preview the selected Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="openlp/plugins/images/imageplugin.py" line="78"/>
-        <source>Preview the selected Image</source>
+        <source>Send the selected Image live</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/plugins/images/imageplugin.py" line="79"/>
-        <source>Send the selected Image live</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="80"/>
         <source>Add the selected Image to the service</source>
         <translation type="unfinished"></translation>
     </message>
@@ -943,60 +943,60 @@
 <context>
     <name>MediaPlugin</name>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="70"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="93"/>
         <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;Erweiterung Medien&lt;/strong&gt;&lt;br /&gt;Die Erweiterung Medien ermÃ¶glicht es Audio- und Videodateien abzuspielen.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="80"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="103"/>
         <source>Media</source>
         <comment>name singular</comment>
         <translation>Medien</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="81"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="104"/>
         <source>Media</source>
         <comment>name plural</comment>
         <translation>Medien</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="85"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="108"/>
         <source>Media</source>
         <comment>container title</comment>
         <translation>Medien</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="89"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="112"/>
         <source>Load a new Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="91"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="114"/>
         <source>Add a new Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="92"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="115"/>
         <source>Edit the selected Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="93"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="116"/>
         <source>Delete the selected Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="94"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="117"/>
         <source>Preview the selected Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="95"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="118"/>
         <source>Send the selected Media live</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="96"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="119"/>
         <source>Add the selected Media to the service</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1100,14 +1100,6 @@
         <translation> build %s</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/aboutdialog.py" line="224"/>
-        <source>Copyright &#xa9; 2004-2011 Raoul Snyman
-Portions copyright &#xa9; 2004-2011 Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri,
-Meinert Jordan, Andreas Preikschat, Christian Richter, Philip
-Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, CarstennTinggaard, Frode Woldsund</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="openlp/core/ui/aboutdialog.py" line="231"/>
         <source>This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.</source>
         <translation type="unfinished"></translation>
@@ -1182,6 +1174,15 @@
     He has set us free.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="openlp/core/ui/aboutdialog.py" line="224"/>
+        <source>Copyright &#xa9; 2004-2011 Raoul Snyman
+Portions copyright &#xa9; 2004-2011 Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri,
+Meinert Jordan, Andreas Preikschat, Christian Richter, Philip
+Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carsten
+Tinggaard, Frode Woldsund</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OpenLP.AdvancedTab</name>
@@ -1285,18 +1286,18 @@
     </message>
     <message>
         <location filename="openlp/core/ui/displaytagdialog.py" line="145"/>
-        <source>Tag id</source>
-        <translation type="unfinished">Tag ID</translation>
+        <source>Tag Id</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/core/ui/displaytagdialog.py" line="147"/>
-        <source>Start Html</source>
-        <translation type="unfinished">Anfangs HTML</translation>
+        <source>Start HTML</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/core/ui/displaytagdialog.py" line="149"/>
-        <source>End Html</source>
-        <translation type="unfinished">End HTML</translation>
+        <source>End HTML</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1435,151 +1436,200 @@
 <context>
     <name>OpenLP.FirstTimeLanguageForm</name>
     <message>
-        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="60"/>
-        <source>Initial Set up Language</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="62"/>
-        <source>Select the language you&apos;d like to use in OpenLP.</source>
+        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="61"/>
+        <source>Select Translation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="63"/>
+        <source>Choose the translation you&apos;d like to use in OpenLP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="65"/>
+        <source>Translation:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpenLP.FirstTimeWizard</name>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="154"/>
-        <source>Songs</source>
-        <translation type="unfinished">Lieder</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="63"/>
-        <source>Bibles</source>
-        <translation type="unfinished">Bibeln</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="64"/>
-        <source>Themes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="65"/>
-        <source>Starting Updates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="67"/>
-        <source>Downloading %s</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="140"/>
+        <location filename="openlp/core/ui/firsttimeform.py" line="61"/>
+        <source>Downloading %s...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="212"/>
+        <source>Download complete. Click the finish button to start OpenLP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="221"/>
+        <source>Enabling selected plugins...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="244"/>
+        <source>Overwrite Existing Songs?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="244"/>
+        <source>Your songs database already exists and your current songs will be permanently lost, are you sure you want to replace it ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="193"/>
         <source>First Time Wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="142"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="195"/>
         <source>Welcome to the First Time Wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="146"/>
-        <source>This wizard will help you to configure OpenLP for initial use . Click the next button below to start the process of selection your initial options. </source>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="199"/>
+        <source>This wizard will help you to configure OpenLP for initial use. Click the next button below to start the process of selection your initial options. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="150"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="203"/>
         <source>Activate required Plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="152"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="205"/>
         <source>Select the Plugins you wish to use. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="155"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="207"/>
+        <source>Songs</source>
+        <translation type="unfinished">Lieder</translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="208"/>
         <source>Custom Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="157"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="210"/>
         <source>Bible</source>
         <translation type="unfinished">Bibeltext</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="158"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="211"/>
         <source>Images</source>
         <translation type="unfinished">Bilder</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="160"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="213"/>
         <source>Presentations</source>
         <translation type="unfinished">PrÃ¤sentationen</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="162"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="215"/>
         <source>Media (Audio and Video)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="164"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="217"/>
         <source>Allow remote access</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="166"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="219"/>
         <source>Monitor Song Usage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="168"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="221"/>
         <source>Allow Alerts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="170"/>
-        <source>Download Samples from OpenLP.org</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="172"/>
-        <source>Select samples to downlaod and install for use.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="175"/>
-        <source>No Internet connection found so unable to download any default files.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="178"/>
-        <source>Download Example Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="180"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="223"/>
+        <source>No Internet Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="225"/>
+        <source>Unable to detect an Internet connection.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="228"/>
+        <source>No Internet connection was found. The First Time Wizard needs an Internet connection in order to be able to download sample songs, Bibles and themes.
+
+To re-run the First Time Wizard and import this sample data at a later stage, press the cancel button now, check your Internet connection, and restart OpenLP.
+
+To cancel the First Time Wizard completely, press the finish button now.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="236"/>
+        <source>Sample Songs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="238"/>
+        <source>Select and download public domain songs.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="240"/>
+        <source>Sample Bibles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="242"/>
+        <source>Select and download free Bibles.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="244"/>
+        <source>Sample Themes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="246"/>
+        <source>Select and download sample themes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="248"/>
         <source>Default Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="182"/>
-        <source>Set up default values to be used by OpenLP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="184"/>
-        <source>Default output display</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="186"/>
-        <source>Select the default Theme</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="188"/>
-        <source>Press finish to apply all your changes and start OpenLP</source>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="250"/>
+        <source>Set up default settings to be used by OpenLP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="252"/>
+        <source>Setting Up And Importing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="254"/>
+        <source>Please wait while OpenLP is set up and your data is imported.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="256"/>
+        <source>Default output display:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="258"/>
+        <source>Select default theme:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="260"/>
+        <source>Starting configuration process...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1704,12 +1754,12 @@
 <context>
     <name>OpenLP.LanguageManager</name>
     <message>
-        <location filename="openlp/core/utils/languagemanager.py" line="126"/>
+        <location filename="openlp/core/utils/languagemanager.py" line="130"/>
         <source>Language</source>
         <translation>Sprache</translation>
     </message>
     <message>
-        <location filename="openlp/core/utils/languagemanager.py" line="126"/>
+        <location filename="openlp/core/utils/languagemanager.py" line="130"/>
         <source>Please restart OpenLP to use your new language setting.</source>
         <translation>Bitte starten Sie OpenLP neu, um die neue Spracheinstellung zu verwenden.</translation>
     </message>
@@ -2015,17 +2065,12 @@
         <translation>&amp;Webseite</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="428"/>
-        <source>&amp;Auto Detect</source>
-        <translation>&amp;Automatische Auswahl</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="430"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="434"/>
         <source>Use the system language, if available.</source>
         <translation>Die Systemsprache, sofern diese verfÃ¼gbar ist, verwenden.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="434"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="430"/>
         <source>Set the interface language to %s</source>
         <translation>Die Sprache von OpenLP auf %s stellen</translation>
     </message>
@@ -2070,27 +2115,27 @@
         <translation>Die Ansicht fÃ¼r den Live-Betrieb optimieren.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="648"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="646"/>
         <source>OpenLP Version Updated</source>
         <translation>Neue OpenLP Version verfÃ¼gbar</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="686"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="684"/>
         <source>OpenLP Main Display Blanked</source>
         <translation>Hauptbildschirm abgedunkelt</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="686"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="684"/>
         <source>The Main Display has been blanked out</source>
         <translation>Die Projektion ist momentan nicht aktiv.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="895"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="893"/>
         <source>Default Theme: %s</source>
         <translation>Standarddesign: %s</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="644"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="642"/>
         <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>
@@ -2110,12 +2155,12 @@
         <translation>&amp;TastenkÃ¼rzel einrichten...</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="817"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="815"/>
         <source>Close OpenLP</source>
         <translation>OpenLP beenden</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="817"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="815"/>
         <source>Are you sure you want to close OpenLP?</source>
         <translation>Sind Sie sicher, dass OpenLP beendet werden soll?</translation>
     </message>
@@ -2144,11 +2189,16 @@
         <source>&amp;Configure Display Tags</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="openlp/core/ui/mainwindow.py" line="432"/>
+        <source>&amp;Autodetect</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OpenLP.MediaManagerItem</name>
     <message>
-        <location filename="openlp/core/lib/__init__.py" line="287"/>
+        <location filename="openlp/core/lib/__init__.py" line="286"/>
         <source>No Items Selected</source>
         <translation>Keine Elemente ausgewÃ¤hlt.</translation>
     </message>
@@ -2426,29 +2476,29 @@
         <translation>&amp;Design des Elements Ã¤ndern</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="493"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="521"/>
         <source>File is not a valid service.
 The content encoding is not UTF-8.</source>
         <translation>Die gewÃ¤hlte Datei ist keine gÃ¼ltige OpenLP Ablaufdatei.
 Der Inhalt ist nicht in UTF-8 kodiert.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="525"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="553"/>
         <source>File is not a valid service.</source>
         <translation>Die Datei ist keine gÃ¼ltige OpenLP Ablaufdatei.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="1051"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="1079"/>
         <source>Missing Display Handler</source>
         <translation>Fehlende Anzeigesteuerung</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="1017"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="1045"/>
         <source>Your item cannot be displayed as there is no handler to display it</source>
         <translation>Dieses Element kann nicht angezeigt werden, da es keine Steuerung dafÃ¼r gibt.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="1051"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="1079"/>
         <source>Your item cannot be displayed as the plugin required to display it is missing or inactive</source>
         <translation>Dieses Element kann nicht angezeigt werden, da die zugehÃ¶rige Erweiterung fehlt oder inaktiv ist.</translation>
     </message>
@@ -2478,7 +2528,7 @@
         <translation>Ablauf Ã¶ffnen</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="466"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="494"/>
         <source>OpenLP Service Files (*.osz)</source>
         <translation>OpenLP Ablaufdateien (*.osz)</translation>
     </message>
@@ -3960,69 +4010,79 @@
         <translation>Speicherort</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="92"/>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="101"/>
         <source>usage_detail_%s_%s.txt</source>
         <translation>Aufrufprotokoll_%s_%s.txt</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="114"/>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="123"/>
         <source>Report Creation</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="114"/>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="123"/>
         <source>Report 
 %s 
 has been successfully created. </source>
         <translation></translation>
     </message>
+    <message>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="92"/>
+        <source>Output Path Not Selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="92"/>
+        <source>You have not set a valid output location for your song usage report. Please select an existing path on your computer.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SongsPlugin</name>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="104"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="103"/>
         <source>&amp;Song</source>
         <translation>&amp;Lied</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="85"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="84"/>
         <source>Import songs using the import wizard.</source>
         <translation>Lieder importieren.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="183"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="182"/>
         <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;Erweiterung Lieder&lt;/strong&gt;&lt;br /&gt;Die Erweiterung Lieder ermÃ¶glicht die Darstellung und Verwaltung von Liedtexten.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="126"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="125"/>
         <source>&amp;Re-index Songs</source>
         <translation>Liederverzeichnis &amp;reindizieren</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="128"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="127"/>
         <source>Re-index the songs database to improve searching and ordering.</source>
         <translation>Das reindizieren der Liederdatenbank kann die Suchergebnisse verbessern.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="141"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="140"/>
         <source>Reindexing songs...</source>
         <translation>Reindiziere die Liederdatenbank...</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="227"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="226"/>
         <source>Song</source>
         <comment>name singular</comment>
         <translation>Lied</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="228"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="227"/>
         <source>Songs</source>
         <comment>name plural</comment>
         <translation>Lieder</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="232"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="231"/>
         <source>Songs</source>
         <comment>container title</comment>
         <translation>Lieder</translation>
@@ -4117,37 +4177,37 @@
         <translation></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="106"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="105"/>
         <source>Exports songs using the export wizard.</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="238"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="237"/>
         <source>Add a new Song</source>
         <translation>Erstelle eine neues Lied</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="239"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="238"/>
         <source>Edit the selected Song</source>
         <translation>Bearbeite das ausgewÃ¤hlte Lied</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="240"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="239"/>
         <source>Delete the selected Song</source>
         <translation>LÃ¶sche das ausgewÃ¤hlte Lied</translation>
     </message>
     <message>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="240"/>
+        <source>Preview the selected Song</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="openlp/plugins/songs/songsplugin.py" line="241"/>
-        <source>Preview the selected Song</source>
+        <source>Send the selected Song live</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/plugins/songs/songsplugin.py" line="242"/>
-        <source>Send the selected Song live</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="243"/>
         <source>Add the selected Song to the service</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4603,12 +4663,12 @@
         <translation>Liedtext</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="318"/>
+        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="321"/>
         <source>Delete Song(s)?</source>
         <translation>Lied(er) lÃ¶schen?</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="400"/>
+        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="403"/>
         <source>CCLI License: </source>
         <translation>CCLI-Lizenz: </translation>
     </message>
@@ -4618,7 +4678,7 @@
         <translation>Ganzes Lied</translation>
     </message>
     <message numerus="yes">
-        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="318"/>
+        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="321"/>
         <source>Are you sure you want to delete the %n selected song(s)?</source>
         <translation>
             <numerusform>Sind Sie sicher, dass das Lied gelÃ¶scht werden soll?</numerusform>

=== modified file 'resources/i18n/en.ts'
--- resources/i18n/en.ts	2011-03-09 16:16:40 +0000
+++ resources/i18n/en.ts	2011-03-13 10:53:56 +0000
@@ -210,7 +210,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="540"/>
+        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="539"/>
         <source>You cannot combine single and dual Bible verse search results. Do you want to delete your search results and start a new search?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -829,59 +829,59 @@
 <context>
     <name>ImagePlugin</name>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="45"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="44"/>
         <source>&lt;strong&gt;Image Plugin&lt;/strong&gt;&lt;br /&gt;The image plugin provides displaying of images.&lt;br /&gt;One of the distinguishing features of this plugin is the ability to group a number of images together in the service manager, making the displaying of multiple images easier. This plugin can also make use of OpenLP&apos;s &quot;timed looping&quot; feature to create a slide show that runs automatically. In addition to this, images from the plugin can be used to override the current theme&apos;s background, which renders text-based items like songs with the selected image as a background instead of the background provided by the theme.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="73"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="72"/>
         <source>Load a new Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="openlp/plugins/images/imageplugin.py" line="74"/>
+        <source>Add a new Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="openlp/plugins/images/imageplugin.py" line="75"/>
-        <source>Add a new Image</source>
+        <source>Edit the selected Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/plugins/images/imageplugin.py" line="76"/>
-        <source>Edit the selected Image</source>
+        <source>Delete the selected Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/plugins/images/imageplugin.py" line="77"/>
-        <source>Delete the selected Image</source>
+        <source>Preview the selected Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/plugins/images/imageplugin.py" line="78"/>
-        <source>Preview the selected Image</source>
+        <source>Send the selected Image live</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/plugins/images/imageplugin.py" line="79"/>
-        <source>Send the selected Image live</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="80"/>
         <source>Add the selected Image to the service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="openlp/plugins/images/imageplugin.py" line="63"/>
+        <source>Image</source>
+        <comment>name singular</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="openlp/plugins/images/imageplugin.py" line="64"/>
-        <source>Image</source>
-        <comment>name singular</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="65"/>
         <source>Images</source>
         <comment>name plural</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="69"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="68"/>
         <source>Images</source>
         <comment>container title</comment>
         <translation type="unfinished"></translation>
@@ -937,59 +937,59 @@
 <context>
     <name>MediaPlugin</name>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="70"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="93"/>
         <source>&lt;strong&gt;Media Plugin&lt;/strong&gt;&lt;br /&gt;The media plugin provides playback of audio and video.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="89"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="112"/>
         <source>Load a new Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="91"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="114"/>
         <source>Add a new Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="92"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="115"/>
         <source>Edit the selected Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="93"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="116"/>
         <source>Delete the selected Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="94"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="117"/>
         <source>Preview the selected Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="95"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="118"/>
         <source>Send the selected Media live</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="96"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="119"/>
         <source>Add the selected Media to the service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="80"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="103"/>
         <source>Media</source>
         <comment>name singular</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="81"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="104"/>
         <source>Media</source>
         <comment>name plural</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="85"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="108"/>
         <source>Media</source>
         <comment>container title</comment>
         <translation type="unfinished"></translation>
@@ -1088,14 +1088,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/aboutdialog.py" line="224"/>
-        <source>Copyright &#xa9; 2004-2011 Raoul Snyman
-Portions copyright &#xa9; 2004-2011 Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri,
-Meinert Jordan, Andreas Preikschat, Christian Richter, Philip
-Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, CarstennTinggaard, Frode Woldsund</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="openlp/core/ui/aboutdialog.py" line="231"/>
         <source>This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.</source>
         <translation type="unfinished"></translation>
@@ -1170,6 +1162,15 @@
     He has set us free.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="openlp/core/ui/aboutdialog.py" line="224"/>
+        <source>Copyright &#xa9; 2004-2011 Raoul Snyman
+Portions copyright &#xa9; 2004-2011 Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri,
+Meinert Jordan, Andreas Preikschat, Christian Richter, Philip
+Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carsten
+Tinggaard, Frode Woldsund</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OpenLP.AdvancedTab</name>
@@ -1273,17 +1274,17 @@
     </message>
     <message>
         <location filename="openlp/core/ui/displaytagdialog.py" line="145"/>
-        <source>Tag id</source>
+        <source>Tag Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/core/ui/displaytagdialog.py" line="147"/>
-        <source>Start Html</source>
+        <source>Start HTML</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/core/ui/displaytagdialog.py" line="149"/>
-        <source>End Html</source>
+        <source>End HTML</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1421,151 +1422,200 @@
 <context>
     <name>OpenLP.FirstTimeLanguageForm</name>
     <message>
-        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="60"/>
-        <source>Initial Set up Language</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="62"/>
-        <source>Select the language you&apos;d like to use in OpenLP.</source>
+        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="61"/>
+        <source>Select Translation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="63"/>
+        <source>Choose the translation you&apos;d like to use in OpenLP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="65"/>
+        <source>Translation:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpenLP.FirstTimeWizard</name>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="154"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="207"/>
         <source>Songs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="63"/>
-        <source>Bibles</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="64"/>
-        <source>Themes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="65"/>
-        <source>Starting Updates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="67"/>
-        <source>Downloading %s</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="140"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="193"/>
         <source>First Time Wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="142"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="195"/>
         <source>Welcome to the First Time Wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="146"/>
-        <source>This wizard will help you to configure OpenLP for initial use . Click the next button below to start the process of selection your initial options. </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="150"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="203"/>
         <source>Activate required Plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="152"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="205"/>
         <source>Select the Plugins you wish to use. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="155"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="208"/>
         <source>Custom Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="157"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="210"/>
         <source>Bible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="158"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="211"/>
         <source>Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="160"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="213"/>
         <source>Presentations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="162"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="215"/>
         <source>Media (Audio and Video)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="164"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="217"/>
         <source>Allow remote access</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="166"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="219"/>
         <source>Monitor Song Usage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="168"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="221"/>
         <source>Allow Alerts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="170"/>
-        <source>Download Samples from OpenLP.org</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="172"/>
-        <source>Select samples to downlaod and install for use.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="175"/>
-        <source>No Internet connection found so unable to download any default files.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="178"/>
-        <source>Download Example Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="180"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="248"/>
         <source>Default Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="182"/>
-        <source>Set up default values to be used by OpenLP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="184"/>
-        <source>Default output display</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="186"/>
-        <source>Select the default Theme</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="188"/>
-        <source>Press finish to apply all your changes and start OpenLP</source>
+        <location filename="openlp/core/ui/firsttimeform.py" line="61"/>
+        <source>Downloading %s...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="212"/>
+        <source>Download complete. Click the finish button to start OpenLP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="221"/>
+        <source>Enabling selected plugins...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="244"/>
+        <source>Overwrite Existing Songs?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="244"/>
+        <source>Your songs database already exists and your current songs will be permanently lost, are you sure you want to replace it ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="199"/>
+        <source>This wizard will help you to configure OpenLP for initial use. Click the next button below to start the process of selection your initial options. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="223"/>
+        <source>No Internet Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="225"/>
+        <source>Unable to detect an Internet connection.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="228"/>
+        <source>No Internet connection was found. The First Time Wizard needs an Internet connection in order to be able to download sample songs, Bibles and themes.
+
+To re-run the First Time Wizard and import this sample data at a later stage, press the cancel button now, check your Internet connection, and restart OpenLP.
+
+To cancel the First Time Wizard completely, press the finish button now.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="236"/>
+        <source>Sample Songs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="238"/>
+        <source>Select and download public domain songs.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="240"/>
+        <source>Sample Bibles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="242"/>
+        <source>Select and download free Bibles.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="244"/>
+        <source>Sample Themes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="246"/>
+        <source>Select and download sample themes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="250"/>
+        <source>Set up default settings to be used by OpenLP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="252"/>
+        <source>Setting Up And Importing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="254"/>
+        <source>Please wait while OpenLP is set up and your data is imported.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="256"/>
+        <source>Default output display:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="258"/>
+        <source>Select default theme:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="260"/>
+        <source>Starting configuration process...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1690,12 +1740,12 @@
 <context>
     <name>OpenLP.LanguageManager</name>
     <message>
-        <location filename="openlp/core/utils/languagemanager.py" line="126"/>
+        <location filename="openlp/core/utils/languagemanager.py" line="130"/>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/utils/languagemanager.py" line="126"/>
+        <location filename="openlp/core/utils/languagemanager.py" line="130"/>
         <source>Please restart OpenLP to use your new language setting.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2001,17 +2051,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="428"/>
-        <source>&amp;Auto Detect</source>
+        <location filename="openlp/core/ui/mainwindow.py" line="434"/>
+        <source>Use the system language, if available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/core/ui/mainwindow.py" line="430"/>
-        <source>Use the system language, if available.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="434"/>
         <source>Set the interface language to %s</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2056,29 +2101,29 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="644"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="642"/>
         <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="648"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="646"/>
         <source>OpenLP Version Updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="686"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="684"/>
         <source>OpenLP Main Display Blanked</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="686"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="684"/>
         <source>The Main Display has been blanked out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="895"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="893"/>
         <source>Default Theme: %s</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2094,12 +2139,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="817"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="815"/>
         <source>Close OpenLP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="817"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="815"/>
         <source>Are you sure you want to close OpenLP?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2128,11 +2173,16 @@
         <source>Open the folder where songs, bibles and other data resides.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="openlp/core/ui/mainwindow.py" line="432"/>
+        <source>&amp;Autodetect</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OpenLP.MediaManagerItem</name>
     <message>
-        <location filename="openlp/core/lib/__init__.py" line="287"/>
+        <location filename="openlp/core/lib/__init__.py" line="286"/>
         <source>No Items Selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2410,33 +2460,33 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="466"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="494"/>
         <source>OpenLP Service Files (*.osz)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="493"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="521"/>
         <source>File is not a valid service.
 The content encoding is not UTF-8.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="525"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="553"/>
         <source>File is not a valid service.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="1051"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="1079"/>
         <source>Missing Display Handler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="1017"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="1045"/>
         <source>Your item cannot be displayed as there is no handler to display it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="1051"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="1079"/>
         <source>Your item cannot be displayed as the plugin required to display it is missing or inactive</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3942,82 +3992,92 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="92"/>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="101"/>
         <source>usage_detail_%s_%s.txt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="114"/>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="123"/>
         <source>Report Creation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="114"/>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="123"/>
         <source>Report 
 %s 
 has been successfully created. </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="92"/>
+        <source>Output Path Not Selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="92"/>
+        <source>You have not set a valid output location for your song usage report. Please select an existing path on your computer.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SongsPlugin</name>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="104"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="103"/>
         <source>&amp;Song</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="85"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="84"/>
         <source>Import songs using the import wizard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="183"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="182"/>
         <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 type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="126"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="125"/>
         <source>&amp;Re-index Songs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="128"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="127"/>
         <source>Re-index the songs database to improve searching and ordering.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="141"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="140"/>
         <source>Reindexing songs...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="237"/>
+        <source>Add a new Song</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="openlp/plugins/songs/songsplugin.py" line="238"/>
-        <source>Add a new Song</source>
+        <source>Edit the selected Song</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/plugins/songs/songsplugin.py" line="239"/>
-        <source>Edit the selected Song</source>
+        <source>Delete the selected Song</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/plugins/songs/songsplugin.py" line="240"/>
-        <source>Delete the selected Song</source>
+        <source>Preview the selected Song</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/plugins/songs/songsplugin.py" line="241"/>
-        <source>Preview the selected Song</source>
+        <source>Send the selected Song live</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/plugins/songs/songsplugin.py" line="242"/>
-        <source>Send the selected Song live</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="243"/>
         <source>Add the selected Song to the service</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4110,25 +4170,25 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="226"/>
+        <source>Song</source>
+        <comment>name singular</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="openlp/plugins/songs/songsplugin.py" line="227"/>
-        <source>Song</source>
-        <comment>name singular</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="228"/>
         <source>Songs</source>
         <comment>name plural</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="232"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="231"/>
         <source>Songs</source>
         <comment>container title</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="106"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="105"/>
         <source>Exports songs using the export wizard.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4584,12 +4644,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="318"/>
+        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="321"/>
         <source>Delete Song(s)?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="400"/>
+        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="403"/>
         <source>CCLI License: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -4599,7 +4659,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="318"/>
+        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="321"/>
         <source>Are you sure you want to delete the %n selected song(s)?</source>
         <translation type="unfinished">
             <numerusform></numerusform>

=== modified file 'resources/i18n/en_GB.ts'
--- resources/i18n/en_GB.ts	2011-03-09 16:16:40 +0000
+++ resources/i18n/en_GB.ts	2011-03-13 10:53:56 +0000
@@ -210,7 +210,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="540"/>
+        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="539"/>
         <source>You cannot combine single and dual Bible verse search results. Do you want to delete your search results and start a new search?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -830,59 +830,59 @@
 <context>
     <name>ImagePlugin</name>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="45"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="44"/>
         <source>&lt;strong&gt;Image Plugin&lt;/strong&gt;&lt;br /&gt;The image plugin provides displaying of images.&lt;br /&gt;One of the distinguishing features of this plugin is the ability to group a number of images together in the service manager, making the displaying of multiple images easier. This plugin can also make use of OpenLP&apos;s &quot;timed looping&quot; feature to create a slide show that runs automatically. In addition to this, images from the plugin can be used to override the current theme&apos;s background, which renders text-based items like songs with the selected image as a background instead of the background provided by the theme.</source>
         <translation>&lt;strong&gt;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.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="73"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="72"/>
         <source>Load a new Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="openlp/plugins/images/imageplugin.py" line="74"/>
+        <source>Add a new Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="openlp/plugins/images/imageplugin.py" line="75"/>
-        <source>Add a new Image</source>
+        <source>Edit the selected Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/plugins/images/imageplugin.py" line="76"/>
-        <source>Edit the selected Image</source>
+        <source>Delete the selected Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/plugins/images/imageplugin.py" line="77"/>
-        <source>Delete the selected Image</source>
+        <source>Preview the selected Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/plugins/images/imageplugin.py" line="78"/>
-        <source>Preview the selected Image</source>
+        <source>Send the selected Image live</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/plugins/images/imageplugin.py" line="79"/>
-        <source>Send the selected Image live</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="80"/>
         <source>Add the selected Image to the service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="openlp/plugins/images/imageplugin.py" line="63"/>
+        <source>Image</source>
+        <comment>name singular</comment>
+        <translation type="unfinished">Image</translation>
+    </message>
+    <message>
         <location filename="openlp/plugins/images/imageplugin.py" line="64"/>
-        <source>Image</source>
-        <comment>name singular</comment>
-        <translation type="unfinished">Image</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="65"/>
         <source>Images</source>
         <comment>name plural</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="69"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="68"/>
         <source>Images</source>
         <comment>container title</comment>
         <translation type="unfinished"></translation>
@@ -938,59 +938,59 @@
 <context>
     <name>MediaPlugin</name>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="70"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="93"/>
         <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 Plugin&lt;/strong&gt;&lt;br /&gt;The media plugin provides playback of audio and video.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="89"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="112"/>
         <source>Load a new Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="91"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="114"/>
         <source>Add a new Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="92"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="115"/>
         <source>Edit the selected Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="93"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="116"/>
         <source>Delete the selected Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="94"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="117"/>
         <source>Preview the selected Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="95"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="118"/>
         <source>Send the selected Media live</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="96"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="119"/>
         <source>Add the selected Media to the service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="80"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="103"/>
         <source>Media</source>
         <comment>name singular</comment>
         <translation type="unfinished">Media</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="81"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="104"/>
         <source>Media</source>
         <comment>name plural</comment>
         <translation type="unfinished">Media</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="85"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="108"/>
         <source>Media</source>
         <comment>container title</comment>
         <translation type="unfinished">Media</translation>
@@ -1095,14 +1095,6 @@
         <translation> build %s</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/aboutdialog.py" line="224"/>
-        <source>Copyright &#xa9; 2004-2011 Raoul Snyman
-Portions copyright &#xa9; 2004-2011 Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri,
-Meinert Jordan, Andreas Preikschat, Christian Richter, Philip
-Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, CarstennTinggaard, Frode Woldsund</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="openlp/core/ui/aboutdialog.py" line="231"/>
         <source>This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.</source>
         <translation type="unfinished"></translation>
@@ -1177,6 +1169,15 @@
     He has set us free.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="openlp/core/ui/aboutdialog.py" line="224"/>
+        <source>Copyright &#xa9; 2004-2011 Raoul Snyman
+Portions copyright &#xa9; 2004-2011 Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri,
+Meinert Jordan, Andreas Preikschat, Christian Richter, Philip
+Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carsten
+Tinggaard, Frode Woldsund</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OpenLP.AdvancedTab</name>
@@ -1280,17 +1281,17 @@
     </message>
     <message>
         <location filename="openlp/core/ui/displaytagdialog.py" line="145"/>
-        <source>Tag id</source>
+        <source>Tag Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/core/ui/displaytagdialog.py" line="147"/>
-        <source>Start Html</source>
+        <source>Start HTML</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/core/ui/displaytagdialog.py" line="149"/>
-        <source>End Html</source>
+        <source>End HTML</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1428,151 +1429,200 @@
 <context>
     <name>OpenLP.FirstTimeLanguageForm</name>
     <message>
-        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="60"/>
-        <source>Initial Set up Language</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="62"/>
-        <source>Select the language you&apos;d like to use in OpenLP.</source>
+        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="61"/>
+        <source>Select Translation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="63"/>
+        <source>Choose the translation you&apos;d like to use in OpenLP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="65"/>
+        <source>Translation:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpenLP.FirstTimeWizard</name>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="154"/>
-        <source>Songs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="63"/>
-        <source>Bibles</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="64"/>
-        <source>Themes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="65"/>
-        <source>Starting Updates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="67"/>
-        <source>Downloading %s</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="140"/>
+        <location filename="openlp/core/ui/firsttimeform.py" line="61"/>
+        <source>Downloading %s...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="212"/>
+        <source>Download complete. Click the finish button to start OpenLP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="221"/>
+        <source>Enabling selected plugins...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="244"/>
+        <source>Overwrite Existing Songs?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="244"/>
+        <source>Your songs database already exists and your current songs will be permanently lost, are you sure you want to replace it ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="193"/>
         <source>First Time Wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="142"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="195"/>
         <source>Welcome to the First Time Wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="146"/>
-        <source>This wizard will help you to configure OpenLP for initial use . Click the next button below to start the process of selection your initial options. </source>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="199"/>
+        <source>This wizard will help you to configure OpenLP for initial use. Click the next button below to start the process of selection your initial options. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="150"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="203"/>
         <source>Activate required Plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="152"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="205"/>
         <source>Select the Plugins you wish to use. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="155"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="207"/>
+        <source>Songs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="208"/>
         <source>Custom Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="157"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="210"/>
         <source>Bible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="158"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="211"/>
         <source>Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="160"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="213"/>
         <source>Presentations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="162"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="215"/>
         <source>Media (Audio and Video)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="164"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="217"/>
         <source>Allow remote access</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="166"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="219"/>
         <source>Monitor Song Usage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="168"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="221"/>
         <source>Allow Alerts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="170"/>
-        <source>Download Samples from OpenLP.org</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="172"/>
-        <source>Select samples to downlaod and install for use.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="175"/>
-        <source>No Internet connection found so unable to download any default files.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="178"/>
-        <source>Download Example Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="180"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="223"/>
+        <source>No Internet Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="225"/>
+        <source>Unable to detect an Internet connection.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="228"/>
+        <source>No Internet connection was found. The First Time Wizard needs an Internet connection in order to be able to download sample songs, Bibles and themes.
+
+To re-run the First Time Wizard and import this sample data at a later stage, press the cancel button now, check your Internet connection, and restart OpenLP.
+
+To cancel the First Time Wizard completely, press the finish button now.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="236"/>
+        <source>Sample Songs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="238"/>
+        <source>Select and download public domain songs.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="240"/>
+        <source>Sample Bibles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="242"/>
+        <source>Select and download free Bibles.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="244"/>
+        <source>Sample Themes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="246"/>
+        <source>Select and download sample themes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="248"/>
         <source>Default Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="182"/>
-        <source>Set up default values to be used by OpenLP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="184"/>
-        <source>Default output display</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="186"/>
-        <source>Select the default Theme</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="188"/>
-        <source>Press finish to apply all your changes and start OpenLP</source>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="250"/>
+        <source>Set up default settings to be used by OpenLP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="252"/>
+        <source>Setting Up And Importing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="254"/>
+        <source>Please wait while OpenLP is set up and your data is imported.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="256"/>
+        <source>Default output display:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="258"/>
+        <source>Select default theme:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="260"/>
+        <source>Starting configuration process...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1697,12 +1747,12 @@
 <context>
     <name>OpenLP.LanguageManager</name>
     <message>
-        <location filename="openlp/core/utils/languagemanager.py" line="126"/>
+        <location filename="openlp/core/utils/languagemanager.py" line="130"/>
         <source>Language</source>
         <translation>Language</translation>
     </message>
     <message>
-        <location filename="openlp/core/utils/languagemanager.py" line="126"/>
+        <location filename="openlp/core/utils/languagemanager.py" line="130"/>
         <source>Please restart OpenLP to use your new language setting.</source>
         <translation>Please restart OpenLP to use your new language setting.</translation>
     </message>
@@ -2008,17 +2058,12 @@
         <translation>&amp;Web Site</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="428"/>
-        <source>&amp;Auto Detect</source>
-        <translation>&amp;Auto Detect</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="430"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="434"/>
         <source>Use the system language, if available.</source>
         <translation>Use the system language, if available.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="434"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="430"/>
         <source>Set the interface language to %s</source>
         <translation>Set the interface language to %s</translation>
     </message>
@@ -2063,7 +2108,7 @@
         <translation>Set the view mode to Live.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="644"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="642"/>
         <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>
@@ -2071,22 +2116,22 @@
 You can download the latest version from http://openlp.org/.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="648"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="646"/>
         <source>OpenLP Version Updated</source>
         <translation>OpenLP Version Updated</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="686"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="684"/>
         <source>OpenLP Main Display Blanked</source>
         <translation>OpenLP Main Display Blanked</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="686"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="684"/>
         <source>The Main Display has been blanked out</source>
         <translation>The Main Display has been blanked out</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="895"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="893"/>
         <source>Default Theme: %s</source>
         <translation>Default Theme: %s</translation>
     </message>
@@ -2102,12 +2147,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="817"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="815"/>
         <source>Close OpenLP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="817"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="815"/>
         <source>Are you sure you want to close OpenLP?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2136,11 +2181,16 @@
         <source>&amp;Configure Display Tags</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="openlp/core/ui/mainwindow.py" line="432"/>
+        <source>&amp;Autodetect</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OpenLP.MediaManagerItem</name>
     <message>
-        <location filename="openlp/core/lib/__init__.py" line="287"/>
+        <location filename="openlp/core/lib/__init__.py" line="286"/>
         <source>No Items Selected</source>
         <translation>No Items Selected</translation>
     </message>
@@ -2418,29 +2468,29 @@
         <translation>&amp;Change Item Theme</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="493"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="521"/>
         <source>File is not a valid service.
 The content encoding is not UTF-8.</source>
         <translation>File is not a valid service.
 The content encoding is not UTF-8.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="525"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="553"/>
         <source>File is not a valid service.</source>
         <translation>File is not a valid service.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="1051"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="1079"/>
         <source>Missing Display Handler</source>
         <translation>Missing Display Handler</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="1017"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="1045"/>
         <source>Your item cannot be displayed as there is no handler to display it</source>
         <translation>Your item cannot be displayed as there is no handler to display it</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="1051"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="1079"/>
         <source>Your item cannot be displayed as the plugin required to display it is missing or inactive</source>
         <translation>Your item cannot be displayed as the plugin required to display it is missing or inactive</translation>
     </message>
@@ -2470,7 +2520,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="466"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="494"/>
         <source>OpenLP Service Files (*.osz)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3952,99 +4002,109 @@
         <translation>Output File Location</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="92"/>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="101"/>
         <source>usage_detail_%s_%s.txt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="114"/>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="123"/>
         <source>Report Creation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="114"/>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="123"/>
         <source>Report 
 %s 
 has been successfully created. </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="92"/>
+        <source>Output Path Not Selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="92"/>
+        <source>You have not set a valid output location for your song usage report. Please select an existing path on your computer.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SongsPlugin</name>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="104"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="103"/>
         <source>&amp;Song</source>
         <translation>&amp;Song</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="85"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="84"/>
         <source>Import songs using the import wizard.</source>
         <translation>Import songs using the import wizard.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="183"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="182"/>
         <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;Songs Plugin&lt;/strong&gt;&lt;br /&gt;The songs plugin provides the ability to display and manage songs.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="126"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="125"/>
         <source>&amp;Re-index Songs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="128"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="127"/>
         <source>Re-index the songs database to improve searching and ordering.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="141"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="140"/>
         <source>Reindexing songs...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="237"/>
+        <source>Add a new Song</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="openlp/plugins/songs/songsplugin.py" line="238"/>
-        <source>Add a new Song</source>
+        <source>Edit the selected Song</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/plugins/songs/songsplugin.py" line="239"/>
-        <source>Edit the selected Song</source>
+        <source>Delete the selected Song</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/plugins/songs/songsplugin.py" line="240"/>
-        <source>Delete the selected Song</source>
+        <source>Preview the selected Song</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/plugins/songs/songsplugin.py" line="241"/>
-        <source>Preview the selected Song</source>
+        <source>Send the selected Song live</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/plugins/songs/songsplugin.py" line="242"/>
-        <source>Send the selected Song live</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="243"/>
         <source>Add the selected Song to the service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="227"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="226"/>
         <source>Song</source>
         <comment>name singular</comment>
         <translation type="unfinished">Song</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="228"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="227"/>
         <source>Songs</source>
         <comment>name plural</comment>
         <translation type="unfinished">Songs</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="232"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="231"/>
         <source>Songs</source>
         <comment>container title</comment>
         <translation type="unfinished">Songs</translation>
@@ -4138,7 +4198,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="106"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="105"/>
         <source>Exports songs using the export wizard.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4594,12 +4654,12 @@
         <translation>Lyrics</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="318"/>
+        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="321"/>
         <source>Delete Song(s)?</source>
         <translation>Delete Song(s)?</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="400"/>
+        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="403"/>
         <source>CCLI License: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -4609,7 +4669,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="318"/>
+        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="321"/>
         <source>Are you sure you want to delete the %n selected song(s)?</source>
         <translation type="unfinished">
             <numerusform></numerusform>

=== modified file 'resources/i18n/en_ZA.ts'
--- resources/i18n/en_ZA.ts	2011-03-09 16:16:40 +0000
+++ resources/i18n/en_ZA.ts	2011-03-13 10:53:56 +0000
@@ -212,7 +212,7 @@
         <translation>Bible not fully loaded.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="540"/>
+        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="539"/>
         <source>You cannot combine single and dual Bible verse search results. Do you want to delete your search results and start a new search?</source>
         <translation>You cannot combine single and dual Bible verse search results. Do you want to delete your search results and start a new search?</translation>
     </message>
@@ -842,59 +842,59 @@
 <context>
     <name>ImagePlugin</name>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="45"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="44"/>
         <source>&lt;strong&gt;Image Plugin&lt;/strong&gt;&lt;br /&gt;The image plugin provides displaying of images.&lt;br /&gt;One of the distinguishing features of this plugin is the ability to group a number of images together in the service manager, making the displaying of multiple images easier. This plugin can also make use of OpenLP&apos;s &quot;timed looping&quot; feature to create a slide show that runs automatically. In addition to this, images from the plugin can be used to override the current theme&apos;s background, which renders text-based items like songs with the selected image as a background instead of the background provided by the theme.</source>
         <translation>&lt;strong&gt;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.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="73"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="72"/>
         <source>Load a new Image</source>
         <translation>Load a new Image</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="75"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="74"/>
         <source>Add a new Image</source>
         <translation>Add a new Image</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="76"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="75"/>
         <source>Edit the selected Image</source>
         <translation>Edit the selected Image</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="77"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="76"/>
         <source>Delete the selected Image</source>
         <translation>Delete the selected Image</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="78"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="77"/>
         <source>Preview the selected Image</source>
         <translation>Preview the selected Image</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="79"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="78"/>
         <source>Send the selected Image live</source>
         <translation>Send the selected Image live</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="80"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="79"/>
         <source>Add the selected Image to the service</source>
         <translation>Add the selected Image to the service</translation>
     </message>
     <message>
+        <location filename="openlp/plugins/images/imageplugin.py" line="63"/>
+        <source>Image</source>
+        <comment>name singular</comment>
+        <translation type="unfinished">Image</translation>
+    </message>
+    <message>
         <location filename="openlp/plugins/images/imageplugin.py" line="64"/>
-        <source>Image</source>
-        <comment>name singular</comment>
-        <translation type="unfinished">Image</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="65"/>
         <source>Images</source>
         <comment>name plural</comment>
         <translation type="unfinished">Images</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="69"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="68"/>
         <source>Images</source>
         <comment>container title</comment>
         <translation type="unfinished">Images</translation>
@@ -951,59 +951,59 @@
 <context>
     <name>MediaPlugin</name>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="70"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="93"/>
         <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 Plugin&lt;/strong&gt;&lt;br /&gt;The media plugin provides playback of audio and video.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="89"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="112"/>
         <source>Load a new Media</source>
         <translation>Load a new Media</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="91"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="114"/>
         <source>Add a new Media</source>
         <translation>Add a new Media</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="92"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="115"/>
         <source>Edit the selected Media</source>
         <translation>Edit the selected Media</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="93"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="116"/>
         <source>Delete the selected Media</source>
         <translation>Delete the selected Media</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="94"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="117"/>
         <source>Preview the selected Media</source>
         <translation>Preview the selected Media</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="95"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="118"/>
         <source>Send the selected Media live</source>
         <translation>Send the selected Media live</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="96"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="119"/>
         <source>Add the selected Media to the service</source>
         <translation>Add the selected Media to the service</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="80"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="103"/>
         <source>Media</source>
         <comment>name singular</comment>
         <translation type="unfinished">Media</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="81"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="104"/>
         <source>Media</source>
         <comment>name plural</comment>
         <translation type="unfinished">Media</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="85"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="108"/>
         <source>Media</source>
         <comment>container title</comment>
         <translation type="unfinished">Media</translation>
@@ -1108,17 +1108,6 @@
         <translation> build %s</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/aboutdialog.py" line="224"/>
-        <source>Copyright &#xa9; 2004-2011 Raoul Snyman
-Portions copyright &#xa9; 2004-2011 Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri,
-Meinert Jordan, Andreas Preikschat, Christian Richter, Philip
-Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, CarstennTinggaard, Frode Woldsund</source>
-        <translation>Copyright Â© 2004-2011 Raoul Snyman
-Portions copyright Â© 2004-2011 Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri,
-Meinert Jordan, Andreas Preikschat, Christian Richter, Philip
-Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, CarstennTinggaard, Frode Woldsund</translation>
-    </message>
-    <message>
         <location filename="openlp/core/ui/aboutdialog.py" line="231"/>
         <source>This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.</source>
         <translation>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.</translation>
@@ -1193,6 +1182,15 @@
     He has set us free.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="openlp/core/ui/aboutdialog.py" line="224"/>
+        <source>Copyright &#xa9; 2004-2011 Raoul Snyman
+Portions copyright &#xa9; 2004-2011 Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri,
+Meinert Jordan, Andreas Preikschat, Christian Richter, Philip
+Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carsten
+Tinggaard, Frode Woldsund</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OpenLP.AdvancedTab</name>
@@ -1296,18 +1294,18 @@
     </message>
     <message>
         <location filename="openlp/core/ui/displaytagdialog.py" line="145"/>
-        <source>Tag id</source>
-        <translation>Tag Id</translation>
+        <source>Tag Id</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/core/ui/displaytagdialog.py" line="147"/>
-        <source>Start Html</source>
-        <translation>Start HTML</translation>
+        <source>Start HTML</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/core/ui/displaytagdialog.py" line="149"/>
-        <source>End Html</source>
-        <translation>End HTML</translation>
+        <source>End HTML</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1472,151 +1470,200 @@
 <context>
     <name>OpenLP.FirstTimeLanguageForm</name>
     <message>
-        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="60"/>
-        <source>Initial Set up Language</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="62"/>
-        <source>Select the language you&apos;d like to use in OpenLP.</source>
+        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="61"/>
+        <source>Select Translation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="63"/>
+        <source>Choose the translation you&apos;d like to use in OpenLP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="65"/>
+        <source>Translation:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpenLP.FirstTimeWizard</name>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="154"/>
-        <source>Songs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="63"/>
-        <source>Bibles</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="64"/>
-        <source>Themes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="65"/>
-        <source>Starting Updates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="67"/>
-        <source>Downloading %s</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="140"/>
+        <location filename="openlp/core/ui/firsttimeform.py" line="61"/>
+        <source>Downloading %s...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="212"/>
+        <source>Download complete. Click the finish button to start OpenLP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="221"/>
+        <source>Enabling selected plugins...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="244"/>
+        <source>Overwrite Existing Songs?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="244"/>
+        <source>Your songs database already exists and your current songs will be permanently lost, are you sure you want to replace it ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="193"/>
         <source>First Time Wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="142"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="195"/>
         <source>Welcome to the First Time Wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="146"/>
-        <source>This wizard will help you to configure OpenLP for initial use . Click the next button below to start the process of selection your initial options. </source>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="199"/>
+        <source>This wizard will help you to configure OpenLP for initial use. Click the next button below to start the process of selection your initial options. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="150"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="203"/>
         <source>Activate required Plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="152"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="205"/>
         <source>Select the Plugins you wish to use. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="155"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="207"/>
+        <source>Songs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="208"/>
         <source>Custom Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="157"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="210"/>
         <source>Bible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="158"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="211"/>
         <source>Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="160"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="213"/>
         <source>Presentations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="162"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="215"/>
         <source>Media (Audio and Video)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="164"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="217"/>
         <source>Allow remote access</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="166"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="219"/>
         <source>Monitor Song Usage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="168"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="221"/>
         <source>Allow Alerts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="170"/>
-        <source>Download Samples from OpenLP.org</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="172"/>
-        <source>Select samples to downlaod and install for use.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="175"/>
-        <source>No Internet connection found so unable to download any default files.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="178"/>
-        <source>Download Example Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="180"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="223"/>
+        <source>No Internet Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="225"/>
+        <source>Unable to detect an Internet connection.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="228"/>
+        <source>No Internet connection was found. The First Time Wizard needs an Internet connection in order to be able to download sample songs, Bibles and themes.
+
+To re-run the First Time Wizard and import this sample data at a later stage, press the cancel button now, check your Internet connection, and restart OpenLP.
+
+To cancel the First Time Wizard completely, press the finish button now.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="236"/>
+        <source>Sample Songs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="238"/>
+        <source>Select and download public domain songs.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="240"/>
+        <source>Sample Bibles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="242"/>
+        <source>Select and download free Bibles.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="244"/>
+        <source>Sample Themes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="246"/>
+        <source>Select and download sample themes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="248"/>
         <source>Default Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="182"/>
-        <source>Set up default values to be used by OpenLP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="184"/>
-        <source>Default output display</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="186"/>
-        <source>Select the default Theme</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="188"/>
-        <source>Press finish to apply all your changes and start OpenLP</source>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="250"/>
+        <source>Set up default settings to be used by OpenLP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="252"/>
+        <source>Setting Up And Importing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="254"/>
+        <source>Please wait while OpenLP is set up and your data is imported.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="256"/>
+        <source>Default output display:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="258"/>
+        <source>Select default theme:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="260"/>
+        <source>Starting configuration process...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1741,12 +1788,12 @@
 <context>
     <name>OpenLP.LanguageManager</name>
     <message>
-        <location filename="openlp/core/utils/languagemanager.py" line="126"/>
+        <location filename="openlp/core/utils/languagemanager.py" line="130"/>
         <source>Language</source>
         <translation>Language</translation>
     </message>
     <message>
-        <location filename="openlp/core/utils/languagemanager.py" line="126"/>
+        <location filename="openlp/core/utils/languagemanager.py" line="130"/>
         <source>Please restart OpenLP to use your new language setting.</source>
         <translation>Please restart OpenLP to use your new language setting.</translation>
     </message>
@@ -2052,17 +2099,12 @@
         <translation>&amp;Web Site</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="428"/>
-        <source>&amp;Auto Detect</source>
-        <translation>&amp;Auto Detect</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="430"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="434"/>
         <source>Use the system language, if available.</source>
         <translation>Use the system language, if available.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="434"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="430"/>
         <source>Set the interface language to %s</source>
         <translation>Set the interface language to %s</translation>
     </message>
@@ -2107,27 +2149,27 @@
         <translation>Set the view mode to Live.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="648"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="646"/>
         <source>OpenLP Version Updated</source>
         <translation>OpenLP Version Updated</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="686"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="684"/>
         <source>OpenLP Main Display Blanked</source>
         <translation>OpenLP Main Display Blanked</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="686"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="684"/>
         <source>The Main Display has been blanked out</source>
         <translation>The Main Display has been blanked out</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="895"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="893"/>
         <source>Default Theme: %s</source>
         <translation>Default Theme: %s</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="644"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="642"/>
         <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>
@@ -2147,12 +2189,12 @@
         <translation>Configure &amp;Shortcuts...</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="817"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="815"/>
         <source>Close OpenLP</source>
         <translation>Close OpenLP</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="817"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="815"/>
         <source>Are you sure you want to close OpenLP?</source>
         <translation>Are you sure you want to close OpenLP?</translation>
     </message>
@@ -2181,11 +2223,16 @@
         <source>&amp;Configure Display Tags</source>
         <translation>&amp;Configure Display Tags</translation>
     </message>
+    <message>
+        <location filename="openlp/core/ui/mainwindow.py" line="432"/>
+        <source>&amp;Autodetect</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OpenLP.MediaManagerItem</name>
     <message>
-        <location filename="openlp/core/lib/__init__.py" line="287"/>
+        <location filename="openlp/core/lib/__init__.py" line="286"/>
         <source>No Items Selected</source>
         <translation>No Items Selected</translation>
     </message>
@@ -2463,29 +2510,29 @@
         <translation>&amp;Change Item Theme</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="493"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="521"/>
         <source>File is not a valid service.
 The content encoding is not UTF-8.</source>
         <translation>File is not a valid service.
 The content encoding is not UTF-8.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="525"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="553"/>
         <source>File is not a valid service.</source>
         <translation>File is not a valid service.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="1051"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="1079"/>
         <source>Missing Display Handler</source>
         <translation>Missing Display Handler</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="1017"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="1045"/>
         <source>Your item cannot be displayed as there is no handler to display it</source>
         <translation>Your item cannot be displayed as there is no handler to display it</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="1051"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="1079"/>
         <source>Your item cannot be displayed as the plugin required to display it is missing or inactive</source>
         <translation>Your item cannot be displayed as the plugin required to display it is missing or inactive</translation>
     </message>
@@ -2515,7 +2562,7 @@
         <translation>Open File</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="466"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="494"/>
         <source>OpenLP Service Files (*.osz)</source>
         <translation>OpenLP Service Files (*.osz)</translation>
     </message>
@@ -3997,17 +4044,17 @@
         <translation>Report Location</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="92"/>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="101"/>
         <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="114"/>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="123"/>
         <source>Report Creation</source>
         <translation>Report Creation</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="114"/>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="123"/>
         <source>Report 
 %s 
 has been successfully created. </source>
@@ -4015,83 +4062,93 @@
 %s 
 has been successfully created. </translation>
     </message>
+    <message>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="92"/>
+        <source>Output Path Not Selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="92"/>
+        <source>You have not set a valid output location for your song usage report. Please select an existing path on your computer.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SongsPlugin</name>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="104"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="103"/>
         <source>&amp;Song</source>
         <translation>&amp;Song</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="85"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="84"/>
         <source>Import songs using the import wizard.</source>
         <translation>Import songs using the import wizard.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="183"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="182"/>
         <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;Songs Plugin&lt;/strong&gt;&lt;br /&gt;The songs plugin provides the ability to display and manage songs.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="126"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="125"/>
         <source>&amp;Re-index Songs</source>
         <translation>&amp;Re-index Songs</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="128"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="127"/>
         <source>Re-index the songs database to improve searching and ordering.</source>
         <translation>Re-index the songs database to improve searching and ordering.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="141"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="140"/>
         <source>Reindexing songs...</source>
         <translation>Reindexing songs...</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="238"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="237"/>
         <source>Add a new Song</source>
         <translation>Add a new Song</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="239"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="238"/>
         <source>Edit the selected Song</source>
         <translation>Edit the selected Song</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="240"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="239"/>
         <source>Delete the selected Song</source>
         <translation>Delete the selected Song</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="241"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="240"/>
         <source>Preview the selected Song</source>
         <translation>Preview the selected Song</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="242"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="241"/>
         <source>Send the selected Song live</source>
         <translation>Send the selected Song live</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="243"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="242"/>
         <source>Add the selected Song to the service</source>
         <translation>Add the selected Song to the service</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="227"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="226"/>
         <source>Song</source>
         <comment>name singular</comment>
         <translation type="unfinished">Song</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="228"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="227"/>
         <source>Songs</source>
         <comment>name plural</comment>
         <translation type="unfinished">Songs</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="232"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="231"/>
         <source>Songs</source>
         <comment>container title</comment>
         <translation type="unfinished">Songs</translation>
@@ -4188,7 +4245,7 @@
 The encoding is responsible for the correct character representation.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="106"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="105"/>
         <source>Exports songs using the export wizard.</source>
         <translation>Exports songs using the export wizard.</translation>
     </message>
@@ -4644,12 +4701,12 @@
         <translation>Lyrics</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="318"/>
+        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="321"/>
         <source>Delete Song(s)?</source>
         <translation>Delete Song(s)?</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="400"/>
+        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="403"/>
         <source>CCLI License: </source>
         <translation>CCLI License: </translation>
     </message>
@@ -4659,7 +4716,7 @@
         <translation>Entire Song</translation>
     </message>
     <message numerus="yes">
-        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="318"/>
+        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="321"/>
         <source>Are you sure you want to delete the %n selected song(s)?</source>
         <translation>
             <numerusform>Are you sure you want to delete the %n selected song(s)?</numerusform>

=== modified file 'resources/i18n/es.ts'
--- resources/i18n/es.ts	2011-03-09 16:16:40 +0000
+++ resources/i18n/es.ts	2011-03-13 10:53:56 +0000
@@ -211,7 +211,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="540"/>
+        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="539"/>
         <source>You cannot combine single and dual Bible verse search results. Do you want to delete your search results and start a new search?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -830,59 +830,59 @@
 <context>
     <name>ImagePlugin</name>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="45"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="44"/>
         <source>&lt;strong&gt;Image Plugin&lt;/strong&gt;&lt;br /&gt;The image plugin provides displaying of images.&lt;br /&gt;One of the distinguishing features of this plugin is the ability to group a number of images together in the service manager, making the displaying of multiple images easier. This plugin can also make use of OpenLP&apos;s &quot;timed looping&quot; feature to create a slide show that runs automatically. In addition to this, images from the plugin can be used to override the current theme&apos;s background, which renders text-based items like songs with the selected image as a background instead of the background provided by the theme.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="73"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="72"/>
         <source>Load a new Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="openlp/plugins/images/imageplugin.py" line="74"/>
+        <source>Add a new Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="openlp/plugins/images/imageplugin.py" line="75"/>
-        <source>Add a new Image</source>
+        <source>Edit the selected Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/plugins/images/imageplugin.py" line="76"/>
-        <source>Edit the selected Image</source>
+        <source>Delete the selected Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/plugins/images/imageplugin.py" line="77"/>
-        <source>Delete the selected Image</source>
+        <source>Preview the selected Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/plugins/images/imageplugin.py" line="78"/>
-        <source>Preview the selected Image</source>
+        <source>Send the selected Image live</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/plugins/images/imageplugin.py" line="79"/>
-        <source>Send the selected Image live</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="80"/>
         <source>Add the selected Image to the service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="openlp/plugins/images/imageplugin.py" line="63"/>
+        <source>Image</source>
+        <comment>name singular</comment>
+        <translation type="unfinished">Imagen</translation>
+    </message>
+    <message>
         <location filename="openlp/plugins/images/imageplugin.py" line="64"/>
-        <source>Image</source>
-        <comment>name singular</comment>
-        <translation type="unfinished">Imagen</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="65"/>
         <source>Images</source>
         <comment>name plural</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="69"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="68"/>
         <source>Images</source>
         <comment>container title</comment>
         <translation type="unfinished"></translation>
@@ -938,59 +938,59 @@
 <context>
     <name>MediaPlugin</name>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="70"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="93"/>
         <source>&lt;strong&gt;Media Plugin&lt;/strong&gt;&lt;br /&gt;The media plugin provides playback of audio and video.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="89"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="112"/>
         <source>Load a new Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="91"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="114"/>
         <source>Add a new Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="92"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="115"/>
         <source>Edit the selected Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="93"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="116"/>
         <source>Delete the selected Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="94"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="117"/>
         <source>Preview the selected Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="95"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="118"/>
         <source>Send the selected Media live</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="96"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="119"/>
         <source>Add the selected Media to the service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="80"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="103"/>
         <source>Media</source>
         <comment>name singular</comment>
         <translation type="unfinished">Medios</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="81"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="104"/>
         <source>Media</source>
         <comment>name plural</comment>
         <translation type="unfinished">Medios</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="85"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="108"/>
         <source>Media</source>
         <comment>container title</comment>
         <translation type="unfinished">Medios</translation>
@@ -1089,14 +1089,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/aboutdialog.py" line="224"/>
-        <source>Copyright &#xa9; 2004-2011 Raoul Snyman
-Portions copyright &#xa9; 2004-2011 Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri,
-Meinert Jordan, Andreas Preikschat, Christian Richter, Philip
-Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, CarstennTinggaard, Frode Woldsund</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="openlp/core/ui/aboutdialog.py" line="231"/>
         <source>This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.</source>
         <translation type="unfinished"></translation>
@@ -1171,6 +1163,15 @@
     He has set us free.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="openlp/core/ui/aboutdialog.py" line="224"/>
+        <source>Copyright &#xa9; 2004-2011 Raoul Snyman
+Portions copyright &#xa9; 2004-2011 Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri,
+Meinert Jordan, Andreas Preikschat, Christian Richter, Philip
+Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carsten
+Tinggaard, Frode Woldsund</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OpenLP.AdvancedTab</name>
@@ -1274,17 +1275,17 @@
     </message>
     <message>
         <location filename="openlp/core/ui/displaytagdialog.py" line="145"/>
-        <source>Tag id</source>
+        <source>Tag Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/core/ui/displaytagdialog.py" line="147"/>
-        <source>Start Html</source>
+        <source>Start HTML</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/core/ui/displaytagdialog.py" line="149"/>
-        <source>End Html</source>
+        <source>End HTML</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1422,151 +1423,200 @@
 <context>
     <name>OpenLP.FirstTimeLanguageForm</name>
     <message>
-        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="60"/>
-        <source>Initial Set up Language</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="62"/>
-        <source>Select the language you&apos;d like to use in OpenLP.</source>
+        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="61"/>
+        <source>Select Translation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="63"/>
+        <source>Choose the translation you&apos;d like to use in OpenLP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="65"/>
+        <source>Translation:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpenLP.FirstTimeWizard</name>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="154"/>
-        <source>Songs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="63"/>
-        <source>Bibles</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="64"/>
-        <source>Themes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="65"/>
-        <source>Starting Updates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="67"/>
-        <source>Downloading %s</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="140"/>
+        <location filename="openlp/core/ui/firsttimeform.py" line="61"/>
+        <source>Downloading %s...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="212"/>
+        <source>Download complete. Click the finish button to start OpenLP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="221"/>
+        <source>Enabling selected plugins...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="244"/>
+        <source>Overwrite Existing Songs?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="244"/>
+        <source>Your songs database already exists and your current songs will be permanently lost, are you sure you want to replace it ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="193"/>
         <source>First Time Wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="142"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="195"/>
         <source>Welcome to the First Time Wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="146"/>
-        <source>This wizard will help you to configure OpenLP for initial use . Click the next button below to start the process of selection your initial options. </source>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="199"/>
+        <source>This wizard will help you to configure OpenLP for initial use. Click the next button below to start the process of selection your initial options. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="150"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="203"/>
         <source>Activate required Plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="152"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="205"/>
         <source>Select the Plugins you wish to use. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="155"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="207"/>
+        <source>Songs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="208"/>
         <source>Custom Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="157"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="210"/>
         <source>Bible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="158"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="211"/>
         <source>Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="160"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="213"/>
         <source>Presentations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="162"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="215"/>
         <source>Media (Audio and Video)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="164"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="217"/>
         <source>Allow remote access</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="166"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="219"/>
         <source>Monitor Song Usage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="168"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="221"/>
         <source>Allow Alerts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="170"/>
-        <source>Download Samples from OpenLP.org</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="172"/>
-        <source>Select samples to downlaod and install for use.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="175"/>
-        <source>No Internet connection found so unable to download any default files.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="178"/>
-        <source>Download Example Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="180"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="223"/>
+        <source>No Internet Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="225"/>
+        <source>Unable to detect an Internet connection.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="228"/>
+        <source>No Internet connection was found. The First Time Wizard needs an Internet connection in order to be able to download sample songs, Bibles and themes.
+
+To re-run the First Time Wizard and import this sample data at a later stage, press the cancel button now, check your Internet connection, and restart OpenLP.
+
+To cancel the First Time Wizard completely, press the finish button now.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="236"/>
+        <source>Sample Songs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="238"/>
+        <source>Select and download public domain songs.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="240"/>
+        <source>Sample Bibles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="242"/>
+        <source>Select and download free Bibles.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="244"/>
+        <source>Sample Themes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="246"/>
+        <source>Select and download sample themes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="248"/>
         <source>Default Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="182"/>
-        <source>Set up default values to be used by OpenLP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="184"/>
-        <source>Default output display</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="186"/>
-        <source>Select the default Theme</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="188"/>
-        <source>Press finish to apply all your changes and start OpenLP</source>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="250"/>
+        <source>Set up default settings to be used by OpenLP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="252"/>
+        <source>Setting Up And Importing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="254"/>
+        <source>Please wait while OpenLP is set up and your data is imported.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="256"/>
+        <source>Default output display:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="258"/>
+        <source>Select default theme:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="260"/>
+        <source>Starting configuration process...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1691,12 +1741,12 @@
 <context>
     <name>OpenLP.LanguageManager</name>
     <message>
-        <location filename="openlp/core/utils/languagemanager.py" line="126"/>
+        <location filename="openlp/core/utils/languagemanager.py" line="130"/>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/utils/languagemanager.py" line="126"/>
+        <location filename="openlp/core/utils/languagemanager.py" line="130"/>
         <source>Please restart OpenLP to use your new language setting.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2002,17 +2052,12 @@
         <translation type="unfinished">Sitio &amp;Web</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="428"/>
-        <source>&amp;Auto Detect</source>
+        <location filename="openlp/core/ui/mainwindow.py" line="434"/>
+        <source>Use the system language, if available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/core/ui/mainwindow.py" line="430"/>
-        <source>Use the system language, if available.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="434"/>
         <source>Set the interface language to %s</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2057,29 +2102,29 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="644"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="642"/>
         <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="648"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="646"/>
         <source>OpenLP Version Updated</source>
         <translation type="unfinished">VersiÃ³n de OpenLP Actualizada</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="686"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="684"/>
         <source>OpenLP Main Display Blanked</source>
         <translation type="unfinished">Pantalla Principal de OpenLP en Blanco</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="686"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="684"/>
         <source>The Main Display has been blanked out</source>
         <translation type="unfinished">La Pantalla Principal esta en negro</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="895"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="893"/>
         <source>Default Theme: %s</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2095,12 +2140,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="817"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="815"/>
         <source>Close OpenLP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="817"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="815"/>
         <source>Are you sure you want to close OpenLP?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2129,11 +2174,16 @@
         <source>&amp;Configure Display Tags</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="openlp/core/ui/mainwindow.py" line="432"/>
+        <source>&amp;Autodetect</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OpenLP.MediaManagerItem</name>
     <message>
-        <location filename="openlp/core/lib/__init__.py" line="287"/>
+        <location filename="openlp/core/lib/__init__.py" line="286"/>
         <source>No Items Selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2411,28 +2461,28 @@
         <translation type="unfinished">&amp;Cambiar Tema de Ãtem</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="493"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="521"/>
         <source>File is not a valid service.
 The content encoding is not UTF-8.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="525"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="553"/>
         <source>File is not a valid service.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="1051"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="1079"/>
         <source>Missing Display Handler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="1017"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="1045"/>
         <source>Your item cannot be displayed as there is no handler to display it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="1051"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="1079"/>
         <source>Your item cannot be displayed as the plugin required to display it is missing or inactive</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2462,7 +2512,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="466"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="494"/>
         <source>OpenLP Service Files (*.osz)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3943,99 +3993,109 @@
         <translation type="unfinished">Archivo de Salida</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="92"/>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="101"/>
         <source>usage_detail_%s_%s.txt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="114"/>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="123"/>
         <source>Report Creation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="114"/>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="123"/>
         <source>Report 
 %s 
 has been successfully created. </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="92"/>
+        <source>Output Path Not Selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="92"/>
+        <source>You have not set a valid output location for your song usage report. Please select an existing path on your computer.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SongsPlugin</name>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="104"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="103"/>
         <source>&amp;Song</source>
         <translation type="unfinished">&amp;CanciÃ³n</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="85"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="84"/>
         <source>Import songs using the import wizard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="183"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="182"/>
         <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 type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="126"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="125"/>
         <source>&amp;Re-index Songs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="128"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="127"/>
         <source>Re-index the songs database to improve searching and ordering.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="141"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="140"/>
         <source>Reindexing songs...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="237"/>
+        <source>Add a new Song</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="openlp/plugins/songs/songsplugin.py" line="238"/>
-        <source>Add a new Song</source>
+        <source>Edit the selected Song</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/plugins/songs/songsplugin.py" line="239"/>
-        <source>Edit the selected Song</source>
+        <source>Delete the selected Song</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/plugins/songs/songsplugin.py" line="240"/>
-        <source>Delete the selected Song</source>
+        <source>Preview the selected Song</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/plugins/songs/songsplugin.py" line="241"/>
-        <source>Preview the selected Song</source>
+        <source>Send the selected Song live</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/plugins/songs/songsplugin.py" line="242"/>
-        <source>Send the selected Song live</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="243"/>
         <source>Add the selected Song to the service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="227"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="226"/>
         <source>Song</source>
         <comment>name singular</comment>
         <translation type="unfinished">CanciÃ³n</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="228"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="227"/>
         <source>Songs</source>
         <comment>name plural</comment>
         <translation type="unfinished">Canciones</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="232"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="231"/>
         <source>Songs</source>
         <comment>container title</comment>
         <translation type="unfinished">Canciones</translation>
@@ -4129,7 +4189,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="106"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="105"/>
         <source>Exports songs using the export wizard.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4585,12 +4645,12 @@
         <translation type="unfinished">Letra</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="318"/>
+        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="321"/>
         <source>Delete Song(s)?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="400"/>
+        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="403"/>
         <source>CCLI License: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -4600,7 +4660,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="318"/>
+        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="321"/>
         <source>Are you sure you want to delete the %n selected song(s)?</source>
         <translation type="unfinished">
             <numerusform></numerusform>

=== modified file 'resources/i18n/et.ts'
--- resources/i18n/et.ts	2011-03-09 16:16:40 +0000
+++ resources/i18n/et.ts	2011-03-13 10:53:56 +0000
@@ -211,7 +211,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="540"/>
+        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="539"/>
         <source>You cannot combine single and dual Bible verse search results. Do you want to delete your search results and start a new search?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -840,59 +840,59 @@
 <context>
     <name>ImagePlugin</name>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="45"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="44"/>
         <source>&lt;strong&gt;Image Plugin&lt;/strong&gt;&lt;br /&gt;The image plugin provides displaying of images.&lt;br /&gt;One of the distinguishing features of this plugin is the ability to group a number of images together in the service manager, making the displaying of multiple images easier. This plugin can also make use of OpenLP&apos;s &quot;timed looping&quot; feature to create a slide show that runs automatically. In addition to this, images from the plugin can be used to override the current theme&apos;s background, which renders text-based items like songs with the selected image as a background instead of the background provided by the theme.</source>
         <translation>&lt;strong&gt;Pildiplugin&lt;/strong&gt;&lt;br /&gt;Pildiplugin vÃµimaldab piltide kuvamise.&lt;br /&gt;Ãœks selle plugina One of the distinguishing features of this plugin is the ability to group a number of images together in the service manager, making the displaying of multiple images easier. This plugin can also make use of OpenLP&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.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="73"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="72"/>
         <source>Load a new Image</source>
         <translation>Uue pildi laadimine</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="75"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="74"/>
         <source>Add a new Image</source>
         <translation>Uue pildi lisamine</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="76"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="75"/>
         <source>Edit the selected Image</source>
         <translation>Valitud pildi muutmine</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="77"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="76"/>
         <source>Delete the selected Image</source>
         <translation>Valitud pildi kustutamine</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="78"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="77"/>
         <source>Preview the selected Image</source>
         <translation>Valitud pildi eelvaatlemine</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="79"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="78"/>
         <source>Send the selected Image live</source>
         <translation>Valitud pildi saatmine ekraanile</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="80"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="79"/>
         <source>Add the selected Image to the service</source>
         <translation>Valitud pildi lisamine teenistusele</translation>
     </message>
     <message>
+        <location filename="openlp/plugins/images/imageplugin.py" line="63"/>
+        <source>Image</source>
+        <comment>name singular</comment>
+        <translation>Pilt</translation>
+    </message>
+    <message>
         <location filename="openlp/plugins/images/imageplugin.py" line="64"/>
-        <source>Image</source>
-        <comment>name singular</comment>
-        <translation>Pilt</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="65"/>
         <source>Images</source>
         <comment>name plural</comment>
         <translation>Pildid</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="69"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="68"/>
         <source>Images</source>
         <comment>container title</comment>
         <translation>Pildid</translation>
@@ -948,59 +948,59 @@
 <context>
     <name>MediaPlugin</name>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="70"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="93"/>
         <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;Meediaplugin&lt;/strong&gt;&lt;br /&gt;Meedia plugin vÃµimaldab audio- ja videofailide taasesitamist.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="89"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="112"/>
         <source>Load a new Media</source>
         <translation>Uue meedia laadimine</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="91"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="114"/>
         <source>Add a new Media</source>
         <translation>Uue meedia lisamine</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="92"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="115"/>
         <source>Edit the selected Media</source>
         <translation>Valitud meedia muutmine</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="93"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="116"/>
         <source>Delete the selected Media</source>
         <translation>Valitud meedia kustutamine</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="94"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="117"/>
         <source>Preview the selected Media</source>
         <translation>Valitud meedia eelvaatlus</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="95"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="118"/>
         <source>Send the selected Media live</source>
         <translation>Valitud meedia saatmine ekraanile</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="96"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="119"/>
         <source>Add the selected Media to the service</source>
         <translation>Valitud meedia lisamine teenistusse</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="80"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="103"/>
         <source>Media</source>
         <comment>name singular</comment>
         <translation>Meedia</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="81"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="104"/>
         <source>Media</source>
         <comment>name plural</comment>
         <translation>Meedia</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="85"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="108"/>
         <source>Media</source>
         <comment>container title</comment>
         <translation>Meedia</translation>
@@ -1105,14 +1105,6 @@
 OpenLP on kirjutatud vabatahtlike poolt. Kui sulle meeldiks nÃ¤ha rohkem kristlikku tarkvara, siis vÃµid annetada, selleks klÃµpsa alumisele nupule.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/aboutdialog.py" line="224"/>
-        <source>Copyright &#xa9; 2004-2011 Raoul Snyman
-Portions copyright &#xa9; 2004-2011 Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri,
-Meinert Jordan, Andreas Preikschat, Christian Richter, Philip
-Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, CarstennTinggaard, Frode Woldsund</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="openlp/core/ui/aboutdialog.py" line="231"/>
         <source>This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.</source>
         <translation type="unfinished"></translation>
@@ -1187,6 +1179,15 @@
     He has set us free.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="openlp/core/ui/aboutdialog.py" line="224"/>
+        <source>Copyright &#xa9; 2004-2011 Raoul Snyman
+Portions copyright &#xa9; 2004-2011 Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri,
+Meinert Jordan, Andreas Preikschat, Christian Richter, Philip
+Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carsten
+Tinggaard, Frode Woldsund</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OpenLP.AdvancedTab</name>
@@ -1290,18 +1291,18 @@
     </message>
     <message>
         <location filename="openlp/core/ui/displaytagdialog.py" line="145"/>
-        <source>Tag id</source>
-        <translation>Sildi ID</translation>
+        <source>Tag Id</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/core/ui/displaytagdialog.py" line="147"/>
-        <source>Start Html</source>
-        <translation>HTMLi algus</translation>
+        <source>Start HTML</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/core/ui/displaytagdialog.py" line="149"/>
-        <source>End Html</source>
-        <translation>HTMLi lÃµpp</translation>
+        <source>End HTML</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1466,151 +1467,200 @@
 <context>
     <name>OpenLP.FirstTimeLanguageForm</name>
     <message>
-        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="60"/>
-        <source>Initial Set up Language</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="62"/>
-        <source>Select the language you&apos;d like to use in OpenLP.</source>
+        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="61"/>
+        <source>Select Translation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="63"/>
+        <source>Choose the translation you&apos;d like to use in OpenLP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="65"/>
+        <source>Translation:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpenLP.FirstTimeWizard</name>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="154"/>
-        <source>Songs</source>
-        <translation type="unfinished">Laulud</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="63"/>
-        <source>Bibles</source>
-        <translation type="unfinished">Piiblid</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="64"/>
-        <source>Themes</source>
-        <translation type="unfinished">Kujundused</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="65"/>
-        <source>Starting Updates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="67"/>
-        <source>Downloading %s</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="140"/>
+        <location filename="openlp/core/ui/firsttimeform.py" line="61"/>
+        <source>Downloading %s...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="212"/>
+        <source>Download complete. Click the finish button to start OpenLP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="221"/>
+        <source>Enabling selected plugins...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="244"/>
+        <source>Overwrite Existing Songs?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="244"/>
+        <source>Your songs database already exists and your current songs will be permanently lost, are you sure you want to replace it ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="193"/>
         <source>First Time Wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="142"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="195"/>
         <source>Welcome to the First Time Wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="146"/>
-        <source>This wizard will help you to configure OpenLP for initial use . Click the next button below to start the process of selection your initial options. </source>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="199"/>
+        <source>This wizard will help you to configure OpenLP for initial use. Click the next button below to start the process of selection your initial options. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="150"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="203"/>
         <source>Activate required Plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="152"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="205"/>
         <source>Select the Plugins you wish to use. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="155"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="207"/>
+        <source>Songs</source>
+        <translation type="unfinished">Laulud</translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="208"/>
         <source>Custom Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="157"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="210"/>
         <source>Bible</source>
         <translation type="unfinished">Piibel</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="158"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="211"/>
         <source>Images</source>
         <translation type="unfinished">Pildid</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="160"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="213"/>
         <source>Presentations</source>
         <translation type="unfinished">Esitlused</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="162"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="215"/>
         <source>Media (Audio and Video)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="164"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="217"/>
         <source>Allow remote access</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="166"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="219"/>
         <source>Monitor Song Usage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="168"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="221"/>
         <source>Allow Alerts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="170"/>
-        <source>Download Samples from OpenLP.org</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="172"/>
-        <source>Select samples to downlaod and install for use.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="175"/>
-        <source>No Internet connection found so unable to download any default files.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="178"/>
-        <source>Download Example Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="180"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="223"/>
+        <source>No Internet Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="225"/>
+        <source>Unable to detect an Internet connection.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="228"/>
+        <source>No Internet connection was found. The First Time Wizard needs an Internet connection in order to be able to download sample songs, Bibles and themes.
+
+To re-run the First Time Wizard and import this sample data at a later stage, press the cancel button now, check your Internet connection, and restart OpenLP.
+
+To cancel the First Time Wizard completely, press the finish button now.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="236"/>
+        <source>Sample Songs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="238"/>
+        <source>Select and download public domain songs.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="240"/>
+        <source>Sample Bibles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="242"/>
+        <source>Select and download free Bibles.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="244"/>
+        <source>Sample Themes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="246"/>
+        <source>Select and download sample themes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="248"/>
         <source>Default Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="182"/>
-        <source>Set up default values to be used by OpenLP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="184"/>
-        <source>Default output display</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="186"/>
-        <source>Select the default Theme</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="188"/>
-        <source>Press finish to apply all your changes and start OpenLP</source>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="250"/>
+        <source>Set up default settings to be used by OpenLP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="252"/>
+        <source>Setting Up And Importing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="254"/>
+        <source>Please wait while OpenLP is set up and your data is imported.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="256"/>
+        <source>Default output display:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="258"/>
+        <source>Select default theme:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="260"/>
+        <source>Starting configuration process...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1735,12 +1785,12 @@
 <context>
     <name>OpenLP.LanguageManager</name>
     <message>
-        <location filename="openlp/core/utils/languagemanager.py" line="126"/>
+        <location filename="openlp/core/utils/languagemanager.py" line="130"/>
         <source>Language</source>
         <translation>Keel</translation>
     </message>
     <message>
-        <location filename="openlp/core/utils/languagemanager.py" line="126"/>
+        <location filename="openlp/core/utils/languagemanager.py" line="130"/>
         <source>Please restart OpenLP to use your new language setting.</source>
         <translation>Uue keele kasutamiseks kÃ¤ivita OpenLP uuesti.</translation>
     </message>
@@ -2046,17 +2096,12 @@
         <translation>&amp;Veebileht</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="428"/>
-        <source>&amp;Auto Detect</source>
-        <translation>&amp;Isetuvastus</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="430"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="434"/>
         <source>Use the system language, if available.</source>
         <translation>Kui saadaval, kasutatakse sÃ¼steemi keelt.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="434"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="430"/>
         <source>Set the interface language to %s</source>
         <translation>Kasutajaliidese keeleks %s mÃ¤Ã¤ramine</translation>
     </message>
@@ -2101,27 +2146,27 @@
         <translation>Vaate reÅ¾iimiks ekraanivaate valimine.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="648"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="646"/>
         <source>OpenLP Version Updated</source>
         <translation>OpenLP uuendus</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="686"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="684"/>
         <source>OpenLP Main Display Blanked</source>
         <translation>OpenLP peakuva on tÃ¼hi</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="686"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="684"/>
         <source>The Main Display has been blanked out</source>
         <translation>Peakuva on tÃ¼hi</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="895"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="893"/>
         <source>Default Theme: %s</source>
         <translation>Vaikimisi kujundus: %s</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="644"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="642"/>
         <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>
@@ -2141,12 +2186,12 @@
         <translation>&amp;Kiirklahvide seadistamine...</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="817"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="815"/>
         <source>Close OpenLP</source>
         <translation>OpenLP sulgemine</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="817"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="815"/>
         <source>Are you sure you want to close OpenLP?</source>
         <translation>Kas oled kindel, et tahad OpenLP sulgeda?</translation>
     </message>
@@ -2175,11 +2220,16 @@
         <source>Open the folder where songs, bibles and other data resides.</source>
         <translation>Laulude, Piiblite ja muude andmete kataloogi avamine.</translation>
     </message>
+    <message>
+        <location filename="openlp/core/ui/mainwindow.py" line="432"/>
+        <source>&amp;Autodetect</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OpenLP.MediaManagerItem</name>
     <message>
-        <location filename="openlp/core/lib/__init__.py" line="287"/>
+        <location filename="openlp/core/lib/__init__.py" line="286"/>
         <source>No Items Selected</source>
         <translation>Ãœhtegi elementi pole valitud</translation>
     </message>
@@ -2457,29 +2507,29 @@
         <translation>&amp;Muuda elemendi kujundust</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="493"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="521"/>
         <source>File is not a valid service.
 The content encoding is not UTF-8.</source>
         <translation>Fail ei ole sobiv teenistus.
 Sisu ei ole UTF-8 kodeeringus.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="525"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="553"/>
         <source>File is not a valid service.</source>
         <translation>Fail pole sobiv teenistus.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="1051"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="1079"/>
         <source>Missing Display Handler</source>
         <translation>Puudub kuvakÃ¤sitleja</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="1017"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="1045"/>
         <source>Your item cannot be displayed as there is no handler to display it</source>
         <translation>Seda elementi pole vÃµimalik nÃ¤idata ekraanil, kuna puudub seda kÃ¤sitsev programm</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="1051"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="1079"/>
         <source>Your item cannot be displayed as the plugin required to display it is missing or inactive</source>
         <translation>Seda elementi pole vÃµimalik nÃ¤idata ekraanil, kuna puudub seda kÃ¤sitsev programm</translation>
     </message>
@@ -2509,7 +2559,7 @@
         <translation>Faili avamine</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="466"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="494"/>
         <source>OpenLP Service Files (*.osz)</source>
         <translation>OpenLP teenistuse failid (*.osz)</translation>
     </message>
@@ -3991,17 +4041,17 @@
         <translation>VÃ¤ljundfaili asukoht</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="92"/>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="101"/>
         <source>usage_detail_%s_%s.txt</source>
         <translation>laulukasutuse_andmed_%s_%s.txt</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="114"/>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="123"/>
         <source>Report Creation</source>
         <translation>Raporti koostamine</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="114"/>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="123"/>
         <source>Report 
 %s 
 has been successfully created. </source>
@@ -4009,83 +4059,93 @@
 %s
 on edukalt loodud.</translation>
     </message>
+    <message>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="92"/>
+        <source>Output Path Not Selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="92"/>
+        <source>You have not set a valid output location for your song usage report. Please select an existing path on your computer.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SongsPlugin</name>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="104"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="103"/>
         <source>&amp;Song</source>
         <translation>&amp;Laul</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="85"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="84"/>
         <source>Import songs using the import wizard.</source>
         <translation>Laulude importimine importimise nÃµustajaga.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="183"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="182"/>
         <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;Laulude plugin&lt;/strong&gt;&lt;br /&gt;See plugin vÃµimaldab laulude kuvamise ja haldamise.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="126"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="125"/>
         <source>&amp;Re-index Songs</source>
         <translation>&amp;Indekseeri laulud uuesti</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="128"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="127"/>
         <source>Re-index the songs database to improve searching and ordering.</source>
         <translation>Laulude andmebaasi kordusindekseerimine, et parendada otsimist ja jÃ¤rjekorda.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="141"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="140"/>
         <source>Reindexing songs...</source>
         <translation>Laulude kordusindekseerimine...</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="238"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="237"/>
         <source>Add a new Song</source>
         <translation>Uue laulu lisamine</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="239"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="238"/>
         <source>Edit the selected Song</source>
         <translation>Valitud laulu muutmine</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="240"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="239"/>
         <source>Delete the selected Song</source>
         <translation>Valitud laulu kustutamine</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="241"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="240"/>
         <source>Preview the selected Song</source>
         <translation>Valitud laulu eelvaatlus</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="242"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="241"/>
         <source>Send the selected Song live</source>
         <translation>Valitud laulu saatmine ekraanile</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="243"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="242"/>
         <source>Add the selected Song to the service</source>
         <translation>Valitud laulu lisamine teenistusele</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="227"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="226"/>
         <source>Song</source>
         <comment>name singular</comment>
         <translation>Laul</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="228"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="227"/>
         <source>Songs</source>
         <comment>name plural</comment>
         <translation>Laulud</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="232"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="231"/>
         <source>Songs</source>
         <comment>container title</comment>
         <translation>Laulud</translation>
@@ -4181,7 +4241,7 @@
 Kodeering on vajalik mÃ¤rkide Ãµige esitamise jaoks.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="106"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="105"/>
         <source>Exports songs using the export wizard.</source>
         <translation>Eksportimise nÃµustaja abil laulude eksportimine.</translation>
     </message>
@@ -4637,12 +4697,12 @@
         <translation>LaulusÃµnad</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="318"/>
+        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="321"/>
         <source>Delete Song(s)?</source>
         <translation>Kas kustutada laul(ud)?</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="400"/>
+        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="403"/>
         <source>CCLI License: </source>
         <translation>CCLI litsents: </translation>
     </message>
@@ -4652,7 +4712,7 @@
         <translation>Kogu laulust</translation>
     </message>
     <message numerus="yes">
-        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="318"/>
+        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="321"/>
         <source>Are you sure you want to delete the %n selected song(s)?</source>
         <translation type="unfinished">
             <numerusform></numerusform>

=== modified file 'resources/i18n/fr.ts'
--- resources/i18n/fr.ts	2011-03-09 16:16:40 +0000
+++ resources/i18n/fr.ts	2011-03-13 10:53:56 +0000
@@ -210,7 +210,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="540"/>
+        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="539"/>
         <source>You cannot combine single and dual Bible verse search results. Do you want to delete your search results and start a new search?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -832,60 +832,60 @@
 <context>
     <name>ImagePlugin</name>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="45"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="44"/>
         <source>&lt;strong&gt;Image Plugin&lt;/strong&gt;&lt;br /&gt;The image plugin provides displaying of images.&lt;br /&gt;One of the distinguishing features of this plugin is the ability to group a number of images together in the service manager, making the displaying of multiple images easier. This plugin can also make use of OpenLP&apos;s &quot;timed looping&quot; feature to create a slide show that runs automatically. In addition to this, images from the plugin can be used to override the current theme&apos;s background, which renders text-based items like songs with the selected image as a background instead of the background provided by the theme.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="openlp/plugins/images/imageplugin.py" line="63"/>
+        <source>Image</source>
+        <comment>name singular</comment>
+        <translation>Image</translation>
+    </message>
+    <message>
         <location filename="openlp/plugins/images/imageplugin.py" line="64"/>
-        <source>Image</source>
-        <comment>name singular</comment>
-        <translation>Image</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="65"/>
         <source>Images</source>
         <comment>name plural</comment>
         <translation>Images</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="69"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="68"/>
         <source>Images</source>
         <comment>container title</comment>
         <translation type="unfinished">Images</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="73"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="72"/>
         <source>Load a new Image</source>
         <translation>Charge une nouvelle image</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="75"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="74"/>
         <source>Add a new Image</source>
         <translation>Ajoute une nouvelle image</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="76"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="75"/>
         <source>Edit the selected Image</source>
         <translation>Ã‰dite l&apos;image sÃ©lectionnÃ©e</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="77"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="76"/>
         <source>Delete the selected Image</source>
         <translation>Efface l&apos;image sÃ©lectionnÃ©e</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="78"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="77"/>
         <source>Preview the selected Image</source>
         <translation>PrÃ©visualise l&apos;image sÃ©lectionnÃ©e</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="79"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="78"/>
         <source>Send the selected Image live</source>
         <translation>Envoie l&apos;image sÃ©lectionnÃ©e en direct</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="80"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="79"/>
         <source>Add the selected Image to the service</source>
         <translation>Ajoute l&apos;image sÃ©lectionnÃ©e au service</translation>
     </message>
@@ -941,60 +941,60 @@
 <context>
     <name>MediaPlugin</name>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="70"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="93"/>
         <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;Module mÃ©dia&lt;/strong&gt;&lt;br /&gt;Le module mÃ©dia permet une lecture de contenu audio et vidÃ©o.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="80"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="103"/>
         <source>Media</source>
         <comment>name singular</comment>
         <translation>MÃ©dias</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="81"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="104"/>
         <source>Media</source>
         <comment>name plural</comment>
         <translation type="unfinished">MÃ©dias</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="85"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="108"/>
         <source>Media</source>
         <comment>container title</comment>
         <translation type="unfinished">MÃ©dias</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="89"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="112"/>
         <source>Load a new Media</source>
         <translation>Charge un nouveau mÃ©dia</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="91"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="114"/>
         <source>Add a new Media</source>
         <translation>Ajoute un nouveau mÃ©dia</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="92"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="115"/>
         <source>Edit the selected Media</source>
         <translation>Ã‰dite le mÃ©dia sÃ©lectionnÃ©</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="93"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="116"/>
         <source>Delete the selected Media</source>
         <translation>Efface le mÃ©dia sÃ©lectionnÃ©</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="94"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="117"/>
         <source>Preview the selected Media</source>
         <translation>PrÃ©visualise le mÃ©dia sÃ©lectionnÃ©</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="95"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="118"/>
         <source>Send the selected Media live</source>
         <translation>Envoie le mÃ©dia en direct</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="96"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="119"/>
         <source>Add the selected Media to the service</source>
         <translation type="unfinished">Ajouter le mÃ©dia sÃ©lectionnÃ© au service</translation>
     </message>
@@ -1092,14 +1092,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/aboutdialog.py" line="224"/>
-        <source>Copyright &#xa9; 2004-2011 Raoul Snyman
-Portions copyright &#xa9; 2004-2011 Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri,
-Meinert Jordan, Andreas Preikschat, Christian Richter, Philip
-Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, CarstennTinggaard, Frode Woldsund</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="openlp/core/ui/aboutdialog.py" line="231"/>
         <source>This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.</source>
         <translation type="unfinished"></translation>
@@ -1174,6 +1166,15 @@
     He has set us free.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="openlp/core/ui/aboutdialog.py" line="224"/>
+        <source>Copyright &#xa9; 2004-2011 Raoul Snyman
+Portions copyright &#xa9; 2004-2011 Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri,
+Meinert Jordan, Andreas Preikschat, Christian Richter, Philip
+Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carsten
+Tinggaard, Frode Woldsund</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OpenLP.AdvancedTab</name>
@@ -1277,17 +1278,17 @@
     </message>
     <message>
         <location filename="openlp/core/ui/displaytagdialog.py" line="145"/>
-        <source>Tag id</source>
+        <source>Tag Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/core/ui/displaytagdialog.py" line="147"/>
-        <source>Start Html</source>
+        <source>Start HTML</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/core/ui/displaytagdialog.py" line="149"/>
-        <source>End Html</source>
+        <source>End HTML</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1426,151 +1427,200 @@
 <context>
     <name>OpenLP.FirstTimeLanguageForm</name>
     <message>
-        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="60"/>
-        <source>Initial Set up Language</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="62"/>
-        <source>Select the language you&apos;d like to use in OpenLP.</source>
+        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="61"/>
+        <source>Select Translation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="63"/>
+        <source>Choose the translation you&apos;d like to use in OpenLP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="65"/>
+        <source>Translation:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpenLP.FirstTimeWizard</name>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="154"/>
-        <source>Songs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="63"/>
-        <source>Bibles</source>
-        <translation type="unfinished">Bibles</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="64"/>
-        <source>Themes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="65"/>
-        <source>Starting Updates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="67"/>
-        <source>Downloading %s</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="140"/>
+        <location filename="openlp/core/ui/firsttimeform.py" line="61"/>
+        <source>Downloading %s...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="212"/>
+        <source>Download complete. Click the finish button to start OpenLP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="221"/>
+        <source>Enabling selected plugins...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="244"/>
+        <source>Overwrite Existing Songs?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="244"/>
+        <source>Your songs database already exists and your current songs will be permanently lost, are you sure you want to replace it ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="193"/>
         <source>First Time Wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="142"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="195"/>
         <source>Welcome to the First Time Wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="146"/>
-        <source>This wizard will help you to configure OpenLP for initial use . Click the next button below to start the process of selection your initial options. </source>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="199"/>
+        <source>This wizard will help you to configure OpenLP for initial use. Click the next button below to start the process of selection your initial options. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="150"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="203"/>
         <source>Activate required Plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="152"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="205"/>
         <source>Select the Plugins you wish to use. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="155"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="207"/>
+        <source>Songs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="208"/>
         <source>Custom Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="157"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="210"/>
         <source>Bible</source>
         <translation type="unfinished">Bible</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="158"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="211"/>
         <source>Images</source>
         <translation type="unfinished">Images</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="160"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="213"/>
         <source>Presentations</source>
         <translation type="unfinished">PrÃ©sentations</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="162"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="215"/>
         <source>Media (Audio and Video)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="164"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="217"/>
         <source>Allow remote access</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="166"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="219"/>
         <source>Monitor Song Usage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="168"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="221"/>
         <source>Allow Alerts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="170"/>
-        <source>Download Samples from OpenLP.org</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="172"/>
-        <source>Select samples to downlaod and install for use.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="175"/>
-        <source>No Internet connection found so unable to download any default files.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="178"/>
-        <source>Download Example Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="180"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="223"/>
+        <source>No Internet Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="225"/>
+        <source>Unable to detect an Internet connection.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="228"/>
+        <source>No Internet connection was found. The First Time Wizard needs an Internet connection in order to be able to download sample songs, Bibles and themes.
+
+To re-run the First Time Wizard and import this sample data at a later stage, press the cancel button now, check your Internet connection, and restart OpenLP.
+
+To cancel the First Time Wizard completely, press the finish button now.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="236"/>
+        <source>Sample Songs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="238"/>
+        <source>Select and download public domain songs.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="240"/>
+        <source>Sample Bibles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="242"/>
+        <source>Select and download free Bibles.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="244"/>
+        <source>Sample Themes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="246"/>
+        <source>Select and download sample themes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="248"/>
         <source>Default Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="182"/>
-        <source>Set up default values to be used by OpenLP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="184"/>
-        <source>Default output display</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="186"/>
-        <source>Select the default Theme</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="188"/>
-        <source>Press finish to apply all your changes and start OpenLP</source>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="250"/>
+        <source>Set up default settings to be used by OpenLP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="252"/>
+        <source>Setting Up And Importing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="254"/>
+        <source>Please wait while OpenLP is set up and your data is imported.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="256"/>
+        <source>Default output display:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="258"/>
+        <source>Select default theme:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="260"/>
+        <source>Starting configuration process...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1695,12 +1745,12 @@
 <context>
     <name>OpenLP.LanguageManager</name>
     <message>
-        <location filename="openlp/core/utils/languagemanager.py" line="126"/>
+        <location filename="openlp/core/utils/languagemanager.py" line="130"/>
         <source>Language</source>
         <translation>Langage</translation>
     </message>
     <message>
-        <location filename="openlp/core/utils/languagemanager.py" line="126"/>
+        <location filename="openlp/core/utils/languagemanager.py" line="130"/>
         <source>Please restart OpenLP to use your new language setting.</source>
         <translation>Veuillez redÃ©marrer OpenLP pour utiliser votre nouvelle propriÃ©tÃ© de langue.</translation>
     </message>
@@ -2011,17 +2061,12 @@
         <translation>Site &amp;Web</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="428"/>
-        <source>&amp;Auto Detect</source>
-        <translation>DÃ©tection &amp;automatique</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="430"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="434"/>
         <source>Use the system language, if available.</source>
         <translation>Utilise le langage systÃ¨me, si disponible.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="434"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="430"/>
         <source>Set the interface language to %s</source>
         <translation>DÃ©fini la langue de l&apos;interface Ã  %s</translation>
     </message>
@@ -2066,7 +2111,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="644"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="642"/>
         <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>
@@ -2075,32 +2120,32 @@
 Vous pouvez tÃ©lÃ©charger la derniÃ¨re version depuis http://openlp.org/.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="648"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="646"/>
         <source>OpenLP Version Updated</source>
         <translation>Version d&apos;OpenLP mis a jours</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="686"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="684"/>
         <source>OpenLP Main Display Blanked</source>
         <translation>OpenLP affichage principale noirci</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="686"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="684"/>
         <source>The Main Display has been blanked out</source>
         <translation>L&apos;affichage principale a Ã©tÃ© noirci</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="817"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="815"/>
         <source>Close OpenLP</source>
         <translation>Ferme OpenLP</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="817"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="815"/>
         <source>Are you sure you want to close OpenLP?</source>
         <translation>ÃŠtes vous sur de vouloir fermer OpenLP ?</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="895"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="893"/>
         <source>Default Theme: %s</source>
         <translation>ThÃ¨me par dÃ©faut : %s</translation>
     </message>
@@ -2135,11 +2180,16 @@
         <source>&amp;Configure Display Tags</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="openlp/core/ui/mainwindow.py" line="432"/>
+        <source>&amp;Autodetect</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OpenLP.MediaManagerItem</name>
     <message>
-        <location filename="openlp/core/lib/__init__.py" line="287"/>
+        <location filename="openlp/core/lib/__init__.py" line="286"/>
         <source>No Items Selected</source>
         <translation>Pas d&apos;Ã©lÃ©ments sÃ©lectionnÃ©</translation>
     </message>
@@ -2462,34 +2512,34 @@
         <translation>Ouvre un fichier</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="466"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="494"/>
         <source>OpenLP Service Files (*.osz)</source>
         <translation>Fichier service OpenLP (*.osz)</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="493"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="521"/>
         <source>File is not a valid service.
 The content encoding is not UTF-8.</source>
         <translation>Le fichier n&apos;est un service valide.
 Le contenu n&apos;est pas de l&apos;UTF-8.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="525"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="553"/>
         <source>File is not a valid service.</source>
         <translation>Le fichier n&apos;est pas un service valide.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="1051"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="1079"/>
         <source>Missing Display Handler</source>
         <translation>DÃ©lÃ©guÃ© d&apos;affichage manquent</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="1017"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="1045"/>
         <source>Your item cannot be displayed as there is no handler to display it</source>
         <translation>Votre Ã©lÃ©ment ne peut pas Ãªtre affichÃ© il n&apos;y a pas de dÃ©lÃ©guÃ© pour l&apos;afficher</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="1051"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="1079"/>
         <source>Your item cannot be displayed as the plugin required to display it is missing or inactive</source>
         <translation>Votre Ã©lÃ©ment ne peut pas Ãªtre affichÃ© le module nÃ©cessaire pour l&apos;afficher est manquant ou inactif</translation>
     </message>
@@ -3951,22 +4001,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="92"/>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="101"/>
         <source>usage_detail_%s_%s.txt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="114"/>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="123"/>
         <source>Report Creation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="114"/>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="123"/>
         <source>Report 
 %s 
 has been successfully created. </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="92"/>
+        <source>Output Path Not Selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="92"/>
+        <source>You have not set a valid output location for your song usage report. Please select an existing path on your computer.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SongsPlugin</name>
@@ -4059,85 +4119,85 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="104"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="103"/>
         <source>&amp;Song</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="85"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="84"/>
         <source>Import songs using the import wizard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="126"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="125"/>
         <source>&amp;Re-index Songs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="128"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="127"/>
         <source>Re-index the songs database to improve searching and ordering.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="141"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="140"/>
         <source>Reindexing songs...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="183"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="182"/>
         <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 type="unfinished"></translation>
     </message>
     <message>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="226"/>
+        <source>Song</source>
+        <comment>name singular</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="openlp/plugins/songs/songsplugin.py" line="227"/>
-        <source>Song</source>
-        <comment>name singular</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="228"/>
         <source>Songs</source>
         <comment>name plural</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="232"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="231"/>
         <source>Songs</source>
         <comment>container title</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="237"/>
+        <source>Add a new Song</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="openlp/plugins/songs/songsplugin.py" line="238"/>
-        <source>Add a new Song</source>
+        <source>Edit the selected Song</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/plugins/songs/songsplugin.py" line="239"/>
-        <source>Edit the selected Song</source>
+        <source>Delete the selected Song</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/plugins/songs/songsplugin.py" line="240"/>
-        <source>Delete the selected Song</source>
+        <source>Preview the selected Song</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/plugins/songs/songsplugin.py" line="241"/>
-        <source>Preview the selected Song</source>
+        <source>Send the selected Song live</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/plugins/songs/songsplugin.py" line="242"/>
-        <source>Send the selected Song live</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="243"/>
         <source>Add the selected Song to the service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="106"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="105"/>
         <source>Exports songs using the export wizard.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4598,12 +4658,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="318"/>
+        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="321"/>
         <source>Delete Song(s)?</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="318"/>
+        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="321"/>
         <source>Are you sure you want to delete the %n selected song(s)?</source>
         <translation type="unfinished">
             <numerusform></numerusform>
@@ -4611,7 +4671,7 @@
         </translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="400"/>
+        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="403"/>
         <source>CCLI License: </source>
         <translation type="unfinished"></translation>
     </message>

=== modified file 'resources/i18n/hu.ts'
--- resources/i18n/hu.ts	2011-03-09 16:16:40 +0000
+++ resources/i18n/hu.ts	2011-03-13 10:53:56 +0000
@@ -210,7 +210,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="540"/>
+        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="539"/>
         <source>You cannot combine single and dual Bible verse search results. Do you want to delete your search results and start a new search?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -830,59 +830,59 @@
 <context>
     <name>ImagePlugin</name>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="45"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="44"/>
         <source>&lt;strong&gt;Image Plugin&lt;/strong&gt;&lt;br /&gt;The image plugin provides displaying of images.&lt;br /&gt;One of the distinguishing features of this plugin is the ability to group a number of images together in the service manager, making the displaying of multiple images easier. This plugin can also make use of OpenLP&apos;s &quot;timed looping&quot; feature to create a slide show that runs automatically. In addition to this, images from the plugin can be used to override the current theme&apos;s background, which renders text-based items like songs with the selected image as a background instead of the background provided by the theme.</source>
         <translation>&lt;strong&gt;KÃ©p bÅ‘vÃtmÃ©ny&lt;/strong&gt;&lt;br /&gt;A kÃ©p a bÅ‘vÃtmÃ©ny mindenfÃ©le kÃ©p vetÃtÃ©sÃ©t teszi lehetÅ‘vÃ©.&lt;br /&gt;A bÅ‘vÃtmÃ©ny egyik kÃ¼lÃ¶nÃ¶s figyelmet Ã©rdemlÅ‘ kÃ©pessÃ©ge az, hogy kÃ©pes a szolgÃ¡latkezelÅ‘n csoportba foglalni a kÃ©peket, Ãgy kÃ¶nnyebbÃ© tÃ©ve sok kÃ©p vetÃtÃ©sÃ©t. A bÅ‘vÃtmÃ©ny kÃ©pes az OpenLP â€židÅ‘zÃtett kÃ¶rkÃ¶rÃ¶sâ€ lejÃ¡tszÃ¡sra is, amivel a diÃ¡kat automatikusan tudjuk lÃ©ptetni. TovÃ¡bbÃ¡, a bÅ‘vÃtmÃ©nyben megadott kÃ©pekkel felÃ¼lÃrhatjuk a tÃ©ma hÃ¡ttÃ©rkÃ©pÃ©t, amellyel a szÃ¶veg alapÃº elemek, mint pl. a dalok, a megadott hÃ¡ttÃ©rkÃ©ppel jelennek meg, a tÃ©mÃ¡ban beÃ¡llÃtott hÃ¡ttÃ©rkÃ©p helyett.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="73"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="72"/>
         <source>Load a new Image</source>
         <translation>Ãšj kÃ©p betÃ¶ltÃ©se</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="75"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="74"/>
         <source>Add a new Image</source>
         <translation>Ãšj kÃ©p hozzÃ¡adÃ¡sa</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="76"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="75"/>
         <source>Edit the selected Image</source>
         <translation>A kijelÃ¶lt kÃ©p szerkesztÃ©se</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="77"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="76"/>
         <source>Delete the selected Image</source>
         <translation>A kijelÃ¶lt kÃ©p tÃ¶rlÃ©se</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="78"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="77"/>
         <source>Preview the selected Image</source>
         <translation>A kijelÃ¶lt kÃ©p elÅ‘nÃ©zete</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="79"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="78"/>
         <source>Send the selected Image live</source>
         <translation>A kijelÃ¶lt kÃ©p Ã©lÅ‘ adÃ¡sba kÃ¼ldÃ©se</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="80"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="79"/>
         <source>Add the selected Image to the service</source>
         <translation>A kijelÃ¶lt kÃ©p hozzÃ¡adÃ¡sa a szolgÃ¡lathoz</translation>
     </message>
     <message>
+        <location filename="openlp/plugins/images/imageplugin.py" line="63"/>
+        <source>Image</source>
+        <comment>name singular</comment>
+        <translation type="unfinished">KÃ©p</translation>
+    </message>
+    <message>
         <location filename="openlp/plugins/images/imageplugin.py" line="64"/>
-        <source>Image</source>
-        <comment>name singular</comment>
-        <translation type="unfinished">KÃ©p</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="65"/>
         <source>Images</source>
         <comment>name plural</comment>
         <translation type="unfinished">KÃ©pek</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="69"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="68"/>
         <source>Images</source>
         <comment>container title</comment>
         <translation type="unfinished">KÃ©pek</translation>
@@ -938,59 +938,59 @@
 <context>
     <name>MediaPlugin</name>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="70"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="93"/>
         <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;MÃ©dia bÅ‘vÃtmÃ©ny&lt;/strong&gt;&lt;br /&gt;A mÃ©dia bÅ‘vÃtmÃ©ny hangok Ã©s videÃ³k lejÃ¡tszÃ¡sÃ¡t teszi lehetÅ‘vÃ©.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="89"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="112"/>
         <source>Load a new Media</source>
         <translation>Ãšj mÃ©diaÃ¡llomÃ¡ny betÃ¶ltÃ©se</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="91"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="114"/>
         <source>Add a new Media</source>
         <translation>Ãšj mÃ©diaÃ¡llomÃ¡ny hozzÃ¡adÃ¡sa</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="92"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="115"/>
         <source>Edit the selected Media</source>
         <translation>A kijelÃ¶lt mÃ©diaÃ¡llomÃ¡ny szerkesztÃ©se</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="93"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="116"/>
         <source>Delete the selected Media</source>
         <translation>A kijelÃ¶lt mÃ©diaÃ¡llomÃ¡ny tÃ¶rlÃ©se</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="94"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="117"/>
         <source>Preview the selected Media</source>
         <translation>A kijelÃ¶lt mÃ©diaÃ¡llomÃ¡ny elÅ‘nÃ©zete</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="95"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="118"/>
         <source>Send the selected Media live</source>
         <translation>A kijelÃ¶lt mÃ©diaÃ¡llomÃ¡ny Ã©lÅ‘ adÃ¡sba kÃ¼ldÃ©se</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="96"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="119"/>
         <source>Add the selected Media to the service</source>
         <translation>A kijelÃ¶lt mÃ©diaÃ¡llomÃ¡ny hozzÃ¡adÃ¡sa a szolgÃ¡lathoz</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="80"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="103"/>
         <source>Media</source>
         <comment>name singular</comment>
         <translation type="unfinished">MÃ©dia</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="81"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="104"/>
         <source>Media</source>
         <comment>name plural</comment>
         <translation type="unfinished">MÃ©dia</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="85"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="108"/>
         <source>Media</source>
         <comment>container title</comment>
         <translation type="unfinished">MÃ©dia</translation>
@@ -1095,14 +1095,6 @@
         <translation></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/aboutdialog.py" line="224"/>
-        <source>Copyright &#xa9; 2004-2011 Raoul Snyman
-Portions copyright &#xa9; 2004-2011 Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri,
-Meinert Jordan, Andreas Preikschat, Christian Richter, Philip
-Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, CarstennTinggaard, Frode Woldsund</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="openlp/core/ui/aboutdialog.py" line="231"/>
         <source>This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.</source>
         <translation type="unfinished"></translation>
@@ -1177,6 +1169,15 @@
     He has set us free.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="openlp/core/ui/aboutdialog.py" line="224"/>
+        <source>Copyright &#xa9; 2004-2011 Raoul Snyman
+Portions copyright &#xa9; 2004-2011 Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri,
+Meinert Jordan, Andreas Preikschat, Christian Richter, Philip
+Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carsten
+Tinggaard, Frode Woldsund</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OpenLP.AdvancedTab</name>
@@ -1280,17 +1281,17 @@
     </message>
     <message>
         <location filename="openlp/core/ui/displaytagdialog.py" line="145"/>
-        <source>Tag id</source>
+        <source>Tag Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/core/ui/displaytagdialog.py" line="147"/>
-        <source>Start Html</source>
+        <source>Start HTML</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/core/ui/displaytagdialog.py" line="149"/>
-        <source>End Html</source>
+        <source>End HTML</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1428,151 +1429,200 @@
 <context>
     <name>OpenLP.FirstTimeLanguageForm</name>
     <message>
-        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="60"/>
-        <source>Initial Set up Language</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="62"/>
-        <source>Select the language you&apos;d like to use in OpenLP.</source>
+        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="61"/>
+        <source>Select Translation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="63"/>
+        <source>Choose the translation you&apos;d like to use in OpenLP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="65"/>
+        <source>Translation:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpenLP.FirstTimeWizard</name>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="154"/>
-        <source>Songs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="63"/>
-        <source>Bibles</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="64"/>
-        <source>Themes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="65"/>
-        <source>Starting Updates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="67"/>
-        <source>Downloading %s</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="140"/>
+        <location filename="openlp/core/ui/firsttimeform.py" line="61"/>
+        <source>Downloading %s...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="212"/>
+        <source>Download complete. Click the finish button to start OpenLP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="221"/>
+        <source>Enabling selected plugins...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="244"/>
+        <source>Overwrite Existing Songs?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="244"/>
+        <source>Your songs database already exists and your current songs will be permanently lost, are you sure you want to replace it ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="193"/>
         <source>First Time Wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="142"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="195"/>
         <source>Welcome to the First Time Wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="146"/>
-        <source>This wizard will help you to configure OpenLP for initial use . Click the next button below to start the process of selection your initial options. </source>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="199"/>
+        <source>This wizard will help you to configure OpenLP for initial use. Click the next button below to start the process of selection your initial options. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="150"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="203"/>
         <source>Activate required Plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="152"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="205"/>
         <source>Select the Plugins you wish to use. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="155"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="207"/>
+        <source>Songs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="208"/>
         <source>Custom Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="157"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="210"/>
         <source>Bible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="158"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="211"/>
         <source>Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="160"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="213"/>
         <source>Presentations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="162"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="215"/>
         <source>Media (Audio and Video)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="164"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="217"/>
         <source>Allow remote access</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="166"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="219"/>
         <source>Monitor Song Usage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="168"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="221"/>
         <source>Allow Alerts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="170"/>
-        <source>Download Samples from OpenLP.org</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="172"/>
-        <source>Select samples to downlaod and install for use.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="175"/>
-        <source>No Internet connection found so unable to download any default files.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="178"/>
-        <source>Download Example Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="180"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="223"/>
+        <source>No Internet Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="225"/>
+        <source>Unable to detect an Internet connection.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="228"/>
+        <source>No Internet connection was found. The First Time Wizard needs an Internet connection in order to be able to download sample songs, Bibles and themes.
+
+To re-run the First Time Wizard and import this sample data at a later stage, press the cancel button now, check your Internet connection, and restart OpenLP.
+
+To cancel the First Time Wizard completely, press the finish button now.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="236"/>
+        <source>Sample Songs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="238"/>
+        <source>Select and download public domain songs.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="240"/>
+        <source>Sample Bibles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="242"/>
+        <source>Select and download free Bibles.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="244"/>
+        <source>Sample Themes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="246"/>
+        <source>Select and download sample themes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="248"/>
         <source>Default Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="182"/>
-        <source>Set up default values to be used by OpenLP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="184"/>
-        <source>Default output display</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="186"/>
-        <source>Select the default Theme</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="188"/>
-        <source>Press finish to apply all your changes and start OpenLP</source>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="250"/>
+        <source>Set up default settings to be used by OpenLP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="252"/>
+        <source>Setting Up And Importing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="254"/>
+        <source>Please wait while OpenLP is set up and your data is imported.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="256"/>
+        <source>Default output display:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="258"/>
+        <source>Select default theme:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="260"/>
+        <source>Starting configuration process...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1697,12 +1747,12 @@
 <context>
     <name>OpenLP.LanguageManager</name>
     <message>
-        <location filename="openlp/core/utils/languagemanager.py" line="126"/>
+        <location filename="openlp/core/utils/languagemanager.py" line="130"/>
         <source>Language</source>
         <translation>Nyelv</translation>
     </message>
     <message>
-        <location filename="openlp/core/utils/languagemanager.py" line="126"/>
+        <location filename="openlp/core/utils/languagemanager.py" line="130"/>
         <source>Please restart OpenLP to use your new language setting.</source>
         <translation>A nyelvi beÃ¡llÃtÃ¡sok az OpenLP ÃºjraindÃtÃ¡sa utÃ¡n lÃ©pnek Ã©rvÃ©nybe.</translation>
     </message>
@@ -2008,17 +2058,12 @@
         <translation>&amp;Weboldal</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="428"/>
-        <source>&amp;Auto Detect</source>
-        <translation>&amp;Automatikus felismerÃ©s</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="430"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="434"/>
         <source>Use the system language, if available.</source>
         <translation>Rendszernyelv hasznÃ¡lata, ha elÃ©rhetÅ‘.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="434"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="430"/>
         <source>Set the interface language to %s</source>
         <translation>A felhasznÃ¡lÃ³i felÃ¼let nyelvÃ©nek Ã¡tvÃ¡ltÃ¡sa erre: %s</translation>
     </message>
@@ -2063,7 +2108,7 @@
         <translation>NÃ©zetmÃ³d vÃ¡ltÃ¡sa a Ã‰lÅ‘ mÃ³dra.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="644"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="642"/>
         <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>
@@ -2072,22 +2117,22 @@
 A legfrissebb verziÃ³ a http://openlp.org/ oldalrÃ³l szerezhetÅ‘ be.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="648"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="646"/>
         <source>OpenLP Version Updated</source>
         <translation>OpenLP verziÃ³frissÃtÃ©s</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="686"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="684"/>
         <source>OpenLP Main Display Blanked</source>
         <translation>SÃ¶tÃ©t OpenLP fÅ‘ kÃ©pernyÅ‘</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="686"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="684"/>
         <source>The Main Display has been blanked out</source>
         <translation>A fÅ‘ kÃ©pernyÅ‘ el lett sÃ¶tÃ©tÃtve</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="895"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="893"/>
         <source>Default Theme: %s</source>
         <translation>AlapÃ©rtelmezett tÃ©ma: %s</translation>
     </message>
@@ -2103,12 +2148,12 @@
         <translation>Magyar</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="817"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="815"/>
         <source>Close OpenLP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="817"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="815"/>
         <source>Are you sure you want to close OpenLP?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2137,11 +2182,16 @@
         <source>&amp;Configure Display Tags</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="openlp/core/ui/mainwindow.py" line="432"/>
+        <source>&amp;Autodetect</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OpenLP.MediaManagerItem</name>
     <message>
-        <location filename="openlp/core/lib/__init__.py" line="287"/>
+        <location filename="openlp/core/lib/__init__.py" line="286"/>
         <source>No Items Selected</source>
         <translation>Nincs kijelÃ¶lt elem</translation>
     </message>
@@ -2419,29 +2469,29 @@
         <translation>Elem tÃ©mÃ¡jÃ¡nak &amp;mÃ³dosÃtÃ¡sa</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="493"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="521"/>
         <source>File is not a valid service.
 The content encoding is not UTF-8.</source>
         <translation>A fÃ¡jl nem Ã©rvÃ©nyes szolgÃ¡lat.
 A tartalom kÃ³dolÃ¡sa nem UTF-8.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="525"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="553"/>
         <source>File is not a valid service.</source>
         <translation>A fÃ¡jl nem Ã©rvÃ©nyes szolgÃ¡lat.</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="1051"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="1079"/>
         <source>Missing Display Handler</source>
         <translation>HiÃ¡nyzÃ³ kÃ©pernyÅ‘ kezelÅ‘</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="1017"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="1045"/>
         <source>Your item cannot be displayed as there is no handler to display it</source>
         <translation>Az elemet nem lehet megjelenÃteni, mert nincs kezelÅ‘, amely megjelenÃtenÃ©</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="1051"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="1079"/>
         <source>Your item cannot be displayed as the plugin required to display it is missing or inactive</source>
         <translation>Az elemet nem lehet megjelenÃteni, mert a bÅ‘vÃtmÃ©ny, amely kezelnÃ©, hiÃ¡nyzik vagy inaktÃv</translation>
     </message>
@@ -2471,7 +2521,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="466"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="494"/>
         <source>OpenLP Service Files (*.osz)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3953,99 +4003,109 @@
         <translation>Kimeneti fÃ¡jl elÃ©rÃ©si Ãºtvonala</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="92"/>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="101"/>
         <source>usage_detail_%s_%s.txt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="114"/>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="123"/>
         <source>Report Creation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="114"/>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="123"/>
         <source>Report 
 %s 
 has been successfully created. </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="92"/>
+        <source>Output Path Not Selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="92"/>
+        <source>You have not set a valid output location for your song usage report. Please select an existing path on your computer.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SongsPlugin</name>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="104"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="103"/>
         <source>&amp;Song</source>
         <translation>&amp;Dal</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="85"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="84"/>
         <source>Import songs using the import wizard.</source>
         <translation>Dalok importÃ¡lÃ¡sa az importÃ¡lÃ¡s tÃ¼ndÃ©rrel.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="183"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="182"/>
         <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;Dalok bÅ‘vÃtmÃ©ny&lt;/strong&gt;&lt;br /&gt;A dalok bÅ‘vÃtmÃ©ny dalok megjelenÃtÃ©sÃ©t Ã©s kezelÃ©sÃ©t teszi lehetÅ‘vÃ©.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="126"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="125"/>
         <source>&amp;Re-index Songs</source>
         <translation>Dalok Ãºjra&amp;indexelÃ©se</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="128"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="127"/>
         <source>Re-index the songs database to improve searching and ordering.</source>
         <translation>Dal adatbÃ¡zis ÃºjraindexelÃ©se a keresÃ©s Ã©s a rendezÃ©s javÃtÃ¡sÃ¡hoz.</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="141"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="140"/>
         <source>Reindexing songs...</source>
         <translation>Dalok indexelÃ©se folyamatban...</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="238"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="237"/>
         <source>Add a new Song</source>
         <translation>Ãšj dal hozzÃ¡adÃ¡sa</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="239"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="238"/>
         <source>Edit the selected Song</source>
         <translation>A kijelÃ¶lt dal szerkesztÃ©se</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="240"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="239"/>
         <source>Delete the selected Song</source>
         <translation>A kijelÃ¶lt dal tÃ¶rlÃ©se</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="241"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="240"/>
         <source>Preview the selected Song</source>
         <translation>A kijelÃ¶lt dal elÅ‘nÃ©zete</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="242"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="241"/>
         <source>Send the selected Song live</source>
         <translation>A kijelÃ¶lt dal Ã©lÅ‘ adÃ¡sba kÃ¼ldÃ©se</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="243"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="242"/>
         <source>Add the selected Song to the service</source>
         <translation>A kijelÃ¶lt dal hozzÃ¡adÃ¡sa a szolgÃ¡lathoz</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="227"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="226"/>
         <source>Song</source>
         <comment>name singular</comment>
         <translation type="unfinished">Dal</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="228"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="227"/>
         <source>Songs</source>
         <comment>name plural</comment>
         <translation type="unfinished">Dalok</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="232"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="231"/>
         <source>Songs</source>
         <comment>container title</comment>
         <translation type="unfinished">Dalok</translation>
@@ -4139,7 +4199,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="106"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="105"/>
         <source>Exports songs using the export wizard.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4595,12 +4655,12 @@
         <translation>DalszÃ¶veg</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="318"/>
+        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="321"/>
         <source>Delete Song(s)?</source>
         <translation>TÃ¶rÃ¶lhetÅ‘(ek) a dal(ok)?</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="400"/>
+        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="403"/>
         <source>CCLI License: </source>
         <translation>CCLI licenc:</translation>
     </message>
@@ -4610,7 +4670,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="318"/>
+        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="321"/>
         <source>Are you sure you want to delete the %n selected song(s)?</source>
         <translation type="unfinished">
             <numerusform></numerusform>

=== modified file 'resources/i18n/id.ts'
--- resources/i18n/id.ts	2011-03-09 16:16:40 +0000
+++ resources/i18n/id.ts	2011-03-13 10:53:56 +0000
@@ -211,7 +211,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="540"/>
+        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="539"/>
         <source>You cannot combine single and dual Bible verse search results. Do you want to delete your search results and start a new search?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -831,59 +831,59 @@
 <context>
     <name>ImagePlugin</name>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="45"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="44"/>
         <source>&lt;strong&gt;Image Plugin&lt;/strong&gt;&lt;br /&gt;The image plugin provides displaying of images.&lt;br /&gt;One of the distinguishing features of this plugin is the ability to group a number of images together in the service manager, making the displaying of multiple images easier. This plugin can also make use of OpenLP&apos;s &quot;timed looping&quot; feature to create a slide show that runs automatically. In addition to this, images from the plugin can be used to override the current theme&apos;s background, which renders text-based items like songs with the selected image as a background instead of the background provided by the theme.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="73"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="72"/>
         <source>Load a new Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="openlp/plugins/images/imageplugin.py" line="74"/>
+        <source>Add a new Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="openlp/plugins/images/imageplugin.py" line="75"/>
-        <source>Add a new Image</source>
+        <source>Edit the selected Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/plugins/images/imageplugin.py" line="76"/>
-        <source>Edit the selected Image</source>
+        <source>Delete the selected Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/plugins/images/imageplugin.py" line="77"/>
-        <source>Delete the selected Image</source>
+        <source>Preview the selected Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/plugins/images/imageplugin.py" line="78"/>
-        <source>Preview the selected Image</source>
+        <source>Send the selected Image live</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/plugins/images/imageplugin.py" line="79"/>
-        <source>Send the selected Image live</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="80"/>
         <source>Add the selected Image to the service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="openlp/plugins/images/imageplugin.py" line="63"/>
+        <source>Image</source>
+        <comment>name singular</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="openlp/plugins/images/imageplugin.py" line="64"/>
-        <source>Image</source>
-        <comment>name singular</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="65"/>
         <source>Images</source>
         <comment>name plural</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="69"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="68"/>
         <source>Images</source>
         <comment>container title</comment>
         <translation type="unfinished"></translation>
@@ -939,59 +939,59 @@
 <context>
     <name>MediaPlugin</name>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="70"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="93"/>
         <source>&lt;strong&gt;Media Plugin&lt;/strong&gt;&lt;br /&gt;The media plugin provides playback of audio and video.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="89"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="112"/>
         <source>Load a new Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="91"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="114"/>
         <source>Add a new Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="92"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="115"/>
         <source>Edit the selected Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="93"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="116"/>
         <source>Delete the selected Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="94"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="117"/>
         <source>Preview the selected Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="95"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="118"/>
         <source>Send the selected Media live</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="96"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="119"/>
         <source>Add the selected Media to the service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="80"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="103"/>
         <source>Media</source>
         <comment>name singular</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="81"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="104"/>
         <source>Media</source>
         <comment>name plural</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="85"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="108"/>
         <source>Media</source>
         <comment>container title</comment>
         <translation type="unfinished"></translation>
@@ -1090,14 +1090,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/aboutdialog.py" line="224"/>
-        <source>Copyright &#xa9; 2004-2011 Raoul Snyman
-Portions copyright &#xa9; 2004-2011 Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri,
-Meinert Jordan, Andreas Preikschat, Christian Richter, Philip
-Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, CarstennTinggaard, Frode Woldsund</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="openlp/core/ui/aboutdialog.py" line="231"/>
         <source>This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.</source>
         <translation type="unfinished"></translation>
@@ -1172,6 +1164,15 @@
     He has set us free.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="openlp/core/ui/aboutdialog.py" line="224"/>
+        <source>Copyright &#xa9; 2004-2011 Raoul Snyman
+Portions copyright &#xa9; 2004-2011 Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri,
+Meinert Jordan, Andreas Preikschat, Christian Richter, Philip
+Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carsten
+Tinggaard, Frode Woldsund</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OpenLP.AdvancedTab</name>
@@ -1275,17 +1276,17 @@
     </message>
     <message>
         <location filename="openlp/core/ui/displaytagdialog.py" line="145"/>
-        <source>Tag id</source>
+        <source>Tag Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/core/ui/displaytagdialog.py" line="147"/>
-        <source>Start Html</source>
+        <source>Start HTML</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/core/ui/displaytagdialog.py" line="149"/>
-        <source>End Html</source>
+        <source>End HTML</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1423,151 +1424,200 @@
 <context>
     <name>OpenLP.FirstTimeLanguageForm</name>
     <message>
-        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="60"/>
-        <source>Initial Set up Language</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="62"/>
-        <source>Select the language you&apos;d like to use in OpenLP.</source>
+        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="61"/>
+        <source>Select Translation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="63"/>
+        <source>Choose the translation you&apos;d like to use in OpenLP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="65"/>
+        <source>Translation:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpenLP.FirstTimeWizard</name>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="154"/>
-        <source>Songs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="63"/>
-        <source>Bibles</source>
-        <translation type="unfinished">Alkitab</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="64"/>
-        <source>Themes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="65"/>
-        <source>Starting Updates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="67"/>
-        <source>Downloading %s</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="140"/>
+        <location filename="openlp/core/ui/firsttimeform.py" line="61"/>
+        <source>Downloading %s...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="212"/>
+        <source>Download complete. Click the finish button to start OpenLP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="221"/>
+        <source>Enabling selected plugins...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="244"/>
+        <source>Overwrite Existing Songs?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="244"/>
+        <source>Your songs database already exists and your current songs will be permanently lost, are you sure you want to replace it ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="193"/>
         <source>First Time Wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="142"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="195"/>
         <source>Welcome to the First Time Wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="146"/>
-        <source>This wizard will help you to configure OpenLP for initial use . Click the next button below to start the process of selection your initial options. </source>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="199"/>
+        <source>This wizard will help you to configure OpenLP for initial use. Click the next button below to start the process of selection your initial options. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="150"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="203"/>
         <source>Activate required Plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="152"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="205"/>
         <source>Select the Plugins you wish to use. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="155"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="207"/>
+        <source>Songs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="208"/>
         <source>Custom Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="157"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="210"/>
         <source>Bible</source>
         <translation type="unfinished">Alkitab</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="158"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="211"/>
         <source>Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="160"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="213"/>
         <source>Presentations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="162"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="215"/>
         <source>Media (Audio and Video)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="164"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="217"/>
         <source>Allow remote access</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="166"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="219"/>
         <source>Monitor Song Usage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="168"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="221"/>
         <source>Allow Alerts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="170"/>
-        <source>Download Samples from OpenLP.org</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="172"/>
-        <source>Select samples to downlaod and install for use.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="175"/>
-        <source>No Internet connection found so unable to download any default files.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="178"/>
-        <source>Download Example Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="180"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="223"/>
+        <source>No Internet Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="225"/>
+        <source>Unable to detect an Internet connection.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="228"/>
+        <source>No Internet connection was found. The First Time Wizard needs an Internet connection in order to be able to download sample songs, Bibles and themes.
+
+To re-run the First Time Wizard and import this sample data at a later stage, press the cancel button now, check your Internet connection, and restart OpenLP.
+
+To cancel the First Time Wizard completely, press the finish button now.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="236"/>
+        <source>Sample Songs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="238"/>
+        <source>Select and download public domain songs.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="240"/>
+        <source>Sample Bibles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="242"/>
+        <source>Select and download free Bibles.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="244"/>
+        <source>Sample Themes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="246"/>
+        <source>Select and download sample themes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="248"/>
         <source>Default Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="182"/>
-        <source>Set up default values to be used by OpenLP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="184"/>
-        <source>Default output display</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="186"/>
-        <source>Select the default Theme</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="188"/>
-        <source>Press finish to apply all your changes and start OpenLP</source>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="250"/>
+        <source>Set up default settings to be used by OpenLP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="252"/>
+        <source>Setting Up And Importing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="254"/>
+        <source>Please wait while OpenLP is set up and your data is imported.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="256"/>
+        <source>Default output display:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="258"/>
+        <source>Select default theme:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="260"/>
+        <source>Starting configuration process...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1692,12 +1742,12 @@
 <context>
     <name>OpenLP.LanguageManager</name>
     <message>
-        <location filename="openlp/core/utils/languagemanager.py" line="126"/>
+        <location filename="openlp/core/utils/languagemanager.py" line="130"/>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/utils/languagemanager.py" line="126"/>
+        <location filename="openlp/core/utils/languagemanager.py" line="130"/>
         <source>Please restart OpenLP to use your new language setting.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2003,17 +2053,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="428"/>
-        <source>&amp;Auto Detect</source>
+        <location filename="openlp/core/ui/mainwindow.py" line="434"/>
+        <source>Use the system language, if available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/core/ui/mainwindow.py" line="430"/>
-        <source>Use the system language, if available.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="434"/>
         <source>Set the interface language to %s</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2058,29 +2103,29 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="644"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="642"/>
         <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="648"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="646"/>
         <source>OpenLP Version Updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="686"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="684"/>
         <source>OpenLP Main Display Blanked</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="686"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="684"/>
         <source>The Main Display has been blanked out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="895"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="893"/>
         <source>Default Theme: %s</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2096,12 +2141,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="817"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="815"/>
         <source>Close OpenLP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="817"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="815"/>
         <source>Are you sure you want to close OpenLP?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2130,11 +2175,16 @@
         <source>&amp;Configure Display Tags</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="openlp/core/ui/mainwindow.py" line="432"/>
+        <source>&amp;Autodetect</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OpenLP.MediaManagerItem</name>
     <message>
-        <location filename="openlp/core/lib/__init__.py" line="287"/>
+        <location filename="openlp/core/lib/__init__.py" line="286"/>
         <source>No Items Selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2412,33 +2462,33 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="466"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="494"/>
         <source>OpenLP Service Files (*.osz)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="493"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="521"/>
         <source>File is not a valid service.
 The content encoding is not UTF-8.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="525"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="553"/>
         <source>File is not a valid service.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="1051"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="1079"/>
         <source>Missing Display Handler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="1017"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="1045"/>
         <source>Your item cannot be displayed as there is no handler to display it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="1051"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="1079"/>
         <source>Your item cannot be displayed as the plugin required to display it is missing or inactive</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3944,82 +3994,92 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="92"/>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="101"/>
         <source>usage_detail_%s_%s.txt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="114"/>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="123"/>
         <source>Report Creation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="114"/>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="123"/>
         <source>Report 
 %s 
 has been successfully created. </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="92"/>
+        <source>Output Path Not Selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="92"/>
+        <source>You have not set a valid output location for your song usage report. Please select an existing path on your computer.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SongsPlugin</name>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="104"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="103"/>
         <source>&amp;Song</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="85"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="84"/>
         <source>Import songs using the import wizard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="183"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="182"/>
         <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 type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="126"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="125"/>
         <source>&amp;Re-index Songs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="128"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="127"/>
         <source>Re-index the songs database to improve searching and ordering.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="141"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="140"/>
         <source>Reindexing songs...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="237"/>
+        <source>Add a new Song</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="openlp/plugins/songs/songsplugin.py" line="238"/>
-        <source>Add a new Song</source>
+        <source>Edit the selected Song</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/plugins/songs/songsplugin.py" line="239"/>
-        <source>Edit the selected Song</source>
+        <source>Delete the selected Song</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/plugins/songs/songsplugin.py" line="240"/>
-        <source>Delete the selected Song</source>
+        <source>Preview the selected Song</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/plugins/songs/songsplugin.py" line="241"/>
-        <source>Preview the selected Song</source>
+        <source>Send the selected Song live</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/plugins/songs/songsplugin.py" line="242"/>
-        <source>Send the selected Song live</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="243"/>
         <source>Add the selected Song to the service</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4112,25 +4172,25 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="226"/>
+        <source>Song</source>
+        <comment>name singular</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="openlp/plugins/songs/songsplugin.py" line="227"/>
-        <source>Song</source>
-        <comment>name singular</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="228"/>
         <source>Songs</source>
         <comment>name plural</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="232"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="231"/>
         <source>Songs</source>
         <comment>container title</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="106"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="105"/>
         <source>Exports songs using the export wizard.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4586,12 +4646,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="318"/>
+        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="321"/>
         <source>Delete Song(s)?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="400"/>
+        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="403"/>
         <source>CCLI License: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -4601,7 +4661,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="318"/>
+        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="321"/>
         <source>Are you sure you want to delete the %n selected song(s)?</source>
         <translation type="unfinished">
             <numerusform></numerusform>

=== modified file 'resources/i18n/ja.ts'
--- resources/i18n/ja.ts	2011-03-09 16:16:40 +0000
+++ resources/i18n/ja.ts	2011-03-13 10:53:56 +0000
@@ -212,7 +212,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="540"/>
+        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="539"/>
         <source>You cannot combine single and dual Bible verse search results. Do you want to delete your search results and start a new search?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -372,7 +372,7 @@
     <message>
         <location filename="openlp/plugins/bibles/lib/biblestab.py" line="124"/>
         <source>Bible theme:</source>
-        <translation>è–æ›¸ã®ãƒ†ãƒ¼ãƒž:</translation>
+        <translation>è–æ›¸ã®å¤–è¦³ãƒ†ãƒ¼ãƒž:</translation>
     </message>
     <message>
         <location filename="openlp/plugins/bibles/lib/biblestab.py" line="126"/>
@@ -592,7 +592,7 @@
     <message>
         <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="450"/>
         <source>You have not specified a testaments file. Do you want to proceed with the import?</source>
-        <translation></translation>
+        <translation>æ–°æ—§è¨³ãƒ•ã‚¡ã‚¤ãƒ«ã‚’æŒ‡å®šã—ã¦ã„ã¾ã›ã‚“ã€‚ã‚¤ãƒ³ãƒãƒ¼ãƒˆã‚’ç¶™ç¶šã—ã¾ã™ã‹?</translation>
     </message>
     <message>
         <location filename="openlp/plugins/bibles/forms/bibleimportform.py" line="569"/>
@@ -752,7 +752,7 @@
     <message>
         <location filename="openlp/plugins/custom/forms/editcustomdialog.py" line="123"/>
         <source>The&amp;me:</source>
-        <translation>ãƒ†ãƒ¼ãƒž(&amp;m):</translation>
+        <translation>å¤–è¦³ãƒ†ãƒ¼ãƒž(&amp;m):</translation>
     </message>
     <message>
         <location filename="openlp/plugins/custom/forms/editcustomform.py" line="261"/>
@@ -839,59 +839,59 @@
 <context>
     <name>ImagePlugin</name>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="45"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="44"/>
         <source>&lt;strong&gt;Image Plugin&lt;/strong&gt;&lt;br /&gt;The image plugin provides displaying of images.&lt;br /&gt;One of the distinguishing features of this plugin is the ability to group a number of images together in the service manager, making the displaying of multiple images easier. This plugin can also make use of OpenLP&apos;s &quot;timed looping&quot; feature to create a slide show that runs automatically. In addition to this, images from the plugin can be used to override the current theme&apos;s background, which renders text-based items like songs with the selected image as a background instead of the background provided by the theme.</source>
-        <translation>&lt;strong&gt;ç”»åƒãƒ—ãƒ©ã‚°ã‚¤ãƒ³&lt;/strong&gt;&lt;br /&gt;ç”»åƒãƒ—ãƒ©ã‚°ã‚¤ãƒ³ã¯ã€ç”»åƒã‚’è¡¨ç¤ºã™ã‚‹æ©Ÿèƒ½ã‚’æä¾›ã—ã¾ã™ã€‚&lt;br /&gt;ç¤¼æ‹ãƒ—ãƒã‚°ãƒ©ãƒ ã§è¤‡æ•°ã®ç”»åƒã‚’ã‚°ãƒ«ãƒ¼ãƒ—åŒ–ã—ãŸã‚Šã€è¤‡æ•°ã®ç”»åƒã‚’ç°¡å˜ã«è¡¨ç¤ºã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ã‚¿ã‚¤ãƒ ã‚¢ã‚¦ãƒˆãƒ«ãƒ¼ãƒ—ã®æ©Ÿèƒ½ã‚’ä½¿ç”¨ã—ã¦ã‚¹ãƒ©ã‚¤ãƒ‰ã‚·ãƒ§ãƒ¼ã‚’è‡ªå‹•çš„ã«è¡¨ç¤ºã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚ã•ã‚‰ã«ã€è³›ç¾Žãªã©ã®ãƒ†ã‚ã‚¹ãƒˆãƒ™ãƒ¼ã‚¹ã®é …ç›®ã®èƒŒæ™¯ã‚’ã€ãƒ†ãƒ¼ãƒžã§æŒ‡å®šã•ã‚ŒãŸã‚‚ã®ã‹ã‚‰ã“ã®ãƒ—ãƒ©ã‚°ã‚¤ãƒ³ã®ç”»åƒã«å¤‰æ›´ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚</translation>
+        <translation>&lt;strong&gt;ç”»åƒãƒ—ãƒ©ã‚°ã‚¤ãƒ³&lt;/strong&gt;&lt;br /&gt;ç”»åƒãƒ—ãƒ©ã‚°ã‚¤ãƒ³ã¯ã€ç”»åƒã‚’è¡¨ç¤ºã™ã‚‹æ©Ÿèƒ½ã‚’æä¾›ã—ã¾ã™ã€‚&lt;br /&gt;ç¤¼æ‹ãƒ—ãƒã‚°ãƒ©ãƒ ã§è¤‡æ•°ã®ç”»åƒã‚’ã‚°ãƒ«ãƒ¼ãƒ—åŒ–ã—ãŸã‚Šã€è¤‡æ•°ã®ç”»åƒã‚’ç°¡å˜ã«è¡¨ç¤ºã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ã‚¿ã‚¤ãƒ ã‚¢ã‚¦ãƒˆãƒ«ãƒ¼ãƒ—ã®æ©Ÿèƒ½ã‚’ä½¿ç”¨ã—ã¦ã‚¹ãƒ©ã‚¤ãƒ‰ã‚·ãƒ§ãƒ¼ã‚’è‡ªå‹•çš„ã«è¡¨ç¤ºã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚ã•ã‚‰ã«ã€è³›ç¾Žãªã©ã®ãƒ†ã‚ã‚¹ãƒˆãƒ™ãƒ¼ã‚¹ã®é …ç›®ã®èƒŒæ™¯ã‚’ã€å¤–è¦³ãƒ†ãƒ¼ãƒžã§æŒ‡å®šã•ã‚ŒãŸã‚‚ã®ã‹ã‚‰ã“ã®ãƒ—ãƒ©ã‚°ã‚¤ãƒ³ã®ç”»åƒã«å¤‰æ›´ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="73"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="72"/>
         <source>Load a new Image</source>
         <translation>æ–°ã—ã„ç”»åƒã‚’èªã¿è¾¼ã¿</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="75"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="74"/>
         <source>Add a new Image</source>
         <translation>æ–°ã—ã„ç”»åƒã‚’è¿½åŠ </translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="76"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="75"/>
         <source>Edit the selected Image</source>
         <translation>é¸æŠžã—ãŸç”»åƒã‚’ç·¨é›†</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="77"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="76"/>
         <source>Delete the selected Image</source>
         <translation>é¸æŠžã—ãŸç”»åƒã‚’å‰Šé™¤</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="78"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="77"/>
         <source>Preview the selected Image</source>
         <translation>é¸æŠžã—ãŸç”»åƒã‚’ãƒ—ãƒ¬ãƒ“ãƒ¥ãƒ¼</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="79"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="78"/>
         <source>Send the selected Image live</source>
         <translation>é¸æŠžã—ãŸç”»åƒã‚’ãƒ©ã‚¤ãƒ–ã¸é€ã‚‹</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="80"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="79"/>
         <source>Add the selected Image to the service</source>
         <translation>é¸æŠžã—ãŸç”»åƒã‚’ç¤¼æ‹ãƒ—ãƒã‚°ãƒ©ãƒ ã«è¿½åŠ </translation>
     </message>
     <message>
+        <location filename="openlp/plugins/images/imageplugin.py" line="63"/>
+        <source>Image</source>
+        <comment>name singular</comment>
+        <translation>ç”»åƒ</translation>
+    </message>
+    <message>
         <location filename="openlp/plugins/images/imageplugin.py" line="64"/>
-        <source>Image</source>
-        <comment>name singular</comment>
-        <translation>ç”»åƒ</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="65"/>
         <source>Images</source>
         <comment>name plural</comment>
         <translation>ç”»åƒ</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="69"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="68"/>
         <source>Images</source>
         <comment>container title</comment>
         <translation>ç”»åƒ</translation>
@@ -948,59 +948,59 @@
 <context>
     <name>MediaPlugin</name>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="70"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="93"/>
         <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;ãƒ¡ãƒ‡ã‚£ã‚¢ãƒ—ãƒ©ã‚°ã‚¤ãƒ³&lt;/strong&gt;&lt;br /&gt;ãƒ¡ãƒ‡ã‚£ã‚¢ãƒ—ãƒ©ã‚°ã‚¤ãƒ³ã¯ã€éŸ³å£°ã‚„å‹•ç”»ã‚’å†ç”Ÿã™ã‚‹æ©Ÿèƒ½ã‚’æä¾›ã—ã¾ã™ã€‚</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="89"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="112"/>
         <source>Load a new Media</source>
         <translation>æ–°ã—ã„ãƒ¡ãƒ‡ã‚£ã‚¢ã‚’èªã¿è¾¼ã¿</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="91"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="114"/>
         <source>Add a new Media</source>
         <translation>æ–°ã—ã„ãƒ¡ãƒ‡ã‚£ã‚¢ã‚’è¿½åŠ </translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="92"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="115"/>
         <source>Edit the selected Media</source>
         <translation>é¸æŠžã—ãŸãƒ¡ãƒ‡ã‚£ã‚¢ã‚’ç·¨é›†</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="93"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="116"/>
         <source>Delete the selected Media</source>
         <translation>é¸æŠžã—ãŸãƒ¡ãƒ‡ã‚£ã‚¢ã‚’å‰Šé™¤</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="94"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="117"/>
         <source>Preview the selected Media</source>
         <translation>é¸æŠžã—ãŸãƒ¡ãƒ‡ã‚£ã‚¢ã‚’ãƒ—ãƒ¬ãƒ“ãƒ¥ãƒ¼</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="95"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="118"/>
         <source>Send the selected Media live</source>
         <translation>é¸æŠžã—ãŸãƒ¡ãƒ‡ã‚£ã‚¢ã‚’ãƒ©ã‚¤ãƒ–ã¸é€ã‚‹</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="96"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="119"/>
         <source>Add the selected Media to the service</source>
         <translation>é¸æŠžã—ãŸãƒ¡ãƒ‡ã‚£ã‚¢ã‚’ç¤¼æ‹ãƒ—ãƒã‚°ãƒ©ãƒ ã«è¿½åŠ </translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="80"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="103"/>
         <source>Media</source>
         <comment>name singular</comment>
         <translation>ãƒ¡ãƒ‡ã‚£ã‚¢</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="81"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="104"/>
         <source>Media</source>
         <comment>name plural</comment>
         <translation>ãƒ¡ãƒ‡ã‚£ã‚¢</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="85"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="108"/>
         <source>Media</source>
         <comment>container title</comment>
         <translation>ãƒ¡ãƒ‡ã‚£ã‚¢</translation>
@@ -1184,7 +1184,8 @@
         <source>Copyright &#xa9; 2004-2011 Raoul Snyman
 Portions copyright &#xa9; 2004-2011 Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri,
 Meinert Jordan, Andreas Preikschat, Christian Richter, Philip
-Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, CarstennTinggaard, Frode Woldsund</source>
+Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carsten
+Tinggaard, Frode Woldsund</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1203,7 +1204,7 @@
     <message>
         <location filename="openlp/core/ui/advancedtab.py" line="129"/>
         <source>Remember active media manager tab on startup</source>
-        <translation>èµ·å‹•æ™‚ã«å‰å›žã®ãƒ¡ãƒ‡ã‚£ã‚¢ãƒžãƒãƒ¼ã‚¸ãƒ£ã‚’é–‹ã</translation>
+        <translation>èµ·å‹•æ™‚ã«å‰å›žã®ãƒ¡ãƒ‡ã‚£ã‚¢ãƒžãƒã‚¸ãƒ£ãƒ¼ã‚’é–‹ã</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/advancedtab.py" line="131"/>
@@ -1290,18 +1291,18 @@
     </message>
     <message>
         <location filename="openlp/core/ui/displaytagdialog.py" line="145"/>
-        <source>Tag id</source>
-        <translation>ã‚¿ã‚°ID</translation>
+        <source>Tag Id</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/core/ui/displaytagdialog.py" line="147"/>
-        <source>Start Html</source>
-        <translation>é–‹å§‹ã‚¿ã‚°</translation>
+        <source>Start HTML</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/core/ui/displaytagdialog.py" line="149"/>
-        <source>End Html</source>
-        <translation>çµ‚äº†ã‚¿ã‚°</translation>
+        <source>End HTML</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1465,151 +1466,200 @@
 <context>
     <name>OpenLP.FirstTimeLanguageForm</name>
     <message>
-        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="60"/>
-        <source>Initial Set up Language</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="62"/>
-        <source>Select the language you&apos;d like to use in OpenLP.</source>
+        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="61"/>
+        <source>Select Translation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="63"/>
+        <source>Choose the translation you&apos;d like to use in OpenLP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="65"/>
+        <source>Translation:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpenLP.FirstTimeWizard</name>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="154"/>
-        <source>Songs</source>
-        <translation type="unfinished">è³›ç¾Ž</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="63"/>
-        <source>Bibles</source>
-        <translation type="unfinished">è–æ›¸</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="64"/>
-        <source>Themes</source>
-        <translation type="unfinished">ãƒ†ãƒ¼ãƒž</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="65"/>
-        <source>Starting Updates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="67"/>
-        <source>Downloading %s</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="140"/>
+        <location filename="openlp/core/ui/firsttimeform.py" line="61"/>
+        <source>Downloading %s...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="212"/>
+        <source>Download complete. Click the finish button to start OpenLP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="221"/>
+        <source>Enabling selected plugins...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="244"/>
+        <source>Overwrite Existing Songs?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="244"/>
+        <source>Your songs database already exists and your current songs will be permanently lost, are you sure you want to replace it ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="193"/>
         <source>First Time Wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="142"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="195"/>
         <source>Welcome to the First Time Wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="146"/>
-        <source>This wizard will help you to configure OpenLP for initial use . Click the next button below to start the process of selection your initial options. </source>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="199"/>
+        <source>This wizard will help you to configure OpenLP for initial use. Click the next button below to start the process of selection your initial options. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="150"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="203"/>
         <source>Activate required Plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="152"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="205"/>
         <source>Select the Plugins you wish to use. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="155"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="207"/>
+        <source>Songs</source>
+        <translation type="unfinished">è³›ç¾Ž</translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="208"/>
         <source>Custom Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="157"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="210"/>
         <source>Bible</source>
         <translation type="unfinished">è–æ›¸</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="158"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="211"/>
         <source>Images</source>
         <translation type="unfinished">ç”»åƒ</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="160"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="213"/>
         <source>Presentations</source>
         <translation type="unfinished">ãƒ—ãƒ¬ã‚¼ãƒ³ãƒ†ãƒ¼ã‚·ãƒ§ãƒ³</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="162"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="215"/>
         <source>Media (Audio and Video)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="164"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="217"/>
         <source>Allow remote access</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="166"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="219"/>
         <source>Monitor Song Usage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="168"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="221"/>
         <source>Allow Alerts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="170"/>
-        <source>Download Samples from OpenLP.org</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="172"/>
-        <source>Select samples to downlaod and install for use.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="175"/>
-        <source>No Internet connection found so unable to download any default files.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="178"/>
-        <source>Download Example Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="180"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="223"/>
+        <source>No Internet Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="225"/>
+        <source>Unable to detect an Internet connection.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="228"/>
+        <source>No Internet connection was found. The First Time Wizard needs an Internet connection in order to be able to download sample songs, Bibles and themes.
+
+To re-run the First Time Wizard and import this sample data at a later stage, press the cancel button now, check your Internet connection, and restart OpenLP.
+
+To cancel the First Time Wizard completely, press the finish button now.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="236"/>
+        <source>Sample Songs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="238"/>
+        <source>Select and download public domain songs.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="240"/>
+        <source>Sample Bibles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="242"/>
+        <source>Select and download free Bibles.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="244"/>
+        <source>Sample Themes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="246"/>
+        <source>Select and download sample themes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="248"/>
         <source>Default Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="182"/>
-        <source>Set up default values to be used by OpenLP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="184"/>
-        <source>Default output display</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="186"/>
-        <source>Select the default Theme</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="188"/>
-        <source>Press finish to apply all your changes and start OpenLP</source>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="250"/>
+        <source>Set up default settings to be used by OpenLP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="252"/>
+        <source>Setting Up And Importing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="254"/>
+        <source>Please wait while OpenLP is set up and your data is imported.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="256"/>
+        <source>Default output display:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="258"/>
+        <source>Select default theme:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="260"/>
+        <source>Starting configuration process...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1734,12 +1784,12 @@
 <context>
     <name>OpenLP.LanguageManager</name>
     <message>
-        <location filename="openlp/core/utils/languagemanager.py" line="126"/>
+        <location filename="openlp/core/utils/languagemanager.py" line="130"/>
         <source>Language</source>
         <translation>è¨€èªž</translation>
     </message>
     <message>
-        <location filename="openlp/core/utils/languagemanager.py" line="126"/>
+        <location filename="openlp/core/utils/languagemanager.py" line="130"/>
         <source>Please restart OpenLP to use your new language setting.</source>
         <translation>æ–°ã—ã„è¨€èªžè¨å®šã‚’ä½¿ç”¨ã™ã‚‹ãŸã‚ã«ã€OpenLPã‚’å†èµ·å‹•ã—ã¦ãã ã•ã„ã€‚</translation>
     </message>
@@ -1802,7 +1852,7 @@
     <message>
         <location filename="openlp/core/ui/mainwindow.py" line="318"/>
         <source>Media Manager</source>
-        <translation>ãƒ¡ãƒ‡ã‚£ã‚¢ãƒžãƒãƒ¼ã‚¸ãƒ£</translation>
+        <translation>ãƒ¡ãƒ‡ã‚£ã‚¢ãƒžãƒã‚¸ãƒ£ãƒ¼</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/mainwindow.py" line="320"/>
@@ -1812,7 +1862,7 @@
     <message>
         <location filename="openlp/core/ui/mainwindow.py" line="322"/>
         <source>Theme Manager</source>
-        <translation>ãƒ†ãƒ¼ãƒžãƒžãƒãƒ¼ã‚¸ãƒ£</translation>
+        <translation>å¤–è¦³ãƒ†ãƒ¼ãƒžãƒžãƒã‚¸ãƒ£ãƒ¼</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/mainwindow.py" line="324"/>
@@ -1892,7 +1942,7 @@
     <message>
         <location filename="openlp/core/ui/mainwindow.py" line="361"/>
         <source>&amp;Theme</source>
-        <translation>ãƒ†ãƒ¼ãƒž(&amp;T)</translation>
+        <translation>å¤–è¦³ãƒ†ãƒ¼ãƒž(&amp;T)</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/mainwindow.py" line="369"/>
@@ -1902,7 +1952,7 @@
     <message>
         <location filename="openlp/core/ui/mainwindow.py" line="371"/>
         <source>&amp;Media Manager</source>
-        <translation>ãƒ¡ãƒ‡ã‚£ã‚¢ãƒžãƒãƒ¼ã‚¸ãƒ£(&amp;M)</translation>
+        <translation>ãƒ¡ãƒ‡ã‚£ã‚¢ãƒžãƒã‚¸ãƒ£ãƒ¼(&amp;M)</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/mainwindow.py" line="373"/>
@@ -1922,17 +1972,17 @@
     <message>
         <location filename="openlp/core/ui/mainwindow.py" line="379"/>
         <source>&amp;Theme Manager</source>
-        <translation>ãƒ†ãƒ¼ãƒžãƒžãƒãƒ¼ã‚¸ãƒ£(&amp;T)</translation>
+        <translation>å¤–è¦³ãƒ†ãƒ¼ãƒžãƒžãƒã‚¸ãƒ£ãƒ¼(&amp;T)</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/mainwindow.py" line="381"/>
         <source>Toggle Theme Manager</source>
-        <translation>ãƒ†ãƒ¼ãƒžãƒžãƒã‚¸ãƒ£ãƒ¼ã®åˆ‡ã‚Šæ›¿ãˆ</translation>
+        <translation>å¤–è¦³ãƒ†ãƒ¼ãƒžãƒžãƒã‚¸ãƒ£ãƒ¼ã®åˆ‡ã‚Šæ›¿ãˆ</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/mainwindow.py" line="383"/>
         <source>Toggle the visibility of the theme manager.</source>
-        <translation>ãƒ†ãƒ¼ãƒžãƒžãƒã‚¸ãƒ£ãƒ¼ã®å¯è¦–æ€§ã‚’åˆ‡ã‚Šæ›¿ãˆã‚‹ã€‚</translation>
+        <translation>å¤–è¦³ãƒ†ãƒ¼ãƒžãƒžãƒã‚¸ãƒ£ãƒ¼ã®å¯è¦–æ€§ã‚’åˆ‡ã‚Šæ›¿ãˆã‚‹ã€‚</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/mainwindow.py" line="385"/>
@@ -2045,17 +2095,12 @@
         <translation>ã‚¦ã‚§ãƒ–ã‚µã‚¤ãƒˆ(&amp;W)</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="428"/>
-        <source>&amp;Auto Detect</source>
-        <translation>è‡ªå‹•æ¤œå‡º(&amp;A)</translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="430"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="434"/>
         <source>Use the system language, if available.</source>
         <translation>ã‚·ã‚¹ãƒ†ãƒ è¨€èªžã‚’å¯èƒ½ã§ã‚ã‚Œã°ä½¿ç”¨ã—ã¾ã™ã€‚</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="434"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="430"/>
         <source>Set the interface language to %s</source>
         <translation>ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ã‚¤ã‚¹è¨€èªžã‚’%sã«è¨å®š</translation>
     </message>
@@ -2100,7 +2145,7 @@
         <translation>è¡¨ç¤ºãƒ¢ãƒ¼ãƒ‰ã‚’ãƒ©ã‚¤ãƒ–ã«ã—ã¾ã™ã€‚</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="644"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="642"/>
         <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>
@@ -2109,24 +2154,24 @@
 http://openlp.org/ã‹ã‚‰æœ€æ–°ç‰ˆãŒãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰å¯èƒ½ã§ã™ã€‚;</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="648"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="646"/>
         <source>OpenLP Version Updated</source>
         <translation>OpenLPã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚¢ãƒƒãƒ—å®Œäº†</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="686"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="684"/>
         <source>OpenLP Main Display Blanked</source>
         <translation>OpenLPã®ãƒ—ãƒ©ã‚¤ãƒžãƒªãƒ‡ã‚£ã‚¹ãƒ—ãƒ¬ã‚¤ãŒãƒ–ãƒ©ãƒ³ã‚¯ã§ã™</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="686"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="684"/>
         <source>The Main Display has been blanked out</source>
         <translation>OpenLPã®ãƒ—ãƒ©ã‚¤ãƒžãƒªãƒ‡ã‚£ã‚¹ãƒ—ãƒ¬ã‚¤ãŒãƒ–ãƒ©ãƒ³ã‚¯ã«ãªã‚Šã¾ã—ãŸ</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="895"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="893"/>
         <source>Default Theme: %s</source>
-        <translation>æ—¢å®šãƒ†ãƒ¼ãƒž</translation>
+        <translation>æ—¢å®šå¤–è¦³ãƒ†ãƒ¼ãƒž</translation>
     </message>
     <message>
         <location filename="openlp/core/utils/languagemanager.py" line="84"/>
@@ -2140,12 +2185,12 @@
         <translation>ã‚·ãƒ§ãƒ¼ãƒˆã‚«ãƒƒãƒˆã®è¨å®š(&amp;S)...</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="817"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="815"/>
         <source>Close OpenLP</source>
         <translation>OpenLPã®çµ‚äº†</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="817"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="815"/>
         <source>Are you sure you want to close OpenLP?</source>
         <translation>æœ¬å½“ã«OpenLPã‚’çµ‚äº†ã—ã¦ã‚‚ã‚ˆã‚ã—ã„ã§ã™ã‹?</translation>
     </message>
@@ -2174,11 +2219,16 @@
         <source>Open the folder where songs, bibles and other data resides.</source>
         <translation>è³›ç¾Žã€è–æ›¸ãƒ‡ãƒ¼ã‚¿ãªã©ã®ãƒ‡ãƒ¼ã‚¿ãŒå«ã¾ã‚Œã¦ã„ã‚‹ãƒ•ã‚©ãƒ«ãƒ€ã‚’é–‹ãã€‚</translation>
     </message>
+    <message>
+        <location filename="openlp/core/ui/mainwindow.py" line="432"/>
+        <source>&amp;Autodetect</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OpenLP.MediaManagerItem</name>
     <message>
-        <location filename="openlp/core/lib/__init__.py" line="287"/>
+        <location filename="openlp/core/lib/__init__.py" line="286"/>
         <source>No Items Selected</source>
         <translation>é …ç›®ã®é¸æŠžãŒã‚ã‚Šã¾ã›ã‚“</translation>
     </message>
@@ -2373,7 +2423,7 @@
     <message>
         <location filename="openlp/core/ui/servicemanager.py" line="115"/>
         <source>Select a theme for the service</source>
-        <translation>ç¤¼æ‹ãƒ—ãƒã‚°ãƒ©ãƒ ã®ãƒ†ãƒ¼ãƒžã‚’é¸æŠž</translation>
+        <translation>ç¤¼æ‹ãƒ—ãƒã‚°ãƒ©ãƒ ã®å¤–è¦³ãƒ†ãƒ¼ãƒžã‚’é¸æŠž</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/servicemanager.py" line="149"/>
@@ -2453,32 +2503,32 @@
     <message>
         <location filename="openlp/core/ui/servicemanager.py" line="285"/>
         <source>&amp;Change Item Theme</source>
-        <translation>é …ç›®ã®ãƒ†ãƒ¼ãƒžã‚’å¤‰æ›´(&amp;C)</translation>
+        <translation>é …ç›®ã®å¤–è¦³ãƒ†ãƒ¼ãƒžã‚’å¤‰æ›´(&amp;C)</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="493"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="521"/>
         <source>File is not a valid service.
 The content encoding is not UTF-8.</source>
         <translation>ç¤¼æ‹ãƒ—ãƒã‚°ãƒ©ãƒ ãƒ•ã‚¡ã‚¤ãƒ«ãŒæœ‰åŠ¹ã§ã‚ã‚Šã¾ã›ã‚“ã€‚
 ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‰ãŒUTF-8ã§ã‚ã‚Šã¾ã›ã‚“ã€‚</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="525"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="553"/>
         <source>File is not a valid service.</source>
         <translation>ç¤¼æ‹ãƒ—ãƒã‚°ãƒ©ãƒ ãƒ•ã‚¡ã‚¤ãƒ«ãŒæœ‰åŠ¹ã§ã‚ã‚Šã¾ã›ã‚“ã€‚</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="1051"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="1079"/>
         <source>Missing Display Handler</source>
         <translation>ãƒ‡ã‚£ã‚¹ãƒ—ãƒ¬ã‚¤ãƒãƒ³ãƒ‰ãƒ©ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="1017"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="1045"/>
         <source>Your item cannot be displayed as there is no handler to display it</source>
         <translation>ãƒ‡ã‚£ã‚¹ãƒ—ãƒ¬ã‚¤ãƒãƒ³ãƒ‰ãƒ©ãŒè¦‹ã¤ã‹ã‚‰ãªã„ãŸã‚é …ç›®ã‚’è¡¨ç¤ºã™ã‚‹äº‹ãŒã§ãã¾ã›ã‚“</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="1051"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="1079"/>
         <source>Your item cannot be displayed as the plugin required to display it is missing or inactive</source>
         <translation>å¿…è¦ãªãƒ—ãƒ©ã‚°ã‚¤ãƒ³ãŒè¦‹ã¤ã‹ã‚‰ãªã„ã‹ç„¡åŠ¹ãªãŸã‚ã€é …ç›®ã‚’è¡¨ç¤ºã™ã‚‹äº‹ãŒã§ãã¾ã›ã‚“</translation>
     </message>
@@ -2508,7 +2558,7 @@
         <translation>ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é–‹ã</translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="466"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="494"/>
         <source>OpenLP Service Files (*.osz)</source>
         <translation>OpenLP ç¤¼æ‹ãƒ—ãƒã‚°ãƒ©ãƒ ãƒ•ã‚¡ã‚¤ãƒ« (*.osz)</translation>
     </message>
@@ -2692,7 +2742,7 @@
     <message>
         <location filename="openlp/core/ui/slidecontroller.py" line="162"/>
         <source>Blank to Theme</source>
-        <translation>ãƒ†ãƒ¼ãƒžã‚’ãƒ–ãƒ©ãƒ³ã‚¯</translation>
+        <translation>å¤–è¦³ãƒ†ãƒ¼ãƒžã‚’ãƒ–ãƒ©ãƒ³ã‚¯</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/slidecontroller.py" line="166"/>
@@ -2781,22 +2831,22 @@
     <message>
         <location filename="openlp/core/ui/themeform.py" line="570"/>
         <source>Theme Name Missing</source>
-        <translation>ãƒ†ãƒ¼ãƒžåãŒä¸æ˜Žã§ã™</translation>
+        <translation>å¤–è¦³ãƒ†ãƒ¼ãƒžåãŒä¸æ˜Žã§ã™</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/themeform.py" line="570"/>
         <source>There is no name for this theme. Please enter one.</source>
-        <translation>ãƒ†ãƒ¼ãƒžåãŒã‚ã‚Šã¾ã›ã‚“ã€‚å…¥åŠ›ã—ã¦ãã ã•ã„ã€‚</translation>
+        <translation>å¤–è¦³ãƒ†ãƒ¼ãƒžåãŒã‚ã‚Šã¾ã›ã‚“ã€‚å…¥åŠ›ã—ã¦ãã ã•ã„ã€‚</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/themeform.py" line="576"/>
         <source>Theme Name Invalid</source>
-        <translation>ç„¡åŠ¹ãªãƒ†ãƒ¼ãƒžå</translation>
+        <translation>ç„¡åŠ¹ãªå¤–è¦³ãƒ†ãƒ¼ãƒžå</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/themeform.py" line="576"/>
         <source>Invalid theme name. Please enter one.</source>
-        <translation>ç„¡åŠ¹ãªãƒ†ãƒ¼ãƒžåã§ã™ã€‚å…¥åŠ›ã—ã¦ãã ã•ã„ã€‚</translation>
+        <translation>ç„¡åŠ¹ãªå¤–è¦³ãƒ†ãƒ¼ãƒžåã§ã™ã€‚å…¥åŠ›ã—ã¦ãã ã•ã„ã€‚</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/themeform.py" line="213"/>
@@ -2809,57 +2859,57 @@
     <message>
         <location filename="openlp/core/ui/thememanager.py" line="66"/>
         <source>Create a new theme.</source>
-        <translation>æ–°ã—ã„ãƒ†ãƒ¼ãƒžã‚’ä½œæˆã™ã‚‹ã€‚</translation>
+        <translation>æ–°ã—ã„å¤–è¦³ãƒ†ãƒ¼ãƒžã‚’ä½œæˆã™ã‚‹ã€‚</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/thememanager.py" line="70"/>
         <source>Edit Theme</source>
-        <translation>ãƒ†ãƒ¼ãƒžç·¨é›†</translation>
+        <translation>å¤–è¦³ãƒ†ãƒ¼ãƒžç·¨é›†</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/thememanager.py" line="70"/>
         <source>Edit a theme.</source>
-        <translation>ãƒ†ãƒ¼ãƒžã®ç·¨é›†ã™ã‚‹ã€‚</translation>
+        <translation>å¤–è¦³ãƒ†ãƒ¼ãƒžã®ç·¨é›†ã™ã‚‹ã€‚</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/thememanager.py" line="75"/>
         <source>Delete Theme</source>
-        <translation>ãƒ†ãƒ¼ãƒžå‰Šé™¤</translation>
+        <translation>å¤–è¦³ãƒ†ãƒ¼ãƒžå‰Šé™¤</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/thememanager.py" line="75"/>
         <source>Delete a theme.</source>
-        <translation>ãƒ†ãƒ¼ãƒžã®å‰Šé™¤ã™ã‚‹ã€‚</translation>
+        <translation>å¤–è¦³ãƒ†ãƒ¼ãƒžã®å‰Šé™¤ã™ã‚‹ã€‚</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/thememanager.py" line="81"/>
         <source>Import Theme</source>
-        <translation>ãƒ†ãƒ¼ãƒžã‚¤ãƒ³ãƒãƒ¼ãƒˆ</translation>
+        <translation>å¤–è¦³ãƒ†ãƒ¼ãƒžã‚¤ãƒ³ãƒãƒ¼ãƒˆ</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/thememanager.py" line="81"/>
         <source>Import a theme.</source>
-        <translation>ãƒ†ãƒ¼ãƒžã®ã‚¤ãƒ³ãƒãƒ¼ãƒˆã‚’ã™ã‚‹ã€‚</translation>
+        <translation>å¤–è¦³ãƒ†ãƒ¼ãƒžã®ã‚¤ãƒ³ãƒãƒ¼ãƒˆã‚’ã™ã‚‹ã€‚</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/thememanager.py" line="86"/>
         <source>Export Theme</source>
-        <translation>ãƒ†ãƒ¼ãƒžã®ã‚¨ã‚ã‚¹ãƒãƒ¼ãƒˆ</translation>
+        <translation>å¤–è¦³ãƒ†ãƒ¼ãƒžã®ã‚¨ã‚ã‚¹ãƒãƒ¼ãƒˆ</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/thememanager.py" line="86"/>
         <source>Export a theme.</source>
-        <translation>ãƒ†ãƒ¼ãƒžã®ã‚¨ã‚ã‚¹ãƒãƒ¼ãƒˆã‚’ã™ã‚‹ã€‚</translation>
+        <translation>å¤–è¦³ãƒ†ãƒ¼ãƒžã®ã‚¨ã‚ã‚¹ãƒãƒ¼ãƒˆã‚’ã™ã‚‹ã€‚</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/thememanager.py" line="107"/>
         <source>&amp;Edit Theme</source>
-        <translation>ãƒ†ãƒ¼ãƒžã®ç·¨é›†(&amp;E)</translation>
+        <translation>å¤–è¦³ãƒ†ãƒ¼ãƒžã®ç·¨é›†(&amp;E)</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/thememanager.py" line="116"/>
         <source>&amp;Delete Theme</source>
-        <translation>ãƒ†ãƒ¼ãƒžã®å‰Šé™¤(&amp;D)</translation>
+        <translation>å¤–è¦³ãƒ†ãƒ¼ãƒžã®å‰Šé™¤(&amp;D)</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/thememanager.py" line="120"/>
@@ -2874,83 +2924,83 @@
     <message>
         <location filename="openlp/core/ui/thememanager.py" line="327"/>
         <source>You must select a theme to edit.</source>
-        <translation>ç·¨é›†ã™ã‚‹ãƒ†ãƒ¼ãƒžã‚’é¸æŠžã—ã¦ãã ã•ã„ã€‚</translation>
+        <translation>ç·¨é›†ã™ã‚‹å¤–è¦³ãƒ†ãƒ¼ãƒžã‚’é¸æŠžã—ã¦ãã ã•ã„ã€‚</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/thememanager.py" line="718"/>
         <source>You are unable to delete the default theme.</source>
-        <translation>æ—¢å®šã®ãƒ†ãƒ¼ãƒžã‚’å‰Šé™¤ã™ã‚‹äº‹ã¯ã§ãã¾ã›ã‚“ã€‚</translation>
+        <translation>æ—¢å®šã®å¤–è¦³ãƒ†ãƒ¼ãƒžã‚’å‰Šé™¤ã™ã‚‹äº‹ã¯ã§ãã¾ã›ã‚“ã€‚</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/thememanager.py" line="726"/>
         <source>Theme %s is used in the %s plugin.</source>
-        <translation>%s ãƒ—ãƒ©ã‚°ã‚¤ãƒ³ã§ã“ã®ãƒ†ãƒ¼ãƒžã¯åˆ©ç”¨ã•ã‚Œã¦ã„ã¾ã™ã€‚</translation>
+        <translation>%s ãƒ—ãƒ©ã‚°ã‚¤ãƒ³ã§ã“ã®å¤–è¦³ãƒ†ãƒ¼ãƒžã¯åˆ©ç”¨ã•ã‚Œã¦ã„ã¾ã™ã€‚</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/thememanager.py" line="378"/>
         <source>You have not selected a theme.</source>
-        <translation>ãƒ†ãƒ¼ãƒžã®é¸æŠžãŒã‚ã‚Šã¾ã›ã‚“ã€‚</translation>
+        <translation>å¤–è¦³ãƒ†ãƒ¼ãƒžã®é¸æŠžãŒã‚ã‚Šã¾ã›ã‚“ã€‚</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/thememanager.py" line="382"/>
         <source>Save Theme - (%s)</source>
-        <translation>ãƒ†ãƒ¼ãƒžã‚’ä¿å˜ - (%s)</translation>
+        <translation>å¤–è¦³ãƒ†ãƒ¼ãƒžã‚’ä¿å˜ - (%s)</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/thememanager.py" line="400"/>
         <source>Theme Exported</source>
-        <translation>ãƒ†ãƒ¼ãƒžã‚¨ã‚ã‚¹ãƒãƒ¼ãƒˆ</translation>
+        <translation>å¤–è¦³ãƒ†ãƒ¼ãƒžã‚¨ã‚ã‚¹ãƒãƒ¼ãƒˆ</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/thememanager.py" line="400"/>
         <source>Your theme has been successfully exported.</source>
-        <translation>ãƒ†ãƒ¼ãƒžã¯æ£å¸¸ã«ã‚¨ã‚ã‚¹ãƒãƒ¼ãƒˆã•ã‚Œã¾ã—ãŸã€‚</translation>
+        <translation>å¤–è¦³ãƒ†ãƒ¼ãƒžã¯æ£å¸¸ã«ã‚¨ã‚ã‚¹ãƒãƒ¼ãƒˆã•ã‚Œã¾ã—ãŸã€‚</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/thememanager.py" line="406"/>
         <source>Theme Export Failed</source>
-        <translation>ãƒ†ãƒ¼ãƒžã®ã‚¨ã‚ã‚¹ãƒãƒ¼ãƒˆå¤±æ•—</translation>
+        <translation>å¤–è¦³ãƒ†ãƒ¼ãƒžã®ã‚¨ã‚ã‚¹ãƒãƒ¼ãƒˆå¤±æ•—</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/thememanager.py" line="406"/>
         <source>Your theme could not be exported due to an error.</source>
-        <translation>ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ãŸãŸã‚ãƒ†ãƒ¼ãƒžã¯ã€ã‚¨ã‚ã‚¹ãƒãƒ¼ãƒˆã•ã‚Œã¾ã›ã‚“ã§ã—ãŸã€‚</translation>
+        <translation>ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ãŸãŸã‚å¤–è¦³ãƒ†ãƒ¼ãƒžã¯ã€ã‚¨ã‚ã‚¹ãƒãƒ¼ãƒˆã•ã‚Œã¾ã›ã‚“ã§ã—ãŸã€‚</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/thememanager.py" line="421"/>
         <source>Select Theme Import File</source>
-        <translation>ã‚¤ãƒ³ãƒãƒ¼ãƒˆå¯¾è±¡ã®ãƒ†ãƒ¼ãƒžãƒ•ã‚¡ã‚¤ãƒ«é¸æŠž</translation>
+        <translation>ã‚¤ãƒ³ãƒãƒ¼ãƒˆå¯¾è±¡ã®å¤–è¦³ãƒ†ãƒ¼ãƒžãƒ•ã‚¡ã‚¤ãƒ«é¸æŠž</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/thememanager.py" line="519"/>
         <source>File is not a valid theme.
 The content encoding is not UTF-8.</source>
-        <translation>ãƒ•ã‚¡ã‚¤ãƒ«ã¯ç„¡åŠ¹ãªãƒ†ãƒ¼ãƒžã§ã™ã€‚æ–‡å—ã‚³ãƒ¼ãƒ‰ãŒUTF-8ã§ã¯ã‚ã‚Šã¾ã›ã‚“ã€‚</translation>
+        <translation>ãƒ•ã‚¡ã‚¤ãƒ«ã¯ç„¡åŠ¹ãªå¤–è¦³ãƒ†ãƒ¼ãƒžã§ã™ã€‚æ–‡å—ã‚³ãƒ¼ãƒ‰ãŒUTF-8ã§ã¯ã‚ã‚Šã¾ã›ã‚“ã€‚</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/thememanager.py" line="566"/>
         <source>File is not a valid theme.</source>
-        <translation>ç„¡åŠ¹ãªãƒ†ãƒ¼ãƒžãƒ•ã‚¡ã‚¤ãƒ«ã§ã™ã€‚</translation>
+        <translation>ç„¡åŠ¹ãªå¤–è¦³ãƒ†ãƒ¼ãƒžãƒ•ã‚¡ã‚¤ãƒ«ã§ã™ã€‚</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/thememanager.py" line="110"/>
         <source>&amp;Copy Theme</source>
-        <translation>ãƒ†ãƒ¼ãƒžã®ã‚³ãƒ”ãƒ¼(&amp;C)</translation>
+        <translation>å¤–è¦³ãƒ†ãƒ¼ãƒžã®ã‚³ãƒ”ãƒ¼(&amp;C)</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/thememanager.py" line="113"/>
         <source>&amp;Rename Theme</source>
-        <translation>ãƒ†ãƒ¼ãƒžã®åå‰ã‚’å¤‰æ›´(&amp;N)</translation>
+        <translation>å¤–è¦³ãƒ†ãƒ¼ãƒžã®åå‰ã‚’å¤‰æ›´(&amp;N)</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/thememanager.py" line="123"/>
         <source>&amp;Export Theme</source>
-        <translation>ãƒ†ãƒ¼ãƒžã®ã‚¨ã‚ã‚¹ãƒãƒ¼ãƒˆ(&amp;E)</translation>
+        <translation>å¤–è¦³ãƒ†ãƒ¼ãƒžã®ã‚¨ã‚ã‚¹ãƒãƒ¼ãƒˆ(&amp;E)</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/thememanager.py" line="274"/>
         <source>You must select a theme to rename.</source>
-        <translation>åå‰ã‚’å¤‰æ›´ã™ã‚‹ãƒ†ãƒ¼ãƒžã‚’é¸æŠžã—ã¦ãã ã•ã„ã€‚</translation>
+        <translation>åå‰ã‚’å¤‰æ›´ã™ã‚‹å¤–è¦³ãƒ†ãƒ¼ãƒžã‚’é¸æŠžã—ã¦ãã ã•ã„ã€‚</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/thememanager.py" line="274"/>
@@ -2960,12 +3010,12 @@
     <message>
         <location filename="openlp/core/ui/thememanager.py" line="274"/>
         <source>Rename %s theme?</source>
-        <translation>%sãƒ†ãƒ¼ãƒžã®åå‰ã‚’å¤‰æ›´ã—ã¾ã™ã€‚å®œã—ã„ã§ã™ã‹?</translation>
+        <translation>%så¤–è¦³ãƒ†ãƒ¼ãƒžã®åå‰ã‚’å¤‰æ›´ã—ã¾ã™ã€‚å®œã—ã„ã§ã™ã‹?</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/thememanager.py" line="342"/>
         <source>You must select a theme to delete.</source>
-        <translation>å‰Šé™¤ã™ã‚‹ãƒ†ãƒ¼ãƒžã‚’é¸æŠžã—ã¦ãã ã•ã„ã€‚</translation>
+        <translation>å‰Šé™¤ã™ã‚‹å¤–è¦³ãƒ†ãƒ¼ãƒžã‚’é¸æŠžã—ã¦ãã ã•ã„ã€‚</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/thememanager.py" line="342"/>
@@ -2975,7 +3025,7 @@
     <message>
         <location filename="openlp/core/ui/thememanager.py" line="342"/>
         <source>Delete %s theme?</source>
-        <translation>%s ãƒ†ãƒ¼ãƒžã‚’å‰Šé™¤ã—ã¾ã™ã€‚å®œã—ã„ã§ã™ã‹?</translation>
+        <translation>%s å¤–è¦³ãƒ†ãƒ¼ãƒžã‚’å‰Šé™¤ã—ã¾ã™ã€‚å®œã—ã„ã§ã™ã‹?</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/thememanager.py" line="726"/>
@@ -2985,12 +3035,12 @@
     <message>
         <location filename="openlp/core/ui/thememanager.py" line="582"/>
         <source>A theme with this name already exists.</source>
-        <translation>åŒåã®ãƒ†ãƒ¼ãƒžãŒæ—¢ã«å˜åœ¨ã—ã¾ã™ã€‚</translation>
+        <translation>åŒåã®å¤–è¦³ãƒ†ãƒ¼ãƒžãŒæ—¢ã«å˜åœ¨ã—ã¾ã™ã€‚</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/thememanager.py" line="421"/>
         <source>OpenLP Themes (*.theme *.otz)</source>
-        <translation>OpenLP ãƒ†ãƒ¼ãƒž (*.theme *.otz)</translation>
+        <translation>OpenLP å¤–è¦³ãƒ†ãƒ¼ãƒž (*.theme *.otz)</translation>
     </message>
 </context>
 <context>
@@ -2998,12 +3048,12 @@
     <message>
         <location filename="openlp/core/ui/themewizard.py" line="406"/>
         <source>Theme Wizard</source>
-        <translation>ãƒ†ãƒ¼ãƒžã‚¬ã‚¤ãƒ‰</translation>
+        <translation>å¤–è¦³ãƒ†ãƒ¼ãƒžã‚¬ã‚¤ãƒ‰</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/themewizard.py" line="408"/>
         <source>Welcome to the Theme Wizard</source>
-        <translation>ãƒ†ãƒ¼ãƒžã‚¬ã‚¤ãƒ‰ã‚’ã‚ˆã†ã“ã</translation>
+        <translation>å¤–è¦³ãƒ†ãƒ¼ãƒžã‚¬ã‚¤ãƒ‰ã‚’ã‚ˆã†ã“ã</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/themewizard.py" line="415"/>
@@ -3013,7 +3063,7 @@
     <message>
         <location filename="openlp/core/ui/themewizard.py" line="417"/>
         <source>Set up your theme&apos;s background according to the parameters below.</source>
-        <translation>ä»¥ä¸‹ã®é …ç›®ã«å¿œã˜ã¦ã€ãƒ†ãƒ¼ãƒžã«ä½¿ç”¨ã™ã‚‹èƒŒæ™¯ã‚’è¨å®šã—ã¦ãã ã•ã„ã€‚</translation>
+        <translation>ä»¥ä¸‹ã®é …ç›®ã«å¿œã˜ã¦ã€å¤–è¦³ãƒ†ãƒ¼ãƒžã«ä½¿ç”¨ã™ã‚‹èƒŒæ™¯ã‚’è¨å®šã—ã¦ãã ã•ã„ã€‚</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/themewizard.py" line="420"/>
@@ -3208,17 +3258,17 @@
     <message>
         <location filename="openlp/core/ui/themewizard.py" line="530"/>
         <source>View the theme and save it replacing the current one or change the name to create a new theme</source>
-        <translation>ãƒ†ãƒ¼ãƒžã‚’è¡¨ç¤ºã—ã€ç¾åœ¨ã®ãƒ†ãƒ¼ãƒžã‚’ç½®ãæ›ãˆã‚‹ã‹åå‰ã‚’å¤‰æ›´ã—ã¦æ–°ã—ã„ãƒ†ãƒ¼ãƒžã‚’ä½œæˆã—ã€ä¿å˜ã™ã‚‹</translation>
+        <translation>å¤–è¦³ãƒ†ãƒ¼ãƒžã‚’è¡¨ç¤ºã—ã€ç¾åœ¨ã®å¤–è¦³ãƒ†ãƒ¼ãƒžã‚’ç½®ãæ›ãˆã‚‹ã‹åå‰ã‚’å¤‰æ›´ã—ã¦æ–°ã—ã„å¤–è¦³ãƒ†ãƒ¼ãƒžã‚’ä½œæˆã—ã€ä¿å˜ã™ã‚‹</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/themewizard.py" line="534"/>
         <source>Theme name:</source>
-        <translation>ãƒ†ãƒ¼ãƒžå:</translation>
+        <translation>å¤–è¦³ãƒ†ãƒ¼ãƒžå:</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/themewizard.py" line="411"/>
         <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>ã“ã®ã‚¬ã‚¤ãƒ‰ã¯ã€ã‚ãªãŸã®ãƒ†ãƒ¼ãƒžã‚’ä½œæˆç·¨é›†ã™ã‚‹æ‰‹åŠ©ã‘ã‚’ã—ã¾ã™ã€‚æ¬¡ã¸ã‚’ã‚¯ãƒªãƒƒã‚¯ã—ã¦ã€èƒŒæ™¯ã‚’é¸æŠžã—ã¦ãã ã•ã„ã€‚</translation>
+        <translation>ã“ã®ã‚¬ã‚¤ãƒ‰ã¯ã€ã‚ãªãŸã®å¤–è¦³ãƒ†ãƒ¼ãƒžã‚’ä½œæˆç·¨é›†ã™ã‚‹æ‰‹åŠ©ã‘ã‚’ã—ã¾ã™ã€‚æ¬¡ã¸ã‚’ã‚¯ãƒªãƒƒã‚¯ã—ã¦ã€èƒŒæ™¯ã‚’é¸æŠžã—ã¦ãã ã•ã„ã€‚</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/themewizard.py" line="490"/>
@@ -3233,7 +3283,7 @@
     <message>
         <location filename="openlp/core/ui/themeform.py" line="300"/>
         <source>Edit Theme - %s</source>
-        <translation>ãƒ†ãƒ¼ãƒžç·¨é›† - %s</translation>
+        <translation>å¤–è¦³ãƒ†ãƒ¼ãƒžç·¨é›† - %s</translation>
     </message>
 </context>
 <context>
@@ -3241,12 +3291,12 @@
     <message>
         <location filename="openlp/core/ui/themestab.py" line="104"/>
         <source>Global Theme</source>
-        <translation>å…¨ä½“ãƒ†ãƒ¼ãƒž</translation>
+        <translation>å…¨ä½“å¤–è¦³ãƒ†ãƒ¼ãƒž</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/themestab.py" line="106"/>
         <source>Theme Level</source>
-        <translation>ãƒ†ãƒ¼ãƒžãƒ¬ãƒ™ãƒ«</translation>
+        <translation>å¤–è¦³ãƒ†ãƒ¼ãƒžãƒ¬ãƒ™ãƒ«</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/themestab.py" line="108"/>
@@ -3256,7 +3306,7 @@
     <message>
         <location filename="openlp/core/ui/themestab.py" line="110"/>
         <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>ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹å†…ã®ãã‚Œãžã‚Œã®è³›ç¾Žã®ãƒ†ãƒ¼ãƒžã‚’ä½¿ç”¨ã—ã¾ã™ã€‚è³›ç¾Žã«ãƒ†ãƒ¼ãƒžãŒè¨å®šã•ã‚Œã¦ã„ãªã„å ´åˆã€ç¤¼æ‹ãƒ—ãƒã‚°ãƒ©ãƒ ã®ãƒ†ãƒ¼ãƒžã‚’ä½¿ç”¨ã—ã¾ã™ã€‚ç¤¼æ‹ãƒ—ãƒã‚°ãƒ©ãƒ ã«ãƒ†ãƒ¼ãƒžãŒè¨å®šã•ã‚Œã¦ã„ãªã‘ã‚Œã°ã€å…¨ä½“è¨å®šã®ãƒ†ãƒ¼ãƒžã‚’ä½¿ç”¨ã—ã¾ã™ã€‚</translation>
+        <translation>ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹å†…ã®ãã‚Œãžã‚Œã®è³›ç¾Žã®å¤–è¦³ãƒ†ãƒ¼ãƒžã‚’ä½¿ç”¨ã—ã¾ã™ã€‚è³›ç¾Žã«å¤–è¦³ãƒ†ãƒ¼ãƒžãŒè¨å®šã•ã‚Œã¦ã„ãªã„å ´åˆã€ç¤¼æ‹ãƒ—ãƒã‚°ãƒ©ãƒ ã®å¤–è¦³ãƒ†ãƒ¼ãƒžã‚’ä½¿ç”¨ã—ã¾ã™ã€‚ç¤¼æ‹ãƒ—ãƒã‚°ãƒ©ãƒ ã«å¤–è¦³ãƒ†ãƒ¼ãƒžãŒè¨å®šã•ã‚Œã¦ã„ãªã‘ã‚Œã°ã€å…¨ä½“è¨å®šã®å¤–è¦³ãƒ†ãƒ¼ãƒžã‚’ä½¿ç”¨ã—ã¾ã™ã€‚</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/themestab.py" line="115"/>
@@ -3266,7 +3316,7 @@
     <message>
         <location filename="openlp/core/ui/themestab.py" line="117"/>
         <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>ç¤¼æ‹ãƒ—ãƒã‚°ãƒ©ãƒ ã®ãƒ†ãƒ¼ãƒžã‚’ç”¨ã„ã€è³›ç¾Žå€‹ã€…ã®ãƒ†ãƒ¼ãƒžã‚’ä¸Šæ›¸ãã—ã¾ã™ã€‚ç¤¼æ‹ãƒ—ãƒã‚°ãƒ©ãƒ ã«ãƒ†ãƒ¼ãƒžãŒè¨å®šã•ã‚Œã¦ã„ãªã‘ã‚Œã°ã€å…¨ä½“è¨å®šã®ãƒ†ãƒ¼ãƒžã‚’ä½¿ç”¨ã—ã¾ã™ã€‚</translation>
+        <translation>ç¤¼æ‹ãƒ—ãƒã‚°ãƒ©ãƒ ã®å¤–è¦³ãƒ†ãƒ¼ãƒžã‚’ç”¨ã„ã€è³›ç¾Žå€‹ã€…ã®å¤–è¦³ãƒ†ãƒ¼ãƒžã‚’ä¸Šæ›¸ãã—ã¾ã™ã€‚ç¤¼æ‹ãƒ—ãƒã‚°ãƒ©ãƒ ã«å¤–è¦³ãƒ†ãƒ¼ãƒžãŒè¨å®šã•ã‚Œã¦ã„ãªã‘ã‚Œã°ã€å…¨ä½“è¨å®šã®å¤–è¦³ãƒ†ãƒ¼ãƒžã‚’ä½¿ç”¨ã—ã¾ã™ã€‚</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/themestab.py" line="121"/>
@@ -3276,7 +3326,7 @@
     <message>
         <location filename="openlp/core/ui/themestab.py" line="123"/>
         <source>Use the global theme, overriding any themes associated with either the service or the songs.</source>
-        <translation>å…¨ä½“ãƒ†ãƒ¼ãƒžã‚’ç”¨ã„ã€ã™ã¹ã¦ã®ç¤¼æ‹ãƒ—ãƒã‚°ãƒ©ãƒ ã‚„è³›ç¾Žã«é–¢é€£ä»˜ã‘ã‚‰ã‚ŒãŸãƒ†ãƒ¼ãƒžã‚’ä¸Šæ›¸ãã—ã¾ã™ã€‚</translation>
+        <translation>å…¨ä½“å¤–è¦³ãƒ†ãƒ¼ãƒžã‚’ç”¨ã„ã€ã™ã¹ã¦ã®ç¤¼æ‹ãƒ—ãƒã‚°ãƒ©ãƒ ã‚„è³›ç¾Žã«é–¢é€£ä»˜ã‘ã‚‰ã‚ŒãŸå¤–è¦³ãƒ†ãƒ¼ãƒžã‚’ä¸Šæ›¸ãã—ã¾ã™ã€‚</translation>
     </message>
 </context>
 <context>
@@ -3425,7 +3475,7 @@
     <message>
         <location filename="openlp/core/lib/ui.py" line="69"/>
         <source>New Theme</source>
-        <translation>æ–°ã—ã„ãƒ†ãƒ¼ãƒž</translation>
+        <translation>æ–°ã—ã„å¤–è¦³ãƒ†ãƒ¼ãƒž</translation>
     </message>
     <message>
         <location filename="openlp/core/lib/ui.py" line="70"/>
@@ -3546,13 +3596,13 @@
         <location filename="openlp/core/lib/ui.py" line="92"/>
         <source>Theme</source>
         <comment>Singular</comment>
-        <translation>ãƒ†ãƒ¼ãƒž</translation>
+        <translation>å¤–è¦³ãƒ†ãƒ¼ãƒž</translation>
     </message>
     <message>
         <location filename="openlp/core/lib/ui.py" line="93"/>
         <source>Themes</source>
         <comment>Plural</comment>
-        <translation>ãƒ†ãƒ¼ãƒž</translation>
+        <translation>å¤–è¦³ãƒ†ãƒ¼ãƒž</translation>
     </message>
     <message>
         <location filename="openlp/core/lib/ui.py" line="94"/>
@@ -3989,17 +4039,17 @@
         <translation>ãƒ¬ãƒãƒ¼ãƒˆã®å‡ºåŠ›å ´æ‰€</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="92"/>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="101"/>
         <source>usage_detail_%s_%s.txt</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="114"/>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="123"/>
         <source>Report Creation</source>
         <translation>ãƒ¬ãƒãƒ¼ãƒˆç”Ÿæˆ</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="114"/>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="123"/>
         <source>Report 
 %s 
 has been successfully created. </source>
@@ -4007,83 +4057,93 @@
         %s
       - ã¯æ£å¸¸ã«ç”Ÿæˆã•ã‚Œã¾ã—ãŸã€‚</translation>
     </message>
+    <message>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="92"/>
+        <source>Output Path Not Selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="92"/>
+        <source>You have not set a valid output location for your song usage report. Please select an existing path on your computer.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SongsPlugin</name>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="104"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="103"/>
         <source>&amp;Song</source>
         <translation>è³›ç¾Ž(&amp;S)</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="85"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="84"/>
         <source>Import songs using the import wizard.</source>
         <translation>ã‚¤ãƒ³ãƒãƒ¼ãƒˆã‚¦ã‚£ã‚¶ãƒ¼ãƒ‰ã‚’ä½¿ç”¨ã—ã¦è³›ç¾Žã‚’ã‚¤ãƒ³ãƒãƒ¼ãƒˆã—ã¾ã™ã€‚</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="183"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="182"/>
         <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;è³›ç¾Žãƒ—ãƒ©ã‚°ã‚¤ãƒ³&lt;/strong&gt;&lt;br /&gt;è³›ç¾Žãƒ—ãƒ©ã‚°ã‚¤ãƒ³ã¯ã€è³›ç¾Žã‚’è¡¨ç¤ºã—ç®¡ç†ã™ã‚‹æ©Ÿèƒ½ã‚’æä¾›ã—ã¾ã™ã€‚</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="126"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="125"/>
         <source>&amp;Re-index Songs</source>
         <translation>è³›ç¾Žã®ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã‚’å†ä½œæˆ(&amp;R)</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="128"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="127"/>
         <source>Re-index the songs database to improve searching and ordering.</source>
         <translation>è³›ç¾Žãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã®ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã‚’å†ä½œæˆã—ã€æ¤œç´¢ã‚„ä¸¦ã¹æ›¿ãˆã‚’é€Ÿãã—ã¾ã™ã€‚</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="141"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="140"/>
         <source>Reindexing songs...</source>
         <translation>è³›ç¾Žã®ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã‚’å†ä½œæˆä¸...</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="238"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="237"/>
         <source>Add a new Song</source>
         <translation>è³›ç¾Žã‚’è¿½åŠ </translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="239"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="238"/>
         <source>Edit the selected Song</source>
         <translation>é¸æŠžã—ãŸè³›ç¾Žã‚’ç·¨é›†</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="240"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="239"/>
         <source>Delete the selected Song</source>
         <translation>é¸æŠžã—ãŸè³›ç¾Žã‚’å‰Šé™¤</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="241"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="240"/>
         <source>Preview the selected Song</source>
         <translation>é¸æŠžã—ãŸè³›ç¾Žã‚’ãƒ—ãƒ¬ãƒ“ãƒ¥ãƒ¼</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="242"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="241"/>
         <source>Send the selected Song live</source>
         <translation>é¸æŠžã—ãŸè³›ç¾Žã‚’ãƒ©ã‚¤ãƒ–ã¸é€ã‚‹</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="243"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="242"/>
         <source>Add the selected Song to the service</source>
         <translation>é¸æŠžã—ãŸè³›ç¾Žã‚’ç¤¼æ‹ãƒ—ãƒã‚°ãƒ©ãƒ ã«è¿½åŠ </translation>
     </message>
     <message>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="226"/>
+        <source>Song</source>
+        <comment>name singular</comment>
+        <translation>è³›ç¾Ž</translation>
+    </message>
+    <message>
         <location filename="openlp/plugins/songs/songsplugin.py" line="227"/>
-        <source>Song</source>
-        <comment>name singular</comment>
-        <translation>è³›ç¾Ž</translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="228"/>
         <source>Songs</source>
         <comment>name plural</comment>
         <translation>è³›ç¾Ž</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="232"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="231"/>
         <source>Songs</source>
         <comment>container title</comment>
         <translation>è³›ç¾Ž</translation>
@@ -4121,7 +4181,7 @@
     <message>
         <location filename="openlp/plugins/songs/lib/__init__.py" line="216"/>
         <source>Japanese (CP-932)</source>
-        <translation></translation>
+        <translation>æ—¥æœ¬èªž  (CP-932)</translation>
     </message>
     <message>
         <location filename="openlp/plugins/songs/lib/__init__.py" line="217"/>
@@ -4177,7 +4237,7 @@
         <translation>æ–‡å—ã‚³ãƒ¼ãƒ‰ã‚’é¸æŠžã—ã¦ãã ã•ã„ã€‚æ–‡å—ãŒæ£å¸¸ã«è¡¨ç¤ºã•ã‚Œã‚‹ã®ã«å¿…è¦ãªè¨å®šã§ã™ã€‚</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="106"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="105"/>
         <source>Exports songs using the export wizard.</source>
         <translation>ã‚¨ã‚ã‚¹ãƒãƒ¼ãƒˆã‚¬ã‚¤ãƒ‰ã‚’ä½¿ã£ã¦è³›ç¾Žã‚’ã‚¨ã‚ã‚¹ãƒãƒ¼ãƒˆã™ã‚‹ã€‚</translation>
     </message>
@@ -4308,7 +4368,7 @@
     <message>
         <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="291"/>
         <source>New &amp;Theme</source>
-        <translation>æ–°ã—ã„ãƒ†ãƒ¼ãƒž(&amp;N)</translation>
+        <translation>æ–°ã—ã„å¤–è¦³ãƒ†ãƒ¼ãƒž(&amp;N)</translation>
     </message>
     <message>
         <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="293"/>
@@ -4323,7 +4383,7 @@
     <message>
         <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="299"/>
         <source>Theme, Copyright Info &amp;&amp; Comments</source>
-        <translation>ãƒ†ãƒ¼ãƒžã€è‘—ä½œæƒ…å ± &amp;&amp; ã‚³ãƒ¡ãƒ³ãƒˆ</translation>
+        <translation>å¤–è¦³ãƒ†ãƒ¼ãƒžã€è‘—ä½œæƒ…å ± &amp;&amp; ã‚³ãƒ¡ãƒ³ãƒˆ</translation>
     </message>
     <message>
         <location filename="openlp/plugins/songs/forms/editsongform.py" line="337"/>
@@ -4633,12 +4693,12 @@
         <translation>è³›ç¾Žè©ž</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="318"/>
+        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="321"/>
         <source>Delete Song(s)?</source>
         <translation>ã“ã‚Œã‚‰ã®è³›ç¾Žã‚’å‰Šé™¤ã—ã¾ã™ã‹?</translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="400"/>
+        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="403"/>
         <source>CCLI License: </source>
         <translation>CCLI ãƒ©ã‚¤ã‚»ãƒ³ã‚¹:</translation>
     </message>
@@ -4648,7 +4708,7 @@
         <translation>è³›ç¾Žå…¨ä½“</translation>
     </message>
     <message numerus="yes">
-        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="318"/>
+        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="321"/>
         <source>Are you sure you want to delete the %n selected song(s)?</source>
         <translation>
             <numerusform>é¸æŠžã•ã‚ŒãŸ%nä»¶ã®è³›ç¾Žã‚’å‰Šé™¤ã—ã¾ã™ã€‚å®œã—ã„ã§ã™ã‹?</numerusform>

=== modified file 'resources/i18n/ko.ts'
--- resources/i18n/ko.ts	2011-03-09 16:16:40 +0000
+++ resources/i18n/ko.ts	2011-03-13 10:53:56 +0000
@@ -210,7 +210,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="540"/>
+        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="539"/>
         <source>You cannot combine single and dual Bible verse search results. Do you want to delete your search results and start a new search?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -830,59 +830,59 @@
 <context>
     <name>ImagePlugin</name>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="45"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="44"/>
         <source>&lt;strong&gt;Image Plugin&lt;/strong&gt;&lt;br /&gt;The image plugin provides displaying of images.&lt;br /&gt;One of the distinguishing features of this plugin is the ability to group a number of images together in the service manager, making the displaying of multiple images easier. This plugin can also make use of OpenLP&apos;s &quot;timed looping&quot; feature to create a slide show that runs automatically. In addition to this, images from the plugin can be used to override the current theme&apos;s background, which renders text-based items like songs with the selected image as a background instead of the background provided by the theme.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="73"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="72"/>
         <source>Load a new Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="openlp/plugins/images/imageplugin.py" line="74"/>
+        <source>Add a new Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="openlp/plugins/images/imageplugin.py" line="75"/>
-        <source>Add a new Image</source>
+        <source>Edit the selected Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/plugins/images/imageplugin.py" line="76"/>
-        <source>Edit the selected Image</source>
+        <source>Delete the selected Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/plugins/images/imageplugin.py" line="77"/>
-        <source>Delete the selected Image</source>
+        <source>Preview the selected Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/plugins/images/imageplugin.py" line="78"/>
-        <source>Preview the selected Image</source>
+        <source>Send the selected Image live</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/plugins/images/imageplugin.py" line="79"/>
-        <source>Send the selected Image live</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="80"/>
         <source>Add the selected Image to the service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="openlp/plugins/images/imageplugin.py" line="63"/>
+        <source>Image</source>
+        <comment>name singular</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="openlp/plugins/images/imageplugin.py" line="64"/>
-        <source>Image</source>
-        <comment>name singular</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="65"/>
         <source>Images</source>
         <comment>name plural</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="69"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="68"/>
         <source>Images</source>
         <comment>container title</comment>
         <translation type="unfinished"></translation>
@@ -938,59 +938,59 @@
 <context>
     <name>MediaPlugin</name>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="70"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="93"/>
         <source>&lt;strong&gt;Media Plugin&lt;/strong&gt;&lt;br /&gt;The media plugin provides playback of audio and video.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="89"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="112"/>
         <source>Load a new Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="91"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="114"/>
         <source>Add a new Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="92"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="115"/>
         <source>Edit the selected Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="93"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="116"/>
         <source>Delete the selected Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="94"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="117"/>
         <source>Preview the selected Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="95"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="118"/>
         <source>Send the selected Media live</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="96"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="119"/>
         <source>Add the selected Media to the service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="80"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="103"/>
         <source>Media</source>
         <comment>name singular</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="81"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="104"/>
         <source>Media</source>
         <comment>name plural</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="85"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="108"/>
         <source>Media</source>
         <comment>container title</comment>
         <translation type="unfinished"></translation>
@@ -1089,14 +1089,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/aboutdialog.py" line="224"/>
-        <source>Copyright &#xa9; 2004-2011 Raoul Snyman
-Portions copyright &#xa9; 2004-2011 Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri,
-Meinert Jordan, Andreas Preikschat, Christian Richter, Philip
-Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, CarstennTinggaard, Frode Woldsund</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="openlp/core/ui/aboutdialog.py" line="231"/>
         <source>This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.</source>
         <translation type="unfinished"></translation>
@@ -1171,6 +1163,15 @@
     He has set us free.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="openlp/core/ui/aboutdialog.py" line="224"/>
+        <source>Copyright &#xa9; 2004-2011 Raoul Snyman
+Portions copyright &#xa9; 2004-2011 Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri,
+Meinert Jordan, Andreas Preikschat, Christian Richter, Philip
+Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carsten
+Tinggaard, Frode Woldsund</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OpenLP.AdvancedTab</name>
@@ -1274,17 +1275,17 @@
     </message>
     <message>
         <location filename="openlp/core/ui/displaytagdialog.py" line="145"/>
-        <source>Tag id</source>
+        <source>Tag Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/core/ui/displaytagdialog.py" line="147"/>
-        <source>Start Html</source>
+        <source>Start HTML</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/core/ui/displaytagdialog.py" line="149"/>
-        <source>End Html</source>
+        <source>End HTML</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1422,151 +1423,200 @@
 <context>
     <name>OpenLP.FirstTimeLanguageForm</name>
     <message>
-        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="60"/>
-        <source>Initial Set up Language</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="62"/>
-        <source>Select the language you&apos;d like to use in OpenLP.</source>
+        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="61"/>
+        <source>Select Translation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="63"/>
+        <source>Choose the translation you&apos;d like to use in OpenLP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="65"/>
+        <source>Translation:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpenLP.FirstTimeWizard</name>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="154"/>
-        <source>Songs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="63"/>
-        <source>Bibles</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="64"/>
-        <source>Themes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="65"/>
-        <source>Starting Updates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="67"/>
-        <source>Downloading %s</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="140"/>
+        <location filename="openlp/core/ui/firsttimeform.py" line="61"/>
+        <source>Downloading %s...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="212"/>
+        <source>Download complete. Click the finish button to start OpenLP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="221"/>
+        <source>Enabling selected plugins...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="244"/>
+        <source>Overwrite Existing Songs?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="244"/>
+        <source>Your songs database already exists and your current songs will be permanently lost, are you sure you want to replace it ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="193"/>
         <source>First Time Wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="142"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="195"/>
         <source>Welcome to the First Time Wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="146"/>
-        <source>This wizard will help you to configure OpenLP for initial use . Click the next button below to start the process of selection your initial options. </source>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="199"/>
+        <source>This wizard will help you to configure OpenLP for initial use. Click the next button below to start the process of selection your initial options. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="150"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="203"/>
         <source>Activate required Plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="152"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="205"/>
         <source>Select the Plugins you wish to use. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="155"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="207"/>
+        <source>Songs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="208"/>
         <source>Custom Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="157"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="210"/>
         <source>Bible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="158"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="211"/>
         <source>Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="160"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="213"/>
         <source>Presentations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="162"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="215"/>
         <source>Media (Audio and Video)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="164"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="217"/>
         <source>Allow remote access</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="166"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="219"/>
         <source>Monitor Song Usage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="168"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="221"/>
         <source>Allow Alerts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="170"/>
-        <source>Download Samples from OpenLP.org</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="172"/>
-        <source>Select samples to downlaod and install for use.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="175"/>
-        <source>No Internet connection found so unable to download any default files.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="178"/>
-        <source>Download Example Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="180"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="223"/>
+        <source>No Internet Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="225"/>
+        <source>Unable to detect an Internet connection.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="228"/>
+        <source>No Internet connection was found. The First Time Wizard needs an Internet connection in order to be able to download sample songs, Bibles and themes.
+
+To re-run the First Time Wizard and import this sample data at a later stage, press the cancel button now, check your Internet connection, and restart OpenLP.
+
+To cancel the First Time Wizard completely, press the finish button now.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="236"/>
+        <source>Sample Songs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="238"/>
+        <source>Select and download public domain songs.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="240"/>
+        <source>Sample Bibles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="242"/>
+        <source>Select and download free Bibles.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="244"/>
+        <source>Sample Themes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="246"/>
+        <source>Select and download sample themes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="248"/>
         <source>Default Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="182"/>
-        <source>Set up default values to be used by OpenLP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="184"/>
-        <source>Default output display</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="186"/>
-        <source>Select the default Theme</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="188"/>
-        <source>Press finish to apply all your changes and start OpenLP</source>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="250"/>
+        <source>Set up default settings to be used by OpenLP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="252"/>
+        <source>Setting Up And Importing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="254"/>
+        <source>Please wait while OpenLP is set up and your data is imported.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="256"/>
+        <source>Default output display:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="258"/>
+        <source>Select default theme:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="260"/>
+        <source>Starting configuration process...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1691,12 +1741,12 @@
 <context>
     <name>OpenLP.LanguageManager</name>
     <message>
-        <location filename="openlp/core/utils/languagemanager.py" line="126"/>
+        <location filename="openlp/core/utils/languagemanager.py" line="130"/>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/utils/languagemanager.py" line="126"/>
+        <location filename="openlp/core/utils/languagemanager.py" line="130"/>
         <source>Please restart OpenLP to use your new language setting.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2002,17 +2052,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="428"/>
-        <source>&amp;Auto Detect</source>
+        <location filename="openlp/core/ui/mainwindow.py" line="434"/>
+        <source>Use the system language, if available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/core/ui/mainwindow.py" line="430"/>
-        <source>Use the system language, if available.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="434"/>
         <source>Set the interface language to %s</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2057,29 +2102,29 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="644"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="642"/>
         <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="648"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="646"/>
         <source>OpenLP Version Updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="686"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="684"/>
         <source>OpenLP Main Display Blanked</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="686"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="684"/>
         <source>The Main Display has been blanked out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="895"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="893"/>
         <source>Default Theme: %s</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2095,12 +2140,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="817"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="815"/>
         <source>Close OpenLP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/mainwindow.py" line="817"/>
+        <location filename="openlp/core/ui/mainwindow.py" line="815"/>
         <source>Are you sure you want to close OpenLP?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2129,11 +2174,16 @@
         <source>&amp;Configure Display Tags</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="openlp/core/ui/mainwindow.py" line="432"/>
+        <source>&amp;Autodetect</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OpenLP.MediaManagerItem</name>
     <message>
-        <location filename="openlp/core/lib/__init__.py" line="287"/>
+        <location filename="openlp/core/lib/__init__.py" line="286"/>
         <source>No Items Selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2411,28 +2461,28 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="493"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="521"/>
         <source>File is not a valid service.
 The content encoding is not UTF-8.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="525"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="553"/>
         <source>File is not a valid service.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="1051"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="1079"/>
         <source>Missing Display Handler</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="1017"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="1045"/>
         <source>Your item cannot be displayed as there is no handler to display it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="1051"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="1079"/>
         <source>Your item cannot be displayed as the plugin required to display it is missing or inactive</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2462,7 +2512,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/servicemanager.py" line="466"/>
+        <location filename="openlp/core/ui/servicemanager.py" line="494"/>
         <source>OpenLP Service Files (*.osz)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3943,99 +3993,109 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="92"/>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="101"/>
         <source>usage_detail_%s_%s.txt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="114"/>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="123"/>
         <source>Report Creation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="114"/>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="123"/>
         <source>Report 
 %s 
 has been successfully created. </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="92"/>
+        <source>Output Path Not Selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songusage/forms/songusagedetailform.py" line="92"/>
+        <source>You have not set a valid output location for your song usage report. Please select an existing path on your computer.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SongsPlugin</name>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="104"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="103"/>
         <source>&amp;Song</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="85"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="84"/>
         <source>Import songs using the import wizard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="183"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="182"/>
         <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 type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="126"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="125"/>
         <source>&amp;Re-index Songs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="128"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="127"/>
         <source>Re-index the songs database to improve searching and ordering.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="141"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="140"/>
         <source>Reindexing songs...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="237"/>
+        <source>Add a new Song</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="openlp/plugins/songs/songsplugin.py" line="238"/>
-        <source>Add a new Song</source>
+        <source>Edit the selected Song</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/plugins/songs/songsplugin.py" line="239"/>
-        <source>Edit the selected Song</source>
+        <source>Delete the selected Song</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/plugins/songs/songsplugin.py" line="240"/>
-        <source>Delete the selected Song</source>
+        <source>Preview the selected Song</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/plugins/songs/songsplugin.py" line="241"/>
-        <source>Preview the selected Song</source>
+        <source>Send the selected Song live</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/plugins/songs/songsplugin.py" line="242"/>
-        <source>Send the selected Song live</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="243"/>
         <source>Add the selected Song to the service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="226"/>
+        <source>Song</source>
+        <comment>name singular</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="openlp/plugins/songs/songsplugin.py" line="227"/>
-        <source>Song</source>
-        <comment>name singular</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="228"/>
         <source>Songs</source>
         <comment>name plural</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="232"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="231"/>
         <source>Songs</source>
         <comment>container title</comment>
         <translation type="unfinished"></translation>
@@ -4129,7 +4189,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/songsplugin.py" line="106"/>
+        <location filename="openlp/plugins/songs/songsplugin.py" line="105"/>
         <source>Exports songs using the export wizard.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4585,12 +4645,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="318"/>
+        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="321"/>
         <source>Delete Song(s)?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="400"/>
+        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="403"/>
         <source>CCLI License: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -4600,7 +4660,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="318"/>
+        <location filename="openlp/plugins/songs/lib/mediaitem.py" line="321"/>
         <source>Are you sure you want to delete the %n selected song(s)?</source>
         <translation type="unfinished">
             <numerusform></numerusform>

=== modified file 'resources/i18n/nb.ts'
--- resources/i18n/nb.ts	2011-03-09 16:16:40 +0000
+++ resources/i18n/nb.ts	2011-03-13 10:53:56 +0000
@@ -210,7 +210,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="540"/>
+        <location filename="openlp/plugins/bibles/lib/mediaitem.py" line="539"/>
         <source>You cannot combine single and dual Bible verse search results. Do you want to delete your search results and start a new search?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -829,59 +829,59 @@
 <context>
     <name>ImagePlugin</name>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="45"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="44"/>
         <source>&lt;strong&gt;Image Plugin&lt;/strong&gt;&lt;br /&gt;The image plugin provides displaying of images.&lt;br /&gt;One of the distinguishing features of this plugin is the ability to group a number of images together in the service manager, making the displaying of multiple images easier. This plugin can also make use of OpenLP&apos;s &quot;timed looping&quot; feature to create a slide show that runs automatically. In addition to this, images from the plugin can be used to override the current theme&apos;s background, which renders text-based items like songs with the selected image as a background instead of the background provided by the theme.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="73"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="72"/>
         <source>Load a new Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="openlp/plugins/images/imageplugin.py" line="74"/>
+        <source>Add a new Image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="openlp/plugins/images/imageplugin.py" line="75"/>
-        <source>Add a new Image</source>
+        <source>Edit the selected Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/plugins/images/imageplugin.py" line="76"/>
-        <source>Edit the selected Image</source>
+        <source>Delete the selected Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/plugins/images/imageplugin.py" line="77"/>
-        <source>Delete the selected Image</source>
+        <source>Preview the selected Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/plugins/images/imageplugin.py" line="78"/>
-        <source>Preview the selected Image</source>
+        <source>Send the selected Image live</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/plugins/images/imageplugin.py" line="79"/>
-        <source>Send the selected Image live</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="80"/>
         <source>Add the selected Image to the service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="openlp/plugins/images/imageplugin.py" line="63"/>
+        <source>Image</source>
+        <comment>name singular</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="openlp/plugins/images/imageplugin.py" line="64"/>
-        <source>Image</source>
-        <comment>name singular</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="65"/>
         <source>Images</source>
         <comment>name plural</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/images/imageplugin.py" line="69"/>
+        <location filename="openlp/plugins/images/imageplugin.py" line="68"/>
         <source>Images</source>
         <comment>container title</comment>
         <translation type="unfinished"></translation>
@@ -937,59 +937,59 @@
 <context>
     <name>MediaPlugin</name>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="70"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="93"/>
         <source>&lt;strong&gt;Media Plugin&lt;/strong&gt;&lt;br /&gt;The media plugin provides playback of audio and video.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="89"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="112"/>
         <source>Load a new Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="91"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="114"/>
         <source>Add a new Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="92"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="115"/>
         <source>Edit the selected Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="93"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="116"/>
         <source>Delete the selected Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="94"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="117"/>
         <source>Preview the selected Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="95"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="118"/>
         <source>Send the selected Media live</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="96"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="119"/>
         <source>Add the selected Media to the service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="80"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="103"/>
         <source>Media</source>
         <comment>name singular</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="81"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="104"/>
         <source>Media</source>
         <comment>name plural</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/plugins/media/mediaplugin.py" line="85"/>
+        <location filename="openlp/plugins/media/mediaplugin.py" line="108"/>
         <source>Media</source>
         <comment>container title</comment>
         <translation type="unfinished"></translation>
@@ -1088,14 +1088,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/aboutdialog.py" line="224"/>
-        <source>Copyright &#xa9; 2004-2011 Raoul Snyman
-Portions copyright &#xa9; 2004-2011 Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri,
-Meinert Jordan, Andreas Preikschat, Christian Richter, Philip
-Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, CarstennTinggaard, Frode Woldsund</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="openlp/core/ui/aboutdialog.py" line="231"/>
         <source>This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.</source>
         <translation type="unfinished"></translation>
@@ -1170,6 +1162,15 @@
     He has set us free.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="openlp/core/ui/aboutdialog.py" line="224"/>
+        <source>Copyright &#xa9; 2004-2011 Raoul Snyman
+Portions copyright &#xa9; 2004-2011 Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri,
+Meinert Jordan, Andreas Preikschat, Christian Richter, Philip
+Ridout, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carsten
+Tinggaard, Frode Woldsund</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OpenLP.AdvancedTab</name>
@@ -1273,17 +1274,17 @@
     </message>
     <message>
         <location filename="openlp/core/ui/displaytagdialog.py" line="145"/>
-        <source>Tag id</source>
+        <source>Tag Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/core/ui/displaytagdialog.py" line="147"/>
-        <source>Start Html</source>
+        <source>Start HTML</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="openlp/core/ui/displaytagdialog.py" line="149"/>
-        <source>End Html</source>
+        <source>End HTML</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1421,151 +1422,200 @@
 <context>
     <name>OpenLP.FirstTimeLanguageForm</name>
     <message>
-        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="60"/>
-        <source>Initial Set up Language</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="62"/>
-        <source>Select the language you&apos;d like to use in OpenLP.</source>
+        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="61"/>
+        <source>Select Translation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="63"/>
+        <source>Choose the translation you&apos;d like to use in OpenLP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimelanguagedialog.py" line="65"/>
+        <source>Translation:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OpenLP.FirstTimeWizard</name>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="154"/>
-        <source>Songs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="63"/>
-        <source>Bibles</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="64"/>
-        <source>Themes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="65"/>
-        <source>Starting Updates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimeform.py" line="67"/>
-        <source>Downloading %s</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="140"/>
+        <location filename="openlp/core/ui/firsttimeform.py" line="61"/>
+        <source>Downloading %s...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="212"/>
+        <source>Download complete. Click the finish button to start OpenLP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="221"/>
+        <source>Enabling selected plugins...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="244"/>
+        <source>Overwrite Existing Songs?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimeform.py" line="244"/>
+        <source>Your songs database already exists and your current songs will be permanently lost, are you sure you want to replace it ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="193"/>
         <source>First Time Wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="142"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="195"/>
         <source>Welcome to the First Time Wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="146"/>
-        <source>This wizard will help you to configure OpenLP for initial use . Click the next button below to start the process of selection your initial options. </source>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="199"/>
+        <source>This wizard will help you to configure OpenLP for initial use. Click the next button below to start the process of selection your initial options. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="150"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="203"/>
         <source>Activate required Plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="152"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="205"/>
         <source>Select the Plugins you wish to use. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="155"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="207"/>
+        <source>Songs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="208"/>
         <source>Custom Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="157"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="210"/>
         <source>Bible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="158"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="211"/>
         <source>Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="160"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="213"/>
         <source>Presentations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="162"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="215"/>
         <source>Media (Audio and Video)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="164"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="217"/>
         <source>Allow remote access</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="166"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="219"/>
         <source>Monitor Song Usage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="168"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="221"/>
         <source>Allow Alerts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="170"/>
-        <source>Download Samples from OpenLP.org</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="172"/>
-        <source>Select samples to downlaod and install for use.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="175"/>
-        <source>No Internet connection found so unable to download any default files.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="178"/>
-        <source>Download Example Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="180"/>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="223"/>
+        <source>No Internet Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="225"/>
+        <source>Unable to detect an Internet connection.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="228"/>
+        <source>No Internet connection was found. The First Time Wizard needs an Internet connection in order to be able to download sample songs, Bibles and themes.
+
+To re-run the First Time Wizard and import this sample data at a later stage, press the cancel button now, check your Internet connection, and restart OpenLP.
+
+To cancel the First Time Wizard completely, press the finish button now.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="236"/>
+        <source>Sample Songs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="238"/>
+        <source>Select and download public domain songs.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="240"/>
+        <source>Sample Bibles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="242"/>
+        <source>Select and download free Bibles.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="244"/>
+        <source>Sample Themes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="246"/>
+        <source>Select and download sample themes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="248"/>
         <source>Default Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="182"/>
-        <source>Set up default values to be used by OpenLP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="184"/>
-        <source>Default output display</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="186"/>
-        <source>Select the default Theme</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/core/ui/firsttimewizard.py" line="188"/>
-        <source>Press finish to apply all your changes and start OpenLP</source>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="250"/>
+        <source>Set up default settings to be used by OpenLP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="252"/>
+        <source>Setting Up And Importing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="254"/>
+        <source>Please wait while OpenLP is set up and your data is imported.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="256"/>
+        <source>Default output display:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="258"/>
+        <source>Select default theme:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/core/ui/firsttimewizard.py" line="260"/>
+        <source>Starting configuration process...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1690,12 +1740,12 @@
 <context>
     <name>OpenLP.LanguageManager</name>
     <message>
-        <location filename="openlp/core/utils/languagemanager.py" line="126"/>
+        <location filename="openlp/core/utils/languagemanager.py" line="130"/>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="openlp/core/utils/languagemanager.py" line="126"/>
+        <location filename="openlp/core/utils/languagemanager.py" line="130"/>
         <source>Please restart OpenLP to use your new language setting.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2001,17 +2051,12 @@
         <translation type="unfinished">&amp;Internett side</translation>
     </message>
     <message>
-        <location filena

Follow ups

[Merge] lp:~raoul-snyman/openlp/i18n into lp:openlp
From: noreply, 2011-03-13
Re: [Merge] lp:~raoul-snyman/openlp/i18n into lp:openlp
From: Tim Bentley, 2011-03-13
Re: [Merge] lp:~raoul-snyman/openlp/i18n into lp:openlp
From: Andreas Preikschat, 2011-03-13
[Merge] lp:~raoul-snyman/openlp/i18n into lp:openlp
From: Raoul Snyman, 2011-03-13