Merge pull request #2424 from ether/release/1.5.0

Release/1.5.0

CHANGELOG.md

@@ -1,3 +1,34 @@
+# 1.5.0
+ * NEW: Lots of performance improvements for page load times
+ * NEW: Hook for adding CSS to Exports
+ * NEW: Allow shardable socket io
+ * NEW: Allow UI to show when attr/prop is applied (CSS)
+ * NEW: Various scripts
+ * NEW: Export full fidelity pads (including authors etc.)
+ * NEW: Various front end tests
+ * NEW: Backend tests
+ * NEW: switchPad hook to instantly switch between pads
+ * NEW: Various translations
+ * NEW: Icon sets instead of images to provide quality high DPI experience
+ * Fix: HTML Import blocking / hanging server
+ * Fix: Export Bullet / Numbered lists HTML
+ * Fix: Swagger deprecated warning
+ * Fix: Bad session from crashing server
+ * Fix: Allow relative settings path
+ * Fix: Stop attributes being improperly assigned between 2 lines
+ * Fix: Copy / Move Pad API race condition
+ * Fix: Save all user preferences
+ * Fix: Upgrade majority of dependency inc upgrade to SocketIO1+
+ * Fix: Provide UI button to restore maximized chat window
+ * Fix: Timeslider UI Fix
+ * Fix: Remove Dokuwiki
+ * Fix: Remove long paths from windows build (stops error during extract)
+ * Fix: Various globals remvoed
+ * Fix: Move all scripts into bin/
+ * Fix: Various CSS bugfixes for Mobile devices
+ * Fix: Overflow Toolbar
+ * Fix: Line Attribute management
+
 # 1.4.1
  * NEW: Translations
  * NEW: userLeave Hook

Makefile

@@ -14,7 +14,7 @@ out/doc/assets/%: doc/assets/%
 
 out/doc/%.html: doc/%.md
 	mkdir -p $(@D)
-	node tools/doc/generate.js --format=html --template=doc/template.html $< > $@
+	node bin/doc/generate.js --format=html --template=doc/template.html $< > $@
 ifeq ($(UNAME),Darwin)
 	sed -i '' 's/__VERSION__/${VERSION}/' $@
 else

README.md

