From 0dae949c4fae1541263ec735ceb2a421aa9aa222 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 13 Sep 2016 15:34:10 +0200
Subject: [PATCH 01/36] fix scrolljank bug

---
 www/poll/main.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/www/poll/main.js b/www/poll/main.js
index 9ae642e13..c8f50f9e1 100644
--- a/www/poll/main.js
+++ b/www/poll/main.js
@@ -303,12 +303,19 @@ define([
     };
 
     var scrollDown = module.scrollDown = function (px) {
+        if (module.scrolling) { return; }
+
+        module.scrolling = true;
+
         var top = $(window).scrollTop() + px + 'px';
         $('html, body').animate({
             scrollTop: top,
         }, {
             duration: 200,
             easing: 'swing',
+            complete: function () {
+                module.scrolling = false;
+            }
         });
     };
 
@@ -375,7 +382,10 @@ define([
         addIfAbsent(proxy.table.rowsOrder, id);
 
         var $row = table.addRow($wrapper, Checkbox, id);
-        scrollDown($row.height());
+
+        if (module.ready) {
+            scrollDown($row.height());
+        }
 
         return $option;
     };

From c35c7cda207f4b286016cc89e1a6080240b19c7e Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 13 Sep 2016 16:02:38 +0200
Subject: [PATCH 02/36] hide wizard after computing results

---
 www/poll/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/poll/main.js b/www/poll/main.js
index c8f50f9e1..d8f028415 100644
--- a/www/poll/main.js
+++ b/www/poll/main.js
@@ -427,7 +427,7 @@ define([
                 var id = rowuid();
                 makeOption(proxy, id, text).val(text);
             });
-            //console.log(options);
+            Wizard.hide();
         });
     });
 

From 5b7d3f9d57f3dcb68396a2933dcf0a308ab4aa40 Mon Sep 17 00:00:00 2001
From: "Hector F. Jimenez" <hfjimenez@utp.edu.co>
Date: Fri, 21 Oct 2016 16:36:41 -0500
Subject: [PATCH 03/36] Add spanish translation

---
 customize.dist/BottomBar.html              |   3 +-
 customize.dist/translations/messages.es.js | 207 +++++++++++++++++++++
 2 files changed, 209 insertions(+), 1 deletion(-)
 create mode 100644 customize.dist/translations/messages.es.js

diff --git a/customize.dist/BottomBar.html b/customize.dist/BottomBar.html
index 827cef5cd..d427347c1 100644
--- a/customize.dist/BottomBar.html
+++ b/customize.dist/BottomBar.html
@@ -5,10 +5,11 @@
       <span class="bottom-bar-language">
         <select id="language-selector">
           <option value="en">English</option>
+          <option value="es">Español</option>
           <option value="fr">Français</option>
         </select>
       </span>
-      <p data-localization="bottom_france">
+      <p data-localization="bottom_spanish">
       </p>
    </div>
     <!--
