merge noscript

customize.dist/index.html

@@ -57,8 +57,12 @@
 
       <center>
         <noscript>
-          <p data-localization="main_oops">
-          <!-- JS required -->
+          <p>
+            <strong>OOPS</strong> In order to do encryption in your browser, Javascript is really <strong>really</strong> required.
+          </p>
+          <hr>
+          <p>
+            <strong>OUPS</strong> Afin de pouvoir réaliser le cryptage depuis votre navigateur, Javascript est <strong>vraiment</strong> requis.
           </p>
         </noscript>
         <h5 id="tryit" data-localization="tryIt"></h5>
@@ -87,8 +91,6 @@
 
 
     </div>
-
-    <div id="bottom-bar"></div>
 </body>
 </html>
 

customize.dist/privacy.html

@@ -74,8 +74,6 @@
 
 
     </div>
-
-    <div id="bottom-bar"></div>
 </body>
 </html>
 

customize.dist/src/fragments/index.html

@@ -17,8 +17,12 @@
 
       <center>
         <noscript>
-          <p data-localization="main_oops">
-          <!-- JS required -->
+          <p>
+            <strong>OOPS</strong> In order to do encryption in your browser, Javascript is really <strong>really</strong> required.
+          </p>
+          <hr>
+          <p>
+            <strong>OUPS</strong> Afin de pouvoir réaliser le cryptage depuis votre navigateur, Javascript est <strong>vraiment</strong> requis.
           </p>
         </noscript>
         <h5 id="tryit" data-localization="tryIt"></h5>

customize.dist/src/template.html

@@ -20,8 +20,6 @@
     <div id="main">
 {{main}}
     </div>
-
-    <div id="bottom-bar"></div>
 </body>
 </html>
 

customize.dist/terms.html

@@ -51,8 +51,6 @@
 
 
     </div>
-
-    <div id="bottom-bar"></div>
 </body>
 </html>
 

customize.dist/translations/messages.fr.js

@@ -142,7 +142,6 @@ define(function () {
     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>.';
-    out.main_oops = '<strong>OUPS</strong> Afin de pouvoir réaliser le cryptage depuis votre navigateur, Javascript est <strong>vraiment</strong> requis.';
 
     out.table_type = 'Type';
     out.table_link = 'Lien';

customize.dist/translations/messages.js

@@ -57,7 +57,7 @@ define(function () {
     out.renameConflict = 'Another pad already has that title';
 
     out.forgetButton = 'FORGET';
-    out.forgetButtonTitle = 'remove this document from your home page listings';
+    out.forgetButtonTitle = 'Remove this document from your home page listings';
     out.forgetPrompt = 'Clicking OK will remove the URL for this pad from localStorage, are you sure?';
 
     out.shareButton = 'SHARE';
@@ -142,8 +142,8 @@ define(function () {
     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 = '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>.';
+
     out.main_about_p2 = 'If you have any questions or comments, you can <a href="https://twitter.com/cryptpad">tweet us</a>, open an issue <a href="https://github.com/xwiki-labs/cryptpad/issues/" title="our issue tracker">on github</a>, come say hi on irc (<a href="http://webchat.freenode.net?channels=%23cryptpad&uio=MT1mYWxzZSY5PXRydWUmMTE9Mjg3JjE1PXRydWUe7" title="freenode webchat">irc.freenode.net</a>), or <a href="mailto:research@xwiki.com">send us an email</a>.';
-    out.main_oops = '<strong>OOPS</strong> In order to do encryption in your browser, Javascript is really <strong>really</strong> required.';
 
     out.table_type = 'Type';
     out.table_link = 'Link';