From ec6a2b5ba906565124b8cfc4eaffe1a08bb06d18 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Mon, 16 Feb 2015 23:02:19 +0000
Subject: [PATCH 1/5] allow for load testing connections to hit by a setting

---
 settings.json.template             | 3 +++
 src/node/hooks/express/socketio.js | 8 ++++++--
 src/node/utils/Settings.js         | 5 +++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/settings.json.template b/settings.json.template
index 3f84af9b..124345e2 100644
--- a/settings.json.template
+++ b/settings.json.template
@@ -108,6 +108,9 @@
 
   // restrict socket.io transport methods
   "socketTransportProtocols" : ["xhr-polling", "jsonp-polling", "htmlfile"],
+
+  // Allow Load Testing tools to hit the Etherpad Instance.  Warning this will disable security on the instance.
+  "loadTest": false,
   
   /* The toolbar buttons configuration.
   "toolbar": {
diff --git a/src/node/hooks/express/socketio.js b/src/node/hooks/express/socketio.js
index b70aa50e..35d6d074 100644
--- a/src/node/hooks/express/socketio.js
+++ b/src/node/hooks/express/socketio.js
@@ -23,8 +23,12 @@ exports.expressCreateServer = function (hook_name, args, cb) {
 
   io.use(function(socket, accept) {
     var data = socket.request;
-    if (!data.headers.cookie) return accept('No session cookie transmitted.', false);
-
+    // Use a setting if we want to allow load Testing
+    if(!data.headers.cookie && settings.loadTest){
+      accept(null, true);
+    }else{
+      if (!data.headers.cookie) return accept('No session cookie transmitted.', false);
+    }
     // Use connect's cookie parser, because it knows how to parse signed cookies
     connect.cookieParser(webaccess.secret)(data, {}, function(err){
       if(err) {
diff --git a/src/node/utils/Settings.js b/src/node/utils/Settings.js
index 1fb5bddf..5382d819 100644
--- a/src/node/utils/Settings.js
+++ b/src/node/utils/Settings.js
@@ -144,6 +144,11 @@ exports.loglevel = "INFO";
  */
 exports.disableIPlogging = false;
 
+/** 
+ * Disable Load Testing
+ */
+exports.loadTest = false;
+
 /*
 * log4js appender configuration
 */

From abb9b6d8330c22f10d55931690004a4fb4d1e6e1 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <siebrand@kitano.nl>
Date: Thu, 19 Feb 2015 13:02:42 +0100
Subject: [PATCH 2/5] Localisation updates from https://translatewiki.net.

---
 src/locales/awa.json       |  69 ++++++++++++++++++++
 src/locales/be-tarask.json |   2 +
 src/locales/cs.json        |  10 ++-
 src/locales/de.json        |   4 +-
 src/locales/el.json        |   2 +
 src/locales/en-gb.json     | 127 +++++++++++++++++++++++++++++++++++++
 src/locales/es.json        |   9 ++-
 src/locales/eu.json        |   4 +-
 src/locales/fr.json        |   2 +
 src/locales/gl.json        |   6 +-
 src/locales/he.json        |   5 ++
 src/locales/it.json        |   5 +-
 src/locales/ksh.json       |   5 ++
 src/locales/mk.json        |   2 +
 src/locales/nl.json        |   5 ++
 src/locales/pt-br.json     |   5 +-
 src/locales/ru.json        |   1 +
 src/locales/sr-ec.json     |  59 +++++++++++++++++
 src/locales/sv.json        |   2 +
 src/locales/zh-hans.json   |   4 +-
 20 files changed, 315 insertions(+), 13 deletions(-)
 create mode 100644 src/locales/awa.json
 create mode 100644 src/locales/en-gb.json
 create mode 100644 src/locales/sr-ec.json

diff --git a/src/locales/awa.json b/src/locales/awa.json
new file mode 100644
index 00000000..f8c0d501
--- /dev/null
+++ b/src/locales/awa.json
@@ -0,0 +1,69 @@
+{
+	"@metadata": {
+		"authors": [
+			"1AnuraagPandey"
+		]
+	},
+	"index.newPad": "नयाँ प्याड",
+	"pad.toolbar.bold.title": "मोट (Ctrl-B)",
+	"pad.toolbar.italic.title": "तिरछा (Ctrl+I)",
+	"pad.toolbar.underline.title": "निम्न रेखाङ्कन (Ctrl-U)",
+	"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.timeslider.title": "टाइमस्लाइडर",
+	"pad.toolbar.savedRevision.title": "पुनरावलोकन संग्रह किहा जाय",
+	"pad.toolbar.settings.title": "सेटिङ्ग",
+	"pad.colorpicker.save": "सहेजा जाय",
+	"pad.colorpicker.cancel": "रद्द करा जाय",
+	"pad.loading": "लोड होत है...",
+	"pad.wrongPassword": "आप कय पासवर्ड गलत रहा",
+	"pad.settings.padSettings": "प्याड सेटिङ्ग",
+	"pad.settings.myView": "हमार दृष्य",
+	"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.importSuccessful": "सफल!",
+	"pad.importExport.exporthtml": "HTML",
+	"pad.importExport.exportplain": "सामान्य पाठ",
+	"pad.importExport.exportword": "माइक्रोसफ्ट वर्ड",
+	"pad.importExport.exportpdf": "पिडिएफ",
+	"pad.importExport.exportopen": "ओडिएफ(खुल्ला कागजात ढाँचा)",
+	"pad.modals.unauth": "अनाधिकृत",
+	"pad.modals.initsocketfail": "सर्भरमा पहुँच से बहरे है ।",
+	"pad.share.readonly": "पढय वाला खाली",
+	"pad.share.link": "लिङ्क",
+	"pad.share.emebdcode": "URL जोडा जाय",
+	"pad.chat": "बातचीत",
+	"timeslider.pageTitle": "{{appTitle}} समय रेखा",
+	"timeslider.toolbar.authors": "लेखक:",
+	"timeslider.toolbar.exportlink.title": "निर्यात",
+	"timeslider.version": "संस्करण {{version}}",
+	"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}} unnamed {[plural(num) one: author, other: authors ]}",
+	"pad.userlist.unnamed": "बेनामी",
+	"pad.userlist.guest": "पहुना",
+	"pad.userlist.deny": "अस्वीकार",
+	"pad.userlist.approve": "स्वीकृत",
+	"pad.impexp.importing": "आयात होत है...",
+	"pad.impexp.importfailed": "आयात असफल रहा",
+	"pad.impexp.copypaste": "कृपया कपी पेस्ट कीन जाय"
+}
diff --git a/src/locales/be-tarask.json b/src/locales/be-tarask.json
index f67d10fe..3c789858 100644
--- a/src/locales/be-tarask.json
+++ b/src/locales/be-tarask.json
@@ -35,6 +35,7 @@
 	"pad.settings.padSettings": "Налады дакумэнта",
 	"pad.settings.myView": "Мой выгляд",
 	"pad.settings.stickychat": "Заўсёды паказваць чат",
