From d0a17d547168a0bcb8e35a7f63ba37ad2d360f5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Eixarch?= <miao.org@gmail.com>
Date: Fri, 23 Nov 2012 18:18:03 +0100
Subject: [PATCH 01/33] test import converting to html instead to txt by
 default

---
 src/node/handler/ImportHandler.js | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/node/handler/ImportHandler.js b/src/node/handler/ImportHandler.js
index 788706ce..b6cd5029 100644
--- a/src/node/handler/ImportHandler.js
+++ b/src/node/handler/ImportHandler.js
@@ -27,17 +27,22 @@ var settings = require('../utils/Settings');
 var formidable = require('formidable');
 var os = require("os");
 
+// TESTING importing in HTML
+var importHtml = require("../utils/ImportHtml");
+
 //load abiword only if its enabled
 if(settings.abiword != null)
   var abiword = require("../utils/Abiword");
 
-var tempDirectory = "/tmp/";
+//Patched in formidable since v1.0.4:
+// The dafault temp directory is well detected in order to OS 
+//var tempDirectory = "/tmp/";
 
 //tempDirectory changes if the operating system is windows
-if(os.type().indexOf("Windows") > -1)
+/*if(os.type().indexOf("Windows") > -1)
 {
   tempDirectory = process.env.TEMP;
-}
+}*/
   
 /**
  * do a requested import
@@ -58,7 +63,7 @@ exports.doImport = function(req, res, padId)
     {
       var form = new formidable.IncomingForm();
       form.keepExtensions = true;
-      form.uploadDir = tempDirectory;
+      //form.uploadDir = tempDirectory;
       
       form.parse(req, function(err, fields, files) 
       { 
@@ -105,6 +110,7 @@ exports.doImport = function(req, res, padId)
       {
         var oldSrcFile = srcFile;
         srcFile = srcFile.split(".")[0] + ".txt";
+        //srcFile = srcFile.split(".")[0] + ".htm";
         
         fs.rename(oldSrcFile, srcFile, callback);
       }
@@ -114,8 +120,11 @@ exports.doImport = function(req, res, padId)
     function(callback)
     {
       var randNum = Math.floor(Math.random()*0xFFFFFFFF);
-      destFile = tempDirectory + "eplite_import_" + randNum + ".txt";
-      abiword.convertFile(srcFile, destFile, "txt", function(err){
+      //destFile = tempDirectory + "eplite_import_" + randNum + ".txt";
+      //destFile = tempDirectory + "eplite_import_" + randNum + ".htm";
+		destFile = os.tmpDir() + "/eplite_import_" + randNum + ".htm";
+      //abiword.convertFile(srcFile, destFile, "txt", function(err){
+      abiword.convertFile(srcFile, destFile, "htm", function(err){
         //catch convert errors
         if(err){
           console.warn("Converting Error:", err);
@@ -164,7 +173,9 @@ exports.doImport = function(req, res, padId)
     //change text of the pad and broadcast the changeset
     function(callback)
     {
-      pad.setText(text);
+      //pad.setText(text);
+		//prueba
+		importHtml.setPadHTML(pad, text);
       padMessageHandler.updatePadClients(pad, callback);
     },
     
@@ -196,6 +207,7 @@ exports.doImport = function(req, res, padId)
     ERR(err);
   
     //close the connection
+
     res.send("<script type='text/javascript' src='/static/js/jquery.js'></script><script> if ( (!$.browser.msie) && (!($.browser.mozilla && $.browser.version.indexOf(\"1.8.\") == 0)) ){document.domain = document.domain;}var impexp = window.top.require('/pad_impexp').padimpexp.handleFrameCall('" + status + "');</script>", 200);
   });
 }

From ef3231efd27a5fde80a6d94b559117e9a028e641 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Eixarch?= <miao.org@gmail.com>
Date: Fri, 23 Nov 2012 19:06:18 +0100
Subject: [PATCH 02/33] cleaning

---
 src/node/handler/ImportHandler.js | 121 ++++++++++--------------------
 1 file changed, 39 insertions(+), 82 deletions(-)

diff --git a/src/node/handler/ImportHandler.js b/src/node/handler/ImportHandler.js
index b6cd5029..f6b381a7 100644
--- a/src/node/handler/ImportHandler.js
+++ b/src/node/handler/ImportHandler.js
@@ -18,31 +18,19 @@
  * limitations under the License.
  */
 
-var ERR = require("async-stacktrace");
-var padManager = require("../db/PadManager");
-var padMessageHandler = require("./PadMessageHandler");
-var async = require("async");
-var fs = require("fs");
-var settings = require('../utils/Settings');
-var formidable = require('formidable');
-var os = require("os");
-
-// TESTING importing in HTML
-var importHtml = require("../utils/ImportHtml");
+var ERR = require("async-stacktrace")
+  , padManager = require("../db/PadManager")
+  , padMessageHandler = require("./PadMessageHandler")
+  , async = require("async")
+  , fs = require("fs")
+  , settings = require('../utils/Settings')
+  , formidable = require('formidable')
+  , os = require("os")
+  , importHtml = require("../utils/ImportHtml");
 
 //load abiword only if its enabled
 if(settings.abiword != null)
   var abiword = require("../utils/Abiword");
-
-//Patched in formidable since v1.0.4:
-// The dafault temp directory is well detected in order to OS 
-//var tempDirectory = "/tmp/";
-
-//tempDirectory changes if the operating system is windows
-/*if(os.type().indexOf("Windows") > -1)
-{
-  tempDirectory = process.env.TEMP;
-}*/
   
 /**
  * do a requested import
@@ -50,32 +38,27 @@ if(settings.abiword != null)
 exports.doImport = function(req, res, padId)
 {
   //pipe to a file
-  //convert file to text via abiword
-  //set text in the pad
+  //convert file to html via abiword
+  //set html in the pad
   
-  var srcFile, destFile;
-  var pad;
-  var text;
+  var srcFile, destFile
+    , pad;
+    , text;
   
   async.series([
     //save the uploaded file to /tmp
-    function(callback)
-    {
+    function(callback) {
       var form = new formidable.IncomingForm();
       form.keepExtensions = true;
-      //form.uploadDir = tempDirectory;
       
-      form.parse(req, function(err, fields, files) 
-      { 
+      form.parse(req, function(err, fields, files) { 
         //the upload failed, stop at this point
-        if(err || files.file === undefined)
-        {
+        if(err || files.file === undefined) {
           console.warn("Uploading Error: " + err.stack);
           callback("uploadFailed");
         }
         //everything ok, continue
-        else 
-        {
+        else {
           //save the path of the uploaded file
           srcFile = files.file.path;
           callback();
@@ -85,48 +68,38 @@ exports.doImport = function(req, res, padId)
     
     //ensure this is a file ending we know, else we change the file ending to .txt
     //this allows us to accept source code files like .c or .java
-    function(callback)
-    {
+    function(callback) {
       var fileEnding = (srcFile.split(".")[1] || "").toLowerCase();
       var knownFileEndings = ["txt", "doc", "docx", "pdf", "odt", "html", "htm"];
       
       //find out if this is a known file ending
       var fileEndingKnown = false;
-      for(var i in knownFileEndings)
-      {
-        if(fileEnding == knownFileEndings[i])
-        {
+      for(var i in knownFileEndings) {
+        if(fileEnding == knownFileEndings[i]){
           fileEndingKnown = true;
         }
       }
       
       //if the file ending is known, continue as normal
-      if(fileEndingKnown)
-      {
+      if(fileEndingKnown) {
         callback();
       }
       //we need to rename this file with a .txt ending
-      else
-      {
+      else {
         var oldSrcFile = srcFile;
         srcFile = srcFile.split(".")[0] + ".txt";
-        //srcFile = srcFile.split(".")[0] + ".htm";
         
         fs.rename(oldSrcFile, srcFile, callback);
       }
     },
     
     //convert file to text
-    function(callback)
-    {
+    function(callback) {
       var randNum = Math.floor(Math.random()*0xFFFFFFFF);
-      //destFile = tempDirectory + "eplite_import_" + randNum + ".txt";
-      //destFile = tempDirectory + "eplite_import_" + randNum + ".htm";
 		destFile = os.tmpDir() + "/eplite_import_" + randNum + ".htm";
-      //abiword.convertFile(srcFile, destFile, "txt", function(err){
-      abiword.convertFile(srcFile, destFile, "htm", function(err){
+      abiword.convertFile(srcFile, destFile, "htm", function(err) {
         //catch convert errors
-        if(err){
+        if(err) {
           console.warn("Converting Error:", err);
           return callback("convertFailed");
         } else {
@@ -136,10 +109,8 @@ exports.doImport = function(req, res, padId)
     },
     
     //get the pad object
-    function(callback)
-    {
-      padManager.getPad(padId, function(err, _pad)
-      {
+    function(callback) {
+      padManager.getPad(padId, function(err, _pad){
         if(ERR(err, callback)) return;
         pad = _pad;
         callback();
@@ -147,54 +118,40 @@ exports.doImport = function(req, res, padId)
     },
     
     //read the text
-    function(callback)
-    {
-      fs.readFile(destFile, "utf8", function(err, _text)
-      {
+    function(callback) {
+      fs.readFile(destFile, "utf8", function(err, _text){
         if(ERR(err, callback)) return;
         text = _text;
         
         //node on windows has a delay on releasing of the file lock.  
         //We add a 100ms delay to work around this
-	      if(os.type().indexOf("Windows") > -1)
-	      {
-          setTimeout(function()
-          {
-            callback();
-          }, 100);
-	      }
-	      else
-	      {
+	      if(os.type().indexOf("Windows") > -1){
+          setTimeout(function(){callback();}, 100);
+	      } else {
 	        callback();
 	      }
       });
     },
     
     //change text of the pad and broadcast the changeset
-    function(callback)
-    {
-      //pad.setText(text);
-		//prueba
+    function(callback) {
 		importHtml.setPadHTML(pad, text);
       padMessageHandler.updatePadClients(pad, callback);
     },
     
     //clean up temporary files
-    function(callback)
-    {
+    function(callback) {
       async.parallel([
-        function(callback)
-        {
+        function(callback){
           fs.unlink(srcFile, callback);
         },
-        function(callback)
-        {
+        function(callback){
           fs.unlink(destFile, callback);
         }
       ], callback);
     }
-  ], function(err)
-  {
+  ], function(err) {
+
     var status = "ok";
     
     //check for known errors and replace the status

From cc60b82a6ef3dda7a8c89dc8083bd5204bb99f48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Eixarch?= <miao.org@gmail.com>
Date: Fri, 23 Nov 2012 22:55:25 +0100
Subject: [PATCH 03/33] Import html by default and allow basic import/export
 features without abiword

---
 src/node/handler/ImportHandler.js      | 70 ++++++++++++++------------
 src/node/hooks/express/importexport.js |  6 ---
 src/static/js/pad_impexp.js            |  4 +-
 3 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/src/node/handler/ImportHandler.js b/src/node/handler/ImportHandler.js
index f6b381a7..93fd3db5 100644
--- a/src/node/handler/ImportHandler.js
+++ b/src/node/handler/ImportHandler.js
@@ -23,6 +23,7 @@ var ERR = require("async-stacktrace")
   , padMessageHandler = require("./PadMessageHandler")
   , async = require("async")
   , fs = require("fs")
+  , path = require("path")
   , settings = require('../utils/Settings')
   , formidable = require('formidable')
   , os = require("os")
@@ -42,7 +43,7 @@ exports.doImport = function(req, res, padId)
   //set html in the pad
   
   var srcFile, destFile
-    , pad;
+    , pad
     , text;
   
   async.series([
@@ -69,16 +70,9 @@ exports.doImport = function(req, res, padId)
     //ensure this is a file ending we know, else we change the file ending to .txt
     //this allows us to accept source code files like .c or .java
     function(callback) {
-      var fileEnding = (srcFile.split(".")[1] || "").toLowerCase();
-      var knownFileEndings = ["txt", "doc", "docx", "pdf", "odt", "html", "htm"];
-      
-      //find out if this is a known file ending
-      var fileEndingKnown = false;
-      for(var i in knownFileEndings) {
-        if(fileEnding == knownFileEndings[i]){
-          fileEndingKnown = true;
-        }
-      }
+      var fileEnding = path.extname(srcFile).toLowerCase()
+        , knownFileEndings = [".txt", ".doc", ".docx", ".pdf", ".odt", ".html", ".htm"]
+        , fileEndingKnown = (knownFileEndings.indexOf(fileEnding) > -1);
       
       //if the file ending is known, continue as normal
       if(fileEndingKnown) {
@@ -87,25 +81,31 @@ exports.doImport = function(req, res, padId)
       //we need to rename this file with a .txt ending
       else {
         var oldSrcFile = srcFile;
-        srcFile = srcFile.split(".")[0] + ".txt";
+        srcFile = path.join(path.dirname(srcFile),path.basename(srcFile, fileEnding)+".txt");
         
         fs.rename(oldSrcFile, srcFile, callback);
       }
     },
     
-    //convert file to text
+    //convert file to html
     function(callback) {
       var randNum = Math.floor(Math.random()*0xFFFFFFFF);
-		destFile = os.tmpDir() + "/eplite_import_" + randNum + ".htm";
-      abiword.convertFile(srcFile, destFile, "htm", function(err) {
-        //catch convert errors
-        if(err) {
-          console.warn("Converting Error:", err);
-          return callback("convertFailed");
-        } else {
-          callback();
-        }
-      });
+      destFile = path.join(os.tmpDir(), "eplite_import_" + randNum + ".htm");
+
+      if (abiword) {
+        abiword.convertFile(srcFile, destFile, "htm", function(err) {
+          //catch convert errors
+          if(err) {
+            console.warn("Converting Error:", err);
+            return callback("convertFailed");
+          } else {
+            callback();
+          }
+        });
+      } else {
+        // if no abiword only rename
+        fs.rename(srcFile, destFile, callback);
+      }
     },
     
     //get the pad object
@@ -125,28 +125,35 @@ exports.doImport = function(req, res, padId)
         
         //node on windows has a delay on releasing of the file lock.  
         //We add a 100ms delay to work around this
-	      if(os.type().indexOf("Windows") > -1){
-          setTimeout(function(){callback();}, 100);
-	      } else {
-	        callback();
-	      }
+        if(os.type().indexOf("Windows") > -1){
+           setTimeout(function() {callback();}, 100);
+        } else {
+          callback();
+        }
       });
     },
     
     //change text of the pad and broadcast the changeset
     function(callback) {
-		importHtml.setPadHTML(pad, text);
+      var fileEnding = path.extname(srcFile).toLowerCase();
+      if (abiword || fileEnding == ".htm" || fileEnding == ".html") {
+        importHtml.setPadHTML(pad, text);
+      } else {
+        pad.setText(text);
+      }
       padMessageHandler.updatePadClients(pad, callback);
     },
     
     //clean up temporary files
     function(callback) {
+      //for node < 0.7 compatible
+      var fileExists = fs.exists || path.exists;
       async.parallel([
         function(callback){
-          fs.unlink(srcFile, callback);
+          fileExists (srcFile, function(exist) { (exist)? fs.unlink(srcFile, callback): callback(); });
         },
         function(callback){
-          fs.unlink(destFile, callback);
+          fileExists (destFile, function(exist) { (exist)? fs.unlink(destFile, callback): callback(); });
         }
       ], callback);
     }
@@ -164,7 +171,6 @@ exports.doImport = function(req, res, padId)
     ERR(err);
   
     //close the connection
-
     res.send("<script type='text/javascript' src='/static/js/jquery.js'></script><script> if ( (!$.browser.msie) && (!($.browser.mozilla && $.browser.version.indexOf(\"1.8.\") == 0)) ){document.domain = document.domain;}var impexp = window.top.require('/pad_impexp').padimpexp.handleFrameCall('" + status + "');</script>", 200);
   });
 }
diff --git a/src/node/hooks/express/importexport.js b/src/node/hooks/express/importexport.js
index 9e78f34d..9754ffa6 100644
--- a/src/node/hooks/express/importexport.js
+++ b/src/node/hooks/express/importexport.js
@@ -28,12 +28,6 @@ exports.expressCreateServer = function (hook_name, args, cb) {
 
   //handle import requests
   args.app.post('/p/:pad/import', function(req, res, next) {
-    //if abiword is disabled, skip handling this request
-    if(settings.abiword == null) {
-      next();
-      return; 
-    }
-
     hasPadAccess(req, res, function() {
       importHandler.doImport(req, res, req.params.pad);
     });
diff --git a/src/static/js/pad_impexp.js b/src/static/js/pad_impexp.js
index 08dd4293..70d27d40 100644
--- a/src/static/js/pad_impexp.js
+++ b/src/static/js/pad_impexp.js
@@ -225,8 +225,8 @@ var padimpexp = (function()
         $("#exportworda").remove();
         $("#exportpdfa").remove();
         $("#exportopena").remove();
-        $(".importformdiv").remove();
-        $("#import").html("Import is not available.  To enable import please install abiword");
+
+        $("#importform").attr('action', pad_root_url + "/import");
       }
       else if(clientVars.abiwordAvailable == "withoutPDF")
       {

From d7cca602dfb2e87497e404d21083c2e8b2cf6689 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Eixarch?= <miao.org@gmail.com>
Date: Mon, 26 Nov 2012 03:18:47 +0100
Subject: [PATCH 04/33] Added message translatable about features importing
 without abiword

---
 settings.json.template      |  2 +-
 src/locales/en.ini          |  3 ++-
 src/locales/es.ini          |  1 +
 src/static/css/pad.css      | 19 ++++++++++++-------
 src/static/js/pad_impexp.js |  9 ++++-----
 src/templates/pad.html      |  3 ++-
 6 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/settings.json.template b/settings.json.template
index 4894f897..f6f3e5b8 100644
--- a/settings.json.template
+++ b/settings.json.template
@@ -65,7 +65,7 @@
   "maxAge" : 21600, // 60 * 60 * 6 = 6 hours
   
   /* This is the path to the Abiword executable. Setting it to null, disables abiword.
-     Abiword is needed to enable the import/export of pads*/  
+     Abiword is needed to advanced import/export features of pads*/  
   "abiword" : null,
  
   /* This setting is used if you require authentication of all users.
diff --git a/src/locales/en.ini b/src/locales/en.ini
index a110583e..32980b51 100644
--- a/src/locales/en.ini
+++ b/src/locales/en.ini
@@ -41,6 +41,7 @@ pad.importExport.exportword = Microsoft Word
 pad.importExport.exportpdf = PDF
 pad.importExport.exportopen = ODF (Open Document Format)
 pad.importExport.exportdokuwiki = DokuWiki
+pad.importExport.abiword.innerHTML = You only can import from plain text or html formats. For more advanced import features please <a href="https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-in-Ubuntu-or-OpenSuse-or-SLES-with-AbiWord">install abiword</a>.
 pad.modals.connected = Connected.
 pad.modals.reconnecting = Reconnecting to your pad..
 pad.modals.forcereconnect = Force reconnect
@@ -74,4 +75,4 @@ timeslider.pageTitle = {{appTitle}} Timeslider
 timeslider.toolbar.returnbutton = Return to pad
 timeslider.toolbar.authors = Authors:
 timeslider.toolbar.authorsList = No Authors
-timeslider.exportCurrent = Export current version as:
\ No newline at end of file
+timeslider.exportCurrent = Export current version as:
diff --git a/src/locales/es.ini b/src/locales/es.ini
index dd2c0d14..538d9495 100644
--- a/src/locales/es.ini
+++ b/src/locales/es.ini
@@ -44,6 +44,7 @@ pad.importExport.exportword = Microsoft Word
 pad.importExport.exportpdf = PDF
 pad.importExport.exportopen = ODF (Open Document Format)
 pad.importExport.exportdokuwiki = DokuWiki
+pad.importExport.abiword.innerHTML = Sólo puede importar formatos de texto plano o html. Para funciones más avanzadas instale <a href="https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-in-Ubuntu-or-OpenSuse-or-SLES-with-AbiWord">abiword</a>.
 pad.modals.connected = Conectado.
 pad.modals.reconnecting = Reconectando a tu pad..
 pad.modals.forcereconnect = Reconexión forzosa
diff --git a/src/static/css/pad.css b/src/static/css/pad.css
index 64f9f0d4..c3deebc1 100644
--- a/src/static/css/pad.css
+++ b/src/static/css/pad.css
@@ -571,15 +571,20 @@ table#otheruserstable {
 #exportdokuwiki {
   background-position: 0px -459px
 }
-#importstatusball {
-  display: none
+
+/* hidden element */
+#importstatusball,
+#importarrow,
+#importmessagesuccess,
+#importmessageabiword {
+  display: none;
 }
