updated sources to 1.6.0

sources/.gitignore

@@ -2,6 +2,7 @@ node_modules
 settings.json
 !settings.json.template
 APIKEY.txt
+SESSIONKEY.txt
 bin/abiword.exe
 bin/node.exe
 etherpad-lite-win.zip
@@ -15,3 +16,5 @@ npm-debug.log
 .ep_initialized
 *.crt
 *.key
+bin/etherpad-1.deb
+credentials.json

sources/.travis.yml

@@ -3,7 +3,7 @@ node_js:
   - "0.10"
 install:
   - "bin/installDeps.sh"
-  - "export GIT_HASH=$(cat .git/HEAD | head -c 7)"
+  - "export GIT_HASH=$(git rev-parse --verify --short HEAD)"
 before_script:
   - "tests/frontend/travis/sauce_tunnel.sh"
 script:

sources/CHANGELOG.md

@@ -1,3 +1,56 @@
+# 1.6.0
+ * SECURITY: Fix a possible xss attack in iframe link
+ * NEW: Add a aceSelectionChanged hook to allow plugins to react when the cursor location changes.
+ * NEW: Accepting Arrays on 'exportHtmlAdditionalTags' to handle attributes stored as ['key', 'value']
+ * NEW: Allow admin to run on a sub-directory
+ * NEW: Support version 5 of node.js
+ * NEW: Update windows build to node version 4.4.3
+ * NEW: Create setting to control if a new line will be indented or not
+ * NEW: Add an appendText API
+ * NEW: Allow LibreOffice to be used when exporting a pad
+ * NEW: Create hook exportHtmlAdditionalTagsWithData
+ * NEW: Improve DB migration performance
+ * NEW: allow settings to be applied from the filesystem 
+ * NEW: remove applySettings hook and allow credentials.json to be part of core
+ * NEW: Use exec to switch to node process
+ * NEW: Validate incoming color codes
+ * Fix: Avoid space removal when pasting text from word processor.
+ * Fix: Removing style that makes editor scroll to the top on iOS without any action from the user
+ * Fix: Fix API call appendChatMessage to send new message to all connected clients
+ * Fix: Timeslider "Return to pad" button
+ * Fix: Generating pad HTML with tags like <span data-TAG="VALUE"> instead of <TAG:VALUE>
+ * Fix: Get git commit hash even if the repo only points to a bare repo.
+ * Fix: Fix decode error if pad name contains special characters and is sanitized
+ * Fix: Fix handleClientMessage_USER_* payloads not containing user info
+ * Fix: Set language cookie on initial load
+ * Fix: Timeslider Not Translated
+ * Other: set charset for mysql connection in settings.json
+ * Other: Dropped support for io.js
+ * Other: Add support to store credentials in credentials.json
+ * Other: Support node version 4 or higher
+ * Other: Update uberDB to version 0.3.0
+
+# 1.5.7
+ * NEW: Add support for intermediate CA certificates for ssl
+ * NEW: Provide a script to clean up before running etherpad
+ * NEW: Use ctrl+shift+1 to do a ordered list
+ * NEW: Show versions of plugins on startup
+ * NEW: Add author on padCreate and padUpdate hook
+ * Fix: switchToPad method
+ * Fix: Dead keys
+ * Fix: Preserve new lines in copy-pasted text
+ * Fix: Compatibility mode on IE 
+ * Fix: Content Collector to get the class of the DOM-node
+ * Fix: Timeslider export links
+ * Fix: Double prompt on file upload
+ * Fix: setText() replaces the entire pad text
+ * Fix: Accessibility features on embedded pads
+ * Fix: Tidy HTML before abiword conversion
+ * Fix: Remove edit buttons in read-only view
+ * Fix: Disable user input in read-only view
+ * Fix: Pads end with a single newline, rather than two newlines
+ * Fix: Toolbar and chat for mobile devices
+
 # 1.5.6
  * Fix: Error on windows installations
 

sources/README.md

@@ -4,7 +4,7 @@
 # About
 Etherpad is a really-real time collaborative editor maintained by the Etherpad Community.
 
