From 2aaf80c8809a0a91a87f56e3f217869071dc8d68 Mon Sep 17 00:00:00 2001
From: Peter 'Pita' Martischka <petermartischka@googlemail.com>
Date: Wed, 14 Nov 2012 09:27:21 -0800
Subject: [PATCH 01/31] Initial commit

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 00000000..33021bd7
--- /dev/null
+++ b/README.md
@@ -0,0 +1,4 @@
+etherpad-lite
+=============
+
+Etherpad Lite
\ No newline at end of file

From a5c4fb154f7414cd5dca9e50c3f2ad00e42672f5 Mon Sep 17 00:00:00 2001
From: Peter 'Pita' Martischka <petermartischka@googlemail.com>
Date: Wed, 14 Nov 2012 09:29:49 -0800
Subject: [PATCH 02/31] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 33021bd7..95dfee26 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-etherpad-lite
+We moved!
 =============
 
-Etherpad Lite
\ No newline at end of file
+You can now find Etherpad Lite under [github.com/ether/etherpad-lite](https://github.com/ether/etherpad-lite)
\ No newline at end of file

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 03/31] 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 04/31] 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 05/31] 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 06/31] 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 6239c66e3639bfed8345dabf304c4f4578dd67ed Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Mon, 26 Nov 2012 20:19:27 +0000
Subject: [PATCH 07/31] remove alert on line wrap as it doesnt mean anything

---
 src/static/js/ace2_inner.js | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js
index 661ea011..b3bc91a9 100644
--- a/src/static/js/ace2_inner.js
+++ b/src/static/js/ace2_inner.js
@@ -333,14 +333,6 @@ function Ace2Inner(){
     return colorutils.triple2css(color);
   }
 
-  function doAlert(str)
-  {
-    scheduler.setTimeout(function()
-    {
-      alert(str);
-    }, 0);
-  }
-
   editorInfo.ace_getRep = function()
   {
     return rep;
@@ -1624,7 +1616,7 @@ function Ace2Inner(){
 
         if (linesWrapped > 0)
         {
-          doAlert("Editor warning: " + linesWrapped + " long line" + (linesWrapped == 1 ? " was" : "s were") + " hard-wrapped into " + ccData.numLinesAfter + " lines.");
+          // console.log("Editor warning: " + linesWrapped + " long line" + (linesWrapped == 1 ? " was" : "s were") + " hard-wrapped into " + ccData.numLinesAfter + " lines.");
         }
 
         if (ss[0] >= 0) selStart = [ss[0] + a + netNumLinesChangeSoFar, ss[1]];

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 08/31] 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 09/31] 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 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 10/31] 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 bf26f60bac93b104cef2986a45ac51b000674b64 Mon Sep 17 00:00:00 2001
From: Manuel Knitza <manuel.knitza@uni.kn>
Date: Tue, 27 Nov 2012 09:59:47 +0100
Subject: [PATCH 11/31] Update doc/api/http_api.md

As EPL moved from "Pita" to "ether" the edited link had to be changed.
---
 doc/api/http_api.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/api/http_api.md b/doc/api/http_api.md
index 990d1b49..7ace1b0b 100644
--- a/doc/api/http_api.md
+++ b/doc/api/http_api.md
@@ -9,7 +9,7 @@ The API gives another web application control of the pads. The basic functions a
 
 The API is designed in a way, so you can reuse your existing user system with their permissions, and map it to etherpad lite. Means: Your web application still has to do authentication, but you can tell etherpad lite via the api, which visitors should get which permissions. This allows etherpad lite to fit into any web application and extend it with real-time functionality. You can embed the pads via an iframe into your website.
 