-#importarrow {
-  display: none
-}
-#importmessagesuccess {
-  display: none
+
+#importmessageabiword {
+  color: #900;
+  font-size: small;
 }
+
 #importsubmitinput {
   height: 25px;
   width: 85px;
diff --git a/src/static/js/pad_impexp.js b/src/static/js/pad_impexp.js
index 70d27d40..4b4733a5 100644
--- a/src/static/js/pad_impexp.js
+++ b/src/static/js/pad_impexp.js
@@ -218,6 +218,9 @@ var padimpexp = (function()
       $("#exporthtmla").attr("href", pad_root_path + "/export/html");
       $("#exportplaina").attr("href", pad_root_path + "/export/txt");
       $("#exportdokuwikia").attr("href", pad_root_path + "/export/dokuwiki");
+
+      // activate action to import in the form
+      $("#importform").attr('action', pad_root_url + "/import");
       
       //hide stuff thats not avaible if abiword is disabled
       if(clientVars.abiwordAvailable == "no")
@@ -226,7 +229,7 @@ var padimpexp = (function()
         $("#exportpdfa").remove();
         $("#exportopena").remove();
 
-        $("#importform").attr('action', pad_root_url + "/import");
+        $("#importmessageabiword").show();
       }
       else if(clientVars.abiwordAvailable == "withoutPDF")
       {
@@ -237,16 +240,12 @@ var padimpexp = (function()
         
         $("#importexport").css({"height":"142px"});
         $("#importexportline").css({"height":"142px"});
-        
-        $("#importform").attr('action', pad_root_url + "/import"); 
       }
       else
       {
         $("#exportworda").attr("href", pad_root_path + "/export/doc");
         $("#exportpdfa").attr("href", pad_root_path + "/export/pdf");
         $("#exportopena").attr("href", pad_root_path + "/export/odt");
-        
-        $("#importform").attr('action', pad_root_path + "/import"); 
       }
     
       $("#impexp-close").click(function()
diff --git a/src/templates/pad.html b/src/templates/pad.html
index 3f3eee4f..a2b153d3 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -246,7 +246,8 @@
             <h1 data-l10n-id="pad.importExport.import_export"></h1>
             <div class="column acl-write">
                 <% e.begin_block("importColumn"); %>
-                <h2 data-l10n-id="pad.importExport.import"></h2><br>
+                <h2 data-l10n-id="pad.importExport.import"></h2>
+                <div class="importmessage" id="importmessageabiword" data-l10n-id="pad.importExport.abiword"></div><br>
                 <form id="importform" method="post" action="" target="importiframe" enctype="multipart/form-data">
                     <div class="importformdiv" id="importformfilediv">
                         <input type="file" name="file" size="15" id="importfileinput">

From fddca354b33eb2f855178657b775a4008e8da8d5 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Mon, 26 Nov 2012 20:52:10 +0000
Subject: [PATCH 05/33] proper fix for focus and some styling of the form and
 allows for pressing enter on form so generally a better fix

---
 src/static/js/pad.js | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/static/js/pad.js b/src/static/js/pad.js
index 34f2a287..936298ab 100644
--- a/src/static/js/pad.js
+++ b/src/static/js/pad.js
@@ -305,14 +305,22 @@ function handshake()
       else if(obj.accessStatus == "needPassword")
       {
         $("#editorloadingbox").html("<b>You need a password to access this pad</b><br>" +
-                                    "<input id='passwordinput' type='password' name='password'>"+
-                                    "<button type='button' onclick=\"" + padutils.escapeHtml('require('+JSON.stringify(module.id)+").savePassword()") + "\">ok</button>");
+                                    "<form class='passForm'><input id='passwordinput' type='password' name='password'>"+
+                                    "<button type='button' onclick=\"" + padutils.escapeHtml('require('+JSON.stringify(module.id)+").savePassword();") + "\">ok</button></div>");
+        $("#passwordinput").focus();
+        $(".passForm").submit(function(){
+          $('.passForm button').click();
+        });
       }
       else if(obj.accessStatus == "wrongPassword")
       {
         $("#editorloadingbox").html("<b>Your password was wrong</b><br>" +
-                                    "<input id='passwordinput' type='password' name='password'>"+
-                                    "<button type='button' onclick=\"" + padutils.escapeHtml('require('+JSON.stringify(module.id)+").savePassword()") + "\">ok</button>");
+                                    "<form class='passForm'><input id='passwordinput' type='password' name='password'>"+
+                                    "<button type='button' onclick=\"" + padutils.escapeHtml('require('+JSON.stringify(module.id)+").savePassword();") + "\">ok</button></div>");
+        $("#passwordinput").focus();
+        $(".passForm").submit(function(){
+          $('.passForm button').click();
+        });
       }
     }
     

From f880473360e26f683df73700366f36b7dc757bdb Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Mon, 26 Nov 2012 20:54:28 +0000
Subject: [PATCH 06/33] remember the styling for the pasword prompt

---
 src/static/css/pad.css | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/static/css/pad.css b/src/static/css/pad.css
index 64f9f0d4..01a19514 100644
--- a/src/static/css/pad.css
+++ b/src/static/css/pad.css
@@ -190,6 +190,19 @@ a img {
   height: 30px;
   z-index: 100;
 }
+
+#editorloadingbox passForm{
+  padding:10px;
+}
+
+#editorloadingbox input{
+  padding:10px;
+}
+
+#editorloadingbox button{
+  padding:10px;
+}
+
 #editorcontainerbox {
   position: absolute;
   bottom: 0;

From 6fe61036325c86ed6e572d0676f1272d67ae1bb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Eixarch?= <miao.org@gmail.com>
Date: Mon, 26 Nov 2012 23:40:31 +0100
Subject: [PATCH 07/33] added languages for translatewiki

---
 src/locales/zh-hant.ini | 78 -----------------------------------------
 src/node/hooks/i18n.js  |  4 +--
 src/package.json        | 52 +++++++++++++--------------
 3 files changed, 28 insertions(+), 106 deletions(-)
 delete mode 100644 src/locales/zh-hant.ini