-Etherpad is written in Javascript(99.9%) on both the server and client so it's easy for developers to maintain and add new features.  Because of this Etherpad has tons of customizations that you can leverage.
+Etherpad is written in JavaScript (99.9%) on both the server and client so it's easy for developers to maintain and add new features.  Because of this Etherpad has tons of customizations that you can leverage.
 
 Etherpad is designed to be easily embeddable and provides a [HTTP API](https://github.com/ether/etherpad-lite/wiki/HTTP-API)
 that allows your web application to manage pads, users and groups. It is recommended to use the [available client implementations](https://github.com/ether/etherpad-lite/wiki/HTTP-API-client-libraries) in order to interact with this API. 

sources/bin/buildForWindows.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-NODE_VERSION="0.12.2"
+NODE_VERSION="4.4.3"
 
 #Move to the folder where ep-lite is installed
 cd `dirname $0`
@@ -29,11 +29,11 @@ hash unzip > /dev/null 2>&1 || {
 }
 
 START_FOLDER=$(pwd);
+TMP_FOLDER=$(mktemp -d)
 
-echo "create a clean environment in /tmp/etherpad-lite-win..." 
+echo "create a clean environment in $TMP_FOLDER..."
-rm -rf /tmp/etherpad-lite-win
+cp -ar . $TMP_FOLDER
-cp -ar . /tmp/etherpad-lite-win
+cd $TMP_FOLDER
-cd /tmp/etherpad-lite-win
 rm -rf node_modules
 rm -f etherpad-lite-win.zip
 
@@ -50,21 +50,20 @@ mv node_modules_resolved node_modules
 
 echo "download windows node..."
 cd bin
-wget "http://nodejs.org/dist/v$NODE_VERSION/node.exe" -O ../node.exe
+wget "https://nodejs.org/dist/v$NODE_VERSION/win-x86/node.exe" -O ../node.exe
 
 echo "remove git history to reduce folder size"
 rm -rf .git/objects
 
 echo "remove windows jsdom-nocontextify/test folder"
-rm -rf /tmp/etherpad-lite-win/src/node_modules/wd/node_modules/request/node_modules/form-data/node_modules/combined-stream/test
+rm -rf $TMP_FOLDER/src/node_modules/wd/node_modules/request/node_modules/form-data/node_modules/combined-stream/test
-rm -rf /tmp/etherpad-lite-win/src/node_modules/nodemailer/node_modules/mailcomposer/node_modules/mimelib/node_modules/encoding/node_modules/iconv-lite/encodings/tables
+rm -rf $TMP_FOLDER/src/node_modules/nodemailer/node_modules/mailcomposer/node_modules/mimelib/node_modules/encoding/node_modules/iconv-lite/encodings/tables
 
 echo "create the zip..."
-cd /tmp
+cd $TMP_FOLDER
-zip -9 -r etherpad-lite-win.zip etherpad-lite-win
+zip -9 -r $START_FOLDER/etherpad-lite-win.zip ./*
-mv etherpad-lite-win.zip $START_FOLDER
 
 echo "clean up..."
-rm -rf /tmp/etherpad-lite-win
+rm -rf $TMP_FOLDER
 
 echo "Finished. You can find the zip in the Etherpad root folder, it's called etherpad-lite-win.zip"

sources/bin/convert.js

@@ -34,13 +34,13 @@ var sql = "SET CHARACTER SET UTF8;\n" +
 fs.writeSync(sqlOutput, sql);
 log("done");
 
-//set setings for ep db
+var etherpadDB = mysql.createConnection({
-var etherpadDB= new mysql.Client();
+  host     : settings.etherpadDB.host,
-etherpadDB.host = settings.etherpadDB.host; 
+  user     : settings.etherpadDB.user,
-etherpadDB.port = settings.etherpadDB.port;
+  password : settings.etherpadDB.password,
-etherpadDB.database = settings.etherpadDB.database; 
+  database : settings.etherpadDB.database,
-etherpadDB.user = settings.etherpadDB.user; 
+  port     : settings.etherpadDB.port
-etherpadDB.password = settings.etherpadDB.password; 
+});
 
 //get the timestamp once
 var timestamp = new Date().getTime();

sources/bin/installDeps.sh

@@ -46,15 +46,11 @@ fi
 #check node version
 NODE_VERSION=$(node --version)
 NODE_V_MINOR=$(echo $NODE_VERSION | cut -d "." -f 1-2)
-#iojs version checking added
+NODE_V_MAIN=$(echo $NODE_VERSION | cut -d "." -f 1)
-if hash iojs 2>/dev/null; then
+NODE_V_MAIN=${NODE_V_MAIN#"v"}
-  IOJS_VERSION=$(iojs --version)
+if [ ! $NODE_V_MINOR = "v0.10" ] && [ ! $NODE_V_MINOR = "v0.11" ] && [ ! $NODE_V_MINOR = "v0.12" ] && [ ! $NODE_V_MAIN -ge 4 ]; then
-fi
+  echo "You're running a wrong version of node. You're using $NODE_VERSION, we need node v0.10.x or higher" >&2
-if [ ! $NODE_V_MINOR = "v0.10" ] && [ ! $NODE_V_MINOR = "v0.11" ] && [ ! $NODE_V_MINOR = "v0.12" ]; then
+  exit 1
-  if [ ! $IOJS_VERSION ]; then
-    echo "You're running a wrong version of node, or io.js is not installed. You're using $NODE_VERSION, we need v0.10.x, v0.11.x or v0.12.x" >&2
-    exit 1
-  fi
 fi
 
 #Get the name of the settings file

sources/bin/installOnWindows.bat

@@ -6,11 +6,6 @@ cd /D "%~dp0\.."
 :: Is node installed?
 cmd /C node -e "" || ( echo "Please install node.js ( http://nodejs.org )" && exit /B 1 )
 
-echo _
-echo Checking node version...
-set check_version="if(['10','11','12'].indexOf(process.version.split('.')[1]) === -1 && process.version.split('.')[0] !== '1') { console.log('You are running a wrong version of Node. Etherpad requires v0.10+'); process.exit(1) }"
-cmd /C node -e %check_version% || exit /B 1
-
 echo _
 echo Ensure that all dependencies are up to date...  If this is the first time you have run Etherpad please be patient.
 cmd /C npm install src/ --loglevel warn || exit /B 1

sources/bin/migrateDirtyDBtoMySQL.js

@@ -1,18 +0,0 @@
-require("ep_etherpad-lite/node_modules/npm").load({}, function(er,npm) {
-
-  process.chdir(npm.root+'/..')
-
-  var settings = require("ep_etherpad-lite/node/utils/Settings");
-  var dirty = require("ep_etherpad-lite/node_modules/ueberDB/node_modules/dirty")('var/dirty.db');
-  var db = require("ep_etherpad-lite/node/db/DB");
-
-  db.init(function() {
-    db = db.db;
-    dirty.on("load", function() {
-      dirty.forEach(function(key, value) {
-        db.set(key, value);
-      });
-    });
-  });
-
-});

sources/bin/migrateDirtyDBtoRealDB.js

@@ -0,0 +1,38 @@
+require("ep_etherpad-lite/node_modules/npm").load({}, function(er,npm) {
+
+  process.chdir(npm.root+'/..')
+
+  // This script requires that you have modified your settings.json file
+  // to work with a real database.  Please make a backup of your dirty.db
+  // file before using this script, just to be safe.
+
+  var settings = require("ep_etherpad-lite/node/utils/Settings");
+  var dirty = require("dirty")('var/dirty.db');
+  var ueberDB = require("../src/node_modules/ueberDB");
+  var log4js = require("../src/node_modules/log4js");
+  var dbWrapperSettings = {
+      "cache": "0",         // The cache slows things down when you're mostly writing.
+  };
+  var db = new ueberDB.database(settings.dbType, settings.dbSettings, dbWrapperSettings, log4js.getLogger("ueberDB"));
+
+  db.init(function() {
+      console.log("Waiting for dirtyDB to parse its file.");
+      dirty.on("load", function(length) {
+          console.log("Loaded " + length + " records, processing now.");
+          var remaining = length;
+          dirty.forEach(function(key, value) {
+              db.set(key, value, function(error) {
+                  if (typeof error != 'undefined') {
+                      console.log("Unexpected result handling: ", key, value, " was: ", error);
+                  }
+                  remaining -= 1;
+                  var oldremaining = remaining;
+                  if ((oldremaining % 100) == 0) {
+                      console.log("Records not yet flushed to database: ", remaining);
+                  }
+              });
+          });
+      console.log("Please wait for all records to flush to database, then kill this process.");
+    });
+  });
+});

sources/bin/rebuildPad.js

@@ -79,6 +79,9 @@ async.series([
     newPad.pool.numToAttrib = oldPad.pool.numToAttrib;
     for(var curRevNum = 0; curRevNum <= newRevHead; curRevNum++) {
       db.db.get("pad:" + padId + ":revs:" + curRevNum, function(err, rev) {
+        if (rev.meta) {
+          throw "The specified revision number could not be found.";
+        }
         var newRevNum = ++newPad.head;
         var newRevId = "pad:" + newPad.id + ":revs:" + newRevNum;
         db.db.set(newRevId, rev);

sources/bin/run.sh

@@ -21,7 +21,7 @@ if [ "$(id -u)" -eq 0 ] && [ $ignoreRoot -eq 0 ]; then
    echo "You shouldn't start Etherpad as root!"
    echo "Please type 'Etherpad rocks my socks' or supply the '--root' argument if you still want to start it as root"
    read rocks
-   if [ ! $rocks = "Etherpad rocks my socks" ]
+   if [ ! "$rocks" == "Etherpad rocks my socks" ]
    then
      echo "Your input was incorrect"
      exit 1
@@ -35,5 +35,5 @@ bin/installDeps.sh $* || exit 1
 echo "Started Etherpad..."
 
 SCRIPTPATH=`pwd -P`
-node $SCRIPTPATH/node_modules/ep_etherpad-lite/node/server.js $*
+exec node $SCRIPTPATH/node_modules/ep_etherpad-lite/node/server.js $*
 

sources/doc/api/editorInfo.md

@@ -37,13 +37,19 @@ Returns the `rep` object.
 ## editorInfo.ace_isCaret(?)
 ## editorInfo.ace_getLineAndCharForPoint(?)
 ## editorInfo.ace_performDocumentApplyAttributesToCharRange(?)
-## editorInfo.ace_setAttributeOnSelection(?)
+## editorInfo.ace_setAttributeOnSelection(attribute, enabled)
+Sets an attribute on current range.
+Example: `call.editorInfo.ace_setAttributeOnSelection("turkey::balls", true); // turkey is the attribute here, balls is the value
+Notes: to remove the attribute pass enabled as false
 ## editorInfo.ace_toggleAttributeOnSelection(?)
-## editorInfo.ace_getAttributeOnSelection(attribute)
+## editorInfo.ace_getAttributeOnSelection(attribute, prevChar)
 Returns a boolean if an attribute exists on a selected range.
+prevChar value should be true if you want to get the previous Character attribute instead of the current selection for example
+if the caret is at position 0,1 (after first character) it's probable you want the attributes on the character at 0,0
 The attribute should be the string name of the attribute applied to the selection IE subscript
 Example usage: Apply the activeButton Class to a button if an attribute is on a highlighted/selected caret position or range.
-Example: `call.editorInfo.ace_getAttributeOnSelection("subscript");` // call here is the callstack from aceEditEvent.
+Example `var isItThere = documentAttributeManager.getAttributeOnSelection("turkey::balls", true);`
+
 See the ep_subscript plugin for an example of this function in action.
 Notes: Does not work on first or last character of a line.  Suffers from a race condition if called with aceEditEvent.
 ## editorInfo.ace_performSelectionChange(?)

sources/doc/api/hooks_client-side.md

@@ -111,7 +111,7 @@ Called from: src/static/js/ace.js
 
 Things in context: None
 
-This hook is provided to allow custom CSS files to be loaded. The return value should be an array of paths relative to the plugins directory.
+This hook is provided to allow custom CSS files to be loaded. The return value should be an array of resource urls or paths relative to the plugins directory.
 
 ## aceInitInnerdocbodyHead
 Called from: src/static/js/ace.js
@@ -160,7 +160,19 @@ Things in context:
 1. ace - the ace object that is applied to this editor.
 2. pad - the pad object of the current pad.
 
-There doesn't appear to be any example available of this particular hook being used, but it gets fired after the editor is all set up.
+## postToolbarInit
+Called from: src/static/js/pad_editbar.js
+
+Things in context:
+
+1. ace - the ace object that is applied to this editor.
+2. toolbar - Editbar instance. See below for the Editbar documentation.  
+
+Can be used to register custom actions to the toolbar.
+
+Usage examples: 
+
+* [https://github.com/tiblu/ep_authorship_toggle]()
 
 ## postTimesliderInit
 Called from: src/static/js/timeslider.js
@@ -203,10 +215,10 @@ Things in context:
 
 This hook is called before the content of a node is collected by the usual methods. The cc object can be used to do a bunch of things that modify the content of the pad. See, for example, the heading1 plugin for etherpad original.
 
-E.g. if you need to apply an attribute to newly inserted characters, 
+E.g. if you need to apply an attribute to newly inserted characters,
 call cc.doAttrib(state, "attributeName") which results in an attribute attributeName=true.
 
-If you want to specify also a value, call cc.doAttrib(state, "attributeName:value")
+If you want to specify also a value, call cc.doAttrib(state, "attributeName::value")
 which results in an attribute attributeName=value.
 
 
@@ -257,7 +269,7 @@ This hook gets called every time the client receives a message of type `name`. T
 
 `collab_client.js` has a pretty extensive list of message types, if you want to take a look.
 
-##aceStartLineAndCharForPoint-aceEndLineAndCharForPoint 
+##aceStartLineAndCharForPoint-aceEndLineAndCharForPoint
 Called from: src/static/js/ace2_inner.js
 
 Things in context:
@@ -272,7 +284,7 @@ Things in context:
 This hook is provided to allow a plugin to turn DOM node selection into [line,char] selection.
 The return value should be an array of [line,char]
 
-##aceKeyEvent 
+##aceKeyEvent
 Called from: src/static/js/ace2_inner.js
 
 Things in context:
@@ -286,7 +298,7 @@ Things in context:
 This hook is provided to allow a plugin to handle key events.
 The return value should be true if you have handled the event.
 
-##collectContentLineText 
+##collectContentLineText
 Called from: src/static/js/contentcollector.js
 
 Things in context:
@@ -299,7 +311,7 @@ Things in context:
 This hook allows you to validate/manipulate the text before it's sent to the server side.
 The return value should be the validated/manipulated text.
 
-##collectContentLineBreak 
+##collectContentLineBreak
 Called from: src/static/js/contentcollector.js
 
 Things in context:
@@ -311,7 +323,7 @@ Things in context:
 This hook is provided to allow whether the br tag should induce a new magic domline or not.
 The return value should be either true(break the line) or false.
 
-##disableAuthorColorsForThisLine 
+##disableAuthorColorsForThisLine
 Called from: src/static/js/linestylefilter.js
 
 Things in context:
@@ -339,3 +351,14 @@ Things in context:
 
 This hook is provided to allow author highlight style to be modified.
 Registered hooks should return 1 if the plugin handles highlighting.  If no plugin returns 1, the core will use the default background-based highlighting.
+
+## aceSelectionChanged
+Called from: src/static/js/ace2_inner.js
+
+Things in context:
+
+1. rep - information about where the user's cursor is
+2. documentAttributeManager - information about attributes in the document
+
+This hook allows a plugin to react to a cursor or selection change,
+perhaps to update a UI element based on the style at the cursor location.

sources/doc/api/hooks_server-side.md

@@ -81,7 +81,7 @@ Available blocks in `pad.html` are:
  * `modals` - Contains all connectivity messages
  * `embedPopup` - the embed dropdown
  * `scripts` - Add your script tags here, if you really have to (consider use client-side hooks instead)
- 
+
 `timeslider.html` blocks:
 
  * `timesliderStyles`
@@ -90,9 +90,9 @@ Available blocks in `pad.html` are:
  * `timesliderTop`
  * `timesliderEditbarRight`
  * `modals`
- 
+
  `index.html` blocks:
- 
+
  * `indexWrapper` - contains the form for creating new pads
 
 ## padInitToolbar
@@ -104,12 +104,17 @@ Things in context:
 
 Here you can add custom toolbar items that will be available in the toolbar config in `settings.json`. For more about the toolbar controller see the API section.
 
+Usage examples: 
+
+* [https://github.com/tiblu/ep_authorship_toggle]()
+
 ## padCreate
 Called from: src/node/db/Pad.js
 
 Things in context:
 
 1. pad - the pad instance
+2. author - the id of the author who created the pad
 
 This hook gets called when a new pad was created.
 
@@ -128,6 +133,7 @@ Called from: src/node/db/Pad.js
 Things in context:
 
 1. pad - the pad instance
+2. author - the id of the author who updated the pad
 
 This hook gets called when an existing pad was updated.
 
@@ -214,6 +220,32 @@ function handleMessage ( hook, context, callback ) {
 };
 ```
 
+## handleMessageSecurity
+Called from: src/node/handler/PadMessageHandler.js
+
+Things in context:
+
+1. message - the message being handled
+2. client - the client object from socket.io
+
+This hook will be called once a message arrives. If a plugin calls `callback(true)` the message will be allowed to be processed. This is especially useful if you want read only pad visitors to update pad contents for whatever reason.
+
+**WARNING**: handleMessageSecurity will be called, even if the client is not authorized to send this message. It's up to the plugin to check permissions.
+
+Example:
+
+```
+function handleMessageSecurity ( hook, context, callback ) {
+  if ( context.message.boomerang == 'hipster' ) {
+    // If the message boomer is hipster, allow the request
+    callback(true);
+  }else{
+    callback();
+  }
+};
+```
+
+
 ## clientVars
 Called from: src/node/handler/PadMessageHandler.js
 
@@ -306,7 +338,7 @@ exports.aceAttribClasses = function(hook_name, attr, cb){
 ```
 
 ## exportFileName
-Called from src/node/handler/ExportHandler.js 
+Called from src/node/handler/ExportHandler.js
 
 Things in context:
 
@@ -329,7 +361,7 @@ Things in context:
 
 1. Pad object
 
-This hook will allow a plug-in developer to include more properties and attributes to support during HTML Export.  An Array should be returned.
+This hook will allow a plug-in developer to include more properties and attributes to support during HTML Export. If tags are stored as `['color', 'red']` on the attribute pool, use `exportHtmlAdditionalTagsWithData` instead. An Array should be returned.
 
 Example:
 ```
@@ -340,6 +372,24 @@ exports.exportHtmlAdditionalTags = function(hook, pad, cb){
 };
 ```
 
+## exportHtmlAdditionalTagsWithData
+Called from src/node/utils/ExportHtml.js
+
+Things in context:
+
+1. Pad object
+
+Identical to `exportHtmlAdditionalTags`, but for tags that are stored with an specific value (not simply `true`) on the attribute pool. For example `['color', 'red']`, instead of `['bold', true]`. This hook will allow a plug-in developer to include more properties and attributes to support during HTML Export. An Array of arrays should be returned. The exported HTML will contain tags like `<span data-color="red">` for the content where attributes are `['color', 'red']`.
+
+Example:
+```
+// Add the props to be supported in export
+exports.exportHtmlAdditionalTagsWithData = function(hook, pad, cb){
+  var padId = pad.id;
+  cb([["color", "red"], ["color", "blue"]]);
+};
+```
+
 ## userLeave
 Called from src/node/handler/PadMessageHandler.js
 
@@ -356,3 +406,20 @@ exports.userLeave = function(hook, session, callback) {
   console.log('%s left pad %s', session.author, session.padId);
 };
 ```
+
+### clientReady
+Called from src/node/handler/PadMessageHandler.js
+
+This in context:
+
+1. message
+
+This hook gets called when handling a CLIENT_READY which is the first message from the client to the server.
+
+Example:
+
+```
+exports.clientReady = function(hook, message) {
+  console.log('Client has entered the pad' + message.padId);
+};
+```

sources/doc/api/http_api.md

@@ -61,7 +61,7 @@ Portal submits content into new blog post
 ## Usage
 
 ### API version
-The latest version is `1.2.12`
+The latest version is `1.2.13`
 
 The current version can be queried via /api.
 
@@ -280,6 +280,16 @@ returns the text of a pad
 
 sets the text of a pad
 
+*Example returns:*
+  * `{code: 0, message:"ok", data: null}`
+  * `{code: 1, message:"padID does not exist", data: null}`
+  * `{code: 1, message:"text too long", data: null}`
+
+#### appendText(padID, text)
+ * API >= 1.2.13
+
+appends text to a pad
+
 *Example returns:*
   * `{code: 0, message:"ok", data: null}`
   * `{code: 1, message:"padID does not exist", data: null}`
@@ -380,6 +390,16 @@ returns the chatHead (last number of the last chat-message) of the pad
 * `{code: 0, message:"ok", data: {chatHead: 42}}`
 * `{code: 1, message:"padID does not exist", data: null}`
 
+#### appendChatMessage(padID, text, authorID [, time])
+ * API >= 1.2.12
+
+creates a chat message, saves it to the database and sends it to all connected clients of this pad
+
+
+*Example returns:*
+
+* `{code: 0, message:"ok", data: null}`
+* `{code: 1, message:"text is no string", data: null}`
 
 ### Pad
 Group pads are normal pads, but with the name schema GROUPID$PADNAME. A security manager controls access of them and its forbidden for normal pads to include a $ in the name. 

sources/settings.json.template

@@ -2,6 +2,9 @@
   This file must be valid JSON. But comments are allowed
 
   Please edit settings.json, not settings.json.template
+
+  To still commit settings without credentials you can 
+  store any credential settings in credentials.json
 */
 {
   // Name your instance!
@@ -10,12 +13,12 @@
   // favicon default name
   // alternatively, set up a fully specified Url to your own favicon
   "favicon": "favicon.ico",
-  
+
   //IP and port which etherpad should bind at
   "ip": "0.0.0.0",
   "port" : 9001,
 
-  /*  
+  /*
   // Node native SSL support
   // this is disabled by default
   //
@@ -24,7 +27,7 @@
 
   "ssl" : {
             "key"  : "/path-to-your/epl-server.key",
-            "cert" : "/path-to-your/epl-server.crt"
+            "cert" : "/path-to-your/epl-server.crt",
             "ca": ["/path-to-your/epl-intermediate-cert1.crt", "/path-to-your/epl-intermediate-cert2.crt"]
           },
 
@@ -37,17 +40,18 @@
   "dbSettings" : {
                    "filename" : "var/dirty.db"
                  },
-                 
+
   /* An Example of MySQL Configuration
    "dbType" : "mysql",
    "dbSettings" : {
-                    "user"    : "root", 
+                    "user"    : "root",
-                    "host"    : "localhost", 
+                    "host"    : "localhost",
-                    "password": "", 
+                    "password": "",
-                    "database": "store"
+                    "database": "store",
+                    "charset" : "utf8mb4"
                   },
   */
-  
+
   //the default text of a pad
   "defaultPadText" : "Welcome to Etherpad!\n\nThis pad text is synchronized as you type, so that everyone viewing this page sees the same text. This allows you to collaborate seamlessly on documents!\n\nGet involved with Etherpad at http:\/\/etherpad.org\n",
 
@@ -65,8 +69,8 @@
     "chatAndUsers": false,
     "lang": "en-gb"
   },
-  
+
-  /* Shoud we suppress errors from being visible in the default Pad Text? */
+  /* Should we suppress errors from being visible in the default Pad Text? */
   "suppressErrorsInPadText" : false,
 
   /* Users must have a session to access pads. This effectively allows only group pads to be accessed. */
@@ -77,35 +81,43 @@
 
   /* Users, who have a valid session, automatically get granted access to password protected pads */
   "sessionNoPassword" : false,
-  
+
-  /* if true, all css & js will be minified before sending to the client. This will improve the loading performance massivly, 
+  /* if true, all css & js will be minified before sending to the client. This will improve the loading performance massivly,
      but makes it impossible to debug the javascript/css */
   "minify" : true,
 
   /* How long may clients use served javascript code (in seconds)? Without versioning this
      may cause problems during deployment. Set to 0 to disable caching */
   "maxAge" : 21600, // 60 * 60 * 6 = 6 hours
-  
+
-  /* This is the path to the Abiword executable. Setting it to null, disables abiword.
+  /* This is the absolute path to the Abiword executable. Setting it to null, disables abiword.
-     Abiword is needed to advanced import/export features of pads*/  
+     Abiword is needed to advanced import/export features of pads*/
   "abiword" : null,
 
+  /* This is the absolute path to the soffice executable. Setting it to null, disables LibreOffice exporting.
+     LibreOffice can be used in lieu of Abiword to export pads */
+  "soffice" : null,
+
+  /* This is the path to the Tidy executable. Setting it to null, disables Tidy.
+     Tidy is used to improve the quality of exported pads*/
+  "tidyHtml" : null,
+
   /* Allow import of file types other than the supported types: txt, doc, docx, rtf, odt, html & htm */
   "allowUnknownFileEnds" : true,
- 
+
   /* This setting is used if you require authentication of all users.
      Note: /admin always requires authentication. */
   "requireAuthentication" : false,
 
   /* Require authorization by a module, or a user with is_admin set, see below. */
   "requireAuthorization" : false,
-  
+
   /*when you use NginX or another proxy/ load-balancer set this to true*/
   "trustProxy" : false,
-  
+
   /* Privacy: disable IP logging */
-  "disableIPlogging" : false,  
+  "disableIPlogging" : false,
-  
+
   /* Users for basic authentication. is_admin = true gives access to /admin.
      If you do not uncomment this, /admin will not be available! */
   /*
@@ -126,7 +138,12 @@
 
   // Allow Load Testing tools to hit the Etherpad Instance.  Warning this will disable security on the instance.
   "loadTest": false,
-  
+
+  // Disable indentation on new line when previous line ends with some special chars (':', '[', '(', '{')
+  /*
+  "indentationOnNewLine": false,
+  */
+
   /* The toolbar buttons configuration.
   "toolbar": {
     "left": [
@@ -148,7 +165,7 @@
 
   /* The log level we are using, can be: DEBUG, INFO, WARN, ERROR */
   "loglevel": "INFO",
-  
+
   //Logging configuration. See log4js documentation for further information
   // https://github.com/nomiddlename/log4js-node
   // You can add as many appenders as you want here:

sources/src/locales/ar.json

@@ -5,7 +5,9 @@
 			"Tux-tn",
 			"Alami",
 			"Meno25",
-			"Test Create account"
+			"Test Create account",
+			"محمد أحمد عبد الفتاح",
+			"Haytham morsy"
 		]
 	},
 	"index.newPad": "باد جديد",
