From d92a875ce5da73f3b719984fa8af1cbdec7431cc Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 27 Mar 2017 11:34:54 +0200
Subject: [PATCH] Translate the 'wrong application' error message

---
 customize.dist/translations/messages.fr.js | 1 +
 customize.dist/translations/messages.js    | 1 +
 www/pad/main.js                            | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js
index 5bdd32018..bda8672cf 100644
--- a/customize.dist/translations/messages.fr.js
+++ b/customize.dist/translations/messages.fr.js
@@ -23,6 +23,7 @@ define(function () {
     out.websocketError = 'Impossible de se connecter au serveur WebSocket...';
     out.typeError = "Ce pad n'est pas compatible avec l'application sélectionnée";
     out.onLogout = 'Vous êtes déconnecté de votre compte utilisateur, <a href="/" target="_blank">cliquez ici</a> pour vous authentifier<br>ou appuyez sur <em>Échap</em> pour accéder au pad en mode lecture seule.';
+    out.wrongApp = "Impossible d'afficher le contenu de ce document temps-réel dans votre navigateur. Vous pouvez essayer de recharger la page.";
 
     out.loading = "Chargement...";
     out.error = "Erreur";
diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index 5d820a181..0c6af6d81 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -25,6 +25,7 @@ define(function () {
     out.websocketError = 'Unable to connect to the websocket server...';
     out.typeError = "This pad is not compatible with the selected application";
     out.onLogout = 'You are logged out, <a href="/" target="_blank">click here</a> to log in<br>or press <em>Escape</em> to access your pad in read-only mode.';
+    out.wrongApp = "Unable to display the content of that realtime session in your browser. Please try to reload that page.";
 
     out.loading = "Loading...";
     out.error = "Error";
diff --git a/www/pad/main.js b/www/pad/main.js
index 1ce8e3710..13abcd863 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -691,7 +691,7 @@ define([
                         if (stringify(hjson2) !== stringify(hjson)) {
                             console.log('err');
                             console.error("shjson2 !== shjson");
-                            Cryptpad.errorLoadingScreen("Unable to display the content of that realtime session in your browser. Please try to reload that page."); // TODO translate
+                            Cryptpad.errorLoadingScreen(Messages.wrongApp);
                             throw new Error();
                         }
                     }