@@ -11,7 +11,7 @@ that allows your web application to manage pads, users and groups. It is recomme
 
 There is also a [jQuery plugin](https://github.com/ether/etherpad-lite-jquery-plugin) that helps you to embed Pads into your website.
 
-There's also a full-featured plugin framework, allowing you to easily add your own features.  By default your Etherpad is rather sparce and because Etherpad takes a lot of it's inspiration from Wordpress plugins are really easy to install and update.  Once you have Etherpad installed you should visit the plugin page and take control.
+There's also a full-featured plugin framework, allowing you to easily add your own features.  By default your Etherpad is rather sparse and because Etherpad takes a lot of it's inspiration from Wordpress plugins are really easy to install and update.  Once you have Etherpad installed you should visit the plugin page and take control.
 
 Finally, Etherpad comes with translations into most languages!  Users are automatically delivered the correct language for their local settings.
 
@@ -50,9 +50,9 @@ Update to the latest version with `git pull origin`, then run `bin\installOnWind
 
 ## GNU/Linux and other UNIX-like systems
 You'll need gzip, git, curl, libssl develop libraries, python and gcc.  
-*For Debian/Ubuntu*: `apt-get install gzip git-core curl python libssl-dev pkg-config build-essential`  
-*For Fedora/CentOS*: `yum install gzip git-core curl python openssl-devel && yum groupinstall "Development Tools"`
-*For FreeBSD*: `portinstall node, npm, git (optional)`
+- *For Debian/Ubuntu*: `apt-get install gzip git-core curl python libssl-dev pkg-config build-essential`  
+- *For Fedora/CentOS*: `yum install gzip git-core curl python openssl-devel && yum groupinstall "Development Tools"`
+- *For FreeBSD*: `portinstall node, npm, git (optional)`
 
 Additionally, you'll need [node.js](http://nodejs.org) installed, Ideally the latest stable version, we recommend installing/compiling nodejs from source (avoiding apt).
 
@@ -74,6 +74,10 @@ You can initially modify the settings in `settings.json`. (If you need to handle
 
 You should use a dedicated database such as "mysql", if you are planning on using etherpad-in a production environment, since the "dirtyDB" database driver is only for testing and/or development purposes.
 
+## Plugins and themes
+
+Etherpad is very customizable through plugins. Instructions for installing themes and plugins can be found in [the plugin wiki article](https://github.com/ether/etherpad-lite/wiki/Available-Plugins).
+
 ## Helpful resources
 The [wiki](https://github.com/ether/etherpad-lite/wiki) is your one-stop resource for Tutorials and How-to's, really check it out! Also, feel free to improve these wiki pages.
 

bin/backendTests.sh

@@ -0,0 +1 @@
+src/node_modules/mocha/bin/mocha --timeout 5000 --reporter nyan tests/backend/specs/api

bin/buildForWindows.sh

@@ -58,6 +58,8 @@ rm -rf .git/objects
 echo "remove windows jsdom-nocontextify/test folder"
 rm -rf /tmp/etherpad-lite-win/node_modules/ep_etherpad-lite/node_modules/jsdom-nocontextifiy/test/
 rm -rf /tmp/etherpad-lite-win/src/node_modules/jsdom-nocontextifiy/test/
+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/etherpad-lite-win/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

bin/dirty-db-cleaner.py

@@ -0,0 +1,45 @@
+#!/usr/bin/python -u
+#
+# Created by Bjarni R. Einarsson, placed in the public domain. Go wild!
+#
+import json
+import os
+import sys
+
+try:
+    dirtydb_input = sys.argv[1]
+    dirtydb_output = '%s.new' % dirtydb_input
+    assert(os.path.exists(dirtydb_input))
+    assert(not os.path.exists(dirtydb_output))
+except:
+    print 
+    print 'Usage: %s /path/to/dirty.db' % sys.argv[0]
+    print 
+    print 'Note: Will create a file named dirty.db.new in the same folder,'
+    print '      please make sure permissions are OK and a file by that'
+    print '      name does not exist already. This script works by omitting'
+    print '      duplicate lines from the dirty.db file, keeping only the'
+    print '      last (latest) instance. No revision data should be lost,'
+    print '      but be careful, make backups. If it breaks you get to keep'
+    print '      both pieces!'
+    print
+    sys.exit(1)
+
+dirtydb = {}
+lines = 0
+with open(dirtydb_input, 'r') as fd:
+    print 'Reading %s' % dirtydb_input
+    for line in fd:
+        lines += 1
+        data = json.loads(line)
+        dirtydb[data['key']] = line
+        if lines % 10000 == 0:
+            sys.stderr.write('.')
+print
+print 'OK, found %d unique keys in %d lines' % (len(dirtydb), lines)
+
+with open(dirtydb_output, 'w') as fd:
+    for data in dirtydb.values():
+        fd.write(data)
+
+print 'Wrote data to %s. All done!' % dirtydb_output

bin/installDeps.sh

@@ -36,8 +36,9 @@ hash npm > /dev/null 2>&1 || {
 
 #check npm version
 NPM_VERSION=$(npm --version)
-if [ ! $(echo $NPM_VERSION | cut -d "." -f 1) = "1" ]; then
-  echo "You're running a wrong version of npm, you're using $NPM_VERSION, we need 1.x" >&2
+NPM_MAIN_VERSION=$(echo $NPM_VERSION | cut -d "." -f 1)
+if [ $(echo $NPM_MAIN_VERSION) = "0" ]; then
+  echo "You're running a wrong version of npm, you're using $NPM_VERSION, we need 1.x or higher" >&2
   exit 1 
 fi
 
@@ -98,7 +99,7 @@ fi
 echo "Clear minfified cache..."
 rm -f var/minified*
 
-echo "ensure custom css/js files are created..."
+echo "Ensure custom css/js files are created..."
 
 for f in "index" "pad" "timeslider"
 do

bin/jshint.sh

@@ -1,9 +0,0 @@
-#!/bin/sh
-
-if [ -d "../bin" ]; then
-  cd "../"
-fi
-
-JSHINT=./node_modules/jshint/bin/hint
-
-$JSHINT ./node/

bin/loadTesting/README

@@ -1,79 +0,0 @@
-This is the new load testing file: https://bitbucket.org/rbraakman/etherpad-stresstest
-
-BELOW is the original load testing file.
-
-This load tester is extremely useful for testing how many dormant clients can connect to etherpad.  
-
-TODO:
-Emulate characters being typed into a pad
-
-HOW TO USE (from @mjd75) proper formatting at: https://github.com/ether/etherpad-lite/issues/360
-
-Server 1:
-Installed Node.js (etc), EtherPad and MySQL
-
-Server 2:
-Installed Xvfb and PhantomJS
-
-I installed Xvfb following (roughly) this guide: http://blog.martin-lyness.com/archives/installing-xvfb-on-ubuntu-9-10-karmic-koala
-
-    #sudo apt-get install xvfb
-    #sudo apt-get install xfonts-100dpi xfonts-75dpi xfonts-scalable xfonts-cyrillic
-
-Launched two instances of Xvfb directly from the terminal:
-
-    #Xvfb :0 -ac
-    #Xvfb :1 -ac
-
-I installed PhantomJS following this guide: http://code.google.com/p/phantomjs/wiki/Installation
-
-    #sudo add-apt-repository ppa:jerome-etienne/neoip
-    #sudo apt-get update
-    #sudo apt-get install phantomjs
-
-I created a small JavaScript file for PhatomJS to use to control the browser instances:
-
-### BEGIN JAVASCRIPT ###
-
-var page = new WebPage(),
-    t, address;
-
-if (phantom.args.length === 0) {
-    console.log('Usage: loader.js <some URL>');
-    phantom.exit();
-} else {
-    t = Date.now();
-    address = phantom.args[0];
-
-    var page = new WebPage();
-    page.onResourceRequested = function (request) {
-        console.log('Request ' + JSON.stringify(request, undefined, 4));
-    };
-    page.onResourceReceived = function (response) {
-        console.log('Receive ' + JSON.stringify(response, undefined, 4));
-    };
-    page.open(address);
-
-}
-
-### END JAVASCRIPT ###
-
-And finally a launcher script that uses screen to run 400 instances of PhantomJS with the above script:
-
-### BEGIN SHELL SCRIPT ###
-
-#!/bin/bash     
-
-# connect 200 instances to display :0                                                             
-for i in {1..200}
-do
-  DISPLAY=:0 screen -d -m phantomjs loader.js http://ec2-50-17-168-xx.compute-1.amazonaws.com:9001/p/pad2 && sleep 2
-done
-
-# connect 200 instances to display :1                                                             
-for i in {1..200}
-do
-  DISPLAY=:1 screen -d -m phantomjs loader.js http://ec2-50-17-168-xx.compute-1.amazonaws.com:9001/p/pad2 && sleep 2
-done
-
-### END SHELL SCRIPT ###

bin/loadTesting/launcher.sh

@@ -1,16 +0,0 @@
-#!/bin/bash
-
-# connect 500 instances to display :0
-for i in {1..500}
-do
-  echo $i
-  echo "Displaying Some shit"
-  DISPLAY=:0 screen -d -m /home/phantomjs/bin/phantomjs loader.js http://10.0.0.55:9001/p/pad2 && sleep 2
-done
-
-# connect 500 instances to display :1
-for i in {1..500}
-do
-  echo $i
-  DISPLAY=:1 screen -d -m /home/phantomjs/bin/phantomjs loader.js http://10.0.0.55:9001/p/pad2 && sleep 2
-done

bin/loadTesting/loader.js

@@ -1,20 +0,0 @@
-var page = new WebPage(),
-    t, address;
-
-if (phantom.args.length === 0) {
-    console.log('Usage: loader.js <some URL>');
-    phantom.exit();
-} else {
-    t = Date.now();
-    address = phantom.args[0];
-
-    var page = new WebPage();
-    page.onResourceRequested = function (request) {
-        console.log('Request ' + JSON.stringify(request, undefined, 4));
-    };
-    page.onResourceReceived = function (response) {
-        console.log('Receive ' + JSON.stringify(response, undefined, 4));
-    };
-    page.open(address);
-
-}

bin/rebuildPad.js

@@ -0,0 +1,120 @@
+/*
+  This is a repair tool. It rebuilds an old pad at a new pad location up to a
+  known "good" revision.
+*/
+
+if(process.argv.length != 4 && process.argv.length != 5) {
+  console.error("Use: node bin/repairPad.js $PADID $REV [$NEWPADID]");
+  process.exit(1);
+}
+
+var npm = require("../src/node_modules/npm");
+var async = require("../src/node_modules/async");
+var ueberDB = require("../src/node_modules/ueberDB");
+
+var padId = process.argv[2];
+var newRevHead = process.argv[3];
+var newPadId = process.argv[4] || padId + "-rebuilt";
+
+var db, oldPad, newPad, settings;
+var AuthorManager, ChangeSet, Pad, PadManager;
+
+async.series([
+  function(callback) {
+    npm.load({}, function(err) {
+      if(err) {
+        console.error("Could not load NPM: " + err)
+        process.exit(1);
+      } else {
+        callback();
+      }
+    })
+  },
+  function(callback) {
+    // Get a handle into the database
+    db = require('../src/node/db/DB');
+    db.init(callback);
+  }, function(callback) {
+     PadManager = require('../src/node/db/PadManager');
+     Pad = require('../src/node/db/Pad').Pad;
+     // Get references to the original pad and to a newly created pad
+     // HACK: This is a standalone script, so we want to write everything
+     // out to the database immediately.  The only problem with this is
+     // that a driver (like the mysql driver) can hardcode these values.
+     db.db.db.settings = {cache: 0, writeInterval: 0, json: true};
+     // Validate the newPadId if specified and that a pad with that ID does
+     // not already exist to avoid overwriting it.
+     if (!PadManager.isValidPadId(newPadId)) {
+       console.error("Cannot create a pad with that id as it is invalid");
+       process.exit(1);
+     }
+     PadManager.doesPadExists(newPadId, function(err, exists) {
+       if (exists) {
+         console.error("Cannot create a pad with that id as it already exists");
+         process.exit(1);
+       }
+     });
+     PadManager.getPad(padId, function(err, pad)  {
+       oldPad = pad;
+       newPad = new Pad(newPadId);
+       callback();
+     });
+  }, function(callback) {
+    // Clone all Chat revisions
+    var chatHead = oldPad.chatHead;
+    for(var i = 0, curHeadNum = 0; i <= chatHead; i++) {
+      db.db.get("pad:" + padId + ":chat:" + i, function (err, chat) {
+        db.db.set("pad:" + newPadId + ":chat:" + curHeadNum++, chat);
+        console.log("Created: Chat Revision: pad:" + newPadId + ":chat:" + curHeadNum);
+      });
+    }
+    callback();
+  }, function(callback) {
+    // Rebuild Pad from revisions up to and including the new revision head
+    AuthorManager = require("../src/node/db/AuthorManager");
+    Changeset = require("ep_etherpad-lite/static/js/Changeset");
+    // Author attributes are derived from changesets, but there can also be
+    // non-author attributes with specific mappings that changesets depend on
+    // and, AFAICT, cannot be recreated any other way
+    newPad.pool.numToAttrib = oldPad.pool.numToAttrib;
+    for(var curRevNum = 0; curRevNum <= newRevHead; curRevNum++) {
+      db.db.get("pad:" + padId + ":revs:" + curRevNum, function(err, rev) {
+        var newRevNum = ++newPad.head;
+        var newRevId = "pad:" + newPad.id + ":revs:" + newRevNum;
+        db.db.set(newRevId, rev);
+        AuthorManager.addPad(rev.meta.author, newPad.id);
+        newPad.atext = Changeset.applyToAText(rev.changeset, newPad.atext, newPad.pool);
+        console.log("Created: Revision: pad:" + newPad.id + ":revs:" + newRevNum);
+        if (newRevNum == newRevHead) {
+          callback();
+        }
+      });
+    }
+  }, function(callback) {
+    // Add saved revisions up to the new revision head
+    console.log(newPad.head);
+    var newSavedRevisions = [];
+    for(var i in oldPad.savedRevisions) {
+      savedRev = oldPad.savedRevisions[i]
+      if (savedRev.revNum <= newRevHead) {
+        newSavedRevisions.push(savedRev);
+        console.log("Added: Saved Revision: " + savedRev.revNum);
+      }
+    }
+    newPad.savedRevisions = newSavedRevisions;
+    callback();
+  }, function(callback) {
+    // Save the source pad
+    db.db.set("pad:"+newPadId, newPad, function(err) {
+      console.log("Created: Source Pad: pad:" + newPadId);
+      newPad.saveToDatabase();
+      callback();
+    });
+  }
+], function (err) {
+  if(err) throw err;
+  else {
+    console.info("finished");
+    process.exit(0);
+  }
+});

bin/run.sh

@@ -32,7 +32,7 @@ fi
 bin/installDeps.sh $* || exit 1
 
 #Move to the node folder and start
-echo "start..."
+echo "Started Etherpad..."
 
 SCRIPTPATH=`pwd -P`
 node $SCRIPTPATH/node_modules/ep_etherpad-lite/node/server.js $*

bin/updatePlugins.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+#Move to the folder where ep-lite is installed
+cd `dirname $0`
+
+#Was this script started in the bin folder? if yes move out
+if [ -d "../bin" ]; then
+  cd "../"
+fi
+
+npm outdated --depth=0 | grep -v "^Package" | awk '{print $1}' | xargs npm install $1 --save-dev
+

doc/api/hooks_client-side.md

@@ -80,6 +80,22 @@ This hook is called during the attribute processing procedure, and should be use
 
 The return value for this function should be a list of classes, which will then be parsed into a valid class string.
 
+## aceAttribClasses
+Called from: src/static/js/linestylefilter.js
+
+Things in context:
+1. Attributes - Object of Attributes
+
+This hook is called when attributes are investigated on a line.  It is useful if you want to add another attribute type or property type to a pad.
+
+Example:
+```
+exports.aceAttribClasses = function(hook_name, attr, cb){
+  attr.sub = 'tag:sub';
+  cb(attr);
+}
+```
+
 ## aceGetFilterStack
 Called from: src/static/js/linestylefilter.js
 

doc/api/hooks_server-side.md

@@ -247,6 +247,40 @@ Things in context:
 
 This hook will allow a plug-in developer to re-write each line when exporting to HTML.
 
+## stylesForExport
+Called from: src/node/utils/ExportHtml.js
+
+Things in context:
+
+1. padId - The Pad Id
+
+This hook will allow a plug-in developer to append Styles to the Exported HTML.
+
+Example:
+
+```
+exports.stylesForExport = function(hook, padId, cb){
+  cb("body{font-size:13.37em !important}");
+}
+```
+
+## aceAttribClasses
+Called from: src/static/js/linestylefilter.js
+
+Things in context:
+1. Attributes - Object of Attributes
+
+This hook is called when attributes are investigated on a line.  It is useful if you want to add another attribute type or property type to a pad.
+
+Example:
+
+```
+exports.aceAttribClasses = function(hook_name, attr, cb){
+  attr.sub = 'tag:sub';
+  cb(attr);
+}
+```
+
 ## exportFileName
 Called from src/node/handler/ExportHandler.js 
 
@@ -264,6 +298,24 @@ exports.exportFileName = function(hook, padId, callback){
 }
 ```
 
+## exportHtmlAdditionalTags
+Called from src/node/utils/ExportHtml.js
+
+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.
+
+Example:
+```
+// Add the props to be supported in export
+exports.exportHtmlAdditionalTags = function(hook, pad, cb){
+  var padId = pad.id;
+  cb(["massive","jugs"]);
+};
+
+
 ## userLeave
 Called from src/node/handler/PadMessageHandler.js
 

settings.json.template

@@ -74,19 +74,22 @@
   /* This is the path to the Abiword executable. Setting it to null, disables abiword.
      Abiword is needed to advanced import/export features of pads*/  
   "abiword" : 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,
+  "requireAuthentication" : false,
 
   /* Require authorization by a module, or a user with is_admin set, see below. */
-  "requireAuthorization": false,
+  "requireAuthorization" : false,
   
   /*when you use NginX or another proxy/ load-balancer set this to true*/
-  "trustProxy": false,
+  "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! */

src/locales/af.json

@@ -25,7 +25,6 @@
 	"pad.settings.fontType.monospaced": "Monospasie",
 	"pad.importExport.exporthtml": "HTML",
 	"pad.importExport.exportpdf": "PDF",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"pad.modals.userdup.advice": "Maak weer 'n verbinding as u die venster wil gebruik.",
 	"pad.modals.unauth": "Nie toegestaan",
 	"pad.modals.deleted": "Geskrap.",

src/locales/ar.json

@@ -2,7 +2,8 @@
 	"@metadata": {
 		"authors": [
 			"Ali1",
-			"Tux-tn"
+			"Tux-tn",
+			"Alami"
 		]
 	},
 	"index.newPad": "باد جديد",
@@ -17,6 +18,7 @@
 	"pad.toolbar.unindent.title": "حذف الإزاحة",
 	"pad.toolbar.undo.title": "فك (Ctrl-Z)",
 	"pad.toolbar.redo.title": "تكرار (Ctrl-Y)",
+	"pad.toolbar.clearAuthorship.title": "مسح ألوان التأليف",
 	"pad.toolbar.import_export.title": "استيراد/تصدير من/إلى تنسيقات ملفات مختلفة",
 	"pad.toolbar.timeslider.title": "متصفح التاريخ",
 	"pad.toolbar.savedRevision.title": "حفظ المراجعة",
@@ -49,7 +51,7 @@
 	"pad.importExport.exportword": "مايكروسوفت وورد",
 	"pad.importExport.exportpdf": "صيغة المستندات المحمولة",
 	"pad.importExport.exportopen": "ODF (نسق المستند المفتوح)",
-	"pad.importExport.exportdokuwiki": "دوکوويكي",
+	"pad.importExport.abiword.innerHTML": "لايمكنك الاستيراد إلا من نص عادي أو من تنسيقات إتش تي إم إل. للحصول على المزيد من ميزات الاستيراد المتقدمة، يرجى تثبيت أبيورد <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\"></a>.",
 	"pad.modals.connected": "متصل.",
 	"pad.modals.reconnecting": "إعادة الاتصال ببادك",
 	"pad.modals.forcereconnect": "فرض إعادة الاتصال",
@@ -57,21 +59,31 @@
 	"pad.modals.userdup.explanation": "يبدو أن هذا الباد تم فتحه في أكثر من نافذة متصفح في هذا الحاسوب.",
 	"pad.modals.userdup.advice": "إعادة الاتصال لإستعمال هذه النافذة بدلاً  من الاخرى.",
 	"pad.modals.unauth": "غير مخول",
+	"pad.modals.unauth.explanation": "لقد تغيرت الأذونات الخاصة بك أثناء عرض هذه الصفحة. حاول إعادة الاتصال.",
+	"pad.modals.looping.explanation": "هناك مشاكل في الاتصال مع ملقم التزامن.",
+	"pad.modals.looping.cause": "ربما كنت متصلاً من خلال وكيل أو جدار حماية غير متوافق.",
 	"pad.modals.initsocketfail": "لا يمكن الوصول إلى الخادم",
 	"pad.modals.initsocketfail.explanation": "تعذر الاتصال بخادم المزامنة.",
+	"pad.modals.initsocketfail.cause": "وهذا على الأرجح بسبب مشكلة في المستعرض الخاص بك أو الاتصال بإنترنت.",
 	"pad.modals.slowcommit.explanation": "الخادم لا يستجيب.",
 	"pad.modals.slowcommit.cause": "يمكن أن يكون هذا بسبب مشاكل في الاتصال بالشبكة.",
+	"pad.modals.badChangeset.explanation": "لقد صنفت إحدى عمليات التحرير التي قمت بها كعملية غير مسموح بها من قبل ملقم التزامن.",
+	"pad.modals.badChangeset.cause": "يمكن أن يكون هذا بسبب تكوين ملقم خاطئ أو بسبب سلوك آخر غير متوقع. يرجى الاتصال بمسؤول الخدمة إذا كنت تعتقد بأن هناك خطأ ما. حاول إعادة الاتصال لمتابعة التحرير.",
+	"pad.modals.corruptPad.explanation": "الباد الذي تحاول الوصول إليه تالف.",
+	"pad.modals.corruptPad.cause": "قد يكون هذا بسبب تكوين ملقم خاطئ أو بسبب سلوك آخر غير متوقع. يرجى الاتصال بمسؤول الخدمة.",
 	"pad.modals.deleted": "محذوف.",
 	"pad.modals.deleted.explanation": "تمت إزالة هذا الباد",
 	"pad.modals.disconnected": "لم تعد متّصل.",
 	"pad.modals.disconnected.explanation": "تم فقدان الإتصال بالخادم",
-	"pad.modals.disconnected.cause": "قد يكون الخادم غير متوفر. الرجاء إعلامنا إذا تكرر هذا.",
+	"pad.modals.disconnected.cause": "قد يكون الخادم غير متوفر. يرجى إعلام مسؤول الخدمة إذا كان هذا لا يزال يحدث.",
+	"pad.share": "شارك هذه الباد",
 	"pad.share.readonly": "للقراءة فقط",
 	"pad.share.link": "رابط",
 	"pad.share.emebdcode": "URL للتضمين",
 	"pad.chat": "دردشة",
 	"pad.chat.title": "فتح الدردشة لهذا الباد",
 	"pad.chat.loadmessages": "تحميل المزيد من الرسائل",
+	"timeslider.pageTitle": "{{appTitle}} متصفح التاريخ",
 	"timeslider.toolbar.returnbutton": "العودة إلى الباد",
 	"timeslider.toolbar.authors": "المؤلفون:",
 	"timeslider.toolbar.authorsList": "بدون مؤلفين",
@@ -92,14 +104,20 @@
 	"timeslider.month.october": "أكتوبر",
 	"timeslider.month.november": "نوفمبر",
 	"timeslider.month.december": "ديسمبر",
-	"pad.userlist.entername": "إدخل اسمك",
+	"timeslider.unnamedauthors": "بدون اسم {{num}} {[plural(num) واحد: كاتب، آخر: مؤلف]}",
+	"pad.savedrevs.marked": "هذا التنقيح محدد الآن كمراجعة محفوظة",
+	"pad.userlist.entername": "أدخل اسمك",
 	"pad.userlist.unnamed": "غير مسمى",
 	"pad.userlist.guest": "ضيف",
 	"pad.userlist.deny": "رفض",
 	"pad.userlist.approve": "موافقة",
+	"pad.editbar.clearcolors": "مسح ألوان التأليف أو المستند بأكمله؟",
 	"pad.impexp.importbutton": "الاستيراد الآن",
 	"pad.impexp.importing": "الاستيراد...",
+	"pad.impexp.confirmimport": "استيراد ملف سيؤدي للكتابة فوق النص الحالي بالباد. هل أنت متأكد من أنك تريد المتابعة؟",
+	"pad.impexp.convertFailed": "لم نتمكن من استيراد هذا الملف. يرجى استخدام تنسيق مستند مختلف، أو النسخ واللصق يدوياً",
 	"pad.impexp.uploadFailed": "فشل التحميل، الرجاء المحاولة مرة أخرى",
 	"pad.impexp.importfailed": "فشل الاستيراد",
-	"pad.impexp.copypaste": "الرجاء نسخ/لصق"
+	"pad.impexp.copypaste": "الرجاء نسخ/لصق",
+	"pad.impexp.exportdisabled": "تصدير التنسيق {{type}} معطل. يرجى الاتصال بمسؤول النظام الخاص بك للحصول على التفاصيل."
 }

src/locales/ast.json

@@ -49,7 +49,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"pad.importExport.abiword.innerHTML": "Sólo se pue importar dende los formatos de testu planu o html. Pa carauterístiques d'importación más avanzaes <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\">instala abiword</a>.",
 	"pad.modals.connected": "Coneutáu.",
 	"pad.modals.reconnecting": "Reconeutando col to bloc...",

src/locales/az.json

@@ -51,7 +51,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Açıq Sənəd Formatı)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"pad.importExport.abiword.innerHTML": "Siz yalnız adi mətndən və ya HTML-dən idxal edə bilərsiniz. İdxalın daha mürəkkəb funksiyaları üçün, zəhmət olmasa, <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-i quraşdırın</a>.",
 	"pad.modals.connected": "Bağlandı.",
 	"pad.modals.reconnecting": "Sizin pad yenidən qoşulur..",

src/locales/azb.json

@@ -2,7 +2,8 @@
 	"@metadata": {
 		"authors": [
 			"Amir a57",
-			"Mousa"
+			"Mousa",
+			"Koroğlu"
 		]
 	},
 	"index.newPad": "یئنی یادداشت دفترچه سی",
@@ -45,7 +46,6 @@
 	"pad.importExport.exportword": "مایکروسافت وورد",
 	"pad.importExport.exportpdf": "پی دی اف",
 	"pad.importExport.exportopen": "او دی اف",
-	"pad.importExport.exportdokuwiki": "دوکو ویکی",
 	"pad.modals.connected": "متصل اولدی",
 	"pad.modals.reconnecting": "سیزین یادداشت دفترچه سینه یئنی دن متصیل اولدی",
 	"pad.modals.forcereconnect": "یئنی اتصال اوچون زورلاما",
@@ -68,5 +68,21 @@
 	"timeslider.pageTitle": "{{appTitle}}زمان اسلایدری",
 	"timeslider.toolbar.returnbutton": "یادداشت دفترچه سینه قاییت",
 	"timeslider.toolbar.authors": "یازیچیلار",
-	"timeslider.toolbar.authorsList": "یازیچی سیز"
+	"timeslider.toolbar.authorsList": "یازیچی سیز",
+	"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.unnamed": "آدسیز",
+	"pad.userlist.guest": "قوْناق",
+	"pad.userlist.deny": "دانماق",
+	"pad.userlist.approve": "اوْنایلا"
 }

src/locales/bcc.json

@@ -0,0 +1,121 @@
+{
+	"@metadata": {
+		"authors": [
+			"Baloch Afghanistan"
+		]
+	},
+	"index.newPad": "دفترچه یادداشت تازه",
+	"index.createOpenPad": "یا ایجاد/بازکردن یک دفترچه یادداشت با نام:",
+	"pad.toolbar.bold.title": "پررنگ (Ctrl-B)",
+	"pad.toolbar.italic.title": "کج (Ctrl-I)",
+	"pad.toolbar.underline.title": "زیرخط (Ctrl-U)",
+	"pad.toolbar.strikethrough.title": "خط خورده",
+	"pad.toolbar.ol.title": "فهرست مرتب شده",
+	"pad.toolbar.ul.title": "فهرست مرتب نشده",
+	"pad.toolbar.indent.title": "تورفتگی (TAB)",
+	"pad.toolbar.unindent.title": "بیرون رفتگی (Shift+TAB)",
+	"pad.toolbar.undo.title": "باطل‌کردن (Ctrl-Z)",
+	"pad.toolbar.redo.title": "از نو (Ctrl-Y)",
+	"pad.toolbar.clearAuthorship.title": "پاک‌کردن رنگ‌های نویسندگی",
+	"pad.toolbar.import_export.title": "درون‌ریزی/برون‌ریزی از/به قالب‌های مختلف",
+	"pad.toolbar.timeslider.title": "لغزندهٔ زمان",
+	"pad.toolbar.savedRevision.title": "ذخیره‌سازی نسخه",
+	"pad.toolbar.settings.title": "تنظیمات",
+	"pad.toolbar.embed.title": "اشتراک و جاسازی این دفترچه یادداشت",
+	"pad.toolbar.showusers.title": "نمایش کاربران در این دفترچه یادداشت",
+	"pad.colorpicker.save": "زاپاس کورتین",
+	"pad.colorpicker.cancel": "کنسیل",
+	"pad.loading": "...بار بیت",
+	"pad.passwordRequired": "برای دسترسی به این دفترچه یادداشت نیاز به یک گذرواژه دارید",
+	"pad.permissionDenied": "شرمنده، شما را اجازت په دسترسی ای صفحه نیست.",
+	"pad.wrongPassword": "گذرواژه‌ی شما درست نیست",
+	"pad.settings.padSettings": "تنظیمات دفترچه یادداشت",
+	"pad.settings.myView": "نمای من",
+	"pad.settings.stickychat": "گفتگو همیشه روی صفحه نمایش باشد",
+	"pad.settings.colorcheck": "رنگ‌های نویسندگی",
+	"pad.settings.linenocheck": "شماره‌ی خطوط",
+	"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.importSuccessful": "موفقیت آمیز بود!",
+	"pad.importExport.export": "برون‌ریزی این دفترچه یادداشت با قالب:",
+	"pad.importExport.exporthtml": "HTML",
+	"pad.importExport.exportplain": "سادگین متن",
+	"pad.importExport.exportword": "Microsoft Word",
+	"pad.importExport.exportpdf": "PDF",
+	"pad.importExport.exportopen": "ODF (قالب سند باز)",
+	"pad.importExport.abiword.innerHTML": "شما تنها می‌توانید از قالب متن ساده یا اچ‌تی‌ام‌ال درون‌ریزی کنید. برای بیشتر شدن ویژگی‌های درون‌ریزی پیشرفته <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.modals.reconnecting": "در حال اتصال دوباره به دفترچه یادداشت شما..",
+	"pad.modals.forcereconnect": "واداشتن به اتصال دوباره",
+	"pad.modals.userdup": "در پنجره‌ای دیگر باز شد",
+	"pad.modals.userdup.explanation": "گمان می‌رود این دفترچه یادداشت در بیش از یک پنجره‌ی مرورگر باز شده‌است.",
+	"pad.modals.userdup.advice": "برای استفاده از این پنجره دوباره وصل شوید.",
+	"pad.modals.unauth": "مجاز نیست",
+	"pad.modals.unauth.explanation": "دسترسی شما در حین مشاهده‌ی این برگه تغییر یافته‌است. دوباره متصل شوید.",
+	"pad.modals.looping.explanation": "مشکلاتی ارتباطی با سرور همگام‌سازی وجود دارد.",
+	"pad.modals.looping.cause": "شاید شما از طریق یک فایروال یا پروکسی ناسازگار متصل شده‌اید.",
+	"pad.modals.initsocketfail": "سرور در دسترس نیست.",
+	"pad.modals.initsocketfail.explanation": "نمی‌توان به سرور همگام سازی وصل شد.",
+	"pad.modals.initsocketfail.cause": "شاید این به خاطر مشکلی در مرورگر یا اتصال اینترنتی شما باشد.",
+	"pad.modals.slowcommit.explanation": "سرور پاسخ نمی‌دهد.",
+	"pad.modals.slowcommit.cause": "این می‌تواند به خاطر مشکلاتی در اتصال به شبکه باشد.",
+	"pad.modals.badChangeset.explanation": "ویرایشی که شما انجام داده‌اید توسط سرور همگام‌سازی نادرست طیقه‌بندی شده‌است.",
+	"pad.modals.badChangeset.cause": "این می‌تواند به دلیل پیکربندی اشتباه یا سایر رفتارهای غیرمنتظره باشد. اگر فکر می‌کنید این یک خطا است لطفاً با مدیر خدمت تماس بگیرید. برای ادامهٔ ویرایش سعی کنید که دوباره متصل شوید.",
+	"pad.modals.corruptPad.explanation": "پدی که شما سعی دارید دسترسی پیدا کنید خراب است.",
+	"pad.modals.corruptPad.cause": "این احتمالاً به دلیل تنظیمات اشتباه کارساز یا سایر رفتارهای غیرمنتظره است. لطفاً با مدیر خدمت تماس حاصل کنید.",
+	"pad.modals.deleted": "پاک کورتین",
+	"pad.modals.deleted.explanation": "این دفترچه یادداشت پاک شده‌است.",
+	"pad.modals.disconnected": "اتصال شما قطع شده‌است.",
+	"pad.modals.disconnected.explanation": "اتصال به سرور قطع شده‌است.",
+	"pad.modals.disconnected.cause": "ممکن است سرور در دسترس نباشد. اگر این مشکل باز هم رخ داد مدیر حدمت را آگاه کنید.",
+	"pad.share": "به اشتراک‌گذاری این دفترچه یادداشت",
+	"pad.share.readonly": "فقط خواندنی",
+	"pad.share.link": "پیوند",
+	"pad.share.emebdcode": "جاسازی نشانی",
+	"pad.chat": "گفتگو",
+	"pad.chat.title": "بازکردن گفتگو برای این دفترچه یادداشت",
+	"pad.chat.loadmessages": "بارگیری پیام‌های بیشتر",
+	"timeslider.pageTitle": "لغزندهٔ زمان {{appTitle}}",
+	"timeslider.toolbar.returnbutton": "بازگشت به دفترچه یادداشت",
+	"timeslider.toolbar.authors": "نویسوک:",
+	"timeslider.toolbar.authorsList": "بدون نویسنده",
+	"timeslider.toolbar.exportlink.title": "درگیزگ",
+	"timeslider.exportCurrent": "برون‌ریزی نگارش کنونی به عنوان:",
+	"timeslider.version": "نگارش {{version}}",
+	"timeslider.saved": "{{month}} {{day}}، {{year}} ذخیره شد",
+	"timeslider.dateformat": "{{month}}/{{day}}/{{year}} {{hours}}:{{minutes}}:{{seconds}}",
+	"timeslider.month.january": "جنوری",
+	"timeslider.month.february": "پیبروری",
+	"timeslider.month.march": "مارچ",
+	"timeslider.month.april": "آپریل",
+	"timeslider.month.may": "می",
+	"timeslider.month.june": "جون",
+	"timeslider.month.july": "جولای",
+	"timeslider.month.august": "آگوست",
+	"timeslider.month.september": "سپٹامبر",
+	"timeslider.month.october": "اکتوبر",
+	"timeslider.month.november": "نوامبر",
+	"timeslider.month.december": "دسمبر",
+	"timeslider.unnamedauthors": "{{num}} نویسندهٔ بی‌نام",
+	"pad.savedrevs.marked": "این بازنویسی هم اکنون به عنوان ذخیره شده علامت‌گذاری شد",
+	"pad.userlist.entername": "وتی یوزرنامء بلک ات",
+	"pad.userlist.unnamed": "بدون نام",
+	"pad.userlist.guest": "مهمان",
+	"pad.userlist.deny": "رد کردن",
+	"pad.userlist.approve": "تایید",
+	"pad.editbar.clearcolors": "رنگ نویسندگی از همه‌ی سند پاک شود؟",
+	"pad.impexp.importbutton": "هم اکنون درون‌ریزی کن",
+	"pad.impexp.importing": "در حال درون‌ریزی...",
+	"pad.impexp.confirmimport": "با درون‌ریزی یک پرونده نوشتهٔ کنونی دفترچه پاک می‌شود. آیا می‌خواهید ادامه دهید؟",
+	"pad.impexp.convertFailed": "ما نمی‌توانیم این پرونده را درون‌ریزی کنیم. خواهشمندیم قالب دیگری برای سندتان انتخاب کرده یا بصورت دستی آنرا کپی کنید",
+	"pad.impexp.uploadFailed": "آپلود انجام نشد، دوباره تلاش کنید",
+	"pad.impexp.importfailed": "درون‌ریزی انجام نشد",
+	"pad.impexp.copypaste": "کپی پیست کنید",
+	"pad.impexp.exportdisabled": "برون‌ریزی با قالب {{type}} از کار افتاده است. برای جزئیات بیشتر با مدیر سیستمتان تماس بگیرید."
+}

src/locales/be-tarask.json

@@ -11,14 +11,14 @@
 	"pad.toolbar.bold.title": "Тоўсты (Ctrl-B)",
 	"pad.toolbar.italic.title": "Курсіў (Ctrl-I)",
 	"pad.toolbar.underline.title": "Падкрэсьліваньне (Ctrl-U)",
-	"pad.toolbar.strikethrough.title": "Закрэсьліваньне",
-	"pad.toolbar.ol.title": "Упарадкаваны сьпіс",
-	"pad.toolbar.ul.title": "Неўпарадкаваны сьпіс",
+	"pad.toolbar.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": "Прыбраць колер дакумэнту",
+	"pad.toolbar.clearAuthorship.title": "Прыбраць колер дакумэнту (Ctrl+Shift+C)",
 	"pad.toolbar.import_export.title": "Імпарт/Экспарт з выкарыстаньне розных фарматаў файлаў",
 	"pad.toolbar.timeslider.title": "Шкала часу",
 	"pad.toolbar.savedRevision.title": "Захаваць вэрсію",
@@ -51,7 +51,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"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.modals.reconnecting": "Перападлучэньне да вашага дакумэнта...",

src/locales/bn.json

@@ -4,7 +4,8 @@
 			"Bellayet",
 			"Nasir8891",
 			"Sankarshan",
-			"Aftab1995"
+			"Aftab1995",
+			"Aftabuzzaman"
 		]
 	},
 	"index.newPad": "নতুন প্যাড",
@@ -18,7 +19,7 @@
 	"pad.toolbar.unindent.title": "আউটডেন্ট (Shift+TAB)",
 	"pad.toolbar.undo.title": "বাতিল করুন (Ctrl-Z)",
 	"pad.toolbar.redo.title": "পুনরায় করুন (Ctrl-Y)",
-	"pad.toolbar.clearAuthorship.title": "কৃতি রং পরিষ্কার করুন",
+	"pad.toolbar.clearAuthorship.title": "কৃতি রং পরিষ্কার করুন  (Ctrl+Shift+C)",
 	"pad.toolbar.timeslider.title": "টাইমস্লাইডার",
 	"pad.toolbar.savedRevision.title": "সংস্করণ সংরক্ষণ করুন",
 	"pad.toolbar.settings.title": "সেটিং",
@@ -49,7 +50,6 @@
 	"pad.importExport.exportword": "মাইক্রোসফট ওয়ার্ড",
 	"pad.importExport.exportpdf": "পিডিএফ",
 	"pad.importExport.exportopen": "ওডিএফ (ওপেন ডকুমেন্ট ফরম্যাট)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"pad.modals.connected": "যোগাযোগ সফল",
 	"pad.modals.reconnecting": "আপনার প্যাডের সাথে সংযোগস্থাপন করা হচ্ছে..",
 	"pad.modals.forcereconnect": "পুনরায় সংযোগস্থাপনের চেষ্টা",

src/locales/br.json

@@ -12,14 +12,14 @@
 	"pad.toolbar.bold.title": "Tev (Ctrl-B)",
 	"pad.toolbar.italic.title": "Italek (Ctrl-I)",
 	"pad.toolbar.underline.title": "Islinennañ (Ctrl-U)",
-	"pad.toolbar.strikethrough.title": "Barrennet",
-	"pad.toolbar.ol.title": "Roll urzhiet",
-	"pad.toolbar.ul.title": "Roll en dizurzh",
+	"pad.toolbar.strikethrough.title": "Barrennet(Ktrl+5)",
+	"pad.toolbar.ol.title": "Listenn urzhiet (Ktrl+Pennlizherenn+N)",
+	"pad.toolbar.ul.title": "Listenn en dizurzh (Ktrl+Pennlizherenn+L)",
 	"pad.toolbar.indent.title": "Endantañ (TAB)",
 	"pad.toolbar.unindent.title": "Diendantañ (Shift+TAB)",
 	"pad.toolbar.undo.title": "Dizober (Ktrl-Z)",
 	"pad.toolbar.redo.title": "Adober (Ktrl-Y)",
-	"pad.toolbar.clearAuthorship.title": "Diverkañ al livioù oc'h anaout an aozerien",
+	"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",
@@ -52,7 +52,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"pad.importExport.abiword.innerHTML": "Ne c'hallit ket emporzjiañ furmadoù testennoù kriz pe html. Evit arc'hwelioù enporzhiañ emdroetoc'h, staliit <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>  mar plij.",
 	"pad.modals.connected": "Kevreet.",
 	"pad.modals.reconnecting": "Adkevreañ war-zu ho pad...",

src/locales/ca.json

@@ -4,7 +4,8 @@
 			"Alvaro Vidal-Abarca",
 			"Pginer",
 			"Pitort",
-			"Toniher"
+			"Toniher",
+			"Macofe"
 		]
 	},
 	"index.newPad": "Nou pad",
@@ -19,7 +20,7 @@
 	"pad.toolbar.unindent.title": "Sagnat invers (Majúsc+TAB)",
 	"pad.toolbar.undo.title": "Desfés (Ctrl-Z)",
 	"pad.toolbar.redo.title": "Refés (Ctrl-Y)",
-	"pad.toolbar.clearAuthorship.title": "Neteja els colors d'autoria",
+	"pad.toolbar.clearAuthorship.title": "Neteja els colors d'autoria (Ctrl+Shift+C)",
 	"pad.toolbar.import_export.title": "Importa/exporta a partir de diferents formats de fitxer",
 	"pad.toolbar.timeslider.title": "Línia temporal",
 	"pad.toolbar.savedRevision.title": "Desa la revisió",
@@ -52,7 +53,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"pad.importExport.abiword.innerHTML": "Només podeu importar de text net o html. Per a opcions d'importació més avançades <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\">instal·leu l'Abiword</a>.",
 	"pad.modals.connected": "Connectat.",
 	"pad.modals.reconnecting": "S'està tornant a connectar al vostre pad…",

src/locales/cs.json

@@ -53,7 +53,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"pad.importExport.abiword.innerHTML": "Importovat můžeš pouze prostý text nebo HTML formátování. Pro pokročilejší funkce importu, prosím, nainstaluj „<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": "Připojeno.",
 	"pad.modals.reconnecting": "Znovupřipojování k Padu…",

src/locales/da.json

@@ -11,14 +11,14 @@
 	"pad.toolbar.bold.title": "Fed (Ctrl-B)",
 	"pad.toolbar.italic.title": "Kursiv (Ctrl-I)",
 	"pad.toolbar.underline.title": "Understregning (Ctrl-U)",
-	"pad.toolbar.strikethrough.title": "Gennemstregning",
-	"pad.toolbar.ol.title": "Sorteret liste",
-	"pad.toolbar.ul.title": "Usorteret liste",
+	"pad.toolbar.strikethrough.title": "Gennemstregning (Ctrl+5)",
+	"pad.toolbar.ol.title": "Sorteret liste (Ctrl+Shift+N)",
+	"pad.toolbar.ul.title": "Usorteret liste (Ctrl+Shift+L)",
 	"pad.toolbar.indent.title": "Indrykning (TAB)",
 	"pad.toolbar.unindent.title": "Ryk ud (Shift+TAB)",
 	"pad.toolbar.undo.title": "Fortryd (Ctrl-Z)",
 	"pad.toolbar.redo.title": "Annuller Fortryd (Ctrl-Y)",
-	"pad.toolbar.clearAuthorship.title": "Fjern farver for forfatterskab",
+	"pad.toolbar.clearAuthorship.title": "Fjern farver for forfatterskab (Ctrl+Shift+C)",
 	"pad.toolbar.import_export.title": "Import/eksport fra/til forskellige filformater",
 	"pad.toolbar.timeslider.title": "Timeslider",
 	"pad.toolbar.savedRevision.title": "Gem Revision",
@@ -51,7 +51,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"pad.importExport.abiword.innerHTML": "Du kan kun importere fra almindelig tekst eller HTML-formater. For mere avancerede importfunktioner, <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 venligst abiword</a>.",
 	"pad.modals.connected": "Forbundet.",
 	"pad.modals.reconnecting": "Genopretter forbindelsen til din pad...",

src/locales/de.json

@@ -12,14 +12,14 @@
 	"pad.toolbar.bold.title": "Fett (Strg-B)",
 	"pad.toolbar.italic.title": "Kursiv (Strg-I)",
 	"pad.toolbar.underline.title": "Unterstrichen (Strg-U)",
-	"pad.toolbar.strikethrough.title": "Durchgestrichen",
-	"pad.toolbar.ol.title": "Nummerierte Liste",
-	"pad.toolbar.ul.title": "Ungeordnete Liste",
+	"pad.toolbar.strikethrough.title": "Durchgestrichen (Strg+5)",
+	"pad.toolbar.ol.title": "Nummerierte Liste (Strg+Shift+N)",
+	"pad.toolbar.ul.title": "Ungeordnete Liste (Strg+Shift+L)",
 	"pad.toolbar.indent.title": "Einrücken (TAB)",
 	"pad.toolbar.unindent.title": "Ausrücken (Shift+TAB)",
 	"pad.toolbar.undo.title": "Rückgängig (Strg-Z)",
 	"pad.toolbar.redo.title": "Wiederholen (Strg-Y)",
-	"pad.toolbar.clearAuthorship.title": "Autorenfarben zurücksetzen",
+	"pad.toolbar.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.savedRevision.title": "Version markieren",
@@ -52,7 +52,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"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.modals.connected": "Verbunden.",
 	"pad.modals.reconnecting": "Wiederherstellen der Verbindung …",

src/locales/diq.json

@@ -10,14 +10,14 @@
 	"pad.toolbar.bold.title": "Qalın (Ctrl-B)",
 	"pad.toolbar.italic.title": "Namıte (Ctrl-I)",
 	"pad.toolbar.underline.title": "Bınxetın (Ctrl-U)",
-	"pad.toolbar.strikethrough.title": "Serxetın",
-	"pad.toolbar.ol.title": "Lista rêzkerdiye",
-	"pad.toolbar.ul.title": "Lista rêznêkerdiye",
+	"pad.toolbar.strikethrough.title": "Serxetın (Ctrl+5)",
+	"pad.toolbar.ol.title": "Lista rêzkerdiye (Ctrl+Shift+N)",
+	"pad.toolbar.ul.title": "Lista rêznêkerdiye (Ctrl+Shift+L)",
 	"pad.toolbar.indent.title": "Serrêze (TAB)",
 	"pad.toolbar.unindent.title": "Teberdayış (Shift+TAB)",
 	"pad.toolbar.undo.title": "Meke (Ctrl-Z)",
 	"pad.toolbar.redo.title": "Fına bıke (Ctrl-Y)",
-	"pad.toolbar.clearAuthorship.title": "Rengê Nuştoğiê Arıstey",
+	"pad.toolbar.clearAuthorship.title": "Rengê Nuştoğiê Arıstey (Ctrl+Shift+C)",
 	"pad.toolbar.timeslider.title": "Ğızagê zemani",
 	"pad.toolbar.savedRevision.title": "Çımraviyarnayışi qeyd ke",
 	"pad.toolbar.settings.title": "Sazkerdışi",
@@ -43,7 +43,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"pad.modals.connected": "Gırediya.",
 	"pad.modals.forcereconnect": "Mecbur anciya gırê de",
 	"pad.modals.userdup": "Zewbina pençere de bi a",
@@ -80,7 +79,7 @@
 	"timeslider.month.november": "Tışrino Peyên",
 	"timeslider.month.december": "Kanun",
 	"timeslider.unnamedauthors": "{{num}} unnamed {[plural(num) zu: nuştoğ, zewbi: nustoği ]}",
-	"pad.userlist.entername": "Namey ğo cı kewe",
+	"pad.userlist.entername": "Nameyê xo cıkewe",
 	"pad.userlist.unnamed": "Name nébıyo",
 	"pad.userlist.guest": "Meyman",
 	"pad.userlist.deny": "Red ke",

src/locales/dsb.json

@@ -49,7 +49,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"pad.importExport.abiword.innerHTML": "Móžoš jano z fprmatow lutnego teksta abo z HTML-formata importěrowaś. Za wěcej rozšyrjone importěrowańske funkcije <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\">instalěruj pšosym Abiword</a>.",
 	"pad.modals.connected": "Zwězany.",
 	"pad.modals.reconnecting": "Zwězujo se znowego z twójim zapisnikom...",

src/locales/el.json

@@ -13,14 +13,14 @@
 	"pad.toolbar.bold.title": "Έντονη (Ctrl-B)",
 	"pad.toolbar.italic.title": "Πλάγια (Ctrl-I)",
 	"pad.toolbar.underline.title": "Υπογράμμιση (Ctrl-U)",
-	"pad.toolbar.strikethrough.title": "Διακριτή διαγραφή",
-	"pad.toolbar.ol.title": "Ταξινομημένη λίστα",
-	"pad.toolbar.ul.title": "Λίστα χωρίς σειρά",
+	"pad.toolbar.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": "Εκκαθάριση των χρωμάτων των συντακτών",
+	"pad.toolbar.clearAuthorship.title": "Εκκαθάριση των χρωμάτων των συντακτών (Ctrl+Shift+C)",
 	"pad.toolbar.import_export.title": "Εισαγωγή/Εξαγωγή από/σε διαφορετικούς τύπους αρχείων",
 	"pad.toolbar.timeslider.title": "Χρονοδιάγραμμα",
 	"pad.toolbar.savedRevision.title": "Αποθήκευση Αναθεώρησης",
@@ -53,14 +53,13 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Μορφή Open Document)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"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.modals.reconnecting": "Επανασύνδεση στο pad σας...",
 	"pad.modals.forcereconnect": "Επιβολή επανασύνδεσης",
 	"pad.modals.userdup": "Ανοιγμένο σε άλλο παράθυρο",
 	"pad.modals.userdup.explanation": "Αυτό το pad φαίνεται να είναι ανοιχτό σε περισσότερα από ένα παράθυρο του προγράμματος περιήγησης σε αυτόν τον υπολογιστή.",
-	"pad.modals.userdup.advice": "Επανασύνδεση για να χρησιμοποιήσετε αυτό το παράθυρο.",
+	"pad.modals.userdup.advice": "Επανασυνδεθείτε για να χρησιμοποιήσετε αυτό το παράθυρο.",
 	"pad.modals.unauth": "Δεν επιτρέπεται",
 	"pad.modals.unauth.explanation": "Τα δικαιώματά σας άλλαξαν όσο βλέπατε αυτήν τη σελίδα. Δοκιμάστε να επανασυνδεθείτε.",
 	"pad.modals.looping.explanation": "Υπάρχουν προβλήματα επικοινωνίας με τον διακομιστή συγχρονισμού.",
@@ -76,7 +75,7 @@
 	"pad.modals.corruptPad.cause": "Αυτό μπορεί να οφείλεται σε ένα λάθος στη ρύθμιση του διακομιστή ή κάποια άλλη απρόβλεπτη συμπεριφορά. Παρακαλώ επικοινωνήστε με τον διαχειριστή της υπηρεσίας.",
 	"pad.modals.deleted": "Διεγράφη.",
 	"pad.modals.deleted.explanation": "Αυτό το pad έχει καταργηθεί.",
-	"pad.modals.disconnected": "Έχετε αποσυνδεθεί.",
+	"pad.modals.disconnected": "Είστε αποσυνδεδεμένοι.",
 	"pad.modals.disconnected.explanation": "Χάθηκε η σύνδεση με τον διακομιστή",
 	"pad.modals.disconnected.cause": "Ο διακομιστής μπορεί να μην είναι διαθέσιμος. Παρακαλούμε ειδοποιήστε τον διαχειριστή της υπηρεσίας εάν εξακολουθεί να συμβαίνει αυτό.",
 	"pad.share": "Μοιραστείτε αυτό το pad",

src/locales/en.json

@@ -2,17 +2,17 @@
   "index.newPad": "New Pad",
   "index.createOpenPad": "or create/open a Pad with the name:",
 
-  "pad.toolbar.bold.title": "Bold (Ctrl-B)",
-  "pad.toolbar.italic.title": "Italic (Ctrl-I)",
-  "pad.toolbar.underline.title": "Underline (Ctrl-U)",
-  "pad.toolbar.strikethrough.title": "Strikethrough",
-  "pad.toolbar.ol.title": "Ordered list",
-  "pad.toolbar.ul.title": "Unordered List",
+  "pad.toolbar.bold.title": "Bold (Ctrl+B)",
+  "pad.toolbar.italic.title": "Italic (Ctrl+I)",
+  "pad.toolbar.underline.title": "Underline (Ctrl+U)",
+  "pad.toolbar.strikethrough.title": "Strikethrough (Ctrl+5)",
+  "pad.toolbar.ol.title": "Ordered list (Ctrl+Shift+N)",
+  "pad.toolbar.ul.title": "Unordered List (Ctrl+Shift+L)",
   "pad.toolbar.indent.title": "Indent (TAB)",
   "pad.toolbar.unindent.title": "Outdent (Shift+TAB)",
-  "pad.toolbar.undo.title": "Undo (Ctrl-Z)",
-  "pad.toolbar.redo.title": "Redo (Ctrl-Y)",
-  "pad.toolbar.clearAuthorship.title": "Clear Authorship Colors",
+  "pad.toolbar.undo.title": "Undo (Ctrl+Z)",
+  "pad.toolbar.redo.title": "Redo (Ctrl+Y)",
+  "pad.toolbar.clearAuthorship.title": "Clear Authorship Colors (Ctrl+Shift+C)",
   "pad.toolbar.import_export.title": "Import/Export from/to different file formats",
   "pad.toolbar.timeslider.title": "Timeslider",
   "pad.toolbar.savedRevision.title": "Save Revision",
@@ -24,6 +24,7 @@
   "pad.colorpicker.cancel": "Cancel",
 
   "pad.loading": "Loading...",
+  "pad.noCookie": "Cookie could not be found. Please allow cookies in your browser!",
   "pad.passwordRequired": "You need a password to access this pad",
   "pad.permissionDenied": "You do not have permission to access this pad",
   "pad.wrongPassword": "Your password was wrong",
@@ -44,12 +45,12 @@
   "pad.importExport.import": "Upload any text file or document",
   "pad.importExport.importSuccessful": "Successful!",
   "pad.importExport.export": "Export current pad as:",
+  "pad.importExport.exportetherpad": "Etherpad",
   "pad.importExport.exporthtml": "HTML",
   "pad.importExport.exportplain": "Plain text",
   "pad.importExport.exportword": "Microsoft Word",
   "pad.importExport.exportpdf": "PDF",
   "pad.importExport.exportopen": "ODF (Open Document Format)",
-  "pad.importExport.exportdokuwiki": "DokuWiki",
   "pad.importExport.abiword.innerHTML": "You only can import from plain text or HTML formats. For more advanced import features please <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-in-Ubuntu-or-OpenSuse-or-SLES-with-AbiWord\">install abiword</a>.",
 
   "pad.modals.connected": "Connected.",
@@ -85,7 +86,7 @@
   "pad.modals.disconnected": "You have been disconnected.",
   "pad.modals.disconnected.explanation": "The connection to the server was lost",
   "pad.modals.disconnected.cause": "The server may be unavailable. Please notify the service administrator if this continues to happen.",
-  
+
   "pad.share": "Share this pad",
   "pad.share.readonly": "Read only",
   "pad.share.link": "Link",
@@ -130,6 +131,7 @@
   "pad.impexp.importing": "Importing...",
   "pad.impexp.confirmimport": "Importing a file will overwrite the current text of the pad. Are you sure you want to proceed?",
   "pad.impexp.convertFailed": "We were not able to import this file. Please use a different document format or copy paste manually",
+  "pad.impexp.padHasData": "We were not able to import this file because this Pad has already had changes, please import to a new pad",
   "pad.impexp.uploadFailed": "The upload failed, please try again",
   "pad.impexp.importfailed": "Import failed",
   "pad.impexp.copypaste": "Please copy paste",

src/locales/es.json

@@ -9,22 +9,23 @@
 			"Rubenwap",
 			"VegaDark",
 			"Vivaelcelta",
-			"Xuacu"
+			"Xuacu",
+			"Macofe"
 		]
 	},
-	"index.newPad": "Nuevo Pad",
-	"index.createOpenPad": "o crea/abre un Pad con el nombre:",
+	"index.newPad": "Nuevo pad",
+	"index.createOpenPad": "o crea/abre un pad con el nombre:",
 	"pad.toolbar.bold.title": "Negrita (Ctrl-B)",
 	"pad.toolbar.italic.title": "Cursiva (Ctrl-I)",
 	"pad.toolbar.underline.title": "Subrayado (Ctrl-U)",
-	"pad.toolbar.strikethrough.title": "Tachado",
-	"pad.toolbar.ol.title": "Lista ordenada",
-	"pad.toolbar.ul.title": "Lista desordenada",
+	"pad.toolbar.strikethrough.title": "Tachado (Ctrl+5)",
+	"pad.toolbar.ol.title": "Lista ordenada (Ctrl+Mayús+N)",
+	"pad.toolbar.ul.title": "Lista desordenada (Ctrl+Mayús+L)",
 	"pad.toolbar.indent.title": "Sangría (TAB)",
 	"pad.toolbar.unindent.title": "Eliminar sangría (Shift+TAB)",
 	"pad.toolbar.undo.title": "Deshacer (Ctrl-Z)",
 	"pad.toolbar.redo.title": "Rehacer (Ctrl-Y)",
-	"pad.toolbar.clearAuthorship.title": "Eliminar los colores de los autores",
+	"pad.toolbar.clearAuthorship.title": "Eliminar los colores de autoría (Ctrl+Shift+C)",
 	"pad.toolbar.import_export.title": "Importar/Exportar a diferentes formatos de archivos",
 	"pad.toolbar.timeslider.title": "Línea de tiempo",
 	"pad.toolbar.savedRevision.title": "Guardar revisión",
@@ -34,13 +35,13 @@
 	"pad.colorpicker.save": "Guardar",
 	"pad.colorpicker.cancel": "Cancelar",
 	"pad.loading": "Cargando...",
-	"pad.passwordRequired": "Necesitas una contraseña para acceder a este documento",
-	"pad.permissionDenied": "No tienes permiso para acceder a esta página",
+	"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",
-	"pad.settings.padSettings": "Configuración del Pad",
+	"pad.settings.padSettings": "Configuración del pad",
 	"pad.settings.myView": "Preferencias personales",
-	"pad.settings.stickychat": "Chat siempre encima",
-	"pad.settings.colorcheck": "Color de autoría",
+	"pad.settings.stickychat": "Chat siempre en pantalla",
+	"pad.settings.colorcheck": "Colores de autoría",
 	"pad.settings.linenocheck": "Números de línea",
 	"pad.settings.rtlcheck": "¿Leer contenido de derecha a izquierda?",
 	"pad.settings.fontType": "Tipografía:",
@@ -50,40 +51,39 @@
 	"pad.settings.language": "Idioma:",
 	"pad.importExport.import_export": "Importar/Exportar",
 	"pad.importExport.import": "Subir cualquier texto o documento",
-	"pad.importExport.importSuccessful": "¡Operación realizada con éxito!",
+	"pad.importExport.importSuccessful": "¡Éxito!",
 	"pad.importExport.export": "Exporta el pad actual como:",
 	"pad.importExport.exporthtml": "HTML",
 	"pad.importExport.exportplain": "Texto plano",
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
-	"pad.importExport.abiword.innerHTML": "Sólo puede importar formatos de texto plano o html. Para funciones más avanzadas instale <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-in-Ubuntu-or-OpenSuse-or-SLES-with-AbiWord\">abiword</a>.",
+	"pad.importExport.abiword.innerHTML": "Sólo puedes importar formatos de texto plano o html. Para funciones más avanzadas instala <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-in-Ubuntu-or-OpenSuse-or-SLES-with-AbiWord\">abiword</a>.",
 	"pad.modals.connected": "Conectado.",
 	"pad.modals.reconnecting": "Reconectando a tu pad..",
-	"pad.modals.forcereconnect": "Reconexión forzosa",
+	"pad.modals.forcereconnect": "Forzar reconexión",
 	"pad.modals.userdup": "Abierto en otra ventana",
 	"pad.modals.userdup.explanation": "Este pad parece estar abierto en más de una ventana de tu navegador.",
 	"pad.modals.userdup.advice": "Reconectar para usar esta ventana.",
 	"pad.modals.unauth": "No autorizado.",
-	"pad.modals.unauth.explanation": "Los permisos han cambiado mientras estabas viendo esta página. Intenta reconectar de nuevo.",
-	"pad.modals.looping.explanation": "Estamos teniendo problemas con la sincronización en el servidor.",
+	"pad.modals.unauth.explanation": "Tus permisos han cambiado mientras estabas viendo esta página. Intenta reconectarte.",
+	"pad.modals.looping.explanation": "Hay problemas con el servidor de sincronización.",
 	"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": "Puede ser a causa de tu navegador o de una caída en tu conexión de 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": "Ha hecho una edición clasificada como ilegal por el servidor de sincronización.",
-	"pad.modals.badChangeset.cause": "Esto podría ser debido a una mala configuración del servidor o algún otro comportamiento inesperado. Póngase en contacto con el administrador del servicio, si siente que esto es un error. Intente volver a conectar con el fin de seguir editando.",
-	"pad.modals.corruptPad.explanation": "El pad que está intentando acceder está dañado.",
-	"pad.modals.corruptPad.cause": "Esto puede deberse a una mala configuración de servidor o algún otro comportamiento inesperado. Póngase en contacto con el administrador del servicio.",
+	"pad.modals.badChangeset.explanation": "Has hecho una edición clasificada como ilegal por el servidor de sincronización.",
+	"pad.modals.badChangeset.cause": "Esto podría deberse a una mala configuración del servidor o algún otro comportamiento inesperado. Contacta al administrador del servicio, si piensas que esto es un error. Intenta reconectarte con el fin de seguir editando.",
+	"pad.modals.corruptPad.explanation": "El pad que intentas acceder está dañado.",
+	"pad.modals.corruptPad.cause": "Esto puede deberse a una mala configuración del servidor o algún otro comportamiento inesperado. Contacta al administrador del servicio.",
 	"pad.modals.deleted": "Borrado.",
 	"pad.modals.deleted.explanation": "Este pad ha sido borrado.",
-	"pad.modals.disconnected": "Has sido desconectado.",
+	"pad.modals.disconnected": "Te has desconectado.",
 	"pad.modals.disconnected.explanation": "Se perdió la conexión con el servidor",
-	"pad.modals.disconnected.cause": "El servidor podría no estar disponible. Contacte con nosotros si esto continúa sucediendo.",
-	"pad.share": "Compatir el pad",
+	"pad.modals.disconnected.cause": "El servidor podría no estar disponible. Contacta al administrador del servicio si esto continúa sucediendo.",
+	"pad.share": "Compatir este pad",
 	"pad.share.readonly": "Sólo lectura",
 	"pad.share.link": "Enlace",
 	"pad.share.emebdcode": "Incrustar URL",
@@ -99,18 +99,18 @@
 	"timeslider.version": "Versión {{version}}",
 	"timeslider.saved": "Guardado el {{day}} de {{month}} de {{year}}",
 	"timeslider.dateformat": "{{day}}/{{month}}/{{year}} {{hours}}:{{minutes}}:{{seconds}}",
-	"timeslider.month.january": "Enero",
-	"timeslider.month.february": "Febrero",
-	"timeslider.month.march": "Marzo",
-	"timeslider.month.april": "Abril",
-	"timeslider.month.may": "Mayo",
-	"timeslider.month.june": "Junio",
-	"timeslider.month.july": "Julio",
-	"timeslider.month.august": "Agosto",
-	"timeslider.month.september": "Septiembre",
-	"timeslider.month.october": "Octubre",
-	"timeslider.month.november": "Noviembre",
-	"timeslider.month.december": "Diciembre",
+	"timeslider.month.january": "enero",
+	"timeslider.month.february": "febrero",
+	"timeslider.month.march": "marzo",
+	"timeslider.month.april": "abril",
+	"timeslider.month.may": "mayo",
+	"timeslider.month.june": "junio",
+	"timeslider.month.july": "julio",
+	"timeslider.month.august": "agosto",
+	"timeslider.month.september": "septiembre",
+	"timeslider.month.october": "octubre",
+	"timeslider.month.november": "noviembre",
+	"timeslider.month.december": "diciembre",
 	"timeslider.unnamedauthors": "{{num}} {[ plural(num) one: autor desconocido, other: autores desconocidos]}",
 	"pad.savedrevs.marked": "Revisión guardada",
 	"pad.userlist.entername": "Escribe tu nombre",
@@ -118,13 +118,13 @@
 	"pad.userlist.guest": "Invitado",
 	"pad.userlist.deny": "Denegar",
 	"pad.userlist.approve": "Aprobar",
-	"pad.editbar.clearcolors": "¿Desea borrar el color de los autores en todo el documento?",
-	"pad.impexp.importbutton": "Importar",
+	"pad.editbar.clearcolors": "¿Quieres borrar los colores de autoría en todo el documento?",
+	"pad.impexp.importbutton": "Importar ahora",
 	"pad.impexp.importing": "Importando...",
-	"pad.impexp.confirmimport": "Al importar un fichero se borrará el contenido actual del documento. ¿Quiere continuar?",
-	"pad.impexp.convertFailed": "No pudimos importar este fichero. Intentalo con otro formato diferente o copia y pega manualmente.",
-	"pad.impexp.uploadFailed": "El envío del fichero falló. Intentelo de nuevo.",
+	"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.uploadFailed": "El envío falló. Intentalo de nuevo.",
 	"pad.impexp.importfailed": "Fallo al importar",
-	"pad.impexp.copypaste": "Intente copiar y pegar",
-	"pad.impexp.exportdisabled": "La exportación al formato {{type}} format está desactivada. Contacte con su administrador de sistemas."
+	"pad.impexp.copypaste": "Intenta copiar y pegar",
+	"pad.impexp.exportdisabled": "La exportación al formato {{type}} está desactivada. Contacta a tu administrador de sistemas."
 }

src/locales/et.json

@@ -49,7 +49,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"pad.importExport.abiword.innerHTML": "Paraku on ainult lihttekstis voi HTML-vormingus dokumentide importimine võimaldatud. Rohkem võimaluste jaoks peab <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\">paigaldama abiword</a>.",
 	"pad.modals.connected": "Ühendatud.",
 	"pad.modals.reconnecting": "Proovitakse luua ühendus klade juurde...",

src/locales/eu.json

@@ -49,7 +49,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.exportdokuwiki": "DocuWiki",
 	"pad.importExport.abiword.innerHTML": "Testu laua edo html formatudun testuak bakarrik inporta ditzakezu. Aurreratuagoak diren inportazio aukerak izateko <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 instala ezazu</a>.",
 	"pad.modals.connected": "Konektatuta.",
 	"pad.modals.reconnecting": "Zure pad-era birkonektatu...",

src/locales/fa.json

@@ -14,14 +14,14 @@
 	"pad.toolbar.bold.title": "پررنگ (Ctrl-B)",
 	"pad.toolbar.italic.title": "کج (Ctrl-I)",
 	"pad.toolbar.underline.title": "زیرخط (Ctrl-U)",
-	"pad.toolbar.strikethrough.title": "خط خورده",
-	"pad.toolbar.ol.title": "فهرست مرتب شده",
-	"pad.toolbar.ul.title": "فهرست مرتب نشده",
+	"pad.toolbar.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": "پاک‌کردن رنگ‌های نویسندگی",
+	"pad.toolbar.clearAuthorship.title": "پاک‌کردن رنگ‌های نویسندگی (Ctrl+Shift+C)",
 	"pad.toolbar.import_export.title": "درون‌ریزی/برون‌ریزی از/به قالب‌های مختلف",
 	"pad.toolbar.timeslider.title": "لغزندهٔ زمان",
 	"pad.toolbar.savedRevision.title": "ذخیره‌سازی نسخه",
@@ -54,7 +54,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (قالب سند باز)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"pad.importExport.abiword.innerHTML": "شما تنها می‌توانید از قالب متن ساده یا اچ‌تی‌ام‌ال درون‌ریزی کنید. برای بیشتر شدن ویژگی‌های درون‌ریزی پیشرفته <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.modals.reconnecting": "در حال اتصال دوباره به دفترچه یادداشت شما..",

src/locales/fi.json

@@ -9,7 +9,8 @@
 			"Stryn",
 			"Tomi Toivio",
 			"Veikk0.ma",
-			"VezonThunder"
+			"VezonThunder",
+			"Macofe"
 		]
 	},
 	"index.newPad": "Uusi muistio",
@@ -17,14 +18,14 @@
 	"pad.toolbar.bold.title": "Lihavointi (Ctrl-B)",
 	"pad.toolbar.italic.title": "Kursivointi (Ctrl-I)",
 	"pad.toolbar.underline.title": "Alleviivaus (Ctrl-U)",
-	"pad.toolbar.strikethrough.title": "Yliviivaus",
-	"pad.toolbar.ol.title": "Numeroitu lista",
-	"pad.toolbar.ul.title": "Numeroimaton lista",
+	"pad.toolbar.strikethrough.title": "Yliviivaus (Ctrl+5)",
+	"pad.toolbar.ol.title": "Numeroitu lista (Ctrl+Shift+N)",
+	"pad.toolbar.ul.title": "Numeroimaton lista (Ctrl+Shift+L)",
 	"pad.toolbar.indent.title": "Sisennä (TAB)",
 	"pad.toolbar.unindent.title": "Ulonna (Shift+TAB)",
 	"pad.toolbar.undo.title": "Kumoa (Ctrl-Z)",
 	"pad.toolbar.redo.title": "Tee uudelleen (Ctrl-Y)",
-	"pad.toolbar.clearAuthorship.title": "Poista kirjoittajavärit",
+	"pad.toolbar.clearAuthorship.title": "Poista kirjoittajavärit (Ctrl+Shift+C)",
 	"pad.toolbar.import_export.title": "Tuo tai vie eri tiedostomuodoista tai -muotoihin",
 	"pad.toolbar.timeslider.title": "Aikajana",
 	"pad.toolbar.savedRevision.title": "Tallenna muutos",
@@ -57,7 +58,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"pad.importExport.abiword.innerHTML": "Tuonti on tuettu vain HTML- ja raakatekstitiedostoista. Lisätietoja tuonnin lisäasetuksista on sivulla <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-in-Ubuntu-or-OpenSuse-or-SLES-with-AbiWord\">install abiword</a>.",
 	"pad.modals.connected": "Yhdistetty.",
 	"pad.modals.reconnecting": "Muodostetaan yhteyttä muistioon uudelleen...",

src/locales/fo.json

@@ -43,7 +43,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Opið Dokument Format)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"pad.importExport.abiword.innerHTML": "Tú kanst bert innflyta frá einføldum teksti ella html formatum. Fyri funksjónir til innflytan fyri víðarikomin vinarliga <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\">installera abiword</a>.",
 	"pad.modals.connected": "Tú hevur samband.",
 	"pad.modals.reconnecting": "Roynir aftur at fáa samband við tín pad..",

src/locales/fr.json

@@ -16,7 +16,9 @@
 			"Rastus Vernon",
 			"Stephane Cottin",
 			"Tux-tn",
-			"Maxim21"
+			"Maxim21",
+			"Boniface",
+			"Macofe"
 		]
 	},
 	"index.newPad": "Nouveau pad",
@@ -24,14 +26,14 @@
 	"pad.toolbar.bold.title": "Gras (Ctrl-B)",
 	"pad.toolbar.italic.title": "Italique (Ctrl-I)",
 	"pad.toolbar.underline.title": "Souligné (Ctrl-U)",
-	"pad.toolbar.strikethrough.title": "Barré",
-	"pad.toolbar.ol.title": "Liste ordonnée",
-	"pad.toolbar.ul.title": "Liste non ordonnée",
+	"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.redo.title": "Rétablir (Ctrl-Y)",
-	"pad.toolbar.clearAuthorship.title": "Effacer les couleurs identifiant les auteurs",
+	"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",
 	"pad.toolbar.savedRevision.title": "Enregistrer la révision",
@@ -49,7 +51,7 @@
 	"pad.settings.stickychat": "Toujours afficher le chat",
 	"pad.settings.colorcheck": "Couleurs d’identification",
 	"pad.settings.linenocheck": "Numéros de lignes",
-	"pad.settings.rtlcheck": "Lecture de droite à gauche",
+	"pad.settings.rtlcheck": "Le contenu doit-il être lu de droite à gauche ?",
 	"pad.settings.fontType": "Police :",
 	"pad.settings.fontType.normal": "Normal",
 	"pad.settings.fontType.monospaced": "Monospace",
@@ -57,14 +59,13 @@
 	"pad.settings.language": "Langue :",
 	"pad.importExport.import_export": "Importer/Exporter",
 	"pad.importExport.import": "Charger un texte ou un document",
-	"pad.importExport.importSuccessful": "Réussi!",
+	"pad.importExport.importSuccessful": "Réussi !",
 	"pad.importExport.export": "Exporter le pad actuel comme :",
 	"pad.importExport.exporthtml": "HTML",
 	"pad.importExport.exportplain": "Texte brut",
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"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...",
@@ -83,7 +84,7 @@
 	"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.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 bloc auquel vous essayez d’accéder est corrompu.",
+	"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é.",
 	"pad.modals.deleted.explanation": "Ce pad a été supprimé.",
@@ -102,22 +103,22 @@
 	"timeslider.toolbar.authors": "Auteurs :",
 	"timeslider.toolbar.authorsList": "Aucun auteur",
 	"timeslider.toolbar.exportlink.title": "Exporter",
-	"timeslider.exportCurrent": "Exporter la version actuelle en :",
+	"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.month.january": "Janvier",
-	"timeslider.month.february": "Février",
-	"timeslider.month.march": "Mars",
-	"timeslider.month.april": "Avril",
-	"timeslider.month.may": "Mai",
-	"timeslider.month.june": "Juin",
-	"timeslider.month.july": "Juillet",
-	"timeslider.month.august": "Août",
-	"timeslider.month.september": "Septembre",
-	"timeslider.month.october": "Octobre",
-	"timeslider.month.november": "Novembre",
-	"timeslider.month.december": "Décembre",
+	"timeslider.month.january": "janvier",
+	"timeslider.month.february": "février",
+	"timeslider.month.march": "mars",
+	"timeslider.month.april": "avril",
+	"timeslider.month.may": "mai",
+	"timeslider.month.june": "juin",
+	"timeslider.month.july": "juillet",
+	"timeslider.month.august": "août",
+	"timeslider.month.september": "septembre",
+	"timeslider.month.october": "octobre",
+	"timeslider.month.november": "novembre",
+	"timeslider.month.december": "décembre",
 	"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.userlist.entername": "Entrez votre nom",
@@ -128,10 +129,10 @@
 	"pad.editbar.clearcolors": "Effacer les couleurs de paternité 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 texte 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.uploadFailed": "Le téléchargement a échoué, veuillez réessayer",
 	"pad.impexp.importfailed": "Échec de l'importation",
 	"pad.impexp.copypaste": "Veuillez copier/coller",
-	"pad.impexp.exportdisabled": "Exporter au format {{type}} est désactivé. Veuillez contacter votre administrateur système pour plus de détails."
+	"pad.impexp.exportdisabled": "L'option d'export au format {{type}} est désactivée. Veuillez contacter votre administrateur système pour plus de détails."
 }

src/locales/gl.json

@@ -1,7 +1,8 @@
 {
 	"@metadata": {
 		"authors": [
-			"Toliño"
+			"Toliño",
+			"Elisardojm"
 		]
 	},
 	"index.newPad": "Novo documento",
@@ -9,14 +10,14 @@
 	"pad.toolbar.bold.title": "Negra (Ctrl-B)",
 	"pad.toolbar.italic.title": "Cursiva (Ctrl-I)",
 	"pad.toolbar.underline.title": "Subliñar (Ctrl-U)",
-	"pad.toolbar.strikethrough.title": "Riscar",
-	"pad.toolbar.ol.title": "Lista ordenada",
-	"pad.toolbar.ul.title": "Lista sen ordenar",
+	"pad.toolbar.strikethrough.title": "Riscar (Ctrl+5)",
+	"pad.toolbar.ol.title": "Lista ordenada (Ctrl+Shift+N)",
+	"pad.toolbar.ul.title": "Lista sen ordenar (Ctrl+Shift+L)",
 	"pad.toolbar.indent.title": "Sangría (TAB)",
 	"pad.toolbar.unindent.title": "Sen sangría (Maiús.+TAB)",
 	"pad.toolbar.undo.title": "Desfacer (Ctrl-Z)",
 	"pad.toolbar.redo.title": "Refacer (Ctrl-Y)",
-	"pad.toolbar.clearAuthorship.title": "Limpar as cores de identificación dos autores",
+	"pad.toolbar.clearAuthorship.title": "Limpar as cores de identificación dos autores (Ctrl+Shift+C)",
 	"pad.toolbar.import_export.title": "Importar/Exportar desde/a diferentes formatos de ficheiro",
 	"pad.toolbar.timeslider.title": "Liña do tempo",
 	"pad.toolbar.savedRevision.title": "Gardar a revisión",
@@ -49,7 +50,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"pad.importExport.abiword.innerHTML": "Só pode importar texto simple ou formatos HTML. Para obter máis información sobre as características de importación avanzadas <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\">instale abiword</a>.",
 	"pad.modals.connected": "Conectado.",
 	"pad.modals.reconnecting": "Reconectando co seu documento...",

src/locales/he.json

@@ -12,14 +12,14 @@
 	"pad.toolbar.bold.title": "בולט (Ctrl-B)",
 	"pad.toolbar.italic.title": "נטוי (Ctrl-I)",
 	"pad.toolbar.underline.title": "קו תחתי (Ctrl-U)",
-	"pad.toolbar.strikethrough.title": "קו מוחק",
-	"pad.toolbar.ol.title": "רשימה ממוספרת",
-	"pad.toolbar.ul.title": "רשימה",
+	"pad.toolbar.strikethrough.title": "קו מוחק (Ctrl+5)",
+	"pad.toolbar.ol.title": "רשימה ממוספרת (Ctrl+Shift+N)",
+	"pad.toolbar.ul.title": "רשימת תבליטים (Ctrl+Shift+L)",
 	"pad.toolbar.indent.title": "הזחה (טאב)",
 	"pad.toolbar.unindent.title": "צמצום הזחה (שיפט–טאב)",
 	"pad.toolbar.undo.title": "ביטול (Ctrl-Z)",
 	"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": "שמירת גרסה",
@@ -52,7 +52,6 @@
 	"pad.importExport.exportword": "מיקרוסופט וורד",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"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.modals.reconnecting": "מתבצע חיבור מחדש...",

src/locales/hrx.json

@@ -49,7 +49,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"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.modals.connected": "Verbünd (konnektiert).",
 	"pad.modals.reconnecting": "Wiederherstelle von der Verbinnung …",

src/locales/hsb.json

@@ -49,7 +49,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"pad.importExport.abiword.innerHTML": "Móžeš jenož z formatow luteho teksta abo z HTML-formata importować. Za bóle rozšěrjene importowanske funkcije <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\">instaluj prošu Abiword</a>.",
 	"pad.modals.connected": "Zwjazany.",
 	"pad.modals.reconnecting": "Zwjazuje so znowa z twojim zapisnikom...",

src/locales/hu.json

@@ -13,14 +13,14 @@
 	"pad.toolbar.bold.title": "Félkövér (Ctrl-B)",
 	"pad.toolbar.italic.title": "Dőlt (Ctrl-I)",
 	"pad.toolbar.underline.title": "Aláhúzás (Ctrl-U)",
-	"pad.toolbar.strikethrough.title": "Áthúzás",
-	"pad.toolbar.ol.title": "Számozott lista",
-	"pad.toolbar.ul.title": "Számozatlan lista",
+	"pad.toolbar.strikethrough.title": "Áthúzás (Ctrl+5)",
+	"pad.toolbar.ol.title": "Számozott lista (Ctrl+Shift+N)",
+	"pad.toolbar.ul.title": "Számozatlan lista (Ctrl+Shift+L)",
 	"pad.toolbar.indent.title": "Behúzás növelése (TAB)",
 	"pad.toolbar.unindent.title": "Behúzás csökkentése (Shift+TAB)",
 	"pad.toolbar.undo.title": "Visszavonás (Ctrl-Z)",
 	"pad.toolbar.redo.title": "Újra (Ctrl-Y)",
-	"pad.toolbar.clearAuthorship.title": "Szerzők színezésének kikapcsolása",
+	"pad.toolbar.clearAuthorship.title": "Szerzők színezésének kikapcsolása (Ctrl+Shift+C)",
 	"pad.toolbar.import_export.title": "Importálás/exportálás különböző fájlformátumokból/ba",
 	"pad.toolbar.timeslider.title": "Időcsúszka",
 	"pad.toolbar.savedRevision.title": "Revízió mentése",
@@ -53,7 +53,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document formátum)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"pad.importExport.abiword.innerHTML": "Csak szöveges, vagy HTML formátumokból importálhatsz. A speciális importálási funkciókért kérjük <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\">telepítsd az abiword-öt</a>.",
 	"pad.modals.connected": "Kapcsolódva.",
 	"pad.modals.reconnecting": "Újrakapcsolódás a noteszhez...",

src/locales/ia.json

@@ -9,14 +9,14 @@
 	"pad.toolbar.bold.title": "Grasse (Ctrl-B)",
 	"pad.toolbar.italic.title": "Italic (Ctrl-I)",
 	"pad.toolbar.underline.title": "Sublinear (Ctrl-U)",
-	"pad.toolbar.strikethrough.title": "Cancellar",
-	"pad.toolbar.ol.title": "Lista ordinate",
-	"pad.toolbar.ul.title": "Lista non ordinate",
+	"pad.toolbar.strikethrough.title": "Cancellar (Ctrl+5)",
+	"pad.toolbar.ol.title": "Lista ordinate (Ctrl+Shift+N)",
+	"pad.toolbar.ul.title": "Lista non ordinate (Ctrl+Shift+L)",
 	"pad.toolbar.indent.title": "Indentar (TAB)",
 	"pad.toolbar.unindent.title": "Disindentar (Shift+TAB)",
 	"pad.toolbar.undo.title": "Disfacer (Ctrl-Z)",
 	"pad.toolbar.redo.title": "Refacer (Ctrl-Y)",
-	"pad.toolbar.clearAuthorship.title": "Rader colores de autor",
+	"pad.toolbar.clearAuthorship.title": "Rader colores de autor (Ctrl+Shift+C)",
 	"pad.toolbar.import_export.title": "Importar/exportar in differente formatos de file",
 	"pad.toolbar.timeslider.title": "Glissa-tempore",
 	"pad.toolbar.savedRevision.title": "Version salveguardate",
@@ -49,7 +49,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"pad.importExport.abiword.innerHTML": "Tu pote solmente importar files in formato de texto simple o HTML. Pro functionalitate de importation plus extense, <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\">installa AbiWord</a>.",
 	"pad.modals.connected": "Connectite.",
 	"pad.modals.reconnecting": "Reconnecte a tu pad…",

src/locales/it.json

@@ -4,7 +4,8 @@
 			"Beta16",
 			"Gianfranco",
 			"Muxator",
-			"Vituzzu"
+			"Vituzzu",
+			"Macofe"
 		]
 	},
 	"index.newPad": "Nuovo Pad",
@@ -12,14 +13,14 @@
 	"pad.toolbar.bold.title": "Grassetto (Ctrl-B)",
 	"pad.toolbar.italic.title": "Corsivo (Ctrl-I)",
 	"pad.toolbar.underline.title": "Sottolineato (Ctrl-U)",
-	"pad.toolbar.strikethrough.title": "Barrato",
-	"pad.toolbar.ol.title": "Elenco numerato",
-	"pad.toolbar.ul.title": "Elenco puntato",
+	"pad.toolbar.strikethrough.title": "Barrato (Ctrl+5)",
+	"pad.toolbar.ol.title": "Elenco numerato (Ctrl+Shift+N)",
+	"pad.toolbar.ul.title": "Elenco puntato (Ctrl+Shift+L)",
 	"pad.toolbar.indent.title": "Rientro (TAB)",
 	"pad.toolbar.unindent.title": "Riduci rientro (Shift+TAB)",
 	"pad.toolbar.undo.title": "Annulla (Ctrl-Z)",
 	"pad.toolbar.redo.title": "Ripeti (Ctrl-Y)",
-	"pad.toolbar.clearAuthorship.title": "Elimina i colori che indicano gli autori",
+	"pad.toolbar.clearAuthorship.title": "Elimina i colori che indicano gli autori (Ctrl+Shift+C)",
 	"pad.toolbar.import_export.title": "Importa/esporta da/a diversi formati di file",
 	"pad.toolbar.timeslider.title": "Presentazione cronologia",
 	"pad.toolbar.savedRevision.title": "Versione salvata",
@@ -52,7 +53,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"pad.importExport.abiword.innerHTML": "È possibile importare solo i formati di testo semplice o HTML. Per metodi più avanzati di importazione <a href=https://github.com/broadcast/etherpad-lite/wiki/How-to-enable-importing and exporting-different file formats-in-Ubuntu-or-OpenSuse-or-SLES-with-AbiWord>installare Abiword</a>.",
 	"pad.modals.connected": "Connesso.",
 	"pad.modals.reconnecting": "Riconnessione al pad in corso...",

src/locales/ja.json

@@ -6,16 +6,16 @@
 	},
 	"index.newPad": "新規作成",
 	"index.createOpenPad": "または作成/編集するパッド名を入力:",
-	"pad.toolbar.bold.title": "太字 (Ctrl-B)",
-	"pad.toolbar.italic.title": "斜体 (Ctrl-I)",
-	"pad.toolbar.underline.title": "下線 (Ctrl-U)",
-	"pad.toolbar.strikethrough.title": "取り消し線",
-	"pad.toolbar.ol.title": "番号付きリスト",
-	"pad.toolbar.ul.title": "番号なしリスト",
+	"pad.toolbar.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.undo.title": "元に戻す (Ctrl+Z)",
+	"pad.toolbar.redo.title": "やり直し (Ctrl+Y)",
 	"pad.toolbar.clearAuthorship.title": "作者の色分けを消去",
 	"pad.toolbar.import_export.title": "他の形式のファイルのインポート/エクスポート",
 	"pad.toolbar.timeslider.title": "タイムスライダー",
@@ -49,7 +49,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"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.modals.reconnecting": "パッドに再接続中...",

src/locales/km.json

@@ -47,7 +47,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"pad.modals.connected": "បាន​តភ្ជាប់​។",
 	"pad.modals.reconnecting": "កំពុង​ភ្ជាប់​ទៅ​ផេត​របស់​អ្នក​ម្ដង​ទៀត..",
 	"pad.modals.forcereconnect": "បង្ខំ​ឲ្យ​ភ្ជាប់​ឡើង​វិញ",

src/locales/ko.json

@@ -2,7 +2,8 @@
 	"@metadata": {
 		"authors": [
 			"Hym411",
-			"아라"
+			"아라",
+			"Revi"
 		]
 	},
 	"index.newPad": "새 패드",
@@ -10,14 +11,14 @@
 	"pad.toolbar.bold.title": "굵게 (Ctrl-B)",
 	"pad.toolbar.italic.title": "기울임 (Ctrl-I)",
 	"pad.toolbar.underline.title": "밑줄 (Ctrl-U)",
-	"pad.toolbar.strikethrough.title": "취소선",
-	"pad.toolbar.ol.title": "순서 있는 목록",
-	"pad.toolbar.ul.title": "순서 없는 목록",
+	"pad.toolbar.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": "저자의 색 지우기",
+	"pad.toolbar.clearAuthorship.title": "저자의 색 지우기 (Ctrl+Shift+C)",
 	"pad.toolbar.import_export.title": "다른 파일 형식으로 가져오기/내보내기",
 	"pad.toolbar.timeslider.title": "시간슬라이더",
 	"pad.toolbar.savedRevision.title": "판 저장",
@@ -50,7 +51,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"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.modals.reconnecting": "패드에 다시 연결 중..",

src/locales/ksh.json

@@ -9,14 +9,14 @@
 	"pad.toolbar.bold.title": "Fättschreff (Strg-B)",
 	"pad.toolbar.italic.title": "Scheive Schreff (Strg-I)",
 	"pad.toolbar.underline.title": "Ongerstresche (Strg-U)",
-	"pad.toolbar.strikethrough.title": "Dorschjeschtresche",
-	"pad.toolbar.ol.title": "Leß met Nommere",
-	"pad.toolbar.ul.title": "Leß met Pongkte",
+	"pad.toolbar.strikethrough.title": "Dorschjeschtresche (Strg+5)",
+	"pad.toolbar.ol.title": "Leß met Nommere (Strg+Jruhß+N)",
+	"pad.toolbar.ul.title": "Leß met Pongkte (Strg+Jruhß+L)",
 	"pad.toolbar.indent.title": "Enjerök (TAB)",
 	"pad.toolbar.unindent.title": "Ußjerök (Jruhßschreff+TAB)",
 	"pad.toolbar.undo.title": "Retuur nämme (Strg-Z)",
 	"pad.toolbar.redo.title": "Norrens (Strg-Y)",
-	"pad.toolbar.clearAuthorship.title": "Donn dä Schriiver ier Färve fottnämme",
+	"pad.toolbar.clearAuthorship.title": "Donn dä Schriiver ier Färve fottnämme (Strg+Jruhß+C)",
 	"pad.toolbar.import_export.title": "Ongerscheidlijje Dattei_Fommaate empotteere udder äxpotteere",
 	"pad.toolbar.timeslider.title": "Verjangeheid afschpelle",
 	"pad.toolbar.savedRevision.title": "Di Väsjohn faßhallde",
@@ -49,7 +49,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF (Poteerbaa Dokemänte Fommaat)",
 	"pad.importExport.exportopen": "ODF (Offe Dokemänte-Fommaat)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"pad.importExport.abiword.innerHTML": "Mer künne bloß eijfaache Täxte udder HTML_Fommaate empoteere. Opwändejere Müjjeleschkeite fö der Empoot jon och, doför bruch mer en <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\">Enschtallazjuhn met <i lang=\"en\" xml:lang=\"en\">Abiword</i></a>.",
 	"pad.modals.connected": "Verbonge.",
 	"pad.modals.reconnecting": "Ben wider aam Verbenge&nbsp;&hellip;",

src/locales/lb.json

@@ -6,8 +6,8 @@
 		]
 	},
 	"index.newPad": "Neie Pad",
-	"pad.toolbar.ol.title": "Numeréiert Lëscht",
-	"pad.toolbar.ul.title": "Net-numeréiert Lëscht",
+	"pad.toolbar.ol.title": "Numeréiert Lëscht (Ctrl+Shift+N)",
+	"pad.toolbar.ul.title": "Net-numeréiert Lëscht (Ctrl+Shift+L)",
 	"pad.toolbar.undo.title": "Réckgängeg (Ctrl-Z)",
 	"pad.toolbar.redo.title": "Widderhuelen (Ctrl-Y)",
 	"pad.toolbar.savedRevision.title": "Versioun späicheren",

src/locales/lki.json

@@ -0,0 +1,75 @@
+{
+	"@metadata": {
+		"authors": [
+			"Hosseinblue"
+		]
+	},
+	"index.newPad": "تازۀpad",
+	"index.createOpenPad": ":ئۀ وسیلۀ نؤمpadسازین/وآز کردن یه گلۀ",
+	"pad.toolbar.bold.title": "پررنگ-تئژ(Ctrl-B)",
+	"pad.toolbar.italic.title": "ایتالیک (Ctrl-I)",
+	"pad.toolbar.underline.title": "ژئر خطی(Ctrl-U)",
+	"pad.toolbar.strikethrough.title": "خط هوواردئ",
+	"pad.toolbar.ol.title": "فئرست رزگی-مرتب",
+	"pad.toolbar.ul.title": "نۀچنریا-نامرتب",
+	"pad.toolbar.indent.title": "تورفتگی-ئه نؤم چئن (TAB)",
+	"pad.toolbar.unindent.title": "(Shift+TAB)بیرون آمدگی-درچئن",
+	"pad.toolbar.undo.title": "گِلّا دائن-ئآهۀتن(Ctrl-Z)",
+	"pad.toolbar.redo.title": "ئۀ نوواهۀتن (Ctrl-Y)",
+	"pad.toolbar.clearAuthorship.title": "پاکاکردن رنگۀل تالیفی",
+	"pad.toolbar.import_export.title": "دربردن/ئه نؤم ئآووردن  ئۀ/ئِِژ فرمتۀل گوناگون",
+	"pad.toolbar.timeslider.title": "اسلایدر وختی-زمانی",
+	"pad.toolbar.savedRevision.title": "ذخیرل دسکاریۀل",
+	"pad.toolbar.settings.title": "تنظیمۀل",
+	"pad.toolbar.embed.title": "بۀشاکردن ؤ نیائن(اشتراک ونشاندن)ئۀ نؤم سایت",
+	"pad.toolbar.showusers.title": "نیشان دائن کاربر ئۀ نؤم ئئ\npad",
+	"pad.colorpicker.save": "ذخیرۀ",
+	"pad.colorpicker.cancel": "ئآهووسانن-لغو",
+	"pad.loading": "...(loading)بارنیائن",
+	"pad.passwordRequired": "هؤمۀ رمزتؤنه گرۀکۀ-لازمۀ ئۀرا اتصال ئئ \npad",
+	"pad.wrongPassword": "رمزۀ تؤن دؤرس نیۀ",
+	"pad.settings.padSettings": "pad تنظیمۀل",
+	"pad.settings.myView": "نمایش-سئرکردن مه",
+	"pad.settings.stickychat": "چت همؤیشۀ ئۀ ولگۀ نمایش بوو",
+	"pad.settings.colorcheck": "رنگۀل تالیفی",
+	"pad.settings.linenocheck": "شؤمارۀل خطی",
+	"pad.settings.fontType": ":شئؤۀ فؤنت",
+	"pad.settings.fontType.normal": "عادی",
+	"pad.settings.fontType.monospaced": "پئنی-پهنا",
+	"pad.settings.globalView": "نمایش جئ هانی",
+	"pad.settings.language": ":زوون",
+	"pad.importExport.import_export": "در بردن/ئه نؤم ئآووردن",
+	"pad.importExport.import": "بارنیائن هر جور نوشته یا سندئ",
+	"pad.importExport.importSuccessful": "! موفق بی-پیرووز بی",
+	"pad.importExport.exporthtml": "html",
+	"pad.importExport.exportplain": "متن پئن-درئژ",
+	"pad.importExport.exportword": "مایکروسافت وورد",
+	"pad.importExport.exportpdf": "پی دی اف",
+	"pad.modals.connected": "وصل بیۀ",
+	"pad.modals.deleted": "پاک بیا-حذف بی",
+	"pad.share.readonly": "تنیا بخؤۀن",
+	"pad.share.link": "لینک",
+	"pad.chat": "گپ",
+	"pad.chat.loadmessages": "پئامۀلئ تر باره سۀر",
+	"timeslider.toolbar.exportlink.title": "در بِردن",
+	"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": "...وارد مۀهه",
+	"pad.impexp.importfailed": "وارد نؤنئ-خطای واردکردن"
+}

src/locales/lrc.json

@@ -36,7 +36,6 @@
 	"pad.importExport.exportword": "واجه پالایشتگر  مایکروسافت",
 	"pad.importExport.exportpdf": "پی دی اف",
 	"pad.importExport.exportopen": "او دی اف(قالو سند وا بیه)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"pad.modals.connected": "وصل بیه",
 	"pad.modals.forcereconnect": "سی وصل بین مژبور کو",
 	"pad.modals.userdup": "د نیمدری هنی واز بیه",

src/locales/lt.json

@@ -28,7 +28,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Atvirasis dokumento formatas)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"pad.modals.connected": "Prisijungta.",
 	"pad.modals.unauth": "Neleidžiama",
 	"pad.modals.initsocketfail": "Serveris yra nepasiekiamas.",

src/locales/lv.json

@@ -46,7 +46,6 @@
 	"pad.importExport.exportword": "Programma Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open dokumenta formāts)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"pad.modals.userdup": "Atvērts citā logā",
 	"pad.modals.unauth": "Nav atļauts",
 	"pad.modals.looping.explanation": "Pastāv sakaru problēmas ar sinhronizācijas servera.",

src/locales/map-bms.json

@@ -49,7 +49,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"pad.importExport.abiword.innerHTML": "Rika mung teyeng impor sekang format plain text utawa HTML. Kanggo fitur impor sing lewih maju monggo <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\">masang abiword</a>.",
 	"pad.modals.connected": "Nyambung.",
 	"pad.modals.reconnecting": "Mbaleli nyambung ming pad Rika...",

src/locales/mk.json

@@ -10,14 +10,14 @@
 	"pad.toolbar.bold.title": "Задебелено (Ctrl-B)",
 	"pad.toolbar.italic.title": "Косо (Ctrl-I)",
 	"pad.toolbar.underline.title": "Подвлечено (Ctrl-U)",
-	"pad.toolbar.strikethrough.title": "Прецртано",
-	"pad.toolbar.ol.title": "Подреден список",
-	"pad.toolbar.ul.title": "Неподреден список",
+	"pad.toolbar.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": "Поништи ги авторските бои",
+	"pad.toolbar.clearAuthorship.title": "Тргни ги авторските бои (Ctrl+Shift+C)",
 	"pad.toolbar.import_export.title": "Увоз/Извоз од/во разни податотечни формати",
 	"pad.toolbar.timeslider.title": "Историски преглед",
 	"pad.toolbar.savedRevision.title": "Зачувај преработка",
@@ -50,7 +50,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"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.modals.reconnecting": "Ве преповрзувам со тетратката...",

src/locales/ml.json

@@ -13,14 +13,14 @@
 	"pad.toolbar.bold.title": "കടുപ്പത്തിലെഴുതുക (Ctrl-B)",
 	"pad.toolbar.italic.title": "ചെരിച്ചെഴുതുക (Ctrl-I)",
 	"pad.toolbar.underline.title": "അടിവരയിടുക (Ctrl-U)",
-	"pad.toolbar.strikethrough.title": "വെട്ടുക",
-	"pad.toolbar.ol.title": "ക്രമത്തിലുള്ള പട്ടിക",
-	"pad.toolbar.ul.title": "ക്രമരഹിത പട്ടിക",
+	"pad.toolbar.strikethrough.title": "വെട്ടുക (Ctrl+5)",
+	"pad.toolbar.ol.title": "ക്രമത്തിലുള്ള പട്ടിക (Ctrl+Shift+N)",
+	"pad.toolbar.ul.title": "ക്രമരഹിത പട്ടിക (Ctrl+Shift+L)",
 	"pad.toolbar.indent.title": "വലത്തേക്ക് തള്ളുക (ടാബ്)",
 	"pad.toolbar.unindent.title": "ഇടത്തേക്ക് തള്ളുക (ഷിഫ്റ്റ്+ടാബ്)",
 	"pad.toolbar.undo.title": "തിരസ്കരിക്കുക (Ctrl-Z)",
 	"pad.toolbar.redo.title": "വീണ്ടും ചെയ്യുക (Ctrl-Y)",
-	"pad.toolbar.clearAuthorship.title": "രചയിതാക്കൾക്കുള്ള നിറം കളയുക",
+	"pad.toolbar.clearAuthorship.title": "രചയിതാക്കൾക്കുള്ള നിറം കളയുക (Ctrl+Shift+C)",
 	"pad.toolbar.import_export.title": "വ്യത്യസ്ത ഫയൽ തരങ്ങളിലേക്ക്/തരങ്ങളിൽ നിന്ന് ഇറക്കുമതി/കയറ്റുമതി ചെയ്യുക",
 	"pad.toolbar.timeslider.title": "സമയരേഖ",
 	"pad.toolbar.savedRevision.title": "നാൾപ്പതിപ്പ് സേവ് ചെയ്യുക",
@@ -53,7 +53,6 @@
 	"pad.importExport.exportword": "മൈക്രോസോഫ്റ്റ് വേഡ്",
 	"pad.importExport.exportpdf": "പി.ഡി.എഫ്.",
 	"pad.importExport.exportopen": "ഒ.ഡി.എഫ്. (ഓപ്പൺ ഡോക്യുമെന്റ് ഫോർമാറ്റ്)",
-	"pad.importExport.exportdokuwiki": "ഡോകുവിക്കി",
 	"pad.importExport.abiword.innerHTML": "പ്ലെയിൻ ടെക്സ്റ്റോ എച്ച്.റ്റി.എം.എൽ. തരമോ മാത്രമേ താങ്കൾക്ക് ഇറക്കുമതി ചെയ്യാനാവൂ. കൂടുതൽ വിപുലീകൃത ഇറക്കുമതി സൗകര്യങ്ങൾക്കായി ദയവായി <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\">അബിവേഡ് ഇൻസ്റ്റോൾ ചെയ്യുക</a>.",
 	"pad.modals.connected": "ബന്ധിപ്പിച്ചിരിക്കുന്നു.",
 	"pad.modals.reconnecting": "താങ്കളുടെ പാഡിലേയ്ക്ക് വീണ്ടും ബന്ധിപ്പിക്കുന്നു...",

src/locales/mn.json

@@ -0,0 +1,76 @@
+{
+	"@metadata": {
+		"authors": [
+			"MongolWiki",
+			"Wisdom"
+		]
+	},
+	"pad.toolbar.bold.title": "Болд тескт (Ctrl-B)",
+	"pad.toolbar.italic.title": "Налуу тескт (Ctrl-I)",
+	"pad.toolbar.underline.title": "Доогуур зураас (Ctrl-U)",
+	"pad.toolbar.strikethrough.title": "Дундуураа зураастай",
+	"pad.toolbar.ol.title": "Эрэмбэлэгдсэн жагсаалт",
+	"pad.toolbar.ul.title": "Эрэмбэлээгүй жагсаалт",
+	"pad.toolbar.undo.title": "Буцаах (Ctrl-Z)",
+	"pad.toolbar.redo.title": "Undo -ын эсрэг (Ctrl-Y)",
+	"pad.toolbar.settings.title": "Тохиргоо",
+	"pad.colorpicker.save": "Хадгалах",
+	"pad.colorpicker.cancel": "Цуцлах",
+	"pad.loading": "Уншиж байна...",
+	"pad.settings.padSettings": "Падын тохиргоо",
+	"pad.settings.linenocheck": "Мөрийн дугаар",
+	"pad.settings.fontType": "Фонтын төрөл:",
+	"pad.settings.fontType.normal": "Ердийн",
+	"pad.settings.fontType.monospaced": "Зай ихтэй фонт",
+	"pad.settings.language": "Хэл:",
+	"pad.importExport.import_export": "Импорт/Экспорт",
+	"pad.importExport.import": "Бичвэр, текст файл оруулах",
+	"pad.importExport.importSuccessful": "Амжилттай!",
+	"pad.importExport.exportplain": "Цулгаа бичвэр",
+	"pad.importExport.exportpdf": "PDF файл",
+	"pad.importExport.exportopen": "ODF файл",
+	"pad.modals.connected": "Холбогдсон.",
+	"pad.modals.unauth": "Үл зөвшөөрөгдсөн",
+	"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": "Зөвхөн унших",
+	"pad.share.link": "Холбоос",
+	"pad.share.emebdcode": "URL хавсаргах",
+	"pad.chat": "Чат",
+	"pad.chat.loadmessages": "Нэмэж мессеж оруулах",
+	"timeslider.toolbar.returnbutton": "Падруу буцах",
+	"timeslider.toolbar.authors": "Зохиогч:",
+	"timeslider.toolbar.authorsList": "Зохиогчгүй",
+	"timeslider.toolbar.exportlink.title": "Экспорт",
+	"timeslider.exportCurrent": "Энэ хувилбарыг экспортлохдоо:",
+	"timeslider.version": "Хувилбар {{version}}",
+	"timeslider.saved": "{{year}}-ы {{month}}-н {{day}}-нд да;галсан.",
+	"timeslider.dateformat": "{{month}}/{{day}}/{{year}} {{hours}}:{{minutes}}:{{seconds}}",
+	"timeslider.month.january": "Нэгдүгээр сар",
+	"timeslider.month.february": "Хоёрдугаар сар",
+	"timeslider.month.march": "Гуравдугаар сар",
+	"timeslider.month.april": "Дөрөвдүгээр сар",
+	"timeslider.month.may": "Тавдугаар сар",
+	"timeslider.month.june": "Зургаадугаар сар",
+	"timeslider.month.july": "Долоодугаар сар",
+	"timeslider.month.august": "Наймдугаар сар",
+	"timeslider.month.september": "Есдүгээр сар",
+	"timeslider.month.october": "Аравдугаар сар",
+	"timeslider.month.november": "Арваннэгдүгээр сар",
+	"timeslider.month.december": "Арванхоёрдугаар сар",
+	"pad.savedrevs.marked": "Энэ хувилбар хадгалагдаагүй байна",
+	"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.copypaste": "Хуулаад тавина уу"
+}

src/locales/mr.json

@@ -26,7 +26,6 @@
 	"pad.importExport.exportword": "मायक्रोसॉफ्ट वर्ड",
 	"pad.importExport.exportpdf": "पीडीएफ",
 	"pad.importExport.exportopen": "ओडीएफ(ओपन डॉक्यूमेंट फॉरमॅट)",
-	"pad.importExport.exportdokuwiki": "डुकुविकि",
 	"pad.modals.connected": "अनुबंधित",
 	"pad.modals.initsocketfail": "विदागारास पोच नाही.",
 	"pad.modals.deleted": "वगळले.",

src/locales/ms.json

@@ -9,14 +9,14 @@
 	"pad.toolbar.bold.title": "Tebal (Ctrl-B)",
 	"pad.toolbar.italic.title": "Miring (Ctrl-I)",
 	"pad.toolbar.underline.title": "Garis bawah (Ctrl-U)",
-	"pad.toolbar.strikethrough.title": "Garis lorek",
-	"pad.toolbar.ol.title": "Senarai tertib",
-	"pad.toolbar.ul.title": "Senarai tak tertib",
+	"pad.toolbar.strikethrough.title": "Garis lorek (Ctrl+5)",
+	"pad.toolbar.ol.title": "Senarai tertib (Ctrl+Shift+N)",
+	"pad.toolbar.ul.title": "Senarai tak tertib (Ctrl+Shift+L)",
 	"pad.toolbar.indent.title": "Engsot ke dalam (TAB)",
 	"pad.toolbar.unindent.title": "Engsot ke luar (Shift + TAB)",
 	"pad.toolbar.undo.title": "Buat asal (Ctrl-Z)",
 	"pad.toolbar.redo.title": "Buat semula (Ctrl-Y)",
-	"pad.toolbar.clearAuthorship.title": "Padamkan Warna Pengarang",
+	"pad.toolbar.clearAuthorship.title": "Padamkan Warna Pengarang (Ctrl+Shift+C)",
 	"pad.toolbar.import_export.title": "Import/Eksport dari/ke format-format fail berbeza",
 	"pad.toolbar.timeslider.title": "Gelangsar masa",
 	"pad.toolbar.savedRevision.title": "Simpan Semakan",
@@ -49,7 +49,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"pad.importExport.abiword.innerHTML": "Anda hanya boleh mengimport dari format teks biasa atau html. Untuk ciri-ciri import yang lebih maju, sila <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\">memasang abiword</a>.",
 	"pad.modals.connected": "Bersambung.",
 	"pad.modals.reconnecting": "Bersambung semula dengan pad anda...",

src/locales/nap.json

@@ -0,0 +1,70 @@
+{
+	"@metadata": {
+		"authors": [
+			"Chelin"
+		]
+	},
+	"index.newPad": "Novo Pad",
+	"index.createOpenPad": "o crià o apre nu Pad cu 'o nomme:",
+	"pad.toolbar.bold.title": "Grassetto (Ctrl-B)",
+	"pad.toolbar.italic.title": "Cursivo (Ctrl-I)",
+	"pad.toolbar.underline.title": "Sottolineato (Ctrl-U)",
+	"pad.toolbar.strikethrough.title": "Barrato (Ctrl+5)",
+	"pad.toolbar.ol.title": "Ennece nummerato (Ctrl+Shift+N)",
+	"pad.toolbar.ul.title": "Ennece puntato (Ctrl+Shift+L)",
+	"pad.toolbar.indent.title": "Rientro (TAB)",
+	"pad.toolbar.unindent.title": "Riduce rientro (Shift+TAB)",
+	"pad.toolbar.undo.title": "Annulla (Ctrl-Z)",
+	"pad.toolbar.redo.title": "Ripete (Ctrl-Y)",
+	"pad.toolbar.clearAuthorship.title": "Elimina 'e culure ca 'ndicanno 'e auture (Ctrl+Shift+C)",
+	"pad.toolbar.import_export.title": "'Mporta/esporta 'e/a diverse furmate 'e file",
+	"pad.toolbar.timeslider.title": "Presentazzione cronologgia",
+	"pad.toolbar.savedRevision.title": "Sarva revisione",
+	"pad.toolbar.settings.title": "Mpustaziune",
+	"pad.colorpicker.save": "Sarva",
+	"pad.colorpicker.cancel": "Canciella",
+	"pad.loading": "Carecamiento 'n curso…",
+	"pad.passwordRequired": "Pe' accede a chisto Pad è necessaria 'na password",
+	"pad.permissionDenied": "Nun se dispunne d\"e permisse necessare pe' accede a chisto Pad",
+	"pad.wrongPassword": "'A password è sbagliata",
+	"pad.settings.padSettings": "Mpostazzione d\"o pad",
+	"pad.settings.fontType.normal": "Nurmale",
+	"pad.importExport.exporthtml": "HTML",
+	"pad.importExport.exportpdf": "PDF",
+	"pad.importExport.exportopen": "ODF (Open Document Format)",
+	"pad.modals.connected": "Cunnesso.",
+	"pad.modals.reconnecting": "Ricunnessione ô pad 'n curso...",
+	"pad.modals.forcereconnect": "Forza 'a ricunnessione",
+	"pad.modals.userdup": "Aprito 'n n'ata fenesta",
+	"pad.modals.unauth": "Nun autorizzato",
+	"pad.modals.deleted": "Canciellato.",
+	"timeslider.pageTitle": "Cronologgia {{appTitle}}",
+	"timeslider.toolbar.returnbutton": "Ritorna ô Pad",
+	"timeslider.toolbar.authors": "Auture:",
+	"timeslider.toolbar.authorsList": "Nisciun autore",
+	"timeslider.toolbar.exportlink.title": "Espurta",
+	"timeslider.exportCurrent": "Espurta 'a verzione corrente comme:",
+	"timeslider.version": "Verzione {{version}}",
+	"timeslider.saved": "Sarvato {{day}} {{month}} {{year}}",
+	"timeslider.dateformat": "{{day}}/{{month}}/{{year}} {{hours}}:{{minutes}}:{{seconds}}",
+	"timeslider.month.january": "Jennaro",
+	"timeslider.month.february": "Frevaro",
+	"timeslider.month.march": "Màrzo",
+	"timeslider.month.april": "Abbrile",
+	"timeslider.month.may": "Màjo",
+	"timeslider.month.june": "Giùgno",
+	"timeslider.month.july": "Luglio",
+	"timeslider.month.august": "Aùsto",
+	"timeslider.month.september": "Settembre",
+	"timeslider.month.october": "Ottovre",
+	"timeslider.month.november": "Nuvembre",
+	"timeslider.month.december": "Dicembre",
+	"timeslider.unnamedauthors": "{{num}} {[plural(num) one: autore, other: auture ]} senza nomme",
+	"pad.userlist.entername": "'Nserisce 'o tujo nomme",
+	"pad.userlist.unnamed": "senza nomme",
+	"pad.userlist.guest": "Ospite",
+	"pad.userlist.deny": "Nega",
+	"pad.userlist.approve": "Appruva",
+	"pad.impexp.importbutton": "'Mpurta mmo",
+	"pad.impexp.importing": "'Mpurtazzione 'n curso..."
+}

src/locales/nb.json

@@ -10,14 +10,14 @@
 	"pad.toolbar.bold.title": "Fet (Ctrl-B)",
 	"pad.toolbar.italic.title": "Kursiv (Ctrl-I)",
 	"pad.toolbar.underline.title": "Understreking (Ctrl-U)",
-	"pad.toolbar.strikethrough.title": "Gjennomstreking",
-	"pad.toolbar.ol.title": "Nummerert liste",
-	"pad.toolbar.ul.title": "Punktliste",
+	"pad.toolbar.strikethrough.title": "Gjennomstreking (Ctrl+5)",
+	"pad.toolbar.ol.title": "Nummerert liste (Ctrl+Shift+N)",
+	"pad.toolbar.ul.title": "Punktliste (Ctrl+Shift+L)",
 	"pad.toolbar.indent.title": "Innrykk (TAB)",
 	"pad.toolbar.unindent.title": "Rykk ut (Shift+TAB)",
 	"pad.toolbar.undo.title": "Angre (Ctrl-Z)",
 	"pad.toolbar.redo.title": "Gjør omigjen (Ctrl-Y)",
-	"pad.toolbar.clearAuthorship.title": "Fjern forfatterfarger",
+	"pad.toolbar.clearAuthorship.title": "Fjern forfatterfarger (Ctrl+Shift+C)",
 	"pad.toolbar.import_export.title": "Importer/eksporter fra/til forskjellige filformater",
 	"pad.toolbar.timeslider.title": "Tidslinje",
 	"pad.toolbar.savedRevision.title": "Lagre revisjoner",
@@ -50,7 +50,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"pad.importExport.abiword.innerHTML": "Du kan bare importere fra ren tekst eller HTML-formater. For mer avanserte importfunksjoner, <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": "Tilkoblet.",
 	"pad.modals.reconnecting": "Kobler til din pad på nytt...",

src/locales/nds.json

@@ -50,7 +50,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"pad.importExport.abiword.innerHTML": "Se köönt blots wat vun Kloortext oder HTML-Stücken röverhalen. Mit <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\"> köönt Se ok anner Saken röverhalen. Dorför mööt Se bidde abiword inrichten</a>.",
 	"pad.modals.connected": "Verbindung steiht.",
 	"pad.modals.reconnecting": "En Verbindung wedder opboen ...",

src/locales/ne.json

@@ -48,7 +48,6 @@
 	"pad.importExport.exportword": "माइक्रोसफ्ट वर्ड",
 	"pad.importExport.exportpdf": "पिडिएफ",
 	"pad.importExport.exportopen": "ओडिएफ(खुल्ला कागजात ढाँचा)",
-	"pad.importExport.exportdokuwiki": "डकुविकि",
 	"pad.modals.connected": "जोडीएको।",
 	"pad.modals.reconnecting": "तपाईँको प्याडमा पुन: जडान गर्दै",
 	"pad.modals.forcereconnect": "जडानको लागि जोडगर्ने",

src/locales/nl.json

@@ -1,7 +1,9 @@
 {
 	"@metadata": {
 		"authors": [
-			"Siebrand"
+			"Siebrand",
+			"Macofe",
+			"Robin0van0der0vliet"
 		]
 	},
 	"index.newPad": "Nieuw pad",
@@ -9,14 +11,14 @@
 	"pad.toolbar.bold.title": "Vet (Ctrl-B)",
 	"pad.toolbar.italic.title": "Cursief (Ctrl-I)",
 	"pad.toolbar.underline.title": "Onderstrepen (Ctrl-U)",
-	"pad.toolbar.strikethrough.title": "Doorhalen",
-	"pad.toolbar.ol.title": "Geordende lijst",
-	"pad.toolbar.ul.title": "Ongeordende lijst",
+	"pad.toolbar.strikethrough.title": "Doorhalen (Ctrl+5)",
+	"pad.toolbar.ol.title": "Geordende lijst (Ctrl+Shift+N)",
+	"pad.toolbar.ul.title": "Ongeordende lijst (Ctrl+Shift+L)",
 	"pad.toolbar.indent.title": "Inspringen (Tab)",
 	"pad.toolbar.unindent.title": "Inspringing verkleinen (Shift+Tab)",
 	"pad.toolbar.undo.title": "Ongedaan maken (Ctrl-Z)",
 	"pad.toolbar.redo.title": "Opnieuw uitvoeren (Ctrl-Y)",
-	"pad.toolbar.clearAuthorship.title": "Kleuren auteurs wissen",
+	"pad.toolbar.clearAuthorship.title": "Kleuren auteurs wissen (Ctrl+Shift+C)",
 	"pad.toolbar.import_export.title": "Naar/van andere opmaak exporteren/importeren",
 	"pad.toolbar.timeslider.title": "Tijdlijn",
 	"pad.toolbar.savedRevision.title": "Versie opslaan",
@@ -49,7 +51,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "Pdf",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"pad.importExport.abiword.innerHTML": "U kunt alleen importeren vanuit platte tekst of een HTML-opmaak. <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\">Installeer abiword</a> om meer geavanceerde importmogelijkheden te krijgen.",
 	"pad.modals.connected": "Verbonden.",
 	"pad.modals.reconnecting": "Opnieuw verbinding maken met uw pad...",

src/locales/nn.json

@@ -48,7 +48,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"pad.importExport.abiword.innerHTML": "Du kan berre importera frå rein tekst- eller HTML-format. Ver venleg og <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> om du treng meir avanserte importfunksjonar.",
 	"pad.modals.connected": "Tilkopla.",
 	"pad.modals.reconnecting": "Gjenopprettar tilkoplinga til blokka di …",

src/locales/oc.json

@@ -49,7 +49,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"pad.importExport.abiword.innerHTML": "Podètz pas importar que de formats tèxte brut o html. Per de foncionalitats d'importacion mai evoluadas, <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\">installatz abiword</a>.",
 	"pad.modals.connected": "Connectat.",
 	"pad.modals.reconnecting": "Reconnexion cap a vòstre Pad...",

src/locales/os.json

@@ -49,7 +49,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"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.modals.reconnecting": "Дӕ документмӕ ногӕй иугонд цӕуы..",

src/locales/pa.json

@@ -1,7 +1,8 @@
 {
 	"@metadata": {
 		"authors": [
-			"Aalam"
+			"Aalam",
+			"Babanwalia"
 		]
 	},
 	"index.newPad": "ਨਵਾਂ ਪੈਡ",
@@ -12,7 +13,8 @@
 	"pad.toolbar.strikethrough.title": "ਵਿੰਨ੍ਹੋ ਵਿਨੋ",
 	"pad.toolbar.ol.title": "ਲੜੀਵਾਰ ਲਿਸਟ",
 	"pad.toolbar.ul.title": "ਬਿਨ-ਲੜੀਬੱਧ ਸੂਚੀ",
-	"pad.toolbar.indent.title": "ਹਾਸ਼ੀਏ ਤੋਂ ਦੂਰ",
+	"pad.toolbar.indent.title": "ਹਾਸ਼ੀਏ ਤੋਂ ਪਰ੍ਹੇ (ਟੈਬ)",
+	"pad.toolbar.unindent.title": "ਹਾਸ਼ੀਏ ਵੱਲ (ਸ਼ਿਫ਼ਟ+ਟੈਬ)",
 	"pad.toolbar.undo.title": "ਵਾਪਸ (Ctrl-Z)",
 	"pad.toolbar.redo.title": "ਪਰਤਾਓ (Ctrl-Y)",
 	"pad.toolbar.clearAuthorship.title": "ਪਰਮਾਣਕਿਤਾ ਰੰਗ ਸਾਫ਼ ਕਰੋ",
@@ -22,7 +24,7 @@
 	"pad.toolbar.settings.title": "ਸੈਟਿੰਗ",
 	"pad.toolbar.embed.title": "ਇਹ ਪੈਡ ਸਾਂਝਾ ਤੇ ਇੰਬੈੱਡ ਕਰੋ",
 	"pad.toolbar.showusers.title": "ਇਹ ਪੈਡ ਉੱਤੇ ਯੂਜ਼ਰ ਵੇਖਾਓ",
-	"pad.colorpicker.save": "ਸੰਭਾਲੋ",
+	"pad.colorpicker.save": "ਸਾਂਭੋ",
 	"pad.colorpicker.cancel": "ਰੱਦ ਕਰੋ",
 	"pad.loading": "…ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ",
 	"pad.passwordRequired": "ਇਹ ਪੈਡ ਦੀ ਵਰਤੋਂ ਕਰਨ ਲਈ ਤੁਹਾਨੂੰ ਪਾਸਵਰਡ ਚਾਹੀਦਾ ਹੈ",
@@ -31,6 +33,7 @@
 	"pad.settings.padSettings": "ਪੈਡ ਸੈਟਿੰਗ",
 	"pad.settings.myView": "ਮੇਰੀ ਝਲਕ",
 	"pad.settings.stickychat": "ਹਮੇਸ਼ਾ ਸਕਰੀਨ ਉੱਤੇ ਗੱਲ ਕਰੋ",
+	"pad.settings.colorcheck": "ਲੇਖਕੀ ਰੰਗ",
 	"pad.settings.linenocheck": "ਲਾਈਨ ਨੰਬਰ",
 	"pad.settings.rtlcheck": "ਸਮੱਗਰੀ ਸੱਜੇ ਤੋਂ ਖੱਬੇ ਪੜ੍ਹਨੀ ਹੈ?",
 	"pad.settings.fontType": "ਫੋਂਟ ਕਿਸਮ:",
@@ -47,19 +50,31 @@
 	"pad.importExport.exportword": "ਮਾਈਕਰੋਸਾਫਟ ਵਰਡ",
 	"pad.importExport.exportpdf": "ਪੀਡੀਐਫ",
 	"pad.importExport.exportopen": "ODF (ਓਪਨ ਡੌਕੂਮੈਂਟ ਫਾਰਮੈਟ)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
+	"pad.importExport.abiword.innerHTML": "ਤੁਸੀਂ ਸਿਰਫ਼ ਸਾਦੀਆਂ ਲਿਖਤੀ ਜਾਂ ਐੱਚ.ਟੀ.ਐੱਮ.ਐੱਲ. ਰੂਪ-ਰੇਖਾਵਾਂ ਤੋਂ ਦਰਾਮਦ ਕਰ ਸਕਦੇ ਹੋ। ਹੋਰ ਉੱਨਤ ਦਰਾਮਦੀ ਗੁਣਾਂ ਵਾਸਤੇ ਮਿਹਰਬਾਨੀ ਕਰਕੇ <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\">ਐਬੀਵਰਡ ਥਾਪੋ</a>।",
 	"pad.modals.connected": "ਕੁਨੈਕਟ ਹੈ।",
 	"pad.modals.reconnecting": "..ਤੁਹਾਡੇ ਪੈਡ ਨਾਲ ਮੁੜ-ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ",
 	"pad.modals.forcereconnect": "ਧੱਕੇ ਨਾਲ ਮੁੜ-ਕੁਨੈਕਟ ਕਰੋ",
 	"pad.modals.userdup": "ਹੋਰ ਵਿੰਡੋ ਵਿੱਚ ਖੁੱਲ੍ਹਿਆ ਹੈ",
+	"pad.modals.userdup.explanation": "ਇਹ ਪੈਡ ਇਸ ਕੰਪਿਊਟਰ 'ਤੇ ਇੱਕ ਤੋਂ ਵੱਧ ਫਰੋਲੂ ਬਾਰੀ ਵਿੱਚ ਖੁੱਲ੍ਹਿਆ ਜਾਪਦਾ ਹੈ।",
+	"pad.modals.userdup.advice": "ਸਗੋਂ ਇਹ ਬਾਰੀ ਵਰਤਣ ਵਾਸਤੇ ਮੁੜ ਜੁੜੋ।",
 	"pad.modals.unauth": "ਪਰਮਾਣਿਤ ਨਹੀਂ ਹੈ",
+	"pad.modals.unauth.explanation": "ਇਹ ਸਫ਼ਾ ਵੇਖਦੇ-ਵੇਖਦੇ ਤੁਹਾਨੂੰ ਮਿਲ਼ੀਆਂ ਇਜਾਜ਼ਤਾਂ ਬਦਲ ਗਈਆਂ ਹਨ। ਮੁੜ ਜੁੜਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ।",
+	"pad.modals.looping.explanation": "ਇੱਕਰੂਪੀ ਸਰਵਰ ਨਾਲ਼ ਸੰਚਾਰੀ ਔਕੜਾਂ ਆ ਰਹੀਆਂ ਹਨ।",
+	"pad.modals.looping.cause": "ਸ਼ਾਇਦ ਤੁਸੀਂ ਕਿਸੇ ਅਢੁਕਵੀਂ ਸੁਰੱਖਿਆ ਪ੍ਰਨਾਲ਼ੀ ਜਾਂ ਪ੍ਰਾਕਸੀ ਰਾਹੀਂ ਜੁੜੇ ਹੋ।",
 	"pad.modals.initsocketfail": "ਸਰਵਰ ਪਹੁੰਚ ਵਿੱਚ ਨਹੀਂ ਹੈ।",
+	"pad.modals.initsocketfail.explanation": "ਇੱਕਰੂਪੀ ਸਰਵਰ ਨਾਲ਼ ਰਾਬਤਾ ਨਹੀਂ ਬਣ ਸਕਿਆ।",
+	"pad.modals.initsocketfail.cause": "ਇਹ ਸ਼ਾਇਦ ਤੁਹਾਡੇ ਫਰੋਲੂ ਜਾਂ ਇੰਟਰਨੈੱਟ ਜੋੜ ਦੀਆਂ ਗੁੰਝਲਾਂ ਕਰਕੇ ਹੋ ਰਿਹਾ ਹੈ।",
 	"pad.modals.slowcommit.explanation": "ਸਰਵਰ ਜਵਾਬ ਨਹੀਂ ਦੇ ਰਿਹਾ ਹੈ।",
 	"pad.modals.slowcommit.cause": "ਇਹ ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਨਾਲ ਸਮੱਸਿਆ ਕਰਕੇ ਹੋ ਸਕਦਾ ਹੈ।",
+	"pad.modals.badChangeset.explanation": "ਤੁਹਾਡੇ ਵੱਲੋਂ ਕੀਤੀ ਇੱਕ ਸੋਧ ਨੂੰ ਇੱਕਰੂਪੀ ਸਰਵਰ ਨੇ ਗ਼ੈਰ-ਕਨੂੰਨੀ ਕਰਾਰ ਦਿੱਤਾ ਹੈ।",
+	"pad.modals.badChangeset.cause": "ਇਹ ਸਿਸਟਮ ਦੀ ਕਿਸੇ ਗ਼ਲਤ ਨੁਹਾਰ ਜਾਂ ਕੋਈ ਹੋਰ ਅਣਸੋਚੇ ਵਤੀਰਾ ਕਰਕੇ ਵਾਪਰ ਸਕਦਾ ਹੈ। ਜੇਕਰ ਤੁਹਾਨੂੰ ਇਹ ਇੱਕ ਦੋਸ਼ ਲੱਗਦਾ ਹੈ ਤਾਂ ਮਿਹਰਬਾਨੀ ਕਰਕੇ ਆਪਣੇ ਸਿਸਟਮ ਦੇ ਪ੍ਰਬੰਧਕ ਨਾਲ਼ ਰਾਬਤਾ ਬਣਾਉ। ਸੋਧ ਜਾਰੀ ਰੱਖਣ ਵਾਸਤੇ ਮੁੜ ਜੁੜੋ।",
+	"pad.modals.corruptPad.explanation": "ਜਿਸ ਪੈਡ ਤੱਕ ਤੁਸੀਂ ਪਹੁੰਚਣਾ ਚਾਹੁੰਦੇ ਹੋ, ਉਹ ਖੋਟਾ ਹੈ।",
+	"pad.modals.corruptPad.cause": "ਇਹ ਸਿਸਟਮ ਦੀ ਕਿਸੇ ਗ਼ਲਤ ਨੁਹਾਰ ਜਾਂ ਕੋਈ ਹੋਰ ਅਣਸੋਚੇ ਵਤੀਰਾ ਕਰਕੇ ਵਾਪਰ ਸਕਦਾ ਹੈ। ਮਿਹਰਬਾਨੀ ਕਰਕੇ ਆਪਣੇ ਸਿਸਟਮ ਦੇ ਪ੍ਰਬੰਧਕ ਨਾਲ਼ ਰਾਬਤਾ ਬਣਾਉ।",
 	"pad.modals.deleted": "ਹਟਾਇਆ।",
 	"pad.modals.deleted.explanation": "ਇਹ ਪੈਡ ਹਟਾਇਆ ਜਾ ਚੁੱਕਾ ਹੈ।",
 	"pad.modals.disconnected": "ਤੁਸੀਂ ਡਿਸ-ਕੁਨੈਕਟ ਹੋ ਚੁੱਕੇ ਹੋ।",
 	"pad.modals.disconnected.explanation": "ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਖਤਮ ਹੋਇਆ ਹੈ",
+	"pad.modals.disconnected.cause": "ਸਰਵਰ ਨਾਮੌਜੂਦ ਹੋ ਸਕਦਾ ਹੈ। ਜੇਕਰ ਇਹ ਹੁੰਦਾ ਰਹੇ ਤਾਂ ਮਿਹਰਬਾਨੀ ਕਰਕੇ ਸੇਵਾ ਪ੍ਰਬੰਧਕ ਨੂੰ ਖ਼ਬਰ ਕਰੋ।",
 	"pad.share": "ਇਹ ਪੈਡ ਸਾਂਝਾ ਕਰੋ",
 	"pad.share.readonly": "ਕੇਵਲ ਪੜ੍ਹਨ ਲਈ",
 	"pad.share.link": "ਲਿੰਕ",
@@ -88,7 +103,7 @@
 	"timeslider.month.october": "ਅਕਤੂਬਰ",
 	"timeslider.month.november": "ਨਵੰਬਰ",
 	"timeslider.month.december": "ਦਸੰਬਰ",
-	"timeslider.unnamedauthors": "{{num}} ਬੇਨਾਮ ਲੇਖਕ",
+	"timeslider.unnamedauthors": "{{num}} ਬੇਨਾਮ {[plural(num) one: ਲੇਖਕ, other: ਲੇਖਕ ]}",
 	"pad.savedrevs.marked": "ਇਹ ਰੀਵਿਜ਼ਨ ਨੂੰ ਹੁਣ ਸੰਭਾਲੇ ਹੋਏ ਰੀਵਿਜ਼ਨ ਵਜੋਂ ਮੰਨਿਆ ਗਿਆ ਹੈ",
 	"pad.userlist.entername": "ਆਪਣਾ ਨਾਂ ਦਿਉ",
 	"pad.userlist.unnamed": "ਬੇਨਾਮ",
@@ -98,7 +113,10 @@
 	"pad.editbar.clearcolors": "ਪੂਰੇ ਦਸਾਤਵੇਜ਼ ਉੱਤੇ ਪਰਮਾਣਕਿਤਾ ਰੰਗ ਸਾਫ਼ ਕਰਨੇ ਹਨ?",
 	"pad.impexp.importbutton": "ਹੁਣੇ ਇੰਪੋਰਟ ਕਰੋ",
 	"pad.impexp.importing": "...ਇੰਪੋਰਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ",
+	"pad.impexp.confirmimport": "ਕੋਈ ਫ਼ਾਈਲ ਦਰਾਮਦ ਕਾਰਨ ਨਾਲ਼ ਪੈਡ ਦੀ ਮੌਜੂਦਾ ਲਿਖਤ ਉੱਤੇ ਲਿਖਿਆ ਜਾਵੇਗਾ। ਕੀ ਤੁਸੀਂ ਸੱਚੀਂ ਇਹ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?",
+	"pad.impexp.convertFailed": "ਅਸੀਂ ਇਸ ਫ਼ਾਈਲ ਦੀ ਦਰਾਮਦ ਨਹੀਂ ਕਰ ਸਕੇ। ਮਿਹਰਬਾਨੀ ਕਰਕੇ ਕੋਈ ਵੱਖਰੀ ਦਸਤਾਵੇਜ਼ੀ ਰੂਪ-ਰੇਖਾ ਵਰਤੋ ਜਾਂ ਹੱਥੀਂ ਨਕਲ-ਚੇਪੀ ਕਰੋ।",
 	"pad.impexp.uploadFailed": "ਅੱਪਲੋਡ ਲਈ ਫੇਲ੍ਹ ਹੈ, ਫੇਰ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ।",
 	"pad.impexp.importfailed": "ਇੰਪੋਰਟ ਫੇਲ੍ਹ ਹੈ",
-	"pad.impexp.copypaste": "ਕਾਪੀ ਕਰੋ ਚੇਪੋ ਜੀ"
+	"pad.impexp.copypaste": "ਕਾਪੀ ਕਰੋ ਚੇਪੋ ਜੀ",
+	"pad.impexp.exportdisabled": "{{type}} ਰੂਪ-ਰੇਖਾ ਵਜੋਂ ਬਰਾਮਦ ਕਰਨਾ ਬੰਦ ਹੈ। ਵੇਰਵੇ ਵਾਸਤੇ ਮਿਹਰਬਾਨੀ ਕਰਕੇ ਆਪਣੇ ਸਿਸਟਮ ਦੇ ਪ੍ਰਬੰਧਕ ਨਾਲ਼ ਰਾਬਤਾ ਬਣਾਉ।"
 }

src/locales/pl.json

@@ -4,7 +4,8 @@
 			"Rezonansowy",
 			"Ty221",
 			"WTM",
-			"Woytecr"
+			"Woytecr",
+			"Macofe"
 		]
 	},
 	"index.newPad": "Nowy dokument",
@@ -19,7 +20,7 @@
 	"pad.toolbar.unindent.title": "Wcięcie (Shift + TAB)",
 	"pad.toolbar.undo.title": "Cofnij (Ctrl-Z)",
 	"pad.toolbar.redo.title": "Ponów (Ctrl-Y)",
-	"pad.toolbar.clearAuthorship.title": "Usuń kolory autorów",
+	"pad.toolbar.clearAuthorship.title": "Usuń kolory autorów (Ctrl+Shift+C)",
 	"pad.toolbar.import_export.title": "Import/eksport z/do różnych formatów plików",
 	"pad.toolbar.timeslider.title": "Oś czasu",
 	"pad.toolbar.savedRevision.title": "Zapisz wersję",
@@ -52,7 +53,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"pad.importExport.abiword.innerHTML": "Możesz importować pliki tylko w formacie zwykłego tekstu lub html. Aby umożliwić bardziej zaawansowane funkcje importu, <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\">zainstaluj abiword</a>.",
 	"pad.modals.connected": "Połączony.",
 	"pad.modals.reconnecting": "Ponowne łączenie z dokumentem...",

src/locales/ps.json

@@ -32,7 +32,6 @@
 	"pad.importExport.exportword": "مايکروسافټ ورډ",
 	"pad.importExport.exportpdf": "پي ډي اېف",
 	"pad.importExport.exportopen": "ODF (اوپن ډاکومنټ فارمټ)",
-	"pad.importExport.exportdokuwiki": "ډوکوويکي",
 	"pad.modals.connected": "اړيکمن شو.",
 	"pad.modals.slowcommit.explanation": "پالنگر ځواب نه وايي.",
 	"pad.modals.slowcommit.cause": "دا کېدای شي د جال د اړيکتيايي ستونزو په سبب وي.",

src/locales/pt-br.json

@@ -7,7 +7,10 @@
 			"TheGabrielZaum",
 			"Titoncio",
 			"Tuliouel",
-			"Rafaelff"
+			"Rafaelff",
+			"Dianakc",
+			"Macofe",
+			"Rodrigo codignoli"
 		]
 	},
 	"index.newPad": "Nova Nota",
@@ -15,14 +18,14 @@
 	"pad.toolbar.bold.title": "Negrito (Ctrl-B)",
 	"pad.toolbar.italic.title": "Itálico (Ctrl-I)",
 	"pad.toolbar.underline.title": "Sublinhar (Ctrl-U)",
-	"pad.toolbar.strikethrough.title": "Tachado",
-	"pad.toolbar.ol.title": "Lista ordenada",
-	"pad.toolbar.ul.title": "Lista não ordenada",
+	"pad.toolbar.strikethrough.title": "Tachado (Ctrl+5)",
+	"pad.toolbar.ol.title": "Lista ordenada (Ctrl+Shift+N)",
+	"pad.toolbar.ul.title": "Lista não ordenada (Ctrl+Shift+L)",
 	"pad.toolbar.indent.title": "Aumentar Recuo (TAB)",
 	"pad.toolbar.unindent.title": "Diminuir Recuo (Shift+TAB)",
 	"pad.toolbar.undo.title": "Desfazer (Ctrl-Z)",
 	"pad.toolbar.redo.title": "Refazer (Ctrl-Y)",
-	"pad.toolbar.clearAuthorship.title": "Limpar as cores de identificação de autoria",
+	"pad.toolbar.clearAuthorship.title": "Limpar as cores de identificação de autoria (Ctrl+Shift+C)",
 	"pad.toolbar.import_export.title": "Importar/Exportar de/para diferentes formatos de arquivo",
 	"pad.toolbar.timeslider.title": "Linha do tempo",
 	"pad.toolbar.savedRevision.title": "Salvar revisão",
@@ -55,7 +58,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"pad.importExport.abiword.innerHTML": "Você só pode importar de formatos de texto puro ou html. Para recursos de importação mais avançados <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\">instale o abiword</a>.",
 	"pad.modals.connected": "Conectado.",
 	"pad.modals.reconnecting": "Reconectando à sua nota...",
@@ -83,7 +85,7 @@
 	"pad.modals.disconnected.cause": "O servidor pode estar indisponível. Por favor, notifique o administrador caso isso continue.",
 	"pad.share": "Compartilhar esta nota",
 	"pad.share.readonly": "Somente leitura",
-	"pad.share.link": "Ligação",
+	"pad.share.link": "Link",
 	"pad.share.emebdcode": "Incorporar o URL",
 	"pad.chat": "Bate-papo",
 	"pad.chat.title": "Abrir o bate-papo desta nota.",

src/locales/pt.json

@@ -5,7 +5,8 @@
 			"Luckas",
 			"Tuliouel",
 			"Waldir",
-			"Imperadeiro98"
+			"Imperadeiro98",
+			"Macofe"
 		]
 	},
 	"index.newPad": "Nova Nota",
@@ -13,14 +14,14 @@
 	"pad.toolbar.bold.title": "Negrito (Ctrl-B)",
 	"pad.toolbar.italic.title": "Itálico (Ctrl-I)",
 	"pad.toolbar.underline.title": "Sublinhado (Ctrl-U)",
-	"pad.toolbar.strikethrough.title": "Riscar",
-	"pad.toolbar.ol.title": "Lista ordenada",
-	"pad.toolbar.ul.title": "Lista desordenada",
+	"pad.toolbar.strikethrough.title": "Riscar (Ctrl+5)",
+	"pad.toolbar.ol.title": "Lista ordenada (Ctrl+Shift+N)",
+	"pad.toolbar.ul.title": "Lista desordenada (Ctrl+Shift+L)",
 	"pad.toolbar.indent.title": "Avançar (TAB)",
 	"pad.toolbar.unindent.title": "Recuar (Shift+TAB)",
 	"pad.toolbar.undo.title": "Desfazer (Ctrl-Z)",
 	"pad.toolbar.redo.title": "Refazer (Ctrl-Y)",
-	"pad.toolbar.clearAuthorship.title": "Limpar cores de autoria",
+	"pad.toolbar.clearAuthorship.title": "Limpar cores de autoria (Ctrl+Shift+C)",
 	"pad.toolbar.import_export.title": "Importar/exportar de/para diferentes formatos de ficheiro",
 	"pad.toolbar.timeslider.title": "Linha de tempo",
 	"pad.toolbar.savedRevision.title": "Salvar revisão",
@@ -53,7 +54,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"pad.modals.connected": "Ligado.",
 	"pad.modals.reconnecting": "Reconectando-se ao seu bloco…",
 	"pad.modals.forcereconnect": "Forçar reconexão",
@@ -71,6 +71,7 @@
 	"pad.modals.disconnected.cause": "O servidor pode estar indisponível. Por favor, notifique o administrador de serviço se isto continuar a acontecer.",
 	"pad.share": "Compartilhar este pad",
 	"pad.share.readonly": "Somente para leitura",
+	"pad.share.link": "Ligação",
 	"pad.chat": "Bate-papo",
 	"pad.chat.title": "Abrir o bate-papo para este pad.",
 	"pad.chat.loadmessages": "Carregar mais mensagens",

src/locales/ru.json

@@ -13,14 +13,14 @@
 	"pad.toolbar.bold.title": "полужирный (Ctrl-B)",
 	"pad.toolbar.italic.title": "курсив (Ctrl-I)",
 	"pad.toolbar.underline.title": "подчёркивание (Ctrl-U)",
-	"pad.toolbar.strikethrough.title": "зачёркивание",
-	"pad.toolbar.ol.title": "Упорядоченный список",
-	"pad.toolbar.ul.title": "Неупорядоченный список",
+	"pad.toolbar.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": "Очистить цвета документа",
+	"pad.toolbar.clearAuthorship.title": "Очистить цвета документа (Ctrl+Shift+C)",
 	"pad.toolbar.import_export.title": "Импорт/экспорт с использованием различных форматов файлов",
 	"pad.toolbar.timeslider.title": "Шкала времени",
 	"pad.toolbar.savedRevision.title": "Сохранить версию",
@@ -53,7 +53,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (документ OpenOffice)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"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.modals.reconnecting": "Повторное подключение к вашему документу",

src/locales/sco.json

@@ -49,7 +49,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"pad.importExport.abiword.innerHTML": "Ye can yinly import fae plain tex or HTML formats. Fer mair advanced import features please <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-in-Ubuntu-or-OpenSuse-or-SLES-with-AbiWord\">install abiword</a>.",
 	"pad.modals.connected": "Connected.",
 	"pad.modals.reconnecting": "Reconnectin til yer pad..",

src/locales/sk.json

@@ -51,7 +51,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"pad.importExport.abiword.innerHTML": "Importovať môžete len čistý text alebo HTML. Pre pokročilejšie funkcie importu prosím nainštalujte „<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": "Pripojené.",
 	"pad.modals.reconnecting": "Opätovné pripájanie k vášmu Padu...",

src/locales/sl.json

@@ -10,14 +10,14 @@
 	"pad.toolbar.bold.title": "Krepko (Ctrl-B)",
 	"pad.toolbar.italic.title": "Ležeče (Ctrl-I)",
 	"pad.toolbar.underline.title": "Podčrtano (Ctrl-U)",
-	"pad.toolbar.strikethrough.title": "Prečrtano",
-	"pad.toolbar.ol.title": "Oštevilčen seznam",
-	"pad.toolbar.ul.title": "Vrstični seznam",
+	"pad.toolbar.strikethrough.title": "Prečrtano (Ctrl+5)",
+	"pad.toolbar.ol.title": "Oštevilčen seznam (Ctrl+Shift+N)",
+	"pad.toolbar.ul.title": "Neurejen seznam (Ctrl+Shift+L)",
 	"pad.toolbar.indent.title": "Zamik desno (TAB)",
 	"pad.toolbar.unindent.title": "Zamik levo (Shift+TAB)",
 	"pad.toolbar.undo.title": "Razveljavi (Ctrl-Z)",
 	"pad.toolbar.redo.title": "Ponovno uveljavi (Ctrl-Y)",
-	"pad.toolbar.clearAuthorship.title": "Počisti barvo avtorstva",
+	"pad.toolbar.clearAuthorship.title": "Počisti barvo avtorstva (Ctrl+Shift+C)",
 	"pad.toolbar.import_export.title": "Izvozi/Uvozi različne oblike zapisov",
 	"pad.toolbar.timeslider.title": "Drsnik zgodovine",
 	"pad.toolbar.savedRevision.title": "Shrani predelavo",
@@ -50,7 +50,6 @@
 	"pad.importExport.exportword": "DOC (zapis Microsoft Word)",
 	"pad.importExport.exportpdf": "PDF (zapis Acrobat PDF)",
 	"pad.importExport.exportopen": "ODF (zapis Open Document)",
-	"pad.importExport.exportdokuwiki": "DokuWiki (zapis DokuWiki)",
 	"pad.importExport.abiword.innerHTML": "Uvoziti je mogoče le običajno neoblikovano besedilo in zapise HTML. Za naprednejše zmožnosti namestite <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\\\">program Abiword</a>.",
 	"pad.modals.connected": "Povezano.",
 	"pad.modals.reconnecting": "Poteka povezovanje z dokumentom ...",

src/locales/sq.json

@@ -9,17 +9,17 @@
 	"pad.toolbar.bold.title": "Të trasha (Ctrl-B)",
 	"pad.toolbar.italic.title": "Të pjerrëta (Ctrl-I)",
 	"pad.toolbar.underline.title": "Të nënvizuara (Ctrl-U)",
-	"pad.toolbar.strikethrough.title": "Hequrvije",
-	"pad.toolbar.ol.title": "Listë e renditur",
-	"pad.toolbar.ul.title": "Listë e parenditur",
-	"pad.toolbar.indent.title": "Brendazi",
-	"pad.toolbar.unindent.title": "Jashtazi",
+	"pad.toolbar.strikethrough.title": "Hequrvije (Ctrl+5)",
+	"pad.toolbar.ol.title": "Listë e renditur (Ctrl+Shift+N)",
+	"pad.toolbar.ul.title": "Listë e parenditur (Ctrl+Shift+L)",
+	"pad.toolbar.indent.title": "Brendazi (TAB)",
+	"pad.toolbar.unindent.title": "Jashtazi (Shift+TAB)",
 	"pad.toolbar.undo.title": "Zhbëje (Ctrl-Z)",
 	"pad.toolbar.redo.title": "Ribëje (Ctrl-Y)",
-	"pad.toolbar.clearAuthorship.title": "Hiq Ngjyra Autorësish",
+	"pad.toolbar.clearAuthorship.title": "Hiqju Ngjyra Autorësish (Ctrl+Shift+C)",
 	"pad.toolbar.import_export.title": "Importoni/Eksportoni nga/në formate të tjera kartelash",
 	"pad.toolbar.timeslider.title": "Rrjedha kohore",
-	"pad.toolbar.savedRevision.title": "Ruaje Rishikin",
+	"pad.toolbar.savedRevision.title": "Ruaje Rishikimin",
 	"pad.toolbar.settings.title": "Rregullime",
 	"pad.toolbar.embed.title": "Ndajeni me të tjerët dhe Trupëzojeni këtë bllok",
 	"pad.toolbar.showusers.title": "Shfaq përdoruesit në këtë bllok",
@@ -49,14 +49,13 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"pad.importExport.abiword.innerHTML": "Mund të importoni vetëm prej formati tekst i thjeshtë ose html. Për veçori më të përparuara importimi, ju lutemi, <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\">instaloni Abiword-in</a>.",
 	"pad.modals.connected": "I lidhur.",
 	"pad.modals.reconnecting": "Po rilidheni te blloku juaj..",
 	"pad.modals.forcereconnect": "Rilidhje e detyruar",
 	"pad.modals.userdup": "Hapur në një tjetër dritare",
 	"pad.modals.userdup.explanation": "Ky bllok duket se gjendet i hapur në më shumë se një dritare shfletuesi në këtë kompjuter.",
-	"pad.modals.userdup.advice": "Rilidhu që të përdoret kjo dritare, më mirë.",
+	"pad.modals.userdup.advice": "Rilidhuni që të përdoret kjo dritare.",
 	"pad.modals.unauth": "I paautorizuar",
 	"pad.modals.unauth.explanation": "Ndërkohë që shihnit këtë dritare, lejet tuaja kanë ndryshuar. Provoni të rilidheni.",
 	"pad.modals.looping.explanation": "Ka probleme komunikimi me shërbyesin e njëkohësimit.",
@@ -66,14 +65,14 @@
 	"pad.modals.initsocketfail.cause": "Ka gjasa që kjo vjen për shkak të një problemi me shfletuesin tuaj ose lidhjen tuaj në internet.",
 	"pad.modals.slowcommit.explanation": "Shërbyesi nuk po përgjigjet.",
 	"pad.modals.slowcommit.cause": "Kjo mund të vijë për shkak problemesh lidhjeje me rrjetin.",
-	"pad.modals.badChangeset.explanation": "Një përpunim që keni bërë u shpall i paligjshëm nga shërbyesu i njëkohësimit.",
+	"pad.modals.badChangeset.explanation": "Një përpunim që keni bërë u vlerësua si i paligjshëm nga shërbyesi i njëkohësimit.",
 	"pad.modals.badChangeset.cause": "Kjo mund të jetë për shkak të një formësimi të gabuar të shërbyesit ose ndonjë tjetër sjelljeje të papritur. Ju lutemi, lidhuni me përgjegjësin e shërbimit, nëse mendoni që ky është një gabim. Provoni të rilidheni që të vazhdoni përpunimin.",
 	"pad.modals.corruptPad.explanation": "Blloku te i cili po përpiqeni të hyni është i dëmtuar.",
 	"pad.modals.corruptPad.cause": "Kjo mund të vijë nga një formësim i gabuar shërbyesi ose ndonjë tjetër sjellje e papritur. Ju lutemi, lidhuni me përgjegjësin e shërbimit.",
 	"pad.modals.deleted": "I fshirë.",
 	"pad.modals.deleted.explanation": "Ky bllok është hequr.",
 	"pad.modals.disconnected": "Jeni shkëputur.",
-	"pad.modals.disconnected.explanation": "U pre lidhja me shërbyesin",
+	"pad.modals.disconnected.explanation": "U ndërpre lidhja me shërbyesin",
 	"pad.modals.disconnected.cause": "Shërbyesi mund të mos jetë në punë. Ju lutemi, njoftoni përgjegjësin e shërbimit, nëse kjo vazhdon të ndodhë.",
 	"pad.share": "Ndajeni këtë bllok me të tjerët",
 	"pad.share.readonly": "Vetëm për lexim",
@@ -103,11 +102,12 @@
 	"timeslider.month.october": "Tetor",
 	"timeslider.month.november": "Nëntor",
 	"timeslider.month.december": "Dhjetor",
+	"timeslider.unnamedauthors": "{{num}} i paemërt {[plural(num) një: autor, tjetër: autorë ]}",
 	"pad.savedrevs.marked": "Ky rishikim tani është shënuar si rishikim i ruajtur",
 	"pad.userlist.entername": "Jepni emrin tuaj",
 	"pad.userlist.unnamed": "pa emër",
 	"pad.userlist.guest": "Vizitor",
-	"pad.userlist.deny": "Mohoje",
+	"pad.userlist.deny": "Hidheni Tej",
 	"pad.userlist.approve": "Miratoje",
 	"pad.editbar.clearcolors": "Të hiqen ngjyra autorësish në krejt dokumentin?",
 	"pad.impexp.importbutton": "Importoje Tani",

src/locales/sv.json

@@ -11,14 +11,14 @@
 	"pad.toolbar.bold.title": "Fet (Ctrl-B)",
 	"pad.toolbar.italic.title": "Kursiv (Ctrl-I)",
 	"pad.toolbar.underline.title": "Understruken (Ctrl-U)",
-	"pad.toolbar.strikethrough.title": "Genomstruken",
-	"pad.toolbar.ol.title": "Numrerad lista",
-	"pad.toolbar.ul.title": "Osorterad lista",
+	"pad.toolbar.strikethrough.title": "Genomstruken (Ctrl+5)",
+	"pad.toolbar.ol.title": "Numrerad lista (Ctrl+Shift+N)",
+	"pad.toolbar.ul.title": "Onumrerad lista (Ctrl+Shift+L)",
 	"pad.toolbar.indent.title": "Öka indrag (TABB)",
 	"pad.toolbar.unindent.title": "Minska indrag (Shift+TABB)",
 	"pad.toolbar.undo.title": "Ångra (Ctrl-Z)",
 	"pad.toolbar.redo.title": "Gör om (Ctrl-Y)",
-	"pad.toolbar.clearAuthorship.title": "Rensa författarfärger",
+	"pad.toolbar.clearAuthorship.title": "Rensa författarfärger (Ctrl+Shift+C)",
 	"pad.toolbar.import_export.title": "Importera/exportera från/till olika filformat",
 	"pad.toolbar.timeslider.title": "Tidsreglage",
 	"pad.toolbar.savedRevision.title": "Spara version",
@@ -51,8 +51,7 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
-	"pad.importExport.abiword.innerHTML": "Du kan endast importera från oformaterad text eller html-format. För mer avancerade importeringsfunktioner, var god <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\">installera abiword</a>.",
+	"pad.importExport.abiword.innerHTML": "Du kan endast importera från oformaterad text eller HTML-format. För mer avancerade importeringsfunktioner, var god <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\">installera abiword</a>.",
 	"pad.modals.connected": "Ansluten.",
 	"pad.modals.reconnecting": "Återansluter till ditt block...",
 	"pad.modals.forcereconnect": "Tvinga återanslutning",
@@ -60,7 +59,7 @@
 	"pad.modals.userdup.explanation": "Detta block verkar vara öppet i mer än ett fönster på denna dator.",
 	"pad.modals.userdup.advice": "Återanslut för att använda detta fönster istället.",
 	"pad.modals.unauth": "Inte godkänd",
-	"pad.modals.unauth.explanation": "Din behörighet ändrades medan du visar denna sida. Försök att återansluta.",
+	"pad.modals.unauth.explanation": "Din behörighet ändrades medan du visade denna sida. Försök att återansluta.",
 	"pad.modals.looping.explanation": "Kommunikationsproblem med synkroniseringsservern har uppstått.",
 	"pad.modals.looping.cause": "Kanske du är ansluten via en inkompatibel brandvägg eller proxy.",
 	"pad.modals.initsocketfail": "Servern kan inte nås.",
@@ -69,7 +68,7 @@
 	"pad.modals.slowcommit.explanation": "Servern svarar inte.",
 	"pad.modals.slowcommit.cause": "Detta kan bero på problem med nätverksanslutningen.",
 	"pad.modals.badChangeset.explanation": "En redigering som du gjort klassificerades som otillåten av synkroniseringsservern.",
-	"pad.modals.badChangeset.cause": "Detta kan bero på en felaktig konfiguration av servern eller något annat oväntad beteende. Var god kontakta tjänstadministratören om du anser att detta är ett fel. Försök ansluta igen för att fortsätta redigera.",
+	"pad.modals.badChangeset.cause": "Detta kan bero på en felaktig konfiguration av servern eller något annat oväntad beteende. Var god kontakta tjänsteadministratören om du upplever att detta är ett fel. Försök att ansluta igen för att fortsätta redigera.",
 	"pad.modals.corruptPad.explanation": "Blocket du försöker komma åt är skadat.",
 	"pad.modals.corruptPad.cause": "Detta kan bero på en felaktig konfiguration av servern eller något annat oväntad beteende. Var god kontakta tjänstadministratören.",
 	"pad.modals.deleted": "Raderad.",
@@ -84,7 +83,7 @@
 	"pad.chat": "Chatt",
 	"pad.chat.title": "Öppna chatten för detta block.",
 	"pad.chat.loadmessages": "Läs in fler meddelanden",
-	"timeslider.pageTitle": "Tidsreglage för {{appTitle}}",
+	"timeslider.pageTitle": "{{appTitle}} tidsreglage",
 	"timeslider.toolbar.returnbutton": "Återvänd till blocket",
 	"timeslider.toolbar.authors": "Författare:",
 	"timeslider.toolbar.authorsList": "Inga författare",

src/locales/te.json

@@ -50,7 +50,6 @@
 	"pad.importExport.exportword": "మైక్రోసాఫ్ట్ వర్డ్",
 	"pad.importExport.exportpdf": "పీ డి ఎఫ్",
 	"pad.importExport.exportopen": "ఓ డి ఎఫ్ (ఓపెన్ డాక్యుమెంట్ ఫార్మాట్)",
-	"pad.importExport.exportdokuwiki": "డాక్యువికి",
 	"pad.modals.connected": "సంబంధం కుదిరింది.",
 	"pad.modals.reconnecting": "మీ పలకకు మరల సంబంధం కలుపుతుంది...",
 	"pad.modals.forcereconnect": "బలవంతంగానైనా సంబంధం కుదిరించు",

src/locales/tr.json

@@ -4,7 +4,8 @@
 			"Emperyan",
 			"Erdemaslancan",
 			"Joseph",
-			"Meelo"
+			"Meelo",
+			"Trockya"
 		]
 	},
 	"index.newPad": "Yeni Bloknot",
@@ -12,14 +13,14 @@
 	"pad.toolbar.bold.title": "Kalın (Ctrl-B)",
 	"pad.toolbar.italic.title": "Eğik (Ctrl-I)",
 	"pad.toolbar.underline.title": "Altı Çizili (Ctrl-U)",
-	"pad.toolbar.strikethrough.title": "Üstü Çizili",
-	"pad.toolbar.ol.title": "Sıralı liste",
-	"pad.toolbar.ul.title": "Sırasız Liste",
+	"pad.toolbar.strikethrough.title": "Üstü Çizili (Ctrl+5)",
+	"pad.toolbar.ol.title": "Sıralı liste (Ctrl+Shift+N)",
+	"pad.toolbar.ul.title": "Sırasız Liste (Ctrl+Shift+L)",
 	"pad.toolbar.indent.title": "Girintiyi arttır (TAB)",
 	"pad.toolbar.unindent.title": "Girintiyi azalt (Shift+TAB)",
 	"pad.toolbar.undo.title": "Geri Al (Ctrl-Z)",
-	"pad.toolbar.redo.title": "Yenile (Ctrl-Y)",
-	"pad.toolbar.clearAuthorship.title": "Yazarlık Renklerini Temizle",
+	"pad.toolbar.redo.title": "Yinele (Ctrl+Y)",
+	"pad.toolbar.clearAuthorship.title": "Yazarlık Renklerini Temizle (Ctrl+Shift+C)",
 	"pad.toolbar.import_export.title": "Farklı dosya biçimlerini içeri/dışarı aktar",
 	"pad.toolbar.timeslider.title": "Zaman Çizelgesi",
 	"pad.toolbar.savedRevision.title": "Düzeltmeyi Kaydet",
@@ -52,7 +53,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Açık Doküman Biçimi)",
-	"pad.importExport.exportdokuwiki": "VikiBelge",
 	"pad.importExport.abiword.innerHTML": "Yalnızca düz metin ya da HTML biçimlerini içe aktarabilirsiniz. Daha fazla gelişmiş içe aktarım özellikleri için <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'ü yükleyin</a>.",
 	"pad.modals.connected": "Bağlandı.",
 	"pad.modals.reconnecting": "Bloknotunuza tekrar bağlanılıyor...",