@@ -37,6 +39,7 @@
 	"pad.settings.padSettings": "إعدادات الباد",
 	"pad.settings.myView": "رؤيتي",
 	"pad.settings.stickychat": "الدردشة دائما على الشاشة",
+	"pad.settings.chatandusers": "أظهر الدردشة والمستخدمين",
 	"pad.settings.colorcheck": "ألوان التأليف",
 	"pad.settings.linenocheck": "أرقام الأسطر",
 	"pad.settings.rtlcheck": "قراءة المحتويات من اليمين إلى اليسار؟",
@@ -95,6 +98,9 @@
 	"timeslider.exportCurrent": "تصدير النسخة الحالية ك:",
 	"timeslider.version": "إصدار {{version}}",
 	"timeslider.saved": "محفوظ {{month}} {{day}}, {{year}}",
+	"timeslider.playPause": "تشغيل / إيقاف مؤقت محتويات الباد",
+	"timeslider.backRevision": "عد إلى مراجعة في هذه الباد",
+	"timeslider.forwardRevision": "انطلق إلى مراجعة في هذه الباد",
 	"timeslider.dateformat": "{{day}}/{{month}}/{{year}} {{hours}}:{{minutes}}:{{seconds}}",
 	"timeslider.month.january": "يناير",
 	"timeslider.month.february": "فبراير",
@@ -110,6 +116,7 @@
 	"timeslider.month.december": "ديسمبر",
 	"timeslider.unnamedauthors": "بدون اسم {{num}} {[plural(num) واحد: كاتب، آخر: مؤلف]}",
 	"pad.savedrevs.marked": "هذا التنقيح محدد الآن كمراجعة محفوظة",
+	"pad.savedrevs.timeslider": "يمكنك عرض المراجعات المحفوظة بزيارة متصفح التاريخ",
 	"pad.userlist.entername": "أدخل اسمك",
 	"pad.userlist.unnamed": "غير مسمى",
 	"pad.userlist.guest": "ضيف",

sources/src/locales/ast.json

@@ -92,6 +92,9 @@
 	"timeslider.exportCurrent": "Esportar la versión actual como:",
 	"timeslider.version": "Versión {{version}}",
 	"timeslider.saved": "Guardáu el {{day}} de {{month}} de {{year}}",
+	"timeslider.playPause": "Reproducir/posar el conteníu del bloc",
+	"timeslider.backRevision": "Dir a la revisión anterior d'esti bloc",
+	"timeslider.forwardRevision": "Dir a la revisión siguiente d'esti bloc",
 	"timeslider.dateformat": "{{day}}/{{month}}/{{year}} {{hours}}:{{minutes}}:{{seconds}}",
 	"timeslider.month.january": "de xineru",
 	"timeslider.month.february": "de febreru",

sources/src/locales/az.json

@@ -4,7 +4,8 @@
 			"AZISS",
 			"Khan27",
 			"Mushviq Abdulla",
-			"Wertuose"
+			"Wertuose",
+			"Mastizada"
 		]
 	},
 	"index.newPad": "Yeni lövhə",
@@ -19,22 +20,24 @@
 	"pad.toolbar.unindent.title": "Çıxıntı (Shift+TAB)",
 	"pad.toolbar.undo.title": "Geri qaytar (Ctrl+Z)",
 	"pad.toolbar.redo.title": "Qaytar (Ctrl+Y)",
-	"pad.toolbar.clearAuthorship.title": "Müəlliflik Rənglərini Təmizlə",
+	"pad.toolbar.clearAuthorship.title": "Müəlliflik Rənglərini Təmizlə (Ctrl+Shift+C)",
 	"pad.toolbar.import_export.title": "Müxtəlif fayl formatların(a/dan) idxal/ixrac",
 	"pad.toolbar.timeslider.title": "Vaxt cədvəli",
-	"pad.toolbar.savedRevision.title": "Saxlanılan Düzəlişlər",
+	"pad.toolbar.savedRevision.title": "Düzəlişləri Saxla",
 	"pad.toolbar.settings.title": "Tənzimləmələr",
 	"pad.toolbar.embed.title": "Bu lövhəni paylaş və qur",
 	"pad.toolbar.showusers.title": "Lövhədəki istifadəçiləri göstər",
 	"pad.colorpicker.save": "Saxla",
 	"pad.colorpicker.cancel": "İmtina",
 	"pad.loading": "Yüklənir...",
+	"pad.noCookie": "Çərəz tapıla bilmədi. Lütfən səyyahınızda çərəzlərə icazə verinǃ",
 	"pad.passwordRequired": "Bu lövhəyə daxil olmaq üçün parol lazımdır",
 	"pad.permissionDenied": "Bu lövhəyə daxil olmaq üçün icazəniz yoxdur",
 	"pad.wrongPassword": "Sizin parolunuz səhvdir",
 	"pad.settings.padSettings": "Lövhə nizamlamaları",
 	"pad.settings.myView": "Mənim Görüntüm",
 	"pad.settings.stickychat": "Söhbət həmişə ekranda",
+	"pad.settings.chatandusers": "Gap və İstifadəçiləri Göstər",
 	"pad.settings.colorcheck": "Müəlliflik rəngləri",
 	"pad.settings.linenocheck": "Sətir nömrələri",
 	"pad.settings.rtlcheck": "Mühtəviyyat sağdan sola doğru oxunsunmu?",
@@ -77,7 +80,7 @@
 	"pad.modals.deleted.explanation": "Bu lövhə silindi.",
 	"pad.modals.disconnected": "Əlaqə kəsilib.",
 	"pad.modals.disconnected.explanation": "Serverə qoşulma itirilib",
-	"pad.modals.disconnected.cause": "Server istifadə olunmur. Əgər problem təkrarlanacaqsa, bizə bildirin.",
+	"pad.modals.disconnected.cause": "Server ola bilsin, əlçatmazdır. Əgər belə davam edərsə xidmət administratorunu xəbərdar edin.",
 	"pad.share": "Bu lövhəni paylaş",
 	"pad.share.readonly": "Yalnız oxuyun",
 	"pad.share.link": "Keçid",
@@ -93,6 +96,7 @@
 	"timeslider.exportCurrent": "Cari versiyanı ixrac etmək kimi:",
 	"timeslider.version": "Versiya {{version}}",
 	"timeslider.saved": "Saxlanıldı {{day}} {{month}}, {{year}}",
+	"timeslider.playPause": "Geri oxutma / Lövhə Məzmunlarını Dayandır",
 	"timeslider.dateformat": "{{day}} {{month}}, {{year}} {{hours}}:{{minutes}}:{{seconds}}",
 	"timeslider.month.january": "Yanvar",
 	"timeslider.month.february": "Fevral",

sources/src/locales/azb.json

@@ -3,7 +3,8 @@
 		"authors": [
 			"Amir a57",
 			"Mousa",
-			"Koroğlu"
+			"Koroğlu",
+			"Alp Er Tunqa"
 		]
 	},
 	"index.newPad": "یئنی یادداشت دفترچه سی",
@@ -11,21 +12,21 @@
 	"pad.toolbar.bold.title": "بویوت",
 	"pad.toolbar.italic.title": "مورب",
 	"pad.toolbar.underline.title": "خطدین آلتی",
-	"pad.toolbar.strikethrough.title": "خط یئمیش",
+	"pad.toolbar.strikethrough.title": "خط یئمیش (Ctrl+5)",
-	"pad.toolbar.ol.title": "جوتدنمیش فهرست",
+	"pad.toolbar.ol.title": "جوتدنمیش فهرست (Ctrl+Shift+N)",
-	"pad.toolbar.ul.title": "جوتدنممیش فهرست",
+	"pad.toolbar.ul.title": "جوتدنمه‌میش لیست (Ctrl+Shift+L)",
 	"pad.toolbar.indent.title": "ایچری باتدیگی",
-	"pad.toolbar.unindent.title": "ائشیگه چیخدیگی",
+	"pad.toolbar.unindent.title": "ائشیگه چیخدیغی (Shift+TAB)",
 	"pad.toolbar.undo.title": "باطل ائتمک",
 	"pad.toolbar.redo.title": "یئنی دن",
-	"pad.toolbar.clearAuthorship.title": "یازیچی رنگ لری پوزماق",
+	"pad.toolbar.clearAuthorship.title": "یازیچی رنگ لری پوزماق (Ctrl+Shift+C)",
 	"pad.toolbar.import_export.title": "آیری قالیب لردن /ایچری توکمه / ائشیگه توکمه",
 	"pad.toolbar.timeslider.title": "زمان اسلایدی",
-	"pad.toolbar.savedRevision.title": "ساخلانمیش نسخه لر",
+	"pad.toolbar.savedRevision.title": "نۆسخه‌نی ذخیره ائت",
 	"pad.toolbar.settings.title": "تنظیملر",
 	"pad.toolbar.embed.title": "بو یادداشت دفترچه سین یئرلتمک",
 	"pad.toolbar.showusers.title": "بو دفترچه یادداشت دا اولان کاربرلری گوستر",
-	"pad.colorpicker.save": "قئید ائت",
+	"pad.colorpicker.save": "ذخیره ائت",
 	"pad.colorpicker.cancel": "لغو ائت",
 	"pad.loading": "یوکلنیر...",
 	"pad.settings.padSettings": "یادداشت دفترچه سینین تنظیملر",
@@ -69,6 +70,7 @@
 	"timeslider.toolbar.returnbutton": "یادداشت دفترچه سینه قاییت",
 	"timeslider.toolbar.authors": "یازیچیلار",
 	"timeslider.toolbar.authorsList": "یازیچی سیز",
+	"timeslider.toolbar.exportlink.title": "ائشیگه آپارماق",
 	"timeslider.month.january": "ژانویه",
 	"timeslider.month.february": "فوریه",
 	"timeslider.month.march": "مارس",

sources/src/locales/be-tarask.json

@@ -94,6 +94,9 @@
 	"timeslider.exportCurrent": "Экспартаваць актуальную вэрсію як:",
 	"timeslider.version": "Вэрсія {{version}}",
 	"timeslider.saved": "Захавана {{day}}.{{month}}.{{year}}",
+	"timeslider.playPause": "Прайграць / спыніць зьмест дакумэнту",
+	"timeslider.backRevision": "Вярнуць рэдагаваньне гэтага дакумэнту",
+	"timeslider.forwardRevision": "Перайсьці да наступнага рэдагаваньня гэтага дакумэнту",
 	"timeslider.dateformat": "{{day}}/{{month}}/{{year}} {{hours}}:{{minutes}}:{{seconds}}",
 	"timeslider.month.january": "студзень",
 	"timeslider.month.february": "люты",

sources/src/locales/bn.json

@@ -10,16 +10,18 @@
 	},
 	"index.newPad": "নতুন প্যাড",
 	"index.createOpenPad": "অথবা নাম লিখে প্যাড খুলুন/তৈরী করুন:",
