Merge branch 'master' of git://github.com/ether/etherpad-lite into create_pad_special_characters

73 files changed, 763 insertions, 290 deletions

diff --git a/src/locales/af.json b/src/locales/af.json
index 9bf302e0..eb04e479 100644
--- a/src/locales/af.json
+++ b/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.",
diff --git a/src/locales/ar.json b/src/locales/ar.json
index 0fa8c02b..9d29b521 100644
--- a/src/locales/ar.json
+++ b/src/locales/ar.json
@@ -3,7 +3,9 @@
 		"authors": [
 			"Ali1",
 			"Tux-tn",
-			"Alami"
+			"Alami",
+			"Meno25",
+			"Test Create account"
 		]
 	},
 	"index.newPad": "باد جديد",
@@ -11,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": "حفظ المراجعة",
@@ -28,6 +30,7 @@
 	"pad.colorpicker.save": "تسجيل",
 	"pad.colorpicker.cancel": "إلغاء",
 	"pad.loading": "جاري التحميل...",
+	"pad.noCookie": "الكوكيز غير متاحة. الرجاء السماح بتحميل الكوكيز على متصفحك!",
 	"pad.passwordRequired": "تحتاج إلى كلمة مرور للوصول إلى هذا الباد",
 	"pad.permissionDenied": "ليس لديك إذن لدخول هذا الباد",
 	"pad.wrongPassword": "كانت كلمة المرور خاطئة",
@@ -46,12 +49,12 @@
 	"pad.importExport.import": "تحميل أي ملف نصي أو وثيقة",
 	"pad.importExport.importSuccessful": "ناجح!",
 	"pad.importExport.export": "تصدير الباد الحالي بصفة:",
+	"pad.importExport.exportetherpad": "إيثرباد",
 	"pad.importExport.exporthtml": "إتش تي إم إل",
 	"pad.importExport.exportplain": "نص عادي",
 	"pad.importExport.exportword": "مايكروسوفت وورد",
 	"pad.importExport.exportpdf": "صيغة المستندات المحمولة",
 	"pad.importExport.exportopen": "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": "إعادة الاتصال ببادك",
@@ -117,6 +120,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/ast.json b/src/locales/ast.json
index 45ee9391..8eda58c8 100644
--- a/src/locales/ast.json
+++ b/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...",
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/az.json b/src/locales/az.json
index f4504323..f5968ee4 100644
--- a/src/locales/az.json
+++ b/src/locales/az.json
@@ -3,35 +3,36 @@
 		"authors": [
 			"AZISS",
 			"Khan27",
-			"Mushviq Abdulla"
+			"Mushviq Abdulla",
+			"Wertuose"
 		]
 	},
-	"index.newPad": "Yeni Pad",
-	"index.createOpenPad": "və ya Pad-ı adı ilə yarat/aç:",
+	"index.newPad": "Yeni lövhə",
+	"index.createOpenPad": "və ya lövhəni bu adla yarat/aç:",
 	"pad.toolbar.bold.title": "Qalın (Ctrl-B)",
 	"pad.toolbar.italic.title": "Kursiv (Ctrl-I)",
 	"pad.toolbar.underline.title": "Altından xətt çəkmə (Ctrl-U)",
-	"pad.toolbar.strikethrough.title": "Pozulma",
-	"pad.toolbar.ol.title": "Qaydaya salınmış siyahı",
-	"pad.toolbar.ul.title": "Qaydaya salınmamış siyahı",
-	"pad.toolbar.indent.title": "Abzas",
-	"pad.toolbar.unindent.title": "Çıxıntı",
-	"pad.toolbar.undo.title": "Geri Al (Ctrl-Z)",
-	"pad.toolbar.redo.title": "Qaytarmaq (Ctrl-Y)",
+	"pad.toolbar.strikethrough.title": "Üstdən xətləmək (Ctrl+5)",
+	"pad.toolbar.ol.title": "Sıralanmış siyahı (Ctrl+Shift+N)",
+	"pad.toolbar.ul.title": "Sırasız siyahı (Ctrl+Shift+L)",
+	"pad.toolbar.indent.title": "Abzas (TAB)",
+	"pad.toolbar.unindent.title": "Çıxıntı (Shift+TAB)",
+	"pad.toolbar.undo.title": "Geri qaytar (Ctrl+Z)",
+	"pad.toolbar.redo.title": "Qaytar (Ctrl+Y)",
 	"pad.toolbar.clearAuthorship.title": "Müəlliflik Rənglərini Təmizlə",
 	"pad.toolbar.import_export.title": "Müxtəlif fayl formatların(a/dan) idxal/ixrac",
 	"pad.toolbar.timeslider.title": "Vaxt cədvəli",
 	"pad.toolbar.savedRevision.title": "Saxlanılan Düzəlişlər",
 	"pad.toolbar.settings.title": "Tənzimləmələr",
-	"pad.toolbar.embed.title": "Bu pad-ı yayımla",
-	"pad.toolbar.showusers.title": "Pad-da istifadəçiləri göstər",
+	"pad.toolbar.embed.title": "Bu lövhəni paylaş və qur",
+	"pad.toolbar.showusers.title": "Lövhədəki istifadəçiləri göstər",
 	"pad.colorpicker.save": "Saxla",
 	"pad.colorpicker.cancel": "İmtina",
 	"pad.loading": "Yüklənir...",
-	"pad.passwordRequired": "Bu pad-a daxil olmaq üçün parol lazımdır",
-	"pad.permissionDenied": "Bu pad-a daxil olmaq üçün icazəniz yoxdur",
+	"pad.passwordRequired": "Bu lövhəyə daxil olmaq üçün parol lazımdır",
+	"pad.permissionDenied": "Bu lövhəyə daxil olmaq üçün icazəniz yoxdur",
 	"pad.wrongPassword": "Sizin parolunuz səhvdir",
-	"pad.settings.padSettings": "Pad Tənzimləmələri",
+	"pad.settings.padSettings": "Lövhə nizamlamaları",
 	"pad.settings.myView": "Mənim Görüntüm",
 	"pad.settings.stickychat": "Söhbət həmişə ekranda",
 	"pad.settings.colorcheck": "Müəlliflik rəngləri",
@@ -45,20 +46,20 @@
 	"pad.importExport.import_export": "İdxal/İxrac",
 	"pad.importExport.import": "Hər hansı bir mətn faylı və ya sənəd yüklə",
 	"pad.importExport.importSuccessful": "Uğurlu!",
-	"pad.importExport.export": "Hazırki pad-ı ixrac etmək kimi:",
+	"pad.importExport.export": "Hazırkı lövhəni bu şəkildə ixrac et:",
+	"pad.importExport.exportetherpad": "Etherpad",
 	"pad.importExport.exporthtml": "HTML",
 	"pad.importExport.exportplain": "Adi mətn",
 	"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.exportopen": "ODF (açıq sənəd formatı)",
 	"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..",
+	"pad.modals.reconnecting": "Sizin lövhə yenidən qoşulur..",
 	"pad.modals.forcereconnect": "Məcbur təkrarən bağlan",
 	"pad.modals.userdup": "Başqa pəncərədə artıq açıqdır",
-	"pad.modals.userdup.explanation": "Sənəd, ola bilsin ki, bu kompyuterdə, brauzerin bir neçə pəncərəsində açılmışdır.",
-	"pad.modals.userdup.advice": "Bu pəncərədən istifadəylə yenidən qoşulun.",
+	"pad.modals.userdup.explanation": "Bu lövhə, ola bilsin ki, bu kompüterdəki brauzerin bir neçə pəncərəsində açılmışdır.",
+	"pad.modals.userdup.advice": "Bu pəncərəni istifadə etmək üçün yenidən qoşul.",
 	"pad.modals.unauth": "İcazəli deyil",
 	"pad.modals.unauth.explanation": "Bu səhifəyə baxdığınız vaxt sizin icazəniz  dəyişilib. Bərpa etmək üşün yenidən cəhd edin.",
 	"pad.modals.looping.explanation": "Sinxronlaşdırma serveri ilə kommunikasiya xətası var.",
@@ -70,22 +71,22 @@
 	"pad.modals.slowcommit.cause": "Bu şəbəkə bağlantısında problemlər yarana bilər.",
 	"pad.modals.badChangeset.explanation": "Etdiyiniz bir redaktə sinxronizasiya  serveri tərəfindən qeyri-leqal/qanundan kənar olaraq təsbit edildi.",
 	"pad.modals.badChangeset.cause": "Bu, yanlış server tərtibatı ya da başqa bir gözlənilməyən davranışlar nəticəsində ola bilər. Bu sizə bir xəta imiş kimi görünürsə lütfən servis nəzarətçisi ilə əlaqə yaradın. Redaktəyə davam etmək üçün yenidən qoşulmanı yoxlayın.",
-	"pad.modals.corruptPad.explanation": "Əldə etməyə çalışdığınız sənəd zədəlidir.",
+	"pad.modals.corruptPad.explanation": "Daxil olmağa çalışdığınız lövhə zədəlidir.",
 	"pad.modals.corruptPad.cause": "Bu, yanlış server tərtibatı ya da başqa bir gözlənilməyən davranışlardan əmələ gələ bilər. Lütfən servis nəzarətçisi ilə əlaqə yaradın.",
 	"pad.modals.deleted": "Silindi.",
-	"pad.modals.deleted.explanation": "Bu pad silindi.",
+	"pad.modals.deleted.explanation": "Bu lövhə silindi.",
 	"pad.modals.disconnected": "Əlaqə kəsilib.",
 	"pad.modals.disconnected.explanation": "Serverə qoşulma itirilib",
 	"pad.modals.disconnected.cause": "Server istifadə olunmur. Əgər problem təkrarlanacaqsa, bizə bildirin.",