+	"pad.settings.chatandusers": "Паказаць чат і ўдзельнікаў",
 	"pad.settings.colorcheck": "Колеры аўтарства",
 	"pad.settings.linenocheck": "Нумары радкоў",
 	"pad.settings.rtlcheck": "Тэкст справа-налева",
@@ -108,6 +109,7 @@
 	"timeslider.month.december": "сьнежань",
 	"timeslider.unnamedauthors": "{{num}} {[plural(num) one: безыменны аўтар, few: безыменныя аўтары, many: безыменных аўтараў, other: безыменных аўтараў ]}",
 	"pad.savedrevs.marked": "Гэтая вэрсія цяпер пазначаная як захаваная",
+	"pad.savedrevs.timeslider": "Вы можаце пабачыць захаваныя вэрсіі з дапамогай шкалы часу",
 	"pad.userlist.entername": "Увядзіце вашае імя",
 	"pad.userlist.unnamed": "безыменны",
 	"pad.userlist.guest": "Госьць",
diff --git a/src/locales/cs.json b/src/locales/cs.json
index 2a6b5fec..19552ffd 100644
--- a/src/locales/cs.json
+++ b/src/locales/cs.json
@@ -13,11 +13,11 @@
 	"pad.toolbar.bold.title": "Tučný text (Ctrl-B)",
 	"pad.toolbar.italic.title": "Kurzíva (Ctrl-I)",
 	"pad.toolbar.underline.title": "Podtržené písmo (Ctrl-U)",
-	"pad.toolbar.strikethrough.title": "Přeskrtnuté písmo",
+	"pad.toolbar.strikethrough.title": "Přeškrtnuto (Ctrl+5)",
 	"pad.toolbar.ol.title": "Číslovaný seznam",
 	"pad.toolbar.ul.title": "Nečíslovaný seznam",
-	"pad.toolbar.indent.title": "Odsazení",
-	"pad.toolbar.unindent.title": "Předsazení",
+	"pad.toolbar.indent.title": "Odsazení (TAB)",
+	"pad.toolbar.unindent.title": "Předsazení (Shift+TAB)",
 	"pad.toolbar.undo.title": "Zpět (Ctrl-Z)",
 	"pad.toolbar.redo.title": "Opakovat (Ctrl-Y)",
 	"pad.toolbar.clearAuthorship.title": "Vymazat barvy autorů",
@@ -30,12 +30,14 @@
 	"pad.colorpicker.save": "Uložit",
 	"pad.colorpicker.cancel": "Zrušit",
 	"pad.loading": "Načítání...",
+	"pad.noCookie": "Nelze nalézt cookie. Povolte prosím cookie ve Vašem prohlížeči.",
 	"pad.passwordRequired": "Pro přístup k tomuto Padu je třeba znát heslo",
 	"pad.permissionDenied": "Nemáte oprávnění pro přístup k tomuto Padu",
 	"pad.wrongPassword": "Nesprávné heslo",
 	"pad.settings.padSettings": "Nastavení Padu",
 	"pad.settings.myView": "Vlastní pohled",
 	"pad.settings.stickychat": "Chat vždy na obrazovce",
+	"pad.settings.chatandusers": "Ukázat Chat a Uživatele",
 	"pad.settings.colorcheck": "Barvy autorů",
 	"pad.settings.linenocheck": "Čísla řádků",
 	"pad.settings.rtlcheck": "Číst obsah zprava doleva?",
@@ -109,6 +111,7 @@
 	"timeslider.month.december": "prosinec",
 	"timeslider.unnamedauthors": "{{num}} {[ plural(num) one: nejmenovaný Autor, few: nejmenovaní Autoři, other: nejmenovaných Autorů ]}",
 	"pad.savedrevs.marked": "Tato revize je nyní označena jako uložená",
+	"pad.savedrevs.timeslider": "Návštěvou časové osy zobrazíte uložené revize",
 	"pad.userlist.entername": "Zadejte své jméno",
 	"pad.userlist.unnamed": "nejmenovaný",
 	"pad.userlist.guest": "Host",
@@ -119,6 +122,7 @@
 	"pad.impexp.importing": "Importování…",
 	"pad.impexp.confirmimport": "Import souboru přepíše aktuální text v padu. Opravdu chcete tuto akci provést?",
 	"pad.impexp.convertFailed": "Tento soubor nelze importovat. Použijte prosím jiný formát dokumentu nebo nakopírujte text ručně",
+	"pad.impexp.padHasData": "Tento soubor jsme nebyly schopni importovat, protože tento Pad již obsahoval změny. Importujte ho prosím do nového padu",
 	"pad.impexp.uploadFailed": "Nahrávání selhalo, zkuste to znovu",
 	"pad.impexp.importfailed": "Import selhal",
 	"pad.impexp.copypaste": "Vložte prosím kopii",
diff --git a/src/locales/de.json b/src/locales/de.json
index a2bca723..4888b8e8 100644
--- a/src/locales/de.json
+++ b/src/locales/de.json
@@ -36,6 +36,7 @@
 	"pad.settings.padSettings": "Pad Einstellungen",
 	"pad.settings.myView": "Eigene Ansicht",
 	"pad.settings.stickychat": "Chat immer anzeigen",
+	"pad.settings.chatandusers": "Chat und Benutzer anzeigen",
 	"pad.settings.colorcheck": "Autorenfarben anzeigen",
 	"pad.settings.linenocheck": "Zeilennummern",
 	"pad.settings.rtlcheck": "Inhalt von rechts nach links lesen?",
@@ -109,6 +110,7 @@
 	"timeslider.month.december": "Dezember",
 	"timeslider.unnamedauthors": "{{num}} {[plural(num) one: unbenannter Autor, other: unbenannte Autoren ]}",
 	"pad.savedrevs.marked": "Diese Version wurde jetzt als gespeicherte Version gekennzeichnet",
+	"pad.savedrevs.timeslider": "Du kannst gespeicherte Versionen durch das Besuchen der Pad-Versionsgeschichte ansehen",
 	"pad.userlist.entername": "Geben Sie Ihren Namen ein",
 	"pad.userlist.unnamed": "unbenannt",
 	"pad.userlist.guest": "Gast",