-	"pad.toolbar.bold.title": "গাড় করা (Ctrl-B)",
+	"pad.toolbar.bold.title": "গাঢ় (Ctrl-B)",
-	"pad.toolbar.italic.title": "বাঁকা করা (Ctrl-I)",
+	"pad.toolbar.italic.title": "বাঁকা (Ctrl+I)",
-	"pad.toolbar.underline.title": "আন্ডারলাইন (Ctrl-U)",
+	"pad.toolbar.underline.title": "নিম্নরেখা (Ctrl+U)",
-	"pad.toolbar.strikethrough.title": "স্ট্রাইক্থ্রু",
+	"pad.toolbar.strikethrough.title": "অবচ্ছেদন (Ctrl+5)",
-	"pad.toolbar.ol.title": "সারিবদ্ধ তালিকা",
+	"pad.toolbar.ol.title": "সারিবদ্ধ তালিকা (Ctrl+Shift+N)",
+	"pad.toolbar.ul.title": "অসারিবদ্ধ তালিকা (Ctrl+Shift+L)",
 	"pad.toolbar.indent.title": "প্রান্তিককরণ (TAB)",
 	"pad.toolbar.unindent.title": "আউটডেন্ট (Shift+TAB)",
 	"pad.toolbar.undo.title": "বাতিল করুন (Ctrl-Z)",
 	"pad.toolbar.redo.title": "পুনরায় করুন (Ctrl-Y)",
 	"pad.toolbar.clearAuthorship.title": "কৃতি রং পরিষ্কার করুন  (Ctrl+Shift+C)",
+	"pad.toolbar.import_export.title": "ভিন্ন ফাইল বিন্যাসে আমদানি/রপ্তানি করুন",
 	"pad.toolbar.timeslider.title": "টাইমস্লাইডার",
 	"pad.toolbar.savedRevision.title": "সংস্করণ সংরক্ষণ করুন",
 	"pad.toolbar.settings.title": "সেটিং",
@@ -27,24 +29,28 @@
 	"pad.toolbar.showusers.title": "এই প্যাডের ব্যবহারকারীদের দেখান",
 	"pad.colorpicker.save": "সংরক্ষণ",
 	"pad.colorpicker.cancel": "বাতিল",
-	"pad.loading": "লোডিং...",
+	"pad.loading": "লোড হচ্ছে...",
+	"pad.noCookie": "কুকি পাওয়া যায়নি। দয়া করে আপনার ব্রাউজারে কুকি অনুমতি দিন!",
 	"pad.passwordRequired": "এই প্যাড-টি দেখার জন্য আপনাকে পাসওয়ার্ড ব্যবহার করতে হবে",
 	"pad.permissionDenied": "দুঃখিত, এ প্যাড-টি দেখার অধিকার আপনার নেই",
 	"pad.wrongPassword": "আপনার পাসওয়ার্ড সঠিক নয়",
 	"pad.settings.padSettings": "প্যাডের স্থাপন",
 	"pad.settings.myView": "আমার দৃশ্য",
 	"pad.settings.stickychat": "চ্যাট সক্রীনে প্রদর্শন করা হবে",
+	"pad.settings.chatandusers": "চ্যাট এবং ব্যবহারকারী দেখান",
 	"pad.settings.colorcheck": "লেখকদের নিজস্ব নির্বাচিত রং",
 	"pad.settings.linenocheck": "লাইন নম্বর",
-	"pad.settings.fontType": "ফন্ট-এর প্রকার:",
+	"pad.settings.rtlcheck": "ডান থেকে বামে বিষয়বস্তু পড়বেন?",
+	"pad.settings.fontType": "ফন্টের প্রকার:",
 	"pad.settings.fontType.normal": "সাধারণ",
 	"pad.settings.fontType.monospaced": "Monospace",
 	"pad.settings.globalView": "সর্বব্যাপী দৃশ্য",
 	"pad.settings.language": "ভাষা:",
 	"pad.importExport.import_export": "আমদানি/রপ্তানি",
-	"pad.importExport.import": "কোন টেক্সট ফাইল বা ডকুমেন্ট আপলোড করুন",
+	"pad.importExport.import": "কোন টেক্সট ফাইল বা নথি আপলোড করুন",
 	"pad.importExport.importSuccessful": "সফল!",
 	"pad.importExport.export": "এই প্যাডটি রপ্তানি করুন:",
+	"pad.importExport.exportetherpad": "ইথারপ্যাড",
 	"pad.importExport.exporthtml": "এইচটিএমএল",
 	"pad.importExport.exportplain": "সাধারণ লেখা",
 	"pad.importExport.exportword": "মাইক্রোসফট ওয়ার্ড",
@@ -55,9 +61,11 @@
 	"pad.modals.forcereconnect": "পুনরায় সংযোগস্থাপনের চেষ্টা",
 	"pad.modals.userdup": "অন্য উইন্ডো-তে খোলা হয়েছে",
 	"pad.modals.unauth": "আপনার অধিকার নেই",
-	"pad.modals.initsocketfail": "সার্ভার-এর সাথে যোগাযোগ করতে অসক্ষম।",
+	"pad.modals.initsocketfail": "সার্ভারে পৌঁছানো যাচ্ছে না।",
+	"pad.modals.slowcommit.explanation": "সার্ভার সাড়া দিচ্ছে না।",
 	"pad.modals.deleted": "অপসারিত।",
 	"pad.modals.deleted.explanation": "এই প্যাডটি অপসারণ করা হয়েছে।",
+	"pad.modals.disconnected": "আপনি সংযোগ বিচ্ছিন্ন হয়েছে গেছে।",
 	"pad.modals.disconnected.explanation": "সার্ভারের সাথে যোগাযোগ করা যাচ্ছে না",
 	"pad.share": "শেয়ার করুন",
 	"pad.share.readonly": "শুধু পড়া",
@@ -86,11 +94,17 @@
 	"timeslider.month.october": "অক্টোবর",
 	"timeslider.month.november": "নভেম্বর",
 	"timeslider.month.december": "ডিসেম্বর",
-	"pad.userlist.entername": "আপনার নাম",
+	"timeslider.unnamedauthors": "নামবিহীন {{num}} জন {[plural(num) one: লেখক, other: লেখক ]}",
+	"pad.userlist.entername": "আপনার নাম লিখুন",
 	"pad.userlist.unnamed": "কোন নাম নির্বাচন করা হয়নি",
 	"pad.userlist.guest": "অতিথি",
+	"pad.userlist.deny": "প্রত্যাখ্যান",
 	"pad.userlist.approve": "অনুমোদিত",
 	"pad.impexp.importbutton": "এখন আমদানি করুন",
 	"pad.impexp.importing": "আমদানি হচ্ছে...",
-	"pad.impexp.importfailed": "আমদানি ব্যর্থ"
+	"pad.impexp.padHasData": "আমরা এই ফাইলটি আমদানি করতে সক্ষম হয়নি কারণ এই প্যাড ইতিমধ্যে পরিবর্তিত হয়েছে, দয়া করে একটি নতুন প্যাডে অামদানি করুন।",
+	"pad.impexp.uploadFailed": "আপলোড করতে ব্যর্থ, দয়া করে আবার চেষ্টা করুন",
+	"pad.impexp.importfailed": "আমদানি ব্যর্থ",
+	"pad.impexp.copypaste": "দয়া করে অনুলিপি প্রতিলেপন করুন",
+	"pad.impexp.exportdisabled": "{{type}} হিসেবে রপ্তানি করা নিষ্ক্রিয় আছে। বিস্তারিত জানার জন্য আপনার সিস্টেম প্রশাসকের সাথে যোগাযোগ করুন।"
 }

sources/src/locales/br.json

@@ -22,7 +22,7 @@
 	"pad.toolbar.clearAuthorship.title": "Diverkañ al livioù oc'h anaout an aozerien (Ktrl+Pennlizherenn+C)",
 	"pad.toolbar.import_export.title": "Enporzhiañ/Ezporzhiañ eus/war-zu ur furmad restr disheñvel",
 	"pad.toolbar.timeslider.title": "Istor dinamek",
-	"pad.toolbar.savedRevision.title": "Doareoù enrollet",
+	"pad.toolbar.savedRevision.title": "Enrollañ an adweladenn",
 	"pad.toolbar.settings.title": "Arventennoù",
 	"pad.toolbar.embed.title": "Rannañ hag enframmañ ar pad-mañ",
 	"pad.toolbar.showusers.title": "Diskwelet implijerien ar Pad",
@@ -95,6 +95,9 @@
 	"timeslider.exportCurrent": "Ezporzhiañ an doare bremañ evel :",
 	"timeslider.version": "Stumm {{version}}",
 	"timeslider.saved": "Enrollañ {{day}} {{month}} {{year}}",
+	"timeslider.playPause": "Lenn / Ehan endalc'hoù ar pad",
+	"timeslider.backRevision": "Kilit eus un adweladenn er pad-mañ",
+	"timeslider.forwardRevision": "Araogiñ un adweladenn er pad-mañ",
 	"timeslider.dateformat": "{{month}}/{{day}}/{{year}} {{hours}}:{{minutes}}:{{seconds}}",
 	"timeslider.month.january": "Genver",
 	"timeslider.month.february": "C'hwevrer",

sources/src/locales/ca.json

@@ -6,7 +6,9 @@
 			"Pitort",
 			"Toniher",
 			"Macofe",
-			"Joan manel"
+			"Joan manel",
+			"Eduardo Martinez",
+			"Jaumeortola"
 		]
 	},
 	"index.newPad": "Nou pad",
@@ -74,7 +76,7 @@
 	"pad.modals.slowcommit.explanation": "El servidor no respon.",
 	"pad.modals.slowcommit.cause": "Això podria ser a causa de problemes amb la connectivitat de la xarxa.",
 	"pad.modals.badChangeset.explanation": "El servidor de sincronització ha classificat com a il·legat una edició que heu fet.",
-	"pad.modals.badChangeset.cause": "Això pot ser degut a una configuració errònia del servidor o a algun altre comportament inesperat. Si us plau, si considereu que això és un error, contacteu amb l'administrador del servei. Intenteu reconnectar-vos per tal de continuar editant.",
+	"pad.modals.badChangeset.cause": "Això pot ser degut a una configuració errònia del servidor o a algun altre comportament inesperat. Si considereu que és un error, contacteu amb l'administrador del servei. Intenteu reconnectar-vos per a continuar editant.",
 	"pad.modals.corruptPad.explanation": "El pad al qual esteu intentant accedir està corrupte.",
 	"pad.modals.corruptPad.cause": "Això pot ser degut a una configuració errònia del servidor o a algun altre comportament inesperat. Si us plau, contacteu amb l'administrador del servei.",
 	"pad.modals.deleted": "Suprimit.",
@@ -97,6 +99,9 @@
 	"timeslider.exportCurrent": "Exporta la versió actual com a:",
 	"timeslider.version": "Versió {{version}}",
 	"timeslider.saved": "Desat {{month}} {{day}}, {{year}}",
+	"timeslider.playPause": "Reproducció / Pausa els continguts del pad",
+	"timeslider.backRevision": "Tornar una revisió enrere en aquest Pad",
+	"timeslider.forwardRevision": "Anar una revisió endavant en aquest Pad",
 	"timeslider.dateformat": "{{month}}/{{day}}/{{year}} {{hours}}:{{minutes}}:{{seconds}}",
 	"timeslider.month.january": "Gener",
 	"timeslider.month.february": "Febrer",

sources/src/locales/cs.json

@@ -5,7 +5,9 @@
 			"Jezevec",
 			"Juandev",
 			"Leanes",
-			"Quinn"
+			"Quinn",
+			"Aktron",
+			"Mormegil"
 		]
 	},
 	"index.newPad": "Založ nový Pad",
@@ -96,6 +98,9 @@
 	"timeslider.exportCurrent": "Exportovat nynější verzi jako:",
 	"timeslider.version": "Verze {{version}}",
 	"timeslider.saved": "Uloženo {{day}} {{month}} {{year}}",
+	"timeslider.playPause": "Pustit / pozastavit obsah padu",
+	"timeslider.backRevision": "Jít v tomto padu o revizi zpět",
+	"timeslider.forwardRevision": "Jít v tomto padu o revizi vpřed",
 	"timeslider.dateformat": "{{day}} {{month}} {{year}} {{hours}}:{{minutes}}:{{seconds}}",
 	"timeslider.month.january": "leden",
 	"timeslider.month.february": "únor",
@@ -109,7 +114,7 @@
 	"timeslider.month.october": "říjen",
 	"timeslider.month.november": "listopad",
 	"timeslider.month.december": "prosinec",
-	"timeslider.unnamedauthors": "{{num}} {[ plural(num) one: nejmenovaný Autor, few: nejmenovaní Autoři, other: nejmenovaných Autorů ]}",
+	"timeslider.unnamedauthors": "{{num}} {[plural(num) one: nejmenovaný autor, few: nejmenovaní autoři, other: nejmenovaných autorů ]}",
 	"pad.savedrevs.marked": "Tato revize je nyní označena jako uložená",
 	"pad.savedrevs.timeslider": "Návštěvou časové osy zobrazíte uložené revize",
 	"pad.userlist.entername": "Zadejte své jméno",

sources/src/locales/de.json

@@ -5,11 +5,12 @@
 			"Mklehr",
 			"Nipsky",
 			"Wikinaut",
-			"Thargon"
+			"Thargon",
+			"Predatorix"
 		]
 	},
 	"index.newPad": "Neues Pad",
-	"index.createOpenPad": "Pad mit folgendem Namen öffnen:",
+	"index.createOpenPad": "oder Pad mit folgendem Namen öffnen:",
 	"pad.toolbar.bold.title": "Fett (Strg-B)",
 	"pad.toolbar.italic.title": "Kursiv (Strg-I)",
 	"pad.toolbar.underline.title": "Unterstrichen (Strg-U)",
@@ -22,22 +23,22 @@
 	"pad.toolbar.redo.title": "Wiederholen (Strg-Y)",
 	"pad.toolbar.clearAuthorship.title": "Autorenfarben zurücksetzen (Strg+Shift+C)",
 	"pad.toolbar.import_export.title": "Import/Export von/zu verschiedenen Dateiformaten",
-	"pad.toolbar.timeslider.title": "Pad-Versionsgeschichte anzeigen",
+	"pad.toolbar.timeslider.title": "Bearbeitungsverlauf",
-	"pad.toolbar.savedRevision.title": "Version markieren",
+	"pad.toolbar.savedRevision.title": "Version speichern",
 	"pad.toolbar.settings.title": "Einstellungen",
-	"pad.toolbar.embed.title": "Pad teilen oder einbetten",
+	"pad.toolbar.embed.title": "Dieses Pad teilen oder einbetten",
-	"pad.toolbar.showusers.title": "Aktuell verbundene Benutzer anzeigen",
+	"pad.toolbar.showusers.title": "Benutzer dieses Pads anzeigen",
 	"pad.colorpicker.save": "Speichern",
 	"pad.colorpicker.cancel": "Abbrechen",