-	"pad.share": "Bu pad-ı yayımla",
+	"pad.share": "Bu lövhəni paylaş",
 	"pad.share.readonly": "Yalnız oxuyun",
 	"pad.share.link": "Keçid",
 	"pad.share.emebdcode": "URL-ni yayımla",
 	"pad.chat": "Söhbət",
-	"pad.chat.title": "Bu pad üçün chat açın.",
+	"pad.chat.title": "Bu lövhə üçün çat açın.",
 	"pad.chat.loadmessages": "Daha çox mesaj yüklə",
 	"timeslider.pageTitle": "{{appTitle}} Vaxt cədvəli",
-	"timeslider.toolbar.returnbutton": "Pad-a qayıt",
+	"timeslider.toolbar.returnbutton": "Lövhəyə qayıt",
 	"timeslider.toolbar.authors": "Müəlliflər:",
 	"timeslider.toolbar.authorsList": "Müəllif yoxdur",
 	"timeslider.toolbar.exportlink.title": "İxrac",
@@ -105,18 +106,19 @@
 	"timeslider.month.october": "Oktyabr",
 	"timeslider.month.november": "Noyabr",
 	"timeslider.month.december": "Dekabr",
-	"timeslider.unnamedauthors": "{{num}} adsız müəlliflər",
+	"timeslider.unnamedauthors": "{{num}} adsız {[plural(num) one: müəllif, other: müəllif]}",
 	"pad.savedrevs.marked": "Bu versiya indi yaddaşa saxlanmış kimi nişanlandı",
-	"pad.userlist.entername": "Adınızı daxil et",
+	"pad.userlist.entername": "Adınızı daxil edin",
 	"pad.userlist.unnamed": "adsız",
 	"pad.userlist.guest": "Qonaq",
 	"pad.userlist.deny": "İnkar etmək",
 	"pad.userlist.approve": "Təsdiqləmək",
-	"pad.editbar.clearcolors": "Bütün sənədlərdə müəlliflik rənglərini təmizlə?",
-	"pad.impexp.importbutton": "İndi idxal edin",
+	"pad.editbar.clearcolors": "Bütün sənədlərdə müəllif rəngləri təmizlənsin?",
+	"pad.impexp.importbutton": "İndi idxal et",
 	"pad.impexp.importing": "İdxal...",
-	"pad.impexp.confirmimport": "Faylın idxalı cari mətni yeniləyəcək. Siz əminsinizmi ki, davam etmək istəyirsiniz?",
+	"pad.impexp.confirmimport": "Faylın idxalı lövhədəki cari mətni yeniləyəcək. Davam etmək istədiyinizə əminsinizmi?",
 	"pad.impexp.convertFailed": "Biz bu fayl idxal etmək mümkün deyil idi. Xahiş olunur müxtəlif sənəddən istifadə edin və ya kopyalayıb yapışdırmaq yolundan istifadə edin",
+	"pad.impexp.padHasData": "Biz bu faylı idxal edə bilmədik, çünki bu lövhədə düzəlişlər edilib, lütfən yeni lövhə idxal edin",
 	"pad.impexp.uploadFailed": "Yükləmədə səhv, xahiş olunur yenə cəhd edin",
 	"pad.impexp.importfailed": "İdxal zamanı səhv",
 	"pad.impexp.copypaste": "Xahiş edirik kopyalayıb yapışdırın",
diff --git a/src/locales/azb.json b/src/locales/azb.json
index b3b76f80..799c5b6b 100644
--- a/src/locales/azb.json
+++ b/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": "اوْنایلا"
 }
diff --git a/src/locales/bcc.json b/src/locales/bcc.json
index 10349ae5..7ae42005 100644
--- a/src/locales/bcc.json
+++ b/src/locales/bcc.json
@@ -49,7 +49,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": "در حال اتصال دوباره به دفترچه یادداشت شما..",
diff --git a/src/locales/be-tarask.json b/src/locales/be-tarask.json
index ae29c396..3c789858 100644
--- a/src/locales/be-tarask.json
+++ b/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": "Захаваць вэрсію",
@@ -28,12 +28,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": "Тэкст справа-налева",
@@ -46,12 +48,12 @@
 	"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",
 	"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": "Перападлучэньне да вашага дакумэнта...",
@@ -107,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": "Госьць",
@@ -117,6 +120,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/bgn.json b/src/locales/bgn.json
new file mode 100644
index 00000000..00efbf3f
--- /dev/null
+++ b/src/locales/bgn.json
@@ -0,0 +1,75 @@
+{
+	"@metadata": {
+		"authors": [
+			"Baloch Afghanistan"
+		]
+	},
+	"index.newPad": "یاداشتی نوکین کتابچه",
+	"index.createOpenPad": "یا جوڑ\t کورتین/پاچ کورتین یک کتابچه ئی یاداشتی بی نام:",
+	"pad.toolbar.bold.title": "پررنگ (Ctrl-B)",
+	"pad.toolbar.italic.title": "چوّٹ (Ctrl-I)",
+	"pad.toolbar.underline.title": "جهلگ خط (Ctrl-U)",
+	"pad.toolbar.strikethrough.title": "خط وارته (Ctrl+5)",
+	"pad.toolbar.ol.title": "ترتیب بوتگین لر لیست (Ctrl+Shift+N)",
+	"pad.toolbar.ul.title": "ترتیب نه بوتگین لر لیست (Ctrl+Shift+L)",
+	"pad.toolbar.indent.title": "بیئتئ بوتگین (TAB)",
+	"pad.toolbar.unindent.title": "در آتگی (Shift+TAB)",
+	"pad.toolbar.undo.title": "باطل‌کورتین (Ctrl-Z)",
+	"pad.toolbar.redo.title": "شه نوک (Ctrl-Y)",
+	"pad.toolbar.clearAuthorship.title": "نویسوکئ رنگانی پاک کورتین (Ctrl+Shift+C)",
+	"pad.toolbar.import_export.title": "بی تئ کورتین/دَر کورتین شه/بی رکم رکمین قالیبان",
+	"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.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.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.userdup": "نوکین دروازه گئ پاچ کورتین",
+	"pad.modals.unauth": "مجاز نه اینت",
+	"pad.modals.deleted.explanation": "ای یاداشتی دفترچه پاک بوته.",
+	"pad.share.readonly": "فقط وانتین",
+	"pad.share.link": "لینک",
+	"pad.chat": "چت وهبر",
+	"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": "ڈ\tسمبر",
+	"timeslider.unnamedauthors": "{{num}} بی نامین نویسوک",
+	"pad.userlist.entername": "وتئ ناما نیویشته بکنیت",
+	"pad.userlist.unnamed": "بی نام",
+	"pad.userlist.guest": "مهمان",
+	"pad.userlist.deny": "رد کورتین",
+	"pad.userlist.approve": "قبول کورتین",
+	"pad.impexp.importbutton": "انون بی تئ کن",
+	"pad.impexp.importing": "بی بی تئ کورتینی حالا...",
+	"pad.impexp.uploadFailed": "آپلود انجام نه بوت، پدا کوشش کن",
+	"pad.impexp.copypaste": "کپی پیست کَنیت"
+}
diff --git a/src/locales/bn.json b/src/locales/bn.json
index 6c3d6cfc..10a804b4 100644
--- a/src/locales/bn.json
+++ b/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": "পুনরায় সংযোগস্থাপনের চেষ্টা",
diff --git a/src/locales/br.json b/src/locales/br.json
index e22802c1..6bbd56d2 100644
--- a/src/locales/br.json
+++ b/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",
@@ -29,6 +29,7 @@
 	"pad.colorpicker.save": "Enrollañ",
 	"pad.colorpicker.cancel": "Nullañ",
 	"pad.loading": "O kargañ...",
+	"pad.noCookie": "N'eus ket gallet kavout an toupin. Aotreit an toupinoù en ho merdeer, mar plij !",
 	"pad.passwordRequired": "Ezhomm ho peus ur ger-tremen evit mont d'ar Pad-se",
 	"pad.permissionDenied": "\nN'oc'h ket aotreet da vont d'ar pad-mañ",
 	"pad.wrongPassword": "Fazius e oa ho ker-tremen",
@@ -47,12 +48,12 @@
 	"pad.importExport.import": "Enkargañ un destenn pe ur restr",
 	"pad.importExport.importSuccessful": "Deuet eo ganeoc'h !",
 	"pad.importExport.export": "Ezporzhiañ ar pad bremañ evel :",
+	"pad.importExport.exportetherpad": "Etherpad",
 	"pad.importExport.exporthtml": "HTML",
 	"pad.importExport.exportplain": "Testenn blaen",
 	"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...",
@@ -118,6 +119,7 @@
 	"pad.impexp.importing": "Oc'h enporzhiañ...",
 	"pad.impexp.confirmimport": "Ma vez enporzhiet ur restr e vo diverket ar pezh zo en teul a-vremañ. Ha sur oc'h e fell deoc'h mont betek penn ?",
 	"pad.impexp.convertFailed": "N'eus ket bet gallet enporzhiañ ar restr. Ober gant ur furmad teul all pe eilañ/pegañ gant an dorn.",
+	"pad.impexp.padHasData": "N'hon eus ket gallet enporzhiañ ar restr-mañdre ma'z eus bet degaset kemmoù er bloc'h-se ; enporzhiit anezhi war-zu ur bloc'h nevez, mar plij.",
 	"pad.impexp.uploadFailed": "C'hwitet eo bet an enporzhiañ. Klaskit en-dro.",
 	"pad.impexp.importfailed": "C'hwitet eo an enporzhiadenn",
 	"pad.impexp.copypaste": "Eilit/pegit, mar plij",
diff --git a/src/locales/ca.json b/src/locales/ca.json
index f6870db8..b7edc65b 100644
--- a/src/locales/ca.json
+++ b/src/locales/ca.json
@@ -4,7 +4,8 @@
 			"Alvaro Vidal-Abarca",
 			"Pginer",
 			"Pitort",