@@ -119,7 +121,7 @@
 	"pad.impexp.importing": "Importiere …",
 	"pad.impexp.confirmimport": "Das Importieren einer Datei überschreibt den aktuellen Text des Pads. Wollen Sie wirklich fortfahren?",
 	"pad.impexp.convertFailed": "Wir können diese Datei nicht importieren. Bitte verwenden Sie ein anderes Dokumentformat oder übertragen Sie den Text manuell.",
-	"pad.impexp.padHasData": "Wir konnten diese Datei nicht importieren, da dieses Pad bereits Änderungen hat. Bitte importiere zu einem neuen Pad.",
+	"pad.impexp.padHasData": "Wir konnten diese Datei nicht importieren, da dieses Pad bereits Änderungen enthält. Bitte importiere sie in ein neues Pad.",
 	"pad.impexp.uploadFailed": "Der Upload ist fehlgeschlagen. Bitte versuchen Sie es erneut.",
 	"pad.impexp.importfailed": "Import fehlgeschlagen",
 	"pad.impexp.copypaste": "Bitte kopieren und einfügen",
diff --git a/src/locales/el.json b/src/locales/el.json
index 740da95c..f18c71e4 100644
--- a/src/locales/el.json
+++ b/src/locales/el.json
@@ -37,6 +37,7 @@
 	"pad.settings.padSettings": "Ρυθμίσεις Pad",
 	"pad.settings.myView": "Η προβολή μου",
 	"pad.settings.stickychat": "Να είναι πάντα ορατή η συνομιλία",
+	"pad.settings.chatandusers": "Εμφάνιση Συνομιλίας και Χρηστών",
 	"pad.settings.colorcheck": "Χρώματα συντάκτη",
 	"pad.settings.linenocheck": "Αριθμοί γραμμών",
 	"pad.settings.rtlcheck": "Διαβάζεται το περιεχόμενο από δεξιά προς τα αριστερά;",
@@ -110,6 +111,7 @@
 	"timeslider.month.december": "Δεκεμβρίου",
 	"timeslider.unnamedauthors": "{{num}} {[plural(num) one: ανώνυμος συντάκτης, other: ανώνυμοι συντάκτες]}",
 	"pad.savedrevs.marked": "Αυτή η έκδοση επισημάνθηκε ως αποθηκευμένη έκδοση",
+	"pad.savedrevs.timeslider": "Μπορείτε να δείτε αποθηκευμένες αναθεωρήσεις στο χρονοδιάγραμμα",
 	"pad.userlist.entername": "Εισάγετε το όνομά σας",
 	"pad.userlist.unnamed": "ανώνυμος",
 	"pad.userlist.guest": "Επισκέπτης",
diff --git a/src/locales/en-gb.json b/src/locales/en-gb.json
new file mode 100644
index 00000000..258b4331
--- /dev/null
+++ b/src/locales/en-gb.json
@@ -0,0 +1,127 @@
+{
+	"@metadata": {
+		"authors": [
+			"Chase me ladies, I'm the Cavalry",
+			"Shirayuki"
+		]
+	},
+	"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 (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 Colours (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",
+	"pad.toolbar.settings.title": "Settings",
+	"pad.toolbar.embed.title": "Share and Embed this pad",
+	"pad.toolbar.showusers.title": "Show the users on this pad",
+	"pad.colorpicker.save": "Save",
+	"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",
+	"pad.settings.padSettings": "Pad Settings",
+	"pad.settings.myView": "My View",
+	"pad.settings.stickychat": "Chat always on screen",
+	"pad.settings.chatandusers": "Show Chat and Users",
+	"pad.settings.colorcheck": "Authorship colours",
+	"pad.settings.linenocheck": "Line numbers",
+	"pad.settings.rtlcheck": "Read content from right to left?",
+	"pad.settings.fontType": "Font type:",
+	"pad.settings.fontType.normal": "Normal",
+	"pad.settings.fontType.monospaced": "Monospace",
+	"pad.settings.globalView": "Global View",
+	"pad.settings.language": "Language:",
+	"pad.importExport.import_export": "Import/Export",
+	"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.abiword.innerHTML": "You only can import from plain text or HTML formats. For more advanced import features please <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-in-Ubuntu-or-OpenSuse-or-SLES-with-AbiWord\">install abiword</a>.",
+	"pad.modals.connected": "Connected.",
+	"pad.modals.reconnecting": "Reconnecting to your pad..",
+	"pad.modals.forcereconnect": "Force reconnect",
+	"pad.modals.userdup": "Opened in another window",
+	"pad.modals.userdup.explanation": "This pad seems to be opened in more than one browser window on this computer.",
+	"pad.modals.userdup.advice": "Reconnect to use this window instead.",
+	"pad.modals.unauth": "Not authorised",
+	"pad.modals.unauth.explanation": "Your permissions have changed while viewing this page. Try to reconnect.",
+	"pad.modals.looping.explanation": "There are communication problems with the synchronisation server.",
+	"pad.modals.looping.cause": "Perhaps you connected through an incompatible firewall or proxy.",
+	"pad.modals.initsocketfail": "Server is unreachable.",
+	"pad.modals.initsocketfail.explanation": "Couldn't connect to the synchronisation server.",
+	"pad.modals.initsocketfail.cause": "This is probably due to a problem with your browser or your internet connection.",
+	"pad.modals.slowcommit.explanation": "The server is not responding.",
+	"pad.modals.slowcommit.cause": "This could be due to problems with network connectivity.",
+	"pad.modals.badChangeset.explanation": "An edit you have made was classified illegal by the synchronisation server.",
+	"pad.modals.badChangeset.cause": "This could be due to a wrong server configuration or some other unexpected behaviour. Please contact the service administrator, if you feel this is an error. Try to reconnect in order to continue editing.",
+	"pad.modals.corruptPad.explanation": "The pad you are trying to access is corrupt.",
+	"pad.modals.corruptPad.cause": "This may be due to a wrong server configuration or some other unexpected behaviour. Please contact the service administrator.",
+	"pad.modals.deleted": "Deleted.",
+	"pad.modals.deleted.explanation": "This pad has been removed.",
+	"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",
+	"pad.share.emebdcode": "Embed URL",
+	"pad.chat": "Chat",
+	"pad.chat.title": "Open the chat for this pad.",
+	"pad.chat.loadmessages": "Load more messages",
+	"timeslider.pageTitle": "{{appTitle}} Timeslider",
+	"timeslider.toolbar.returnbutton": "Return to pad",
+	"timeslider.toolbar.authors": "Authors:",
+	"timeslider.toolbar.authorsList": "No Authors",
+	"timeslider.toolbar.exportlink.title": "Export",
+	"timeslider.exportCurrent": "Export current version as:",
+	"timeslider.version": "Version {{version}}",
+	"timeslider.saved": "Saved {{month}} {{day}}, {{year}}",
+	"timeslider.dateformat": "{{day}}/{{month}}/{{year}} {{hours}}:{{minutes}}:{{seconds}}",
+	"timeslider.month.january": "January",
+	"timeslider.month.february": "February",
+	"timeslider.month.march": "March",
+	"timeslider.month.april": "April",
+	"timeslider.month.may": "May",
+	"timeslider.month.june": "June",
+	"timeslider.month.july": "July",
+	"timeslider.month.august": "August",
+	"timeslider.month.september": "September",
+	"timeslider.month.october": "October",
+	"timeslider.month.november": "November",
+	"timeslider.month.december": "December",
+	"timeslider.unnamedauthors": "{{num}} unnamed {[plural(num) one: author, other: authors ]}",
+	"pad.savedrevs.marked": "This revision is now marked as a saved revision",
+	"pad.savedrevs.timeslider": "You can see saved revisions by visiting the timeslider",
+	"pad.userlist.entername": "Enter your name",
+	"pad.userlist.unnamed": "unnamed",
+	"pad.userlist.guest": "Guest",
+	"pad.userlist.deny": "Deny",
+	"pad.userlist.approve": "Approve",
+	"pad.editbar.clearcolors": "Clear authorship colours on entire document?",
+	"pad.impexp.importbutton": "Import Now",
+	"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",
+	"pad.impexp.exportdisabled": "Exporting as {{type}} format is disabled. Please contact your system administrator for details."
+}
diff --git a/src/locales/es.json b/src/locales/es.json
index 5547d327..21eb60a7 100644
--- a/src/locales/es.json
+++ b/src/locales/es.json
@@ -10,7 +10,8 @@
 			"VegaDark",
 			"Vivaelcelta",
 			"Xuacu",
