Merge branch 'unstable' into GlobalVideoPlayer-Part1

locale/es_ES/translations.ts

@@ -3784,5 +3784,53 @@
         <source>Movies</source>
         <translation>Películas</translation>
     </message>
+    <message>
+        <source>An error was encountered while playing this item.</source>
+        <translation>Se encontró un error al reproducir este elemento.</translation>
+        <extracomment>Dialog detail when error occurs during playback</extracomment>
+    </message>
+    <message>
+        <source>Save Credentials?</source>
+        <translation>¿Guardar credenciales?</translation>
+    </message>
+    <message>
+        <source>Change Server</source>
+        <translation>Cambiar de Servidor</translation>
+    </message>
+    <message>
+        <source>On Now</source>
+        <translation>Transmitiendo Ahora</translation>
+    </message>
+    <message>
+        <source>Error Retrieving Content</source>
+        <translation>Error al recuperar el contenido</translation>
+        <extracomment>Dialog title when unable to load Content from Server</extracomment>
+    </message>
+    <message>
+        <source>Error During Playback</source>
+        <translation>Error durante la reproducción</translation>
+        <extracomment>Dialog title when error occurs during playback</extracomment>
+    </message>
+    <message>
+        <source>There was an error retrieving the data for this item from the server.</source>
+        <translation>Se produjo un error al recuperar los datos de este elemento del servidor.</translation>
+        <extracomment>Dialog detail when unable to load Content from Server</extracomment>
+    </message>
+    <message>
+        <source>Sign Out</source>
+        <translation>Cerrar Sesión</translation>
+    </message>
+    <message>
+        <source>Delete Saved</source>
+        <translation>Eliminar Guardado</translation>
+    </message>
+    <message>
+        <source>Loading Channel Data</source>
+        <translation>Cargando información del canal</translation>
+    </message>
+    <message>
+        <source>Error loading Channel Data</source>
+        <translation>Error al cargar la información del canal</translation>
+    </message>
 </context>
 </TS>

package-lock.json

@@ -14,7 +14,7 @@
         "bgv": "npm:button-group-vert@1.0.2",
         "brighterscript-formatter": "1.6.27",
         "intKeyboard": "npm:integer-keyboard@1.0.12",
-        "log": "npm:roku-log@0.10.1",
+        "log": "npm:roku-log@0.9.3",
         "sob": "npm:slide-out-button@1.0.1"
       },
       "devDependencies": {
@@ -651,8 +651,7 @@
       "name": "@rokucommunity/bslib",
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/@rokucommunity/bslib/-/bslib-0.1.1.tgz",
-      "integrity": "sha512-2ox6EUL+UTtccTbD4dbVjZK3QHa0PHCqpoKMF8lZz9ayzzEP3iVPF8KZR6hOi6bxsIcbGXVjqmtCVkpC4P9SrA==",
+      "integrity": "sha512-2ox6EUL+UTtccTbD4dbVjZK3QHa0PHCqpoKMF8lZz9ayzzEP3iVPF8KZR6hOi6bxsIcbGXVjqmtCVkpC4P9SrA=="
-      "dev": true
     },
     "node_modules/camelcase": {
       "version": "5.3.1",
@@ -2153,11 +2152,11 @@
     },
     "node_modules/log": {
       "name": "roku-log",
-      "version": "0.10.1",
+      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/roku-log/-/roku-log-0.10.1.tgz",
+      "resolved": "https://registry.npmjs.org/roku-log/-/roku-log-0.9.3.tgz",
-      "integrity": "sha512-kueRBu2CC+REPVU3OJQ0AcHDcv9XxZKSOtGUGVS+/rMo5Wu7PavMhKfK5si1QtwlPyZvYsDWeN9UEoF7rhFD6w==",
+      "integrity": "sha512-YzvtSCdmZJeimyZZ/C5Y7tdw6vpNMrZV90pg8EPn3vLAtRjtxN3dOt73s48BVOx2W00M0BEGmeaECObS2RdIqg==",
       "dependencies": {
-        "@rokucommunity/bslib": "^0.1.1"
+        "bslib": "npm:@rokucommunity/bslib@^0.1.1"
       }
     },
     "node_modules/long": {

package.json

@@ -7,7 +7,7 @@
     "bgv": "npm:button-group-vert@1.0.2",
     "brighterscript-formatter": "1.6.27",
     "intKeyboard": "npm:integer-keyboard@1.0.12",
-    "log": "npm:roku-log@0.10.1",
+    "log": "npm:roku-log@0.9.3",
     "sob": "npm:slide-out-button@1.0.1"
   },
   "devDependencies": {