Merge remote-tracking branch 'origin/halali' into halali

# Conflicts:
#	views/menu.tpl

bazarr/get_subtitle.py

@@ -766,10 +766,13 @@ def upgrade_subtitles():
     providers_list = get_providers()
     providers_auth = get_providers_auth()
     
+    count_episode_to_upgrade = len(episodes_to_upgrade)
+    count_movie_to_upgrade = len(movies_to_upgrade)
+
     for i, episode in enumerate(episodes_to_upgrade, 1):
         if episode[1] in ast.literal_eval(str(episode[9])):
-            notifications.write(msg='Upgrading series subtitles : ' + str(i) + '/' + str(len(episodes_to_upgrade)),
+            notifications.write(msg='Upgrading series subtitles : ' + str(i) + '/' + str(count_episode_to_upgrade),
-                                queue='get_subtitle')
+                                queue='get_subtitle', duration='long')
             result = download_subtitle(path_replace(episode[0]), str(alpha3_from_alpha2(episode[1])),
                                        episode[3], providers_list, providers_auth, str(episode[4]),
                                        episode[5], 'series', forced_minimum_score=int(episode[2]), is_upgrade=True)
@@ -785,8 +788,8 @@ def upgrade_subtitles():
 
     for i, movie in enumerate(movies_to_upgrade, 1):
         if movie[1] in ast.literal_eval(str(movie[8])):
-            notifications.write(msg='Upgrading movie subtitles : ' + str(i) + '/' + str(len(movies_to_upgrade)),
+            notifications.write(msg='Upgrading movie subtitles : ' + str(i) + '/' + str(count_movie_to_upgrade),
-                                    queue='get_subtitle')
+                                    queue='get_subtitle', duration='long')
             result = download_subtitle(path_replace_movie(movie[0]), str(alpha3_from_alpha2(movie[1])),
                                        movie[3], providers_list, providers_auth, str(movie[4]),
                                        movie[5], 'movie', forced_minimum_score=int(movie[2]), is_upgrade=True)

views/menu.tpl

@@ -262,6 +262,9 @@
                     if (duration === 'temporary') {
                         timeout = 3000;
                         killer = queue;
+                    } else if (duration === 'long') {
+                        timeout = 15000;
+                        killer = queue;
                     }  else {
 						timeout = false;
 						killer = false;