Merge remote-tracking branch 'upstream/master'

plugin.video.alfa/channels/autoplay.py

@@ -516,7 +516,7 @@ def autoplay_config(item):
         default = num - 1
         if default > len(server_list) - 1:
             default = 0
-        set_servers = {"id": "server_%s" % num, "label": u"          \u2665 Servidor Favorito %s" % num,
+        set_servers = {"id": "server_%s" % num, "label": u"          \u2665 " +"Servidor Favorito %s" % num,
                        "color": "0xfffcab14", "type": "list", "default": default,
                        "enabled": "eq(-%s,true)+eq(-%s,true)" % (pos1, num), "visible": True,
                        "lvalues": server_list}
@@ -548,7 +548,7 @@ def autoplay_config(item):
         if default > len(quality_list) - 1:
             default = 0
 
-        set_quality = {"id": "quality_%s" % num, "label": u"          \u2665 Calidad Favorita %s" % num,
+        set_quality = {"id": "quality_%s" % num, "label": u"          \u2665 " + "Calidad Favorita %s" % num,
                        "color": "0xfff442d9", "type": "list", "default": default,
                        "enabled": "eq(-%s,true)+eq(-%s,true)" % (pos1, num), "visible": True,
                        "lvalues": quality_list}

plugin.video.alfa/channels/downloads.json

@@ -128,7 +128,7 @@
       "label": "@70238",
       "lvalues": [
         "@70244",
-        "@70245"
+        "Reordenar"
       ],
       "default": 1,
       "enabled": true,
@@ -145,7 +145,7 @@
         "Vose, Eng, Sub, Esp, Lat"
       ],
       "default": 0,
-      "enabled": "eq(-1,@70245])",
+      "enabled": "eq(-1,'Reordenar')",
       "visible": true
     },
     {
@@ -159,7 +159,7 @@
         "SD"
       ],
       "default": 0,
-      "enabled": "eq(-2,@70245])",
+      "enabled": "eq(-2,'Reordenar')",
       "visible": true
     },
     {
@@ -167,8 +167,8 @@
       "type": "bool",
       "label": "@70242",
       "default": true,
-      "enabled": "eq(-3,@70245])",
+      "enabled": "eq(-3,'Reordenar')",
       "visible": true
     }
   ]
-}
+}

plugin.video.alfa/channels/news.py

@@ -612,14 +612,14 @@ def setting_channel(item):
 
         list_controls.append(control)
 
-    caption = "Canales incluidos en Novedades " + item.title.replace("Canales incluidos en: ", "- ").strip()
+    caption = config.get_localized_string(60533) + item.title.replace(config.get_localized_string(60525), "- ").strip()
     if config.get_setting("custom_button_value_news", item.channel):
-        custom_button_label = "Ninguno"
+        custom_button_label = config.get_localized_string(59992)
     else:
-        custom_button_label = "Todos"
+        custom_button_label = config.get_localized_string(59991)
 
     return platformtools.show_channel_settings(list_controls=list_controls,
-                                               caption="Canales incluidos en Novedades",
+                                               caption=caption,
                                                callback="save_settings", item=item,
                                                custom_button={'visible': True,
                                                               'function': "cb_custom_button",

plugin.video.alfa/channels/search.py

@@ -160,7 +160,7 @@ def searchbycat(item):
     # Only in xbmc/kodi
     # Abre un cuadro de dialogo con las categorías en las que hacer la búsqueda
 
-    categories = ["Películas", "Series", "Anime", "Documentales", "VOS", "Latino"]
+    categories = [config.get_localized_string(30122), config.get_localized_string(30123), config.get_localized_string(30124), config.get_localized_string(30125), config.get_localized_string(59975), config.get_localized_string(59976)]
     categories_id = ["movie", "tvshow", "anime", "documentary", "vos", "latino"]
     list_controls = []
     for i, category in enumerate(categories):
@@ -416,7 +416,7 @@ def do_search(item, categories=None):
             percentage = int(math.ceil(index * t))
 
             list_pendent_names = [a.getName() for a in pendent]
-            mensaje = "Buscando en %s" % (", ".join(list_pendent_names))
+            mensaje = config.get_localized_string(70282) % (", ".join(list_pendent_names))
             progreso.update(percentage, config.get_localized_string(60521) % (len(threads) - len(pendent), len(threads)),
                             mensaje)
             logger.debug(mensaje)

plugin.video.alfa/channels/videolibrary.py

@@ -16,10 +16,10 @@ def mainlist(item):
 
     itemlist = list()
     itemlist.append(Item(channel=item.channel, action="list_movies", title=config.get_localized_string(60509),
-                         category="Videoteca de películas",
+                         category=config.get_localized_string(70270),
                          thumbnail=get_thumb("videolibrary_movie.png")))
     itemlist.append(Item(channel=item.channel, action="list_tvshows", title=config.get_localized_string(60600),
-                         category="Videoteca de series",
+                         category=config.get_localized_string(70271),
                          thumbnail=get_thumb("videolibrary_tvshow.png")))
 
     return itemlist
@@ -146,7 +146,7 @@ def list_tvshows(item):
                                         "action": "delete",
                                         "channel": "videolibrary",
                                         "multicanal": multicanal},
-                                       {"title": "Buscar nuevos episodios ahora",
+                                       {"title": config.get_localized_string(70269),
                                         "action": "update_tvshow",
                                         "channel": "videolibrary"}]
                 # ,{"title": "Cambiar contenido (PENDIENTE)",