-	"pad.loading": "Laden …",
+	"pad.loading": "Lade …",
 	"pad.noCookie": "Das Cookie konnte nicht gefunden werden. Bitte erlaube Cookies in deinem Browser!",
-	"pad.passwordRequired": "Sie benötigen ein Passwort, um auf dieses Pad zuzugreifen",
+	"pad.passwordRequired": "Sie benötigen ein Kennwort, um auf dieses Pad zuzugreifen",
 	"pad.permissionDenied": "Sie haben keine Berechtigung, um auf dieses Pad zuzugreifen",
-	"pad.wrongPassword": "Ihr Passwort war falsch",
+	"pad.wrongPassword": "Ihr eingegebenes Kennwort war falsch",
-	"pad.settings.padSettings": "Pad Einstellungen",
+	"pad.settings.padSettings": "Pad-Einstellungen",
 	"pad.settings.myView": "Eigene Ansicht",
-	"pad.settings.stickychat": "Chat immer anzeigen",
+	"pad.settings.stickychat": "Unterhaltung immer anzeigen",
-	"pad.settings.chatandusers": "Chat und Benutzer anzeigen",
+	"pad.settings.chatandusers": "Unterhaltung und Benutzer anzeigen",
 	"pad.settings.colorcheck": "Autorenfarben anzeigen",
 	"pad.settings.linenocheck": "Zeilennummern",
 	"pad.settings.rtlcheck": "Inhalt von rechts nach links lesen?",
@@ -56,46 +57,49 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.abiword.innerHTML": "Sie können nur aus Klartext oder HTML-Formaten importieren. Für mehr erweiterte Importfunktionen <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\">installieren Sie bitte abiword</a>.",
+	"pad.importExport.abiword.innerHTML": "Sie können nur aus reinen Text- oder HTML-Formaten importieren. Für umfangreichere Importfunktionen <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\">installieren Sie bitte abiword</a>.",
 	"pad.modals.connected": "Verbunden.",
 	"pad.modals.reconnecting": "Wiederherstellen der Verbindung …",
-	"pad.modals.forcereconnect": "Erneut Verbinden",
+	"pad.modals.forcereconnect": "Erneutes Verbinden erzwingen",
 	"pad.modals.userdup": "In einem anderen Fenster geöffnet",
-	"pad.modals.userdup.explanation": "Dieses Pad scheint in mehr als einem Browser-Fenster auf diesem Computer geöffnet zu sein.",
+	"pad.modals.userdup.explanation": "Dieses Pad scheint in mehr als einem Browser-Fenster auf diesem Rechner geöffnet zu sein.",
-	"pad.modals.userdup.advice": "Um dieses Fenster zu benutzen, verbinden Sie bitte erneut.",
+	"pad.modals.userdup.advice": "Um stattdessen dieses Fenster zu verwenden, verbinden Sie sich bitte erneut.",
-	"pad.modals.unauth": "Nicht authorisiert.",
+	"pad.modals.unauth": "Nicht berechtigt",
-	"pad.modals.unauth.explanation": "Ihre Zugriffsberechtigung für dieses Pad hat sich zwischenzeitlich geändert. Sie können versuchen das Pad erneut aufzurufen.",
+	"pad.modals.unauth.explanation": "Ihre Zugriffsberechtigung für dieses Pad hat sich zwischenzeitlich geändert. Versuchen Sie sich erneut zu verbinden.",
-	"pad.modals.looping.explanation": "Es gibt Probleme bei der Kommunikation mit dem Pad-Server.",
+	"pad.modals.looping.explanation": "Es gibt Verbindungsprobleme mit dem Server.",
-	"pad.modals.looping.cause": "Möglicherweise sind Sie durch eine inkompatible Firewall oder über einen inkompatiblen Proxy mit dem Pad-Server verbunden.",
+	"pad.modals.looping.cause": "Möglicherweise sind Sie durch eine inkompatible Firewall oder über einen inkompatiblen Proxy mit dem Server verbunden.",
-	"pad.modals.initsocketfail": "Pad-Server nicht erreichbar.",
+	"pad.modals.initsocketfail": "Der Server ist nicht erreichbar.",
-	"pad.modals.initsocketfail.explanation": "Es konnte keine Verbindung zum Pad-Server hergestellt werden.",
+	"pad.modals.initsocketfail.explanation": "Es konnte keine Verbindung zum Server hergestellt werden.",
 	"pad.modals.initsocketfail.cause": "Dies könnte an Ihrem Browser oder Ihrer Internet-Verbindung liegen.",
-	"pad.modals.slowcommit.explanation": "Der Pad-Server reagiert nicht.",
+	"pad.modals.slowcommit.explanation": "Der Server antwortet nicht.",
-	"pad.modals.slowcommit.cause": "Dies könnte ein Netzwerkverbindungsproblem sein oder eine momentane Überlastung des Pad-Servers.",
+	"pad.modals.slowcommit.cause": "Dies könnte ein Netzwerkverbindungsproblem sein oder eine momentane Überlastung des Servers.",
-	"pad.modals.badChangeset.explanation": "Eine von Ihnen gemachte Änderung wurde vom Pad-Server als ungültig eingestuft.",
+	"pad.modals.badChangeset.explanation": "Eine von Ihnen gemachte Änderung wurde vom Server als ungültig eingestuft.",
 	"pad.modals.badChangeset.cause": "Dies könnte aufgrund einer falschen Serverkonfiguration oder eines anderen unerwarteten Verhaltens passiert sein. Bitte kontaktiere den Diensteadministrator, falls du glaubst, dass es sich um einen Fehler handelt. Versuche dich erneut zu verbinden, um mit dem Bearbeiten fortzufahren.",
-	"pad.modals.corruptPad.explanation": "Das Pad, auf das du zugreifen willst, ist beschädigt.",
+	"pad.modals.corruptPad.explanation": "Das Pad, auf das Sie versuchen zuzugreifen, ist beschädigt.",
-	"pad.modals.corruptPad.cause": "Dies könnte an einer falschen Serverkonfiguration oder eines anderen unerwarteten Verhaltens liegen. Bitte kontaktiere den Diensteadministrator.",
+	"pad.modals.corruptPad.cause": "Dies könnte an einer falschen Serverkonfiguration oder eines anderen unerwarteten Verhaltens liegen. Bitte kontaktieren Sie den Administrator dieses Dienstes.",
 	"pad.modals.deleted": "Gelöscht.",
 	"pad.modals.deleted.explanation": "Dieses Pad wurde entfernt.",
-	"pad.modals.disconnected": "Deine Verbindung wurde getrennt.",
+	"pad.modals.disconnected": "Ihre Verbindung wurde getrennt.",
-	"pad.modals.disconnected.explanation": "Die Verbindung zum Pad-Server wurde unterbrochen.",
+	"pad.modals.disconnected.explanation": "Die Verbindung zum Server wurde unterbrochen.",
-	"pad.modals.disconnected.cause": "Möglicherweise ist der Pad-Server nicht erreichbar. Bitte benachrichtigen Sie den Dienstadministrator, falls dies weiterhin passiert.",
+	"pad.modals.disconnected.cause": "Möglicherweise ist der Server nicht erreichbar. Bitte benachrichtigen Sie den Dienstadministrator, falls dies weiterhin passiert.",
 	"pad.share": "Dieses Pad teilen",
 	"pad.share.readonly": "Eingeschränkter Nur-Lese-Zugriff",
-	"pad.share.link": "Link",
+	"pad.share.link": "Verknüpfung",
 	"pad.share.emebdcode": "In Webseite einbetten",
-	"pad.chat": "Chat",
+	"pad.chat": "Unterhaltung",
-	"pad.chat.title": "Den Chat dieses Pads öffnen",
+	"pad.chat.title": "Den Chat für dieses Pad öffnen.",
 	"pad.chat.loadmessages": "Weitere Nachrichten laden",
-	"timeslider.pageTitle": "{{appTitle}} Pad-Versionsgeschichte",
+	"timeslider.pageTitle": "{{appTitle}} Bearbeitungsverlauf",
 	"timeslider.toolbar.returnbutton": "Zurück zum Pad",
 	"timeslider.toolbar.authors": "Autoren:",
 	"timeslider.toolbar.authorsList": "keine Autoren",
 	"timeslider.toolbar.exportlink.title": "Diese Version exportieren",
 	"timeslider.exportCurrent": "Exportiere diese Version als:",
 	"timeslider.version": "Version {{version}}",
-	"timeslider.saved": "gespeichert am {{day}}. {{month}} {{year}}",
+	"timeslider.saved": "Gespeichert am {{day}}. {{month}} {{year}}",
+	"timeslider.playPause": "Padbearbeitung abspielen/pausieren",
+	"timeslider.backRevision": "Eine Version in diesem Pad zurück gehen",
+	"timeslider.forwardRevision": "Eine Version in diesem Pad vorwärts gehen",
 	"timeslider.dateformat": "{{day}}.{{month}}.{{year}} {{hours}}:{{minutes}}:{{seconds}}",
 	"timeslider.month.january": "Januar",
 	"timeslider.month.february": "Februar",
@@ -111,7 +115,7 @@
 	"timeslider.month.december": "Dezember",
 	"timeslider.unnamedauthors": "{{num}} {[plural(num) one: unbenannter Autor, other: unbenannte Autoren ]}",
 	"pad.savedrevs.marked": "Diese Version wurde jetzt als gespeicherte Version gekennzeichnet",
-	"pad.savedrevs.timeslider": "Du kannst gespeicherte Versionen durch das Besuchen der Pad-Versionsgeschichte ansehen",
+	"pad.savedrevs.timeslider": "Du kannst gespeicherte Versionen durch den Aufruf des Bearbeitungsverlaufes ansehen",
 	"pad.userlist.entername": "Geben Sie Ihren Namen ein",
 	"pad.userlist.unnamed": "unbenannt",
 	"pad.userlist.guest": "Gast",
@@ -121,9 +125,9 @@
 	"pad.impexp.importbutton": "Jetzt importieren",
 	"pad.impexp.importing": "Importiere …",
 	"pad.impexp.confirmimport": "Das Importieren einer Datei überschreibt den aktuellen Text des Pads. Wollen Sie wirklich fortfahren?",
-	"pad.impexp.convertFailed": "Wir können diese Datei nicht importieren. Bitte verwenden Sie ein anderes Dokumentformat oder übertragen Sie den Text manuell.",
+	"pad.impexp.convertFailed": "Diese Datei konnte nicht importiert werden. Bitte verwenden Sie ein anderes Dokumentformat oder übertragen Sie den Text manuell.",
-	"pad.impexp.padHasData": "Wir konnten diese Datei nicht importieren, da dieses Pad bereits Änderungen enthält. Bitte importiere sie in ein neues Pad.",
+	"pad.impexp.padHasData": "Diese Datei konnte nicht importiert werden, da dieses Pad bereits Änderungen enthält. Bitte importieren Sie die Datei in ein neues Pad.",
-	"pad.impexp.uploadFailed": "Der Upload ist fehlgeschlagen. Bitte versuchen Sie es erneut.",
+	"pad.impexp.uploadFailed": "Das Hochladen ist fehlgeschlagen. Bitte versuchen Sie es erneut.",
 	"pad.impexp.importfailed": "Import fehlgeschlagen",
 	"pad.impexp.copypaste": "Bitte kopieren und einfügen",
 	"pad.impexp.exportdisabled": "Der Export im {{type}}-Format ist deaktiviert. Für Einzelheiten kontaktieren Sie bitte Ihren Systemadministrator."

sources/src/locales/dty.json

@@ -0,0 +1,64 @@
+{
+	"@metadata": {
+		"authors": [
+			"रमेश सिंह बोहरा",
+			"राम प्रसाद जोशी"
+		]
+	},
+	"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": "बीचको धड्को (Ctrl+5)",
+	"pad.toolbar.ol.title": "एकनासको सूची (Ctrl+Shift+N)",
+	"pad.toolbar.ul.title": "अक्रमाङ्कित सूची (Ctrl+Shift+L)",
+	"pad.toolbar.indent.title": "इन्डेन्ट (TAB)",
+	"pad.toolbar.unindent.title": "आउटडेन्ट (Shift+TAB)",
+	"pad.toolbar.undo.title": "खारेजी  (Ctrl-Z)",
+	"pad.toolbar.redo.title": "दोसर्या:लागु (Ctrl-Y)",
+	"pad.toolbar.clearAuthorship.title": "लेखकीय रङ्ग हटाउन्या (Ctrl+Shift+C)",
+	"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.passwordRequired": "यो प्यड खोल्लाकी पासवर्ड चाहिन्छ",
+	"pad.permissionDenied": "तमलाईँ यै प्याड खोल्लाकी अनुमति नाइथिन",
+	"pad.wrongPassword": "तमरो पासवर्ड गलत थ्यो",
+	"pad.settings.padSettings": "प्याड सेटिङ्गहरू",
+	"pad.settings.myView": "मेरि हेराइ",
+	"pad.settings.stickychat": "पर्दामा जबलई कुरडी गद्य्या",
+	"pad.settings.chatandusers": "वार्ता और प्रयोगकर्ताहरू देखाउन्या",
+	"pad.settings.colorcheck": "लेखकीय रङ्ग",
+	"pad.settings.linenocheck": "हरफ संख्या",
+	"pad.settings.rtlcheck": "के सामग्री दाहिना बठे देब्रे पढ्न्या हो ?",
+	"pad.settings.fontType": "फन्ट प्रकार:",
+	"pad.settings.globalView": "विश्वव्यापी दृष्य",
+	"pad.settings.language": "भाषा: $1",
+	"pad.importExport.import_export": "आउन्या/झान्या",
+	"pad.importExport.import": "कोइलै पाठ रयाको फाइल और कागजात अपलोड गरिदिय",
+	"pad.importExport.importSuccessful": "सफल भयो!",
+	"pad.importExport.export": "निम्न रुपमि प्याड पठौन्या :",
+	"pad.importExport.exportetherpad": "इथरप्याड",
+	"pad.importExport.exporthtml": "हटमेल",
+	"pad.importExport.exportplain": "सानतिनो पाठ",
+	"pad.importExport.exportword": "माइक्रोसफ्ट वर्ड",
+	"pad.importExport.exportpdf": "पिडिएफ",
+	"pad.importExport.exportopen": "ओडिएफ(खुल्ला कागजात ढाँचा)",
+	"pad.modals.connected": "जोडीयाको",
+	"pad.modals.reconnecting": "तमरो प्याडमि आजि: जडान हुन्नाछ",
+	"pad.modals.initsocketfail": "सर्भरमा पहुँच पुर्‍याउन नाइसकियो  ।",
+	"pad.modals.deleted": "मेटियाको",
+	"pad.modals.deleted.explanation": "यो प्याड हटाइसक्याको छ ।",
+	"pad.modals.disconnected": "तमरो जडान अवरुद्ध भयो ।",
+	"pad.modals.disconnected.explanation": "तमरो सर्भरसितको जडान अवरुद्ध भयो",
+	"pad.share": "यस प्यडलाई बाड्न्या",
+	"pad.share.readonly": "पड्या मात्तरै",
+	"pad.share.link": "लिङ्क",
+	"pad.share.emebdcode": "URL थप्प्या",
+	"pad.chat": "कुरणिकानी"
+}

