Merge branch 'soon'

customize.dist/credential.js

@@ -61,7 +61,13 @@ define([
             }
 
             // grab an unused slice of the entropy
-            var A = bytes.slice(entropy.used, entropy.used + n);
+            // Note: Internet Explorer doesn't support .slice on Uint8Array
+            var A;
+            if (bytes.slice) {
+                A = bytes.slice(entropy.used, entropy.used + n);
+            } else {
+                A = bytes.subarray(entropy.used, entropy.used + n);
+            }
 
             // account for the bytes you used so you don't reuse bytes
             entropy.used += n;

customize.dist/login.js

@@ -113,7 +113,8 @@ define([
     };
 
     var isProxyEmpty = function (proxy) {
-        return Object.keys(proxy).length === 0;
+        var l = Object.keys(proxy).length;
+        return l === 0 || (l === 2 && proxy._events && proxy.on);
     };
 
     var setMergeAnonDrive = function () {

www/common/translations/messages.es.json

@@ -8,7 +8,9 @@
         "whiteboard": "Pizarra",
         "contacts": "Contactos",
         "kanban": "Kanban",
-        "drive": "CryptDrive"
+        "drive": "CryptDrive",
+        "todo": "Lista de tareas",
+        "file": "Archivo"
     },
     "disconnected": "Desconectado",
     "synchronizing": "Sincronización",