diff --git a/src/locales/zh-hant.ini b/src/locales/zh-hant.ini
deleted file mode 100644
index b76ae180..00000000
--- a/src/locales/zh-hant.ini
+++ /dev/null
@@ -1,78 +0,0 @@
-; Exported from translatewiki.net
-; Author: Simon Shek
-[zh-hant]
-index.newPad = 新Pad
-index.createOpenPad = 或創建／開啟以下名稱的pad：
-pad.toolbar.bold.title = 粗體（Ctrl-B）
-pad.toolbar.italic.title = 斜體（Ctrl-I）
-pad.toolbar.underline.title = 底線（Ctrl-U）
-pad.toolbar.strikethrough.title = 刪除線
-pad.toolbar.ol.title = 有序清單
-pad.toolbar.ul.title = 無序清單
-pad.toolbar.indent.title = 縮排
-pad.toolbar.unindent.title = 凸排
-pad.toolbar.undo.title = 撤銷（Ctrl-Z）
-pad.toolbar.redo.title = 重做（Ctrl-Y）
-pad.toolbar.clearAuthorship.title = 清除作名顏色
-pad.toolbar.import_export.title = 以其他檔案格式導入／匯出
-pad.toolbar.timeslider.title = 時間軸
-pad.toolbar.savedRevision.title = 已儲存的修訂
-pad.toolbar.settings.title = 設定
-pad.toolbar.embed.title = 嵌入此pad
-pad.toolbar.showusers.title = 顯示此pad的用戶
-pad.colorpicker.save = 儲存
-pad.colorpicker.cancel = 取消
-pad.loading = 載入中...
-pad.settings.padSettings = Pad設定
-pad.settings.myView = 我的視窗
-pad.settings.stickychat = 永遠在屏幕上顯示聊天
-pad.settings.colorcheck = 作者顏色
-pad.settings.linenocheck = 行號
-pad.settings.fontType = 字體類型：
-pad.settings.fontType.normal = 正常
-pad.settings.fontType.monospaced = 等寬
-pad.settings.globalView = 所有人的視窗
-pad.settings.language = 語言：
-pad.importExport.import_export = 導入／匯出
-pad.importExport.import = 上載任何文字檔或文檔
-pad.importExport.successful = 完成！
-pad.importExport.export = 匯出當前pad為：
-pad.importExport.exporthtml = HTML
-pad.importExport.exportplain = 純文字
-pad.importExport.exportword = Microsoft Word
-pad.importExport.exportpdf = PDF
-pad.importExport.exportopen = ODF（開放文件格式）
-pad.importExport.exportdokuwiki = DokuWiki
-pad.modals.connected = 已連線。
-pad.modals.reconnecting = 重新連接到您的pad...
-pad.modals.forcereconnect = 強制重新連線
-pad.modals.uderdup = 在另一個視窗中開啟
-pad.modals.userdup.explanation = 此pad似乎在此電腦上的多個瀏覽器視窗中開啟。
-pad.modals.userdup.advice = 重新連接到此視窗。
-pad.modals.unauth = 未授權
-pad.modals.unauth.explanation = 您的權限在查看此頁時發生更改。請嘗試重新連接。
-pad.modals.looping = 已離線。
-pad.modals.looping.explanation = 與同步伺服器間有通信問題。
-pad.modals.looping.cause = 也許您通過一個不相容的防火牆或代理伺服器連接。
-pad.modals.initsocketfail = 無法訪問伺服器。
-pad.modals.initsocketfail.explanation = 無法連接到同步伺服器。
-pad.modals.initsocketfail.cause = 可能是由於您的瀏覽器或您的互聯網連接的問題。
-pad.modals.slowcommit = 已離線。
-pad.modals.slowcommit.explanation = 伺服器沒有回應。
-pad.modals.slowcommit.cause = 可能是由於網路連接問題。
-pad.modals.deleted = 已刪除。
-pad.modals.deleted.explanation = 此pad已被移除。
-pad.modals.disconnected = 您已中斷連線。
-pad.modals.disconnected.explanation = 伺服器連接曾中斷
-pad.modals.disconnected.cause = 伺服器可能無法使用。若此情況持續發生，請通知我們。
-pad.share = 分享此pad
-pad.share.readonly = 唯讀
-pad.share.link = 連結
-pad.share.emebdcode = 嵌入網址
-pad.chat = 聊天
-pad.chat.title = 打開此pad的聊天。
-timeslider.pageTitle = {{appTitle}}時間軸
-timeslider.toolbar.returnbutton = 返回到pad
-timeslider.toolbar.authors = 作者：
-timeslider.toolbar.authorsList = 無作者
-timeslider.exportCurrent = 匯出當前版本為：
diff --git a/src/node/hooks/i18n.js b/src/node/hooks/i18n.js
index 4d42de04..f6f0f8c8 100644
--- a/src/node/hooks/i18n.js
+++ b/src/node/hooks/i18n.js
@@ -1,4 +1,4 @@
-var languages = require('languages')
+var languages = require('languages4translatewiki')
   , fs = require('fs')
   , path = require('path')
   , express = require('express')
@@ -9,7 +9,7 @@ var localesPath = __dirname+"/../../locales";
 var localeIndex = fs.readFileSync(localesPath+'/en.ini')+'\r\n';
 
 // add language base 'en' to availableLangs