sources/src/locales/el.json

@@ -96,6 +96,9 @@
 	"timeslider.exportCurrent": "Εξαγωγή τρέχουσας έκδοσης ως:",
 	"timeslider.version": "Έκδοση {{version}}",
 	"timeslider.saved": "Αποθηκεύτηκε στις {{day}} {{month}} {{year}}",
+	"timeslider.playPause": "Αναπαραγωγή / Παύση των περιεχομένων αυτού του Pad",
+	"timeslider.backRevision": "Επιστροφή σε μια έκδοση αυτού του Pad",
+	"timeslider.forwardRevision": "Μια έκδοση μπροστά αυτού του Pad",
 	"timeslider.dateformat": "{{day}}/{{month}}/{{year}} {{hours}}:{{minutes}}:{{seconds}}",
 	"timeslider.month.january": "Ιανουαρίου",
 	"timeslider.month.february": "Φεβρουαρίου",

sources/src/locales/en-gb.json

@@ -93,6 +93,9 @@
 	"timeslider.exportCurrent": "Export current version as:",
 	"timeslider.version": "Version {{version}}",
 	"timeslider.saved": "Saved {{month}} {{day}}, {{year}}",
+	"timeslider.playPause": "Playback/Pause Pad Contents",
+	"timeslider.backRevision": "Go back a revision in this Pad",
+	"timeslider.forwardRevision": "Go forward a revision in this Pad",
 	"timeslider.dateformat": "{{day}}/{{month}}/{{year}} {{hours}}:{{minutes}}:{{seconds}}",
 	"timeslider.month.january": "January",
 	"timeslider.month.february": "February",

sources/src/locales/eo.json

@@ -94,6 +94,9 @@
 	"timeslider.exportCurrent": "Elporti la nunan version kiel:",
 	"timeslider.version": "Versio {{version}}",
 	"timeslider.saved": "Konservita la {{day}}an de {{month}}, {{year}}",
+	"timeslider.playPause": "Ludi / paŭzi la enhavojn de la teksto",
+	"timeslider.backRevision": "Reiri unu version en ĉi tiu teksto",
+	"timeslider.forwardRevision": "Antaŭeniri unu version en ĉi tiu teksto",
 	"timeslider.dateformat": "{{day}}-{{month}}-{{year}} {{hours}}:{{minutes}}:{{seconds}}",
 	"timeslider.month.january": "januaro",
 	"timeslider.month.february": "februaro",

sources/src/locales/es.json

@@ -36,7 +36,7 @@
 	"pad.colorpicker.save": "Guardar",
 	"pad.colorpicker.cancel": "Cancelar",
 	"pad.loading": "Cargando...",
-	"pad.noCookie": "La cookie no se pudo encontrar. ¡Por favor, habilita las cookies en tu navegador!",
+	"pad.noCookie": "La cookie no se pudo encontrar. ¡Habilita las cookies en tu navegador!",
 	"pad.passwordRequired": "Necesitas una contraseña para acceder a este pad",
 	"pad.permissionDenied": "No tienes permiso para acceder a este pad",
 	"pad.wrongPassword": "La contraseña era incorrecta",
@@ -75,7 +75,7 @@
 	"pad.modals.looping.cause": "Puede deberse a que te conectes a través de un proxy o un cortafuegos incompatible.",
 	"pad.modals.initsocketfail": "Servidor incalcanzable.",
 	"pad.modals.initsocketfail.explanation": "No se pudo conectar al servidor de sincronización.",
-	"pad.modals.initsocketfail.cause": "Probablemente debido a un problema en tu navegador o en tu conexión a internet.",
+	"pad.modals.initsocketfail.cause": "Probablemente debido a un problema en tu navegador o en tu conexión a Internet.",
 	"pad.modals.slowcommit.explanation": "El servidor no responde.",
 	"pad.modals.slowcommit.cause": "Puede deberse a problemas con tu conexión de red.",
 	"pad.modals.badChangeset.explanation": "Has hecho una edición clasificada como ilegal por el servidor de sincronización.",
@@ -102,6 +102,9 @@
 	"timeslider.exportCurrent": "Exportar la versión actual como:",
 	"timeslider.version": "Versión {{version}}",
 	"timeslider.saved": "Guardado el {{day}} de {{month}} de {{year}}",
+	"timeslider.playPause": "Reproducir/pausar los contenidos del pad",
+	"timeslider.backRevision": "Ir a la revisión anterior en este pad",
+	"timeslider.forwardRevision": "Ir a la revisión posterior en este pad",
 	"timeslider.dateformat": "{{day}}/{{month}}/{{year}} {{hours}}:{{minutes}}:{{seconds}}",
 	"timeslider.month.january": "enero",
 	"timeslider.month.february": "febrero",
@@ -115,7 +118,7 @@
 	"timeslider.month.october": "octubre",
 	"timeslider.month.november": "noviembre",
 	"timeslider.month.december": "diciembre",
-	"timeslider.unnamedauthors": "{{num}} {[ plural(num) one: autor desconocido, other: autores desconocidos]}",
+	"timeslider.unnamedauthors": "{{num}} {[plural(num) one: autor desconocido, other: autores desconocidos]}",
 	"pad.savedrevs.marked": "Revisión guardada",
 	"pad.savedrevs.timeslider": "Puedes ver revisiones guardadas visitando la línea de tiempo",
 	"pad.userlist.entername": "Escribe tu nombre",
@@ -128,8 +131,8 @@
 	"pad.impexp.importing": "Importando...",
 	"pad.impexp.confirmimport": "Al importar un archivo se borrará el contenido actual del pad. ¿Estás seguro de que quieres continuar?",
 	"pad.impexp.convertFailed": "No pudimos importar este archivo. Inténtalo con un formato diferente o copia y pega manualmente.",
-	"pad.impexp.padHasData": "No hemos podido importar este archivo porque esta almohadilla ya ha tenido cambios, por favor, importa a una nueva almohadilla",
+	"pad.impexp.padHasData": "No hemos podido importar este archivo porque este pad ya ha tenido cambios. Importa a un nuevo pad.",
-	"pad.impexp.uploadFailed": "El envío falló. Intentalo de nuevo.",
+	"pad.impexp.uploadFailed": "El envío falló. Inténtalo de nuevo.",
 	"pad.impexp.importfailed": "Fallo al importar",
 	"pad.impexp.copypaste": "Intenta copiar y pegar",
 	"pad.impexp.exportdisabled": "La exportación al formato {{type}} está desactivada. Contacta a tu administrador de sistemas."

sources/src/locales/eu.json

@@ -2,7 +2,9 @@
 	"@metadata": {
 		"authors": [
 			"Theklan",
-			"Subi"
+			"Subi",
+			"Xabier Armendaritz",
+			"An13sa"
 		]
 	},
 	"index.newPad": "Pad berria",
@@ -10,14 +12,14 @@
 	"pad.toolbar.bold.title": "Lodia (Ctrl-B)",
 	"pad.toolbar.italic.title": "Etzana (Ctrl-I)",
 	"pad.toolbar.underline.title": "Azpimarratua (Ctrl-U)",
-	"pad.toolbar.strikethrough.title": "Ezabatua",
+	"pad.toolbar.strikethrough.title": "Ezabatua (Ctrl+5)",
-	"pad.toolbar.ol.title": "Zerrenda ordenatua",
+	"pad.toolbar.ol.title": "Zerrenda ordenatua (Ctrl+Shift+N)",
-	"pad.toolbar.ul.title": "Zerrenda ez-ordenatua",
+	"pad.toolbar.ul.title": "Zerrenda ez-ordenatua (Ctrl+Shift+L)",
-	"pad.toolbar.indent.title": "Koska",
+	"pad.toolbar.indent.title": "Koska (TAB)",
-	"pad.toolbar.unindent.title": "Koska kendu",
+	"pad.toolbar.unindent.title": "Koska kendu (Shift+TAB)",
 	"pad.toolbar.undo.title": "Desegin (Ctrl-Z)",
 	"pad.toolbar.redo.title": "Berregin (Ctrl-Y)",
-	"pad.toolbar.clearAuthorship.title": "Ezabatu Egiletza Koloreak",
+	"pad.toolbar.clearAuthorship.title": "Ezabatu Egiletza Koloreak (Ctrl+Shift+C)",
 	"pad.toolbar.import_export.title": "Inportatu/Esportatu fitxategi formatu ezberdinetara/ezberdinetatik",
 	"pad.toolbar.timeslider.title": "Denbora lerroa",
 	"pad.toolbar.savedRevision.title": "Gorde berrikuspena",
@@ -27,12 +29,14 @@
 	"pad.colorpicker.save": "Gorde",
 	"pad.colorpicker.cancel": "Utzi",
 	"pad.loading": "Kargatzen...",
+	"pad.noCookie": "Cookiea ez da aurkitu. Mesedez, gaitu cookieak zure nabigatzailean!",
 	"pad.passwordRequired": "Pasahitza behar duzu pad honetara sartzeko",
 	"pad.permissionDenied": "Ez duzu bamienik pad honetara sartzeko",
 	"pad.wrongPassword": "Zure pasahitza oker zegoen",
 	"pad.settings.padSettings": "Pad hobespenak",
 	"pad.settings.myView": "Nire ikusmoldea",
 	"pad.settings.stickychat": "Txata beti pantailan",
+	"pad.settings.chatandusers": "Erakutsi txata eta erabiltzaileak",
 	"pad.settings.colorcheck": "Egiletzaren koloreak",
 	"pad.settings.linenocheck": "Lerro zenbakiak",
 	"pad.settings.rtlcheck": "Edukia eskubitik ezkerrera irakurri?",
@@ -67,11 +71,12 @@
 	"pad.modals.initsocketfail.cause": "Ziurrenik hau zure nabigatzailea edo internet konexioaren arazo bat dela eta izango da.",
 	"pad.modals.slowcommit.explanation": "Zerbitzariak ez du erantzuten.",
 	"pad.modals.slowcommit.cause": "Baliteke hau sarearen konexio arazoak direla eta izatea.",
+	"pad.modals.badChangeset.explanation": "Sinkronizazio zerbitzariak, zuk egindako aldaketa bat legez kanpokotzat jo du.",
 	"pad.modals.deleted": "Ezabatua.",
 	"pad.modals.deleted.explanation": "Pad hau ezabatua izan da.",
 	"pad.modals.disconnected": "Deskonektatua izan zara.",
 	"pad.modals.disconnected.explanation": "Zerbitzariaren konexioa galdu da",
-	"pad.modals.disconnected.cause": "Baliteke zerbitzaria irisgarria ez izatea. Mesedez, esaiguzu hau gertatzen jarraitzen badu.",
+	"pad.modals.disconnected.cause": "Baliteke zerbitzaria eskuragarri ez egotea. Mesedez, jakinarazi zerbitzuko administrariari honek gertatzen jarraitzen badu.",
 	"pad.share": "Pad hau partekatu",
 	"pad.share.readonly": "Irakurtzeko bakarrik",
 	"pad.share.link": "Lotura",
@@ -87,7 +92,7 @@
 	"timeslider.exportCurrent": "Gorde bertsio hau honela:",
 	"timeslider.version": "Bertsioa {{version}}",
 	"timeslider.saved": "{{year}}ko {{month}}ren {{day}}an gordeta",
-	"timeslider.dateformat": "{{year}}/{{month}}/{{day}} {{hours}}:{{minutes}}:{{seconds}}",
+	"timeslider.dateformat": "{{year}}-{{month}}-{{day}} {{hours}}:{{minutes}}:{{seconds}}",
 	"timeslider.month.january": "Urtarrila",
 	"timeslider.month.february": "Otsaila",
 	"timeslider.month.march": "Martxoa",
@@ -100,7 +105,7 @@
 	"timeslider.month.october": "Urria",
 	"timeslider.month.november": "Azaroa",
 	"timeslider.month.december": "Abendua",
-	"timeslider.unnamedauthors": "{{num}} izenik gabeko egileak",
+	"timeslider.unnamedauthors": "{{num}} izenik gabeko {[plural(num) one: egilea, other: egileak]}",
 	"pad.savedrevs.marked": "Berrikuspen hau markatua dago gordetako berrikuspen gisa",
 	"pad.userlist.entername": "Sartu zure erabiltzaile izena",
 	"pad.userlist.unnamed": "izenik gabe",

sources/src/locales/fa.json

@@ -74,7 +74,7 @@
 	"pad.modals.initsocketfail.cause": "شاید این به خاطر مشکلی در مرورگر یا اتصال اینترنتی شما باشد.",
 	"pad.modals.slowcommit.explanation": "سرور پاسخ نمی‌دهد.",
 	"pad.modals.slowcommit.cause": "این می‌تواند به خاطر مشکلاتی در اتصال به شبکه باشد.",