-			"Toniher"
+			"Toniher",
+			"Macofe"
 		]
 	},
 	"index.newPad": "Nou pad",
@@ -12,14 +13,14 @@
 	"pad.toolbar.bold.title": "Negreta (Ctrl-B)",
 	"pad.toolbar.italic.title": "Cursiva (Ctrl-I)",
 	"pad.toolbar.underline.title": "Subratllat (Ctrl-U)",
-	"pad.toolbar.strikethrough.title": "Ratllat",
-	"pad.toolbar.ol.title": "Llista ordenada",
-	"pad.toolbar.ul.title": "Llista sense ordenar",
+	"pad.toolbar.strikethrough.title": "Ratllat (Ctrl+5)",
+	"pad.toolbar.ol.title": "Llista ordenada (Ctrl+Shift+N)",
+	"pad.toolbar.ul.title": "Llista sense ordenar (Ctrl+Shift+L)",
 	"pad.toolbar.indent.title": "Sagnat (TAB)",
 	"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ó",
@@ -29,6 +30,7 @@
 	"pad.colorpicker.save": "Desa",
 	"pad.colorpicker.cancel": "Cancel·la",
 	"pad.loading": "S'està carregant...",
+	"pad.noCookie": "No s'ha trobat la galeta. Permeteu les galetes en el navegador!",
 	"pad.passwordRequired": "Us cal una contrasenya per a accedir a aquest pad",
 	"pad.permissionDenied": "No teniu permisos per a accedir a aquest pad",
 	"pad.wrongPassword": "La contrasenya és incorrecta",
@@ -47,12 +49,12 @@
 	"pad.importExport.import": "Puja qualsevol fitxer de text o document",
 	"pad.importExport.importSuccessful": "Hi ha hagut èxit!",
 	"pad.importExport.export": "Exporta el pad actual com a:",
+	"pad.importExport.exportetherpad": "Etherpad",
 	"pad.importExport.exporthtml": "HTML",
 	"pad.importExport.exportplain": "Text net",
 	"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…",
@@ -118,6 +120,7 @@
 	"pad.impexp.importing": "Important...",
 	"pad.impexp.confirmimport": "En importar un fitxer se sobreescriurà el text actual del pad. Esteu segur que voleu continuar?",
 	"pad.impexp.convertFailed": "No és possible d'importar aquest fitxer. Si us plau, podeu provar d'utilitzar un format diferent o copiar i enganxar manualment.",
+	"pad.impexp.padHasData": "No vam poder importar el fitxer perquè el pad ja tenia canvis. Importeu-lo a un nou pad",
 	"pad.impexp.uploadFailed": "Ha fallat la càrrega. Torneu-ho a provar",
 	"pad.impexp.importfailed": "Ha fallat la importació",
 	"pad.impexp.copypaste": "Si us plau, copieu i enganxeu",
diff --git a/src/locales/cs.json b/src/locales/cs.json
index 62a2302c..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?",
@@ -48,12 +50,12 @@
 	"pad.importExport.import": "Nahrát libovolný textový soubor nebo dokument",
 	"pad.importExport.importSuccessful": "Úspěšně!",
 	"pad.importExport.export": "Exportovat stávající Pad jako:",
+	"pad.importExport.exportetherpad": "Etherpad",
 	"pad.importExport.exporthtml": "HTML",
 	"pad.importExport.exportplain": "Prostý 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": "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…",
@@ -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/da.json b/src/locales/da.json
index a6a07d14..662e9afb 100644
--- a/src/locales/da.json
+++ b/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...",
diff --git a/src/locales/de.json b/src/locales/de.json
index 05a9af79..4888b8e8 100644
--- a/src/locales/de.json
+++ b/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",
@@ -29,12 +29,14 @@
 	"pad.colorpicker.save": "Speichern",
 	"pad.colorpicker.cancel": "Abbrechen",
 	"pad.loading": "Laden …",
+	"pad.noCookie": "Das Cookie konnte nicht gefunden werden. Bitte erlaube Cookies in deinem Browser!",
 	"pad.passwordRequired": "Sie benötigen ein Passwort, um auf dieses Pad zuzugreifen",
 	"pad.permissionDenied": "Sie haben keine Berechtigung, um auf dieses Pad zuzugreifen",
 	"pad.wrongPassword": "Ihr Passwort war falsch",
 	"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?",
@@ -47,12 +49,12 @@
 	"pad.importExport.import": "Text-Datei oder Dokument hochladen",
 	"pad.importExport.importSuccessful": "Erfolgreich!",
 	"pad.importExport.export": "Aktuelles Pad exportieren als:",
+	"pad.importExport.exportetherpad": "Etherpad",
 	"pad.importExport.exporthtml": "HTML",
 	"pad.importExport.exportplain": "Textdatei",
 	"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 …",
@@ -108,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",
@@ -118,6 +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 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/diq.json b/src/locales/diq.json
index a98b3c14..81a55477 100644
--- a/src/locales/diq.json
+++ b/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,12 +43,12 @@
 	"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",
 	"pad.modals.unauth": "Selahiyetdar niyo",
 	"pad.modals.initsocketfail": "Nêresneyêno ciyageyroği.",
+	"pad.modals.slowcommit.explanation": "Server cewab nêdano.",
 	"pad.modals.deleted": "Esteriya.",
 	"pad.modals.deleted.explanation": "Ena ped wedariye",
 	"pad.share": "Na ped vıla ke",
@@ -80,7 +80,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",
diff --git a/src/locales/dsb.json b/src/locales/dsb.json
index a24536d4..0600be90 100644
--- a/src/locales/dsb.json
+++ b/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...",
diff --git a/src/locales/el.json b/src/locales/el.json
index 0c334c1c..f18c71e4 100644
--- a/src/locales/el.json
+++ b/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": "Αποθήκευση Αναθεώρησης",
@@ -30,12 +30,14 @@
 	"pad.colorpicker.save": "Αποθήκευση",
 	"pad.colorpicker.cancel": "Άκυρο",
 	"pad.loading": "Φόρτωση...",
+	"pad.noCookie": "Το cookie δεν βρέθηκε. Παρακαλώ επιτρέψτε τα cookies στον περιηγητή σας!",
 	"pad.passwordRequired": "Χρειάζεστε κωδικό πρόσβασης για πρόσβαση σε αυτό το pad",
 	"pad.permissionDenied": "Δεν έχετε δικαίωμα πρόσβασης σε αυτό το pad",
 	"pad.wrongPassword": "Ο κωδικός σας ήταν λανθασμένος",
 	"pad.settings.padSettings": "Ρυθμίσεις Pad",
 	"pad.settings.myView": "Η προβολή μου",
 	"pad.settings.stickychat": "Να είναι πάντα ορατή η συνομιλία",
+	"pad.settings.chatandusers": "Εμφάνιση Συνομιλίας και Χρηστών",
 	"pad.settings.colorcheck": "Χρώματα συντάκτη",
 	"pad.settings.linenocheck": "Αριθμοί γραμμών",
 	"pad.settings.rtlcheck": "Διαβάζεται το περιεχόμενο από δεξιά προς τα αριστερά;",
@@ -48,19 +50,19 @@
 	"pad.importExport.import": "Αποστολή οποιουδήποτε αρχείου κειμένου ή εγγράφου",
 	"pad.importExport.importSuccessful": "Επιτυχής!",
 	"pad.importExport.export": "Εξαγωγή τρέχοντος pad ως:",
+	"pad.importExport.exportetherpad": "Etherpad",
 	"pad.importExport.exporthtml": "HTML",
 	"pad.importExport.exportplain": "Απλό κείμενο",
 	"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 +78,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",
@@ -109,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": "Επισκέπτης",
@@ -119,6 +122,7 @@
 	"pad.impexp.importing": "Εισάγεται...",
 	"pad.impexp.confirmimport": "Η εισαγωγή ενός αρχείου θα αντικαταστήσει το κείμενο του pad. Είστε βέβαιοι ότι θέλετε να συνεχίσετε;",
 	"pad.impexp.convertFailed": "Δεν καταφέραμε να εισάγουμε αυτό το αρχείο. Παρακαλώ χρησιμοποιήστε διαφορετικό τύπο αρχείου ή αντιγράψτε και επικολλήστε χειροκίνητα",
+	"pad.impexp.padHasData": "Δεν μπορέσαμε να εισάγουμε το αρχείο επειδή το Pad είχε ήδη αλλαγές. Παρακαλούμε εισαγάγετε το αρχείο σε νέο pad",
 	"pad.impexp.uploadFailed": "Η αποστολή απέτυχε, παρακαλώ προσπαθήστε ξανά",
 	"pad.impexp.importfailed": "Η εισαγωγή απέτυχε",
 	"pad.impexp.copypaste": "Παρακαλώ αντιγράψτε και επικολλήστε",
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/en.json b/src/locales/en.json
index d9b98389..3e16c5de 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -12,7 +12,7 @@
   "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.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",
@@ -31,12 +32,30 @@
   "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 colors",
   "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.opendyslexic": "Open Dyslexic",
   "pad.settings.fontType.monospaced": "Monospace",
+  "pad.settings.fontType.comicsans": "Comic Sans",
+  "pad.settings.fontType.couriernew": "Courier New",
+  "pad.settings.fontType.georgia": "Georgia",
+  "pad.settings.fontType.impact": "Impact",
+  "pad.settings.fontType.lucida": "Lucida",
+  "pad.settings.fontType.lucidasans": "Lucida Sans",
+  "pad.settings.fontType.palatino": "Palatino",
+  "pad.settings.fontType.tahoma": "Tahoma",
+  "pad.settings.fontType.timesnewroman": "Times New Roman",
+  "pad.settings.fontType.trebuchet": "Trebuchet",
+  "pad.settings.fontType.verdana": "Verdana",
+  "pad.settings.fontType.symbol": "Symbol",
+  "pad.settings.fontType.webdings": "Webdings",
+  "pad.settings.fontType.wingdings": "Wingdings",
+  "pad.settings.fontType.sansserif": "Sans Serif",
+  "pad.settings.fontType.serif": "Serif",
   "pad.settings.globalView": "Global View",
   "pad.settings.language": "Language:",
 