-exports.availableLangs = {en: languages.getLanguageInfo('en')}
+exports.availableLangs = {en: {name:'English',nativeName:'English',direction:'ltr'}};
 
 fs.readdir(localesPath, function(er, files) {
   files.forEach(function(locale) {
diff --git a/src/package.json b/src/package.json
index 8f762077..24bcdd84 100644
--- a/src/package.json
+++ b/src/package.json
@@ -11,32 +11,32 @@
                       { "name": "Marcel Klehr" }
                      ],
   "dependencies"   : {
-                      "yajsml"              : "1.1.6",
-                      "request"             : "2.9.100",
-                      "require-kernel"      : "1.0.5",
-                      "resolve"             : "0.2.x",
-                      "socket.io"           : "0.9.x",
-                      "ueberDB"             : "0.1.8",
-                      "async"               : "0.1.x",
-                      "express"             : "3.x",
-                      "connect"             : "2.4.x",
-                      "clean-css"           : "0.3.2",
-                      "uglify-js"           : "1.2.5",
-                      "formidable"          : "1.0.9",
-                      "log4js"              : "0.5.x",
-                      "jsdom-nocontextifiy" : "0.2.10",
-                      "async-stacktrace"    : "0.0.2",
-                      "npm"                 : "1.1.x",
-                      "npm-registry-client" : "0.2.10",
-                      "ejs"                 : "0.6.1",
-                      "graceful-fs"         : "1.1.5",
-                      "slide"               : "1.1.3",
-                      "semver"              : "1.0.13",
-                      "security"            : "1.0.0",
-                      "tinycon"             : "0.0.1",
-                      "underscore"          : "1.3.1",
-                      "unorm"               : "1.0.0",
-                      "languages"           : "0.1.1"
+                      "yajsml"                  : "1.1.6",
+                      "request"                 : "2.9.100",
+                      "require-kernel"          : "1.0.5",
+                      "resolve"                 : "0.2.x",
+                      "socket.io"               : "0.9.x",
+                      "ueberDB"                 : "0.1.8",
+                      "async"                   : "0.1.x",
+                      "express"                 : "3.x",
+                      "connect"                 : "2.4.x",
+                      "clean-css"               : "0.3.2",
+                      "uglify-js"               : "1.2.5",
+                      "formidable"              : "1.0.9",
+                      "log4js"                  : "0.5.x",
+                      "jsdom-nocontextifiy"     : "0.2.10",
+                      "async-stacktrace"        : "0.0.2",
+                      "npm"                     : "1.1.x",
+                      "npm-registry-client"     : "0.2.10",
+                      "ejs"                     : "0.6.1",
+                      "graceful-fs"             : "1.1.5",
+                      "slide"                   : "1.1.3",
+                      "semver"                  : "1.0.13",
+                      "security"                : "1.0.0",
+                      "tinycon"                 : "0.0.1",
+                      "underscore"              : "1.3.1",
+                      "unorm"                   : "1.0.0",
+                      "languages4translatewiki" : "0.1.2"
                      },
   "bin":             { "etherpad-lite": "./node/server.js" },
   "devDependencies": {

From 97d77ea089c75fc64fef94b9259674d738a930cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Eixarch?= <miao.org@gmail.com>
Date: Tue, 27 Nov 2012 00:11:45 +0100
Subject: [PATCH 08/33] added my name in header

---
 src/node/handler/ImportHandler.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/node/handler/ImportHandler.js b/src/node/handler/ImportHandler.js
index 93fd3db5..815e5357 100644
--- a/src/node/handler/ImportHandler.js
+++ b/src/node/handler/ImportHandler.js
@@ -4,6 +4,7 @@
 
 /*
  * 2011 Peter 'Pita' Martischka (Primary Technology Ltd)
+ * 2012 Iván Eixarch
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

From c445197e7fc03572aa31511e35f9193a47332c20 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Tue, 27 Nov 2012 15:10:36 +0000
Subject: [PATCH 09/33] Update src/static/css/pad.css

---
 src/static/css/pad.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/static/css/pad.css b/src/static/css/pad.css
index 01a19514..a2540614 100644
--- a/src/static/css/pad.css
+++ b/src/static/css/pad.css
@@ -191,7 +191,7 @@ a img {
   z-index: 100;
 }
 
-#editorloadingbox passForm{
+#editorloadingbox .passForm{
   padding:10px;
 }
 

From 1cc0e8cbf0d38b4a34674623e329cf9e2379c209 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Eixarch?= <miao.org@gmail.com>
Date: Wed, 28 Nov 2012 03:27:09 +0100
Subject: [PATCH 10/33] Restore original ini file

---
 src/locales/zh-hant.ini | 78 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 src/locales/zh-hant.ini

diff --git a/src/locales/zh-hant.ini b/src/locales/zh-hant.ini
new file mode 100644
index 00000000..b76ae180
--- /dev/null
+++ b/src/locales/zh-hant.ini
@@ -0,0 +1,78 @@
+; Exported from translatewiki.net
+; Author: Simon Shek
+[zh-hant]
+index.newPad = 新Pad
+index.createOpenPad = 或創建／開啟以下名稱的pad：
+pad.toolbar.bold.title = 粗體（Ctrl-B）
+pad.toolbar.italic.title = 斜體（Ctrl-I）
+pad.toolbar.underline.title = 底線（Ctrl-U）
+pad.toolbar.strikethrough.title = 刪除線
+pad.toolbar.ol.title = 有序清單
+pad.toolbar.ul.title = 無序清單
+pad.toolbar.indent.title = 縮排
+pad.toolbar.unindent.title = 凸排
+pad.toolbar.undo.title = 撤銷（Ctrl-Z）
+pad.toolbar.redo.title = 重做（Ctrl-Y）
+pad.toolbar.clearAuthorship.title = 清除作名顏色
+pad.toolbar.import_export.title = 以其他檔案格式導入／匯出
+pad.toolbar.timeslider.title = 時間軸
+pad.toolbar.savedRevision.title = 已儲存的修訂
+pad.toolbar.settings.title = 設定
+pad.toolbar.embed.title = 嵌入此pad
+pad.toolbar.showusers.title = 顯示此pad的用戶
+pad.colorpicker.save = 儲存
+pad.colorpicker.cancel = 取消
+pad.loading = 載入中...
+pad.settings.padSettings = Pad設定
+pad.settings.myView = 我的視窗
+pad.settings.stickychat = 永遠在屏幕上顯示聊天
+pad.settings.colorcheck = 作者顏色
+pad.settings.linenocheck = 行號
+pad.settings.fontType = 字體類型：
+pad.settings.fontType.normal = 正常
+pad.settings.fontType.monospaced = 等寬
+pad.settings.globalView = 所有人的視窗
+pad.settings.language = 語言：
+pad.importExport.import_export = 導入／匯出
+pad.importExport.import = 上載任何文字檔或文檔
+pad.importExport.successful = 完成！
+pad.importExport.export = 匯出當前pad為：
+pad.importExport.exporthtml = HTML
+pad.importExport.exportplain = 純文字
+pad.importExport.exportword = Microsoft Word
+pad.importExport.exportpdf = PDF
+pad.importExport.exportopen = ODF（開放文件格式）
+pad.importExport.exportdokuwiki = DokuWiki
+pad.modals.connected = 已連線。
+pad.modals.reconnecting = 重新連接到您的pad...
+pad.modals.forcereconnect = 強制重新連線
+pad.modals.uderdup = 在另一個視窗中開啟
+pad.modals.userdup.explanation = 此pad似乎在此電腦上的多個瀏覽器視窗中開啟。
+pad.modals.userdup.advice = 重新連接到此視窗。
+pad.modals.unauth = 未授權
+pad.modals.unauth.explanation = 您的權限在查看此頁時發生更改。請嘗試重新連接。
+pad.modals.looping = 已離線。
+pad.modals.looping.explanation = 與同步伺服器間有通信問題。
+pad.modals.looping.cause = 也許您通過一個不相容的防火牆或代理伺服器連接。
+pad.modals.initsocketfail = 無法訪問伺服器。
+pad.modals.initsocketfail.explanation = 無法連接到同步伺服器。
+pad.modals.initsocketfail.cause = 可能是由於您的瀏覽器或您的互聯網連接的問題。
+pad.modals.slowcommit = 已離線。
+pad.modals.slowcommit.explanation = 伺服器沒有回應。
+pad.modals.slowcommit.cause = 可能是由於網路連接問題。
+pad.modals.deleted = 已刪除。
+pad.modals.deleted.explanation = 此pad已被移除。
+pad.modals.disconnected = 您已中斷連線。
+pad.modals.disconnected.explanation = 伺服器連接曾中斷
+pad.modals.disconnected.cause = 伺服器可能無法使用。若此情況持續發生，請通知我們。
+pad.share = 分享此pad
+pad.share.readonly = 唯讀
+pad.share.link = 連結
+pad.share.emebdcode = 嵌入網址
+pad.chat = 聊天
+pad.chat.title = 打開此pad的聊天。
+timeslider.pageTitle = {{appTitle}}時間軸
+timeslider.toolbar.returnbutton = 返回到pad
+timeslider.toolbar.authors = 作者：
+timeslider.toolbar.authorsList = 無作者
+timeslider.exportCurrent = 匯出當前版本為：

From 9ec8a6e3d38bde94a3bc52daa16bb1588157f67c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Eixarch?= <miao.org@gmail.com>
Date: Wed, 28 Nov 2012 04:02:55 +0100
Subject: [PATCH 11/33] back to globalize... don't work :S

---
 src/node/hooks/i18n.js | 11 +++++++----
 src/package.json       |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/node/hooks/i18n.js b/src/node/hooks/i18n.js
index f6f0f8c8..147ef533 100644
--- a/src/node/hooks/i18n.js
+++ b/src/node/hooks/i18n.js
@@ -1,4 +1,4 @@
-var languages = require('languages4translatewiki')
+var Globalize = require('globalize')
   , fs = require('fs')
   , path = require('path')
   , express = require('express')
@@ -9,7 +9,8 @@ var localesPath = __dirname+"/../../locales";
 var localeIndex = fs.readFileSync(localesPath+'/en.ini')+'\r\n';
 
 // add language base 'en' to availableLangs
-exports.availableLangs = {en: {name:'English',nativeName:'English',direction:'ltr'}};
+exports.availableLangs = {};
+exports.availableLangs['en'] = Globalize.cultures['en'];
 
 fs.readdir(localesPath, function(er, files) {
   files.forEach(function(locale) {
@@ -19,11 +20,13 @@ fs.readdir(localesPath, function(er, files) {
     // build locale index
     localeIndex += '['+locale+']\r\n@import url(locales/'+locale+'.ini)\r\n'
     
-    // add info language {name, nativeName, direction} to availableLangs
-    exports.availableLangs[locale]=languages.getLanguageInfo(locale);
+    require('globalize/lib/cultures/globalize.culture.'+locale+'.js')
+    exports.availableLangs[locale]=Globalize.cultures[locale];
   })
 })
 
+console.log(exports.availableLangs);
+
 exports.expressCreateServer = function(n, args) {
 
   args.app.use('/locales', express.static(localesPath));
diff --git a/src/package.json b/src/package.json
index 24bcdd84..2bc5ac22 100644
--- a/src/package.json
+++ b/src/package.json
@@ -36,7 +36,7 @@
                       "tinycon"                 : "0.0.1",
                       "underscore"              : "1.3.1",
                       "unorm"                   : "1.0.0",
-                      "languages4translatewiki" : "0.1.2"
+                      "globalize"               : "0.1.1"
                      },
   "bin":             { "etherpad-lite": "./node/server.js" },
   "devDependencies": {

From 795a20b3f24b122acc356e6ecd29b76a6cd09bc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Eixarch?= <miao.org@gmail.com>
Date: Wed, 28 Nov 2012 23:54:23 +0100
Subject: [PATCH 12/33] get languages availables through translatewiki API

---
 src/node/hooks/i18n.js | 47 ++++++++++++++++++++++++++++--------------
 src/package.json       |  3 +--
 2 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/src/node/hooks/i18n.js b/src/node/hooks/i18n.js
index 147ef533..3589dfb2 100644
--- a/src/node/hooks/i18n.js
+++ b/src/node/hooks/i18n.js
@@ -1,4 +1,4 @@
-var Globalize = require('globalize')
+var http = require ('http')
   , fs = require('fs')
   , path = require('path')
   , express = require('express')
@@ -8,24 +8,39 @@ var localesPath = __dirname+"/../../locales";
 // Serve English strings directly with /locales.ini
 var localeIndex = fs.readFileSync(localesPath+'/en.ini')+'\r\n';
 
-// add language base 'en' to availableLangs
-exports.availableLangs = {};
-exports.availableLangs['en'] = Globalize.cultures['en'];
+exports.availableLangs = {'en': {'nativeName': 'English'}};
 
-fs.readdir(localesPath, function(er, files) {
-  files.forEach(function(locale) {
-    locale = locale.split('.')[0]
-    if(locale.toLowerCase() == 'en') return;
+// build availableLangs with translatewiki web API
+var request = http.request ('http://translatewiki.net/w/api.php?action=query&meta=siteinfo&siprop=languages&format=json',
+  function (res) {
+    var twLangs = '';
+    res.setEncoding ('utf8');
+    res.on ('data', function (chunk) { twLangs += chunk; });
+    res.on ('end', function () {
+      // twLangs = [{code: 'en', '*': 'English'}...] 
+      twLangs = JSON.parse(twLangs)['query']['languages'];
 
-    // build locale index
-    localeIndex += '['+locale+']\r\n@import url(locales/'+locale+'.ini)\r\n'
+      fs.readdir(localesPath, function(er, files) {
+        files.forEach(function(locale) {
+          locale = locale.split('.')[0];
+          if(locale.toLowerCase() == 'en') return;
+
+          // build locale index
+          localeIndex += '['+locale+']\r\n@import url(locales/'+locale+'.ini)\r\n';
     
-    require('globalize/lib/cultures/globalize.culture.'+locale+'.js')
-    exports.availableLangs[locale]=Globalize.cultures[locale];
-  })
-})
-
-console.log(exports.availableLangs);
+          for (var l = 0; l < twLangs.length; l++) {
+            var code = twLangs[l]['code'];
+            if (locale == code) {
+              var nativeName = twLangs[l]['*'];
+              exports.availableLangs[code] = {'nativeName': nativeName};
+            }
+          }
+        });
+      });
+    });
+  }).on ('error', function(e) {
+    console.error('While query translatewiki API: '+e.message);
+  }).end();
 
 exports.expressCreateServer = function(n, args) {
 
diff --git a/src/package.json b/src/package.json
index 2bc5ac22..e6805353 100644
--- a/src/package.json
+++ b/src/package.json
@@ -35,8 +35,7 @@
                       "security"                : "1.0.0",
                       "tinycon"                 : "0.0.1",
                       "underscore"              : "1.3.1",
-                      "unorm"                   : "1.0.0",
-                      "globalize"               : "0.1.1"
+                      "unorm"                   : "1.0.0"
                      },
   "bin":             { "etherpad-lite": "./node/server.js" },
   "devDependencies": {

From e9e4d65ad46b5b222a4117c2efb1225422f68650 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Sun, 2 Dec 2012 12:35:02 +0000
Subject: [PATCH 13/33] Localisation updates from http://translatewiki.net.

---
 src/locales/ca.ini  |  36 ++++++++++++++
 src/locales/de.ini  |  16 ++++++
 src/locales/es.ini  |  16 ++++++
 src/locales/fi.ini  |   2 +-
 src/locales/fr.ini  |  42 +++++++++++-----
 src/locales/gl.ini  |  15 ++++++
 src/locales/ja.ini  |  15 ++++++
 src/locales/ksh.ini |  23 +++++++--
 src/locales/mk.ini  |  15 ++++++
 src/locales/ml.ini  | 115 +++++++++++++++++++++++++-------------------
 src/locales/nl.ini  |  15 ++++++
 src/locales/sv.ini  |  15 ++++++
 12 files changed, 256 insertions(+), 69 deletions(-)
 create mode 100644 src/locales/ca.ini

diff --git a/src/locales/ca.ini b/src/locales/ca.ini
new file mode 100644
index 00000000..e9437eda
--- /dev/null
+++ b/src/locales/ca.ini
@@ -0,0 +1,36 @@
+; Exported from translatewiki.net
+; Author: Pginer
+; Author: Toniher
+[ca]
+pad.toolbar.bold.title = Negreta (Ctrl-B)
+pad.toolbar.italic.title = Cursiva (Ctrl-I)
+pad.toolbar.ol.title = Llista ordenada
+pad.toolbar.ul.title = Llista sense ordenar
+pad.toolbar.undo.title = Desfés (Ctrl-Z)
+pad.toolbar.redo.title = Refés (Ctrl-Y)
+pad.toolbar.settings.title = Configuració
+pad.colorpicker.save = Desa
+pad.colorpicker.cancel = Cancel·la
+pad.loading = S'està carregant...
+pad.settings.fontType.normal = Normal
+pad.settings.language = Llengua:
+pad.importExport.import_export = Importació/exportació
+pad.importExport.exporthtml = HTML
+pad.importExport.exportplain = Text net
+pad.modals.slowcommit.explanation = El servidor no respon.
+pad.share.readonly = Només de lectura
+pad.share.link = Enllaç
+timeslider.toolbar.authors = Autors:
+timeslider.toolbar.authorsList = No hi ha autors
+timeslider.month.january = Gener
+timeslider.month.february = Febrer
+timeslider.month.march = Març
+timeslider.month.april = Abril
+timeslider.month.may = Maig
+timeslider.month.june = Juny
+timeslider.month.july = Juliol
+timeslider.month.august = Agost
+timeslider.month.september = Setembre
+timeslider.month.october = Octubre
+timeslider.month.november = Novembre
+timeslider.month.december = Desembre
diff --git a/src/locales/de.ini b/src/locales/de.ini
index f153ba77..0a9ab58e 100644
--- a/src/locales/de.ini
+++ b/src/locales/de.ini
@@ -1,5 +1,6 @@
 ; Exported from translatewiki.net
 ; Author: Metalhead64
+; Author: Mklehr
 ; Author: Wikinaut
 [de]
 index.newPad = Neues Pad
@@ -77,3 +78,18 @@ timeslider.toolbar.returnbutton = Zurück zum Pad
 timeslider.toolbar.authors = Autoren:
 timeslider.toolbar.authorsList = keine Autoren
 timeslider.exportCurrent = Exportiere diese Version als:
+timeslider.version = Version {{version}}
+timeslider.saved = Gespeichert am {{day}}.{{month}}.{{year}}
+timeslider.dateformat = {{day}}.{{month}}.{{year}} {{hours}}:{{minutes}}:{{seconds}}
+timeslider.month.january = Januar
+timeslider.month.february = Februar
+timeslider.month.march = März
+timeslider.month.april = April
+timeslider.month.may = Mai
+timeslider.month.june = Juni
+timeslider.month.july = Juli
+timeslider.month.august = August
+timeslider.month.september = September
+timeslider.month.october = Oktober
+timeslider.month.november = November
+timeslider.month.december = Dezember
diff --git a/src/locales/es.ini b/src/locales/es.ini
index 95c731ef..d698b752 100644
--- a/src/locales/es.ini
+++ b/src/locales/es.ini
@@ -1,4 +1,5 @@
 ; Exported from translatewiki.net
+; Author: Armando-Martin
 ; Author: Jacobo
 ; Author: McDutchie
 ; Author: Xuacu
@@ -78,3 +79,18 @@ timeslider.toolbar.returnbutton = Volver al pad
 timeslider.toolbar.authors = Autores:
 timeslider.toolbar.authorsList = Sin autores
 timeslider.exportCurrent = Exportar la versión actual como:
+timeslider.version = Versión {{version}}
+timeslider.saved = Guardado el {{day}} de {{month}} de {{year}}
+timeslider.dateformat = {{day}}/{{month}}/{{year}} {{hours}}:{{minutes}}:{{seconds}}
+timeslider.month.january = Enero
+timeslider.month.february = Febrero
+timeslider.month.march = Marzo
+timeslider.month.april = Abril
+timeslider.month.may = Mayo
+timeslider.month.june = Junio
+timeslider.month.july = Julio
+timeslider.month.august = Agosto
+timeslider.month.september = Septiembre
+timeslider.month.october = Octubre
+timeslider.month.november = Noviembre
+timeslider.month.december = Diciembre
diff --git a/src/locales/fi.ini b/src/locales/fi.ini
index 0a9c4f6c..9442db49 100644
--- a/src/locales/fi.ini
+++ b/src/locales/fi.ini
@@ -5,7 +5,7 @@
 ; Author: Nike
 [fi]
 index.newPad = Uusi muistio
-index.createOpenPad = tai luo/avaa muistio nimellä:
+index.createOpenPad = tai luo tai avaa muistio nimellä:
 pad.toolbar.bold.title = Lihavointi (Ctrl-B)
 pad.toolbar.italic.title = Kursivointi (Ctrl-I)
 pad.toolbar.underline.title = Alleviivaus (Ctrl-U)
diff --git a/src/locales/fr.ini b/src/locales/fr.ini
index 7ac51f9c..ee1f66dc 100644
--- a/src/locales/fr.ini
+++ b/src/locales/fr.ini
@@ -1,6 +1,7 @@
 ; Exported from translatewiki.net
 ; Author: Crochet.david
 ; Author: Gomoko
+; Author: Goofy
 ; Author: Jean-Frédéric
 ; Author: Leviathan
 ; Author: McDutchie
@@ -13,14 +14,14 @@ pad.toolbar.italic.title = Italique (Ctrl-I)
 pad.toolbar.underline.title = Souligner (Ctrl-U)
 pad.toolbar.strikethrough.title = Barrer
 pad.toolbar.ol.title = Liste ordonnée
-pad.toolbar.ul.title = Liste non-ordonnée
+pad.toolbar.ul.title = Liste à puces
 pad.toolbar.indent.title = Indenter
 pad.toolbar.unindent.title = Désindenter
 pad.toolbar.undo.title = Annuler (Ctrl-Z)
 pad.toolbar.redo.title = Rétablir (Ctrl-Y)
 pad.toolbar.clearAuthorship.title = Effacer les couleurs identifiant les auteurs
 pad.toolbar.import_export.title = Importer/Exporter de/vers un format de fichier différent
-pad.toolbar.timeslider.title = Navigateur d’historique
+pad.toolbar.timeslider.title = Historique dynamique
 pad.toolbar.savedRevision.title = Versions enregistrées
 pad.toolbar.settings.title = Paramètres
 pad.toolbar.embed.title = Intégrer ce Pad
@@ -30,9 +31,9 @@ pad.colorpicker.cancel = Annuler
 pad.loading = Chargement…
 pad.settings.padSettings = Paramètres du Pad
 pad.settings.myView = Ma vue
-pad.settings.stickychat = Messagerie toujours affichée
+pad.settings.stickychat = Toujours afficher le chat
 pad.settings.colorcheck = Couleurs d’identification
-pad.settings.linenocheck = Numéros des lignes
+pad.settings.linenocheck = Numéros de lignes
 pad.settings.fontType = Type de police :
 pad.settings.fontType.normal = Normal
 pad.settings.fontType.monospaced = Monospace
@@ -55,29 +56,44 @@ pad.modals.uderdup = Ouvert dans une autre fenêtre
 pad.modals.userdup.explanation = Il semble que ce Pad soit ouvert dans plusieurs fenêtres de votre navigateur sur cet ordinateur.
 pad.modals.userdup.advice = Se reconnecter en utilisant cette fenêtre.
 pad.modals.unauth = Non autorisé
-pad.modals.unauth.explanation = Vos permissions ont été changées lors de la visualisation de cette page. Essayer de vous reconnecter.
+pad.modals.unauth.explanation = Vos permissions ont été changées lors de l'affichage de cette page. Essayer de vous reconnecter.
 pad.modals.looping = Déconnecté.
 pad.modals.looping.explanation = Nous éprouvons un problème de communication au serveur de synchronisation.
-pad.modals.looping.cause = Il est possible que leur connection soit protégée par un pare-feu incompatible ou un serveur proxy incompatible.
+pad.modals.looping.cause = Il est possible que votre connexion soit protégée par un pare-feu incompatible ou un serveur proxy incompatible.
 pad.modals.initsocketfail = Le serveur est introuvable.
 pad.modals.initsocketfail.explanation = Impossible de se connecter au serveur de synchronisation.
-pad.modals.initsocketfail.cause = La cause de ce problème peut être liée à votre fureteur web.
+pad.modals.initsocketfail.cause = Le problème peut venir de votre navigateur web ou de votre connexion Internet.
 pad.modals.slowcommit = Déconnecté.
 pad.modals.slowcommit.explanation = Le serveur ne répond pas.
-pad.modals.slowcommit.cause = La cause de ce problème peut être liée à une erreur de connectivité du réseau.
+pad.modals.slowcommit.cause = Ce problème peut venir d'une mauvaise connectivité au réseau.
 pad.modals.deleted = Supprimé.
 pad.modals.deleted.explanation = Ce Pad a été supprimé.
 pad.modals.disconnected = Vous avez été déconnecté.
 pad.modals.disconnected.explanation = La connexion au serveur a échoué.
-pad.modals.disconnected.cause = Ce serveur est possiblement hors-ligne. Veuillez nous joindre si le problème persiste.
+pad.modals.disconnected.cause = Il se peut que le serveur soit indisponible. Veuillez nous en informer si le problème persiste.
 pad.share = Partager ce Pad
 pad.share.readonly = Lecture seule
 pad.share.link = Lien
 pad.share.emebdcode = Lien à intégrer
-pad.chat = Messagerie
-pad.chat.title = Ouvrir la messagerie liée au Pad.
-timeslider.pageTitle = {{appTitle}} Curseur temporel
+pad.chat = Chat
+pad.chat.title = Ouvrir le chat associé à ce pad.
+timeslider.pageTitle = Historique dynamique de {{appTitle}}
 timeslider.toolbar.returnbutton = Retour à ce Pad.
 timeslider.toolbar.authors = Auteurs :
 timeslider.toolbar.authorsList = Aucun auteur
-timeslider.exportCurrent = Exporter version actuelle vers :
+timeslider.exportCurrent = Exporter la version actuelle en :
+timeslider.version = Version {{version}}
+timeslider.saved = Enregistré le {{day}} {{month}} {{year}}
+timeslider.dateformat = {{day}}/{{month}}/{{year}} à {{hours}}:{{minutes}}:{{seconds}}
+timeslider.month.january = Janvier
+timeslider.month.february = Février
+timeslider.month.march = Mars
+timeslider.month.april = Avril
+timeslider.month.may = Mai
+timeslider.month.june = Juin
+timeslider.month.july = Juillet
+timeslider.month.august = Août
+timeslider.month.september = Septembre
+timeslider.month.october = Octobre
+timeslider.month.november = Novembre
+timeslider.month.december = Décembre
diff --git a/src/locales/gl.ini b/src/locales/gl.ini
index 017c61f2..a824fb46 100644
--- a/src/locales/gl.ini
+++ b/src/locales/gl.ini
@@ -76,3 +76,18 @@ timeslider.toolbar.returnbutton = Volver ao documento
 timeslider.toolbar.authors = Autores:
 timeslider.toolbar.authorsList = Ningún autor
 timeslider.exportCurrent = Exportar a versión actual en formato:
+timeslider.version = Versión {{version}}
+timeslider.saved = Gardado o {{day}} de {{month}} de {{year}}
+timeslider.dateformat = {{day}}/{{month}}/{{year}} {{hours}}:{{minutes}}:{{seconds}}
+timeslider.month.january = xaneiro
+timeslider.month.february = febreiro
+timeslider.month.march = marzo
+timeslider.month.april = abril
+timeslider.month.may = maio
+timeslider.month.june = xuño
+timeslider.month.july = xullo
+timeslider.month.august = agosto
+timeslider.month.september = setembro
+timeslider.month.october = outubro
+timeslider.month.november = novembro
+timeslider.month.december = decembro
diff --git a/src/locales/ja.ini b/src/locales/ja.ini
index c092e07c..5ad25392 100644
--- a/src/locales/ja.ini
+++ b/src/locales/ja.ini
@@ -76,3 +76,18 @@ timeslider.toolbar.returnbutton = パッドに戻る
 timeslider.toolbar.authors = 作者:
 timeslider.toolbar.authorsList = 作者なし
 timeslider.exportCurrent = 現在の版をエクスポートする形式:
+timeslider.version = バージョン {{version}}
+timeslider.saved = | {{year}}年{{month}}{{day}}日に保存
+timeslider.dateformat = {{year}}年{{month}}{{day}}日 {{hours}}:{{minutes}}:{{seconds}}
+timeslider.month.january = 1月
+timeslider.month.february = 2月
+timeslider.month.march = 3月
+timeslider.month.april = 4月
+timeslider.month.may = 5月
+timeslider.month.june = 6月
+timeslider.month.july = 7月
+timeslider.month.august = 8月
+timeslider.month.september = 9月
+timeslider.month.october = 10月
+timeslider.month.november = 11月
+timeslider.month.december = 12月
diff --git a/src/locales/ksh.ini b/src/locales/ksh.ini
index fcd972c1..372d36ee 100644
--- a/src/locales/ksh.ini
+++ b/src/locales/ksh.ini
@@ -40,10 +40,8 @@ pad.importExport.export = Don dat Pädd äxpoteere alß:
 pad.importExport.exporthtml = HTML
 pad.importExport.exportplain = Eijfach Täx
 pad.importExport.exportword = Microsoft Word
-pad.importExport.exportpdf = <i lang="en">PDF</i>
-(Poteerbaa Dokemänte Fommaat)
-pad.importExport.exportopen = <i lang="en">ODF</i>
-(Offe Dokemänte-Fommaat)
+pad.importExport.exportpdf = PDF (Poteerbaa Dokemänte Fommaat)
+pad.importExport.exportopen = ODF (Offe Dokemänte-Fommaat)
 pad.importExport.exportdokuwiki = DokuWiki
 pad.modals.connected = Verbonge.
 pad.modals.reconnecting = Ben wider aam Verbenge&nbsp;&hellip;
@@ -55,7 +53,7 @@ pad.modals.unauth = Nit berääschtesch
 pad.modals.unauth.explanation = Ding Berääschtejong hät sesch jeändert, derwiehl De di Sigg aam beloore wohrß. Versöhk en neu Verbendong ze maache.
 pad.modals.looping = De Verbendong es fott.
 pad.modals.looping.explanation = Et jitt Probleeme met dä Verbendong mem ẞööver för de Schriiver ier Aandeile zesamme_ze_bränge.
-pad.modals.looping.cause = Künnt sin, Ding Verbendong jeiht dorj_en onzopaß <i lang="en">proxy</i>-ööver udder <i lang="en">firewall</i>
+pad.modals.looping.cause = Künnt sin, Ding Verbendong jeiht dorj_ene onzopaß <i lang="en">proxy</i>-ẞööver udder <i lang="en">firewall</i>.
 pad.modals.initsocketfail = Dä ẞööver es nit ze äreische.
 pad.modals.initsocketfail.explanation = Kein Verbendong met däm ẞööver ze krijje.
 pad.modals.initsocketfail.cause = Dat künnt aam Brauser udder aan däm singer Verbendong övver et Internet lijje.
@@ -79,3 +77,18 @@ timeslider.toolbar.returnbutton = Jangk retuur nohm Pädd
 timeslider.toolbar.authors = Schriiver:
 timeslider.toolbar.authorsList = Kein Schriivere
 timeslider.exportCurrent = Donn de meußte Väsjohn äxpotteere alß:
+timeslider.version = Väsjon {{version}}
+timeslider.saved = Faßjehallde aam {{day}}. {{month}} {{year}}
+timeslider.dateformat = amm {{day}}. {{month}} {{year}} öm {{hours}}:{{minutes}}:{{seconds}}
+timeslider.month.january = Jannewaa
+timeslider.month.february = Fääbrowaa
+timeslider.month.march = Määz
+timeslider.month.april = Apprell
+timeslider.month.may = Mai
+timeslider.month.june = Juuni
+timeslider.month.july = Juuli
+timeslider.month.august = Oujoß
+timeslider.month.september = Säptämber
+timeslider.month.october = Oktoober
+timeslider.month.november = Novämber
+timeslider.month.december = Dezämber
diff --git a/src/locales/mk.ini b/src/locales/mk.ini
index c5205229..b1aaf323 100644
--- a/src/locales/mk.ini
+++ b/src/locales/mk.ini
@@ -76,3 +76,18 @@ timeslider.toolbar.returnbutton = Назад на тетратката
 timeslider.toolbar.authors = Автори:
 timeslider.toolbar.authorsList = Нема автори
 timeslider.exportCurrent = Извези ја тековната верзија како:
+timeslider.version = Верзија {{version}}
+timeslider.saved = Зачувано на {{day}} {{month}} {{year}} г.
+timeslider.dateformat = {{day}}/{{month}}/{{year}} {{hours}}:{{minutes}}:{{seconds}}
+timeslider.month.january = јануари
+timeslider.month.february = февруари
+timeslider.month.march = март
+timeslider.month.april = април
+timeslider.month.may = мај
+timeslider.month.june = јуни
+timeslider.month.july = јули
+timeslider.month.august = август
+timeslider.month.september = септември
+timeslider.month.october = октомври
+timeslider.month.november = ноември
+timeslider.month.december = декември
diff --git a/src/locales/ml.ini b/src/locales/ml.ini
index 409b6b10..0c374426 100644
--- a/src/locales/ml.ini
+++ b/src/locales/ml.ini
@@ -1,78 +1,93 @@
 ; Exported from translatewiki.net
+; Author: Praveenp
 ; Author: Santhosh.thottingal
 [ml]
-index.newPad = പുതിയ ഏടു്
-index.createOpenPad = അല്ലെങ്കിൽ പേരുകൊടുത്തു് ഒരു ഏടുണ്ടാക്കുകയോ തുറക്കുകയോ ചെയ്യുക
-pad.toolbar.bold.title = കട്ടി  (Ctrl-B)
-pad.toolbar.italic.title = ചെരിക്കുക (Ctrl-I)
-pad.toolbar.underline.title = അടിവര (Ctrl-U)
+index.newPad = പുതിയ പാഡ്
+index.createOpenPad = അല്ലെങ്കിൽ പേരുപയോഗിച്ച് പാഡ് സൃഷ്ടിക്കുക/തുറക്കുക:
+pad.toolbar.bold.title = കട്ടികൂട്ടിയെഴുതുക (Ctrl-B)
+pad.toolbar.italic.title = ചെരിച്ചെഴുതുക (Ctrl-I)
+pad.toolbar.underline.title = അടിവരയിടുക (Ctrl-U)
 pad.toolbar.strikethrough.title = വെട്ടുക
 pad.toolbar.ol.title = ക്രമത്തിലുള്ള പട്ടിക
 pad.toolbar.ul.title = ക്രമരഹിത പട്ടിക
-pad.toolbar.indent.title = വലത്തേക്കു് തള്ളുക
-pad.toolbar.unindent.title = ഇടത്തേക്കു് തള്ളുക
-pad.toolbar.undo.title = വേണ്ട  (Ctrl-Z)
-pad.toolbar.redo.title = വീണ്ടും (Ctrl-Y)
-pad.toolbar.clearAuthorship.title = എഴുത്തിയവർക്കുള്ള നിറം കളയുക
-pad.toolbar.import_export.title = വിവിധ ഫയൽത്തരങ്ങളിലേക്ക്/നിന്നും എടുക്കുക
+pad.toolbar.indent.title = വലത്തേക്ക് തള്ളുക
+pad.toolbar.unindent.title = ഇടത്തേക്ക് തള്ളുക
+pad.toolbar.undo.title = തിരസ്കരിക്കുക (Ctrl-Z)
+pad.toolbar.redo.title = വീണ്ടും ചെയ്യുക (Ctrl-Y)
+pad.toolbar.clearAuthorship.title = രചയിതാക്കൾക്കുള്ള നിറം കളയുക
+pad.toolbar.import_export.title = വ്യത്യസ്ത ഫയൽ തരങ്ങളിലേക്ക്/തരങ്ങളിൽ നിന്ന് ഇറക്കുമതി/കയറ്റുമതി ചെയ്യുക
 pad.toolbar.timeslider.title = സമയരേഖ
-pad.toolbar.savedRevision.title = എടുത്തുവെച്ച ലക്കങ്ങൾ
-pad.toolbar.settings.title = ക്രമീകരണങ്ങൾ
-pad.toolbar.embed.title = ഈ ഏടു് ഉൾപ്പെടുത്തുക
-pad.toolbar.showusers.title = ഈ ഏടിലുള്ളവരെ കാണുക
-pad.colorpicker.save = എടുത്തുവെയ്ക്കുക
+pad.toolbar.savedRevision.title = സേവ് ചെയ്തിട്ടുള്ള നാൾപ്പതിപ്പുകൾ
+pad.toolbar.settings.title = സജ്ജീകരണങ്ങൾ
+pad.toolbar.embed.title = ഈ പാഡ് എംബെഡ് ചെയ്യുക
+pad.toolbar.showusers.title = ഈ പാഡിലുള്ള ഉപയോക്താക്കളെ പ്രദർശിപ്പിക്കുക
+pad.colorpicker.save = സേവ് ചെയ്യുക
 pad.colorpicker.cancel = റദ്ദാക്കുക
-pad.loading = എടുക്കുന്നു...
-pad.settings.padSettings = ഏടിന്റെ ക്രമീകരണങ്ങൾ
+pad.loading = ശേഖരിക്കുന്നു...
+pad.settings.padSettings = പാഡ് സജ്ജീകരണങ്ങൾ
 pad.settings.myView = എന്റെ കാഴ്ച
-pad.settings.stickychat = സംവാദം കാണിക്കുക
+pad.settings.stickychat = തത്സമയം സംവാദം എപ്പോഴും സ്ക്രീനിൽ കാണിക്കുക
 pad.settings.colorcheck = എഴുത്തുകാർക്കുള്ള നിറങ്ങൾ
 pad.settings.linenocheck = എണ്ണമിട്ട വരികൾ
-pad.settings.fontType = അക്ഷരത്തിന്റെ തരം
+pad.settings.fontType = ഫോണ്ട് തരം:
 pad.settings.fontType.normal = സാധാരണം
-pad.settings.fontType.monospaced = ഒരേവീതി
+pad.settings.fontType.monospaced = മോണോസ്പേസ്
 pad.settings.globalView = മൊത്തക്കാഴ്ച
 pad.settings.language = ഭാഷ:
-pad.importExport.import_export = എടുക്കുക/കയറ്റുക
-pad.importExport.import = ഫയലോ രേഖയോ കേറ്റൂക
+pad.importExport.import_export = ഇറക്കുമതി/കയറ്റുമതി ചെയ്യുക
+pad.importExport.import = എന്തെങ്കിലും എഴുത്തു പ്രമാണമോ രേഖയോ അപ്‌ലോഡ് ചെയ്യുക
 pad.importExport.successful = വിജയകരം!
-pad.importExport.export = ഈ ഏടു് എടുത്തുവെയ്ക്കുക:
-pad.importExport.exporthtml = HTML
-pad.importExport.exportplain = വെറും എഴുത്തു്
-pad.importExport.exportword = Microsoft Word
-pad.importExport.exportpdf = PDF
-pad.importExport.exportopen = ODF (Open Document Format)
-pad.importExport.exportdokuwiki = DokuWiki
+pad.importExport.export = ഇപ്പോഴത്തെ പാഡ് ഇങ്ങനെ കയറ്റുമതി ചെയ്യുക:
+pad.importExport.exporthtml = എച്ച്.റ്റി.എം.എൽ.
+pad.importExport.exportplain = വെറും എഴുത്ത്
+pad.importExport.exportword = മൈക്രോസോഫ്റ്റ് വേഡ്
+pad.importExport.exportpdf = പി.ഡി.എഫ്.
+pad.importExport.exportopen = ഒ.ഡി.എഫ്. (ഓപ്പൺ ഡോക്യുമെന്റ് ഫോർമാറ്റ്)
+pad.importExport.exportdokuwiki = ഡോകുവിക്കി
 pad.modals.connected = ബന്ധിപ്പിച്ചിരിക്കുന്നു.
-pad.modals.reconnecting = ഏടു് വീണ്ടും ബന്ധിപ്പിക്കുന്നു...
+pad.modals.reconnecting = താങ്കളുടെ പാഡിലേയ്ക്ക് വീണ്ടും ബന്ധിപ്പിക്കുന്നു...
 pad.modals.forcereconnect = എന്തായാലും ബന്ധിപ്പിക്കുക
-pad.modals.uderdup = വേറെ ജാലകത്തിൽ തുറന്നു
-pad.modals.userdup.explanation = ഈ ഏടു് ഒന്നിലധികം ബൌസർ ജാലകങ്ങളിൽ ഈ കമ്പ്യൂട്ടറിൽ തുറന്നതായി കാണുന്നു.
+pad.modals.uderdup = മറ്റൊരു ജാലകത്തിൽ തുറന്നു
+pad.modals.userdup.explanation = ഈ കമ്പ്യൂട്ടറിൽ ഈ പാഡ് ഒന്നിലധികം ബ്രൗസർ ജാലകങ്ങളിൽ തുറന്നതായി കാണുന്നു.
 pad.modals.userdup.advice = ഈ ജാലകം തന്നെ ഉപയോഗിക്കാനായി ബന്ധിപ്പിക്കുക
-pad.modals.unauth = അനുവാദമില്ല.
-pad.modals.unauth.explanation = നിങ്ങളുടെ അനുവാദങ്ങൾ മാറിയിരിക്കുന്നു. വീണ്ടും ബന്ധിപ്പിക്കുക
+pad.modals.unauth = അനുവാദമില്ല
+pad.modals.unauth.explanation = ഈ താൾ കണ്ടുകൊണ്ടിരിക്കെ താങ്കൾക്കുള്ള അനുമതികളിൽ മാറ്റമുണ്ടായി. വീണ്ടും ബന്ധപ്പെടാൻ ശ്രമിക്കുക.
 pad.modals.looping = വേർപെട്ടു.
-pad.modals.looping.explanation = സെർവറുമായുള്ള സംവേദനത്തിൽ തകരാറു്
-pad.modals.looping.cause = ഒരുപക്ഷേ പറ്റാത്ത ഫയർവാളിലൂടെയോ പ്രോക്സിയിലൂടെയോ ബന്ധിപ്പിച്ചിരിക്കാം
+pad.modals.looping.explanation = സിംക്രണൈസേഷൻ സെർവറുമായുള്ള ആശയവിനിമയത്തിൽ പ്രശ്നങ്ങളുണ്ട്.
+pad.modals.looping.cause = ഒരുപക്ഷേ പൊരുത്തപ്പെടാത്ത ഫയർവാളിലൂടെയോ പ്രോക്സിയിലൂടെയോ ആകാം താങ്കൾ ബന്ധിച്ചിരുന്നത്.
 pad.modals.initsocketfail = സെർവറിലെത്താൻ പറ്റുന്നില്ല.
-pad.modals.initsocketfail.explanation = സെർവറുമായി ബന്ധപ്പെടാൻ കഴിയുന്നില്ല
-pad.modals.initsocketfail.cause = ഇന്റർനെറ്റ് കണക്ഷന്റെയോ ബ്രൌസറിന്റെയോ പ്രശ്നമാകാം
+pad.modals.initsocketfail.explanation = സിംക്രണൈസേഷൻ സെർവറുമായി ബന്ധപ്പെടാൻ കഴിഞ്ഞില്ല.
+pad.modals.initsocketfail.cause = ഇന്റർനെറ്റ് കണക്ഷന്റെയോ ബ്രൗസറിന്റെയോ പ്രശ്നമാകാം
 pad.modals.slowcommit = വേർപെട്ടു.
 pad.modals.slowcommit.explanation = സെർവർ പ്രതികരിക്കുന്നില്ല.
 pad.modals.slowcommit.cause = നെറ്റ്‌വർക്ക് പ്രശ്നം കാരണമാകാം.
 pad.modals.deleted = മായ്ച്ചു
-pad.modals.deleted.explanation = ഈ ഏടു് കളഞ്ഞു
-pad.modals.disconnected = നിങ്ങൾ വേർപെട്ടു
+pad.modals.deleted.explanation = ഈ പാഡ് നീക്കം ചെയ്തു.
+pad.modals.disconnected = താങ്കൾ വേർപെട്ടിരിക്കുന്നു.
 pad.modals.disconnected.explanation = സെർവറുമായുള്ള ബന്ധം നഷ്ടപ്പെട്ടു
-pad.modals.disconnected.cause = സെർവർ ഓടുന്നില്ലായിരിക്കാം. ഇതു് തുടരുന്നെങ്കിൽ ഞങ്ങളെ അറിയിക്കുക
-pad.share = ഈ ഏടു് പങ്കിടുക
-pad.share.readonly = വായിക്കാൻ മാത്രം
+pad.modals.disconnected.cause = സെർവർ ലഭ്യമല്ലായിരിക്കാം. ഇത് തുടർച്ചയായി സംഭവിക്കുന്നുണ്ടെങ്കിൽ ദയവായി ഞങ്ങളെ അറിയിക്കുക.
+pad.share = ഈ പാഡ് പങ്കിടുക
+pad.share.readonly = വായിക്കൽ മാത്രം
 pad.share.link = കണ്ണി
-pad.share.emebdcode = Embed URL
-pad.chat = സംവാദം
-pad.chat.title = ഈ ഏടിന്റെ സംവാദം തുറക്കുക
+pad.share.emebdcode = എംബെഡ് യു.ആർ.എൽ.
+pad.chat = തത്സമയസംവാദം
+pad.chat.title = ഈ പാഡിന്റെ തത്സമയസംവാദം തുറക്കുക.
 timeslider.pageTitle = {{appTitle}} സമയരേഖ
-timeslider.toolbar.returnbutton = ഏടിലേക്കു് തിരിച്ചുപോവുക
-timeslider.toolbar.authors = എഴുതിയവർ:
+timeslider.toolbar.returnbutton = പാഡിലേക്ക് തിരിച്ചുപോവുക
+timeslider.toolbar.authors = രചയിതാക്കൾ:
 timeslider.toolbar.authorsList = ആരും എഴുതിയിട്ടില്ല
-timeslider.exportCurrent = ഈ പതിപ്പു് ഇങ്ങനെ എടുക്കുക:
+timeslider.exportCurrent = ഈ പതിപ്പ് ഇങ്ങനെ എടുക്കുക:
+timeslider.version = പതിപ്പ് {{version}}
+timeslider.saved = സേവ് ചെയ്തത് {{month}} {{day}}, {{year}}
+timeslider.month.january = ജനുവരി
+timeslider.month.february = ഫെബ്രുവരി
+timeslider.month.march = മാർച്ച്
+timeslider.month.april = ഏപ്രിൽ
+timeslider.month.may = മേയ്
+timeslider.month.june = ജൂൺ
+timeslider.month.july = ജൂലൈ
+timeslider.month.august = ഓഗസ്റ്റ്
+timeslider.month.september = സെപ്റ്റംബർ
+timeslider.month.october = ഒക്ടോബർ
+timeslider.month.november = നവംബർ
+timeslider.month.december = ഡിസംബർ
diff --git a/src/locales/nl.ini b/src/locales/nl.ini
index 94dcb32d..1a078d92 100644
--- a/src/locales/nl.ini
+++ b/src/locales/nl.ini
@@ -77,3 +77,18 @@ timeslider.toolbar.returnbutton = Terug naar pad
 timeslider.toolbar.authors = Auteurs:
 timeslider.toolbar.authorsList = Geen auteurs
 timeslider.exportCurrent = Huidige versie exporteren als:
+timeslider.version = Versie {{version}}
+timeslider.saved = Opgeslagen op {{day}} {{month}} {{year}}
+timeslider.dateformat = {{year}}-{{month}}-{{day}} {{hours}}:{{minutes}}:{{seconds}}
+timeslider.month.january = januari
+timeslider.month.february = februari
+timeslider.month.march = maart
+timeslider.month.april = april
+timeslider.month.may = mei
+timeslider.month.june = juni
+timeslider.month.july = juli
+timeslider.month.august = augustus
+timeslider.month.september = september
+timeslider.month.october = oktober
+timeslider.month.november = november
+timeslider.month.december = december
diff --git a/src/locales/sv.ini b/src/locales/sv.ini
index bd3c1e5c..e6844ffb 100644
--- a/src/locales/sv.ini
+++ b/src/locales/sv.ini
@@ -76,3 +76,18 @@ timeslider.toolbar.returnbutton = Återvänd till blocket
 timeslider.toolbar.authors = Författare:
 timeslider.toolbar.authorsList = Ingen författare
 timeslider.exportCurrent = Exportera aktuell version som:
+timeslider.version = Version {{version}}
+timeslider.saved = Sparades den {{day}} {{month}} {{year}}
+timeslider.dateformat = {{day}}/{{month}}/{{year}} {{hours}}:{{minutes}}:{{seconds}}
+timeslider.month.january = januari
+timeslider.month.february = februari
+timeslider.month.march = mars
+timeslider.month.april = april
+timeslider.month.may = maj
+timeslider.month.june = juni
+timeslider.month.july = juli
+timeslider.month.august = augusti
+timeslider.month.september = september
+timeslider.month.october = oktober
+timeslider.month.november = november
+timeslider.month.december = december

From 3cdf66c2f77d6aa57f38635492464ecc4a2059f7 Mon Sep 17 00:00:00 2001
From: root <john@mclear.co.uk>
Date: Sun, 2 Dec 2012 17:03:56 +0000
Subject: [PATCH 14/33] first effort to move into templates but javascript is
 broken so dont pull

---
 src/static/css/pad.css | 13 +++++++++++++
 src/static/js/pad.js   | 25 +++++++++++++++++--------
 src/templates/pad.html | 14 +++++++++++++-
 3 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/src/static/css/pad.css b/src/static/css/pad.css
index 01a19514..6f96b92d 100644
--- a/src/static/css/pad.css
+++ b/src/static/css/pad.css
@@ -22,6 +22,7 @@ iframe {
 .readonly .acl-write {
   display: none;
 }
+
 #users {
   background: #f7f7f7;
   background: -webkit-linear-gradient( #F7F7F7,#EEE);
@@ -891,3 +892,15 @@ input[type=checkbox] {
       line-height: 24px
     }
 }
+
+#passwordRequired{
+  display:none;
+}
+
+#permissionDenied{
+  display:none;
+}
+
+#wrongPassword{
+  display:none;
+}
diff --git a/src/static/js/pad.js b/src/static/js/pad.js
index 936298ab..bfe8bf8c 100644
--- a/src/static/js/pad.js
+++ b/src/static/js/pad.js
@@ -298,30 +298,39 @@ function handshake()
     //the access was not granted, give the user a message
     if(!receivedClientVars && obj.accessStatus)
     {
+      $('.passForm').submit(function(){
+        // THIS BIT DOESNT WORK
+        alert("I AM BROKEN");
+        padutils.escapeHtml('require('+JSON.stringify(module.id)).savePassword();
+      });
+
       if(obj.accessStatus == "deny")
       {
-        $("#editorloadingbox").html("<b>You do not have permission to access this pad</b>");
+        $('#loading').hide();
+        $("#permissionDenied").show());
       }
       else if(obj.accessStatus == "needPassword")
       {
-        $("#editorloadingbox").html("<b>You need a password to access this pad</b><br>" +
+/*        $("#editorloadingbox").html("<b>You need a password to access this pad</b><br>" +
                                     "<form class='passForm'><input id='passwordinput' type='password' name='password'>"+
                                     "<button type='button' onclick=\"" + padutils.escapeHtml('require('+JSON.stringify(module.id)+").savePassword();") + "\">ok</button></div>");
         $("#passwordinput").focus();
         $(".passForm").submit(function(){
           $('.passForm button').click();
         });
+*/
+        $('#loading').hide();
+        $('#passwordRequired').show();
+        $("#passwordinput").focus();
       }
       else if(obj.accessStatus == "wrongPassword")
       {
-        $("#editorloadingbox").html("<b>Your password was wrong</b><br>" +
-                                    "<form class='passForm'><input id='passwordinput' type='password' name='password'>"+
-                                    "<button type='button' onclick=\"" + padutils.escapeHtml('require('+JSON.stringify(module.id)+").savePassword();") + "\">ok</button></div>");
+        $('#loading').hide();
+        $('#wrongPassword').show();
         $("#passwordinput").focus();
-        $(".passForm").submit(function(){
-          $('.passForm button').click();
-        });
+
       }
+
     }
     
     //if we haven't recieved the clientVars yet, then this message should it be
diff --git a/src/templates/pad.html b/src/templates/pad.html
index 3f3eee4f..402d9003 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -184,7 +184,19 @@
         <div id="editorcontainerbox">
             <div id="editorcontainer"></div>
             <div id="editorloadingbox">
-              <p data-l10n-id="pad.loading">Loading...</p>
+              <div id="passwordRequired">
+                <p data-l10n-id="pad.youneedpasword">You need a password to access this pad</p>
+                <form class='passForm'>
+                  <input id='passwordinput' type='password' name='password'><input type='submit' value='Submit'>
+                </form>
+              </div>
+              <div id="permissionDenied">
+                <p data-l10n-id="pad.youdonthavepermission">You do not have permission to access this pad</p>
+              </div>
+              <div id="wrongPassword">
+                <p data-l10n-id="pad.wrongpassword">Your password was wrong</p>
+              </div>
+              <p data-l10n-id="pad.loading" id="loading">Loading...</p>
               <noscript><strong>Sorry, you have to enable Javascript in order to use this.</strong></noscript>
             </div>
         </div>

From 8a9045b3358ea6b60cdb7d9d8e19ed0cb545d950 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Sun, 2 Dec 2012 18:33:31 +0000
Subject: [PATCH 15/33] remove ssl not enabled message

---
 src/node/hooks/express.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/node/hooks/express.js b/src/node/hooks/express.js
index 2bbb5eec..033bd5e3 100644
--- a/src/node/hooks/express.js
+++ b/src/node/hooks/express.js
@@ -66,8 +66,6 @@ exports.restartServer = function () {
 
   } else {
 
-    console.log( "SSL -- not enabled!" );
-
     var http = require('http');
     server = http.createServer(app);
   }

From b5c263dd37829afc63c0e1ea572954094c4be062 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Mon, 3 Dec 2012 01:41:01 +0000
Subject: [PATCH 16/33] improve search to use description too, bit more cpu
 heavy for thats okay

---
 src/static/js/pluginfw/installer.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/static/js/pluginfw/installer.js b/src/static/js/pluginfw/installer.js
index d668e549..e491f077 100644
--- a/src/static/js/pluginfw/installer.js
+++ b/src/static/js/pluginfw/installer.js
@@ -91,9 +91,12 @@ exports.search = function(query, cache, cb) {
           if (er) return cb(er);
           var res = {};
           var i = 0;
-          for (key in data) {
+          for (key in data) { // for every plugin in the data from npm
             if (   key.indexOf(plugins.prefix) == 0
-                && key.indexOf(query.pattern) != -1) {
+                && key.indexOf(query.pattern) != -1
+                || key.indexOf(plugins.prefix) == 0
+                && data[key].description.indexOf(query.pattern) != -1
+              ) { // If the name contains ep_ and the search string is in the name or description
               i++;
               if (i > query.offset
                   && i <= query.offset + query.limit) {

From 84d154b168f792bd6c95aa9c78df8ddc0d867805 Mon Sep 17 00:00:00 2001
From: root <john@mclear.co.uk>
Date: Mon, 3 Dec 2012 11:35:06 +0000
Subject: [PATCH 17/33] Update strings, add UK strings, fix JS

---
 src/locales/en.ini     |  3 +++
 src/static/js/pad.js   | 12 +-----------
 src/templates/pad.html |  6 +++---
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/locales/en.ini b/src/locales/en.ini
index e542594d..225b16cf 100644
--- a/src/locales/en.ini
+++ b/src/locales/en.ini
@@ -21,6 +21,9 @@ pad.toolbar.showusers.title = Show the users on this pad
 pad.colorpicker.save = Save
 pad.colorpicker.cancel = Cancel
 pad.loading = Loading...
+pad.passwordRequired = You need a password to access this pad
+pad.permissionDenied = You do not have permission to access this pad
+pad.wrongPassword = Your password was wrong
 pad.settings.padSettings = Pad Settings
 pad.settings.myView = My View
 pad.settings.stickychat = Chat always on screen
diff --git a/src/static/js/pad.js b/src/static/js/pad.js
index bfe8bf8c..aef06eff 100644
--- a/src/static/js/pad.js
+++ b/src/static/js/pad.js
@@ -299,9 +299,7 @@ function handshake()
     if(!receivedClientVars && obj.accessStatus)
     {
       $('.passForm').submit(function(){
-        // THIS BIT DOESNT WORK
-        alert("I AM BROKEN");
-        padutils.escapeHtml('require('+JSON.stringify(module.id)).savePassword();
+        require(module.id).savePassword();
       });
 
       if(obj.accessStatus == "deny")
@@ -311,14 +309,6 @@ function handshake()
       }
       else if(obj.accessStatus == "needPassword")
       {
-/*        $("#editorloadingbox").html("<b>You need a password to access this pad</b><br>" +
-                                    "<form class='passForm'><input id='passwordinput' type='password' name='password'>"+
-                                    "<button type='button' onclick=\"" + padutils.escapeHtml('require('+JSON.stringify(module.id)+").savePassword();") + "\">ok</button></div>");
-        $("#passwordinput").focus();
-        $(".passForm").submit(function(){
-          $('.passForm button').click();
-        });
-*/
         $('#loading').hide();
         $('#passwordRequired').show();
         $("#passwordinput").focus();
diff --git a/src/templates/pad.html b/src/templates/pad.html
index e37163e1..d9c6be46 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -185,16 +185,16 @@
             <div id="editorcontainer"></div>
             <div id="editorloadingbox">
               <div id="passwordRequired">
-                <p data-l10n-id="pad.youneedpasword">You need a password to access this pad</p>
+                <p data-l10n-id="pad.passwordRequired">You need a password to access this pad</p>
                 <form class='passForm'>
                   <input id='passwordinput' type='password' name='password'><input type='submit' value='Submit'>
                 </form>
               </div>
               <div id="permissionDenied">
-                <p data-l10n-id="pad.youdonthavepermission">You do not have permission to access this pad</p>
+                <p data-l10n-id="pad.permissionDenied">You do not have permission to access this pad</p>
               </div>
               <div id="wrongPassword">
-                <p data-l10n-id="pad.wrongpassword">Your password was wrong</p>
+                <p data-l10n-id="pad.wrongPassword">Your password was wrong</p>
               </div>
               <p data-l10n-id="pad.loading" id="loading">Loading...</p>
               <noscript><strong>Sorry, you have to enable Javascript in order to use this.</strong></noscript>

From b0463bd7d5c64b25cff95718e9b529320a10586e Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Mon, 3 Dec 2012 11:41:51 +0000
Subject: [PATCH 18/33] whoopsi

---
 src/static/js/pad.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/static/js/pad.js b/src/static/js/pad.js
index aef06eff..54d44278 100644
--- a/src/static/js/pad.js
+++ b/src/static/js/pad.js
@@ -298,14 +298,12 @@ function handshake()
     //the access was not granted, give the user a message
     if(!receivedClientVars && obj.accessStatus)
     {
-      $('.passForm').submit(function(){
-        require(module.id).savePassword();
-      });
+      $('.passForm').submit(pad.savePassword);
 
       if(obj.accessStatus == "deny")
       {
         $('#loading').hide();
-        $("#permissionDenied").show());
+        $("#permissionDenied").show();
       }
       else if(obj.accessStatus == "needPassword")
       {
@@ -318,9 +316,7 @@ function handshake()
         $('#loading').hide();
         $('#wrongPassword').show();
         $("#passwordinput").focus();
-
       }
-
     }
     
     //if we haven't recieved the clientVars yet, then this message should it be

From 4843840d72095229e022b81629fb6639ef201946 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Mon, 3 Dec 2012 11:44:30 +0000
Subject: [PATCH 19/33] last JS fix

---
 src/static/js/pad.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/static/js/pad.js b/src/static/js/pad.js
index 54d44278..316802bf 100644
--- a/src/static/js/pad.js
+++ b/src/static/js/pad.js
@@ -298,7 +298,7 @@ function handshake()
     //the access was not granted, give the user a message
     if(!receivedClientVars && obj.accessStatus)
     {
-      $('.passForm').submit(pad.savePassword);
+      $('.passForm').submit(require(module.id).savePassword);
 
       if(obj.accessStatus == "deny")
       {

From d09894ce779e1b55970514d1318119dd2485da44 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Mon, 3 Dec 2012 12:05:11 +0000
Subject: [PATCH 20/33] make it show password dialog on wrong password

---
 src/static/js/pad.js       |  1 +
 src/static/js/pad_utils.js | 12 +++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/static/js/pad.js b/src/static/js/pad.js
index 316802bf..d380a8dc 100644
--- a/src/static/js/pad.js
+++ b/src/static/js/pad.js
@@ -315,6 +315,7 @@ function handshake()
       {
         $('#loading').hide();
         $('#wrongPassword').show();
+        $('#passwordRequired').show();
         $("#passwordinput").focus();
       }
     }
diff --git a/src/static/js/pad_utils.js b/src/static/js/pad_utils.js
index 83ee9aae..f752722f 100644
--- a/src/static/js/pad_utils.js
+++ b/src/static/js/pad_utils.js
@@ -52,7 +52,17 @@ function createCookie(name, value, days, path)
   if(!path)
     path = "/";
 
-  document.cookie = name + "=" + value + expires + "; path=" + path;
+  if(!path)
+    path = "/";
+
+  //Check if the browser is IE and if so make sure the full path is set in the cookie
+  if(navigator.appName=='Microsoft Internet Explorer'){
+    document.cookie = name + "=" + value + expires + "; path="+document.location;
+  }
+  else{
+    document.cookie = name + "=" + value + expires + "; path=" + path;
+  }
+
 }
 
 function readCookie(name)

From 0b92fdfc628656f9d7b562d62733778f144e65d9 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Mon, 3 Dec 2012 12:47:11 +0000
Subject: [PATCH 21/33] fix IE auth but only a temp fix

---
 src/static/js/pad_utils.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/static/js/pad_utils.js b/src/static/js/pad_utils.js
index f752722f..59c3d419 100644
--- a/src/static/js/pad_utils.js
+++ b/src/static/js/pad_utils.js
@@ -52,8 +52,9 @@ function createCookie(name, value, days, path)
   if(!path)
     path = "/";
 
-  if(!path)
-    path = "/";
+  // This fixes an issue with IE not wanting to store cookies for Auth #1234.  It's a temp fix because 
+  // Really we should be storing the cookie on teh document.location path and not modifying the fsking URL to contain a password!
+  document.cookie = name + "=" + value + expires + "; path=" + "/";
 
   //Check if the browser is IE and if so make sure the full path is set in the cookie
   if(navigator.appName=='Microsoft Internet Explorer'){

From b3e55f64a86951ddd25243c4b593cf61ec109c4c Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Mon, 3 Dec 2012 13:10:32 +0000
Subject: [PATCH 22/33] stop password being clearly visible

---
 src/static/js/pad.js       | 1 +
 src/static/js/pad_utils.js | 2 +-
 src/templates/pad.html     | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/static/js/pad.js b/src/static/js/pad.js
index d380a8dc..cace9bf7 100644
--- a/src/static/js/pad.js
+++ b/src/static/js/pad.js
@@ -202,6 +202,7 @@ function savePassword()
   createCookie("password",$("#passwordinput").val(),null,document.location.pathname);
   //reload
   document.location=document.location;
+  return false;
 }
 
 function handshake()
diff --git a/src/static/js/pad_utils.js b/src/static/js/pad_utils.js
index 59c3d419..7c97b035 100644
--- a/src/static/js/pad_utils.js
+++ b/src/static/js/pad_utils.js
@@ -54,7 +54,7 @@ function createCookie(name, value, days, path)
 
   // This fixes an issue with IE not wanting to store cookies for Auth #1234.  It's a temp fix because 
   // Really we should be storing the cookie on teh document.location path and not modifying the fsking URL to contain a password!
-  document.cookie = name + "=" + value + expires + "; path=" + "/";
+  // document.cookie = name + "=" + value + expires + "; path=" + "/";
 
   //Check if the browser is IE and if so make sure the full path is set in the cookie
   if(navigator.appName=='Microsoft Internet Explorer'){
diff --git a/src/templates/pad.html b/src/templates/pad.html
index 896a62f6..a392980a 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -186,7 +186,7 @@
             <div id="editorloadingbox">
               <div id="passwordRequired">
                 <p data-l10n-id="pad.passwordRequired">You need a password to access this pad</p>
-                <form class='passForm'>
+                <form class='passForm' method='POST'>
                   <input id='passwordinput' type='password' name='password'><input type='submit' value='Submit'>
                 </form>
               </div>

From 1e8d954560bc7e475d73ce9e4df82ffeb2492c80 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Mon, 3 Dec 2012 14:28:25 +0000
Subject: [PATCH 23/33] best I can do with this temporary fix for IE

---
 src/static/js/pad.js       | 10 ++++++----
 src/static/js/pad_utils.js | 16 +++++++---------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/static/js/pad.js b/src/static/js/pad.js
index cace9bf7..9ad701b3 100644
--- a/src/static/js/pad.js
+++ b/src/static/js/pad.js
@@ -51,18 +51,20 @@ var randomString = require('./pad_utils').randomString;
 
 var hooks = require('./pluginfw/hooks');
 
-function createCookie(name, value, days, path)
-{
+function createCookie(name, value, days, path){ /* Warning Internet Explorer doesn't use this it uses the one from pad_utils.js */
   if (days)
   {
     var date = new Date();
     date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
     var expires = "; expires=" + date.toGMTString();
   }
-  else var expires = "";
+  else{
+    var expires = "";
+  }
   
-  if(!path)
+  if(!path){ // If the path isn't set then just whack the cookie on the root path
     path = "/";
+  }
   
   //Check if the browser is IE and if so make sure the full path is set in the cookie
   if(navigator.appName=='Microsoft Internet Explorer'){
diff --git a/src/static/js/pad_utils.js b/src/static/js/pad_utils.js
index 7c97b035..82f7fcad 100644
--- a/src/static/js/pad_utils.js
+++ b/src/static/js/pad_utils.js
@@ -39,26 +39,24 @@ function randomString(len)
   return randomstring;
 }
 
-function createCookie(name, value, days, path)
-{
+function createCookie(name, value, days, path){ /* Used by IE */
   if (days)
   {
     var date = new Date();
     date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
     var expires = "; expires=" + date.toGMTString();
   }
-  else var expires = "";
+  else{
+    var expires = "";
+  }
 
-  if(!path)
+  if(!path){ // IF the Path of the cookie isn't set then just create it on root
     path = "/";
-
-  // This fixes an issue with IE not wanting to store cookies for Auth #1234.  It's a temp fix because 
-  // Really we should be storing the cookie on teh document.location path and not modifying the fsking URL to contain a password!
-  // document.cookie = name + "=" + value + expires + "; path=" + "/";
+  }
 
   //Check if the browser is IE and if so make sure the full path is set in the cookie
   if(navigator.appName=='Microsoft Internet Explorer'){
-    document.cookie = name + "=" + value + expires + "; path="+document.location;
+    document.cookie = name + "=" + value + expires + "; path=/"; /* Note this bodge fix for IE is temporary until auth is rewritten */
   }
   else{
     document.cookie = name + "=" + value + expires + "; path=" + path;

From 5f949b8457154d5b75a79765565977e8cbdf1e8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Eixarch?= <miao.org@gmail.com>
Date: Tue, 4 Dec 2012 12:12:58 +0100
Subject: [PATCH 24/33] Update language4translatewiki 0.1.3

---
 src/node/hooks/i18n.js | 43 +++++++++++++-----------------------------
 src/package.json       |  3 ++-
 2 files changed, 15 insertions(+), 31 deletions(-)

diff --git a/src/node/hooks/i18n.js b/src/node/hooks/i18n.js
index 3589dfb2..882e5156 100644
--- a/src/node/hooks/i18n.js
+++ b/src/node/hooks/i18n.js
@@ -1,4 +1,4 @@
-var http = require ('http')
+var languages = require('languages4translatewiki')
   , fs = require('fs')
   , path = require('path')
   , express = require('express')
@@ -10,37 +10,20 @@ var localeIndex = fs.readFileSync(localesPath+'/en.ini')+'\r\n';
 
 exports.availableLangs = {'en': {'nativeName': 'English'}};
 
-// build availableLangs with translatewiki web API
-var request = http.request ('http://translatewiki.net/w/api.php?action=query&meta=siteinfo&siprop=languages&format=json',
-  function (res) {
-    var twLangs = '';
-    res.setEncoding ('utf8');
-    res.on ('data', function (chunk) { twLangs += chunk; });
-    res.on ('end', function () {
-      // twLangs = [{code: 'en', '*': 'English'}...] 
-      twLangs = JSON.parse(twLangs)['query']['languages'];
+fs.readdir(localesPath, function(er, files) {
+  files.forEach(function(locale) {
+    var ext = path.extname(locale);
+    locale = path.basename(locale, ext).toLowerCase();
+    if(locale == 'en' || ext != '.ini') return;
 
-      fs.readdir(localesPath, function(er, files) {
-        files.forEach(function(locale) {
-          locale = locale.split('.')[0];
-          if(locale.toLowerCase() == 'en') return;
-
-          // build locale index
-          localeIndex += '['+locale+']\r\n@import url(locales/'+locale+'.ini)\r\n';
+    // build locale index
+    localeIndex += '['+locale+']\r\n@import url(locales/'+locale+'.ini)\r\n'
     
-          for (var l = 0; l < twLangs.length; l++) {
-            var code = twLangs[l]['code'];
-            if (locale == code) {
-              var nativeName = twLangs[l]['*'];
-              exports.availableLangs[code] = {'nativeName': nativeName};
-            }
-          }
-        });
-      });
-    });
-  }).on ('error', function(e) {
-    console.error('While query translatewiki API: '+e.message);
-  }).end();
+    // add info language {nativeName, direction} to availableLangs
+    exports.availableLangs[locale]=languages.getLanguageInfo(locale);
+  })
+})
+
 
 exports.expressCreateServer = function(n, args) {
 
diff --git a/src/package.json b/src/package.json
index e6805353..d2b03a97 100644
--- a/src/package.json
+++ b/src/package.json
@@ -35,7 +35,8 @@
                       "security"                : "1.0.0",
                       "tinycon"                 : "0.0.1",
                       "underscore"              : "1.3.1",
-                      "unorm"                   : "1.0.0"
+                      "unorm"                   : "1.0.0",
+                      "languages4translatewiki" : "0.1.3"
                      },
   "bin":             { "etherpad-lite": "./node/server.js" },
   "devDependencies": {

From a2b22652ceee934682f84bffa43d3b6d0df27fcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Eixarch?= <miao.org@gmail.com>
Date: Tue, 4 Dec 2012 13:02:23 +0100
Subject: [PATCH 25/33] added direction language in English

---
 src/node/hooks/i18n.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/node/hooks/i18n.js b/src/node/hooks/i18n.js
index 882e5156..a45d46fe 100644
--- a/src/node/hooks/i18n.js
+++ b/src/node/hooks/i18n.js
@@ -8,7 +8,7 @@ var localesPath = __dirname+"/../../locales";
 // Serve English strings directly with /locales.ini
 var localeIndex = fs.readFileSync(localesPath+'/en.ini')+'\r\n';
 
-exports.availableLangs = {'en': {'nativeName': 'English'}};
+exports.availableLangs = {'en': {'nativeName': 'English', 'direction': 'ltr'}};
 
 fs.readdir(localesPath, function(er, files) {
   files.forEach(function(locale) {

From 1fc5519c86dd95136471149e0ae99a4c0c5ca4e2 Mon Sep 17 00:00:00 2001
From: 0ip <me@factor.cc>
Date: Tue, 4 Dec 2012 14:30:30 +0100
Subject: [PATCH 26/33] Display plugin versions

---
 src/static/js/admin/plugins.js   | 4 ++++
 src/templates/admin/plugins.html | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/src/static/js/admin/plugins.js b/src/static/js/admin/plugins.js
index 93acf6ea..a279498f 100644
--- a/src/static/js/admin/plugins.js
+++ b/src/static/js/admin/plugins.js
@@ -113,10 +113,14 @@ $(document).ready(function () {
     for (plugin_name in data.results) {
       var plugin = data.results[plugin_name];
       var row = widget.find(".template tr").clone();
+      var version = '0.0.0';
+      for (version in data.results[plugin_name].versions) break;
 
       for (attr in plugin) {
         row.find("." + attr).html(plugin[attr]);
       }
+      row.find(".version").html(version);
+      
       widget.find(".results").append(row);
     }
 
diff --git a/src/templates/admin/plugins.html b/src/templates/admin/plugins.html
index 3dad3bd0..394cf0e0 100644
--- a/src/templates/admin/plugins.html
+++ b/src/templates/admin/plugins.html
@@ -30,6 +30,7 @@
           <tr>
             <th>Name</th>
             <th>Description</th>
+            <th>Version</th>
             <td></td>
           </tr>
         </thead>
@@ -37,6 +38,7 @@
           <tr id="installed-plugin-template">
             <td class="name"></td>
             <td class="description"></td>
+              <td class="version"></td>
             <td class="actions">
               <input type="button" value="Uninstall" class="do-uninstall">
             </td>
@@ -58,6 +60,7 @@
             <tr>
               <th>Name</th>
               <th>Description</th>
+              <th>Version</th>
               <td></td>
             </tr>
           </thead>
@@ -65,6 +68,7 @@
             <tr>
               <td class="name"></td>
               <td class="description"></td>
+              <td class="version"></td>
               <td class="actions">
                 <input type="button" value="Install" class="do-install">
              </td>

From 20f13bc8cedb3721d64af6da9214df150959218c Mon Sep 17 00:00:00 2001
From: 0ip <me@factor.cc>
Date: Tue, 4 Dec 2012 19:08:25 +0100
Subject: [PATCH 27/33] Add comment to explain how the property containing the
 version is being read

---
 src/static/js/admin/plugins.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/static/js/admin/plugins.js b/src/static/js/admin/plugins.js
index a279498f..61852028 100644
--- a/src/static/js/admin/plugins.js
+++ b/src/static/js/admin/plugins.js
@@ -114,6 +114,7 @@ $(document).ready(function () {
       var plugin = data.results[plugin_name];
       var row = widget.find(".template tr").clone();
       var version = '0.0.0';
+      // hack to access "versions" property of the npm package object
       for (version in data.results[plugin_name].versions) break;
 
       for (attr in plugin) {

From 8d0ef88baf3fc815916cef66b8636060209bdb33 Mon Sep 17 00:00:00 2001
From: 0ip <me@factor.cc>
Date: Wed, 5 Dec 2012 12:55:48 +0100
Subject: [PATCH 28/33] Adjust select width

looks better :)
---
 src/static/css/pad.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/static/css/pad.css b/src/static/css/pad.css
index 9897a303..bb8da99b 100644
--- a/src/static/css/pad.css
+++ b/src/static/css/pad.css
@@ -774,7 +774,7 @@ input[type=checkbox] {
   border-radius: 3px;
   border: 1px solid #ccc;
   outline: none;
-  min-width: 105px;
+  width: 120px;
 }
 .column {
   float: left;

From 377ff1eadeed90bd1295597df996a575840254c9 Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Wed, 5 Dec 2012 14:04:48 +0100
Subject: [PATCH 29/33] Fix #1219: Make api work if requireAuth is enabled

---
 src/node/hooks/express/webaccess.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/node/hooks/express/webaccess.js b/src/node/hooks/express/webaccess.js
index 41bf3880..50323ef6 100644
--- a/src/node/hooks/express/webaccess.js
+++ b/src/node/hooks/express/webaccess.js
@@ -15,8 +15,8 @@ exports.basicAuth = function (req, res, next) {
   }
 
   var authorize = function (cb) {
-    // Do not require auth for static paths...this could be a bit brittle
-    if (req.path.match(/^\/(static|javascripts|pluginfw)/)) return cb(true);
+    // Do not require auth for static paths and the API...this could be a bit brittle
+    if (req.path.match(/^\/(static|javascripts|pluginfw|api)/)) return cb(true);
 
     if (req.path.indexOf('/admin') != 0) {
       if (!settings.requireAuthentication) return cb(true);

From fe89a367cc02063586571ce64964bc691a4ac542 Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Wed, 5 Dec 2012 14:16:44 +0100
Subject: [PATCH 30/33] Fix #1226: Chrome would load async js

---
 src/templates/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/templates/index.html b/src/templates/index.html
index 9fd33a26..961c6012 100644
--- a/src/templates/index.html
+++ b/src/templates/index.html
@@ -41,7 +41,7 @@
               if(language) document.documentElement.lang = language[1];
             })(document)
         </script>
-        <script type="text/javascript" src="static/js/l10n.js" async></script>
+        <script type="text/javascript" src="static/js/l10n.js"></script>
 
         <style>
             html, body {

From c853f8fad24b20ac10d60aab4ec875d5ff3b122a Mon Sep 17 00:00:00 2001
From: Guillaume AMAT <guillaume.amat@informatique-libre.com>
Date: Wed, 5 Dec 2012 15:02:32 +0100
Subject: [PATCH 31/33] Reduces the width of the file input to prevent overflow
 in the import popup

---
 src/templates/pad.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/templates/pad.html b/src/templates/pad.html
index a392980a..ba4e777a 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -262,7 +262,7 @@
                 <div class="importmessage" id="importmessageabiword" data-l10n-id="pad.importExport.abiword"></div><br>
                 <form id="importform" method="post" action="" target="importiframe" enctype="multipart/form-data">
                     <div class="importformdiv" id="importformfilediv">
-                        <input type="file" name="file" size="15" id="importfileinput">
+                        <input type="file" name="file" size="10" id="importfileinput">
                         <div class="importmessage" id="importmessagefail"></div>
                     </div>
                     <div id="import"></div>

From 4ce16b526ea6573fb739247a1bf732c29c455dc8 Mon Sep 17 00:00:00 2001
From: goldquest <tjwelde@gmail.com>
Date: Thu, 6 Dec 2012 02:00:58 +0100
Subject: [PATCH 32/33] Added semicolons

---
 src/node/db/SecurityManager.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/node/db/SecurityManager.js b/src/node/db/SecurityManager.js
index 59e27b55..7cbb367d 100644
--- a/src/node/db/SecurityManager.js
+++ b/src/node/db/SecurityManager.js
@@ -25,7 +25,7 @@ var async = require("async");
 var authorManager = require("./AuthorManager");
 var padManager = require("./PadManager");
 var sessionManager = require("./SessionManager");
-var settings = require("../utils/Settings")
+var settings = require("../utils/Settings");
 var randomString = require('ep_etherpad-lite/static/js/pad_utils').randomString;
 
 /**
@@ -83,7 +83,7 @@ exports.checkAccess = function (padID, sessionCookie, token, password, callback)
           // grant access, with author of token
           callback(null, statusObject);
         }
-      })
+      });
       
       //don't continue
       return;
@@ -282,4 +282,4 @@ exports.checkAccess = function (padID, sessionCookie, token, password, callback)
     if(ERR(err, callback)) return;
     callback(null, statusObject);
   });
-}
+};

From 76310961358debf6a78545202d533835dcdf844f Mon Sep 17 00:00:00 2001
From: goldquest <tjwelde@gmail.com>
Date: Thu, 6 Dec 2012 02:01:38 +0100
Subject: [PATCH 33/33] fix for multiple cookies support (Also fix for, when
 session is not valid anymore)

---
 src/node/db/SecurityManager.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/node/db/SecurityManager.js b/src/node/db/SecurityManager.js
index 7cbb367d..4289e39c 100644
--- a/src/node/db/SecurityManager.js
+++ b/src/node/db/SecurityManager.js
@@ -133,10 +133,16 @@ exports.checkAccess = function (padID, sessionCookie, token, password, callback)
               var now = Math.floor(new Date().getTime()/1000);
               
               //is it for this group?
-              if(sessionInfo.groupID != groupID) return;
+              if(sessionInfo.groupID != groupID) {
+            	  callback();
+            	  return;
+              }
               
               //is validUntil still ok?
-              if(sessionInfo.validUntil <= now) return;
+              if(sessionInfo.validUntil <= now){
+            	  callback();
+            	  return;
+              }
               
               // There is a valid session
               validSession = true;