-	"pad.modals.badChangeset.explanation": "ویرایشی که شما انجام داده‌اید توسط سرور همگام‌سازی نادرست طیقه‌بندی شده‌است.",
+	"pad.modals.badChangeset.explanation": "ویرایشی که شما انجام داده‌اید توسط سرور همگام‌سازی نادرست طیقه‌بندی شده است.",
 	"pad.modals.badChangeset.cause": "این می‌تواند به دلیل پیکربندی اشتباه یا سایر رفتارهای غیرمنتظره باشد. اگر فکر می‌کنید این یک خطا است لطفاً با مدیر خدمت تماس بگیرید. برای ادامهٔ ویرایش سعی کنید که دوباره متصل شوید.",
 	"pad.modals.corruptPad.explanation": "پدی که شما سعی دارید دسترسی پیدا کنید خراب است.",
 	"pad.modals.corruptPad.cause": "این احتمالاً به دلیل تنظیمات اشتباه کارساز یا سایر رفتارهای غیرمنتظره است. لطفاً با مدیر خدمت تماس حاصل کنید.",
@@ -98,6 +98,9 @@
 	"timeslider.exportCurrent": "برون‌ریزی نگارش کنونی به عنوان:",
 	"timeslider.version": "نگارش {{version}}",
 	"timeslider.saved": "{{month}} {{day}}، {{year}} ذخیره شد",
+	"timeslider.playPause": "اجرای مجدد/متوقف کردن پخش",
+	"timeslider.backRevision": "رفتن به نسخهٔ پیشین در این دفترچه",
+	"timeslider.forwardRevision": "رفتن به نسخهٔ بعدی در این دفترچه",
 	"timeslider.dateformat": "{{month}}/{{day}}/{{year}} {{hours}}:{{minutes}}:{{seconds}}",
 	"timeslider.month.january": "ژانویه",
 	"timeslider.month.february": "فوریه",

sources/src/locales/fi.json

@@ -12,7 +12,8 @@
 			"VezonThunder",
 			"Macofe",
 			"MrTapsa",
-			"Silvonen"
+			"Silvonen",
+			"Espeox"
 		]
 	},
 	"index.newPad": "Uusi muistio",
@@ -44,6 +45,7 @@
 	"pad.settings.padSettings": "Muistion asetukset",
 	"pad.settings.myView": "Oma näkymä",
 	"pad.settings.stickychat": "Keskustelu aina näkyvissä",
+	"pad.settings.chatandusers": "Näytä keskustelu ja käyttäjät",
 	"pad.settings.colorcheck": "Kirjoittajavärit",
 	"pad.settings.linenocheck": "Rivinumerot",
 	"pad.settings.rtlcheck": "Luetaanko sisältö oikealta vasemmalle?",
@@ -102,6 +104,9 @@
 	"timeslider.exportCurrent": "Vie nykyinen versio muodossa:",
 	"timeslider.version": "Versio {{version}}",
 	"timeslider.saved": "Tallennettu {{day}}. {{month}}ta {{year}}",
+	"timeslider.playPause": "Toista / pysäytä muistion sisältö",
+	"timeslider.backRevision": "Palaa edelliseen muutokseen taaksepäin tässä muistiossa",
+	"timeslider.forwardRevision": "Siirry seuraavaan muutokseen tässä muistiossa",
 	"timeslider.dateformat": "{{day}}.{{month}}.{{year}} {{hours}}:{{minutes}}:{{seconds}}",
 	"timeslider.month.january": "tammikuu",
 	"timeslider.month.february": "helmikuu",
@@ -117,6 +122,7 @@
 	"timeslider.month.december": "joulukuu",
 	"timeslider.unnamedauthors": "{{num}} {[plural(num) one: nimetön tekijä, other: nimetöntä tekijää ]}",
 	"pad.savedrevs.marked": "Tämä versio on nyt merkitty tallennetuksi versioksi",
+	"pad.savedrevs.timeslider": "Voit tarkastella tallennettuja versioita avaamalla aikajanan",
 	"pad.userlist.entername": "Kirjoita nimesi",
 	"pad.userlist.unnamed": "nimetön",
 	"pad.userlist.guest": "Vieras",
@@ -127,6 +133,7 @@
 	"pad.impexp.importing": "Tuodaan...",
 	"pad.impexp.confirmimport": "Tiedoston tuonti korvaa kaiken muistiossa olevan tekstin. Haluatko varmasti jatkaa?",
 	"pad.impexp.convertFailed": "TIedoston tuonti epäonnistui. Käytä eri tiedostomuotoa tai kopioi ja liitä käsin.",
+	"pad.impexp.padHasData": "Tiedostoa ei voitu lisätä lehtiöön, koska lehtiötä on jo muokattu – ole hyvä ja lisää tiedosto uuteen lehtiöön",
 	"pad.impexp.uploadFailed": "Lähetys epäonnistui. Yritä uudelleen.",
 	"pad.impexp.importfailed": "Tuonti epäonnistui",
 	"pad.impexp.copypaste": "Kopioi ja liitä",

sources/src/locales/fr.json

@@ -18,21 +18,24 @@
 			"Tux-tn",
 			"Maxim21",
 			"Boniface",
-			"Macofe"
+			"Macofe",
+			"Framafan",
+			"Fylip22",
+			"C13m3n7"
 		]
 	},
 	"index.newPad": "Nouveau pad",
 	"index.createOpenPad": "ou créer/ouvrir un pad intitulé :",
-	"pad.toolbar.bold.title": "Gras (Ctrl-B)",
+	"pad.toolbar.bold.title": "Gras (Ctrl+B)",
-	"pad.toolbar.italic.title": "Italique (Ctrl-I)",
+	"pad.toolbar.italic.title": "Italique (Ctrl+I)",
-	"pad.toolbar.underline.title": "Souligné (Ctrl-U)",
+	"pad.toolbar.underline.title": "Souligné (Ctrl+U)",
 	"pad.toolbar.strikethrough.title": "Barré (Ctrl+5)",
 	"pad.toolbar.ol.title": "Liste ordonnée (Ctrl+Shift+N)",
 	"pad.toolbar.ul.title": "Liste non ordonnée (Ctrl+Shift+L)",
 	"pad.toolbar.indent.title": "Indenter (TAB)",
 	"pad.toolbar.unindent.title": "Désindenter (Maj+TAB)",
-	"pad.toolbar.undo.title": "Annuler (Ctrl-Z)",
+	"pad.toolbar.undo.title": "Annuler (Ctrl+Z)",
-	"pad.toolbar.redo.title": "Rétablir (Ctrl-Y)",
+	"pad.toolbar.redo.title": "Rétablir (Ctrl+Y)",
 	"pad.toolbar.clearAuthorship.title": "Effacer les couleurs identifiant les auteurs (Ctrl+Shift+C)",
 	"pad.toolbar.import_export.title": "Importer/Exporter de/vers un format de fichier différent",
 	"pad.toolbar.timeslider.title": "Historique dynamique",
@@ -45,11 +48,11 @@
 	"pad.loading": "Chargement…",
 	"pad.noCookie": "Le cookie n’a pas pu être trouvé. Veuillez autoriser les cookies dans votre navigateur !",
 	"pad.passwordRequired": "Vous avez besoin d'un mot de passe pour accéder à ce pad",
-	"pad.permissionDenied": "Il ne vous est pas permis d’accéder à ce pad",
+	"pad.permissionDenied": "Vous n'avez pas la permission d’accéder à ce pad",
 	"pad.wrongPassword": "Votre mot de passe est incorrect",
 	"pad.settings.padSettings": "Paramètres du pad",
 	"pad.settings.myView": "Ma vue",
-	"pad.settings.stickychat": "Toujours afficher le chat",
+	"pad.settings.stickychat": "Toujours afficher le tchat",
 	"pad.settings.chatandusers": "Afficher la discussion et les utilisateurs",
 	"pad.settings.colorcheck": "Couleurs d’identification",
 	"pad.settings.linenocheck": "Numéros de lignes",
@@ -69,24 +72,24 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.abiword.innerHTML": "Vous ne pouvez importer que des formats texte brut ou html. Pour des fonctionnalités d'importation plus évoluées, veuillez <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\">installer abiword</a>.",
+	"pad.importExport.abiword.innerHTML": "Vous ne pouvez importer que des formats texte brut ou HTML. Pour des fonctionnalités d'importation plus évoluées, veuillez <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\">installer Abiword</a>.",
 	"pad.modals.connected": "Connecté.",
 	"pad.modals.reconnecting": "Reconnexion vers votre pad...",
 	"pad.modals.forcereconnect": "Forcer la reconnexion",
 	"pad.modals.userdup": "Ouvert dans une autre fenêtre",
-	"pad.modals.userdup.explanation": "Ce pad semble être ouvert dans plus d'une fenêtre de navigateur sur cet ordinateur.",
+	"pad.modals.userdup.explanation": "Ce pad semble être ouvert dans plusieurs fenêtres 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 l'affichage de cette page. Essayez de vous reconnecter.",
 	"pad.modals.looping.explanation": "Nous éprouvons un problème de communication au serveur de synchronisation.",
-	"pad.modals.looping.cause": "Il est possible que votre connexion soit protégée par un pare-feu ou un serveur mandataire incompatible.",
+	"pad.modals.looping.cause": "Il est possible que vous soyez connecté avec un pare-feu ou un 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": "Ceci est probablement dû à un problème avec votre navigateur ou votre connexion internet.",
 	"pad.modals.slowcommit.explanation": "Le serveur ne répond pas.",
 	"pad.modals.slowcommit.cause": "Ce problème peut venir d'une mauvaise connectivité au réseau.",
-	"pad.modals.badChangeset.explanation": "Une modification que vous avez effectuée a été classée comme illégale par le serveur de synchronisation.",
+	"pad.modals.badChangeset.explanation": "Une modification que vous avez effectuée a été classée comme impossible par le serveur de synchronisation.",
-	"pad.modals.badChangeset.cause": "Cela peut être dû à une mauvaise configuration du serveur ou à un autre comportement inattendu. Veuillez contacter l’administrateur du service, si vous pensez que c’est une erreur. Essayez de vous reconnecter pour continuer à modifier.",
+	"pad.modals.badChangeset.cause": "Cela peut être dû à une mauvaise configuration du serveur ou à un autre comportement inattendu. Veuillez contacter l’administrateur du service si vous pensez que c’est une erreur. Essayez de vous reconnecter pour continuer à modifier.",
 	"pad.modals.corruptPad.explanation": "Le pad auquel vous essayez d’accéder est corrompu.",
 	"pad.modals.corruptPad.cause": "Cela peut être dû à une mauvaise configuration du serveur ou à un autre comportement inattendu. Veuillez contacter l’administrateur du service.",
 	"pad.modals.deleted": "Supprimé.",
@@ -99,7 +102,7 @@
 	"pad.share.link": "Lien",
 	"pad.share.emebdcode": "Incorporer un lien",
 	"pad.chat": "Chat",
-	"pad.chat.title": "Ouvrir le chat associé à ce pad.",
+	"pad.chat.title": "Ouvrir le chat de ce pad.",
 	"pad.chat.loadmessages": "Charger davantage de messages",
 	"timeslider.pageTitle": "Historique dynamique de {{appTitle}}",
 	"timeslider.toolbar.returnbutton": "Retourner au pad",
@@ -109,7 +112,10 @@
 	"timeslider.exportCurrent": "Exporter la version actuelle sous :",
 	"timeslider.version": "Version {{version}}",
 	"timeslider.saved": "Enregistré le {{day}} {{month}} {{year}}",
-	"timeslider.dateformat": "{{day}}/{{month}}/{{year}} {{hours}}:{{minutes}}:{{seconds}}",
+	"timeslider.playPause": "Lecture / Pause des contenus du pad",
+	"timeslider.backRevision": "Reculer d’une révision dans ce pad",
+	"timeslider.forwardRevision": "Avancer d’une révision dans ce pad",
+	"timeslider.dateformat": "{{day}}/{{month}}/{{year}} {{seconds}}:{{minutes}}:{{hours}}",
 	"timeslider.month.january": "janvier",
 	"timeslider.month.february": "février",
 	"timeslider.month.march": "mars",
@@ -124,18 +130,18 @@
 	"timeslider.month.december": "décembre",
 	"timeslider.unnamedauthors": "{{num}} {[plural(num) one: auteur anonyme, other: auteurs anonymes ]}",
 	"pad.savedrevs.marked": "Cette révision est maintenant marquée comme révision enregistrée",
-	"pad.savedrevs.timeslider": "Vous pouvez voir les révisions enregistrées en visitant l’ascenseur temporel",
+	"pad.savedrevs.timeslider": "Vous pouvez voir les révisions enregistrées en ouvrant l'historique",
 	"pad.userlist.entername": "Entrez votre nom",
 	"pad.userlist.unnamed": "anonyme",
 	"pad.userlist.guest": "Invité",
 	"pad.userlist.deny": "Refuser",
 	"pad.userlist.approve": "Approuver",
-	"pad.editbar.clearcolors": "Effacer les couleurs de paternité dans tout le document ?",
+	"pad.editbar.clearcolors": "Effacer les couleurs de paternité des auteurs dans tout le document ?",
 	"pad.impexp.importbutton": "Importer maintenant",
 	"pad.impexp.importing": "Import en cours...",
-	"pad.impexp.confirmimport": "Importer un fichier écrasera le texte actuel du pad. Êtes-vous sûr de vouloir le faire ?",
+	"pad.impexp.confirmimport": "Importer un fichier écrasera le contenu actuel du pad. Êtes-vous sûr de vouloir le faire ?",
-	"pad.impexp.convertFailed": "Nous ne pouvons pas importer ce fichier. Veuillez utiliser un autre format de document ou faire un copier/coller manuel",
+	"pad.impexp.convertFailed": "Nous ne pouvons pas importer ce fichier. Veuillez utiliser un autre format de document ou faire manuellement un copier/coller du texte brut",
-	"pad.impexp.padHasData": "Nous n’avons pas pu importer ce fichier parce que ce bloc a déjà eu des modifications ; veuillez importer vers un nouveau bloc",
+	"pad.impexp.padHasData": "Nous n’avons pas pu importer ce fichier parce que ce pad a déjà eu des modifications ; veuillez donc en créer un nouveau",
 	"pad.impexp.uploadFailed": "Le téléchargement a échoué, veuillez réessayer",
 	"pad.impexp.importfailed": "Échec de l'importation",
 	"pad.impexp.copypaste": "Veuillez copier/coller",