-			"Macofe"
+			"Macofe",
+			"Fitoschido"
 		]
 	},
 	"index.newPad": "Nuevo pad",
@@ -42,6 +43,7 @@
 	"pad.settings.padSettings": "Configuración del pad",
 	"pad.settings.myView": "Preferencias personales",
 	"pad.settings.stickychat": "Chat siempre en pantalla",
+	"pad.settings.chatandusers": "Mostrar el chat y los usuarios",
 	"pad.settings.colorcheck": "Colores de autoría",
 	"pad.settings.linenocheck": "Números de línea",
 	"pad.settings.rtlcheck": "¿Leer contenido de derecha a izquierda?",
@@ -56,11 +58,11 @@
 	"pad.importExport.export": "Exporta el pad actual como:",
 	"pad.importExport.exportetherpad": "Etherpad",
 	"pad.importExport.exporthtml": "HTML",
-	"pad.importExport.exportplain": "Texto plano",
+	"pad.importExport.exportplain": "Texto sin formato",
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"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.importExport.abiword.innerHTML": "Solo es posible importar texto sin formato o en HTML. Para obtener funciones de importación más avanzadas es necesario <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\">instalar AbiWord</a>.",
 	"pad.modals.connected": "Conectado.",
 	"pad.modals.reconnecting": "Reconectando a tu pad..",
 	"pad.modals.forcereconnect": "Forzar reconexión",
@@ -115,6 +117,7 @@
 	"timeslider.month.december": "diciembre",
 	"timeslider.unnamedauthors": "{{num}} {[ plural(num) one: autor desconocido, other: autores desconocidos]}",
 	"pad.savedrevs.marked": "Revisión guardada",
+	"pad.savedrevs.timeslider": "Puedes ver revisiones guardadas visitando la línea de tiempo",
 	"pad.userlist.entername": "Escribe tu nombre",
 	"pad.userlist.unnamed": "anónimo",
 	"pad.userlist.guest": "Invitado",