diff --git a/customize.dist/translations/messages.es.js b/customize.dist/translations/messages.es.js
new file mode 100644
index 000000000..be87ed13a
--- /dev/null
+++ b/customize.dist/translations/messages.es.js
@@ -0,0 +1,207 @@
+define(function () {
+    var out = {};
+
+    out.main_title = "Cryptpad: Zero Knowledge, Editor Colaborativo en Tiempo Real";
+
+    out.type = {};
+    out.type.pad = 'Pad';
+    out.type.code = 'Código';
+    out.type.poll = 'Encuesta';
+    out.type.slide = 'Presentación';
+
+    out.errorBox_errorType_disconnected = 'Conexión perdida';
+    out.errorBox_errorExplanation_disconnected = [
+        'Se perdio la conexion con el servidor, tu puedes reconectarte actualizando la pagina o revisando tu trabajo ',
+        'haciendo click por fuera de este cuadro.'
+    ].join('');
+
+    out.common_connectionLost = 'Conexión perdida con el servidor';
+
+    out.editingAlone = 'Editar solo';
+    out.editingWithOneOtherPerson = 'Editar con otra persona';
+    out.editingWith = 'Editar con ';
+    out.otherPeople = 'Otras personas';
+    out.disconnected = 'Desconectado';
+    out.synchronizing = 'Sincronizando';
+    out.reconnecting = 'Reconectando...';
+    out.lag = 'Retraso';
+    out.readonly = 'Solo lectura';
+    out.nobodyIsEditing = 'Nadie está editando';
+    out.onePersonIsEditing = 'Una personas está editando';
+    out.peopleAreEditing = '{0} personas están editando';
+    out.oneViewer = '1 visualizando';
+    out.viewers = '{0} están visualizando';
+    out.anonymous = "Actualmente eres anónimo";
+
+    out.greenLight = "Todo esta trabajando bién";
+    out.orangeLight = "Tu conexion es lenta y podria impactar en el desempeño de tu experiencia";
+    out.redLight = "¡Has sido desconectado de la sesión! ";
+
+    out.importButton = 'IMPORTAR';
+    out.importButtonTitle = 'Importar un documento de tus archivos locales';
+
+    out.exportButton = 'EXPORTAR';
+    out.exportButtonTitle = 'Exportar este documento a un archivo local';
+    out.exportPrompt = '¿Como te gustaria nombra tu archivo ?';
+
+    out.back = '&#8656; Atras';
+    out.backToCryptpad = '⇐ Atras a Cryptpad';
+
+    out.userButton = 'USUARIO';
+    out.userButtonTitle = 'Cambiar tu nombre de usuario';
+    out.changeNamePrompt = 'Cambiar tu nombre: ';
+
+    out.renameButton = 'RENOMBRAR';
+    out.renameButtonTitle = 'Cambiar el titulo del documento listado en tu pagina de inicio';
+    out.renamePrompt = 'Como titularias este noja?';
+    out.renameConflict = 'Otra nota tiene ya ese titulo';
+
+    out.forgetButton = 'OLVIDAR';
+    out.forgetButtonTitle = 'Eliminar este documento de la lista en la pagina de inicio';
+    out.forgetPrompt = 'Presiona OK, removera la URL para esta nota desde el almacenamiento local, ¿Esta seguro?';
+
+    out.shareButton = 'COMPARTIR';
+    out.shareButtonTitle = "Copiar URL al portapapeles";
+    out.shareSuccess = '¡URL Copiada al portapapeles!;
+    out.shareFailed = "Fallo al copiar URL al portapapeles";
+
+    out.presentButton = 'PRESENTAR';
+    out.presentButtonTitle = "Ingresar en modo presentación";
+    out.presentSuccess = 'ESC para salir del modo presentación';
+    out.sourceButton = 'VER CÓDIGO FUENTE';
+    out.sourceButtonTitle = "Abandonar modo presentación";
+
+    out.backgroundButton = 'COLOR DE FONDO';
+    out.backgroundButtonTitle = 'Cambiar el color de fondo en el modo presentación';
+    out.colorButton = 'COLOR DE TEXTO';
+    out.colorButtonTitle = 'Cambiar el color de texto en el modo presentación';
+
+    out.commitButton = 'COMMIT';
+
+    out.getViewButton = 'URL SOLO-LECTURA';
+    out.getViewButtonTitle = 'Obtener URL de solo lectura para este documento';
+    out.readonlyUrl = 'Documento de solo lectura';
+    out.copyReadOnly = "Copiar URL al portapapeles";
+    out.openReadOnly = "Abrir en nueva pestaña";
+
+    out.disconnectAlert = '¡Conexión de Red perdida!';
+
+    out.tryIt = '¡PROBARLO!';
+    out.recentPads = 'Tus notas recientes (están almacenadas en el navegador)';
+
+    out.okButton = 'OK (enter)';
+    out.cancelButton = 'Cancelar (esc)';
+
+    out.loginText = '<p>Tu nombre de usuario y password son usados para generar una llave unica que es desconocida por nuestro servidor.</p>\n' +
+                    '<p>Se cuidados no olvides tus credenciales, son imposibles de recuperar</p>';
+
+    out.forget = "Olvidar";
+
+    // Polls
+
+    out.poll_title = "Zero Knowledge selector de fecha";
+    out.poll_subtitle = "Zero Knowledge, agenda en <em>tiempo real</em> ";
+
+    out.poll_p_save = "Tus configuraciones son actualizadas instantaneamente, no es necesario guardar cambios.";
+    out.poll_p_encryption = "Todos los datos de entrada son cifrados, solo las personas que posee el link tiene acceso. Incluso desde el servidor no puede ver tus cambios.";
+    out.poll_p_howtouse = "Ingresa tu nombre en el campo de entrada en la parte inferior y verificalo";
+
+    out.promptName = "¿ Cual es tu nombre ?";
+
+    out.wizardButton = 'ASISTENTE';
+    out.wizardLog = "Presiona el boton en la parte superior izquierda para regresar a la encuesta";
+    out.wizardTitle = "Utiliza el asistente para crear tu encuesta";
+    out.wizardConfirm = "¿Estas realmente seguro de agregar estas opciones a tu encuesta?";
+
+    out.poll_closeWizardButton = "Cerrar el asistente";
+    out.poll_closeWizardButtonTitle = "Cerrar el asistente";
+    out.poll_wizardComputeButton = "Computar opciones";
+    out.poll_wizardClearButton = "Limpiar tabla";
+    out.poll_wizardDescription = "Automaticamente crear un number de opciones ingresando cualquier numero de fechas y segmentos de tiempo";
+    out.poll_wizardAddDateButton = "+ Fechas";
+    out.poll_wizardAddTimeButton = "+ Horas";
+
+    out.poll_addUserButton = "+ Usuarios";
+    out.poll_addUserButtonTitle = "Click para adicionar usuario";
+    out.poll_addOptionButton = "+ Opciones";
+    out.poll_addOptionButtonTitle = "Click para adicionar una opción";
+    out.poll_addOption = "Proponer una opción";
+    out.poll_optionPlaceholder = "Opción";
+    out.poll_addUser = "Ingresar un nombre";
+    out.poll_userPlaceholder = "Tu nombre";
+    out.poll_removeOption = "¿Seguro que te gustaria eliminar esta opción?";
+    out.poll_removeOptionTitle = "Eliminar la fila";
+    out.poll_removeUser = "¿Seguro que te gustaria eliminar este usuario?";
+    out.poll_removeUserTitle = "Eliminar la columna";
+    out.poll_editOption = "¿Seguro que te gustaria editar esta opción?";
+    out.poll_editOptionTitle = "Editar la fila";
+    out.poll_editUser = "¿Seguro que te gustaria editar este usuario?";
+    out.poll_editUserTitle = "Editar la columna";
+
+    out.poll_titleHint = "Titulo";
+    out.poll_descriptionHint = "Descripción";
+
+    // index.html
+
+    out.main_p1 = 'CryptPad es un editor en tiempo <strong>zero knowledge</strong>.  El cifrado es llevado acabo en tu navegador protegiendo los datos de, sistemas en la nube, and la NSA. La clave cifrado privada es almacenada en la URL <a href="https://en.wikipedia.org/wiki/Fragment_identifier">fragment identifier</a> lo cual no es nunca enviado al servidor pero esta disponible para el javascript compartiendo la URL, tu autorizas a otros quienes desean participar.';
+    out.main_p2 = 'Este proyecto usa <a href="http://ckeditor.com/">CKEditor</a> un editor de texto, <a href="https://codemirror.net/">CodeMirror</a>, y <a href="https://github.com/xwiki-contrib/chainpad">ChainPad</a> un motor de tiempo real.';
+    out.main_howitworks = '¿Como Funciona?';
+    out.main_howitworks_p1 = 'CryptPad uses a variant of the <a href="https://en.wikipedia.org/wiki/Operational_transformation">Operational transformation</a> algorithm which is able to find distributed consensus using a Nakamoto Blockchain, a construct popularized by <a href="https://en.wikipedia.org/wiki/Bitcoin">Bitcoin</a>. This way the algorithm can avoid the need for a central server to resolve Operational Transform Edit Conflicts and without the need for resolving conflicts, the server can be kept unaware of the content which is being edited on the pad.';
+    out.main_about = 'Acerca de';
+    out.main_about_p1 = 'Tu puedes leer mas acerca de nuestra <a href="/privacy.html" title="">politica de privacidad</a> y <a href="/terms.html">terminos de servicio</a>.';
+
+    out.main_about_p2 = 'Si tu tienes preguntas o comentarios, tu puedes <a href="https://twitter.com/cryptpad">tweetearnos </a>,o abrir un issue <a href="https://github.com/xwiki-labs/cryptpad/issues/" title="our issue tracker">en github</a>, ven y di hola a nuestro canal de irc (<a href="http://webchat.freenode.net?channels=%23cryptpad&uio=MT1mYWxzZSY5PXRydWUmMTE9Mjg3JjE1PXRydWUe7" title="freenode webchat">irc.freenode.net</a>), o <a href="mailto:research@xwiki.com">envianos un email</a>.';
+
+    out.table_type = 'Tipo';
+    out.table_link = 'Link';
+    out.table_created = 'Creado';
+    out.table_last = 'Ultimo Acceso';
+
+    out.button_newpad = 'CREAR NUEVA NOTA DE TEXTO ENRIQUECIDO';
+    out.button_newcode = 'CREAR NUEVA NOTA DE CÓDIGO';
+    out.button_newpoll = 'CREAR NUEVA ENCUESTA';
+    out.button_newslide = 'CREAR NUEVA PRESENTACIÓN';
+
+    // privacy.html
+
+    out.policy_title = 'Cryptpad Política de privacidad';
+    out.policy_whatweknow = 'Que sabemos sobre tí';
+    out.policy_whatweknow_p1 = 'Como una aplicación que esta hospedada en la red, Cryptpad tiene acceso a los metadatos expuestos por el protocolo HTTP. Esto incluye tu direccion IP, y otros headers HTTP que puede ser usados para identificar particularmente tu navegador. Tu puedes comprar la informacion que comparte tu navegador visitando <a target="_blank" rel="noopener noreferrer" href="https://www.whatismybrowser.com/detect/what-http-headers-is-my-browser-sending" title="Que headers HTTP esta compartiendo mi navegador">WhatIsMyBrowser.com</a>.';
+    out.policy_whatweknow_p2 = 'Nosotros usamos <a href="https://piwik.org/" target="_blank" rel="noopener noreferrer" title="open source analytics platform">Piwik</a>, an open source analytics platform, to learn more about our users. Piwik tells us about how you found Cryptpad, via direct entry, through a search engine, or via a referral from another web service like Reddit or Twitter. We also learn when you visit, what links you click while on our informational pages, and how long you stay on a particular page.';
+    out.policy_whatweknow_p3 = 'Estas herramientas de estadística son usadas solamente para informacion local . Nosotros no recolectamos cualquier informacion sobre el uso de nuestro zero-knowledge application.';
+    out.policy_howweuse = 'Como nosotros usamos lo que aprendemos';
+    out.policy_howweuse_p1 = 'Nosotros usamos esta informacion para tomar mejores decisiones como promover y promocionar Cryptpad, para evaluar cual de nuestros esfuerzos pasados han sido exitosos. La informacion sobre tu ubicacion nos permite conocer si nosotros debemos considerar mejor soporte para otros idiomas diferentes al ingles.';
+    out.policy_howweuse_p2 = "La informacion sobre tu navegador (si es un sistema operativo de escritorio o movil) nos ayuda a tomar medidads en las caracteristicas que debemos priorizar y mejorar. Nuestro equipo de desarrollo es pequeño, intentamos hacer elecciones que beneficien la mayoria de los usuarios' experiencia como sea posible.";
+    out.policy_whatwetell = 'Lo que nosotros le decimos a otros sobre tí';
+    out.policy_whatwetell_p1 = 'No suministramos información a terceros, ni la que usted nos proporciona a nosotros a menos de ser obligados legalmente a hacerlo. ;
+    out.policy_links = 'Links a Otros sitios';
+    out.policy_links_p1 = 'Este sitio contiene links a otros sitios, incluyendo algunos producidos por otras organizaciones. Nosotros no nos responsabilisamos por el tratamiento, privacidad de los datos y contenido de sitios externos. Como regla general, los links externos son abiertos una nueva pestaña del navegador, para hacerlo claro tu estas abandonando Cryptpad.fr.';
+    out.policy_ads = 'Anuncio';
+    out.policy_ads_p1 = 'Nosotros no mostramos anuncios online, pensamos que podemos linkear a las personas que financian nuestra investigación.';
+    out.policy_choices = 'Eleciones que tu tienes';
+    out.policy_choices_open = 'Nuestro código es open source, Entonces tu siempre tienes la opcion crear tu propia estancia de Cryptpad.';
+    out.policy_choices_vpn = 'Si tu deseas usar nuestra estancia, pero no deseas exponer tu dirección IP, tu puedes proteger tu dirección IP utilizando <a href="https://www.torproject.org/projects/torbrowser.html.en" title="downloads from the Tor project" target="_blank" rel="noopener noreferrer">Tor browser bundle</a>, o una  <a href="https://riseup.net/en/vpn" title="VPNs provided by Riseup" target="_blank" rel="noopener noreferrer">VPN</a>.';
+    out.policy_choices_ads = 'If usted desea blockear rastreadores, y plataformas similares puedes utilizar herramientas como <a href="https://www.eff.org/privacybadger" title="download privacy badger" target="_blank" rel="noopener noreferrer">Privacy Badger</a>.';
+
+    // terms.html
+
+    out.tos_title = "Cryptpad Términos de Servicio";
+    out.tos_legal = "Porfavor no seas malicioso, abusivo o realices prácticas ilegales.";
+    out.tos_availability = "Nosotros esperamos que encuentres este servicio util, pero nuestra disponibilidad o desempeño no pueden ser garantizados. Por favor exporta tus datos regularmente.";
+    out.tos_e2ee = "Cryptpad Los documentos pueden ser leidos o modificados para alguien puede ser invitado o por el contrario obtener un fragmento del documento. Nosotros recomendamos que tu uses cifrado punto a punto(e2ee) para compartir URLs, no asumimos ninguna responsabilidad en el evento de que existan fugas de URLs.";
+    out.tos_logs = "Los metadatos entregados por el navegador a el servidor pueden ser logueados y almacenados para propuestas de mantener el servicio.";
+    out.tos_3rdparties = "Nosotros no proveemos datos individualizados a terceros a menos que sea requerido por la ley.";
+
+    // BottomBar.html
+
+    out.bottom_france = '<a href="http://www.xwiki.com/" target="_blank" rel="noopener noreferrer">Made with <img class="bottom-bar-heart" src="/customize/heart.png" /> en <img class="bottom-bar-fr" src="/customize/fr.png" /></a>';
+    out.bottom_support = '<a href="http://labs.xwiki.com/" title="XWiki Labs" target="_blank" rel="noopener noreferrer">An <img src="/customize/logo-xwiki2.png" alt="XWiki SAS" class="bottom-bar-xwiki"/> Labs Project </a> with the support of <a href="http://ng.open-paas.org/" title="OpenPaaS::ng" target="_blank" rel="noopener noreferrer"> <img src="/customize/openpaasng.png" alt="OpenPaaS-ng" class="bottom-bar-openpaas" /></a>';
+
+    // Header.html
+
+    out.header_france = '<a href="http://www.xwiki.com/" target="_blank" rel="noopener noreferrer">With <img class="bottom-bar-heart" src="/customize/heart.png" /> from <img class="bottom-bar-fr" src="/customize/fr.png" title="France" alt="France"/> by <img src="/customize/logo-xwiki.png" alt="XWiki SAS" class="bottom-bar-xwiki"/></a>';
+    out.header_support = '<a href="http://ng.open-paas.org/" title="OpenPaaS::ng" target="_blank" rel="noopener noreferre-r"> <img src="/customize/openpaasng.png" alt="OpenPaaS-ng" class="bottom-bar-openpaas" /></a>';
+    out.header_logoTitle = 'Ir a la pagina principal';
+
+    return out;
+});

From a846463328375e8592dec4b53cd65aea8609dd96 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 24 Oct 2016 11:18:34 +0200
Subject: [PATCH 04/36] change localization key back to france