@@ -44,12 +63,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.",
@@ -103,6 +122,10 @@
   "timeslider.version": "Version {{version}}",
   "timeslider.saved": "Saved {{month}} {{day}}, {{year}}",
 
+  "timeslider.playPause": "Playback / Pause Pad Contents",
+  "timeslider.backRevision":"Go back a revision in this Pad",
+  "timeslider.forwardRevision":"Go forward a revision in this Pad",
+
   "timeslider.dateformat": "{{month}}/{{day}}/{{year}} {{hours}}:{{minutes}}:{{seconds}}",
   "timeslider.month.january": "January",
   "timeslider.month.february": "February",
@@ -119,6 +142,7 @@
 
   "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",
@@ -130,6 +154,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",
diff --git a/src/locales/es.json b/src/locales/es.json
index 62e255ea..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",
@@ -25,7 +26,7 @@
 	"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 autoría",
+	"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",
@@ -35,12 +36,14 @@
 	"pad.colorpicker.save": "Guardar",
 	"pad.colorpicker.cancel": "Cancelar",
 	"pad.loading": "Cargando...",
+	"pad.noCookie": "La cookie no se pudo encontrar. ¡Por favor, habilita las cookies en tu navegador!",
 	"pad.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.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?",
@@ -53,13 +56,13 @@
 	"pad.importExport.import": "Subir cualquier texto o documento",
 	"pad.importExport.importSuccessful": "¡Éxito!",
 	"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.exportdokuwiki": "DokuWiki",
-	"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",
@@ -100,20 +103,21 @@
 	"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.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",
@@ -124,6 +128,7 @@
 	"pad.impexp.importing": "Importando...",
 	"pad.impexp.confirmimport": "Al importar un archivo se borrará el contenido actual del pad. ¿Estás seguro de que quieres continuar?",
 	"pad.impexp.convertFailed": "No pudimos importar este archivo. Inténtalo con un formato diferente o copia y pega manualmente.",
+	"pad.impexp.padHasData": "No hemos podido importar este archivo porque esta almohadilla ya ha tenido cambios, por favor, importa a una nueva almohadilla",
 	"pad.impexp.uploadFailed": "El envío falló. Intentalo de nuevo.",
 	"pad.impexp.importfailed": "Fallo al importar",
 	"pad.impexp.copypaste": "Intenta copiar y pegar",
diff --git a/src/locales/et.json b/src/locales/et.json
index 29cd92b9..3ea8b3e6 100644
--- a/src/locales/et.json
+++ b/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...",
diff --git a/src/locales/eu.json b/src/locales/eu.json
index 5aa3ec4e..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,12 +45,12 @@
 	"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",
 	"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...",
diff --git a/src/locales/fa.json b/src/locales/fa.json
index 3b421972..53fb55b2 100644
--- a/src/locales/fa.json
+++ b/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": "ذخیره‌سازی نسخه",
@@ -31,6 +31,7 @@
 	"pad.colorpicker.save": "ذخیره",
 	"pad.colorpicker.cancel": "لغو",
 	"pad.loading": "در حال بارگذاری...",
+	"pad.noCookie": "کوکی یافت نشد. لطفاً اجازهٔ اجرای کوکی در مروگرتان را بدهید!",
 	"pad.passwordRequired": "برای دسترسی به این دفترچه یادداشت نیاز به یک گذرواژه دارید",
 	"pad.permissionDenied": "شما اجازه‌ی دسترسی به این دفترچه یادداشت را ندارید",
 	"pad.wrongPassword": "گذرواژه‌ی شما درست نیست",
@@ -49,12 +50,12 @@
 	"pad.importExport.import": "بارگذاری پرونده‌ی متنی یا سند",
 	"pad.importExport.importSuccessful": "موفقیت آمیز بود!",
 	"pad.importExport.export": "برون‌ریزی این دفترچه یادداشت با قالب:",
+	"pad.importExport.exportetherpad": "اترپد",
 	"pad.importExport.exporthtml": "HTML",
 	"pad.importExport.exportplain": "متن ساده",
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (قالب سند باز)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"pad.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": "در حال اتصال دوباره به دفترچه یادداشت شما..",
@@ -120,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/fi.json b/src/locales/fi.json
index 656f0a21..25e4d084 100644
--- a/src/locales/fi.json
+++ b/src/locales/fi.json
@@ -9,7 +9,9 @@
 			"Stryn",
 			"Tomi Toivio",
 			"Veikk0.ma",
-			"VezonThunder"
+			"VezonThunder",
+			"Macofe",
+			"MrTapsa"
 		]
 	},
 	"index.newPad": "Uusi muistio",
@@ -17,14 +19,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",
@@ -34,6 +36,7 @@
 	"pad.colorpicker.save": "Tallenna",
 	"pad.colorpicker.cancel": "Peru",
 	"pad.loading": "Ladataan…",
+	"pad.noCookie": "Evästettä ei löytynyt. Ole hyvä, ja salli evästeet selaimessasi!",
 	"pad.passwordRequired": "Tämä muistio on suojattu salasanalla.",
 	"pad.permissionDenied": "Käyttöoikeutesi eivät riitä tämän muistion käyttämiseen.",
 	"pad.wrongPassword": "Väärä salasana",
@@ -57,7 +60,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...",
diff --git a/src/locales/fo.json b/src/locales/fo.json
index cd72dec7..43e9d9f1 100644
--- a/src/locales/fo.json
+++ b/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..",
diff --git a/src/locales/fr.json b/src/locales/fr.json
index b6b1a720..ba289e3b 100644
--- a/src/locales/fr.json
+++ b/src/locales/fr.json
@@ -17,7 +17,8 @@
 			"Stephane Cottin",
 			"Tux-tn",
 			"Maxim21",
-			"Boniface"
+			"Boniface",
+			"Macofe"
 		]
 	},
 	"index.newPad": "Nouveau pad",
@@ -32,7 +33,7 @@
 	"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",
@@ -42,12 +43,14 @@
 	"pad.colorpicker.save": "Enregistrer",
 	"pad.colorpicker.cancel": "Annuler",
 	"pad.loading": "Chargement…",
+	"pad.noCookie": "Le cookie n’a pas pu être trouvé. Veuillez autoriser les cookies dans votre navigateur !",
 	"pad.passwordRequired": "Vous avez besoin d'un mot de passe pour accéder à ce pad",
 	"pad.permissionDenied": "Il ne vous est pas permis d’accéder à ce pad",
 	"pad.wrongPassword": "Votre mot de passe est incorrect",
 	"pad.settings.padSettings": "Paramètres du pad",
 	"pad.settings.myView": "Ma vue",
 	"pad.settings.stickychat": "Toujours afficher le chat",
+	"pad.settings.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 ?",
@@ -60,12 +63,12 @@
 	"pad.importExport.import": "Charger un texte ou un document",
 	"pad.importExport.importSuccessful": "Réussi !",
 	"pad.importExport.export": "Exporter le pad actuel comme :",
+	"pad.importExport.exportetherpad": "Etherpad",
 	"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...",
@@ -121,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é",
@@ -131,6 +135,7 @@
 	"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.convertFailed": "Nous ne pouvons pas importer ce fichier. Veuillez utiliser un autre format de document ou faire un copier/coller manuel",
+	"pad.impexp.padHasData": "Nous n’avons pas pu importer ce fichier parce que ce bloc a déjà eu des modifications ; veuillez importer vers un nouveau bloc",
 	"pad.impexp.uploadFailed": "Le téléchargement a échoué, veuillez réessayer",
 	"pad.impexp.importfailed": "Échec de l'importation",
 	"pad.impexp.copypaste": "Veuillez copier/coller",
diff --git a/src/locales/gl.json b/src/locales/gl.json
index 93855a8b..381296aa 100644
--- a/src/locales/gl.json
+++ b/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",
@@ -26,12 +27,14 @@
 	"pad.colorpicker.save": "Gardar",
 	"pad.colorpicker.cancel": "Cancelar",
 	"pad.loading": "Cargando...",
+	"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?",
@@ -44,12 +47,12 @@
 	"pad.importExport.import": "Cargar un ficheiro de texto ou documento",
 	"pad.importExport.importSuccessful": "Correcto!",
 	"pad.importExport.export": "Exportar o documento actual en formato:",
+	"pad.importExport.exportetherpad": "Etherpad",
 	"pad.importExport.exporthtml": "HTML",
 	"pad.importExport.exportplain": "Texto simple",
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"pad.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...",
@@ -105,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",
@@ -115,6 +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 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 7d7f2b78..4222e153 100644
--- a/src/locales/he.json
+++ b/src/locales/he.json
@@ -19,7 +19,7 @@
 	"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": "שמירת גרסה",
@@ -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,12 +49,12 @@
 	"pad.importExport.import": "העלאת כל קובץ טקסט או מסמך",
 	"pad.importExport.importSuccessful": "זה עבד!",
 	"pad.importExport.export": "ייצוא הפנקס הנוכחי בתור:",
+	"pad.importExport.exportetherpad": "את'רפד",
 	"pad.importExport.exporthtml": "HTML",
 	"pad.importExport.exportplain": "טקסט רגיל",
 	"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": "מתבצע חיבור מחדש...",