diff --git a/src/locales/eu.json b/src/locales/eu.json
index f12b8d21..9cd06076 100644
--- a/src/locales/eu.json
+++ b/src/locales/eu.json
@@ -1,7 +1,8 @@
 {
 	"@metadata": {
 		"authors": [
-			"Theklan"
+			"Theklan",
+			"Subi"
 		]
 	},
 	"index.newPad": "Pad berria",
@@ -44,6 +45,7 @@
 	"pad.importExport.import": "Igo edozein testu fitxategi edo dokumentu",
 	"pad.importExport.importSuccessful": "Arrakastatsua!",
 	"pad.importExport.export": "Oraingo pad hau honela esportatu:",
+	"pad.importExport.exportetherpad": "Etherpad",
 	"pad.importExport.exporthtml": "HTML",
 	"pad.importExport.exportplain": "Testu laua",
 	"pad.importExport.exportword": "Microsoft Word",
diff --git a/src/locales/fr.json b/src/locales/fr.json
index 92fcb193..ba289e3b 100644
--- a/src/locales/fr.json
+++ b/src/locales/fr.json
@@ -50,6 +50,7 @@
 	"pad.settings.padSettings": "Paramètres du pad",
 	"pad.settings.myView": "Ma vue",
 	"pad.settings.stickychat": "Toujours afficher le chat",
+	"pad.settings.chatandusers": "Afficher la discussion et les utilisateurs",
 	"pad.settings.colorcheck": "Couleurs d’identification",
 	"pad.settings.linenocheck": "Numéros de lignes",
 	"pad.settings.rtlcheck": "Le contenu doit-il être lu de droite à gauche ?",
@@ -123,6 +124,7 @@
 	"timeslider.month.december": "décembre",
 	"timeslider.unnamedauthors": "{{num}} {[plural(num) one: auteur anonyme, other: auteurs anonymes ]}",
 	"pad.savedrevs.marked": "Cette révision est maintenant marquée comme révision enregistrée",
+	"pad.savedrevs.timeslider": "Vous pouvez voir les révisions enregistrées en visitant l’ascenseur temporel",
 	"pad.userlist.entername": "Entrez votre nom",
 	"pad.userlist.unnamed": "anonyme",
 	"pad.userlist.guest": "Invité",
diff --git a/src/locales/gl.json b/src/locales/gl.json
index b0ca6532..381296aa 100644
--- a/src/locales/gl.json
+++ b/src/locales/gl.json
@@ -27,13 +27,14 @@
 	"pad.colorpicker.save": "Gardar",
 	"pad.colorpicker.cancel": "Cancelar",
 	"pad.loading": "Cargando...",
-	"pad.noCookie": "A cookie non se puido atopar. Por favor, habilite as cookies no seu navegador!",
+	"pad.noCookie": "Non se puido atopar a cookie. Por favor, habilite as cookies no seu navegador!",
 	"pad.passwordRequired": "Cómpre un contrasinal para acceder a este documento",
 	"pad.permissionDenied": "Non ten permiso para acceder a este documento",
 	"pad.wrongPassword": "O contrasinal era incorrecto",
 	"pad.settings.padSettings": "Configuracións do documento",
 	"pad.settings.myView": "A miña vista",
 	"pad.settings.stickychat": "Chat sempre visible",
+	"pad.settings.chatandusers": "Mostrar o chat e os usuarios",
 	"pad.settings.colorcheck": "Cores de identificación",
 	"pad.settings.linenocheck": "Números de liña",
 	"pad.settings.rtlcheck": "Quere ler o contido da dereita á esquerda?",
@@ -107,6 +108,7 @@
 	"timeslider.month.december": "decembro",
 	"timeslider.unnamedauthors": "{{num}} {[plural(num) one: autor anónimo, other: autores anónimos ]}",
 	"pad.savedrevs.marked": "Esta revisión está agora marcada como revisión gardada",
+	"pad.savedrevs.timeslider": "Pode consultar as revisións gardadas visitando a liña do tempo",
 	"pad.userlist.entername": "Insira o seu nome",
 	"pad.userlist.unnamed": "anónimo",
 	"pad.userlist.guest": "Convidado",
@@ -117,7 +119,7 @@
 	"pad.impexp.importing": "Importando...",
 	"pad.impexp.confirmimport": "A importación dun ficheiro ha sobrescribir o texto actual do documento. Está seguro de querer continuar?",
 	"pad.impexp.convertFailed": "Non somos capaces de importar o ficheiro. Utilice un formato de documento diferente ou copie e pegue manualmente",
-	"pad.impexp.padHasData": "Non puidemos importar este ficheiro porque este Pad xa tivo cambios, por favor, importe a un novo pad.",
+	"pad.impexp.padHasData": "Non puidemos importar este ficheiro porque este documento xa sufriu cambios; importe a un novo documento.",
 	"pad.impexp.uploadFailed": "Houbo un erro ao cargar o ficheiro; inténteo de novo",
 	"pad.impexp.importfailed": "Fallou a importación",
 	"pad.impexp.copypaste": "Copie e pegue",
diff --git a/src/locales/he.json b/src/locales/he.json
index 573bc5f6..4222e153 100644
--- a/src/locales/he.json
+++ b/src/locales/he.json
@@ -29,12 +29,14 @@
 	"pad.colorpicker.save": "שמירה",
 	"pad.colorpicker.cancel": "ביטול",
 	"pad.loading": "טעינה...",
+	"pad.noCookie": "העוגייה לא נמצאה. נא לאפשר עוגיות בדפדפן שלך!",
 	"pad.passwordRequired": "דרושה ססמה כדי לגשת לפנקס הזה",
 	"pad.permissionDenied": "אין לך הרשאה לגשת לפנקס הזה",
 	"pad.wrongPassword": "ססמתך הייתה שגויה",
 	"pad.settings.padSettings": "הגדרות פנקס",
 	"pad.settings.myView": "התצוגה שלי",
 	"pad.settings.stickychat": "השיחה תמיד על המסך",
+	"pad.settings.chatandusers": "הצגת צ'אט ומשתמשים",
 	"pad.settings.colorcheck": "צביעה לפי מחבר",
 	"pad.settings.linenocheck": "מספרי שורות",
 	"pad.settings.rtlcheck": "לקרוא את התוכן מימין לשמאל?",
@@ -47,6 +49,7 @@
 	"pad.importExport.import": "העלאת כל קובץ טקסט או מסמך",
 	"pad.importExport.importSuccessful": "זה עבד!",
 	"pad.importExport.export": "ייצוא הפנקס הנוכחי בתור:",
+	"pad.importExport.exportetherpad": "את'רפד",
 	"pad.importExport.exporthtml": "HTML",
 	"pad.importExport.exportplain": "טקסט רגיל",
 	"pad.importExport.exportword": "מיקרוסופט וורד",
@@ -107,6 +110,7 @@
 	"timeslider.month.december": "דצמבר",
 	"timeslider.unnamedauthors": "{[plural(num) one: יוצר אחד, other: {{num}} יוצרים ]} ללא שם",
 	"pad.savedrevs.marked": "גרסה זו מסומנת כגרסה שמורה",
+	"pad.savedrevs.timeslider": "אפשר להציג גרסאות שמורות באמצעות ביקור בגולל הזמן",
 	"pad.userlist.entername": "נא להזין את שמך",
 	"pad.userlist.unnamed": "ללא שם",
 	"pad.userlist.guest": "אורח",
@@ -117,6 +121,7 @@
 	"pad.impexp.importing": "ייבוא...",
 	"pad.impexp.confirmimport": "ייבוא של קובץ יבטל את הטקסט הנוכחי בפנקס. האם ברצונך להמשיך?",
 	"pad.impexp.convertFailed": "לא הצלחנו לייבא את הקובץ הזה. נא להשתמש בתסדיר מסמך שונה או להעתיק ולהדביק ידנית",
+	"pad.impexp.padHasData": "לא הצלחנו לייבא את הקובץ הזה, כי בפנקס הזה כבר יש שינויים. נא לייבא לפנקס חדש.",
 	"pad.impexp.uploadFailed": "ההעלאה נכשלה, נא לנסות שוב",
 	"pad.impexp.importfailed": "הייבוא נכשל",
 	"pad.impexp.copypaste": "נא להעתיק ולהדביק",
diff --git a/src/locales/it.json b/src/locales/it.json
index 02ae8a9f..a6c30d96 100644
--- a/src/locales/it.json
+++ b/src/locales/it.json
@@ -5,7 +5,8 @@
 			"Gianfranco",
 			"Muxator",
 			"Vituzzu",
-			"Macofe"
+			"Macofe",
+			"Nivit"
 		]
 	},
 	"index.newPad": "Nuovo Pad",
@@ -36,6 +37,7 @@
 	"pad.settings.padSettings": "Impostazioni del Pad",
 	"pad.settings.myView": "Mia visualizzazione",
 	"pad.settings.stickychat": "Chat sempre sullo schermo",
+	"pad.settings.chatandusers": "Mostra chat e utenti",
 	"pad.settings.colorcheck": "Colori che indicano gli autori",
 	"pad.settings.linenocheck": "Numeri di riga",
 	"pad.settings.rtlcheck": "Leggere il contenuto da destra a sinistra?",
