From 88d717690025e07158bd8a4bfaa740a8872b78f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20P=C3=B5ldaru?= <mahfiaz@gmail.com>
Date: Tue, 13 Dec 2011 02:34:46 +0200
Subject: [PATCH] Fix for #828385, more sensible and partly alphabetical order
 of import formats.

---
 openlp/plugins/songs/forms/songimportform.py |  3 ++-
 openlp/plugins/songs/lib/importer.py         | 26 ++++++++++----------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/openlp/plugins/songs/forms/songimportform.py b/openlp/plugins/songs/forms/songimportform.py
index b79e56f7b..d556ffde3 100644
--- a/openlp/plugins/songs/forms/songimportform.py
+++ b/openlp/plugins/songs/forms/songimportform.py
@@ -238,7 +238,8 @@ class SongImportForm(OpenLPWizard):
         self.sourcePage.setTitle(WizardStrings.ImportSelect)
         self.sourcePage.setSubTitle(WizardStrings.ImportSelectLong)
         self.formatLabel.setText(WizardStrings.FormatLabel)
-        self.formatComboBox.setItemText(SongFormat.OpenLP2, UiStrings().OLPV2)
+        self.formatComboBox.setItemText(SongFormat.OpenLP2,
+            translate('SongsPlugin.ImportWizardForm', 'OpenLP 2.0 database'))
         self.formatComboBox.setItemText(SongFormat.OpenLP1, UiStrings().OLPV1)
         self.formatComboBox.setItemText(SongFormat.OpenLyrics,
             translate('SongsPlugin.ImportWizardForm',
diff --git a/openlp/plugins/songs/lib/importer.py b/openlp/plugins/songs/lib/importer.py
index d8432f668..bdc8d61e1 100644
--- a/openlp/plugins/songs/lib/importer.py
+++ b/openlp/plugins/songs/lib/importer.py
@@ -68,19 +68,19 @@ class SongFormat(object):
     """
     _format_availability = {}
     Unknown = -1
-    OpenLP2 = 0
-    OpenLP1 = 1
-    OpenLyrics = 2
-    OpenSong = 3
-    WordsOfWorship = 4
-    CCLI = 5
-    SongsOfFellowship = 6
-    Generic = 7
-    EasiSlides = 8
-    EasyWorship = 9
-    SongBeamer = 10
-    SongShowPlus = 11
-    FoilPresenter = 12
+    OpenLyrics = 0
+    OpenLP2 = 1
+    OpenLP1 = 2
+    Generic = 3
+    CCLI = 4
+    EasiSlides = 5
+    EasyWorship = 6
+    FoilPresenter = 7
+    OpenSong = 8
+    SongBeamer = 9
+    SongShowPlus = 10
+    SongsOfFellowship = 11
+    WordsOfWorship = 12
     #CSV = 13
 
     @staticmethod