---
 customize.dist/BottomBar.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/customize.dist/BottomBar.html b/customize.dist/BottomBar.html
index d427347c1..9fc1bd9e1 100644
--- a/customize.dist/BottomBar.html
+++ b/customize.dist/BottomBar.html
@@ -9,7 +9,7 @@
           <option value="fr">Français</option>
         </select>
       </span>
-      <p data-localization="bottom_spanish">
+      <p data-localization="bottom_france">
       </p>
    </div>
     <!--

From 7285e655c32bcbde3c29cc36c18252c2531b74d1 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 24 Oct 2016 11:23:27 +0200
Subject: [PATCH 05/36] fix unterminated strings

---
 customize.dist/translations/messages.es.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/customize.dist/translations/messages.es.js b/customize.dist/translations/messages.es.js
index be87ed13a..3768e8411 100644
--- a/customize.dist/translations/messages.es.js
+++ b/customize.dist/translations/messages.es.js
@@ -62,7 +62,7 @@ define(function () {
 
     out.shareButton = 'COMPARTIR';
     out.shareButtonTitle = "Copiar URL al portapapeles";
-    out.shareSuccess = '¡URL Copiada al portapapeles!;
+    out.shareSuccess = '¡URL Copiada al portapapeles!';
     out.shareFailed = "Fallo al copiar URL al portapapeles";
 
     out.presentButton = 'PRESENTAR';
@@ -173,7 +173,7 @@ define(function () {
     out.policy_howweuse_p1 = 'Nosotros usamos esta informacion para tomar mejores decisiones como promover y promocionar Cryptpad, para evaluar cual de nuestros esfuerzos pasados han sido exitosos. La informacion sobre tu ubicacion nos permite conocer si nosotros debemos considerar mejor soporte para otros idiomas diferentes al ingles.';
     out.policy_howweuse_p2 = "La informacion sobre tu navegador (si es un sistema operativo de escritorio o movil) nos ayuda a tomar medidads en las caracteristicas que debemos priorizar y mejorar. Nuestro equipo de desarrollo es pequeño, intentamos hacer elecciones que beneficien la mayoria de los usuarios' experiencia como sea posible.";
     out.policy_whatwetell = 'Lo que nosotros le decimos a otros sobre tí';
-    out.policy_whatwetell_p1 = 'No suministramos información a terceros, ni la que usted nos proporciona a nosotros a menos de ser obligados legalmente a hacerlo. ;
+    out.policy_whatwetell_p1 = 'No suministramos información a terceros, ni la que usted nos proporciona a nosotros a menos de ser obligados legalmente a hacerlo.';
     out.policy_links = 'Links a Otros sitios';
     out.policy_links_p1 = 'Este sitio contiene links a otros sitios, incluyendo algunos producidos por otras organizaciones. Nosotros no nos responsabilisamos por el tratamiento, privacidad de los datos y contenido de sitios externos. Como regla general, los links externos son abiertos una nueva pestaña del navegador, para hacerlo claro tu estas abandonando Cryptpad.fr.';
     out.policy_ads = 'Anuncio';

From 02c0790dd6b99d674279bff2f62dfbedc85860da Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 24 Oct 2016 11:39:28 +0200
Subject: [PATCH 06/36] export messages

---
 www/common/cryptpad-common.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index b512ab54b..4fdde73e6 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -21,6 +21,7 @@ define([
 
     var common = {
         User: User,
+        Messages: Messages,
     };
     var store;
     var userProxy;

From 1785516f0e156359cfba6a8b9bad0097130dda4a Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 24 Oct 2016 11:41:36 +0200
Subject: [PATCH 07/36] add spanish translations to map. export a function
 which checks completion of translations

---
 customize.dist/messages.js | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/customize.dist/messages.js b/customize.dist/messages.js
index 1801fc84d..85db5ab5b 100644
--- a/customize.dist/messages.js
+++ b/customize.dist/messages.js
@@ -1,11 +1,13 @@
 define(['/customize/languageSelector.js',
         '/customize/translations/messages.js',
+        '/customize/translations/messages.es.js',
         '/customize/translations/messages.fr.js',
-        '/bower_components/jquery/dist/jquery.min.js'], function(LS, Default, French) {
+        '/bower_components/jquery/dist/jquery.min.js'], function(LS, Default, Spanish, French) {
     var $ = window.jQuery;
 
     var map = {
-        'fr': French
+        'fr': French,
+        'es': Spanish,
     };
 
     var defaultLanguage = 'en';
@@ -22,6 +24,22 @@ define(['/customize/languageSelector.js',
         messages = $.extend(true, {}, Default, map[language]);
     }
 
+    messages._checkTranslationState = function () {
+        var missing = [];
+        Object.keys(map).forEach(function (code) {
+            var translation = map[code];
+            Object.keys(Default).forEach(function (k) {
+                if (/^_/.test(k) || /nitialState$/.test(k)) { return; }
+                if (!translation[k]) {
+                    var warning = "key [" + k + "] is missing from translation [" + code + "]";
+                    missing.push(warning);
+                    console.log(warning);
+                }
+            });
+        });
+        return missing;
+    };
+
     // Get keys with parameters
     messages._getKey = function (key, argArray) {
         if (!messages[key]) { return '?'; }

From e07cb984e5a2349dd1c41fde54e7459897e77e45 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 24 Oct 2016 11:47:13 +0200
Subject: [PATCH 08/36] return, don't log

---
 customize.dist/messages.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/customize.dist/messages.js b/customize.dist/messages.js
index 85db5ab5b..21cb58e6f 100644
--- a/customize.dist/messages.js
+++ b/customize.dist/messages.js
@@ -33,7 +33,6 @@ define(['/customize/languageSelector.js',
                 if (!translation[k]) {
                     var warning = "key [" + k + "] is missing from translation [" + code + "]";
                     missing.push(warning);
-                    console.log(warning);
                 }
             });
         });

From 841ded8fdc403c53dda9cdffa0a58532f4a83993 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 24 Oct 2016 11:51:16 +0200
Subject: [PATCH 09/36] add translation completeness test to assertion page

---
 www/assert/main.js | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/www/assert/main.js b/www/assert/main.js
index dc3c2087e..f3b6c6fe2 100644
--- a/www/assert/main.js
+++ b/www/assert/main.js
@@ -4,7 +4,8 @@ define([
     '/bower_components/hyperjson/hyperjson.js',
     '/bower_components/textpatcher/TextPatcher.amd.js',
     'json.sortify',
-], function (jQuery, Hyperjson, TextPatcher, Sortify) {
+    '/common/cryptpad-common.js',
+], function (jQuery, Hyperjson, TextPatcher, Sortify, Cryptpad) {
     var $ = window.jQuery;
     window.Hyperjson = Hyperjson;
     window.TextPatcher = TextPatcher;
@@ -140,6 +141,19 @@ define([
         strungJSON(orig);
     });
 
+    assert(function () {
+        var missing = Cryptpad.Messages._checkTranslationState();
+
+        if (missing.length !== 0) {
+            missing.forEach(function (msg) {
+                console.log('* ' + msg);
+            });
+
+            return false;
+        }
+        return true;
+    }, "expected all translation keys in default language to be present in all translations. See console for details.");
+
     var swap = function (str, dict) {
         return str.replace(/\{\{(.*?)\}\}/g, function (all, key) {
             return typeof dict[key] !== 'undefined'? dict[key] : all;

From ef17dd66fa4d59b3e93e67586dc25f3837ef29b0 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 24 Oct 2016 12:01:15 +0200
Subject: [PATCH 10/36] userButtonTitle to french translation. Thanks @yflory

---
 customize.dist/translations/messages.fr.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js
index 31b435f1e..3d4f85196 100644
--- a/customize.dist/translations/messages.fr.js
+++ b/customize.dist/translations/messages.fr.js
@@ -45,6 +45,7 @@ define(function () {
 
     out.userButton = 'UTILISATEUR';
     out.userButtonTitle = "Changer votre nom d'utilisateur";
+    out.changeNamePrompt = 'Changer votre nom (laisser vide pour rester anonyme) : ';
 
     out.renameButton = 'RENOMMER';
     out.renameButtonTitle = 'Changer le titre utilisé par ce document dans la page d\'accueil de Cryptpad';

From 54615932f836326de804f4a522128049a7e7b99e Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 24 Oct 2016 11:41:36 +0200
Subject: [PATCH 11/36] merge in some espanol commits

---
 customize.dist/messages.js | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/customize.dist/messages.js b/customize.dist/messages.js
index f1062ada3..b35e5897c 100644
--- a/customize.dist/messages.js
+++ b/customize.dist/messages.js
@@ -1,11 +1,13 @@
 define(['/customize/languageSelector.js',
         '/customize/translations/messages.js',
+        //'/customize/translations/messages.es.js', // uncomment when we're ready to merge 'espanol'
         '/customize/translations/messages.fr.js',
-        '/bower_components/jquery/dist/jquery.min.js'], function(LS, Default, French) {
+        '/bower_components/jquery/dist/jquery.min.js'], function(LS, Default, /*Spanish,*/ French) {
     var $ = window.jQuery;
 
     var map = {
-        'fr': French
+        'fr': French,
+        //'es': Spanish,
     };
 
     var defaultLanguage = 'en';
@@ -32,6 +34,21 @@ define(['/customize/languageSelector.js',
     }
 
     messages._initSelector = LS.main;
+    messages._checkTranslationState = function () {
+        var missing = [];
+        Object.keys(map).forEach(function (code) {
+            var translation = map[code];
+            Object.keys(Default).forEach(function (k) {
+                if (/^_/.test(k) || /nitialState$/.test(k)) { return; }
+                if (!translation[k]) {
+                    var warning = "key [" + k + "] is missing from translation [" + code + "]";
+                    missing.push(warning);
+                    console.log(warning);
+                }
+            });
+        });
+        return missing;
+    };
 
     // Get keys with parameters
     messages._getKey = function (key, argArray) {

From b1370c05b7501f1da167c96caabe8565f080f06c Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 24 Oct 2016 11:51:16 +0200
Subject: [PATCH 12/36] add translation completeness test to assertion page

---
 www/assert/main.js | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/www/assert/main.js b/www/assert/main.js
index dc3c2087e..f3b6c6fe2 100644
--- a/www/assert/main.js
+++ b/www/assert/main.js
@@ -4,7 +4,8 @@ define([
     '/bower_components/hyperjson/hyperjson.js',
     '/bower_components/textpatcher/TextPatcher.amd.js',
     'json.sortify',
-], function (jQuery, Hyperjson, TextPatcher, Sortify) {
+    '/common/cryptpad-common.js',
+], function (jQuery, Hyperjson, TextPatcher, Sortify, Cryptpad) {
     var $ = window.jQuery;
     window.Hyperjson = Hyperjson;
     window.TextPatcher = TextPatcher;
@@ -140,6 +141,19 @@ define([
         strungJSON(orig);
     });
 
+    assert(function () {
+        var missing = Cryptpad.Messages._checkTranslationState();
+
+        if (missing.length !== 0) {
+            missing.forEach(function (msg) {
+                console.log('* ' + msg);
+            });
+
+            return false;
+        }
+        return true;
+    }, "expected all translation keys in default language to be present in all translations. See console for details.");
+
     var swap = function (str, dict) {
         return str.replace(/\{\{(.*?)\}\}/g, function (all, key) {
             return typeof dict[key] !== 'undefined'? dict[key] : all;

From 2d5448458bdfe50424d274804b73277811189f00 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 24 Oct 2016 11:39:28 +0200
Subject: [PATCH 13/36] export messages

---
 www/common/cryptpad-common.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index 68ebd95dc..d28b1e5e5 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -21,6 +21,7 @@ define([
 
     var common = {
         User: User,
+        Messages: Messages,
     };
     var store;
     var userProxy;

From f1bb63f915f929087115cd4f936d1a0d04b135b2 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Thu, 3 Nov 2016 16:05:37 +0100
Subject: [PATCH 14/36] translate missing keys to spanish using google
 translate

---
 customize.dist/translations/messages.es.js | 41 +++++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

diff --git a/customize.dist/translations/messages.es.js b/customize.dist/translations/messages.es.js
index 3768e8411..7f9a1294b 100644
--- a/customize.dist/translations/messages.es.js
+++ b/customize.dist/translations/messages.es.js
@@ -1,7 +1,10 @@
 define(function () {
     var out = {};
 
+    out._languageName = 'Español';
+
     out.main_title = "Cryptpad: Zero Knowledge, Editor Colaborativo en Tiempo Real";
+    out.main_slogan = "La unidad es la fuerza - la colaboración es clave";
 
     out.type = {};
     out.type.pad = 'Pad';
@@ -17,6 +20,26 @@ define(function () {
 
     out.common_connectionLost = 'Conexión perdida con el servidor';
 
+
+// HERE
+    out.disconnected = "Desconectado";
+    out.synchronizing = "Sincronización";
+    out.reconnecting = "Reconectando";
+    out.lag = "Retraso";
+    out.readOnly = 'Solo lectura';
+    out.anonymous = 'Anónimo';
+    out.yourself = "tú mismo";
+    out.anonymousUsers = "usuarios anónimos";
+    out.anonymousUser = "usuario anónimo";
+    out.shareView = "URL de sólo lectura";
+    out.shareEdit = "Editar URL";
+    out.users = "Usuarios";
+    out.and = "y";
+    out.viewer = "espectadore";
+    out.viewers = "espectadores";
+    out.editor = "editor";
+    out.editors = "editors";
+
     out.editingAlone = 'Editar solo';
     out.editingWithOneOtherPerson = 'Editar con otra persona';
     out.editingWith = 'Editar con ';
@@ -55,6 +78,7 @@ define(function () {
     out.renameButtonTitle = 'Cambiar el titulo del documento listado en tu pagina de inicio';
     out.renamePrompt = 'Como titularias este noja?';
     out.renameConflict = 'Otra nota tiene ya ese titulo';
+    out.clickToEdit = "Haz click para editar";
 
     out.forgetButton = 'OLVIDAR';
     out.forgetButtonTitle = 'Eliminar este documento de la lista en la pagina de inicio';
@@ -84,6 +108,18 @@ define(function () {
     out.copyReadOnly = "Copiar URL al portapapeles";
     out.openReadOnly = "Abrir en nueva pestaña";
 
+    // TODO VERIFY
+    out.editShare = "URL de edición compartida";
+    out.editShareTitle = "Copiar la URL de edición al portapapeles";
+    out.viewShare = "Compartir vista URL";
+    out.viewShareTitle = "Copiar la URL de solo lectura al portapapeles";
+    out.viewOpen = "Ver en nueva pestaña";
+    out.viewOpenTitle = "Abrir el documento en modo de sólo lectura en una nueva pestaña";
+
+    out.notifyJoined = "{0} se ha unido a la sesión de colaboración";
+    out.notifyRenamed = "{0} ahora se conoce como {1}";
+    out.notifyLeft = "{0} ha dejado la sesión de colaboración";
+
     out.disconnectAlert = '¡Conexión de Red perdida!';
 
     out.tryIt = '¡PROBARLO!';
@@ -146,7 +182,10 @@ define(function () {
     out.main_p1 = 'CryptPad es un editor en tiempo <strong>zero knowledge</strong>.  El cifrado es llevado acabo en tu navegador protegiendo los datos de, sistemas en la nube, and la NSA. La clave cifrado privada es almacenada en la URL <a href="https://en.wikipedia.org/wiki/Fragment_identifier">fragment identifier</a> lo cual no es nunca enviado al servidor pero esta disponible para el javascript compartiendo la URL, tu autorizas a otros quienes desean participar.';
     out.main_p2 = 'Este proyecto usa <a href="http://ckeditor.com/">CKEditor</a> un editor de texto, <a href="https://codemirror.net/">CodeMirror</a>, y <a href="https://github.com/xwiki-contrib/chainpad">ChainPad</a> un motor de tiempo real.';
     out.main_howitworks = '¿Como Funciona?';
-    out.main_howitworks_p1 = 'CryptPad uses a variant of the <a href="https://en.wikipedia.org/wiki/Operational_transformation">Operational transformation</a> algorithm which is able to find distributed consensus using a Nakamoto Blockchain, a construct popularized by <a href="https://en.wikipedia.org/wiki/Bitcoin">Bitcoin</a>. This way the algorithm can avoid the need for a central server to resolve Operational Transform Edit Conflicts and without the need for resolving conflicts, the server can be kept unaware of the content which is being edited on the pad.';
+
+    // TODO
+    out.main_howitworks_p1 = "CryptPad utiliza una variante del algoritmo de <a href='https://en.wikipedia.org/wiki/Operational_transformation'>transformación Operacional</a> que es capaz de encontrar el consenso distribuido usando un Nakamoto Blockchain, una construcción popularizada por <a href='https://en.wikipedia.org/wiki/Bitcoin'>Bitcoin</a> . De esta manera el algoritmo puede evitar la necesidad de un servidor central para resolver Conflictos de Edición de Transformación Operacional y sin necesidad de resolver conflictos, el servidor puede mantenerse inconsciente del contenido que se está editando en el pad.";
+
     out.main_about = 'Acerca de';
     out.main_about_p1 = 'Tu puedes leer mas acerca de nuestra <a href="/privacy.html" title="">politica de privacidad</a> y <a href="/terms.html">terminos de servicio</a>.';
 

From e52450fdc714354de9d2eefc8cdc5f0b83665df6 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Fri, 4 Nov 2016 10:31:35 +0100
Subject: [PATCH 15/36] update english and french translations to include link
 to bitcoin.pdf

---
 customize.dist/translations/messages.fr.js | 2 +-
 customize.dist/translations/messages.js    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js
index 0ce5f0c03..2c7777067 100644
--- a/customize.dist/translations/messages.fr.js
+++ b/customize.dist/translations/messages.fr.js
@@ -162,7 +162,7 @@ define(function () {
     out.main_p1 = 'CryptPad est l\'éditeur collaboratif en temps réel <strong>zero knowledge</strong>. Le chiffrement est effectué depuis votre navigateur, ce qui protège les données contre le serveur, le cloud, et la NSA. La clé de chiffrement est stockée dans l\'<a href="https://fr.wikipedia.org/wiki/Identificateur_de_fragment">identifieur de fragment</a> de l\'URL qui n\'est jamais envoyée au serveur mais est accessible depuis javascript, de sorte qu\'en partageant l\'URL, vous donnez l\'accès au pad à ceux qui souhaitent participer.';
     out.main_p2 = 'Ce projet utilise l\'éditeur visuel (WYSIWYG) <a href="http://ckeditor.com/">CKEditor</a>, l\'éditeur de code source <a href="https://codemirror.net/">CodeMirror</a>, et le moteur temps-réel <a href="https://github.com/xwiki-contrib/chainpad">ChainPad</a>.';
     out.main_howitworks = 'Comment ça fonctionne';
-    out.main_howitworks_p1 = 'CryptPad utilise une variante de l\'algorithme d\'<a href="https://en.wikipedia.org/wiki/Operational_transformation">Operational transformation</a> qui est capable de trouver un consensus distribué en utilisant une chaîne de bloc Nakamoto, un outil popularisé par le <a href="https://fr.wikipedia.org/wiki/Bitcoin">Bitcoin</a>. De cette manière, l\'algorithme évite la nécessité d\'utiliser un serveur central pour résoudre les conflits d\'édition de l\'Operational Transformation, et sans ce besoin de résolution des conflits le serveur peut rester ignorant du contenu qui est édité dans le pad.';
+    out.main_howitworks_p1 = 'CryptPad utilise une variante de l\'algorithme d\'<a href="https://en.wikipedia.org/wiki/Operational_transformation">Operational transformation</a> qui est capable de trouver un consensus distribué en utilisant <a href="https://bitcoin.org/bitcoin.pdf">une chaîne de bloc Nakamoto</a>, un outil popularisé par le <a href="https://fr.wikipedia.org/wiki/Bitcoin">Bitcoin</a>. De cette manière, l\'algorithme évite la nécessité d\'utiliser un serveur central pour résoudre les conflits d\'édition de l\'Operational Transformation, et sans ce besoin de résolution des conflits le serveur peut rester ignorant du contenu qui est édité dans le pad.';
     out.main_about = 'À propos';
     out.main_about_p1 = 'Vous pouvez en apprendre davantage sur notre <a href="/privacy.html" title="">politique de confidentialité</a> et nos <a href="/terms.html">conditions d\'utilisation</a>.';
     out.main_about_p2 = 'Si vous avez des questions ou commentaires, vous pouvez <a href="https://twitter.com/cryptpad">nous tweeter</a>, ouvrir une issue sur <a href="https://github.com/xwiki-labs/cryptpad/issues/" title="our issue tracker">Github</a>, venir dire bonjour sur IRC (<a href="http://webchat.freenode.net?channels=%23cryptpad&uio=MT1mYWxzZSY5PXRydWUmMTE9Mjg3JjE1PXRydWUe7" title="freenode webchat">irc.freenode.net</a>), ou <a href="mailto:research@xwiki.com">nous envoyer un email</a>.';
diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index d96c78b39..54704a245 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -162,7 +162,7 @@ define(function () {
     out.main_p1 = 'CryptPad is the <strong>zero knowledge</strong> realtime collaborative editor.  Encryption carried out in your web browser protects the data from the server, the cloud, and the NSA.  The secret encryption key is stored in the URL <a href="https://en.wikipedia.org/wiki/Fragment_identifier">fragment identifier</a> which is never sent to the server but is available to javascript so by sharing the URL, you give authorization to others who want to participate.';
     out.main_p2 = 'This project uses the <a href="http://ckeditor.com/">CKEditor</a> Visual Editor, <a href="https://codemirror.net/">CodeMirror</a>, and the <a href="https://github.com/xwiki-contrib/chainpad">ChainPad</a> realtime engine.';
     out.main_howitworks = 'How It Works';
-    out.main_howitworks_p1 = 'CryptPad uses a variant of the <a href="https://en.wikipedia.org/wiki/Operational_transformation">Operational transformation</a> algorithm which is able to find distributed consensus using a Nakamoto Blockchain, a construct popularized by <a href="https://en.wikipedia.org/wiki/Bitcoin">Bitcoin</a>. This way the algorithm can avoid the need for a central server to resolve Operational Transform Edit Conflicts and without the need for resolving conflicts, the server can be kept unaware of the content which is being edited on the pad.';
+    out.main_howitworks_p1 = 'CryptPad uses a variant of the <a href="https://en.wikipedia.org/wiki/Operational_transformation">Operational transformation</a> algorithm which is able to find distributed consensus using a <a href="https://bitcoin.org/bitcoin.pdf">Nakamoto Blockchain</a>, a construct popularized by <a href="https://en.wikipedia.org/wiki/Bitcoin">Bitcoin</a>. This way the algorithm can avoid the need for a central server to resolve Operational Transform Edit Conflicts and without the need for resolving conflicts, the server can be kept unaware of the content which is being edited on the pad.';
     out.main_about = 'About';
     out.main_about_p1 = 'You can read more about our <a href="/privacy.html" title="">privacy policy</a> and <a href="/terms.html">terms of service</a>.';
 

From 779b3914f9b47f87fe4461f92db88d906fb67995 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Fri, 4 Nov 2016 10:32:20 +0100
Subject: [PATCH 16/36] fix spanish pluralization and update howitworks

---
 customize.dist/translations/messages.es.js | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/customize.dist/translations/messages.es.js b/customize.dist/translations/messages.es.js
index 7f9a1294b..a7b9740b9 100644
--- a/customize.dist/translations/messages.es.js
+++ b/customize.dist/translations/messages.es.js
@@ -4,7 +4,7 @@ define(function () {
     out._languageName = 'Español';
 
     out.main_title = "Cryptpad: Zero Knowledge, Editor Colaborativo en Tiempo Real";
-    out.main_slogan = "La unidad es la fuerza - la colaboración es clave";
+    out.main_slogan = "La unidad es la fuerza - la colaboración es la clave";
 
     out.type = {};
     out.type.pad = 'Pad';
@@ -20,8 +20,6 @@ define(function () {
 
     out.common_connectionLost = 'Conexión perdida con el servidor';
 
-
-// HERE
     out.disconnected = "Desconectado";
     out.synchronizing = "Sincronización";
     out.reconnecting = "Reconectando";
@@ -35,10 +33,10 @@ define(function () {
     out.shareEdit = "Editar URL";
     out.users = "Usuarios";
     out.and = "y";
-    out.viewer = "espectadore";
+    out.viewer = "espectador";
     out.viewers = "espectadores";
     out.editor = "editor";
-    out.editors = "editors";
+    out.editors = "editores";
 
     out.editingAlone = 'Editar solo';
     out.editingWithOneOtherPerson = 'Editar con otra persona';
@@ -183,8 +181,8 @@ define(function () {
     out.main_p2 = 'Este proyecto usa <a href="http://ckeditor.com/">CKEditor</a> un editor de texto, <a href="https://codemirror.net/">CodeMirror</a>, y <a href="https://github.com/xwiki-contrib/chainpad">ChainPad</a> un motor de tiempo real.';
     out.main_howitworks = '¿Como Funciona?';
 
-    // TODO
-    out.main_howitworks_p1 = "CryptPad utiliza una variante del algoritmo de <a href='https://en.wikipedia.org/wiki/Operational_transformation'>transformación Operacional</a> que es capaz de encontrar el consenso distribuido usando un Nakamoto Blockchain, una construcción popularizada por <a href='https://en.wikipedia.org/wiki/Bitcoin'>Bitcoin</a> . De esta manera el algoritmo puede evitar la necesidad de un servidor central para resolver Conflictos de Edición de Transformación Operacional y sin necesidad de resolver conflictos, el servidor puede mantenerse inconsciente del contenido que se está editando en el pad.";
+    out.main_howitworks_p1 = "CryptPad utiliza una variante del algoritmo de <a href='https://en.wikipedia.org/wiki/Operational_transformation'>transformación Operacional</a> que es capaz de encontrar el consenso distribuido usando un <a href='https://bitcoin.org/bitcoin.pdf'>Nakamoto Blockchain</a>, una construcción popularizada por <a href='https://en.wikipedia.org/wiki/Bitcoin'>Bitcoin</a> . De esta manera el algoritmo puede evitar la necesidad de un servidor central para resolver Conflictos de Edición de Transformación Operacional y sin necesidad de resolver conflictos, el servidor puede mantenerse inconsciente del contenido que se está editando en el pad.";
+
 
     out.main_about = 'Acerca de';
     out.main_about_p1 = 'Tu puedes leer mas acerca de nuestra <a href="/privacy.html" title="">politica de privacidad</a> y <a href="/terms.html">terminos de servicio</a>.';

From 7b63decfeeb5dd8b4c94ffadcccab44a55b98087 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Fri, 4 Nov 2016 11:46:59 +0100
Subject: [PATCH 17/36] eliminate one step from the translation process by
 auto-adding languages to selector

---
 customize.dist/DecorateToolbar.js | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/customize.dist/DecorateToolbar.js b/customize.dist/DecorateToolbar.js
index 6ec6eac89..49a30c79f 100644
--- a/customize.dist/DecorateToolbar.js
+++ b/customize.dist/DecorateToolbar.js
@@ -18,8 +18,17 @@ define([
         $.ajax({
             url: isHtml ? '/customize/BottomBar.html' : '/customize/Header.html',
             success: function (ret) {
-                //:$('iframe').height('96%');
-                $('body').append(ret);
+                var $bar = $(ret);
+                $('body').append($bar);
+
+                var $sel = $bar.find('#language-selector');
+
+                Object.keys(Messages._languages).forEach(function (code) {
+                    $sel.append($('<option>', {
+                        value: code,
+                    }).text(Messages._languages[code]));
+                });
+
                 LS.main();
                 Messages._applyTranslation();
             }

From fda0f7d2e7fd49cd5790292c5c1b647a004372c9 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Fri, 4 Nov 2016 11:49:43 +0100
Subject: [PATCH 18/36] let javascript add language keys intead of html

---
 customize.dist/BottomBar.html | 6 +-----
 customize.dist/Header.html    | 5 +----
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/customize.dist/BottomBar.html b/customize.dist/BottomBar.html
index 0f97941c8..c8d43dfce 100644
--- a/customize.dist/BottomBar.html
+++ b/customize.dist/BottomBar.html
@@ -3,11 +3,7 @@
   <div class="bottom-bar">
     <div class="bottom-bar-left">
       <span class="bottom-bar-language">
-        <select id="language-selector">
-          <option value="en">English</option>
-          <option value="es">Español</option>
-          <option value="fr">Français</option>
-        </select>
+        <select id="language-selector"></select>
       </span>
       <p data-localization="bottom_france">
       </p>
diff --git a/customize.dist/Header.html b/customize.dist/Header.html
index 555b004c4..ace3b4d2e 100644
--- a/customize.dist/Header.html
+++ b/customize.dist/Header.html
@@ -3,10 +3,7 @@
   <div class="top-bar">
     <div class="bottom-bar-left">
       <span class="bottom-bar-language">
-        <select id="language-selector">
-          <option value="en">English</option>
-          <option value="fr">Français</option>
-        </select>
+        <select id="language-selector"></select>
       </span>
       <p data-localization="header_france" class="big">
       </p>

From 72f284bb53e60f261029960ee54603a4f49150b2 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Fri, 4 Nov 2016 11:51:52 +0100
Subject: [PATCH 19/36] add comments so translators don't get completely lost

---
 customize.dist/messages.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/customize.dist/messages.js b/customize.dist/messages.js
index 730af9629..fdd11d3d6 100644
--- a/customize.dist/messages.js
+++ b/customize.dist/messages.js
@@ -2,9 +2,16 @@ define(['/customize/languageSelector.js',
         '/customize/translations/messages.js',
         '/customize/translations/messages.es.js',
         '/customize/translations/messages.fr.js',
-        '/bower_components/jquery/dist/jquery.min.js'], function(LS, Default, Spanish, French) {
+
+    // 1) additional translation files can be added here...
+
+        '/bower_components/jquery/dist/jquery.min.js'],
+
+    // 2) name your language module here...
+        function(LS, Default, Spanish, French) {
     var $ = window.jQuery;
 
+    // 3) add your module to this map so it gets used
     var map = {
         'fr': French,
         'es': Spanish,

From 439a9981cc08a6fe3d659671e17067c22185cee1 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Fri, 4 Nov 2016 14:10:32 +0100
Subject: [PATCH 20/36] add documentation for submitting a translation

---
 customize.dist/translations/README.md | 126 ++++++++++++++++++++++++++
 readme.md                             |  15 +++
 2 files changed, 141 insertions(+)
 create mode 100644 customize.dist/translations/README.md

diff --git a/customize.dist/translations/README.md b/customize.dist/translations/README.md
new file mode 100644
index 000000000..36c43448e
--- /dev/null
+++ b/customize.dist/translations/README.md
@@ -0,0 +1,126 @@
+# Adding Translations
+
+To illustrate the process of translating, this guide will make an english-pirate translation of Cryptpad.
+We'll assume that you have a work locally-installed, properly functioning installation of Cryptpad.
+If you don't have Cryptpad installed locally, start by following the steps in the main readme.
+
+## Getting started
+
+Once everything is working, copy the default (English) source file (`/customize.dist/translations/messages.js`) to a file named according to your language's [ISO 639-1 Code](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes), like `/customize.dist/translations/messages.fr.js`.
+There is no ISO 639-1 language code for _English-pirate_, so we'll just call it `messages.pirate.js`.
+
+```Bash
+cd /customize.dist/translations/
+cp messages.js messages.pirate.js
+```
+
+## Including your translation
+
+To include your translation in the list, you'll need to add it to `/customize.dist/messages.js`.
+There are comments indicating what to modify in three places:
+
+```javascript
+define(['/customize/languageSelector.js',
+        '/customize/translations/messages.js',
+        '/customize/translations/messages.es.js',
+        '/customize/translations/messages.fr.js',
+
+    // 1) additional translation files can be added here...
+
+        '/bower_components/jquery/dist/jquery.min.js'],
+
+    // 2) name your language module here...
+        function(LS, Default, Spanish, French) {
+    var $ = window.jQuery;
+
+    // 3) add your module to this map so it gets used
+    var map = {
+        'fr': French,
+        'es': Spanish,
+    };
+```
+
+We need to modify these three places to include our file:
+
+```javascript
+define(['/customize/languageSelector.js',
+        '/customize/translations/messages.js',
+        '/customize/translations/messages.es.js',
+        '/customize/translations/messages.fr.js',
+
+    // 1) additional translation files can be added here...
+        '/customize/translations/messages.pirate.js', // add our module via its path
+
+        '/bower_components/jquery/dist/jquery.min.js'],
+
+    // 2) name your language module here...
+        function(LS, Default, Spanish, French, Pirate) { // name our module 'Pirate' for use as a variable
+    var $ = window.jQuery;
+
+    // 3) add your module to this map so it gets used
+    var map = {
+        'fr': French,
+        'es': Spanish,
+        'pirate': Pirate, // add our module to the map of languages
+    };
+```
+
+Note that the path to the file is `/customize/translations/`, not `/customize.dist/translations`.
+Cryptpad's server is configured to search for files in `/customize/` first.
+If a file is not found, it falls back to `/customize.dist/`.
+This allows administrators of a Cryptpad installation to override the default behaviour with their own files.
+
+We want translations to be the default behaviour, so we'll place it in `/customize.dist/translations/`, but resolve it via `/customize/translations/`.
+
+The second and third steps are simpler.
+Just add your module in a similar fashion to the existing translations, save your changes, and close `/customize.dist/messages.js`.
+That's all!
+
+
+## Actually translating content
+
+Now we can go back to our file, `/customize.dist/translations/messages.pirate.js` and start to add our Pirate-language customizations.
+
+Open the translation file you created in `/customize.dist/translations/`.
+You should see something like: 
+
+```javascript
+define(function () {
+    var out = {};
+
+    // translations must set this key for their language to be available in
+    // the language dropdowns that are shown throughout Cryptpad's interface
+    out._languageName = 'English';
+```
+
+Now you just need to work through this file, updating the strings like so:
+
+```javascript
+define(function () {
+    var out = {};
+
+    // translations must set this key for their language to be available in
+    // the language dropdowns that are shown throughout Cryptpad's interface
+    out._languageName = 'Pirate';
+```
+
+It's important that you modify just the string, and not the variable name which is used to access its content.
+For instance, changing `_languageName` to `_language_name` would make the string `'Pirate'` inaccessible to the rest of the codebase.
+
+## Verifying Your Translations
+
+It's advisable to save your translation file frequently, and reload Cryptpad in your browser to check that there are no errors in your translation file.
+If there are any errors in your code, the file will fail to parse, and the page will no load correctly.
+
+Checking frequently will make it easier to know which change caused the error.
+
+Additionally, we advise using the apps and visiting the various pages, to make sure that your translations make sense in context.
+
+When you're happy with your translation file, you can visit http://localhost:3000/assert/ to view Cryptpad's tests.
+Among other things, these tests will check to make sure that your translation has an entry for every entry in the default English translation.
+
+## Getting Help
+
+If you have any issues, reach out via any of the methods listed in the readme under **Contacting Us**.
+We're happy to help.
+
diff --git a/readme.md b/readme.md
index c80766ad0..e2dab9d9c 100644
--- a/readme.md
+++ b/readme.md
@@ -101,6 +101,21 @@ the battery out of your computer before it spawns Agent Smith.
 
 Still there are other low-lives in the world so using CryptPad over HTTPS is probably a good idea.
 
+## Translations
+
+We'd like to make it easy for more people to use encryption in their routine activities.
+As such, we've tried to make language-specific parts of Cryptpad translatable. If you're
+able to translate Cryptpad's interface, and would like to help, please contact us!
+
+You can also see [our translation guide](/customize.dist/translations/README.md).
+
+## Contacting Us
+
+You can reach members of the Cryptpad development team on [twitter](https://twitter.com/cryptpad),
+via our [github issue tracker](https://github.com/xwiki-labs/cryptpad/issues/), on the
+[freenode](http://webchat.freenode.net/?channels=%23cryptpad&uio=MT1mYWxzZSY5PXRydWUmMTE9Mjg3JjE1PXRydWUe7)
+irc network, or by [email](mailto:research@xwiki.com).
+
 ## Contributing
 
 We love Open Source and we love contribution. It is our intent to keep this project available

From 933831a2a83df7e3a3cacbd6e2566932674708a8 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Fri, 4 Nov 2016 14:11:00 +0100
Subject: [PATCH 21/36] add a comment about _languageName

---
 customize.dist/translations/messages.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index 54704a245..61880205a 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -1,6 +1,8 @@
 define(function () {
     var out = {};
 
+    // translations must set this key for their language to be available in
+    // the language dropdowns that are shown throughout Cryptpad's interface
     out._languageName = 'English';
 
     out.main_title = "Cryptpad: Zero Knowledge, Collaborative Real Time Editing";

From 6366e95dd88374fc664ae2dff700f3b907a80ae3 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Fri, 4 Nov 2016 14:21:05 +0100
Subject: [PATCH 22/36] remove unnecessary translation key

---
 customize.dist/Header.html                 | 2 +-
 customize.dist/translations/messages.fr.js | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/customize.dist/Header.html b/customize.dist/Header.html
index ace3b4d2e..358f6a33a 100644
--- a/customize.dist/Header.html
+++ b/customize.dist/Header.html
@@ -13,7 +13,7 @@
       <p><a id="cryptpad-logo" class="small" href="/" data-localization-title="header_logoTitle"><img src="/customize/cryptofist_mini.png" alt="Cryptpad" class="cryptofist" /></a></p>
     </div>
     <div class="bottom-bar-right">
-      <p data-localization="header_xwiki" class="small">
+      <p class="small">
           <a href="http://www.xwiki.com/" target="_blank" rel="noopener noreferrer"><img src="/customize/logo-xwiki.png" alt="XWiki SAS" class="bottom-bar-xwiki"/></a>
       <p data-localization="header_support" class="big">
       </p>
diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js
index 2c7777067..94ca6050a 100644
--- a/customize.dist/translations/messages.fr.js
+++ b/customize.dist/translations/messages.fr.js
@@ -215,7 +215,6 @@ define(function () {
     // Header.html
 
     out.header_france = '<a href="http://www.xwiki.com/fr" target="_blank" rel="noopener noreferrer">Fait avec <img class="bottom-bar-heart" src="/customize/heart.png" /> en <img class="bottom-bar-fr" title="France" alt="France" src="/customize/fr.png" /> par <img src="/customize/logo-xwiki.png" alt="XWiki SAS" class="bottom-bar-xwiki"/></a>';
-    out.header_xwiki = '<a href="http://www.xwiki.com/fr" target="_blank" rel="noopener noreferrer"><img src="/customize/logo-xwiki.png" alt="XWiki SAS" class="bottom-bar-xwiki"/></a>';
     out.header_support = '<a href="http://ng.open-paas.org/" title="OpenPaaS::ng" target="_blank" rel="noopener noreferrer"> <img src="/customize/openpaasng.png" alt="OpenPaaS-ng" class="bottom-bar-openpaas" /></a>';
     out.header_logoTitle = "Aller vers la page d'accueil";
 

From ef37dcd7e4a056c474e64db6069a96cc79b3142c Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Fri, 4 Nov 2016 16:11:33 +0100
Subject: [PATCH 23/36] add note about how missing keys are treated

---
 customize.dist/translations/README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/customize.dist/translations/README.md b/customize.dist/translations/README.md
index 36c43448e..8bde27e08 100644
--- a/customize.dist/translations/README.md
+++ b/customize.dist/translations/README.md
@@ -107,6 +107,9 @@ define(function () {
 It's important that you modify just the string, and not the variable name which is used to access its content.
 For instance, changing `_languageName` to `_language_name` would make the string `'Pirate'` inaccessible to the rest of the codebase.
 
+If a key is not found in your translation, the default English version of that key will be used.
+This is to make sure that buttons and other interface elements are not empty, but it's obviously not ideal.
+
 ## Verifying Your Translations
 
 It's advisable to save your translation file frequently, and reload Cryptpad in your browser to check that there are no errors in your translation file.

From 002e22ee9a6736c8e0f7962b9f76cde73d3ca61f Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Fri, 4 Nov 2016 16:17:59 +0100
Subject: [PATCH 24/36] turn off unwanted behaviour until we can do it
 correctly

---
 www/poll/main.js | 57 ++++++++++++++++++++++++++++++------------------
 1 file changed, 36 insertions(+), 21 deletions(-)

diff --git a/www/poll/main.js b/www/poll/main.js
index 4cf46da73..6eb063487 100644
--- a/www/poll/main.js
+++ b/www/poll/main.js
@@ -72,6 +72,23 @@ define([
         });
     };
 
+    var getLastName = module.getLastName = function (cb) {
+        Cryptpad.getAttribute('username', function (err, userName) {
+            cb(err, userName || '');
+        });
+    };
+
+    var setName = module.setName = function (uname, cb) {
+        if (typeof(uname) !== 'string') {
+            return void cb(new Error('expected string'));
+        }
+        uname = Cryptpad.fixHTML(uname.trim()).slice(0, 32);
+        Cryptpad.setAttribute('username', uname, function (err, data) {
+            if (err) { return void cb(err); }
+            cb(void 0, uname);
+        });
+    };
+
     module.Wizard = Wizard;
 
     // special UI elements
@@ -825,6 +842,10 @@ define([
 
 
         setEditable(true);
+        return;
+
+        // shortcircuiting before all of this code since it's not quite the
+        // behaviour we want, and it's a bit of work to make it Do The Right Thing
 
         if (First) {
             // assume the first user to the poll wants to be the administrator...
@@ -840,39 +861,33 @@ define([
 
             module.activeColumn = '';
             var promptForName = function () {
-                // HERE
-                Cryptpad.prompt(Messages.promptName, "", function (name, ev) {
-                    if (name === null) {
-                        name = '';
-                    }
 
-                    if (!module.isEditable) { return; }
+                var followUp = function (name) {
+                    if (!name) { return; }
                     var id = module.activeColumn = coluid();
 
                     Cryptpad.setPadAttribute('column', id, function (err) {
-                        if (err) {
-                            console.error("Couldn't remember your column id");
-                            return;
-                        }
-
-                        console.log(id);
+                        if (err) { return void console.error("Couldn't remember your column id"); }
                         makeUser(module.rt.proxy, id, name).focus().val(name);
                         makeUserEditable(id, true);
                     });
+                };
+
+                getLastName(function (err, uname) {
+                    if (!uname) {
+                        return void Cryptpad.prompt(Messages.promptName, "", function (name, ev) {
+                            if (!(name || module.isEditable)) { return; }
+                            followUp(name);
+                        });
+                    }
+                    followUp(uname);
                 });
             };
 
-            if (column === null) {
-                //console.log("Looks like you're new to this poll, why don't you make a column");
-                promptForName();
-                return;
-            }
+            if (column === null) { return void promptForName(); }
 
             // column might be defined, but that column might have been deleted...
-            if (proxy.table.colsOrder.indexOf(column) === -1) {
-                promptForName();
-                return;
-            }
+            if (proxy.table.colsOrder.indexOf(column) === -1) { return void promptForName(); }
         });
     };
 

From 86bad46f48e5b6cfaa429f2b04647eba03ebdb12 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Fri, 4 Nov 2016 17:08:46 +0100
Subject: [PATCH 25/36] comment out dead code so CI doesn't complain

---
 www/poll/main.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/poll/main.js b/www/poll/main.js
index 6eb063487..ac238e36d 100644
--- a/www/poll/main.js
+++ b/www/poll/main.js
@@ -846,7 +846,7 @@ define([
 
         // shortcircuiting before all of this code since it's not quite the
         // behaviour we want, and it's a bit of work to make it Do The Right Thing
-
+/*
         if (First) {
             // assume the first user to the poll wants to be the administrator...
             // TODO prompt them with questions to set up their poll...
@@ -888,7 +888,7 @@ define([
 
             // column might be defined, but that column might have been deleted...
             if (proxy.table.colsOrder.indexOf(column) === -1) { return void promptForName(); }
-        });
+        });*/
     };
 
     var config = {

From 67bf41627d523d6a5db71723af6423a77c97fd57 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Fri, 4 Nov 2016 17:08:46 +0100
Subject: [PATCH 26/36] comment out dead code so CI doesn't complain

---
 www/poll/main.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/poll/main.js b/www/poll/main.js
index 6eb063487..ac238e36d 100644
--- a/www/poll/main.js
+++ b/www/poll/main.js
@@ -846,7 +846,7 @@ define([
 
         // shortcircuiting before all of this code since it's not quite the
         // behaviour we want, and it's a bit of work to make it Do The Right Thing
-
+/*
         if (First) {
             // assume the first user to the poll wants to be the administrator...
             // TODO prompt them with questions to set up their poll...
@@ -888,7 +888,7 @@ define([
 
             // column might be defined, but that column might have been deleted...
             if (proxy.table.colsOrder.indexOf(column) === -1) { return void promptForName(); }
-        });
+        });*/
     };
 
     var config = {

From 303c65f2c39e945a16b4ad4dc764a2ef6bb50443 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 7 Nov 2016 11:20:30 +0100
Subject: [PATCH 27/36] use replaceState if available, instead of setting the
 hash

---
 www/code/main.js              | 4 +---
 www/common/cryptpad-common.js | 8 ++++++++
 www/pad/main.js               | 4 +---
 www/poll/main.js              | 4 +---
 www/slide/main.js             | 2 +-
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/www/code/main.js b/www/code/main.js
index ee4fd2f0f..a12d4bb8c 100644
--- a/www/code/main.js
+++ b/www/code/main.js
@@ -495,9 +495,7 @@ define([
                 }
 
                 // set the hash
-                if (!readOnly) {
-                    window.location.hash = editHash;
-                }
+                if (!readOnly) { Cryptpad.setHash(editHash); }
 
                 Cryptpad.getPadTitle(function (err, title) {
                     if (err) {
diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index d28b1e5e5..85f07234c 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -225,6 +225,14 @@ define([
         return secret;
     };
 
+    var setHash = common.setHash = function (hash) {
+        if (!/^#/.test(hash)) { hash = '#' + hash; }
+        if (window.history && window.history.replaceState) {
+            return void window.history.replaceState({}, window.document.title, hash);
+        }
+        window.location.hash = hash;
+    };
+
     var storageKey = common.storageKey = 'CryptPad_RECENTPADS';
 
     /*
diff --git a/www/pad/main.js b/www/pad/main.js
index 310a3d353..c55370771 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -601,9 +601,7 @@ define([
                 }
 
                 // set the hash
-                if (!readOnly) {
-                    window.location.hash = editHash;
-                }
+                if (!readOnly) { Cryptpad.setHash(editHash); }
 
                 Cryptpad.getPadTitle(function (err, title) {
                     if (err) {
diff --git a/www/poll/main.js b/www/poll/main.js
index ac238e36d..1caa10793 100644
--- a/www/poll/main.js
+++ b/www/poll/main.js
@@ -914,9 +914,7 @@ define([
                 editHash = Cryptpad.getEditHashFromKeys(info.channel, secret.keys);
             }
             // set the hash
-            if (!readOnly) {
-                window.location.hash = editHash;
-            }
+            if (!readOnly) { Cryptpad.setHash(editHash); }
 
             module.patchText = TextPatcher.create({
                 realtime: realtime,
diff --git a/www/slide/main.js b/www/slide/main.js
index 91a174d0f..3efb9bd45 100644
--- a/www/slide/main.js
+++ b/www/slide/main.js
@@ -585,7 +585,7 @@ define([
 
                 // set the hash
                 if (!window.location.hash || window.location.hash === '#') {
-                    window.location.hash = editHash;
+                    Cryptpad.setHash(editHash);
                 }
 
                 Cryptpad.getPadTitle(function (err, title) {

From e90ab105aaf4466770187a2b6940de266d75920f Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 7 Nov 2016 11:43:49 +0100
Subject: [PATCH 28/36] display buttons according to the order in
 application_config.js

---
 customize.dist/application_config.js | 2 +-
 customize.dist/main.js               | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/customize.dist/application_config.js b/customize.dist/application_config.js
index d7e9141c1..e4561df24 100644
--- a/customize.dist/application_config.js
+++ b/customize.dist/application_config.js
@@ -4,7 +4,7 @@ define(function() {
     /* Select the buttons displayed on the main page to create new collaborative sessions
      * Existing types : pad, code, poll, slide
      */
-    config.availablePadTypes = ['pad', 'code', 'poll', 'slide'];
+    config.availablePadTypes = ['pad', 'code', 'slide', 'poll'];
 
     return config;
 });
diff --git a/customize.dist/main.js b/customize.dist/main.js
index 2622eef1b..732bce4b8 100644
--- a/customize.dist/main.js
+++ b/customize.dist/main.js
@@ -28,8 +28,9 @@ define([
     var forgetPad = Cryptpad.forgetPad;
 
     var displayCreateButtons = function () {
+        var $parent = $('#buttons');
         Config.availablePadTypes.forEach(function (el) {
-            $('#create-' + el).show();
+            $('#create-' + el).detach().appendTo($parent).show();
         });
     };
 

From b7d9998b9b7a12cb2b93f7f3fe082b364ed30179 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 7 Nov 2016 12:10:00 +0100
Subject: [PATCH 29/36] fix reference to undefined variable

---
 www/code/main.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/www/code/main.js b/www/code/main.js
index ee4fd2f0f..1ee726097 100644
--- a/www/code/main.js
+++ b/www/code/main.js
@@ -253,6 +253,7 @@ define([
                     var clike = /^\s*(\/\*|\/\/)(.*)?(\*\/)*$/;
                     if (clike.test(line)) {
                         line.replace(clike, function (a, one, two) {
+                            if (!two) { return; }
                             text = two.replace(/\*\/\s*$/, '').trim();
                         });
                         return true;

From 75dd4a5926738b78ae8bc1fd62ca5d9ba8be751f Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 7 Nov 2016 12:11:01 +0100
Subject: [PATCH 30/36] slightly better test for variable

---
 www/code/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/code/main.js b/www/code/main.js
index 1ee726097..4f6b087dd 100644
--- a/www/code/main.js
+++ b/www/code/main.js
@@ -253,7 +253,7 @@ define([
                     var clike = /^\s*(\/\*|\/\/)(.*)?(\*\/)*$/;
                     if (clike.test(line)) {
                         line.replace(clike, function (a, one, two) {
-                            if (!two) { return; }
+                            if (!two && two.replace) { return; }
                             text = two.replace(/\*\/\s*$/, '').trim();
                         });
                         return true;

From e77ad4e909eec45a224c2c40fcefe7e16974e87e Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 7 Nov 2016 12:26:48 +0100
Subject: [PATCH 31/36] better fixes for export

---
 www/code/main.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/www/code/main.js b/www/code/main.js
index 4f6b087dd..4c28fe58e 100644
--- a/www/code/main.js
+++ b/www/code/main.js
@@ -253,19 +253,21 @@ define([
                     var clike = /^\s*(\/\*|\/\/)(.*)?(\*\/)*$/;
                     if (clike.test(line)) {
                         line.replace(clike, function (a, one, two) {
-                            if (!two && two.replace) { return; }
+                            if (!(two && two.replace)) { return; }
                             text = two.replace(/\*\/\s*$/, '').trim();
                         });
                         return true;
                     }
+
+                    // TODO make one more pass for multiline comments
                 });
 
                 return text.trim();
             };
 
-            var suggestName = function () {
+            var suggestName = function (fallback) {
                 if (document.title === defaultName) {
-                    return getHeadingText() || "";
+                    return getHeadingText() || fallback || "";
                 } else {
                     return document.title || getHeadingText() || defaultName;
                 }
@@ -276,7 +278,7 @@ define([
 
                 var ext = Modes.extensionOf(module.highlightMode);
 
-                var title = Cryptpad.fixFileName(suggestName()) + ext;
+                var title = Cryptpad.fixFileName(suggestName('cryptpad')) + (ext || '.txt');
 
                 Cryptpad.prompt(Messages.exportPrompt, title, function (filename) {
                         if (filename === null) { return; }

From d009b7400c26e65c61ce5faeb2eaa68425c4d0d6 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 7 Nov 2016 12:29:57 +0100
Subject: [PATCH 32/36] fall back to default title if one is not suggested

---
 www/pad/main.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/www/pad/main.js b/www/pad/main.js
index 310a3d353..de3e2bcf9 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -321,9 +321,9 @@ define([
                 })) { return text; }
             };
 
-            var suggestName = function () {
+            var suggestName = function (fallback) {
                 if (document.title === defaultName) {
-                    return getHeadingText() || "";
+                    return getHeadingText() || fallback || "";
                 } else {
                     return document.title || getHeadingText() || defaultName;
                 }
@@ -510,7 +510,7 @@ define([
 
             var exportFile = function () {
                 var html = getHTML();
-                var suggestion = suggestName();
+                var suggestion = suggestName('cryptpad-document');
                 Cryptpad.prompt(Messages.exportPrompt,
                     Cryptpad.fixFileName(suggestion) + '.html', function (filename) {
                     if (!(typeof(filename) === 'string' && filename)) { return; }

From c2770a7a7461a903c1b267025a3d5bb89b882d81 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Mon, 7 Nov 2016 15:03:17 +0100
Subject: [PATCH 33/36] set correct hash even if browser does not implement
 replaceState

---
 www/code/main.js              | 2 +-
 www/common/cryptpad-common.js | 4 ++--
 www/pad/main.js               | 2 +-
 www/poll/main.js              | 2 +-
 www/slide/main.js             | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/www/code/main.js b/www/code/main.js
index a12d4bb8c..da0a2a385 100644
--- a/www/code/main.js
+++ b/www/code/main.js
@@ -495,7 +495,7 @@ define([
                 }
 
                 // set the hash
-                if (!readOnly) { Cryptpad.setHash(editHash); }
+                if (!readOnly) { Cryptpad.replaceHash(editHash); }
 
                 Cryptpad.getPadTitle(function (err, title) {
                     if (err) {
diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index 85f07234c..1866fb34a 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -225,9 +225,9 @@ define([
         return secret;
     };
 
-    var setHash = common.setHash = function (hash) {
-        if (!/^#/.test(hash)) { hash = '#' + hash; }
+    var replaceHash = common.replaceHash = function (hash) {
         if (window.history && window.history.replaceState) {
+            if (!/^#/.test(hash)) { hash = '#' + hash; }
             return void window.history.replaceState({}, window.document.title, hash);
         }
         window.location.hash = hash;
diff --git a/www/pad/main.js b/www/pad/main.js
index c55370771..d1e6c9df0 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -601,7 +601,7 @@ define([
                 }
 
                 // set the hash
-                if (!readOnly) { Cryptpad.setHash(editHash); }
+                if (!readOnly) { Cryptpad.replaceHash(editHash); }
 
                 Cryptpad.getPadTitle(function (err, title) {
                     if (err) {
diff --git a/www/poll/main.js b/www/poll/main.js
index 1caa10793..9fbf2cfde 100644
--- a/www/poll/main.js
+++ b/www/poll/main.js
@@ -914,7 +914,7 @@ define([
                 editHash = Cryptpad.getEditHashFromKeys(info.channel, secret.keys);
             }
             // set the hash
-            if (!readOnly) { Cryptpad.setHash(editHash); }
+            if (!readOnly) { Cryptpad.replaceHash(editHash); }
 
             module.patchText = TextPatcher.create({
                 realtime: realtime,
diff --git a/www/slide/main.js b/www/slide/main.js
index 3efb9bd45..a291ae02c 100644
--- a/www/slide/main.js
+++ b/www/slide/main.js
@@ -585,7 +585,7 @@ define([
 
                 // set the hash
                 if (!window.location.hash || window.location.hash === '#') {
-                    Cryptpad.setHash(editHash);
+                    Cryptpad.replaceHash(editHash);
                 }
 
                 Cryptpad.getPadTitle(function (err, title) {

From ebff3046026f7e7fe0d41de7e348b32daea71fef Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 6 Dec 2016 15:16:43 +0100
Subject: [PATCH 34/36] turn off some unwanted behaviour

---
 www/poll/main.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/www/poll/main.js b/www/poll/main.js
index 9fbf2cfde..7417ad10b 100644
--- a/www/poll/main.js
+++ b/www/poll/main.js
@@ -435,7 +435,7 @@ define([
 
         var msg = Messages.poll_addUser;
         Cryptpad.prompt(msg, "", function (name) {
-            if (name === null) { return; }
+            if (!(name && name.trim())) { return; }
             makeUser(module.rt.proxy, id, name).val(name);
             makeUserEditable(id, true).focus();
         });
@@ -782,14 +782,16 @@ define([
             }));
         }
 
+/*
         if (!readOnly && module.viewHash) {
-            /* add a 'links' button */
+            /* add a 'links' button
             var $links = Cryptpad.createButton('readonly', true, {viewHash: module.viewHash})
                 .text(Messages.getViewButton)
                 .removeAttr('style')
                 .attr('class', 'action button readonly');
             $toolbar.append($links);
         }
+*/
 
         /* Import/Export buttons */
         /*

From b79618c94a8be478fcffba79d7576bf77cae34f3 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 6 Dec 2016 16:00:38 +0100
Subject: [PATCH 35/36] don't allow listeners in /slide/

---
 www/slide/slide.js | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/www/slide/slide.js b/www/slide/slide.js
index b07c1b63d..cae81204f 100644
--- a/www/slide/slide.js
+++ b/www/slide/slide.js
@@ -45,7 +45,7 @@ define([
     var unsafeTag = function (info) {
         if (['addAttribute', 'modifyAttribute'].indexOf(info.diff.action) !== -1) {
             if (/^on/.test(info.diff.name)) {
-                console.log("Rejecting forbidden element attribute with name", info.diff.element.nodeName);
+                console.log("Rejecting forbidden element attribute with name", info.diff.name);
                 return true;
             }
         }
@@ -91,12 +91,28 @@ define([
         return patch;
     };
 
+    var slice = function (coll) {
+        return Array.prototype.slice.call(coll);
+    };
+
+    /*  remove listeners from the DOM */
+    var removeListeners = function (root) {
+        slice(root.attributes).map(function (attr) {
+            if (/^on/.test(attr.name)) {
+                root.attributes.removeNamedItem(attr.name);
+            }
+        });
+        // all the way down
+        slice(root.children).forEach(removeListeners);
+    };
+
     var draw = Slide.draw =  function (i) {
         console.log("Trying to draw slide #%s", i);
         if (typeof(Slide.content[i]) !== 'string') { return; }
 
         var c = Slide.content[i];
         var Dom = domFromHTML('<div id="content">' + Marked(c) + '</div>');
+        removeListeners(Dom.body);
         var patch = makeDiff(domFromHTML($content[0].outerHTML), Dom);
 
         if (typeof(patch) === 'string') {

From 4cd9bd553461ac5e07c1eb7a13f8ee1322da1dee Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 6 Dec 2016 16:21:11 +0100
Subject: [PATCH 36/36] strip listeners

---
 www/pad/main.js | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/www/pad/main.js b/www/pad/main.js
index 0ad2778b8..457913cb5 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -35,8 +35,23 @@ define([
     window.Toolbar = Toolbar;
     window.Hyperjson = Hyperjson;
 
+    var slice = function (coll) {
+        return Array.prototype.slice.call(coll);
+    };
+
+    var removeListeners = function (root) {
+        slice(root.attributes).map(function (attr) {
+            if (/^on/.test(attr.name)) {
+                root.attributes.removeNamedItem(attr.name);
+            }
+        });
+        slice(root.children).forEach(removeListeners);
+    };
+
     var hjsonToDom = function (H) {
-        return Hyperjson.toDOM(H); //callOn(H, Hyperscript);
+        var dom = Hyperjson.toDOM(H);
+        removeListeners(dom);
+        return dom;
     };
 
     var module = window.REALTIME_MODULE = window.APP = {