@@ -48,6 +50,7 @@
 	"pad.importExport.import": "Carica un file di testo o un documento",
 	"pad.importExport.importSuccessful": "Riuscito!",
 	"pad.importExport.export": "Esportare il Pad corrente come:",
+	"pad.importExport.exportetherpad": "Etherpad",
 	"pad.importExport.exporthtml": "HTML",
 	"pad.importExport.exportplain": "Solo testo",
 	"pad.importExport.exportword": "Microsoft Word",
diff --git a/src/locales/ksh.json b/src/locales/ksh.json
index 8443e0ec..f851bbf1 100644
--- a/src/locales/ksh.json
+++ b/src/locales/ksh.json
@@ -26,12 +26,14 @@
 	"pad.colorpicker.save": "Faßhallde",
 	"pad.colorpicker.cancel": "Ophüüre",
 	"pad.loading": "Ben aam Laade&nbsp;&hellip;",
+	"pad.noCookie": "Dat Pläzje wood nit jevonge. Don dat en Dingem Brauser zohlohße!",
 	"pad.passwordRequired": "Do bruchs e Paßwoot för heh dat Pädd.",
 	"pad.permissionDenied": "Do häs nit dat Rääsch, op heh dat Pädd zohzejriife.",
 	"pad.wrongPassword": "Ding Paßwoot wohr verkeht.",
 	"pad.settings.padSettings": "Däm Pädd sing Enschtällonge",
 	"pad.settings.myView": "Aanseesch",
 	"pad.settings.stickychat": "Donn der Klaaf emmer aanzeije",
+	"pad.settings.chatandusers": "Dunn de Metmaacher un der Klaaf aanzeije",
 	"pad.settings.colorcheck": "Färve för de Schriiver",
 	"pad.settings.linenocheck": "Nommere för de Reije",
 	"pad.settings.rtlcheck": "Schreff vun Rääschß noh Lenks?",
@@ -44,6 +46,7 @@
 	"pad.importExport.import": "Donn jeede Täx udder jeede Zoot Dokemänt huhlaade",
 	"pad.importExport.importSuccessful": "Jeschaff!",
 	"pad.importExport.export": "Don dat Pädd äxpoteere alß:",
+	"pad.importExport.exportetherpad": "Etherpad",
 	"pad.importExport.exporthtml": "HTML",
 	"pad.importExport.exportplain": "Eijfach Täx",
 	"pad.importExport.exportword": "Microsoft Word",
@@ -104,6 +107,7 @@
 	"timeslider.month.december": "Dezämber",
 	"timeslider.unnamedauthors": "{[plural(num) zero: keine, one: eine, other: {{num}} ]} nahmeloose Schriiver",
 	"pad.savedrevs.marked": "Heh di Väsjohn es jäz faßjehallde.",
+	"pad.savedrevs.timeslider": "Mer kann de faßjehallde Väsjohne belohre beim Verjangeheid afschpelle",
 	"pad.userlist.entername": "Jif Dinge Nahme en",
 	"pad.userlist.unnamed": "nahmeloßß",
 	"pad.userlist.guest": "Jaßß",
@@ -114,6 +118,7 @@
 	"pad.impexp.importing": "Ben aam Empotteere&nbsp;&hellip;",
 	"pad.impexp.confirmimport": "En Dattei ze empotteere määt der janze Täx em Pädd fott. Wells De dat verfaftesch hann?",
 	"pad.impexp.convertFailed": "Mer kunnte di Dattei nit empoteere. Nemm en ander Dattei-Fommaat udder donn dä Täx vun Hand kopeere un ennföhje.",
+	"pad.impexp.padHasData": "Mer kunnte di Dattei nit empottehre weil et Pädd alt Veränderonge metjemaht hät. Donn se en e neu Pädd empottehre.",
 	"pad.impexp.uploadFailed": "Dat Huhlaade es donävve jejange. Bes esu johd un probeer et norr_ens.",
 	"pad.impexp.importfailed": "Et Empoteere es donävve jejange.",
 	"pad.impexp.copypaste": "Bes esu johd un donn et koppeere un enfööje",
diff --git a/src/locales/mk.json b/src/locales/mk.json
index 9fc6b817..a924875a 100644
--- a/src/locales/mk.json
+++ b/src/locales/mk.json
@@ -34,6 +34,7 @@
 	"pad.settings.padSettings": "Поставки на тетратката",
 	"pad.settings.myView": "Мој поглед",
 	"pad.settings.stickychat": "Разговорите секогаш на екранот",
+	"pad.settings.chatandusers": "Прикажи разговор и корисници",
 	"pad.settings.colorcheck": "Авторски бои",
 	"pad.settings.linenocheck": "Броеви на редовите",
 	"pad.settings.rtlcheck": "Содржините да се читаат од десно на лево?",
@@ -107,6 +108,7 @@
 	"timeslider.month.december": "декември",
 	"timeslider.unnamedauthors": "{{num}} {[plural(num) one: неименуван автор, other: неименувани автори ]}",
 	"pad.savedrevs.marked": "Оваа преработка сега е означена како зачувана",
+	"pad.savedrevs.timeslider": "Можете да ги погледате зачуваните преработки посетувајќи го времеследниот лизгач",
 	"pad.userlist.entername": "Внесете го вашето име",
 	"pad.userlist.unnamed": "без име",
 	"pad.userlist.guest": "Гостин",
diff --git a/src/locales/nl.json b/src/locales/nl.json
index ed69527e..183d0fa9 100644
--- a/src/locales/nl.json
+++ b/src/locales/nl.json
@@ -28,12 +28,14 @@
 	"pad.colorpicker.save": "Opslaan",
 	"pad.colorpicker.cancel": "Annuleren",
 	"pad.loading": "Bezig met laden…",
+	"pad.noCookie": "Er kon geen cookie gevonden worden. Zorg ervoor dat uw browser cookies accepteert.",
 	"pad.passwordRequired": "U hebt een wachtwoord nodig om toegang te krijgen tot deze pad",
 	"pad.permissionDenied": "U hebt geen rechten om deze pad te bekijken",
 	"pad.wrongPassword": "U hebt een onjuist wachtwoord ingevoerd",
 	"pad.settings.padSettings": "Padinstellingen",
 	"pad.settings.myView": "Mijn overzicht",
 	"pad.settings.stickychat": "Chat altijd zichtbaar",
+	"pad.settings.chatandusers": "Chat en gebruikers weergeven",
 	"pad.settings.colorcheck": "Kleuren auteurs",
 	"pad.settings.linenocheck": "Regelnummers",
 	"pad.settings.rtlcheck": "Inhoud van rechts naar links lezen?",