@@ -108,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": "אורח",
@@ -118,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/hrx.json b/src/locales/hrx.json
index 808a1297..74630efa 100644
--- a/src/locales/hrx.json
+++ b/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 …",
diff --git a/src/locales/hsb.json b/src/locales/hsb.json
index c86f6078..ddf3cc4a 100644
--- a/src/locales/hsb.json
+++ b/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...",
diff --git a/src/locales/hu.json b/src/locales/hu.json
index 2cbf5749..287e7954 100644
--- a/src/locales/hu.json
+++ b/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",
@@ -30,6 +30,7 @@
 	"pad.colorpicker.save": "Mentés",
 	"pad.colorpicker.cancel": "Mégsem",
 	"pad.loading": "Betöltés…",
+	"pad.noCookie": "Nem található a süti. Engedélyezd a böngésződben a sütik használatát!",
 	"pad.passwordRequired": "Jelszóra van szükséged ezen notesz eléréséhez",
 	"pad.permissionDenied": "Nincs engedélyed ezen notesz eléréséhez",
 	"pad.wrongPassword": "A jelszó rossz volt",
@@ -48,12 +49,12 @@
 	"pad.importExport.import": "Tetszőleges szövegfájl vagy dokumentum feltöltése",
 	"pad.importExport.importSuccessful": "Siker!",
 	"pad.importExport.export": "Jelenlegi notesz exportálása így:",
+	"pad.importExport.exportetherpad": "Etherpad",
 	"pad.importExport.exporthtml": "HTML",
 	"pad.importExport.exportplain": "Sima szöveg",
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document 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...",
@@ -119,6 +120,7 @@
 	"pad.impexp.importing": "Importálás…",
 	"pad.impexp.confirmimport": "Egy fájl importálása felülírja a jelenlegi szöveget a noteszben. Biztos hogy folytatod?",
 	"pad.impexp.convertFailed": "Nem tudtuk importálni ezt a fájlt. Kérjük, használj másik dokumentum formátumot, vagy kézzel másold és illeszd be a tartalmat",
+	"pad.impexp.padHasData": "Nem tudjuk importálni ezt a fájlt, mert ez a Pad már megváltozott, kérjük, importálj egy új padra",
 	"pad.impexp.uploadFailed": "A feltöltés sikertelen, próbáld meg újra",
 	"pad.impexp.importfailed": "Az importálás nem sikerült",
 	"pad.impexp.copypaste": "Kérjük másold be",
diff --git a/src/locales/ia.json b/src/locales/ia.json
index 971f2919..e7f5cc2b 100644
--- a/src/locales/ia.json
+++ b/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",
@@ -26,6 +26,7 @@
 	"pad.colorpicker.save": "Salveguardar",
 	"pad.colorpicker.cancel": "Cancellar",
 	"pad.loading": "Cargamento…",
+	"pad.noCookie": "Le cookie non pote esser trovate. Per favor permitte le cookies in tu navigator!",
 	"pad.passwordRequired": "Un contrasigno es necessari pro acceder a iste pad",
 	"pad.permissionDenied": "Tu non ha le permission de acceder a iste pad",
 	"pad.wrongPassword": "Le contrasigno es incorrecte",
@@ -44,12 +45,12 @@
 	"pad.importExport.import": "Incargar qualcunque file de texto o documento",
 	"pad.importExport.importSuccessful": "Succedite!",
 	"pad.importExport.export": "Exportar le pad actual como:",
+	"pad.importExport.exportetherpad": "Etherpad",
 	"pad.importExport.exporthtml": "HTML",
 	"pad.importExport.exportplain": "Texto simple",
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"pad.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…",
@@ -115,6 +116,7 @@
 	"pad.impexp.importing": "Importation in curso…",
 	"pad.impexp.confirmimport": "Le importation de un file superscribera le texto actual del pad. Es tu secur de voler continuar?",
 	"pad.impexp.convertFailed": "Nos non ha potite importar iste file. Per favor usa un altere formato de documento o copia e colla le texto manualmente.",
+	"pad.impexp.padHasData": "Nos non ha potite importar iste file perque iste Pad ha jam habite cambiamentos. Per favor importa lo a un nove pad.",
 	"pad.impexp.uploadFailed": "Le incargamento ha fallite. Per favor reproba.",
 	"pad.impexp.importfailed": "Importation fallite",
 	"pad.impexp.copypaste": "Per favor copia e colla",
diff --git a/src/locales/it.json b/src/locales/it.json
index 8292c4f2..a6c30d96 100644
--- a/src/locales/it.json
+++ b/src/locales/it.json
@@ -4,7 +4,9 @@
 			"Beta16",
 			"Gianfranco",
 			"Muxator",
-			"Vituzzu"
+			"Vituzzu",
+			"Macofe",
+			"Nivit"
 		]
 	},
 	"index.newPad": "Nuovo Pad",
@@ -12,14 +14,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",
@@ -35,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?",
@@ -47,12 +50,12 @@
 	"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",
 	"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...",
diff --git a/src/locales/ja.json b/src/locales/ja.json
index 011c935a..62e6dc62 100644
--- a/src/locales/ja.json
+++ b/src/locales/ja.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": "パッドに再接続中...",
diff --git a/src/locales/km.json b/src/locales/km.json
index a90c0e97..4dea037a 100644
--- a/src/locales/km.json
+++ b/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": "បង្ខំ​ឲ្យ​ភ្ជាប់​ឡើង​វិញ",
diff --git a/src/locales/ko.json b/src/locales/ko.json
index 1fed980f..e18c5bbd 100644
--- a/src/locales/ko.json
+++ b/src/locales/ko.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": "패드에 다시 연결 중..",
diff --git a/src/locales/ksh.json b/src/locales/ksh.json
index 1de3c450..f851bbf1 100644
--- a/src/locales/ksh.json
+++ b/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",
@@ -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,12 +46,12 @@
 	"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",
 	"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;",
@@ -105,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ßß",
@@ -115,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/lb.json b/src/locales/lb.json
index 7f936906..68bdb418 100644
--- a/src/locales/lb.json
+++ b/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",
@@ -15,6 +15,7 @@
 	"pad.colorpicker.save": "Späicheren",
 	"pad.colorpicker.cancel": "Ofbriechen",
 	"pad.loading": "Lueden...",
+	"pad.noCookie": "Cookie gouf net fonnt. Erlaabt w.e.g. Cookien an Ärem Browser!",
 	"pad.wrongPassword": "Äert Passwuert ass falsch",
 	"pad.settings.fontType.normal": "Normal",
 	"pad.settings.language": "Sprooch:",
diff --git a/src/locales/lrc.json b/src/locales/lrc.json
index 322b6f23..910f8f1e 100644
--- a/src/locales/lrc.json
+++ b/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": "د نیمدری هنی واز بیه",
diff --git a/src/locales/lt.json b/src/locales/lt.json
index 503b6589..7b4e1481 100644
--- a/src/locales/lt.json
+++ b/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.",
diff --git a/src/locales/lv.json b/src/locales/lv.json
index e57c4259..ee402d33 100644
--- a/src/locales/lv.json
+++ b/src/locales/lv.json
@@ -9,14 +9,14 @@
 	"pad.toolbar.bold.title": "Treknrakstā (CTRL + B)",
 	"pad.toolbar.italic.title": "Slīpraksta (Ctrl-es)",
 	"pad.toolbar.underline.title": "Pasvītrojuma (CTRL + U)",
-	"pad.toolbar.strikethrough.title": "Pārsvītrojums",
-	"pad.toolbar.ol.title": "Sakārtots saraksts",
-	"pad.toolbar.ul.title": "Nesakārtots saraksts",
-	"pad.toolbar.indent.title": "Atkāpe",
-	"pad.toolbar.unindent.title": "Izkāpe",
+	"pad.toolbar.strikethrough.title": "Pārsvītrojums (Ctrl+5)",
+	"pad.toolbar.ol.title": "Sakārtots saraksts (Ctrl+Shift+N)",
+	"pad.toolbar.ul.title": "Nesakārtots saraksts (Ctrl+Shift+L)",
+	"pad.toolbar.indent.title": "Atkāpe (TAB)",
+	"pad.toolbar.unindent.title": "Izkāpe (Shift+TAB)",
 	"pad.toolbar.undo.title": "Atsaukt (CTRL + Z)",
 	"pad.toolbar.redo.title": "Atcelt atsaukšanu (CTRL + Y)",
-	"pad.toolbar.clearAuthorship.title": "Notīrit autoru krāsas",
+	"pad.toolbar.clearAuthorship.title": "Notīrit autoru krāsas (Ctrl+Shift+C)",
 	"pad.toolbar.import_export.title": "Importēšanas/eksportēšanas no un uz citu failu formātiem",
 	"pad.toolbar.savedRevision.title": "Saglabāt pārskatīšanu",
 	"pad.toolbar.settings.title": "Iestatījumi",
@@ -46,7 +46,7 @@
 	"pad.importExport.exportword": "Programma Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open dokumenta formāts)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
+	"pad.modals.connected": "Pievienojies.",
 	"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.",
@@ -56,7 +56,7 @@
 	"pad.modals.deleted": "Dzēsts",
 	"pad.modals.disconnected": "Jūs esat atvienots.",
 	"pad.modals.disconnected.explanation": "Tika zaudēts savienojums ar serveri",
-	"pad.modals.disconnected.cause": "Iespējams, ka serveris nav pieejams. Lūgums paziņot mums, ja tas turpina notikt.",
+	"pad.modals.disconnected.cause": "Iespējams, ka serveris nav pieejams. Lūgums paziņot pakalpojuma administratoram, ja tas turpina notikt.",
 	"pad.share": "Koplietot šo pad",
 	"pad.share.readonly": "Tikai lasāms",
 	"pad.share.link": "Saite",