sources/src/locales/gl.json

@@ -93,6 +93,9 @@
 	"timeslider.exportCurrent": "Exportar a versión actual en formato:",
 	"timeslider.version": "Versión {{version}}",
 	"timeslider.saved": "Gardado o {{day}} de {{month}} de {{year}}",
+	"timeslider.playPause": "Reproducir/pausar os contidos do pad",
+	"timeslider.backRevision": "Ir á revisión anterior neste pad",
+	"timeslider.forwardRevision": "Ir á revisión posterior neste pad",
 	"timeslider.dateformat": "{{day}}/{{month}}/{{year}} {{hours}}:{{minutes}}:{{seconds}}",
 	"timeslider.month.january": "xaneiro",
 	"timeslider.month.february": "febreiro",

sources/src/locales/gu.json

@@ -0,0 +1,56 @@
+{
+	"@metadata": {
+		"authors": [
+			"Bhatakati aatma",
+			"Harsh4101991",
+			"KartikMistry"
+		]
+	},
+	"index.newPad": "નવું પેડ",
+	"pad.toolbar.bold.title": "બોલ્ડ",
+	"pad.toolbar.settings.title": "ગોઠવણીઓ",
+	"pad.colorpicker.save": "સાચવો",
+	"pad.colorpicker.cancel": "રદ્દ કરો",
+	"pad.loading": "લાવે છે...",
+	"pad.noCookie": "કુકી મળી નહી. આપના બ્રાઉઝર સેટિંગમાં જઇ કુકી સક્રિય કરો!",
+	"pad.passwordRequired": "તમારે આ પેડના ઉપયોગ માટે ગુપ્તસંજ્ઞાની જરુર પડશે",
+	"pad.permissionDenied": "આ પેડના ઉપયોગની આપને પરવાનગી નથી",
+	"pad.wrongPassword": "આપની ગુપ્તસંજ્ઞા ખોટી છે",
+	"pad.settings.padSettings": "પેડ ગોઠવણીઓ",
+	"pad.settings.myView": "મારા મતે",
+	"pad.settings.fontType.normal": "સામાન્ય",
+	"pad.settings.fontType.monospaced": "મોનોસ્પેસ",
+	"pad.settings.language": "ભાષા:",
+	"pad.importExport.import_export": "આયાત/નિકાસ",
+	"pad.importExport.importSuccessful": "સફળ!",
+	"pad.importExport.exporthtml": "HTML",
+	"pad.importExport.exportplain": "સાદું લખાણ",
+	"pad.importExport.exportword": "માઇક્રોસોફ્ટ વર્ડ",
+	"pad.importExport.exportpdf": "PDF",
+	"pad.importExport.exportopen": "ODF (ઓપન ડોક્યુમેન્ટ ફોરમેટ)",
+	"pad.importExport.abiword.innerHTML": "આપ માત્ર સાદુ લખાણ અથવા HTML આયાત કરી શકો છો. વધુ અધ્યતન આયાત સુવિધા માટે  <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": "જોડાયેલું",
+	"pad.chat": "વાતચીત",
+	"pad.chat.title": "આ પેડ માટે વાતચીત ખોલો.",
+	"pad.chat.loadmessages": "વધુ સંદેશાઓ લાવો",
+	"timeslider.toolbar.authors": "લેખકો:",
+	"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": "ડિસેમ્બર",
+	"pad.userlist.entername": "તમારું નામ દાખલ કરો",
+	"pad.userlist.unnamed": "અનામી",
+	"pad.userlist.guest": "મહેમાન",
+	"pad.userlist.deny": "નકારો",
+	"pad.userlist.approve": "મંજૂર",
+	"pad.impexp.importbutton": "આયાત કરો",
+	"pad.impexp.importing": "આયાત કરે છે..."
+}

sources/src/locales/he.json

@@ -95,6 +95,9 @@
 	"timeslider.exportCurrent": "ייצוא הגרסה הנוכחית בתור:",
 	"timeslider.version": "גרסה {{version}}",
 	"timeslider.saved": "נשמרה ב־{{day}} ב{{month}} {{year}}",
+	"timeslider.playPause": "לנגן / לעצור את תוכן הפנקס",
+	"timeslider.backRevision": "לחזור לגרסה של הפנקס הזה",
+	"timeslider.forwardRevision": "ללכת לגרסה חדשה יותר בפנקס הזה",
 	"timeslider.dateformat": "{{year}}-{{month}}-{{day}} {{hours}}:{{minutes}}:{{seconds}}",
 	"timeslider.month.january": "ינואר",
 	"timeslider.month.february": "פברואר",

sources/src/locales/ia.json

@@ -33,6 +33,7 @@
 	"pad.settings.padSettings": "Configuration del pad",
 	"pad.settings.myView": "Mi vista",
 	"pad.settings.stickychat": "Chat sempre visibile",
+	"pad.settings.chatandusers": "Monstrar chat e usatores",
 	"pad.settings.colorcheck": "Colores de autor",
 	"pad.settings.linenocheck": "Numeros de linea",
 	"pad.settings.rtlcheck": "Leger le contento de dextra a sinistra?",
@@ -91,6 +92,9 @@
 	"timeslider.exportCurrent": "Exportar le version actual como:",
 	"timeslider.version": "Version {{version}}",
 	"timeslider.saved": "Salveguardate le {{day}} de {{month}} {{year}}",
+	"timeslider.playPause": "Reproducer/pausar le contento del pad",
+	"timeslider.backRevision": "Recular un version in iste pad",
+	"timeslider.forwardRevision": "Avantiar un version in iste pad",
 	"timeslider.dateformat": "{{year}}-{{month}}-{{day}} {{hours}}:{{minutes}}:{{seconds}}",
 	"timeslider.month.january": "januario",
 	"timeslider.month.february": "februario",
@@ -106,6 +110,7 @@
 	"timeslider.month.december": "decembre",
 	"timeslider.unnamedauthors": "{{num}} {[plural(num) one: autor, other: autores ]} sin nomine",
 	"pad.savedrevs.marked": "Iste version es ora marcate como version salveguardate",
+	"pad.savedrevs.timeslider": "Tu pote vider versiones salveguardate con le chronologia glissante.",
 	"pad.userlist.entername": "Entra tu nomine",
 	"pad.userlist.unnamed": "sin nomine",
 	"pad.userlist.guest": "Invitato",

sources/src/locales/is.json

@@ -1,7 +1,8 @@
 {
 	"@metadata": {
 		"authors": [
-			"Sveinn í Felli"
+			"Sveinn í Felli",
+			"Sveinki"
 		]
 	},
 	"index.newPad": "Ný skrifblokk",
@@ -92,6 +93,9 @@
 	"timeslider.exportCurrent": "Flytja út núverandi útgáfu sem:",
 	"timeslider.version": "Útgáfa {{version}}",
 	"timeslider.saved": "Vistað {{day}}. {{month}}, {{year}}",
+	"timeslider.playPause": "Afspilun / Hlé á efni skrifblokkar",
+	"timeslider.backRevision": "Fara til baka um eina útgáfu í þessari skrifblokk",
+	"timeslider.forwardRevision": "Fara áfram um eina útgáfu í þessari skrifblokk",
 	"timeslider.dateformat": "{{day}}/{{month}}/{{year}} {{hours}}:{{minutes}}:{{seconds}}",
 	"timeslider.month.january": "Janúar",
 	"timeslider.month.february": "febrúar",

sources/src/locales/it.json

@@ -53,7 +53,7 @@
 	"pad.importExport.export": "Esportare il Pad corrente come:",
 	"pad.importExport.exportetherpad": "Etherpad",
 	"pad.importExport.exporthtml": "HTML",
-	"pad.importExport.exportplain": "Solo testo",
+	"pad.importExport.exportplain": "Testo normale",
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
@@ -93,10 +93,13 @@
 	"timeslider.toolbar.returnbutton": "Ritorna al Pad",
 	"timeslider.toolbar.authors": "Autori:",
 	"timeslider.toolbar.authorsList": "Nessun autore",
-	"timeslider.toolbar.exportlink.title": "esporta",
+	"timeslider.toolbar.exportlink.title": "Esporta",
 	"timeslider.exportCurrent": "Esporta la versione corrente come:",
 	"timeslider.version": "Versione {{version}}",
 	"timeslider.saved": "Salvato {{day}} {{month}} {{year}}",
+	"timeslider.playPause": "Riproduzione / Pausa contenuti Pad",
+	"timeslider.backRevision": "Vai indietro di una versione in questo Pad",
+	"timeslider.forwardRevision": "Vai avanti di una versione in questo Pad",
 	"timeslider.dateformat": "{{day}}/{{month}}/{{year}} {{hours}}:{{minutes}}:{{seconds}}",
 	"timeslider.month.january": "gennaio",
 	"timeslider.month.february": "febbraio",

sources/src/locales/ja.json

@@ -93,6 +93,9 @@
 	"timeslider.exportCurrent": "現在の版をエクスポートする形式:",
 	"timeslider.version": "バージョン {{version}}",
 	"timeslider.saved": "| {{year}}年{{month}}{{day}}日に保存",
+	"timeslider.playPause": "パッドの過去の内容を再生／一時停止",
+	"timeslider.backRevision": "前の版に戻る",
+	"timeslider.forwardRevision": "次の版に進む",
 	"timeslider.dateformat": "{{year}}年{{month}}月{{day}}日 {{hours}}:{{minutes}}:{{seconds}}",
 	"timeslider.month.january": "1月",
 	"timeslider.month.february": "2月",

sources/src/locales/ko.json

@@ -3,21 +3,23 @@
 		"authors": [
 			"Hym411",
 			"아라",
-			"Revi"
+			"Revi",
+			"Kurousagi",
+			"SeoJeongHo"
 		]
 	},
 	"index.newPad": "새 패드",
 	"index.createOpenPad": "또는 다음 이름으로 패드 만들기/열기:",
-	"pad.toolbar.bold.title": "굵게 (Ctrl-B)",
+	"pad.toolbar.bold.title": "굵은꼴 (Ctrl+B)",
-	"pad.toolbar.italic.title": "기울임 (Ctrl-I)",
+	"pad.toolbar.italic.title": "기울임꼴 (Ctrl+I)",
-	"pad.toolbar.underline.title": "밑줄 (Ctrl-U)",
+	"pad.toolbar.underline.title": "밑줄 (Ctrl+U)",
 	"pad.toolbar.strikethrough.title": "취소선 (Ctrl+5)",
 	"pad.toolbar.ol.title": "순서 있는 목록 (Ctrl+Shift+N)",
 	"pad.toolbar.ul.title": "순서 없는 목록 (Ctrl+Shift+L)",
 	"pad.toolbar.indent.title": "들여쓰기 (TAB)",
 	"pad.toolbar.unindent.title": "내어쓰기 (Shift+TAB)",
-	"pad.toolbar.undo.title": "실행 취소 (Ctrl-Z)",
+	"pad.toolbar.undo.title": "실행 취소 (Ctrl+Z)",
-	"pad.toolbar.redo.title": "다시 실행 (Ctrl-Y)",
+	"pad.toolbar.redo.title": "다시 실행 (Ctrl+Y)",
 	"pad.toolbar.clearAuthorship.title": "저자의 색 지우기 (Ctrl+Shift+C)",
 	"pad.toolbar.import_export.title": "다른 파일 형식으로 가져오기/내보내기",
 	"pad.toolbar.timeslider.title": "시간슬라이더",
@@ -48,6 +50,7 @@
 	"pad.importExport.import": "텍스트 파일이나 문서 올리기",
 	"pad.importExport.importSuccessful": "성공!",
 	"pad.importExport.export": "다음으로 현재 패드 내보내기:",
+	"pad.importExport.exportetherpad": "Etherpad",
 	"pad.importExport.exporthtml": "HTML",
 	"pad.importExport.exportplain": "일반 텍스트",
 	"pad.importExport.exportword": "Microsoft Word",
@@ -93,6 +96,9 @@
 	"timeslider.exportCurrent": "현재 버전으로 내보내기:",
 	"timeslider.version": "버전 {{version}}",
 	"timeslider.saved": "{{year}}년 {{month}} {{day}}일에 저장함",
+	"timeslider.playPause": "시작 / 패드 내용을 일시 중지",
+	"timeslider.backRevision": "패드의 수정판으로 다시 가기",
+	"timeslider.forwardRevision": "패드의 수정판을 앞으로 이동 시키기",
 	"timeslider.dateformat": "{{year}}년/{{month}}/{{day}}일 {{hours}}:{{minutes}}:{{seconds}}",
 	"timeslider.month.january": "1월",
 	"timeslider.month.february": "2월",
@@ -108,6 +114,7 @@
 	"timeslider.month.december": "12월",
 	"timeslider.unnamedauthors": "이름 없는 {[plural(num) one: 저자, other: 저자 ]} {{num}}명",
 	"pad.savedrevs.marked": "이 판은 이제 저장한 판으로 표시합니다.",
+	"pad.savedrevs.timeslider": "당신은 타임슬라이더를 통해 저장된 버전을 볼 수 있습니다",
 	"pad.userlist.entername": "이름을 입력하세요",
 	"pad.userlist.unnamed": "이름없음",
 	"pad.userlist.guest": "손님",
@@ -118,6 +125,7 @@
 	"pad.impexp.importing": "가져오는 중...",
 	"pad.impexp.confirmimport": "파일을 가져오면 패드의 현재 텍스트를 덮어쓰게 됩니다. 진행하시겠습니까?",
 	"pad.impexp.convertFailed": "이 파일을 가져올 수 없습니다. 다른 문서 형식을 사용하거나 수동으로 복사하여 붙여넣으세요",
+	"pad.impexp.padHasData": "우리는 이 파일을 가져올수 없었습니다. 이 패드는 이미 수정되었으니, 새 패드를 가져와 주십시오",
 	"pad.impexp.uploadFailed": "올리기를 실패했습니다. 다시 시도하세요",
 	"pad.impexp.importfailed": "가져오기를 실패했습니다",
 	"pad.impexp.copypaste": "복사하여 붙여넣으세요",