-Take a look at [HTTP API client libraries](https://github.com/Pita/etherpad-lite/wiki/HTTP-API-client-libraries) to see if a library in your favorite language.
+Take a look at [HTTP API client libraries](https://github.com/ether/etherpad-lite/wiki/HTTP-API-client-libraries) to see if a library in your favorite language.
 
 ## Examples
 

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 12/31] 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 8c7939ec9f18da05bb58da0b43d805948c9cc9b9 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Wed, 28 Nov 2012 17:17:35 +0000
Subject: [PATCH 13/31] catch control S and send an event to save a revision

---
 src/static/js/ace2_inner.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js
index b3bc91a9..9290fd56 100644
--- a/src/static/js/ace2_inner.js
+++ b/src/static/js/ace2_inner.js
@@ -3537,7 +3537,7 @@ function Ace2Inner(){
     var keyCode = evt.keyCode;
     var which = evt.which;
 
-    // prevent ESC key
+    // prevent ESC key and Control S
     if (keyCode == 27)
     {
       evt.preventDefault();
@@ -3562,7 +3562,7 @@ function Ace2Inner(){
     inCallStackIfNecessary("handleKeyEvent", function()
     {
 
-      if (type == "keypress" || (isTypeForSpecialKey && keyCode == 13 /*return*/ ))
+      if (type == "keypress" || (isTypeForSpecialKey && keyCode == 13 || keyCode == 83 /*return*/ ))
       {
         // in IE, special keys don't send keypress, the keydown does the action
         if (!outsideKeyPress(evt))
@@ -3575,7 +3575,6 @@ function Ace2Inner(){
       {
         outsideKeyDown(evt);
       }
-
       if (!stopped)
       {
         var specialHandledInHook = hooks.callAll('aceKeyEvent', {
@@ -3614,6 +3613,12 @@ function Ace2Inner(){
           }, 0);
           specialHandled = true;
         }
+        if ((!specialHandled) && isTypeForSpecialKey && keyCode == 83)
+        {
+          evt.preventDefault();
+          parent.parent.pad.collabClient.sendMessage({"type":"SAVE_REVISION"}); /* The parent.parent part of this is BAD and I feel bad..  It may break something */
+          specialHandled = true;
+        }
         if ((!specialHandled) && isTypeForSpecialKey && keyCode == 9 && !(evt.metaKey || evt.ctrlKey))
         {
           // tab

From 93e9d7c852be597b3793106069ef8adc5d80734c Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Wed, 28 Nov 2012 17:20:58 +0000
Subject: [PATCH 14/31] remove control S comment

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

diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js
index 9290fd56..da646b7e 100644
--- a/src/static/js/ace2_inner.js
+++ b/src/static/js/ace2_inner.js
@@ -3537,7 +3537,7 @@ function Ace2Inner(){
     var keyCode = evt.keyCode;
     var which = evt.which;
 
-    // prevent ESC key and Control S
+    // prevent ESC key
     if (keyCode == 27)
     {
       evt.preventDefault();

From 719fb7e04508f74b64bd0c4ed9bf8119f35686bf Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Thu, 29 Nov 2012 13:42:37 +0100
Subject: [PATCH 15/31] Let socket.io decide which transport is best for the
 browser

---
 src/node/hooks/express/socketio.js | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/node/hooks/express/socketio.js b/src/node/hooks/express/socketio.js
index 546ba2af..c2b9ff6c 100644
--- a/src/node/hooks/express/socketio.js
+++ b/src/node/hooks/express/socketio.js
@@ -36,13 +36,10 @@ exports.expressCreateServer = function (hook_name, args, cb) {
     });
   });
 
-  // the following has been successfully tested with the following browsers 
-  // works also behind reverse proxy
-  // Firefox 14.0.1
-  // IE8 with Native XMLHTTP support
-  // IE8 without Native XMLHTTP support
-  // Chrome 21.0.1180.79
-  io.set('transports', ['jsonp-polling']);
+  // there shouldn#t be a browser that isn't compatible to all 
+  // transports in this list at once
+  // e.g. XHR is disabled in IE by default, so in IE it should use jsonp-polling
+  io.set('transports', ['xhr-polling', 'jsonp-polling', 'htmlfile']);
 
   var socketIOLogger = log4js.getLogger("socket.io");
   io.set('logger', {

From d76100358840e24079a523b7b9c8d135370878ef Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Fri, 30 Nov 2012 22:50:54 +0000
Subject: [PATCH 16/31] fix path to favicon resolves #1236

---
 src/node/utils/Settings.js    | 2 ++
 src/templates/pad.html        | 2 +-
 src/templates/timeslider.html | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/node/utils/Settings.js b/src/node/utils/Settings.js
index 9caa2b0b..fb2a592c 100644
--- a/src/node/utils/Settings.js
+++ b/src/node/utils/Settings.js
@@ -38,6 +38,8 @@ exports.title = "Etherpad Lite";
  * The app favicon fully specified url, visible e.g. in the browser window
  */
 exports.favicon = "favicon.ico";
+exports.faviconPad = "../" + exports.favicon;
+exports.faviconTimeslider = "../../" + exports.favicon;
 
 /**
  * The IP ep-lite should listen to
diff --git a/src/templates/pad.html b/src/templates/pad.html
index 3f3eee4f..c1300d5e 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -32,7 +32,7 @@
         <meta charset="utf-8">
         <meta name="robots" content="noindex, nofollow">
         <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0">
-        <link rel="shortcut icon" href="<%=settings.favicon%>">
+        <link rel="shortcut icon" href="<%=settings.faviconPad%>">
 
         <link rel="resource" type="application/l10n" href="../locales.ini" />
         <script type="text/javascript">
diff --git a/src/templates/timeslider.html b/src/templates/timeslider.html
index dfeee16c..281fa01b 100644
--- a/src/templates/timeslider.html
+++ b/src/templates/timeslider.html
@@ -31,7 +31,7 @@
 <head>
   <meta charset="utf-8">
   <meta name="robots" content="noindex, nofollow">
-  <link rel="shortcut icon" href="<%=settings.favicon%>">
+  <link rel="shortcut icon" href="<%=settings.faviconTimeslider%>">
   <link rel="resource" type="application/l10n" href="../../locales.ini" />
   
   <script type="text/javascript">

From a4c4d11cd4dde56d164bdcc86c0d6e088b24aa8b Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Fri, 30 Nov 2012 15:26:51 -0800
Subject: [PATCH 17/31] fix letter s...

---
 src/static/js/ace2_inner.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js
index da646b7e..f7c4cc5c 100644
--- a/src/static/js/ace2_inner.js
+++ b/src/static/js/ace2_inner.js
@@ -3561,8 +3561,7 @@ function Ace2Inner(){
 
     inCallStackIfNecessary("handleKeyEvent", function()
     {
-
-      if (type == "keypress" || (isTypeForSpecialKey && keyCode == 13 || keyCode == 83 /*return*/ ))
+      if (type == "keypress" || (isTypeForSpecialKey && keyCode == 13 /*return*/ ))
       {
         // in IE, special keys don't send keypress, the keydown does the action
         if (!outsideKeyPress(evt))

From 3dcbd8dd4ed66bd20291ca00f156c3258bc3b3a9 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Fri, 30 Nov 2012 23:28:34 +0000
Subject: [PATCH 18/31] fix the control S to save a revision

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

diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js
index f7c4cc5c..87132603 100644
--- a/src/static/js/ace2_inner.js
+++ b/src/static/js/ace2_inner.js
@@ -3612,7 +3612,7 @@ function Ace2Inner(){
           }, 0);
           specialHandled = true;
         }
-        if ((!specialHandled) && isTypeForSpecialKey && keyCode == 83)
+        if ((!specialHandled) && isTypeForCmdKey && String.fromCharCode(which).toLowerCase() == "s" && (evt.metaKey || evt.ctrlKey)) /* Do a saved revision on ctrl S */
         {
           evt.preventDefault();
           parent.parent.pad.collabClient.sendMessage({"type":"SAVE_REVISION"}); /* The parent.parent part of this is BAD and I feel bad..  It may break something */

From eb93ce2aa66a04b345a7ce640e9877b3c3090bcf Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Fri, 30 Nov 2012 23:33:22 +0000
Subject: [PATCH 19/31]  a test for adding any letter from alphabet can be
 extended to include foreign cahrs infact please DO THIS

---
 tests/frontend/specs/keystroke_alphabet.js | 27 ++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 tests/frontend/specs/keystroke_alphabet.js

diff --git a/tests/frontend/specs/keystroke_alphabet.js b/tests/frontend/specs/keystroke_alphabet.js
new file mode 100644
index 00000000..131a81c0
--- /dev/null
+++ b/tests/frontend/specs/keystroke_alphabet.js
@@ -0,0 +1,27 @@
+describe("All the alphabet works n stuff", function(){
+  var expectedString = "abcdefghijklmnopqrstuvwxyz";
+
+  //create a new pad before each test run
+  beforeEach(function(cb){
+    helper.newPad(cb);
+    this.timeout(60000);
+  });
+
+  it("when you enter any char it appears right", function(done) {
+    var inner$ = helper.padInner$; 
+    var chrome$ = helper.padChrome$; 
+    
+    //get the first text element out of the inner iframe
+    var firstTextElement = inner$("div").first();
+    
+    // simulate key presses to delete content
+    firstTextElement.sendkeys('{selectall}'); // select all
+    firstTextElement.sendkeys('{del}'); // clear the first line
+    firstTextElement.sendkeys(expectedString); // insert the string
+	  
+    helper.waitFor(function(){
+      return inner$("div").first().text() === expectedString;
+    }, 2000).done(done);
+  });
+
+});

From d4b79a6cba86b22d236332e50d2f89f21ad65b00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Laxstr=C3=B6m?= <niklas.laxstrom@gmail.com>
Date: Sat, 1 Dec 2012 11:32:26 +0000
Subject: [PATCH 20/31] Localisation updates from http://translatewiki.net.

---
 src/locales/ar.ini  | 56 +++++++++++++++++++++++++++++++
 src/locales/ast.ini | 78 +++++++++++++++++++++++++++++++++++++++++++
 src/locales/azb.ini | 71 ++++++++++++++++++++++++++++++++++++++++
 src/locales/da.ini  | 79 ++++++++++++++++++++++++++++++++++++++++++++
 src/locales/de.ini  | 10 +++---
 src/locales/el.ini  | 80 +++++++++++++++++++++++++++++++++++++++++++++
 src/locales/es.ini  |  7 ++--
 src/locales/fi.ini  | 22 +++++++++++--
 src/locales/fr.ini  | 37 +++++++++++----------
 src/locales/gl.ini  | 78 +++++++++++++++++++++++++++++++++++++++++++
 src/locales/hu.ini  | 11 ++++---
 src/locales/it.ini  | 78 +++++++++++++++++++++++++++++++++++++++++++
 src/locales/nl.ini  |  3 +-
 src/locales/pl.ini  | 78 +++++++++++++++++++++++++++++++++++++++++++
 src/locales/pt.ini  | 45 +++++++++++++++++++++++++
 src/locales/sv.ini  | 78 +++++++++++++++++++++++++++++++++++++++++++
 src/locales/uk.ini  | 78 +++++++++++++++++++++++++++++++++++++++++++
 17 files changed, 854 insertions(+), 35 deletions(-)
 create mode 100644 src/locales/ar.ini
 create mode 100644 src/locales/ast.ini
 create mode 100644 src/locales/azb.ini
 create mode 100644 src/locales/da.ini
 create mode 100644 src/locales/el.ini
 create mode 100644 src/locales/gl.ini
 create mode 100644 src/locales/it.ini
 create mode 100644 src/locales/pl.ini
 create mode 100644 src/locales/pt.ini
 create mode 100644 src/locales/sv.ini
 create mode 100644 src/locales/uk.ini

diff --git a/src/locales/ar.ini b/src/locales/ar.ini
new file mode 100644
index 00000000..b06d2141
--- /dev/null
+++ b/src/locales/ar.ini
@@ -0,0 +1,56 @@
+; Exported from translatewiki.net
+; Author: Ali1
+; Author: Tux-tn
+[ar]
+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.import_export.title = استيراد/تصدير من/إلى تنسيقات ملفات مختلفة
+pad.toolbar.timeslider.title = متصفح التاريخ
+pad.toolbar.savedRevision.title = التنقيحات المحفوظة
+pad.toolbar.settings.title = الإعدادات
+pad.colorpicker.save = تسجيل
+pad.colorpicker.cancel = إلغاء
+pad.loading = جاري التحميل...
+pad.settings.stickychat = الدردشة دائما على الشاشة
+pad.settings.linenocheck = أرقام الأسطر
+pad.settings.fontType = نوع الخط:
+pad.settings.fontType.normal = عادي
+pad.settings.fontType.monospaced = ثابت العرض
+pad.settings.language = اللغة:
+pad.importExport.import_export = استيراد/تصدير
+pad.importExport.import = تحميل أي ملف نصي أو وثيقة
+pad.importExport.successful = ناجح!
+pad.importExport.exporthtml = إتش تي إم إل
+pad.importExport.exportplain = نص عادي
+pad.importExport.exportword = مايكروسوفت وورد
+pad.importExport.exportpdf = صيغة المستندات المحمولة
+pad.importExport.exportopen = ODF (نسق المستند المفتوح)
+pad.importExport.exportdokuwiki = دوکوويكي
+pad.modals.connected = متصل.
+pad.modals.forcereconnect = فرض إعادة الاتصال
+pad.modals.uderdup = مفتوح في نافذة أخرى
+pad.modals.unauth = غير مخول
+pad.modals.looping = تم قطع الاتصال.
+pad.modals.initsocketfail = لا يمكن الوصول إلى الخادم
+pad.modals.initsocketfail.explanation = تعذر الاتصال بخادم المزامنة.
+pad.modals.slowcommit = تم قطع الاتصال.
+pad.modals.slowcommit.explanation = الخادم لا يستجيب.
+pad.modals.slowcommit.cause = يمكن أن يكون هذا بسبب مشاكل في الاتصال بالشبكة.
+pad.modals.deleted = محذوف.
+pad.modals.disconnected = لم تعد متّصل.
+pad.modals.disconnected.explanation = تم فقدان الإتصال بالخادم
+pad.modals.disconnected.cause = قد يكون الخادم غير متوفر. الرجاء إعلامنا إذا تكرر هذا.
+pad.share.readonly = للقراءة فقط
+pad.share.link = رابط
+pad.chat = دردشة
+timeslider.toolbar.authors = المؤلفون:
+timeslider.toolbar.authorsList = بدون مؤلفين
+timeslider.exportCurrent = تصدير النسخة الحالية ك:
diff --git a/src/locales/ast.ini b/src/locales/ast.ini
new file mode 100644
index 00000000..ab7e3a7c
--- /dev/null
+++ b/src/locales/ast.ini
@@ -0,0 +1,78 @@
+; Exported from translatewiki.net
+; Author: Xuacu
+[ast]
+index.newPad = Nuevu bloc
+index.createOpenPad = o crear/abrir un bloc col nome:
+pad.toolbar.bold.title = Negrina (Ctrl-B)
+pad.toolbar.italic.title = Cursiva (Ctrl-I)
+pad.toolbar.underline.title = Sorrayáu (Ctrl-U)
+pad.toolbar.strikethrough.title = Tacháu
+pad.toolbar.ol.title = Llista ordenada
+pad.toolbar.ul.title = Llista ensin ordenar
+pad.toolbar.indent.title = Sangría
+pad.toolbar.unindent.title = Sangría inversa
+pad.toolbar.undo.title = Desfacer (Ctrl-Z)
+pad.toolbar.redo.title = Refacer (Ctrl-Y)
+pad.toolbar.clearAuthorship.title = Llimpiar los colores d'autoría
+pad.toolbar.import_export.title = Importar/Esportar ente distintos formatos de ficheru
+pad.toolbar.timeslider.title = Eslizador de tiempu
+pad.toolbar.savedRevision.title = Revisiones guardaes
+pad.toolbar.settings.title = Configuración
+pad.toolbar.embed.title = Incrustar esti bloc
+pad.toolbar.showusers.title = Amosar los usuarios d'esti bloc
+pad.colorpicker.save = Guardar
+pad.colorpicker.cancel = Encaboxar
+pad.loading = Cargando...
+pad.settings.padSettings = Configuración del bloc
+pad.settings.myView = la mio vista
+pad.settings.stickychat = Alderique en pantalla siempres
+pad.settings.colorcheck = Colores d'autoría
+pad.settings.linenocheck = Númberos de llinia
+pad.settings.fontType = Tipografía:
+pad.settings.fontType.normal = Normal
+pad.settings.fontType.monospaced = Monoespaciada
+pad.settings.globalView = Vista global
+pad.settings.language = Llingua:
+pad.importExport.import_export = Importar/Esportar
+pad.importExport.import = Xubir cualquier ficheru o documentu de testu
+pad.importExport.successful = ¡Correuto!
+pad.importExport.export = Esportar el bloc actual como:
+pad.importExport.exporthtml = HTML
+pad.importExport.exportplain = Testu simple
+pad.importExport.exportword = Microsoft Word
+pad.importExport.exportpdf = PDF
+pad.importExport.exportopen = ODF (Open Document Format)
+pad.importExport.exportdokuwiki = DokuWiki
+pad.modals.connected = Coneutáu.
+pad.modals.reconnecting = Reconeutando col to bloc...
+pad.modals.forcereconnect = Forzar la reconexón
+pad.modals.uderdup = Abiertu n'otra ventana
+pad.modals.userdup.explanation = Esti bloc paez que ta abiertu en más d'una ventana del navegador d'esti ordenador.
+pad.modals.userdup.advice = Reconeutar pa usar esta ventana.
+pad.modals.unauth = Non autorizáu.
+pad.modals.unauth.explanation = Los tos permisos camudaron mientres vies esta páxina. Intenta volver a coneutar.
+pad.modals.looping = Desconeutáu.
+pad.modals.looping.explanation = Hai problemes de comunicación col sirvidor de sincronización.
+pad.modals.looping.cause = Pues tar coneutáu per un torgafueos o un proxy incompatibles.
+pad.modals.initsocketfail = Sirvidor incalcanzable.
+pad.modals.initsocketfail.explanation = Nun se pudo coneutar col sirvidor de sincronización.
+pad.modals.initsocketfail.cause = Probablemente ye por aciu d'un problema col navegador o cola to conexón a internet.
+pad.modals.slowcommit = Desconeutáu.
+pad.modals.slowcommit.explanation = El sirvidor nun respuende.
+pad.modals.slowcommit.cause = Pue ser por problemes de coneutividá de la rede.
+pad.modals.deleted = Desaniciáu
+pad.modals.deleted.explanation = Esti bloc se desanició.
+pad.modals.disconnected = Te desconeutasti.
+pad.modals.disconnected.explanation = Perdióse la conexón col sirvidor
+pad.modals.disconnected.cause = El sirvidor podría nun tar disponible. Por favor, avisanos si sigue pasando esto.
+pad.share = Compartir esti bloc
+pad.share.readonly = Sólo llectura
+pad.share.link = Enllaz
+pad.share.emebdcode = Incrustar URL
+pad.chat = Chat
+pad.chat.title = Abrir el chat d'esti bloc.
+timeslider.pageTitle = Eslizador de tiempu de {{appTitle}}
+timeslider.toolbar.returnbutton = Tornar al bloc
+timeslider.toolbar.authors = Autores:
+timeslider.toolbar.authorsList = Nun hai autores
+timeslider.exportCurrent = Esportar la versión actual como:
diff --git a/src/locales/azb.ini b/src/locales/azb.ini
new file mode 100644
index 00000000..74db395a
--- /dev/null
+++ b/src/locales/azb.ini
@@ -0,0 +1,71 @@
+; Exported from translatewiki.net
+; Author: Amir a57
+[azb]
+index.newPad = یئنی یادداشت دفترچه سی
+index.createOpenPad = یا دا ایجاد /بیر پد آدلا برابر آچماق:
+pad.toolbar.bold.title = بویوت
+pad.toolbar.italic.title = مورب
+pad.toolbar.underline.title = خطدین آلتی
+pad.toolbar.strikethrough.title = خط یئمیش
+pad.toolbar.ol.title = جوتدنمیش فهرست
+pad.toolbar.ul.title = جوتدنممیش فهرست
+pad.toolbar.indent.title = ایچری باتدیگی
+pad.toolbar.unindent.title = ائشیگه چیخدیگی
+pad.toolbar.undo.title = باطل ائتمک
+pad.toolbar.redo.title = یئنی دن
+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.colorpicker.cancel = لغو ائت
+pad.loading = یوکلنیر...
+pad.settings.padSettings = یادداشت دفترچه سینین تنظیملر
+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.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.forcereconnect = یئنی اتصال اوچون زورلاما
+pad.modals.uderdup = یئنی پنجرده آچیلدی
+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.deleted = سیلیندی.
+pad.modals.deleted.explanation = بو یادداشت دفترچه سی سیلینیب دیر.
+pad.modals.disconnected = سیزین اتصالینیز قطع اولوب دور.
+pad.modals.disconnected.explanation = سروره اتصال قطع اولوب دور.
+pad.share.readonly = اوخومالی فقط
+pad.share.link = باغلانتی
+pad.share.emebdcode = نشانی نی یئرلتمک
+pad.chat = چت
+pad.chat.title = بو یادداشت دفترچه نی چت اوچون آچ
+timeslider.pageTitle = {{appTitle}}زمان اسلایدری
+timeslider.toolbar.returnbutton = یادداشت دفترچه سینه قاییت
+timeslider.toolbar.authors = یازیچیلار
+timeslider.toolbar.authorsList = یازیچی سیز
diff --git a/src/locales/da.ini b/src/locales/da.ini
new file mode 100644
index 00000000..6f6d4b1d
--- /dev/null
+++ b/src/locales/da.ini
@@ -0,0 +1,79 @@
+; Exported from translatewiki.net
+; Author: Christian List
+; Author: Emilkris33
+[da]
+index.newPad = Ny Pad
+index.createOpenPad = eller opret/åbn en Pad med navnet:
+pad.toolbar.bold.title = Fed (Ctrl-B)
+pad.toolbar.italic.title = Kursiv (Ctrl-I)
+pad.toolbar.underline.title = Understregning (Ctrl-U)
+pad.toolbar.strikethrough.title = Gennemstregning
+pad.toolbar.ol.title = Sorteret liste
+pad.toolbar.ul.title = Usorteret liste
+pad.toolbar.indent.title = Indrykning
+pad.toolbar.unindent.title = Ryk ud
+pad.toolbar.undo.title = Fortryd (Ctrl-Z)
+pad.toolbar.redo.title = Annuller Fortryd (Ctrl-Y)
+pad.toolbar.clearAuthorship.title = Fjern farver for forfatterskab
+pad.toolbar.import_export.title = Import/eksport fra/til forskellige filformater
+pad.toolbar.timeslider.title = Timeslider
+pad.toolbar.savedRevision.title = Gemte revisioner
+pad.toolbar.settings.title = Indstillinger
+pad.toolbar.embed.title = Integrer denne pad
+pad.toolbar.showusers.title = Vis brugere på denne pad
+pad.colorpicker.save = Gem
+pad.colorpicker.cancel = Afbryd
+pad.loading = Indlæser ...
+pad.settings.padSettings = Pad indstillinger
+pad.settings.myView = Min visning
+pad.settings.stickychat = Chat altid på skærmen
+pad.settings.colorcheck = Forfatterskabsfarver
+pad.settings.linenocheck = Linjenumre
+pad.settings.fontType = Skrifttype:
+pad.settings.fontType.normal = Normal
+pad.settings.fontType.monospaced = Fastbredde
+pad.settings.globalView = Global visning
+pad.settings.language = Sprog:
+pad.importExport.import_export = Import/Eksport
+pad.importExport.import = Uploade en tekstfil eller dokument
+pad.importExport.successful = Vellykket!
+pad.importExport.export = Eksporter aktuelle pad som:
+pad.importExport.exporthtml = HTML
+pad.importExport.exportplain = Almindelig tekst
+pad.importExport.exportword = Microsoft Word
+pad.importExport.exportpdf = PDF
+pad.importExport.exportopen = ODF (Open Document Format)
+pad.importExport.exportdokuwiki = DokuWiki
+pad.modals.connected = Forbundet.
+pad.modals.reconnecting = Genopretter forbindelsen til din pad...
+pad.modals.forcereconnect = Gennemtving genoprettelse af forbindelsen
+pad.modals.uderdup = Åbnet i et andet vindue
+pad.modals.userdup.explanation = Denne pad synes at være åbnet i mere end ét browservindue på denne computer.
+pad.modals.userdup.advice = Tilslut igen for at bruge dette vindue i stedet.
+pad.modals.unauth = Ikke tilladt
+pad.modals.unauth.explanation = Dine rettigheder er ændret mens du ser på denne side. Prøv at oprette forbindelsen igen.
+pad.modals.looping = Forbindelse afbrudt.
+pad.modals.looping.explanation = Der er kommunikationsproblemer med synkroniseringsserveren.
+pad.modals.looping.cause = Måske tilsluttede du via en inkompatibel firewall eller proxy.
+pad.modals.initsocketfail = Serveren er ikke tilgængelig.
+pad.modals.initsocketfail.explanation = Kunne ikke oprette forbindelse til synkroniseringsserveren.
+pad.modals.initsocketfail.cause = Det skyldes sandsynligvis et problem med din browser eller din internetforbindelse.
+pad.modals.slowcommit = Forbindelse afbrudt.
+pad.modals.slowcommit.explanation = Serveren svarer ikke.
+pad.modals.slowcommit.cause = Det kan skyldes problemer med netværksforbindelsen.
+pad.modals.deleted = Slettet.
+pad.modals.deleted.explanation = Denne pad er blevet fjernet.
+pad.modals.disconnected = Du har fået afbrudt forbindelsen.
+pad.modals.disconnected.explanation = Forbindelsen til serveren blev afbrudt
+pad.modals.disconnected.cause = Serveren er muligvis ikke tilgængelig. Gør os venligst opmærksom på hvis dette fortsætter med at ske.
+pad.share = Del denne pad
+pad.share.readonly = Skrivebeskyttet
+pad.share.link = Link
+pad.share.emebdcode = Integrerings URL
+pad.chat = Chat
+pad.chat.title = Åben chat for denne pad.
+timeslider.pageTitle = {{appTitle}} Timeslider
+timeslider.toolbar.returnbutton = Tilbage til pad
+timeslider.toolbar.authors = Forfattere:
+timeslider.toolbar.authorsList = Ingen Forfattere
+timeslider.exportCurrent = Eksporter aktuelle version som:
diff --git a/src/locales/de.ini b/src/locales/de.ini
index 1de2ad89..f153ba77 100644
--- a/src/locales/de.ini
+++ b/src/locales/de.ini
@@ -16,11 +16,11 @@ pad.toolbar.undo.title = Rückgängig (Strg-Z)
 pad.toolbar.redo.title = Wiederholen (Strg-Y)
 pad.toolbar.clearAuthorship.title = Autorenfarben zurücksetzen
 pad.toolbar.import_export.title = Import/Export in verschiedenen Dateiformaten
-pad.toolbar.timeslider.title = Pad-Geschichte anzeigen
+pad.toolbar.timeslider.title = Pad-Versionsgeschichte anzeigen
 pad.toolbar.savedRevision.title = Diese Revision markieren
 pad.toolbar.settings.title = Einstellungen
 pad.toolbar.embed.title = Dieses Pad teilen oder einbetten
-pad.toolbar.showusers.title = Verbundene Benutzer anzeigen
+pad.toolbar.showusers.title = Aktuell verbundene Benutzer anzeigen
 pad.colorpicker.save = Speichern
 pad.colorpicker.cancel = Abbrechen
 pad.loading = Laden...
@@ -56,17 +56,17 @@ pad.modals.looping = Verbindung unterbrochen.
 pad.modals.looping.explanation = Es gibt Probleme bei der Kommunikation mit dem Pad-Server.
 pad.modals.looping.cause = Möglicherweise sind Sie durch eine inkompatible Firewall oder über einen inkompatiblen Proxy mit dem Padserver verbunden.
 pad.modals.initsocketfail = Pad-Server nicht erreichbar.
-pad.modals.initsocketfail.explanation = Es konnte keine Verbindung zum Synchronisationsserver hergestellt werden.
+pad.modals.initsocketfail.explanation = Es konnte keine Verbindung zum Pad-Server hergestellt werden.
 pad.modals.initsocketfail.cause = Dies könnte an Ihrem Browser oder Ihrer Internet-Verbindung liegen.
 pad.modals.slowcommit = Verbindung unterbrochen.
 pad.modals.slowcommit.explanation = Der Pad-Server reagiert nicht.
-pad.modals.slowcommit.cause = Dies könnte ein Problemen der Netzwerkverbindung sein, oder der Pad-Server ist momentan überlastet.
+pad.modals.slowcommit.cause = Dies könnte ein Netzwerkverbindungsproblem sein oder eine momentane Überlastung des Pad-Servers.
 pad.modals.deleted = Gelöscht.
 pad.modals.deleted.explanation = Dieses Pad wurde gelöscht.
 pad.modals.disconnected = Verbindung unterbrochen.
 pad.modals.disconnected.explanation = Die Verbindung zum Pad-Server wurde unterbrochen.
 pad.modals.disconnected.cause = Möglicherweise ist der Pad-Server nicht erreichbar. Bitte benachrichtigen Sie uns, falls dies weiterhin passiert.
-pad.share = Dieses Pad teilen
+pad.share = Dieses Pad anderen mitteilen
 pad.share.readonly = Eingeschränkter Nur-Lese-Zugriff
 pad.share.link = Link
 pad.share.emebdcode = In Webseite einbetten
diff --git a/src/locales/el.ini b/src/locales/el.ini
new file mode 100644
index 00000000..e94407a4
--- /dev/null
+++ b/src/locales/el.ini
@@ -0,0 +1,80 @@
+; Exported from translatewiki.net
+; Author: Evropi
+; Author: Glavkos
+; Author: Monopatis
+[el]
+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 (Open Document Format)
+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 = Ενσωματώστε URL
+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/locales/es.ini b/src/locales/es.ini
index dd2c0d14..95c731ef 100644
--- a/src/locales/es.ini
+++ b/src/locales/es.ini
@@ -1,5 +1,7 @@
 ; Exported from translatewiki.net
+; Author: Jacobo
 ; Author: McDutchie
+; Author: Xuacu
 [es]
 index.newPad = Nuevo Pad
 index.createOpenPad = o puedes crear/abrir un Pad con el nombre:
@@ -36,8 +38,7 @@ pad.settings.language = Idioma:
 pad.importExport.import_export = Importar/Exportar
 pad.importExport.import = Subir cualquier texto o documento
 pad.importExport.successful = ¡Operación exitosa!
-; Fuzzy
-pad.importExport.export = Exporta el pad actual como
+pad.importExport.export = Exporta el pad actual como:
 pad.importExport.exporthtml = HTML
 pad.importExport.exportplain = Texto plano
 pad.importExport.exportword = Microsoft Word
@@ -56,7 +57,7 @@ pad.modals.looping = Desconectado.
 pad.modals.looping.explanation = Estamos teniendo problemas con la sincronización en el servidor.
 pad.modals.looping.cause = Quizás su conexión fluya a través de un proxy o un cortafuegos incompatible.
 pad.modals.initsocketfail = Servidor incalcanzable.
-pad.modals.initsocketfail.explanation = No se pudo conectar al sevidor de sincronización.
+pad.modals.initsocketfail.explanation = No se pudo conectar al servidor de sincronización.
 pad.modals.initsocketfail.cause = Puede ser a causa de tu navegador o de una caída en tu conexión de Internet.
 pad.modals.slowcommit = Desconectado.
 pad.modals.slowcommit.explanation = El servidor no responde.
diff --git a/src/locales/fi.ini b/src/locales/fi.ini
index 29ddd87a..0a9c4f6c 100644
--- a/src/locales/fi.ini
+++ b/src/locales/fi.ini
@@ -1,10 +1,11 @@
 ; Exported from translatewiki.net
 ; Author: Artnay
 ; Author: Jl
+; Author: Nedergard
 ; Author: Nike
 [fi]
 index.newPad = Uusi muistio
-index.createOpenPad = tai avaa muistio nimellä:
+index.createOpenPad = tai luo/avaa muistio nimellä:
 pad.toolbar.bold.title = Lihavointi (Ctrl-B)
 pad.toolbar.italic.title = Kursivointi (Ctrl-I)
 pad.toolbar.underline.title = Alleviivaus (Ctrl-U)
@@ -16,14 +17,14 @@ pad.toolbar.unindent.title = Ulonna
 pad.toolbar.undo.title = Kumoa (Ctrl-Z)
 pad.toolbar.redo.title = Tee uudelleen (Ctrl-Y)
 pad.toolbar.clearAuthorship.title = Poista kirjoittajavärit
-pad.toolbar.import_export.title = Tuo tai vie eri muotoihin
+pad.toolbar.import_export.title = Tuo tai vie eri tiedostomuodoista tai -muotoihin
 pad.toolbar.timeslider.title = Aikajana
 pad.toolbar.savedRevision.title = Tallennetut versiot
 pad.toolbar.settings.title = Asetukset
 pad.toolbar.embed.title = Upota muistio
 pad.toolbar.showusers.title = Näytä muistion käyttäjät
 pad.colorpicker.save = Tallenna
-pad.colorpicker.cancel = Peru
+pad.colorpicker.cancel = Peruuta
 pad.loading = Ladataan…
 pad.settings.padSettings = Muistion asetukset
 pad.settings.myView = Oma näkymä
@@ -78,3 +79,18 @@ timeslider.toolbar.returnbutton = Palaa muistioon
 timeslider.toolbar.authors = Tekijät:
 timeslider.toolbar.authorsList = Ei tekijöitä
 timeslider.exportCurrent = Vie nykyinen versio muodossa:
+timeslider.version = Versio {{version}}
+timeslider.saved = Tallennettu {{day}}. {{month}}ta {{year}}
+timeslider.dateformat = {{day}}.{{month}}.{{year}} {{hours}}:{{minutes}}:{{seconds}}
+timeslider.month.january = tammikuu
+timeslider.month.february = helmikuu
+timeslider.month.march = maaliskuu
+timeslider.month.april = huhtikuu
+timeslider.month.may = toukokuu
+timeslider.month.june = kesäkuu
+timeslider.month.july = heinäkuu
+timeslider.month.august = elokuu
+timeslider.month.september = syyskuu
+timeslider.month.october = lokakuu
+timeslider.month.november = marraskuu
+timeslider.month.december = joulukuu
diff --git a/src/locales/fr.ini b/src/locales/fr.ini
index 853c9ba8..7ac51f9c 100644
--- a/src/locales/fr.ini
+++ b/src/locales/fr.ini
@@ -1,10 +1,13 @@
 ; Exported from translatewiki.net
+; Author: Crochet.david
 ; Author: Gomoko
+; Author: Jean-Frédéric
 ; Author: Leviathan
 ; Author: McDutchie
+; Author: Od1n
 [fr]
 index.newPad = Nouveau Pad
-index.createOpenPad = ou créer/ouvrir un Pad intitulé
+index.createOpenPad = ou créer/ouvrir un Pad intitulé :
 pad.toolbar.bold.title = Gras (Ctrl-B)
 pad.toolbar.italic.title = Italique (Ctrl-I)
 pad.toolbar.underline.title = Souligner (Ctrl-U)
@@ -17,41 +20,41 @@ 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 = Navigateur d’historique
 pad.toolbar.savedRevision.title = Versions enregistrées
 pad.toolbar.settings.title = Paramètres
 pad.toolbar.embed.title = Intégrer ce Pad
 pad.toolbar.showusers.title = Afficher les utilisateurs du Pad
-pad.colorpicker.save = Sauver
+pad.colorpicker.save = Enregistrer
 pad.colorpicker.cancel = Annuler
-pad.loading = Chargement...
+pad.loading = Chargement…
 pad.settings.padSettings = Paramètres du Pad
 pad.settings.myView = Ma vue
 pad.settings.stickychat = Messagerie toujours affichée
-pad.settings.colorcheck = Couleurs d'identification
+pad.settings.colorcheck = Couleurs d’identification
 pad.settings.linenocheck = Numéros des lignes
-pad.settings.fontType = Type de police:
+pad.settings.fontType = Type de police :
 pad.settings.fontType.normal = Normal
 pad.settings.fontType.monospaced = Monospace
-pad.settings.globalView = Vue d'ensemble
-pad.settings.language = Langue:
+pad.settings.globalView = Vue d’ensemble
+pad.settings.language = Langue :
 pad.importExport.import_export = Importer/Exporter
 pad.importExport.import = Charger un texte ou un document
-pad.importExport.successful = Traitement effectué!
-pad.importExport.export = Exporter le Pad actuel comme:
+pad.importExport.successful = Traitement effectué !
+pad.importExport.export = Exporter le Pad actuel comme :
 pad.importExport.exporthtml = HTML
 pad.importExport.exportplain = Texte brut
 pad.importExport.exportword = Microsoft Word
-pad.importExport.exportpdf = PDf
+pad.importExport.exportpdf = PDF
 pad.importExport.exportopen = ODF (Open Document Format)
 pad.importExport.exportdokuwiki = DokuWiki
 pad.modals.connected = Connecté.
 pad.modals.reconnecting = Reconnexion vers votre Pad...
 pad.modals.forcereconnect = Forcer la reconnexion.
 pad.modals.uderdup = Ouvert dans une autre fenêtre
-pad.modals.userdup.explanation = Ce Pad semble avoir été ouvert dans plusieurs fenêtres de votre fureteur sur cet ordinateur.
+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 = Not authorized Non authorisé
+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.looping = Déconnecté.
 pad.modals.looping.explanation = Nous éprouvons un problème de communication au serveur de synchronisation.
@@ -59,9 +62,9 @@ pad.modals.looping.cause = Il est possible que leur connection soit protégée p
 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.slowcommit = Disconnected. Déconnecté
+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 = La cause de ce problème peut être liée à une erreur de connectivité du réseau.
 pad.modals.deleted = Supprimé.
 pad.modals.deleted.explanation = Ce Pad a été supprimé.
 pad.modals.disconnected = Vous avez été déconnecté.
@@ -75,6 +78,6 @@ pad.chat = Messagerie
 pad.chat.title = Ouvrir la messagerie liée au Pad.
 timeslider.pageTitle = {{appTitle}} Curseur temporel
 timeslider.toolbar.returnbutton = Retour à ce Pad.
-timeslider.toolbar.authors = Auteurs:
+timeslider.toolbar.authors = Auteurs :
 timeslider.toolbar.authorsList = Aucun auteur
-timeslider.exportCurrent = Exporter version actuelle vers:
+timeslider.exportCurrent = Exporter version actuelle vers :
diff --git a/src/locales/gl.ini b/src/locales/gl.ini
new file mode 100644
index 00000000..017c61f2
--- /dev/null
+++ b/src/locales/gl.ini
@@ -0,0 +1,78 @@
+; Exported from translatewiki.net
+; Author: Toliño
+[gl]
+index.newPad = Novo documento
+index.createOpenPad = ou cree/abra un documento co nome:
+pad.toolbar.bold.title = Negra (Ctrl-B)
+pad.toolbar.italic.title = Cursiva (Ctrl-I)
+pad.toolbar.underline.title = Subliñar (Ctrl-U)
+pad.toolbar.strikethrough.title = Riscar
+pad.toolbar.ol.title = Lista ordenada
+pad.toolbar.ul.title = Lista sen ordenar
+pad.toolbar.indent.title = Sangría
+pad.toolbar.unindent.title = Sen sangría
+pad.toolbar.undo.title = Desfacer (Ctrl-Z)
+pad.toolbar.redo.title = Refacer (Ctrl-Y)
+pad.toolbar.clearAuthorship.title = Limpar as cores de identificación dos autores
+pad.toolbar.import_export.title = Importar/Exportar desde/a diferentes formatos de ficheiro
+pad.toolbar.timeslider.title = Liña do tempo
+pad.toolbar.savedRevision.title = Revisións gardadas
+pad.toolbar.settings.title = Configuracións
+pad.toolbar.embed.title = Incorporar este documento
+pad.toolbar.showusers.title = Mostrar os usuarios deste documento
+pad.colorpicker.save = Gardar
+pad.colorpicker.cancel = Cancelar
+pad.loading = Cargando...
+pad.settings.padSettings = Configuracións do documento
+pad.settings.myView = A miña vista
+pad.settings.stickychat = Chat sempre visible
+pad.settings.colorcheck = Cores de identificación
+pad.settings.linenocheck = Números de liña
+pad.settings.fontType = Tipo de letra:
+pad.settings.fontType.normal = Normal
+pad.settings.fontType.monospaced = Monoespazada
+pad.settings.globalView = Vista global
+pad.settings.language = Lingua:
+pad.importExport.import_export = Importar/Exportar
+pad.importExport.import = Cargar un ficheiro de texto ou documento
+pad.importExport.successful = Correcto!
+pad.importExport.export = Exportar o documento actual en formato:
+pad.importExport.exporthtml = HTML
+pad.importExport.exportplain = Texto simple
+pad.importExport.exportword = Microsoft Word
+pad.importExport.exportpdf = PDF
+pad.importExport.exportopen = ODF (Open Document Format)
+pad.importExport.exportdokuwiki = DokuWiki
+pad.modals.connected = Conectado.
+pad.modals.reconnecting = Reconectando co seu documento...
+pad.modals.forcereconnect = Forzar a reconexión
+pad.modals.uderdup = Aberto noutra ventá
+pad.modals.userdup.explanation = Semella que este documento está aberto en varias ventás do navegador neste ordenador.
+pad.modals.userdup.advice = Reconectar para usar esta ventá.
+pad.modals.unauth = Non autorizado
+pad.modals.unauth.explanation = Os seus permisos cambiaron mentres estaba nesta páxina. Intente a reconexión.
+pad.modals.looping = Desconectado.
+pad.modals.looping.explanation = Hai un problema de comunicación co servidor de sincronización.
+pad.modals.looping.cause = Seica a súa conexión pasa a través dun firewall ou proxy incompatible.
+pad.modals.initsocketfail = Non se pode alcanzar o servidor.
+pad.modals.initsocketfail.explanation = Non se pode conectar co servidor de sincronización.
+pad.modals.initsocketfail.cause = Isto acontece probablemente debido a un problema co navegador ou coa conexión á internet.
+pad.modals.slowcommit = Desconectado.
+pad.modals.slowcommit.explanation = O servidor non responde.
+pad.modals.slowcommit.cause = Isto pode deberse a un problema de conexión á rede.
+pad.modals.deleted = Borrado.
+pad.modals.deleted.explanation = Este documento foi eliminado.
+pad.modals.disconnected = Foi desconectado.
+pad.modals.disconnected.explanation = Perdeuse a conexión co servidor
+pad.modals.disconnected.cause = O servidor non está dispoñible. Póñase en contacto con nós se o problema continúa.
+pad.share = Compartir este documento
+pad.share.readonly = Lectura só
+pad.share.link = Ligazón
+pad.share.emebdcode = Incorporar o URL
+pad.chat = Chat
+pad.chat.title = Abrir o chat deste documento.
+timeslider.pageTitle = Liña do tempo de {{appTitle}}
+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:
diff --git a/src/locales/hu.ini b/src/locales/hu.ini
index da76f32e..cc79d034 100644
--- a/src/locales/hu.ini
+++ b/src/locales/hu.ini
@@ -1,4 +1,5 @@
 ; Exported from translatewiki.net
+; Author: R-Joe
 ; Author: Tgr
 [hu]
 index.newPad = Új notesz
@@ -25,8 +26,8 @@ pad.colorpicker.cancel = Mégsem
 pad.loading = Betöltés…
 pad.settings.padSettings = Notesz beállításai
 pad.settings.myView = Az én nézetem
-pad.settings.stickychat = Mindig mutasd a chat-dobozt
-pad.settings.colorcheck = Szerzők szíbei
+pad.settings.stickychat = Mindig mutasd a csevegés-dobozt
+pad.settings.colorcheck = Szerzők színei
 pad.settings.linenocheck = Sorok számozása
 pad.settings.fontType = Betűtípus:
 pad.settings.fontType.normal = Szokásos
@@ -41,7 +42,7 @@ pad.importExport.exporthtml = HTML
 pad.importExport.exportplain = Sima szöveg
 pad.importExport.exportword = Microsoft Word
 pad.importExport.exportpdf = PDF
-pad.importExport.exportopen = ODF (Open Document Format)
+pad.importExport.exportopen = ODF (Open Document formátum)
 pad.importExport.exportdokuwiki = DokuWiki
 pad.modals.connected = Kapcsolódva.
 pad.modals.reconnecting = Újrakapcsolódás a noteszhez...
@@ -69,8 +70,8 @@ pad.share = Notesz megosztása
 pad.share.readonly = Csak olvasható
 pad.share.link = Hivatkozás
 pad.share.emebdcode = URL beágyazása
-pad.chat = Chat
-pad.chat.title = A noteszhez tartozó chat megnyitása.
+pad.chat = Csevegés
+pad.chat.title = A noteszhez tartozó csevegés megnyitása.
 timeslider.pageTitle = {{appTitle}} időcsúszka
 timeslider.toolbar.returnbutton = Vissza a noteszhez
 timeslider.toolbar.authors = Szerzők:
diff --git a/src/locales/it.ini b/src/locales/it.ini
new file mode 100644
index 00000000..2e47d293
--- /dev/null
+++ b/src/locales/it.ini
@@ -0,0 +1,78 @@
+; Exported from translatewiki.net
+; Author: Gianfranco
+[it]
+index.newPad = Nuovo Pad
+index.createOpenPad = o creare o aprire un Pad con il nome:
+pad.toolbar.bold.title = Grassetto (Ctrl-B)
+pad.toolbar.italic.title = Corsivo (Ctrl-I)
+pad.toolbar.underline.title = Sottolinea (Ctrl-U)
+pad.toolbar.strikethrough.title = Barrato
+pad.toolbar.ol.title = Elenco ordinato
+pad.toolbar.ul.title = Elenco non ordinato
+pad.toolbar.indent.title = Rientro
+pad.toolbar.unindent.title = Riduci rientro
+pad.toolbar.undo.title = Annulla (Ctrl-Z)
+pad.toolbar.redo.title = Ripeti (Ctrl-Y)
+pad.toolbar.clearAuthorship.title = Elimina i colori che indicano gli autori
+pad.toolbar.import_export.title = Importa/esporta da/a diversi formati di file
+pad.toolbar.timeslider.title = Presentazione cronologia
+pad.toolbar.savedRevision.title = Revisioni salvate
+pad.toolbar.settings.title = Impostazioni
+pad.toolbar.embed.title = Incorpora questo pad
+pad.toolbar.showusers.title = Visualizza gli utenti su questo pad
+pad.colorpicker.save = Salva
+pad.colorpicker.cancel = Annulla
+pad.loading = Caricamento in corso…
+pad.settings.padSettings = Impostazioni del Pad
+pad.settings.myView = Mia visualizzazione
+pad.settings.stickychat = Chat sempre sullo schermo
+pad.settings.colorcheck = Colori che indicano gli autori
+pad.settings.linenocheck = Numeri di riga
+pad.settings.fontType = Tipo di carattere:
+pad.settings.fontType.normal = Normale
+pad.settings.fontType.monospaced = Monospace
+pad.settings.globalView = Visualizzazione globale
+pad.settings.language = Lingua:
+pad.importExport.import_export = Importazione/esportazione
+pad.importExport.import = Carica qualsiasi file di testo o documento
+pad.importExport.successful = Riuscito!
+pad.importExport.export = Esportare il pad corrente come:
+pad.importExport.exporthtml = HTML
+pad.importExport.exportplain = Solo testo
+pad.importExport.exportword = Microsoft Word
+pad.importExport.exportpdf = PDF
+pad.importExport.exportopen = ODF (Open Document Format)
+pad.importExport.exportdokuwiki = DokuWiki
+pad.modals.connected = Connesso.
+pad.modals.reconnecting = Riconnessione al tuo pad in corso...
+pad.modals.forcereconnect = Forza la riconnessione
+pad.modals.uderdup = Aperto in un'altra finestra
+pad.modals.userdup.explanation = Questo pad sembra essere aperto in più di una finestra del browser su questo computer.
+pad.modals.userdup.advice = Riconnettiti per utilizzare invece questa finestra.
+pad.modals.unauth = Non autorizzato
+pad.modals.unauth.explanation = Le tue autorizzazioni sono state modificate durante la visualizzazione di questa pagina. Prova a riconnetterti.
+pad.modals.looping = Disconnesso.
+pad.modals.looping.explanation = Ci sono problemi di comunicazione con il server di sincronizzazione.
+pad.modals.looping.cause = Forse sei connesso attraverso un firewall o un server proxy non compatibili.
+pad.modals.initsocketfail = Il server non è raggiungibile.
+pad.modals.initsocketfail.explanation = Impossibile connettersi al server di sincronizzazione.
+pad.modals.initsocketfail.cause = Questo è probabilmente dovuto a un problema con il tuo browser o con la tua connessione a internet.
+pad.modals.slowcommit = Disconnesso.
+pad.modals.slowcommit.explanation = Il server non risponde.
+pad.modals.slowcommit.cause = Questo potrebbe essere dovuto a problemi con la connettività di rete.
+pad.modals.deleted = Cancellato.
+pad.modals.deleted.explanation = Questo pad è stato rimosso.
+pad.modals.disconnected = Sei stato disconnesso.
+pad.modals.disconnected.explanation = La connessione al server è stata persa
+pad.modals.disconnected.cause = Il server potrebbe essere non disponibile. Per favore, fateci sapere se il problema persiste.
+pad.share = Condividi questo pad
+pad.share.readonly = Sola lettura
+pad.share.link = Link
+pad.share.emebdcode = Incorpora URL
+pad.chat = Chat
+pad.chat.title = Apri la chat per questo pad.
+timeslider.pageTitle = Cronologia {{appTitle}}
+timeslider.toolbar.returnbutton = Ritorna al pad
+timeslider.toolbar.authors = Autori:
+timeslider.toolbar.authorsList = Nessun autore
+timeslider.exportCurrent = Esporta la versione corrente come:
diff --git a/src/locales/nl.ini b/src/locales/nl.ini
index 868cd987..94dcb32d 100644
--- a/src/locales/nl.ini
+++ b/src/locales/nl.ini
@@ -37,7 +37,6 @@ pad.settings.language = Taal:
 pad.importExport.import_export = Importeren/exporteren
 pad.importExport.import = Upload een tekstbestand of document
 pad.importExport.successful = Afgerond
-; Fuzzy
 pad.importExport.export = Huidige pad exporteren als
 pad.importExport.exporthtml = HTML
 pad.importExport.exportplain = Tekst zonder opmaak
@@ -50,7 +49,7 @@ pad.modals.reconnecting = Opnieuw verbinding maken met uw pad...
 pad.modals.forcereconnect = Opnieuw verbinden
 pad.modals.uderdup = In een ander venster geopend
 pad.modals.userdup.explanation = Dit pad is meer dan één keer geopend in een browservenster op deze computer.
-pad.modals.userdup.advice = Als u dit venster wilt gebruiken maakt u opnieuw verbinding.
+pad.modals.userdup.advice = Maak opnieuw verbinding als u dit venster wilt gebruiken.
 pad.modals.unauth = Niet toegestaan
 pad.modals.unauth.explanation = Uw rechten zijn gewijzigd terwijl u de pagina aan het bekijken was. Probeer opnieuw te verbinden.
 pad.modals.looping = Verbinding verbroken.
diff --git a/src/locales/pl.ini b/src/locales/pl.ini
new file mode 100644
index 00000000..0eefc3ef
--- /dev/null
+++ b/src/locales/pl.ini
@@ -0,0 +1,78 @@
+; Exported from translatewiki.net
+; Author: Woytecr
+[pl]
+index.newPad = Nowy Dokument
+index.createOpenPad = lub stwórz/otwórz dokument o nazwie:
+pad.toolbar.bold.title = Pogrubienie (Ctrl-B)
+pad.toolbar.italic.title = Kursywa (Ctrl-I)
+pad.toolbar.underline.title = Podkreślenie (Ctrl-U)
+pad.toolbar.strikethrough.title = Przekreślenie
+pad.toolbar.ol.title = Lista uporządkowana
+pad.toolbar.ul.title = Lista nieuporządkowana
+pad.toolbar.indent.title = Wcięcie
+pad.toolbar.unindent.title = Zmniejsz wcięcie
+pad.toolbar.undo.title = Cofnij (Ctrl-Z)
+pad.toolbar.redo.title = Ponów (Ctrl-Y)
+pad.toolbar.clearAuthorship.title = Usuń kolory autorów
+pad.toolbar.import_export.title = Import/eksport z/do różnych formatów plików
+pad.toolbar.timeslider.title = Oś czasu
+pad.toolbar.savedRevision.title = Zapisane wersje
+pad.toolbar.settings.title = Ustawienia
+pad.toolbar.embed.title = Umieść ten Notatnik
+pad.toolbar.showusers.title = Pokaż użytkowników
+pad.colorpicker.save = Zapisz
+pad.colorpicker.cancel = Anuluj
+pad.loading = Ładowanie...
+pad.settings.padSettings = Ustawienia dokumentu
+pad.settings.myView = Mój widok
+pad.settings.stickychat = Czat zawsze na ekranie
+pad.settings.colorcheck = Kolory autorstwa
+pad.settings.linenocheck = Numery linii
+pad.settings.fontType = Rodzaj czcionki:
+pad.settings.fontType.normal = Normalna
+pad.settings.fontType.monospaced = Monospace
+pad.settings.globalView = Widok ogólny
+pad.settings.language = Język:
+pad.importExport.import_export = Import/eksport
+pad.importExport.import = Prześlij dowolny plik tekstowy lub dokument
+pad.importExport.successful = Sukces!
+pad.importExport.export = Eksportuj bieżący dokument jako:
+pad.importExport.exporthtml = HTML
+pad.importExport.exportplain = Zwykły tekst
+pad.importExport.exportword = Microsoft Word
+pad.importExport.exportpdf = PDF
+pad.importExport.exportopen = ODF (Open Document Format)
+pad.importExport.exportdokuwiki = DokuWiki
+pad.modals.connected = Połączony.
+pad.modals.reconnecting = Ponowne łączenie z dokumentem...
+pad.modals.forcereconnect = Wymuś ponowne połączenie
+pad.modals.uderdup = Otwarty w innym oknie
+pad.modals.userdup.explanation = Ten dokument prawdopodobnie został otwarty w więcej niż jednym oknie przeglądarki.
+pad.modals.userdup.advice = Połącz ponownie przy użyciu tego okna.
+pad.modals.unauth = Brak autoryzacji
+pad.modals.unauth.explanation = Twoje uprawnienia uległy zmianie podczas przeglądania tej strony. Spróbuj ponownie się połączyć.
+pad.modals.looping = Rozłączony.
+pad.modals.looping.explanation = Wystąpiły problemy z komunikacją z serwerem synchronizacji.
+pad.modals.looping.cause = Być może jesteś połączony przez niezgodną zaporę lub serwer proxy.
+pad.modals.initsocketfail = Serwer jest nieosiągalny.
+pad.modals.initsocketfail.explanation = Nie udało się połączyć z serwerem synchronizacji.
+pad.modals.initsocketfail.cause = Przyczyną są prawdopodobnie problemy z przeglądarka lub połączeniem z internetem.
+pad.modals.slowcommit = Rozłączony.
+pad.modals.slowcommit.explanation = Serwer nie odpowiada.
+pad.modals.slowcommit.cause = Może być to spowodowane problemami z Twoim połączeniem z siecią.
+pad.modals.deleted = Usunięto.
+pad.modals.deleted.explanation = Ten dokument został usunięty.
+pad.modals.disconnected = Zostałeś rozłączony.
+pad.modals.disconnected.explanation = Utracono połączenie z serwerem
+pad.modals.disconnected.cause = Serwer może być niedostępny. Poinformuj nas jeżeli problem będzie się powtarzał.
+pad.share = Udostępnij ten dokument
+pad.share.readonly = Tylko do odczytu
+pad.share.link = Link
+pad.share.emebdcode = Kod do umieszczenia
+pad.chat = Czat
+pad.chat.title = Otwórz czat dla tego dokumentu.
+timeslider.pageTitle = Oś czasu {{appTitle}}
+timeslider.toolbar.returnbutton = Powróć do dokumentu
+timeslider.toolbar.authors = Autorzy:
+timeslider.toolbar.authorsList = Brak autorów
+timeslider.exportCurrent = Eksportuj bieżącą wersję jako:
diff --git a/src/locales/pt.ini b/src/locales/pt.ini
new file mode 100644
index 00000000..a210e64a
--- /dev/null
+++ b/src/locales/pt.ini
@@ -0,0 +1,45 @@
+; Exported from translatewiki.net
+; Author: Waldir
+[pt]
+index.newPad = Novo Pad
+index.createOpenPad = ou criar/abrir um Pad com o nome:
+pad.toolbar.bold.title = Negrito (Ctrl-B)
+pad.toolbar.italic.title = Itálico (Ctrl-I)
+pad.toolbar.underline.title = Sublinhado (Ctrl-U)
+pad.toolbar.ol.title = Lista numerada
+pad.toolbar.ul.title = Lista
+pad.toolbar.undo.title = Desfazer (Ctrl-Z)
+pad.toolbar.redo.title = Refazer (Ctrl-Y)
+pad.toolbar.clearAuthorship.title = Limpar cores de autoria
+pad.toolbar.import_export.title = Importar/exportar de/para diferentes formatos de ficheiro
+pad.toolbar.timeslider.title = Linha de tempo
+pad.toolbar.savedRevision.title = Versões gravadas
+pad.toolbar.settings.title = Configurações
+pad.toolbar.embed.title = Incorporar este Pad
+pad.toolbar.showusers.title = Mostrar os utilizadores neste Pad
+pad.colorpicker.save = Gravar
+pad.colorpicker.cancel = Cancelar
+pad.loading = A carregar…
+pad.settings.padSettings = Configurações do Pad
+pad.settings.myView = Minha vista
+pad.settings.colorcheck = Cores de autoria
+pad.settings.linenocheck = Números de linha
+pad.settings.fontType = Tipo de letra:
+pad.settings.fontType.normal = Normal
+pad.settings.fontType.monospaced = Monoespaçada
+pad.settings.globalView = Vista global
+pad.settings.language = Língua:
+pad.importExport.import_export = Importar/Exportar
+pad.importExport.import = Carregar qualquer ficheiro de texto ou documento
+pad.importExport.successful = Bem sucedido!
+pad.importExport.export = Exportar o Pad actual como:
+pad.importExport.exporthtml = HTML
+pad.importExport.exportplain = Texto simples
+pad.importExport.exportword = Microsoft Word
+pad.importExport.exportpdf = PDF
+pad.importExport.exportopen = ODF (Open Document Format)
+pad.importExport.exportdokuwiki = DokuWiki
+pad.modals.connected = Ligado.
+pad.modals.reconnecting = Reconectando-se ao seu bloco…
+pad.modals.forcereconnect = Forçar reconexão
+pad.modals.uderdup = Aberto noutra janela
diff --git a/src/locales/sv.ini b/src/locales/sv.ini
new file mode 100644
index 00000000..bd3c1e5c
--- /dev/null
+++ b/src/locales/sv.ini
@@ -0,0 +1,78 @@
+; Exported from translatewiki.net
+; Author: WikiPhoenix
+[sv]
+index.newPad = Nytt block
+index.createOpenPad = eller skapa/öppna ett block med namnet:
+pad.toolbar.bold.title = Fet (Ctrl-B)
+pad.toolbar.italic.title = Kursiv (Ctrl-I)
+pad.toolbar.underline.title = Understruken (Ctrl-U)
+pad.toolbar.strikethrough.title = Genomstruken
+pad.toolbar.ol.title = Numrerad lista
+pad.toolbar.ul.title = Ta bort numrerad lista
+pad.toolbar.indent.title = Öka indrag
+pad.toolbar.unindent.title = Minska indrag
+pad.toolbar.undo.title = Ångra (Ctrl-Z)
+pad.toolbar.redo.title = Gör om (Ctrl-Y)
+pad.toolbar.clearAuthorship.title = Rensa färger för författarskap
+pad.toolbar.import_export.title = Importera/exportera från/till olika filformat
+pad.toolbar.timeslider.title = Tidsreglage
+pad.toolbar.savedRevision.title = Sparade revisioner
+pad.toolbar.settings.title = Inställningar
+pad.toolbar.embed.title = Bädda in detta block
+pad.toolbar.showusers.title = Visa användarna på detta block
+pad.colorpicker.save = Spara
+pad.colorpicker.cancel = Avbryt
+pad.loading = Läser in...
+pad.settings.padSettings = Blockinställningar
+pad.settings.myView = Min vy
+pad.settings.stickychat = Chatten alltid på skärmen
+pad.settings.colorcheck = Författarskapsfärger
+pad.settings.linenocheck = Radnummer
+pad.settings.fontType = Typsnitt:
+pad.settings.fontType.normal = Normal
+pad.settings.fontType.monospaced = Fast breddsteg
+pad.settings.globalView = Global vy
+pad.settings.language = Språk:
+pad.importExport.import_export = Importera/exportera
+pad.importExport.import = Ladda upp en textfil eller dokument
+pad.importExport.successful = Åtgärden slutfördes!
+pad.importExport.export = Export aktuellt block som:
+pad.importExport.exporthtml = HTML
+pad.importExport.exportplain = Oformaterad text
+pad.importExport.exportword = Microsoft Word
+pad.importExport.exportpdf = PDF
+pad.importExport.exportopen = ODF (Open Document Format)
+pad.importExport.exportdokuwiki = DokuWiki
+pad.modals.connected = Ansluten.
+pad.modals.reconnecting = Återansluter till ditt block...
+pad.modals.forcereconnect = Tvinga återanslutning
+pad.modals.uderdup = Öppnas i ett nytt fönster
+pad.modals.userdup.explanation = Detta block verkar vara öppet i mer än ett fönster på denna dator.
+pad.modals.userdup.advice = Återanslut för att använda detta fönster istället.
+pad.modals.unauth = Inte godkänd
+pad.modals.unauth.explanation = Din behörighet ändrades medan du visar denna sida. Försök att återansluta.
+pad.modals.looping = Frånkopplad.
+pad.modals.looping.explanation = Kommunikationsproblem med synkroniseringsservern har uppstått.
+pad.modals.looping.cause = Kanske du är ansluten via en inkompatibel brandvägg eller proxy.
+pad.modals.initsocketfail = Servern inte kan nås.
+pad.modals.initsocketfail.explanation = Det gick inte att ansluta till synkroniseringsservern.
+pad.modals.initsocketfail.cause = Detta är beror troligen på ett problem med din webbläsare eller din internetanslutning.
+pad.modals.slowcommit = Frånkopplad.
+pad.modals.slowcommit.explanation = Servern svarar inte.
+pad.modals.slowcommit.cause = Detta kan bero på problem med nätverksanslutningen.
+pad.modals.deleted = Raderad.
+pad.modals.deleted.explanation = Detta block har tagits bort.
+pad.modals.disconnected = Du har kopplats från.
+pad.modals.disconnected.explanation = Anslutningen till servern avbröts
+pad.modals.disconnected.cause = Servern kanske inte är tillgänglig. Var god meddela oss om detta fortsätter att hända.
+pad.share = Dela detta block
+pad.share.readonly = Skrivskyddad
+pad.share.link = Länk
+pad.share.emebdcode = Bädda in URL
+pad.chat = Chatt
+pad.chat.title = Öppna chatten för detta block.
+timeslider.pageTitle = Tidsreglage för {{appTitle}}
+timeslider.toolbar.returnbutton = Återvänd till blocket
+timeslider.toolbar.authors = Författare:
+timeslider.toolbar.authorsList = Ingen författare
+timeslider.exportCurrent = Exportera aktuell version som:
diff --git a/src/locales/uk.ini b/src/locales/uk.ini
new file mode 100644
index 00000000..03cb1836
--- /dev/null
+++ b/src/locales/uk.ini
@@ -0,0 +1,78 @@
+; Exported from translatewiki.net
+; Author: Base
+[uk]
+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.timeslider.title = Шкала часу
+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.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.importExport.exporthtml = HTML
+pad.importExport.exportplain = Звичайний текст
+pad.importExport.exportword = Microsoft Word
+pad.importExport.exportpdf = PDF
+pad.importExport.exportopen = ODF (документ OpenOffice)
+pad.importExport.exportdokuwiki = DokuWiki
+pad.modals.connected = З'єднано.
+pad.modals.reconnecting = Перепідлючення до Вашого документу..
+pad.modals.forcereconnect = Примусове перепідключення
+pad.modals.uderdup = Відкрито у іншому вікні
+pad.modals.userdup.explanation = Документ, можливо, відкрито більш ніж в одному вікні браузера на цьому комп'ютері.
+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.modals.disconnected = Вас було від'єднано.
+pad.modals.disconnected.explanation = З'єднання з сервером втрачено
+pad.modals.disconnected.cause = Сервер, можливо, недоступний. Будь ласка, повідомте нам, якщо це повторюватиметься.
+pad.share = Поділитись
+pad.share.readonly = Тільки читання
+pad.share.link = Посилання
+pad.share.emebdcode = Вставити URL
+pad.chat = Чат
+pad.chat.title = Відкрити чат для цього документу.
+timeslider.pageTitle = Часова шкала {{appTitle}}
+timeslider.toolbar.returnbutton = Повернутись до документу
+timeslider.toolbar.authors = Автори:
+timeslider.toolbar.authorsList = Немає авторів
+timeslider.exportCurrent = Експортувати поточну версію як:

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 21/31] 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 22/31] 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 23/31] 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 24/31] 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 25/31] 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 26/31] 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 27/31] 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 28/31] 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 29/31] 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 30/31] 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 31/31] 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;