@@ -46,6 +48,7 @@
 	"pad.importExport.import": "Upload een tekstbestand of document",
 	"pad.importExport.importSuccessful": "Afgerond",
 	"pad.importExport.export": "Huidige pad exporteren als",
+	"pad.importExport.exportetherpad": "Etherpad",
 	"pad.importExport.exporthtml": "HTML",
 	"pad.importExport.exportplain": "Tekst zonder opmaak",
 	"pad.importExport.exportword": "Microsoft Word",
@@ -106,6 +109,7 @@
 	"timeslider.month.december": "december",
 	"timeslider.unnamedauthors": "{{num}} onbekende {[plural(num) one: auteur, other: auteurs ]}",
 	"pad.savedrevs.marked": "Deze versie is nu gemarkeerd als opgeslagen versie",
+	"pad.savedrevs.timeslider": "U kunt opgeslagen versies bekijken via de tijdschuiver.",
 	"pad.userlist.entername": "Geef uw naam op",
 	"pad.userlist.unnamed": "zonder naam",
 	"pad.userlist.guest": "Gast",
@@ -116,6 +120,7 @@
 	"pad.impexp.importing": "Bezig met importeren…",
 	"pad.impexp.confirmimport": "Door een bestand te importeren overschrijft u de huidige tekst van de pad. Wilt u echt doorgaan?",
 	"pad.impexp.convertFailed": "Het was niet mogelijk dit bestand te importeren. Gebruik een andere documentopmaak of kopieer en plak de inhoud handmatig",
+	"pad.impexp.padHasData": "Het was niet mogelijk dit bestand te importeren omdat er al wijzigingen aan de etherpad zijn gemaakt. Importeer naar een nieuwe etherpad.",
 	"pad.impexp.uploadFailed": "Het uploaden is mislukt. Probeer het opnieuw",
 	"pad.impexp.importfailed": "Importeren is mislukt",
 	"pad.impexp.copypaste": "Gebruik kopiëren en plakken",
diff --git a/src/locales/pt-br.json b/src/locales/pt-br.json
index e8eb79ee..1fd145bc 100644
--- a/src/locales/pt-br.json
+++ b/src/locales/pt-br.json
@@ -11,7 +11,8 @@
 			"Dianakc",
 			"Macofe",
 			"Rodrigo codignoli",
-			"Webysther"
+			"Webysther",
+			"Fasouzafreitas"
 		]
 	},
 	"index.newPad": "Nova Nota",
@@ -43,6 +44,7 @@
 	"pad.settings.padSettings": "Configurações da Nota",
 	"pad.settings.myView": "Minha Visão",
 	"pad.settings.stickychat": "Conversa sempre visível",
+	"pad.settings.chatandusers": "Mostrar o chat e os usuários",
 	"pad.settings.colorcheck": "Cores de autoria",
 	"pad.settings.linenocheck": "Números de linha",
 	"pad.settings.rtlcheck": "Ler conteúdo da direita para esquerda?",
@@ -116,6 +118,7 @@
 	"timeslider.month.december": "Dezembro",
 	"timeslider.unnamedauthors": "{{num}} {[plural(num) one: autor anônimo, other: autores anônimos ]}",
 	"pad.savedrevs.marked": "Esta revisão foi marcada como salva",
+	"pad.savedrevs.timeslider": "Pode consultar as revisões salvas visitando a linha do tempo",
 	"pad.userlist.entername": "Insira o seu nome",
 	"pad.userlist.unnamed": "Sem título",
 	"pad.userlist.guest": "Convidado",
diff --git a/src/locales/ru.json b/src/locales/ru.json
index f96f2338..bd2143a1 100644
--- a/src/locales/ru.json
+++ b/src/locales/ru.json
@@ -48,6 +48,7 @@
 	"pad.importExport.import": "Загрузить любой текстовый файл или документ",
 	"pad.importExport.importSuccessful": "Успешно!",
 	"pad.importExport.export": "Экспортировать текущий документ как:",
+	"pad.importExport.exportetherpad": "Etherpad",
 	"pad.importExport.exporthtml": "HTML",
 	"pad.importExport.exportplain": "Обычный текст",
 	"pad.importExport.exportword": "Microsoft Word",
diff --git a/src/locales/sr-ec.json b/src/locales/sr-ec.json
new file mode 100644
index 00000000..9fd20b18
--- /dev/null
+++ b/src/locales/sr-ec.json
@@ -0,0 +1,59 @@
+{
+	"@metadata": {
+		"authors": [
+			"Aktron",
+			"Milicevic01",
+			"Милан Јелисавчић"
+		]
+	},
+	"index.newPad": "Нови Пад",
+	"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.undo.title": "Опозови (Ctrl+Z)",
+	"pad.toolbar.settings.title": "Подешавања",
+	"pad.colorpicker.save": "Сачувај",
+	"pad.colorpicker.cancel": "Откажи",
+	"pad.loading": "Учитавање...",
+	"pad.wrongPassword": "Ваша лозинка није исправна",
+	"pad.settings.myView": "Мој приказ",
+	"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.exporthtml": "HTML",
+	"pad.importExport.exportplain": "чист текст",
+	"pad.importExport.exportpdf": "PDF",
+	"pad.modals.connected": "Повезано.",
+	"pad.modals.slowcommit.explanation": "Сервер не одговара.",
+	"pad.modals.deleted": "Обрисано.",
+	"pad.share": "Дели овај пад",
+	"pad.share.readonly": "Само за читање",
+	"pad.share.link": "Веза",
+	"pad.chat": "Ћаскање",
+	"pad.chat.title": "Отворите ћаскање за овај пад.",
+	"pad.chat.loadmessages": "Учитајте више порука.",
+	"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.approve": "одобрено",
+	"pad.impexp.importbutton": "Увези одмах",
+	"pad.impexp.importing": "Увожење..."
+}
diff --git a/src/locales/sv.json b/src/locales/sv.json
index a53146bf..ae9b1f9a 100644
--- a/src/locales/sv.json
+++ b/src/locales/sv.json
@@ -35,6 +35,7 @@
 	"pad.settings.padSettings": "Blockinställningar",
 	"pad.settings.myView": "Min vy",
 	"pad.settings.stickychat": "Chatten alltid på skärmen",
+	"pad.settings.chatandusers": "Visa chatt och användare",
 	"pad.settings.colorcheck": "Författarskapsfärger",
 	"pad.settings.linenocheck": "Radnummer",
 	"pad.settings.rtlcheck": "Vill du läsa innehållet från höger till vänster?",
@@ -108,6 +109,7 @@
 	"timeslider.month.december": "december",
 	"timeslider.unnamedauthors": "{{num}} {[plural(num) one: namnlös författare, other: namnlösa författare]}",
 	"pad.savedrevs.marked": "Denna version är nu markerad som en sparad version",
