Merge upstream changes

configuration.ini

@@ -6,6 +6,8 @@ music_folder = /home/dmichel/botamusique/music/
 tmp_folder = /tmp/
 web_interface = False
 is_web_proxified = True
+ignored_folders = tmp
+ignored_files = Thumbs.db
 
 [command]
 play_file = file
@@ -21,6 +23,7 @@ volume = v
 kill = kill
 stop_and_getout = oust
 joinme = joinme
+queue = queue
 
 [radio]
 ponyville = http://192.99.131.205:8000/stream.mp3
@@ -38,18 +41,22 @@ not_playing = Aucun stream en lecture
 bad_file = Bad file asked
 no_file = Not file here
 bad_url = Bad URL asked
-empty_playlist = No more music into the playlist
+multiple_matches = Track not found! Possible candidates:
+queue_contents = The next items in the queue are:
+queue_empty = No more music in the playlist!
 
 help = Command available:
        <br />!play_file <path>
        <br />!play_url <url> - youtube or soundcloud
        <br />!play_radio <url> - url of a stream
+       <br />!list - display list of available tracks
+       <br />!queue - display items in queue
        <br />!next - jump to the next music of the playlist
        <br />!stop - stop and clear the playlist
-       <br />!play_file - stop + Go to default channel
+       <br />!oust - stop + Go to default channel
        <br />!v - get or change the volume (in %)
        <br />!joinme
 
 [debug]
 ffmpeg = False
-mumbleConnection = False
+mumbleConnection = False