diff --git a/src/locales/map-bms.json b/src/locales/map-bms.json
index 883b1d8f..1b87bac8 100644
--- a/src/locales/map-bms.json
+++ b/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...",
diff --git a/src/locales/mk.json b/src/locales/mk.json
index 8aaf9917..a924875a 100644
--- a/src/locales/mk.json
+++ b/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": "Зачувај преработка",
@@ -27,12 +27,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": "Содржините да се читаат од десно на лево?",
@@ -45,12 +47,12 @@
 	"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",
 	"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": "Ве преповрзувам со тетратката...",
@@ -106,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": "Гостин",
@@ -116,6 +119,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/ml.json b/src/locales/ml.json
index ff7a38f3..680df0c2 100644
--- a/src/locales/ml.json
+++ b/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": "താങ്കളുടെ പാഡിലേയ്ക്ക് വീണ്ടും ബന്ധിപ്പിക്കുന്നു...",
diff --git a/src/locales/mr.json b/src/locales/mr.json
index 31de89aa..536b578c 100644
--- a/src/locales/mr.json
+++ b/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": "वगळले.",
diff --git a/src/locales/ms.json b/src/locales/ms.json
index 033de1bc..d099de06 100644
--- a/src/locales/ms.json
+++ b/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",
@@ -26,6 +26,7 @@
 	"pad.colorpicker.save": "Simpan",
 	"pad.colorpicker.cancel": "Batalkan",
 	"pad.loading": "Sedang dimuatkan...",
+	"pad.noCookie": "Cookie tidak dapat dijumpai. Tolong benarkan cookie dalam pelayar anda!",
 	"pad.passwordRequired": "Anda memerlukan kata laluan untuk mengakses pad ini",
 	"pad.permissionDenied": "Anda tiada kebenaran untuk mengakses pad ini",
 	"pad.wrongPassword": "Kata laluan anda salah",
@@ -44,12 +45,12 @@
 	"pad.importExport.import": "Muat naik sebarang fail teks atau dokumen",
 	"pad.importExport.importSuccessful": "Berjaya!",
 	"pad.importExport.export": "Eksport pad semasa sebagai:",
+	"pad.importExport.exportetherpad": "Etherpad",
 	"pad.importExport.exporthtml": "HTML",
 	"pad.importExport.exportplain": "Teks biasa",
 	"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...",
@@ -115,6 +116,7 @@
 	"pad.impexp.importing": "Sedang mengimport...",
 	"pad.impexp.confirmimport": "Mengimport fail akan menulis ganti teks semasa pada pad ini. Adakah anda benar-benar ingin teruskan?",
 	"pad.impexp.convertFailed": "Fail tidak dapat diimport. Sila gunakan format dokumen yang lain atau salin tampal secara manual",
+	"pad.impexp.padHasData": "Kami tidak dapat mengimport fail ini kerana Pad ini sudah mengalami perubahan. Sila import ke pad yang baru",
 	"pad.impexp.uploadFailed": "Muat naik gagal, sila cuba lagi",
 	"pad.impexp.importfailed": "Import gagal",
 	"pad.impexp.copypaste": "Sila salin tampal",
diff --git a/src/locales/nap.json b/src/locales/nap.json
index 6ba696fc..6cd1651b 100644
--- a/src/locales/nap.json
+++ b/src/locales/nap.json
@@ -1,7 +1,8 @@
 {
 	"@metadata": {
 		"authors": [
-			"Chelin"
+			"Chelin",
+			"C.R."
 		]
 	},
 	"index.newPad": "Novo Pad",
@@ -9,36 +10,70 @@
 	"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",
-	"pad.toolbar.ol.title": "Ennece nummerato",
-	"pad.toolbar.ul.title": "Ennece puntato",
+	"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",
+	"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.toolbar.embed.title": "Sparte e nzerta stu Pad",
+	"pad.toolbar.showusers.title": "Mmusta ll'utente ncopp'a stu Pad",
 	"pad.colorpicker.save": "Sarva",
 	"pad.colorpicker.cancel": "Canciella",
 	"pad.loading": "Carecamiento 'n curso…",
+	"pad.noCookie": "Cookie nun truvata. Pe' piacere premmettete 'e cookies dint' 'o navigatóre vuosto!",
 	"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.myView": "Mia Veruta",
+	"pad.settings.stickychat": "Chat sempe ncopp' 'o schermo",
+	"pad.settings.colorcheck": "Auturevolezza pe' culure",
+	"pad.settings.linenocheck": "Nummere 'e riga",
+	"pad.settings.rtlcheck": "Lieggere 'e cuntenute 'a destra a smerza?",
+	"pad.settings.fontType": "Tipo 'e funte:",
 	"pad.settings.fontType.normal": "Nurmale",
+	"pad.settings.fontType.monospaced": "Monospace",
+	"pad.settings.globalView": "Visualizzazione globbale",
+	"pad.settings.language": "Llengua:",
+	"pad.importExport.import_export": "Mpurtaziune/sportaziune",
+	"pad.importExport.import": "Carreca coccherunto testo o documento",
+	"pad.importExport.importSuccessful": "Ngarrata!",
+	"pad.importExport.export": "Sportà stu Pad comme:",
+	"pad.importExport.exportetherpad": "Etherpad",
 	"pad.importExport.exporthtml": "HTML",
+	"pad.importExport.exportplain": "Testo nurmale",
+	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
+	"pad.importExport.abiword.innerHTML": "Putite surtanto mpurtà testo chiano o furmatte HTML. Pe n'avé sisteme cchiù annanze 'e mpurtazione pe' piacere <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\">installate Abiword</a>.",
 	"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.userdup.explanation": "Stu Pad pare fosse araputo dint'a cchiù 'e na fenesta 'e navigatore dint'a stu computer.",
+	"pad.modals.userdup.advice": "Riconnettateve pe' putè ausà mmece sta fenesta.",
 	"pad.modals.unauth": "Nun autorizzato",
+	"pad.modals.unauth.explanation": "'E premmesse vuoste so' cagnate pe' tramente ca se vereva sta paggena. Tentate 'e ve riconnettà.",
+	"pad.modals.looping.explanation": "Ce stanno probbleme 'e comunicazione c' 'o server 'e sincronizzaziona.",
+	"pad.modals.looping.cause": "Può darse ca ve site cullegato pe' mmiez' 'e nu firewall incompatibbele o proxy.",
+	"pad.modals.initsocketfail": "Nun se può arrevà 'o server.",
+	"pad.modals.initsocketfail.explanation": "Nun se può cunnettà 'o server e sincronizzaziona.",
+	"pad.modals.initsocketfail.cause": "Stu fatto è succiesso, probabbilmente pe' bbìa 'e nu probblema c' 'o navigatóre 'o ll'internet.",
+	"pad.modals.slowcommit.explanation": "'O server nun risponne.",
+	"pad.modals.slowcommit.cause": "Stu fatto può darse ca è causato pe' bbìa 'e prubbleme 'e connettività 'e rezza.",
+	"pad.modals.badChangeset.explanation": "Nu cagnamento ca stavate facenno è stato classeficato comme illegale p' 'o server 'e sincronizzaziona.",
+	"pad.modals.badChangeset.cause": "Chistu fatto può darse ca è causato pe' bbìa 'e na mpustazione errata d' 'o server o cocch'atu comportamento nun preveduto. Pe' piacere cuntattate l'ammenistratore d' 'o servizio, si se pienza ca chist'è n'errore. Tentate a ve riconnettà pe' cuntinuà 'a edità.",
+	"pad.modals.corruptPad.explanation": "'O pad addò vulevate trasì è scassato.",
 	"pad.modals.deleted": "Canciellato.",
+	"pad.share.link": "Jonta",
+	"pad.chat": "Chiàcchiera",
 	"timeslider.pageTitle": "Cronologgia {{appTitle}}",
 	"timeslider.toolbar.returnbutton": "Ritorna ô Pad",
 	"timeslider.toolbar.authors": "Auture:",
diff --git a/src/locales/nb.json b/src/locales/nb.json
index 0620d2b4..a1b3a5ca 100644
--- a/src/locales/nb.json
+++ b/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...",
diff --git a/src/locales/nds.json b/src/locales/nds.json
index 451a0211..dfb92278 100644
--- a/src/locales/nds.json
+++ b/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 ...",
diff --git a/src/locales/ne.json b/src/locales/ne.json
index 37194884..b380526e 100644
--- a/src/locales/ne.json
+++ b/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": "जडानको लागि जोडगर्ने",
diff --git a/src/locales/nl.json b/src/locales/nl.json
index 5a9d9fba..183d0fa9 100644
--- a/src/locales/nl.json
+++ b/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",
@@ -26,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?",
@@ -44,12 +48,12 @@
 	"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",
 	"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...",
@@ -105,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",
@@ -115,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/nn.json b/src/locales/nn.json
index 104a17dc..dc6368ed 100644
--- a/src/locales/nn.json
+++ b/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 …",
diff --git a/src/locales/oc.json b/src/locales/oc.json
index 5921f4ff..e62d387a 100644
--- a/src/locales/oc.json
+++ b/src/locales/oc.json
@@ -9,14 +9,14 @@
 	"pad.toolbar.bold.title": "Gras (Ctrl-B)",
 	"pad.toolbar.italic.title": "Italica (Ctrl-I)",
 	"pad.toolbar.underline.title": "Soslinhat (Ctrl-U)",
-	"pad.toolbar.strikethrough.title": "Raiat",
-	"pad.toolbar.ol.title": "Lista ordenada",
-	"pad.toolbar.ul.title": "Lista amb de piuses",
+	"pad.toolbar.strikethrough.title": "Raiat (Ctrl+5)",
+	"pad.toolbar.ol.title": "Lista ordenada (Ctrl+Shift+N)",
+	"pad.toolbar.ul.title": "Lista pas ordenada (Ctrl+Shift+L)",
 	"pad.toolbar.indent.title": "Indentar (TAB)",
 	"pad.toolbar.unindent.title": "Desindentar (Maj+TAB)",
 	"pad.toolbar.undo.title": "Anullar (Ctrl-Z)",
 	"pad.toolbar.redo.title": "Restablir (Ctrl-Y)",
-	"pad.toolbar.clearAuthorship.title": "Escafar las colors qu'identifican los autors",
+	"pad.toolbar.clearAuthorship.title": "Escafar las colors qu'identifican los autors (Ctrl+Shift+C)",
 	"pad.toolbar.import_export.title": "Importar/Exportar de/cap a un format de fichièr diferent",
 	"pad.toolbar.timeslider.title": "Istoric dinamic",
 	"pad.toolbar.savedRevision.title": "Enregistrar la revision",
@@ -26,6 +26,7 @@
 	"pad.colorpicker.save": "Enregistrar",
 	"pad.colorpicker.cancel": "Anullar",
 	"pad.loading": "Cargament...",
+	"pad.noCookie": "Lo cookie a pas pogut èsser trobat. Autorizatz los cookies dins vòstre navigador !",
 	"pad.passwordRequired": "Avètz besonh d'un senhal per accedir a aqueste Pad",
 	"pad.permissionDenied": "Vos es pas permés d’accedir a aqueste Pad.",
 	"pad.wrongPassword": "Senhal incorrècte",
@@ -44,12 +45,12 @@
 	"pad.importExport.import": "Cargar un tèxte o un document",
 	"pad.importExport.importSuccessful": "Capitat !",
 	"pad.importExport.export": "Exportar lo Pad actual coma :",
+	"pad.importExport.exportetherpad": "Etherpad",
 	"pad.importExport.exporthtml": "HTML",
 	"pad.importExport.exportplain": "Tèxte 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": "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...",
@@ -115,6 +116,7 @@
 	"pad.impexp.importing": "Impòrt en cors...",
 	"pad.impexp.confirmimport": "Importar un fichièr espotirà lo tèxte actual del blòt. Sètz segur que lo volètz far ?",
 	"pad.impexp.convertFailed": "Podèm pas importar aqueste fichièr. Utilizatz un autre format de document o fasètz un copiar/pegar manual",
+	"pad.impexp.padHasData": "Avèm pas pogut importar aqueste fichièr perque aqueste blòt a ja agut de modificacions ; importatz cap a un blòt novèl",
 	"pad.impexp.uploadFailed": "Lo telecargament a fracassat, reensajatz",
 	"pad.impexp.importfailed": "Fracàs de l'importacion",
 	"pad.impexp.copypaste": "Copiatz/pegatz",
diff --git a/src/locales/os.json b/src/locales/os.json
index 109dada7..941fe2b8 100644
--- a/src/locales/os.json
+++ b/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": "Дӕ документмӕ ногӕй иугонд цӕуы..",
diff --git a/src/locales/pa.json b/src/locales/pa.json
index 55ce5e6c..9e154e36 100644
--- a/src/locales/pa.json
+++ b/src/locales/pa.json
@@ -50,7 +50,6 @@
 	"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": "..ਤੁਹਾਡੇ ਪੈਡ ਨਾਲ ਮੁੜ-ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ",
diff --git a/src/locales/pl.json b/src/locales/pl.json
index 9e7be2fb..bcd7a0ef 100644
--- a/src/locales/pl.json
+++ b/src/locales/pl.json
@@ -4,7 +4,9 @@
 			"Rezonansowy",
 			"Ty221",
 			"WTM",
-			"Woytecr"
+			"Woytecr",
+			"Macofe",
+			"Pan Cube"
 		]
 	},
 	"index.newPad": "Nowy dokument",
