[transmageddon] Add latest versio of dvdtrack chooser

[Christian Fredrik Kalager Schaller <uraeus src gnome org>]

commit 1a92ff56abb3e928e77f1a0ff2499978655d8b56
Author: Christian Fredrik Kalager Schaller <uraeus linuxrising org>
Date:   Tue Jun 25 11:49:09 2013 +0200

    Add latest versio of dvdtrack chooser

 src/dvdtrackchooser.py |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/src/dvdtrackchooser.py b/src/dvdtrackchooser.py
index 5b17ab0..fdb4d46 100644
--- a/src/dvdtrackchooser.py
+++ b/src/dvdtrackchooser.py
@@ -53,7 +53,11 @@ class dvdtrackchooser(Gtk.Dialog):
            languages.append(language)
            
            # create a string to push into the listview
+<<<<<<< HEAD
            self.listoftracks.append(_("Title:") + " " + str(scounter) + ", " + _("Languages:") + " " + 
languages[scounter] + " " + _("Length:") + " " + str(round((self.Tracks[scounter]['length']/60), 2)) + " " + 
_("Minutes"))
+=======
+           self.listoftracks.append(_("Title: ") + str(scounter) + ", " + _("Languages: ") + 
languages[scounter] + _(" Length: ") + str(round((self.Tracks[scounter]['length']/60), 2)) + " Minutes")
+>>>>>>> fix typo in string
 
            # For testing purposes look for longest track
            scounter=scounter+1
@@ -93,7 +97,6 @@ class dvdtrackchooser(Gtk.Dialog):
            tree_iter = model.get_iter(path)
            value = model.get_value(tree_iter,1)
            self.dvdtitle=value
-           print("TITLE IS " +str(value))
            self.isdvd=True
        self.dvdwindow.destroy()