+	"pad.savedrevs.timeslider": "Du kan se sparade versioner med tidsreglaget",
 	"pad.userlist.entername": "Ange ditt namn",
 	"pad.userlist.unnamed": "namnlös",
 	"pad.userlist.guest": "Gäst",
diff --git a/src/locales/zh-hans.json b/src/locales/zh-hans.json
index 10727c5d..4af3cb48 100644
--- a/src/locales/zh-hans.json
+++ b/src/locales/zh-hans.json
@@ -42,6 +42,7 @@
 	"pad.settings.padSettings": "记事本设置",
 	"pad.settings.myView": "我的视窗",
 	"pad.settings.stickychat": "总是显示聊天屏幕",
+	"pad.settings.chatandusers": "显示聊天和用户",
 	"pad.settings.colorcheck": "作者颜色",
 	"pad.settings.linenocheck": "行号",
 	"pad.settings.rtlcheck": "从右到左阅读内容吗？",
@@ -100,7 +101,7 @@
 	"timeslider.exportCurrent": "当前版本导出为：",
 	"timeslider.version": "版本 {{version}}",
 	"timeslider.saved": "在{{year}}年{{month}}{{day}}日保存",
-	"timeslider.dateformat": "{{year}}年{{month}}{{day}}日 {{hours}}时:{{minutes}}分:{{seconds}}秒",
+	"timeslider.dateformat": "{{year}}年{{month}}月{{day}}日 {{hours}}时:{{minutes}}分:{{seconds}}秒",
 	"timeslider.month.january": "1月",
 	"timeslider.month.february": "2月",
 	"timeslider.month.march": "三月",
@@ -115,6 +116,7 @@
 	"timeslider.month.december": "十二月",
 	"timeslider.unnamedauthors": "{{num}}个匿名作者",
 	"pad.savedrevs.marked": "这一修订现在被标记为已保存的修订版本",
+	"pad.savedrevs.timeslider": "您可以使用时间滑块查阅已保存的版本",
 	"pad.userlist.entername": "输入您的姓名",
 	"pad.userlist.unnamed": "匿名",
 	"pad.userlist.guest": "访客",

From d5bec1701e10c2d0b5f1ffa96fd5ce4e86728e88 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Sat, 21 Feb 2015 12:33:30 +0000
Subject: [PATCH 3/5] fix export of bad pads and also limit import to files

---
 src/node/utils/ExportEtherpad.js |  2 +-
 src/node/utils/ImportEtherpad.js | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/node/utils/ExportEtherpad.js b/src/node/utils/ExportEtherpad.js
index 4f91e4e3..b7d43852 100644
--- a/src/node/utils/ExportEtherpad.js
+++ b/src/node/utils/ExportEtherpad.js
@@ -48,7 +48,7 @@ exports.getPadRaw = function(padId, callback){
 
               // Get the author info
               db.get("globalAuthor:"+authorId, function(e, authorEntry){
-                authorEntry.padIDs = padId;
+                if(authorEntry && authorEntry.padIDs) authorEntry.padIDs = padId;
                 if(!e) data["globalAuthor:"+authorId] = authorEntry;
               });
 
diff --git a/src/node/utils/ImportEtherpad.js b/src/node/utils/ImportEtherpad.js
index 1574a3a9..37863bff 100644
--- a/src/node/utils/ImportEtherpad.js
+++ b/src/node/utils/ImportEtherpad.js
@@ -21,9 +21,22 @@ var db = require("../db/DB").db;
 exports.setPadRaw = function(padId, records, callback){
   records = JSON.parse(records);
 
+  // !! HACK !!
+  // If you have a really large pad it will cause a Maximum Range Stack crash
+  // This is a temporary patch for that so things are kept stable.
+  var recordCount = Object.keys(records).length;
+  if(recordCount >= 50000){
+    console.warn("Etherpad file is too large to import..  We need to fix this.  See https://github.com/ether/etherpad-lite/issues/2524");
+    return callback("tooLarge", false);
+  }
+
   async.eachSeries(Object.keys(records), function(key, cb){
     var value = records[key]
 
+    if(!value){
+      cb(); // null values are bad.
+    }
+
     // Author data
     if(value.padIDs){
       // rewrite author pad ids
@@ -34,7 +47,9 @@ exports.setPadRaw = function(padId, records, callback){
       db.get(key, function(err, author){
         if(author){
           // Yes, add the padID to the author..
-          author.padIDs.push(padId);
+          if( Object.prototype.toString.call(author) === '[object Array]'){
+            author.padIDs.push(padId);
+          }
           value = author;
         }else{
           // No, create a new array with the author info in

From 1c044588e6d9b0ee721f5c68e94c480028ce6467 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Sun, 22 Feb 2015 17:56:44 +0000
Subject: [PATCH 4/5] mobile stylings for chat always on screen

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

diff --git a/src/static/css/pad.css b/src/static/css/pad.css
index 5e4c4d14..c9ebff4a 100644
--- a/src/static/css/pad.css
+++ b/src/static/css/pad.css
@@ -1014,12 +1014,16 @@ input[type=checkbox] {
     top: 72px !important;
   }
 }
+
+/* Mobile devices */
 @media only screen and (min-device-width: 320px) and (max-device-width: 720px) {
     #users {
       top: auto;
       right:0px !important;
       bottom: 33px;
       border-radius: 0px !important;
+      height: 55px !important;
+      overflow: auto;
     }
     #mycolorpicker {
       left: -73px;
@@ -1099,7 +1103,8 @@ input[type=checkbox] {
     }
     #chatbox{
       position:absolute;
-      bottom:33px;
+      bottom:33px !important;
+      margin: 65px 0 0 0;
     }
     #gritter-notice-wrapper{
       bottom:43px !important;

From 4166f190780f196a24248ec2733e97d7c0ba76ec Mon Sep 17 00:00:00 2001
From: Luc Didry <ldidry@users.noreply.github.com>
Date: Sun, 22 Feb 2015 22:32:18 +0100
Subject: [PATCH 5/5] Set correct API version in doc

The doc says current version is 1.2.9, but there is getPadID which uses 1.2.10 API.
---
 doc/api/http_api.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/api/http_api.md b/doc/api/http_api.md
index 6cbe6e6b..84a4ec7e 100644
--- a/doc/api/http_api.md
+++ b/doc/api/http_api.md
@@ -61,7 +61,7 @@ Portal submits content into new blog post
 ## Usage
 
 ### API version
-The latest version is `1.2.9`
+The latest version is `1.2.10`
 
 The current version can be queried via /api.