@@ -19,7 +21,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ę",
@@ -47,12 +49,12 @@
 	"pad.importExport.import": "Prześlij dowolny plik tekstowy lub dokument",
 	"pad.importExport.importSuccessful": "Sukces!",
 	"pad.importExport.export": "Eksportuj bieżący dokument jako:",
+	"pad.importExport.exportetherpad": "Etherpad",
 	"pad.importExport.exporthtml": "HTML",
 	"pad.importExport.exportplain": "Zwykły tekst",
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"pad.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...",
diff --git a/src/locales/ps.json b/src/locales/ps.json
index 76004412..1a57e76a 100644
--- a/src/locales/ps.json
+++ b/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": "دا کېدای شي د جال د اړيکتيايي ستونزو په سبب وي.",
diff --git a/src/locales/pt-br.json b/src/locales/pt-br.json
index 333d59fb..1fd145bc 100644
--- a/src/locales/pt-br.json
+++ b/src/locales/pt-br.json
@@ -8,7 +8,11 @@
 			"Titoncio",
 			"Tuliouel",
 			"Rafaelff",
-			"Dianakc"
+			"Dianakc",
+			"Macofe",
+			"Rodrigo codignoli",
+			"Webysther",
+			"Fasouzafreitas"
 		]
 	},
 	"index.newPad": "Nova Nota",
@@ -16,14 +20,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",
@@ -33,12 +37,14 @@
 	"pad.colorpicker.save": "Salvar",
 	"pad.colorpicker.cancel": "Cancelar",
 	"pad.loading": "Carregando...",
+	"pad.noCookie": "Cookie não foi encontrado. Por favor, habilite cookies no seu navegador!",
 	"pad.passwordRequired": "Você precisa de uma senha para acessar esta Nota",
 	"pad.permissionDenied": "Você não tem permissão para acessar esta Nota",
 	"pad.wrongPassword": "Senha incorreta",
 	"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?",
@@ -51,12 +57,12 @@
 	"pad.importExport.import": "Enviar um arquivo texto ou documento",
 	"pad.importExport.importSuccessful": "Completo!",
 	"pad.importExport.export": "Exportar a presente nota como:",
+	"pad.importExport.exportetherpad": "Etherpad",
 	"pad.importExport.exporthtml": "HTML",
 	"pad.importExport.exportplain": "Texto puro",
 	"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...",
@@ -112,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",
@@ -122,6 +129,7 @@
 	"pad.impexp.importing": "Importando...",
 	"pad.impexp.confirmimport": "Importar um arquivo sobrescreverá o atual texto da nota. Tem certeza de que deseja prosseguir?",
 	"pad.impexp.convertFailed": "Não foi possível importar este arquivo. Use outro formato ou copie e cole manualmente",
+	"pad.impexp.padHasData": "Não foi possível importar este arquivo porque este bloco de notas já tinha alterações, consulte como importar para um novo bloco de notas",
 	"pad.impexp.uploadFailed": "O envio falhou. Tente outra vez",
 	"pad.impexp.importfailed": "A importação falhou",
 	"pad.impexp.copypaste": "Copie e cole",
diff --git a/src/locales/pt.json b/src/locales/pt.json
index 69a4dca1..473980fd 100644
--- a/src/locales/pt.json
+++ b/src/locales/pt.json
@@ -6,7 +6,8 @@
 			"Tuliouel",
 			"Waldir",
 			"Imperadeiro98",
-			"Macofe"
+			"Macofe",
+			"Ti4goc"
 		]
 	},
 	"index.newPad": "Nova Nota",
@@ -21,7 +22,7 @@
 	"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",
@@ -54,7 +55,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",
@@ -106,6 +106,7 @@
 	"pad.impexp.importbutton": "Importar agora",
 	"pad.impexp.importing": "Importando...",
 	"pad.impexp.confirmimport": "A importação de um ficheiro irá substituir o texto atual do pad. Tem certeza que deseja continuar?",
+	"pad.impexp.padHasData": "Não fomos capazes de importar este ficheiro porque esta Almofada já tinha alterações, consulte importar para um novo bloco",
 	"pad.impexp.uploadFailed": "O upload falhou. Por favor, tente novamente",
 	"pad.impexp.importfailed": "A importação falhou",
 	"pad.impexp.copypaste": "Por favor, copie e cole"
diff --git a/src/locales/ru.json b/src/locales/ru.json
index cd030bad..bd2143a1 100644
--- a/src/locales/ru.json
+++ b/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": "Сохранить версию",
@@ -48,12 +48,12 @@
 	"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",
 	"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": "Повторное подключение к вашему документу",
diff --git a/src/locales/sco.json b/src/locales/sco.json
index efcb187a..f7b01824 100644
--- a/src/locales/sco.json
+++ b/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..",
diff --git a/src/locales/sk.json b/src/locales/sk.json
index 8f376926..02c5c978 100644
--- a/src/locales/sk.json
+++ b/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...",
diff --git a/src/locales/sl.json b/src/locales/sl.json
index 8e57cffa..41a6ce76 100644
--- a/src/locales/sl.json
+++ b/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 ...",
diff --git a/src/locales/sq.json b/src/locales/sq.json
index 54e76067..6374ea62 100644
--- a/src/locales/sq.json
+++ b/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",
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 623def9a..ae9b1f9a 100644
--- a/src/locales/sv.json
+++ b/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",
@@ -28,12 +28,14 @@
 	"pad.colorpicker.save": "Spara",
 	"pad.colorpicker.cancel": "Avbryt",
 	"pad.loading": "Läser in...",
+	"pad.noCookie": "Kunde inte hitta några kakor. Var god tillåt kakor i din webbläsare!",
 	"pad.passwordRequired": "Du behöver ett lösenord för att få tillgång till detta block",
 	"pad.permissionDenied": "Du har inte åtkomstbehörighet för detta block",
 	"pad.wrongPassword": "Ditt lösenord var fel",
 	"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?",
@@ -46,13 +48,13 @@
 	"pad.importExport.import": "Ladda upp textfiler eller dokument",
 	"pad.importExport.importSuccessful": "Åtgärden slutfördes!",
 	"pad.importExport.export": "Export aktuellt block som:",
+	"pad.importExport.exportetherpad": "Etherpad",
 	"pad.importExport.exporthtml": "HTML",
 	"pad.importExport.exportplain": "Oformaterad text",
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
-	"pad.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 +62,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 +71,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 +86,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",
@@ -107,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",
@@ -117,6 +120,7 @@
 	"pad.impexp.importing": "Importerar...",
 	"pad.impexp.confirmimport": "Att importera en fil kommer att skriva över den aktuella texten i blocket. Är du säker på att du vill fortsätta?",
 	"pad.impexp.convertFailed": "Vi kunde inte importera denna fil. Var god använd ett annat dokumentformat eller kopiera och klistra in den manuellt",
+	"pad.impexp.padHasData": "Vi kunde inte importera denna fil eftersom detta block redan har redigerats. Importera den till ett nytt block.",
 	"pad.impexp.uploadFailed": "Uppladdningen misslyckades, var god försök igen",
 	"pad.impexp.importfailed": "Importering misslyckades",
 	"pad.impexp.copypaste": "Var god kopiera och klistra in",
diff --git a/src/locales/te.json b/src/locales/te.json
index 41341d1e..19878206 100644
--- a/src/locales/te.json
+++ b/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": "బలవంతంగానైనా సంబంధం కుదిరించు",
diff --git a/src/locales/tr.json b/src/locales/tr.json
index a83c7313..b0b6dbee 100644
--- a/src/locales/tr.json
+++ b/src/locales/tr.json
@@ -20,7 +20,7 @@
 	"pad.toolbar.unindent.title": "Girintiyi azalt (Shift+TAB)",
 	"pad.toolbar.undo.title": "Geri Al (Ctrl-Z)",
 	"pad.toolbar.redo.title": "Yinele (Ctrl+Y)",
-	"pad.toolbar.clearAuthorship.title": "Yazarlık Renklerini Temizle",
+	"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",
@@ -30,6 +30,7 @@
 	"pad.colorpicker.save": "Kaydet",
 	"pad.colorpicker.cancel": "İptal",
 	"pad.loading": "Yükleniyor...",
+	"pad.noCookie": "Çerez bulunamadı. Lütfen tarayıcınızda çerezlere izin veriniz!",
 	"pad.passwordRequired": "Bu bloknota erişebilmeniz için parolaya ihtiyacınız var",
 	"pad.permissionDenied": "Bu bloknota erişmeye izniniz yok",
 	"pad.wrongPassword": "Parolanız yanlış",
@@ -48,12 +49,12 @@
 	"pad.importExport.import": "Herhangi bir metin dosyası ya da belgesi yükle",
 	"pad.importExport.importSuccessful": "Başarılı!",
 	"pad.importExport.export": "Mevcut bloknotu şu olarak dışa aktar:",
+	"pad.importExport.exportetherpad": "Etherpad",
 	"pad.importExport.exporthtml": "HTML",
 	"pad.importExport.exportplain": "Düz metin",
 	"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...",
diff --git a/src/locales/uk.json b/src/locales/uk.json
index 41686c5e..79a39a33 100644
--- a/src/locales/uk.json
+++ b/src/locales/uk.json
@@ -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": "Перепідлючення до Вашого документу..",
diff --git a/src/locales/vi.json b/src/locales/vi.json
index 608e9645..da0baf50 100644
--- a/src/locales/vi.json
+++ b/src/locales/vi.json
@@ -3,7 +3,8 @@
 		"authors": [
 			"Baonguyen21022003",
 			"Minh Nguyen",
-			"Tuankiet65"
+			"Tuankiet65",
+			"Max20091"
 		]
 	},
 	"index.newPad": "Tạo một Pad mới",
@@ -11,9 +12,9 @@
 	"pad.toolbar.bold.title": "In đậm (Ctrl-B)",
 	"pad.toolbar.italic.title": "In nghiêng (Ctrl-I)",
 	"pad.toolbar.underline.title": "Gạch chân (Ctrl-U)",
-	"pad.toolbar.strikethrough.title": "Gạch ngang",
-	"pad.toolbar.ol.title": "Danh sách Có Đánh số",
-	"pad.toolbar.ul.title": "Danh sách Không Đánh số",
+	"pad.toolbar.strikethrough.title": "Gạch ngang (Ctrl+5)",
+	"pad.toolbar.ol.title": "Danh sách Có Đánh số (Ctrl+Shift+N)",
+	"pad.toolbar.ul.title": "Danh sách Không Đánh số (Ctrl+Shift+L)",
 	"pad.toolbar.indent.title": "Tăng lề (TAB)",
 	"pad.toolbar.unindent.title": "Giảm lề (Shift+TAB)",
 	"pad.toolbar.undo.title": "Hoàn tác (Ctrl-Z)",
@@ -51,7 +52,6 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF",
-	"pad.importExport.exportdokuwiki": "DokuWiki",
 	"pad.importExport.abiword.innerHTML": "Bạn chỉ có thể nhập vào từ văn bản thuần túy hay định dạng HTML. Nếu muốn có nhiều chức năng nhập hơn xin hãy <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\">cài đặt abiword</a>.",
 	"pad.modals.connected": "Đã kết nối lại.",
 	"pad.modals.reconnecting": "Kết nối lại tới pad của bạn",
diff --git a/src/locales/zh-hans.json b/src/locales/zh-hans.json
index 61aa99fc..4af3cb48 100644
--- a/src/locales/zh-hans.json
+++ b/src/locales/zh-hans.json
@@ -24,8 +24,8 @@
 	"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.redo.title": "重做（Ctrl+Y）",
+	"pad.toolbar.clearAuthorship.title": "清除作者颜色（Ctrl+Shift+C）",
 	"pad.toolbar.import_export.title": "从不同的文件格式导入/导出",
 	"pad.toolbar.timeslider.title": "时间轴",
 	"pad.toolbar.savedRevision.title": "保存修订",
@@ -35,12 +35,14 @@
 	"pad.colorpicker.save": "保存",
 	"pad.colorpicker.cancel": "取消",
 	"pad.loading": "载入中……",
+	"pad.noCookie": "无法找到Cookie。请在您的浏览器中允许Cookie！",
 	"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": "从右到左阅读内容吗？",
@@ -53,12 +55,12 @@
 	"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",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF（开放文档格式）",
-	"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": "重新连接到您的记事本...",
@@ -99,9 +101,9 @@
 	"timeslider.exportCurrent": "当前版本导出为：",
 	"timeslider.version": "版本 {{version}}",
 	"timeslider.saved": "在{{year}}年{{month}}{{day}}日保存",
-	"timeslider.dateformat": "{{year}}年{{month}}{{day}}日 {{hours}}时:{{minutes}}分:{{seconds}}秒",
-	"timeslider.month.january": "一月",
-	"timeslider.month.february": "二月",
+	"timeslider.dateformat": "{{year}}年{{month}}月{{day}}日 {{hours}}时:{{minutes}}分:{{seconds}}秒",
+	"timeslider.month.january": "1月",
+	"timeslider.month.february": "2月",
 	"timeslider.month.march": "三月",
 	"timeslider.month.april": "四月",
 	"timeslider.month.may": "五月",
@@ -114,6 +116,7 @@
 	"timeslider.month.december": "十二月",
 	"timeslider.unnamedauthors": "{{num}}个匿名作者",
 	"pad.savedrevs.marked": "这一修订现在被标记为已保存的修订版本",
+	"pad.savedrevs.timeslider": "您可以使用时间滑块查阅已保存的版本",
 	"pad.userlist.entername": "输入您的姓名",
 	"pad.userlist.unnamed": "匿名",
 	"pad.userlist.guest": "访客",
@@ -124,6 +127,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/zh-hant.json b/src/locales/zh-hant.json
index 0707648a..a692d0ca 100644
--- a/src/locales/zh-hant.json
+++ b/src/locales/zh-hant.json
@@ -14,9 +14,9 @@
 	"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）",
@@ -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": "您只可以純文字或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...",
@@ -73,7 +72,7 @@
 	"pad.modals.slowcommit.cause": "這可能是因為網路連線問題所造成。",
 	"pad.modals.badChangeset.explanation": "您的一個編輯被同步伺服器類為非法。",
 	"pad.modals.badChangeset.cause": "這可能由於伺服器的配置錯誤或遇到意外問題。若您認為這是錯誤，請聯繫伺服器管理員。如要繼續編輯，請嘗試重新連接。",
-	"pad.modals.corruptPad.explanation": "您試圖訪問的平板已損壞。",
+	"pad.modals.corruptPad.explanation": "您試圖存取的平板已損壞。",
 	"pad.modals.corruptPad.cause": "這可能由於伺服器的配置錯誤或遇到意外問題。請聯繫伺服器管理員。",
 	"pad.modals.deleted": "已刪除。",
 	"pad.modals.deleted.explanation": "此pad已被移除。",
@@ -94,16 +93,16 @@
 	"timeslider.toolbar.exportlink.title": "匯出",
 	"timeslider.exportCurrent": "匯出當前版本為：",
 	"timeslider.version": "版本{{version}}",
-	"timeslider.saved": "{{year}}年{{month}}月{{day}}日儲存",
+	"timeslider.saved": "{{year}}年{{month}}{{day}}日儲存",
 	"timeslider.dateformat": "{{year}}年{{month}}月{{day}}日 {{hours}}:{{minutes}}:{{seconds}}",
 	"timeslider.month.january": "1月",
-	"timeslider.month.february": "2月",
+	"timeslider.month.february": "二月",
 	"timeslider.month.march": "3月",
 	"timeslider.month.april": "4月",
 	"timeslider.month.may": "5月",
 	"timeslider.month.june": "6月",
 	"timeslider.month.july": "7月",
-	"timeslider.month.august": "8月",
+	"timeslider.month.august": "八月",
 	"timeslider.month.september": "9月",
 	"timeslider.month.october": "10月",
 	"timeslider.month.november": "11月",