resolve merge

CHANGELOG.md

@@ -1,3 +1,31 @@
+# 1.4
+ * NEW: Disable toolbar items through settings.json
+ * NEW: Internal stats/metrics engine
+ * NEW: Copy/Move Pad API functions
+ * NEW: getAttributeOnSelection method
+ * NEW: CSS function when an attribute is active on caret location
+ * NEW: Various new eejs blocks
+ * NEW: Ace afterEditHook
+ * NEW: Import hook to introduce alternative export methods
+ * NEW: preProcessDomLine allows Domline attributes to be processed before native attributes
+ * Fix: Allow for lighter author colors
+ * Fix: Improved randomness of session tokens
+ * Fix: Don't panic if an author2session/group2session no longer exists
+ * Fix: Gracefully fallback to related languages if chosen language is unavailable
+ * Fix: Various changeset/stability bugs
+ * Fix: Re-enable import buttons after failed import
+ * Fix: Allow browser tabs to be cycled when in editor
+ * Fix: Better Protocol detection
+ * Fix: padList API Fix
+ * Fix: Caret walking issue
+ * Fix: Better settings.json parsing
+ * Fix: Improved import/export handling
+ * Other: Various whitespace/code clean-up
+ * Other: .deb packaging creator
+ * Other: More API Documentation
+ * Other: Lots more translations
+ * Other: Support Node 0.11
+
 # 1.3
  * NEW: We now follow the semantic versioning scheme!
  * NEW: Option to disable IP logging

CONTRIBUTING.md

@@ -31,6 +31,7 @@ Also, keep it maintainable. We don't wanna end up as the monster Etherpad was!
 * Do generalize sooner or later! (if an old solution, quickly hacked together, poses more problems than it solves today, refactor it!)
 * Keep it compatible. Do not introduce changes to the public API, db schema or configurations too lightly. Don't make incompatible changes without good reasons!
 * If you do make changes, document them! (see below)
+* Use protocol independent urls "//"
 
 ## Branching model / git workflow
 see git flow http://nvie.com/posts/a-successful-git-branching-model/

README.md

@@ -22,7 +22,7 @@ Also, check out the **[FAQ](https://github.com/ether/etherpad-lite/wiki/FAQ)**,
 
 # Installation
 
-Etherpad works with node v0.8 and v0.10, only. (We don't support v0.6)
+Etherpad works with node v0.8, v0.10 and v0.11, only. (We don't support v0.6)
 
 ## Windows
 

doc/api/api.md

@@ -5,4 +5,6 @@
 @include hooks_server-side
 @include editorInfo
 @include changeset_library
-@include pluginfw
+@include pluginfw
+@include toolbar
+@include editbar

doc/api/editbar.md

@@ -0,0 +1,28 @@
+# Editbar
+srf/static/js/pad_editbar.js
+
+## isEnabled()
+
+## disable()
+
+## toggleDropDown(dropdown, callback)
+Shows the dropdown `div.popup` whose `id` equals `dropdown`.
+
+## registerCommand(cmd, callback)
+Register a handler for a specific command. Commands are fired if the corresponding button is clicked or the corresponding select is changed.
+
+## registerAceCommand(cmd, callback)
+Creates an ace callstack and calls the callback with an ace instance: `callback(cmd, ace)`.
+
+Example:
+```
+toolbar.registerAceCommand("insertorderedlist", function (cmd, ace) {
+  ace.ace_doInsertOrderedList();
+});
+```
+
+## registerDropdownCommand(cmd, dropdown)
+Ties a `div.popup` where `id` equals `dropdown` to a `command` fired by clicking a button.
+
+## triggerCommand(cmd[, item])
+Triggers a command (optionally with some internal representation of the toolbar item that triggered it).

doc/api/hooks_client-side.md

@@ -10,6 +10,22 @@ nothing
 
 This hook proxies the functionality of jQuery's `$(document).ready` event.
 
+## aceDomLinePreProcessLineAttributes
+Called from: src/static/js/domline.js
+
+Things in context:
+
+1. domline - The current DOM line being processed
+2. cls - The class of the current block element (useful for styling)
+
+This hook is called for elements in the DOM that have the "lineMarkerAttribute" set. You can add elements into this category with the aceRegisterBlockElements hook above.  This hook is run BEFORE the numbered and ordered lists logic is applied.
+
+The return value of this hook should have the following structure:
+
+`{ preHtml: String, postHtml: String, processedMarker: Boolean }`
+
+The preHtml and postHtml values will be added to the HTML display of the element, and if processedMarker is true, the engine won't try to process it any more.
+
 ## aceDomLineProcessLineAttributes
 Called from: src/static/js/domline.js
 
@@ -18,7 +34,7 @@ Things in context:
 1. domline - The current DOM line being processed
 2. cls - The class of the current block element (useful for styling)
 
-This hook is called for elements in the DOM that have the "lineMarkerAttribute" set. You can add elements into this category with the aceRegisterBlockElements hook above.
+This hook is called for elements in the DOM that have the "lineMarkerAttribute" set. You can add elements into this category with the aceRegisterBlockElements hook above.  This hook is run AFTER the ordered and numbered lists logic is applied.
 
 The return value of this hook should have the following structure:
 

doc/api/hooks_server-side.md

@@ -63,7 +63,46 @@ Things in context:
 
 This hook gets called upon the rendering of an ejs template block. For any specific kind of block, you can change how that block gets rendered by modifying the content object passed in.
 
-Have a look at `src/templates/pad.html` and `src/templates/timeslider.html` to see which blocks are available.
+Available blocks in `pad.html` are:
+
+ * `htmlHead` - after `<html>` and immediately before the title tag
+ * `styles` - the style `<link>`s
+ * `body` - the contents of the body tag
+ * `editbarMenuLeft` - the left tool bar (consider using the toolbar controller instead of manually adding html here)
+ * `editbarMenuRight` - right tool bar
+ * `afterEditbar` - allows you to add stuff immediately after the toolbar
+ * `userlist` - the contents of the userlist dropdown
+ * `loading` - the intial loading message
+ * `mySettings` - the left column of the settings dropdown ("My view"); intended for adding checkboxes only
+ * `mySettings.dropdowns` - add your dropdown settings here
+ * `globalSettings` - the right column of the settings dropdown ("Global view")
+ * `importColumn` - import form
+ * `exportColumn` - export form
+ * `modals` - Contains all connectivity messages
+ * `embedPopup` - the embed dropdown
+ * `scripts` - Add your script tags here, if you really have to (consider use client-side hooks instead)
+ 
+`timeslider.html` blocks:
+
+ * `timesliderStyles`
+ * `timesliderScripts`
+ * `timesliderBody`
+ * `timesliderTop`
+ * `timesliderEditbarRight`
+ * `modals`
+ 
+ `index.html` blocks:
+ 
+ * `indexWrapper` - contains the form for creating new pads
+
+## padInitToolbar
+Called from: src/node/hooks/express/specialpages.js
+
+Things in context:
+
+1. toolbar - the toolbar controller that will render the toolbar eventually
+
+Here you can add custom toolbar items that will be available in the toolbar config in `settings.json`. For more about the toolbar controller see the API section.
 
 ## padCreate
 Called from: src/node/db/Pad.js

doc/api/http_api.md

@@ -61,7 +61,7 @@ Portal submits content into new blog post
 ## Usage
 
 ### API version
-The latest version is `1.2.8`
+The latest version is `1.2.9`
 
 The current version can be queried via /api.
 

doc/api/toolbar.md

@@ -0,0 +1,46 @@
+# Toolbar controller
+src/node/utils/toolbar.js
+
+## button(opts)
+ * {Object} `opts`
+   * `command` - this command fill be fired on the editbar on click
+   * `localizationId` - will be set as `data-l10-id`
+   * `class` - here you can add additional classes to the button
+
+Returns: {Button}
+
+Example:
+```
+var orderedlist = toolbar.button({
+  command: "insertorderedlist",
+  localizationId: "pad.toolbar.ol.title",
+  class: "buttonicon buttonicon-insertorderedlist"
+})
+```
+
+You can also create buttons with text:
+
+```
+var myButton = toolbar.button({
+  command: "myButton",
+  localizationId: "myPlugin.toolbar.myButton",
+  class: "buttontext"
+})
+```
+
+## selectButton(opts)
+ * {Object} `opts`
+   * `id` - id of the menu item
+   * `selectId` - id of the select element
+   * `command` - this command fill be fired on the editbar on change
+
+Returns: {SelectButton}
+
+## SelectButton.addOption(value, text, attributes)
+ * {String} value - The value of this option
+ * {String} text - the label text used for this option
+ * {Object} attributes - any additional html attributes go here (e.g. `data-l10n-id`)
+   
+## registerButton(name, item)
+  * {String} name - used to reference the item in the toolbar config in settings.json
+  * {Button|SelectButton} item - the button to add

doc/assets/style.css

@@ -1,3 +1,7 @@
+html {
+  border-top: solid green 5pt;
+}
+
 body.apidoc {
   width: 60%;
   min-width: 10cm;
@@ -5,8 +9,7 @@ body.apidoc {
 }
 
 #header {
-  background-color: #5a5;
+  padding: 1pc 0;
-  padding: 10px;
   color: #111;
 }
 

settings.json.template

@@ -103,6 +103,25 @@
   // restrict socket.io transport methods
   "socketTransportProtocols" : ["xhr-polling", "jsonp-polling", "htmlfile"],
   
+  /* The toolbar buttons configuration.
+  "toolbar": {
+    "left": [
+      ["bold", "italic", "underline", "strikethrough"],
+      ["orderedlist", "unorderedlist", "indent", "outdent"],
+      ["undo", "redo"],
+      ["clearauthorship"]
+    ],
+    "right": [
+      ["importexport", "timeslider", "savedrevision"],
+      ["settings", "embed"],
+      ["showusers"]
+    ],
+    "timeslider": [
+      ["timeslider_export", "timeslider_returnToPad"]
+    ]
+  },
+  */
+
   /* The log level we are using, can be: DEBUG, INFO, WARN, ERROR */
   "loglevel": "INFO",
   

src/locales/af.json

@@ -62,4 +62,4 @@
     "pad.impexp.importbutton": "Voer nou in",
     "pad.impexp.importing": "Besig met invoer...",
     "pad.impexp.importfailed": "Invoer het gefaal"
-}
+}

src/locales/ar.json

@@ -102,4 +102,4 @@
     "pad.impexp.uploadFailed": "فشل التحميل، الرجاء المحاولة مرة أخرى",
     "pad.impexp.importfailed": "فشل الاستيراد",
     "pad.impexp.copypaste": "الرجاء نسخ/لصق"
-}
+}

src/locales/ast.json

@@ -12,8 +12,8 @@
     "pad.toolbar.strikethrough.title": "Tacháu",
     "pad.toolbar.ol.title": "Llista ordenada",
     "pad.toolbar.ul.title": "Llista ensin ordenar",
-    "pad.toolbar.indent.title": "Sangría",
+    "pad.toolbar.indent.title": "Sangría (TAB)",
-    "pad.toolbar.unindent.title": "Sangría inversa",
+    "pad.toolbar.unindent.title": "Sangría inversa (Mayúsc+TAB)",
     "pad.toolbar.undo.title": "Desfacer (Ctrl-Z)",
     "pad.toolbar.redo.title": "Refacer (Ctrl-Y)",
     "pad.toolbar.clearAuthorship.title": "Llimpiar los colores d'autoría",
@@ -50,7 +50,7 @@
     "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 \u003Ca 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\"\u003Einstala abiword\u003C/a\u003E.",
+    "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...",
     "pad.modals.forcereconnect": "Forzar la reconexón",
@@ -119,4 +119,4 @@
     "pad.impexp.importfailed": "Falló la importación",
     "pad.impexp.copypaste": "Por favor, copia y apega",
     "pad.impexp.exportdisabled": "La esportación en formatu {{type}} ta desactivada. Por favor, comunica col alministrador del sistema pa más detalles."
-}
+}

src/locales/az.json

@@ -52,7 +52,7 @@
     "pad.importExport.exportpdf": "PDF",
     "pad.importExport.exportopen": "ODF (Açıq Sənəd Formatı)",
     "pad.importExport.exportdokuwiki": "DokuWiki",
-    "pad.importExport.abiword.innerHTML": "Siz yalnız adi mətndən və ya HTML-dən idxal edə bilərsiniz. İdxalın daha mürəkkəb funksiyaları üçün, zəhmət olmasa, \u003Ca 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\"\u003E AbiWord-i quraşdırın\u003C/a\u003E.",
+    "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.forcereconnect": "Məcbur təkrarən bağlan",
@@ -121,4 +121,4 @@
     "pad.impexp.importfailed": "İdxal zamanı səhv",
     "pad.impexp.copypaste": "Xahiş edirik kopyalayıb yapışdırın",
     "pad.impexp.exportdisabled": "{{ type}} formatında ixrac söndürülmüşdür. Ətraflı informasiya üçün sistem administratoruna müraciət ediniz."
-}
+}

src/locales/azb.json

@@ -69,4 +69,4 @@
     "timeslider.toolbar.returnbutton": "یادداشت دفترچه سینه قاییت",
     "timeslider.toolbar.authors": "یازیچیلار",
     "timeslider.toolbar.authorsList": "یازیچی سیز"
-}
+}

src/locales/be-tarask.json

@@ -15,7 +15,7 @@
     "pad.toolbar.ol.title": "Упарадкаваны сьпіс",
     "pad.toolbar.ul.title": "Неўпарадкаваны сьпіс",
     "pad.toolbar.indent.title": "Водступ (TAB)",
-    "pad.toolbar.unindent.title": "Выступ",
+    "pad.toolbar.unindent.title": "Выступ (Shift+TAB)",
     "pad.toolbar.undo.title": "Скасаваць(Ctrl-Z)",
     "pad.toolbar.redo.title": "Вярнуць (Ctrl-Y)",
     "pad.toolbar.clearAuthorship.title": "Прыбраць колер дакумэнту",
@@ -59,4 +59,4 @@
     "pad.share.readonly": "Толькі для чытаньня",
     "pad.share.link": "Спасылка",
     "pad.chat": "Чат"
-}
+}

src/locales/bn.json

@@ -86,4 +86,4 @@
     "pad.impexp.importbutton": "এখন ইম্পোর্ট করুন",
     "pad.impexp.importing": "ইম্পোর্ট চলছে...",
     "pad.impexp.importfailed": "ইম্পোর্ট অসক্ষম"
-}
+}

src/locales/br.json

@@ -53,7 +53,7 @@
     "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 \u003Ca 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\"\u003Eabiword\u003C/a\u003E  mar plij.",
+    "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...",
     "pad.modals.forcereconnect": "Adkevreañ dre heg",
@@ -122,4 +122,4 @@
     "pad.impexp.importfailed": "C'hwitet eo an enporzhiadenn",
     "pad.impexp.copypaste": "Eilit/pegit, mar plij",
     "pad.impexp.exportdisabled": "Diweredekaet eo ezporzhiañ d'ar furmad {{type}}. Kit e darempred gant merour ar reizhiad evit gouzout hiroc'h."
-}
+}

src/locales/ca.json

@@ -53,7 +53,7 @@
     "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 \u003Ca 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\"\u003Einstal·leu l'Abiword\u003C/a\u003E.",
+    "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…",
     "pad.modals.forcereconnect": "Força tornar a connectar",
@@ -122,4 +122,4 @@
     "pad.impexp.importfailed": "Ha fallat la importació",
     "pad.impexp.copypaste": "Si us plau, copieu i enganxeu",
     "pad.impexp.exportdisabled": "Està inhabilitada l'exportació com a {{type}}. Contacteu amb el vostre administrador de sistemes per a més informació."
-}
+}

src/locales/cs.json

@@ -54,7 +54,7 @@
     "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 „\u003Ca 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\"\u003Eabiword\u003C/a\u003E“.",
+    "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…",
     "pad.modals.forcereconnect": "Vynutit znovupřipojení",
@@ -123,4 +123,4 @@
     "pad.impexp.importfailed": "Import selhal",
     "pad.impexp.copypaste": "Vložte prosím kopii",
     "pad.impexp.exportdisabled": "Export do formátu {{type}} je zakázán. Kontaktujte svého administrátora pro zjištění detailů."
-}
+}

src/locales/da.json

@@ -14,8 +14,8 @@
     "pad.toolbar.strikethrough.title": "Gennemstregning",
     "pad.toolbar.ol.title": "Sorteret liste",
     "pad.toolbar.ul.title": "Usorteret liste",
-    "pad.toolbar.indent.title": "Indrykning",
+    "pad.toolbar.indent.title": "Indrykning (TAB)",
-    "pad.toolbar.unindent.title": "Ryk ud",
+    "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",
@@ -52,7 +52,7 @@
     "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, \u003Ca 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\"\u003Einstaller venligst abiword\u003C/a\u003E.",
+    "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...",
     "pad.modals.forcereconnect": "Gennemtving genoprettelse af forbindelsen",
@@ -121,4 +121,4 @@
     "pad.impexp.importfailed": "Importen mislykkedes",
     "pad.impexp.copypaste": "Venligst kopier og sæt ind",
     "pad.impexp.exportdisabled": "Eksportere i {{type}} format er deaktiveret. Kontakt din systemadministrator for mere information."
-}
+}

src/locales/de.json

@@ -53,7 +53,7 @@
     "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 \u003Ca 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\"\u003Einstallieren Sie bitte abiword\u003C/a\u003E.",
+    "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 …",
     "pad.modals.forcereconnect": "Erneut Verbinden",
@@ -122,4 +122,4 @@
     "pad.impexp.importfailed": "Import fehlgeschlagen",
     "pad.impexp.copypaste": "Bitte kopieren und einfügen",
     "pad.impexp.exportdisabled": "Der Export im {{type}}-Format ist deaktiviert. Für Einzelheiten kontaktieren Sie bitte Ihren Systemadministrator."
-}
+}

src/locales/diq.json

@@ -13,8 +13,8 @@
     "pad.toolbar.strikethrough.title": "Serxetın",
     "pad.toolbar.ol.title": "Lista rêzkerdiye",
     "pad.toolbar.ul.title": "Lista rêznêkerdiye",
-    "pad.toolbar.indent.title": "Serê rêze",
+    "pad.toolbar.indent.title": "Serrêze (TAB)",
-    "pad.toolbar.unindent.title": "Vıcente",
+    "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",
@@ -26,6 +26,7 @@
     "pad.colorpicker.save": "Qeyd ke",
     "pad.colorpicker.cancel": "Bıtexelne",
     "pad.loading": "Bar beno...",
+    "pad.wrongPassword": "Parola şıma ğeleta",
     "pad.settings.padSettings": "Sazkerdışê Pedi",
     "pad.settings.myView": "Asayışê mı",
     "pad.settings.colorcheck": "Rengê nuştekariye",
@@ -87,4 +88,4 @@
     "pad.impexp.importing": "Deyeno azere...",
     "pad.impexp.importfailed": "Zer kerdış mıwafaq nebı",
     "pad.impexp.copypaste": "Reca keme kopya pronayış bıkeri"
-}
+}

src/locales/dsb.json

@@ -0,0 +1,122 @@
+{
+    "@metadata": {
+        "authors": [
+            "Michawiki"
+        ]
+    },
+    "index.newPad": "Nowy zapisnik",
+    "index.createOpenPad": "abo napóraj/wócyń zapisnik z mjenim:",
+    "pad.toolbar.bold.title": "Tucny (Strg-B)",
+    "pad.toolbar.italic.title": "Kursiwny (Strg-I)",
+    "pad.toolbar.underline.title": "Pódšmarnuś (Strg-U)",
+    "pad.toolbar.strikethrough.title": "Pśešmarnuś",
+    "pad.toolbar.ol.title": "Numerěrowana lisćina",
+    "pad.toolbar.ul.title": "Nalicenje",
+    "pad.toolbar.indent.title": "Zasunuś (TAB)",
+    "pad.toolbar.unindent.title": "Wusunuś (Umsch+TAB)",
+    "pad.toolbar.undo.title": "Anulěrowaś (Strg-Z)",
+    "pad.toolbar.redo.title": "Wóspjetowaś (Strg-Y)",
+    "pad.toolbar.clearAuthorship.title": "Awtorowe barwy lašowaś",
+    "pad.toolbar.import_export.title": "Import/Eksport z/do drugich datajowych formatow",
+    "pad.toolbar.timeslider.title": "Wersijowa historija",
+    "pad.toolbar.savedRevision.title": "Wersiju składowaś",
+    "pad.toolbar.settings.title": "Nastajenja",
+    "pad.toolbar.embed.title": "Toś ten zapisnik źěliś a zasajźiś",
+    "pad.toolbar.showusers.title": "Wužywarje na toś tom zapisniku pokazaś",
+    "pad.colorpicker.save": "Składowaś",
+    "pad.colorpicker.cancel": "Pśetergnuś",
+    "pad.loading": "Zacytujo se...",
+    "pad.passwordRequired": "Trjebaš gronidło, aby na toś ten zapisnik pśistup měł",
+    "pad.permissionDenied": "Njamaš pśistupne pšawo za toś ten zapisnik.",
+    "pad.wrongPassword": "Twójo gronidło jo wopaki było",
+    "pad.settings.padSettings": "Nastajenja zapisnika",
+    "pad.settings.myView": "Mój naglěd",
+    "pad.settings.stickychat": "Chat pśecej na wobrazowce pokazaś",
+    "pad.settings.colorcheck": "Awtorowe barwy",
+    "pad.settings.linenocheck": "Smužkowe numery",
+    "pad.settings.rtlcheck": "Wopśimjeśe wótpšawa nalěwo cytaś?",
+    "pad.settings.fontType": "Pismowa družyna:",
+    "pad.settings.fontType.normal": "Normalny",
+    "pad.settings.fontType.monospaced": "Monospace",
+    "pad.settings.globalView": "Globalny naglěd",
+    "pad.settings.language": "Rěc:",
+    "pad.importExport.import_export": "Import/Eksport",
+    "pad.importExport.import": "Tekstowu dataju abo dokument nagraś",
+    "pad.importExport.importSuccessful": "Wuspěšny!",
+    "pad.importExport.export": "Aktualny zapisnik eksportěrowaś ako:",
+    "pad.importExport.exporthtml": "HTML",
+    "pad.importExport.exportplain": "Lutny 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": "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...",
+    "pad.modals.forcereconnect": "Znowego zwězaś",
+    "pad.modals.userdup": "W drugem woknje wócynjony",
+    "pad.modals.userdup.explanation": "Zda se, až toś ten zapisnik jo se we wěcej ako jadnem woknje wobglědowaka na toś tom licadłu wócynił.",
+    "pad.modals.userdup.advice": "Zwězaj znowego, aby toś to wokno město togo wužywał.",
+    "pad.modals.unauth": "Njeawtorizěrowany",
+    "pad.modals.unauth.explanation": "Pśi wobglědowanju toś togo boka su se twóje pšawa změnili. Wopytaj se znowego zwězaś.",
+    "pad.modals.looping.explanation": "Su komunikaciske problemy ze synchronizěrowańskim serwerom.",
+    "pad.modals.looping.cause": "Snaź sy pśez njekompatibelnu wognjowu murju abo proksy zwězany.",
+    "pad.modals.initsocketfail": "Serwer njejo dojśpiwajobny.",
+    "pad.modals.initsocketfail.explanation": "Zwisk ze synchronizěrowańskim serwerom njejo móžno.",
+    "pad.modals.initsocketfail.cause": "To jo nejskerjej problem z twójim wobglědowakom abo twójim internetnym zwiskom.",
+    "pad.modals.slowcommit.explanation": "Serwer njewótegranja.",
+    "pad.modals.slowcommit.cause": "To by mógło problem seśowego zwiska byś.",
+    "pad.modals.badChangeset.explanation": "Změna, kótaruž sy pśewjadł, jo se pśez synchronizěrowański serwer ako njedowólonu markěrowała.",
+    "pad.modals.badChangeset.cause": "To jo se snaź wopacneje serweroweje konfiguracije dla abo drugego njewócakanego zaźaeržanja dla stało. Pšosym staj se ze słužbowym administratorom do zwiska, jolic se mysliš, až to jo zmólka. Wopytaj hyšći raz zwězaś, aby z wobźěłowanim pókšacował.",
+    "pad.modals.corruptPad.explanation": "Zapisnik, na kótaryž coš pśistup měś, jo wobškóźony.",
+    "pad.modals.corruptPad.cause": "To jo se snaź wopacneje serweroweje konfiguracije dla abo drugego njewócakanego zaźaržanja dla stało. Pšosym staj se ze słužbowym administratorom do zwiska.",
+    "pad.modals.deleted": "Wulašowany.",
+    "pad.modals.deleted.explanation": "Toś ten zapisnik jo se wótpórał.",
+    "pad.modals.disconnected": "Zwisk jo pśetergnjony.",
+    "pad.modals.disconnected.explanation": "Zwisk ze serwerom jo se zgubił",
+    "pad.modals.disconnected.cause": "Serwer njestoj k dispoziciji. Pšosym informěruj słužbowego administratora, jolic to se dalej stawa.",
+    "pad.share": "Toś ten zapisnik źěliś",
+    "pad.share.readonly": "Jano cytajobny",
+    "pad.share.link": "Wótkaz",
+    "pad.share.emebdcode": "URL zasajźiś",
+    "pad.chat": "Chat",
+    "pad.chat.title": "Chat za toś ten zapisnik wócyniś",
+    "pad.chat.loadmessages": "Dalšne powěsći zacytaś",
+    "timeslider.pageTitle": "{{appTitle}} - wersijowa historija",
+    "timeslider.toolbar.returnbutton": "Slědk k zapisnikoju",
+    "timeslider.toolbar.authors": "Awtory:",
+    "timeslider.toolbar.authorsList": "Žedne awtory",
+    "timeslider.toolbar.exportlink.title": "Eksportěrowaś",
+    "timeslider.exportCurrent": "Aktualnu wersiju eksportěrowaś ako:",
+    "timeslider.version": "Wersija {{version}}",
+    "timeslider.saved": "Składowany {{day}}. {{month}} {{year}}",
+    "timeslider.dateformat": "{{day}}. {{month}} {{year}} {{hours}}:{{minutes}}:{{seconds}}",
+    "timeslider.month.january": "januara",
+    "timeslider.month.february": "februara",
+    "timeslider.month.march": "měrca",
+    "timeslider.month.april": "apryla",
+    "timeslider.month.may": "maja",
+    "timeslider.month.june": "junija",
+    "timeslider.month.july": "julija",
+    "timeslider.month.august": "awgusta",
+    "timeslider.month.september": "septembra",
+    "timeslider.month.october": "oktobra",
+    "timeslider.month.november": "nowembra",
+    "timeslider.month.december": "decembra",
+    "timeslider.unnamedauthors": "{{num}} {[plural(num) one: awtor, two: awtora, few: awtory, other: awtorow ]} bźez mjenja",
+    "pad.savedrevs.marked": "Toś ta wersija jo se něnto ako składowana wersija markěrowała",
+    "pad.userlist.entername": "Zapódaj swójo mě",
+    "pad.userlist.unnamed": "bźez mjenja",
+    "pad.userlist.guest": "Gósć",
+    "pad.userlist.deny": "Wótpokazaś",
+    "pad.userlist.approve": "Pśizwóliś",
+    "pad.editbar.clearcolors": "Awtorowe barwy w cełem dokumenśe lašowaś?",
+    "pad.impexp.importbutton": "Něnto importěrowaś",
+    "pad.impexp.importing": "Importěrujo se...",
+    "pad.impexp.confirmimport": "Importowanje dataje pśepišo aktualny tekst zapisnika. Coš napšawdu pókšacowaś?",
+    "pad.impexp.convertFailed": "Njejsmy mógli toś tu dataju importěrowaś. Pšosym wužyj drugi dokumentowy format abo kopěruj manuelnje",
+    "pad.impexp.uploadFailed": "Nagraśe njejo se raźiło, pšosym wopytaj hyšći raz",
+    "pad.impexp.importfailed": "Import njejo se raził",
+    "pad.impexp.copypaste": "Pšosym kopěrowaś a zasajźiś",
+    "pad.impexp.exportdisabled": "Eksport ako format {{type}} jo znjemóžnjony. Pšosym staj se ze swójim systemowym administratorom za drobnostki do zwiska."
+}

src/locales/el.json

@@ -10,14 +10,14 @@
     },
     "index.newPad": "Νέο Pad",
     "index.createOpenPad": "ή δημιουργία/άνοιγμα ενός Pad με όνομα:",
-    "pad.toolbar.bold.title": "Έντονα (Ctrl-B)",
+    "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.indent.title": "Αριστερά εσοχή (TAB)",
-    "pad.toolbar.unindent.title": "Αφαίρεση εσοχής (Shift+TAB)",
+    "pad.toolbar.unindent.title": "Δεξιά εσοχή (Shift+TAB)",
     "pad.toolbar.undo.title": "Αναίρεση (Ctrl-Z)",
     "pad.toolbar.redo.title": "Επανάληψη (Ctrl-Y)",
     "pad.toolbar.clearAuthorship.title": "Εκκαθάριση των χρωμάτων των συντακτών",
@@ -52,9 +52,9 @@
     "pad.importExport.exportplain": "Απλό κείμενο",
     "pad.importExport.exportword": "Microsoft Word",
     "pad.importExport.exportpdf": "PDF",
-    "pad.importExport.exportopen": "ODF (Open Document Format)",
+    "pad.importExport.exportopen": "ODF (Μορφή Open Document)",
     "pad.importExport.exportdokuwiki": "DokuWiki",
-    "pad.importExport.abiword.innerHTML": "Μπορείτε να κάνετε εισαγωγή απλού κειμένου ή μορφής html. Για πιο προηγμένες  δυνατότητες εισαγωγής παρακαλώ \u003Ca 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\"\u003Eεγκαταστήστε το abiword\u003C/a\u003E.",
+    "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": "Επιβολή επανασύνδεσης",
@@ -71,7 +71,9 @@
     "pad.modals.slowcommit.explanation": "Ο διακομιστής δεν αποκρίνεται.",
     "pad.modals.slowcommit.cause": "Αυτό μπορεί να οφείλεται σε προβλήματα σύνδεσης δικτύου.",
     "pad.modals.badChangeset.explanation": "Μια επεξεργασία που κάνατε χαρακτηρίστηκε ως παράνομη από τον διακομιστή συγχρονισμού.",
+    "pad.modals.badChangeset.cause": "Αυτό μπορεί να οφείλεται σε ένα λάθος στη ρύθμιση του διακομιστή ή κάποια άλλη απρόβλεπτη συμπεριφορά. Παρακαλώ επικοινωνήστε με τον διαχειριστή της υπηρεσίας, εάν πιστεύετε πως αυτό οφείλεται σε σφάλμα. Δοκιμάστε να επανασυνδεθείτε για να συνεχίσετε την επεξεργασία.",
     "pad.modals.corruptPad.explanation": "Το pad που προσπαθείτε να επισκεφτείτε είναι κατεστραμμένο.",
+    "pad.modals.corruptPad.cause": "Αυτό μπορεί να οφείλεται σε ένα λάθος στη ρύθμιση του διακομιστή ή κάποια άλλη απρόβλεπτη συμπεριφορά. Παρακαλώ επικοινωνήστε με τον διαχειριστή της υπηρεσίας.",
     "pad.modals.deleted": "Διεγράφη.",
     "pad.modals.deleted.explanation": "Αυτό το pad έχει καταργηθεί.",
     "pad.modals.disconnected": "Έχετε αποσυνδεθεί.",
@@ -121,4 +123,4 @@
     "pad.impexp.importfailed": "Η εισαγωγή απέτυχε",
     "pad.impexp.copypaste": "Παρακαλώ αντιγράψτε και επικολλήστε",
     "pad.impexp.exportdisabled": "Η εξαγωγή σε μορφή {{type}} έχει απενεργοποιηθεί. Επικοινωνήστε με τον διαχειριστή του συστήματός σας για λεπτομέρειες."
-}
+}

src/locales/es.json

@@ -20,8 +20,8 @@
     "pad.toolbar.strikethrough.title": "Tachado",
     "pad.toolbar.ol.title": "Lista ordenada",
     "pad.toolbar.ul.title": "Lista desordenada",
-    "pad.toolbar.indent.title": "Sangrar",
+    "pad.toolbar.indent.title": "Sangría (TAB)",
-    "pad.toolbar.unindent.title": "Desangrar",
+    "pad.toolbar.unindent.title": "Eliminar sangría (Shift+TAB)",
     "pad.toolbar.undo.title": "Deshacer (Ctrl-Z)",
     "pad.toolbar.redo.title": "Rehacer (Ctrl-Y)",
     "pad.toolbar.clearAuthorship.title": "Eliminar los colores de los autores",
@@ -58,7 +58,7 @@
     "pad.importExport.exportpdf": "PDF",
     "pad.importExport.exportopen": "ODF (Open Document Format)",
     "pad.importExport.exportdokuwiki": "DokuWiki",
-    "pad.importExport.abiword.innerHTML": "Sólo puede importar formatos de texto plano o html. Para funciones más avanzadas instale \u003Ca 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\"\u003Eabiword\u003C/a\u003E.",
+    "pad.importExport.abiword.innerHTML": "Sólo puede importar formatos de texto plano o html. Para funciones más avanzadas instale <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-in-Ubuntu-or-OpenSuse-or-SLES-with-AbiWord\">abiword</a>.",
     "pad.modals.connected": "Conectado.",
     "pad.modals.reconnecting": "Reconectando a tu pad..",
     "pad.modals.forcereconnect": "Reconexión forzosa",
@@ -127,4 +127,4 @@
     "pad.impexp.importfailed": "Fallo al importar",
     "pad.impexp.copypaste": "Intente copiar y pegar",
     "pad.impexp.exportdisabled": "La exportación al formato {{type}} format está desactivada. Contacte con su administrador de sistemas."
-}
+}

src/locales/et.json

@@ -50,7 +50,7 @@
     "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 \u003Ca 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\"\u003Epaigaldama abiword\u003C/a\u003E.",
+    "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...",
     "pad.modals.forcereconnect": "Sunni ühenduse taasloomist",
@@ -119,4 +119,4 @@
     "pad.impexp.importfailed": "Importimine nurjus",
     "pad.impexp.copypaste": "Palun kopeeri ja kleebi",
     "pad.impexp.exportdisabled": "Eksportimine vormingusse {{type}} on hetkel keelatud. Üksikasjade saamiseks pöördu oma süsteemiadministraatori poole."
-}
+}

src/locales/eu.json

@@ -50,7 +50,7 @@
     "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 \u003Ca 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\"\u003Eabiword instala ezazu\u003C/a\u003E.",
+    "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...",
     "pad.modals.forcereconnect": "Berkonexioa fortzatu",
@@ -115,4 +115,4 @@
     "pad.impexp.importfailed": "Inportazioak akatsa egin du",
     "pad.impexp.copypaste": "Mesedez kopiatu eta pegatu",
     "pad.impexp.exportdisabled": "{{type}} formatuarekin esportatzea desgaituta dago. Kontakta ezazu administratzailea detaile gehiagorako."
-}
+}

src/locales/fa.json

@@ -17,8 +17,8 @@
     "pad.toolbar.strikethrough.title": "خط خورده",
     "pad.toolbar.ol.title": "فهرست مرتب شده",
     "pad.toolbar.ul.title": "فهرست مرتب نشده",
-    "pad.toolbar.indent.title": "تورفتگی",
+    "pad.toolbar.indent.title": "تورفتگی (TAB)",
-    "pad.toolbar.unindent.title": "بیرون رفتگی",
+    "pad.toolbar.unindent.title": "بیرون رفتگی (Shift+TAB)",
     "pad.toolbar.undo.title": "باطل‌کردن (Ctrl-Z)",
     "pad.toolbar.redo.title": "از نو (Ctrl-Y)",
     "pad.toolbar.clearAuthorship.title": "پاک‌کردن رنگ‌های نویسندگی",
@@ -55,7 +55,7 @@
     "pad.importExport.exportpdf": "PDF",
     "pad.importExport.exportopen": "ODF (قالب سند باز)",
     "pad.importExport.exportdokuwiki": "DokuWiki",
-    "pad.importExport.abiword.innerHTML": "شما تنها می‌توانید از قالب متن ساده یا اچ‌تی‌ام‌ال درون‌ریزی کنید. برای بیشتر شدن ویژگی‌های درون‌ریزی پیشرفته \u003Ca 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\"\u003EAbiWord\u003C/a\u003E را نصب کنید.",
+    "pad.importExport.abiword.innerHTML": "شما تنها می‌توانید از قالب متن ساده یا اچ‌تی‌ام‌ال درون‌ریزی کنید. برای بیشتر شدن ویژگی‌های درون‌ریزی پیشرفته <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-in-Ubuntu-or-OpenSuse-or-SLES-with-AbiWord\">AbiWord</a> را نصب کنید.",
     "pad.modals.connected": "متصل شد.",
     "pad.modals.reconnecting": "در حال اتصال دوباره به دفترچه یادداشت شما..",
     "pad.modals.forcereconnect": "واداشتن به اتصال دوباره",
@@ -118,10 +118,10 @@
     "pad.editbar.clearcolors": "رنگ نویسندگی از همه‌ی سند پاک شود؟",
     "pad.impexp.importbutton": "هم اکنون درون‌ریزی کن",
     "pad.impexp.importing": "در حال درون‌ریزی...",
-    "pad.impexp.confirmimport": "با درون‌ریزی یک فایل نوشته‌ی کنونی دفترچه پاک می‌شود. آیا می‌خواهید ادامه دهید؟",
+    "pad.impexp.confirmimport": "با درون‌ریزی یک پرونده نوشتهٔ کنونی دفترچه پاک می‌شود. آیا می‌خواهید ادامه دهید؟",
-    "pad.impexp.convertFailed": "ما نمی‌توانیم این فایل را درون‌ریزی کنیم. خواهشمندیم قالب دیگری برای سندتان انتخاب کرده یا بصورت دستی آنرا کپی کنید",
+    "pad.impexp.convertFailed": "ما نمی‌توانیم این پرونده را درون‌ریزی کنیم. خواهشمندیم قالب دیگری برای سندتان انتخاب کرده یا بصورت دستی آنرا کپی کنید",
     "pad.impexp.uploadFailed": "آپلود انجام نشد، دوباره تلاش کنید",
     "pad.impexp.importfailed": "درون‌ریزی انجام نشد",
     "pad.impexp.copypaste": "کپی پیست کنید",
     "pad.impexp.exportdisabled": "برون‌ریزی با قالب {{type}} از کار افتاده است. برای جزئیات بیشتر با مدیر سیستمتان تماس بگیرید."
-}
+}

src/locales/fi.json

@@ -32,7 +32,7 @@
     "pad.toolbar.embed.title": "Jaa ja upota muistio",
     "pad.toolbar.showusers.title": "Näytä muistion käyttäjät",
     "pad.colorpicker.save": "Tallenna",
-    "pad.colorpicker.cancel": "Peruuta",
+    "pad.colorpicker.cancel": "Peru",
     "pad.loading": "Ladataan…",
     "pad.passwordRequired": "Tämä muistio on suojattu salasanalla.",
     "pad.permissionDenied": "Käyttöoikeutesi eivät riitä tämän muistion käyttämiseen.",
@@ -58,7 +58,7 @@
     "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 \u003Ca 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\"\u003Einstall abiword\u003C/a\u003E.",
+    "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...",
     "pad.modals.forcereconnect": "Pakota yhdistämään uudelleen",
@@ -127,4 +127,4 @@
     "pad.impexp.importfailed": "Tuonti epäonnistui",
     "pad.impexp.copypaste": "Kopioi ja liitä",
     "pad.impexp.exportdisabled": "Vienti muotoon \"{{type}}\" ei ole käytössä. Ota yhteys ylläpitäjään saadaksesi lisätietoja."
-}
+}

src/locales/fo.json

@@ -44,7 +44,7 @@
     "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 \u003Ca 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\"\u003Einstallera abiword\u003C/a\u003E.",
+    "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..",
     "pad.modals.forcereconnect": "Tvinga endurstovnan av sambandi.",
@@ -91,4 +91,4 @@
     "pad.userlist.guest": "Gestur",
     "pad.userlist.deny": "Nokta",
     "pad.userlist.approve": "Góðkenn"
-}
+}

src/locales/fr.json

@@ -15,7 +15,8 @@
             "Quenenni",
             "Rastus Vernon",
             "Stephane Cottin",
-            "Tux-tn"
+            "Tux-tn",
+            "Maxim21"
         ]
     },
     "index.newPad": "Nouveau pad",
@@ -26,8 +27,8 @@
     "pad.toolbar.strikethrough.title": "Barré",
     "pad.toolbar.ol.title": "Liste ordonnée",
     "pad.toolbar.ul.title": "Liste non ordonnée",
-    "pad.toolbar.indent.title": "Indenter",
+    "pad.toolbar.indent.title": "Indenter (TAB)",
-    "pad.toolbar.unindent.title": "Désindenter",
+    "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",
@@ -64,7 +65,7 @@
     "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 \u003Ca 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\"\u003Einstaller abiword\u003C/a\u003E.",
+    "pad.importExport.abiword.innerHTML": "Vous ne pouvez importer que des formats texte brut ou html. Pour des fonctionnalités d'importation plus évoluées, veuillez <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-in-Ubuntu-or-OpenSuse-or-SLES-with-AbiWord\">installer abiword</a>.",
     "pad.modals.connected": "Connecté.",
     "pad.modals.reconnecting": "Reconnexion vers votre pad...",
     "pad.modals.forcereconnect": "Forcer la reconnexion",
@@ -133,4 +134,4 @@
     "pad.impexp.importfailed": "Échec de l'importation",
     "pad.impexp.copypaste": "Veuillez copier/coller",
     "pad.impexp.exportdisabled": "Exporter au format {{type}} est désactivé. Veuillez contacter votre administrateur système pour plus de détails."
-}
+}

src/locales/gl.json

@@ -12,8 +12,8 @@
     "pad.toolbar.strikethrough.title": "Riscar",
     "pad.toolbar.ol.title": "Lista ordenada",
     "pad.toolbar.ul.title": "Lista sen ordenar",
-    "pad.toolbar.indent.title": "Sangría",
+    "pad.toolbar.indent.title": "Sangría (TAB)",
-    "pad.toolbar.unindent.title": "Sen sangría",
+    "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",
@@ -50,7 +50,7 @@
     "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 \u003Ca 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\"\u003Einstale abiword\u003C/a\u003E.",
+    "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...",
     "pad.modals.forcereconnect": "Forzar a reconexión",
@@ -119,4 +119,4 @@
     "pad.impexp.importfailed": "Fallou a importación",
     "pad.impexp.copypaste": "Copie e pegue",
     "pad.impexp.exportdisabled": "A exportación en formato {{type}} está desactivada. Póñase en contacto co administrador do sistema se quere máis detalles."
-}
+}

src/locales/he.json

@@ -15,8 +15,8 @@
     "pad.toolbar.strikethrough.title": "קו מוחק",
     "pad.toolbar.ol.title": "רשימה ממוספרת",
     "pad.toolbar.ul.title": "רשימה",
-    "pad.toolbar.indent.title": "הזחה",
+    "pad.toolbar.indent.title": "הזחה (טאב)",
-    "pad.toolbar.unindent.title": "צמצום הזחה",
+    "pad.toolbar.unindent.title": "צמצום הזחה (שיפט–טאב)",
     "pad.toolbar.undo.title": "ביטול (Ctrl-Z)",
     "pad.toolbar.redo.title": "ביצוע מחדש",
     "pad.toolbar.clearAuthorship.title": "ניקוי צבעים",
@@ -53,7 +53,7 @@
     "pad.importExport.exportpdf": "PDF",
     "pad.importExport.exportopen": "ODF (Open Document Format)",
     "pad.importExport.exportdokuwiki": "DokuWiki",
-    "pad.importExport.abiword.innerHTML": "באפשרותך לייבא מטקסט פשוט או מ־HTML. לאפשרויות ייבוא מתקדמות יותר יש \u003Ca 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\"\u003Eלהתקין את abiword\u003C/a\u003E.",
+    "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.modals.forcereconnect": "לכפות חיבור מחדש",
@@ -122,4 +122,4 @@
     "pad.impexp.importfailed": "הייבוא נכשל",
     "pad.impexp.copypaste": "נא להעתיק ולהדביק",
     "pad.impexp.exportdisabled": "ייצוא בתסדיר {{type}} אינו פעיל. מנהל המערכת שלך יוכל לספר לך על זה עוד פרטים."
-}
+}

src/locales/hrx.json

@@ -0,0 +1,122 @@
+{
+    "@metadata": {
+        "authors": [
+            "Paul Beppler"
+        ]
+    },
+    "index.newPad": "Neies Pad",
+    "index.createOpenPad": "Pad mit follichendem Noome uffmache:",
+    "pad.toolbar.bold.title": "Fett (Strg-B)",
+    "pad.toolbar.italic.title": "Kursiv (Strg-I)",
+    "pad.toolbar.underline.title": "Unnerstrich (Strg-U)",
+    "pad.toolbar.strikethrough.title": "Dorrichgestrich",
+    "pad.toolbar.ol.title": "Nummerierte List",
+    "pad.toolbar.ul.title": "Ungeordnete List",
+    "pad.toolbar.indent.title": "Einrück (TAB)",
+    "pad.toolbar.unindent.title": "Ausrück (Shift+TAB)",
+    "pad.toolbar.undo.title": "Rückgängich (Strg-Z)",
+    "pad.toolbar.redo.title": "Wiederhole (Strg-Y)",
+    "pad.toolbar.clearAuthorship.title": "Autorefarbe zurücksetze",
+    "pad.toolbar.import_export.title": "Import/Export von/zu verschiedne Dateiformate",
+    "pad.toolbar.timeslider.title": "Pad-Versionsgeschicht oonzeiche",
+    "pad.toolbar.savedRevision.title": "Version markiere",
+    "pad.toolbar.settings.title": "Einstellunge",
+    "pad.toolbar.embed.title": "Pad teile orrer inbette",
+    "pad.toolbar.showusers.title": "Aktuell verbundne Benutzer oonzeiche",
+    "pad.colorpicker.save": "Speichre",
+    "pad.colorpicker.cancel": "Abbreche",
+    "pad.loading": "Loode …",
+    "pad.passwordRequired": "Sie benötiche en Passwort, um uff das Pad zuzugreife",
+    "pad.permissionDenied": "Du host ken Berechtichung, um uff das Pad zuzugreif",
+    "pad.wrongPassword": "Dein Passwort woor falsch",
+    "pad.settings.padSettings": "Pad Einstellunge",
+    "pad.settings.myView": "Eichne Oonsicht",
+    "pad.settings.stickychat": "Chat immer oonzeiche",
+    "pad.settings.colorcheck": "Autorenfarbe oonzeiche",
+    "pad.settings.linenocheck": "Zeilenummer",
+    "pad.settings.rtlcheck": "Inhalt von rechts bis links lese?",
+    "pad.settings.fontType": "Schriftoort:",
+    "pad.settings.fontType.normal": "Normal",
+    "pad.settings.fontType.monospaced": "Monospace",
+    "pad.settings.globalView": "Gemeinsame Oonsicht",
+    "pad.settings.language": "Sproch:",
+    "pad.importExport.import_export": "Import/Export",
+    "pad.importExport.import": "Text-Datei orrer Dokument hochloode",
+    "pad.importExport.importSuccessful": "Erfollichreich!",
+    "pad.importExport.export": "Aktuelles Pad exportiere wie:",
+    "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": "Verbünd (konnektiert).",
+    "pad.modals.reconnecting": "Wiederherstelle von der Verbinnung …",
+    "pad.modals.forcereconnect": "Erneit Verbinne",
+    "pad.modals.userdup": "In enem andren Fenster schon uff (geöffnet)",
+    "pad.modals.userdup.explanation": "Das Pad scheint in meahr wie enem Browser-Fenster uff dem Komputadoar uff sin (geöffnet zu sein).",
+    "pad.modals.userdup.advice": "Um das Fenster se benutze, verbinn bittschön wieder erneit.",
+    "pad.modals.unauth": "Net authorisiert.",
+    "pad.modals.unauth.explanation": "Dein Zugriffsberechtichung für das Pad hot sich zwischichzeitlich geännert. Du kannst versuche das Pad wieder erneit uffserufe.",
+    "pad.modals.looping.explanation": "Es gebt Probleme bei der Kommunikation mit dem Pad-Server.",
+    "pad.modals.looping.cause": "Möchlicherweis bist dorrich en inkompatible Firewall orrer üwer en inkompatible Proxy mit dem Pad-Server verbünd (konnektiert).",
+    "pad.modals.initsocketfail": "Pad-Server net erreichbar.",
+    "pad.modals.initsocketfail.explanation": "Do konnt ken Verbinnung zum Pad-Server heargestellt sin.",
+    "pad.modals.initsocketfail.cause": "Dies könnt an deinem Browser orrer dein Internet-Verbinnung leihe.",
+    "pad.modals.slowcommit.explanation": "Der Pad-Server reagiert net.",
+    "pad.modals.slowcommit.cause": "Das könnt en Netzwerkverbinnungsproblem sin orrer en momentane Üwerlaschtung von der Pad-Server.",
+    "pad.modals.badChangeset.explanation": "En von dein gemachte Ännrung woard vom Pad-Server wie ungültich ingeschtuft (klassifiziert).",
+    "pad.modals.badChangeset.cause": "Das könnt uffgrund von en falsche Serverkonfiguration orrer en annre unerwoortete Verhalt passiert sin. Bittschön kontaktier den Diensteadministratoar, falls du gloobst, dass das sich um en Fehler handelt. Versuch dich wieder erneit se verbinne, um mit dem Beoorbeite fortzufoohre.",
+    "pad.modals.corruptPad.explanation": "Das Pad, uff das du zugreife willst, ist beschädicht.",
+    "pad.modals.corruptPad.cause": "Das könnt an en falsche Serverkonfiguration orrer en annre unerwoortete Verhalten liehn. Bittschön kontaktier den Diensteadministratoar.",
+    "pad.modals.deleted": "Abgewischt.",
+    "pad.modals.deleted.explanation": "Das Pad woard entfernt.",
+    "pad.modals.disconnected": "Verbinnung unnerbroch (du bist jetzt deskonnektiert).",
+    "pad.modals.disconnected.explanation": "Die Verbinnung (konnektion) zu dem Pad-Server woard unnerbroch.",
+    "pad.modals.disconnected.cause": "Möchlicherweis ist der Pad-Server net erreichbar. Bittschön benachrichtig den Dienstadministratoar, falls das weiterhin passiere tut.",
+    "pad.share": "Das Pad teile",
+    "pad.share.readonly": "Ingeschränkter Nur-Lese-Zugriff",
+    "pad.share.link": "Link",
+    "pad.share.emebdcode": "In Webseite einbette",
+    "pad.chat": "Chat",
+    "pad.chat.title": "Den Chat von dem Pad uffmache",
+    "pad.chat.loadmessages": "Weitre Nachrichte loode",
+    "timeslider.pageTitle": "{{appTitle}} Pad-Versionsgeschicht",
+    "timeslider.toolbar.returnbutton": "Zurück zum Pad",
+    "timeslider.toolbar.authors": "Autore:",
+    "timeslider.toolbar.authorsList": "ken Autore",
+    "timeslider.toolbar.exportlink.title": "Die Version exportiere",
+    "timeslider.exportCurrent": "Exportier die Version wie:",
+    "timeslider.version": "Version {{version}}",
+    "timeslider.saved": "Gespeichert am {{day}}.{{month}}.{{year}}",
+    "timeslider.dateformat": "{{day}}.{{month}}.{{year}} {{hours}}:{{minutes}}:{{seconds}}",
+    "timeslider.month.january": "Januar",
+    "timeslider.month.february": "Februar",
+    "timeslider.month.march": "März",
+    "timeslider.month.april": "April",
+    "timeslider.month.may": "Mai",
+    "timeslider.month.june": "Juni",
+    "timeslider.month.july": "Juli",
+    "timeslider.month.august": "August",
+    "timeslider.month.september": "September",
+    "timeslider.month.october": "Oktober",
+    "timeslider.month.november": "November",
+    "timeslider.month.december": "Dezember",
+    "timeslider.unnamedauthors": "{{num}} {[plural(num) one: unbenannter Autoar, other: unbenannte Autore ]}",
+    "pad.savedrevs.marked": "Die Version woard jetzt wie gespeicherte Version gekennzeichnet",
+    "pad.userlist.entername": "Tue en Noome ren gebe",
+    "pad.userlist.unnamed": "unbenannt",
+    "pad.userlist.guest": "Gast",
+    "pad.userlist.deny": "Verweihe (negiere)",
+    "pad.userlist.approve": "Genehmiche (approviere)",
+    "pad.editbar.clearcolors": "Autorefarbe im gesamte Dokument zurücksetze?",
+    "pad.impexp.importbutton": "Jetzt importiere",
+    "pad.impexp.importing": "Importiere …",
+    "pad.impexp.confirmimport": "Das Importiere von en Datei üwerschreibt den aktuelle Text von dem Pad. Willst du weerklich fortfoohre?",
+    "pad.impexp.convertFailed": "Mir könne die Datei net importiere. Bittschön verwenn en anner Dokumentformat orrer üwertrooh den Text manuell.",
+    "pad.impexp.uploadFailed": "Der Upload ist fehlgeschloohn (das hot net funktioniert). Bittschön versuch  das wieder erneit.",
+    "pad.impexp.importfailed": "Import fehlgeschloohn (das hot net funktioniert)",
+    "pad.impexp.copypaste": "Bittschön tue kopiere und einfüche (oonklebe)",
+    "pad.impexp.exportdisabled": "Der Export im {{type}}-Format ist deaktiviert. Für Einzelheite (Detalhes) tue bittschön dein Systemadministratoar kontaktiere."
+}

src/locales/hsb.json

@@ -0,0 +1,122 @@
+{
+    "@metadata": {
+        "authors": [
+            "Michawiki"
+        ]
+    },
+    "index.newPad": "Nowy zapisnik",
+    "index.createOpenPad": "abo wutwor/wočiń zapisnik z mjenom:",
+    "pad.toolbar.bold.title": "Tučny (Strg-B)",
+    "pad.toolbar.italic.title": "Kursiwny (Strg-I)",
+    "pad.toolbar.underline.title": "Podšmórnyć (Strg-U)",
+    "pad.toolbar.strikethrough.title": "Přešmórnyć",
+    "pad.toolbar.ol.title": "Čisłowana lisćina",
+    "pad.toolbar.ul.title": "Naličenje",
+    "pad.toolbar.indent.title": "Zasunyć (TAB)",
+    "pad.toolbar.unindent.title": "Wusunyć (Umsch+TAB)",
+    "pad.toolbar.undo.title": "Cofnyć (Strg-Z)",
+    "pad.toolbar.redo.title": "Wospjetować (Strg-Y)",
+    "pad.toolbar.clearAuthorship.title": "Awtorowe barby wotstronić",
+    "pad.toolbar.import_export.title": "Import/Eksport z/do druhich datajowych formatow",
+    "pad.toolbar.timeslider.title": "Historijowa strona",
+    "pad.toolbar.savedRevision.title": "Wersiju składować",
+    "pad.toolbar.settings.title": "Nastajenja",
+    "pad.toolbar.embed.title": "Tutón zapisnik dźělić a zasadźić",
+    "pad.toolbar.showusers.title": "Wužiwarjow na tutym zapisniku pokazać",
+    "pad.colorpicker.save": "Składować",
+    "pad.colorpicker.cancel": "Přetorhnyć",
+    "pad.loading": "Začituje so...",
+    "pad.passwordRequired": "Trjebaš hesło, zo by na tutón zapisnik přistup měł",
+    "pad.permissionDenied": "Nimaće prawo za přistup na tutón zapisnik.",
+    "pad.wrongPassword": "Twoje hesło bě wopak",
+    "pad.settings.padSettings": "Nastajenja zapisnika",
+    "pad.settings.myView": "Mój napohlad",
+    "pad.settings.stickychat": "Chat přeco na wobrazowce pokazać",
+    "pad.settings.colorcheck": "Awtorowe barby",
+    "pad.settings.linenocheck": "Linkowe čisła",
+    "pad.settings.rtlcheck": "Wobsah wotprawa nalěwo čitać?",
+    "pad.settings.fontType": "Pismowa družina:",
+    "pad.settings.fontType.normal": "Normalny",
+    "pad.settings.fontType.monospaced": "Monospace",
+    "pad.settings.globalView": "Globalny napohlad",
+    "pad.settings.language": "Rěč:",
+    "pad.importExport.import_export": "Import/Eksport",
+    "pad.importExport.import": "Tekstowu dataju abo dokument nahrać",
+    "pad.importExport.importSuccessful": "Wuspěšny!",
+    "pad.importExport.export": "Aktualny zapisnik eksportować jako:",
+    "pad.importExport.exporthtml": "HTML",
+    "pad.importExport.exportplain": "Luty 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": "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...",
+    "pad.modals.forcereconnect": "Znowa zwjazać",
+    "pad.modals.userdup": "W druhim woknje wočinjeny",
+    "pad.modals.userdup.explanation": "Zda so, zo tutón zapisnik je so we wjace hač jednym woknje wobhladowaka na tutym ličaku wočinił.",
+    "pad.modals.userdup.advice": "Zwjazaj znowa, zo by tute wokno město toho wužiwał.",
+    "pad.modals.unauth": "Njeawtorizowany",
+    "pad.modals.unauth.explanation": "Při wobhladowanju tuteje strony su so twoje prawa změnili. Spytaj so znowa zwjazać.",
+    "pad.modals.looping.explanation": "Su komunikaciske problemy ze synchronizowanskim serwerom.",
+    "pad.modals.looping.cause": "Snano sy přez njekompatibelnu wohnjowu murju abo proksy zwjazany.",
+    "pad.modals.initsocketfail": "Serwer je njedocpějomny.",
+    "pad.modals.initsocketfail.explanation": "Zwisk ze synchronizowanskim serwerom móžno njeje.",
+    "pad.modals.initsocketfail.cause": "To je najskerje problem z twojim wobhladowakom abo twojim internetnym zwiskom.",
+    "pad.modals.slowcommit.explanation": "Serwer njewotmołwja.",
+    "pad.modals.slowcommit.cause": "To móhło problem syćoweho zwiska być.",
+    "pad.modals.badChangeset.explanation": "Změna, kotruž sy přewjedł, je so přez synchronizowanski serwer jako njedowolenu woznamjeniła.",
+    "pad.modals.badChangeset.cause": "To je so snano wopačneje serweroweje konfiguracije dla abo druheho njewočakowaneho zadźerženja dla stało. Prošu staj so ze słužbowym administratorom do zwiska, jeli sej mysliš, zo to je zmylk. Spytaj hišće raz zwjazać, zo by z wobdźěłowanjom pokročował.",
+    "pad.modals.corruptPad.explanation": "Zapisnik, na kotryž chceš přistup měć, je wobškodźeny.",
+    "pad.modals.corruptPad.cause": "To je so snano wopačneje serweroweje konfiguracije dla abo druheho njewočakowaneho zadźerženja dla stało. Prošu staj so ze słužbowym administratorom do zwiska.",
+    "pad.modals.deleted": "Zhašany.",
+    "pad.modals.deleted.explanation": "Tutón zapisnik je so wotstronił.",
+    "pad.modals.disconnected": "Zwisk je přetorhnjeny.",
+    "pad.modals.disconnected.explanation": "Zwisk ze serwerom je so zhubił",
+    "pad.modals.disconnected.cause": "Serwer k dispoziciji njesteji. Prošu informuj słužboweho administratora, jeli to so dale stawa.",
+    "pad.share": "Tutón zapisnik dźělić",
+    "pad.share.readonly": "Jenož čitajomny",
+    "pad.share.link": "Wotkaz",
+    "pad.share.emebdcode": "URL zasadźić",
+    "pad.chat": "Chat",
+    "pad.chat.title": "Chat za tutón zapisnik wočinić",
+    "pad.chat.loadmessages": "Dalše powěsće začitać",
+    "timeslider.pageTitle": "{{appTitle}} - wersijowa historija",
+    "timeslider.toolbar.returnbutton": "Wróćo k zapisnikej",
+    "timeslider.toolbar.authors": "Awtorojo:",
+    "timeslider.toolbar.authorsList": "Žane awtorojo",
+    "timeslider.toolbar.exportlink.title": "Eksportować",
+    "timeslider.exportCurrent": "Aktualnu wersiju eksportować jako:",
+    "timeslider.version": "Wersija {{version}}",
+    "timeslider.saved": "Składowany {{day}}. {{month}} {{year}}",
+    "timeslider.dateformat": "{{day}}. {{month}} {{year}} {{hours}}:{{minutes}}:{{seconds}}",
+    "timeslider.month.january": "januara",
+    "timeslider.month.february": "februara",
+    "timeslider.month.march": "měrca",
+    "timeslider.month.april": "apryla",
+    "timeslider.month.may": "meje",
+    "timeslider.month.june": "junija",
+    "timeslider.month.july": "julija",
+    "timeslider.month.august": "awgusta",
+    "timeslider.month.september": "septembra",
+    "timeslider.month.october": "oktobra",
+    "timeslider.month.november": "nowembra",
+    "timeslider.month.december": "decembra",
+    "timeslider.unnamedauthors": "{{num}} {[plural(num) one: awtor, two: awtoraj, few: awtorojo, other: awtorow ]} bjez mjena",
+    "pad.savedrevs.marked": "Tuta wersija je so nětko jako składowana wersija woznamjeniła",
+    "pad.userlist.entername": "Zapodaj swoje mjeno",
+    "pad.userlist.unnamed": "bjez mjena",
+    "pad.userlist.guest": "Hósć",
+    "pad.userlist.deny": "Wotpokazać",
+    "pad.userlist.approve": "Schwalić",
+    "pad.editbar.clearcolors": "Awtorowe barby w cyłym dokumenće zhašeć?",
+    "pad.impexp.importbutton": "Nětko importować",
+    "pad.impexp.importing": "Importuje so...",
+    "pad.impexp.confirmimport": "Importowanje dataje přepisa aktualny tekst zapisnika. Chceš woprawdźe pokročować?",
+    "pad.impexp.convertFailed": "Njemóžachmy tutu dataju importować. Prošu wužij druhi dokumentowy format abo kopěruj manuelnje",
+    "pad.impexp.uploadFailed": "Nahraće njeje so poradźiło, prošu spytaj hišće raz",
+    "pad.impexp.importfailed": "Import njeje so poradźiło",
+    "pad.impexp.copypaste": "Prošu kopěrować a zasadźić",
+    "pad.impexp.exportdisabled": "Eksport jako format {{type}} je znjemóžnjeny. Prošu staj so ze swojim systemowym administratorom za podrobnosće do zwiska."
+}

src/locales/hu.json

@@ -15,8 +15,8 @@
     "pad.toolbar.strikethrough.title": "Áthúzás",
     "pad.toolbar.ol.title": "Számozott lista",
     "pad.toolbar.ul.title": "Számozatlan lista",
-    "pad.toolbar.indent.title": "Behúzás növelése",
+    "pad.toolbar.indent.title": "Behúzás növelése (TAB)",
-    "pad.toolbar.unindent.title": "Behúzás csökkentése",
+    "pad.toolbar.unindent.title": "Behúzás csökkentése (Shift+TAB)",
     "pad.toolbar.undo.title": "Vissza (Ctrl-Z)",
     "pad.toolbar.redo.title": "Újra (Ctrl-Y)",
     "pad.toolbar.clearAuthorship.title": "Szerzők színezésének kikapcsolása",
@@ -106,4 +106,4 @@
     "pad.impexp.importing": "Importálás…",
     "pad.impexp.uploadFailed": "A feltöltés sikertelen, próbáld meg újra",
     "pad.impexp.importfailed": "Az importálás nem sikerült"
-}
+}

src/locales/ia.json

@@ -50,7 +50,7 @@
     "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, \u003Ca 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\"\u003Einstalla AbiWord\u003C/a\u003E.",
+    "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…",
     "pad.modals.forcereconnect": "Fortiar reconnexion",
@@ -119,4 +119,4 @@
     "pad.impexp.importfailed": "Importation fallite",
     "pad.impexp.copypaste": "Per favor copia e colla",
     "pad.impexp.exportdisabled": "Le exportation in formato {{type}} es disactivate. Per favor contacta le administrator del systema pro detalios."
-}
+}

src/locales/it.json

@@ -15,8 +15,8 @@
     "pad.toolbar.strikethrough.title": "Barrato",
     "pad.toolbar.ol.title": "Elenco numerato",
     "pad.toolbar.ul.title": "Elenco puntato",
-    "pad.toolbar.indent.title": "Rientro",
+    "pad.toolbar.indent.title": "Rientro (TAB)",
-    "pad.toolbar.unindent.title": "Riduci rientro",
+    "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",
@@ -53,7 +53,7 @@
     "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 \u003Ca 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\u003Einstallare Abiword\u003C/a\u003E.",
+    "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...",
     "pad.modals.forcereconnect": "Forza la riconnessione",
@@ -122,4 +122,4 @@
     "pad.impexp.importfailed": "Importazione fallita",
     "pad.impexp.copypaste": "Si prega di copiare e incollare",
     "pad.impexp.exportdisabled": "L'esportazione come {{type}} è disabilitata. Contattare l'amministratore per i dettagli."
-}
+}

src/locales/ja.json

@@ -50,7 +50,7 @@
     "pad.importExport.exportpdf": "PDF",
     "pad.importExport.exportopen": "ODF (Open Document Format)",
     "pad.importExport.exportdokuwiki": "DokuWiki",
-    "pad.importExport.abiword.innerHTML": "プレーンテキストまたは HTML ファイルからのみインポートできます。より高度なインポート機能を使用するには、\u003Ca 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\"\u003Eabiword をインストール\u003C/a\u003Eしてください。",
+    "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.modals.forcereconnect": "強制的に再接続",
@@ -114,9 +114,9 @@
     "pad.impexp.importbutton": "インポートする",
     "pad.impexp.importing": "インポート中...",
     "pad.impexp.confirmimport": "ファイルをインポートすると、パッドの現在のテキストが上書きされます。本当に続行しますか?",
-    "pad.impexp.convertFailed": "このファイルをインポートできませんでした。他の文書形式を使用するか、手作業でコピー \u0026 ペーストしてください",
+    "pad.impexp.convertFailed": "このファイルをインポートできませんでした。他の文書形式を使用するか、手作業でコピー & ペーストしてください",
     "pad.impexp.uploadFailed": "アップロードに失敗しました。もう一度お試しください",
     "pad.impexp.importfailed": "インポートに失敗しました",
-    "pad.impexp.copypaste": "コピー \u0026 ペーストしてください",
+    "pad.impexp.copypaste": "コピー & ペーストしてください",
     "pad.impexp.exportdisabled": "{{type}}形式でのエクスポートは無効になっています。詳細はシステム管理者にお問い合わせください。"
-}
+}

src/locales/km.json

@@ -20,16 +20,28 @@
     "pad.toolbar.import_export.title": "នាំចូល/នាំចេញ ពី/ទៅប្រភេទឯកសារផ្សេងទៀត",
     "pad.toolbar.savedRevision.title": "រក្សាទុកកំណែ",
     "pad.toolbar.settings.title": "ការកំណត់​",
+    "pad.toolbar.embed.title": "ចែក​រំលែក​និង​បង្កប់​ផេត​នេះ",
+    "pad.toolbar.showusers.title": "បង្ហាញ​អ្នក​ប្រើ​លើ​ផេត​នេះ",
     "pad.colorpicker.save": "រក្សាទុក",
     "pad.colorpicker.cancel": "បោះបង់",
     "pad.loading": "កំពុងផ្ទុក…",
+    "pad.passwordRequired": "អ្នក​ត្រូវ​មាន​ពាក្យ​សម្ងាត់ ដើម្បី​ចូល​ផេត​នេះ",
+    "pad.permissionDenied": "អ្នក​មិន​មាន​សិទ្ធិ​ចូល​ផេត​នេះ​ទេ",
+    "pad.wrongPassword": "ពាក្យ​សម្ងាត់​របស់​អ្នក ខុស​ហើយ",
+    "pad.settings.padSettings": "ការ​កំណត់​ផេត",
     "pad.settings.myView": "គំហើញរបស់ខ្ញុំ",
+    "pad.settings.stickychat": "តែង​បង្ហាញ​ការ​ជជែក​លើ​អេក្រង់",
+    "pad.settings.linenocheck": "លេខ​បន្ទាត់",
+    "pad.settings.rtlcheck": "អាន​ពី​ស្ដាំ​ទៅ​ឆ្វេង?",
     "pad.settings.fontType": "ប្រភេទពុម្ពអក្សរ៖",
     "pad.settings.fontType.normal": "ធម្មតា",
+    "pad.settings.fontType.monospaced": "Monospace",
     "pad.settings.globalView": "គំហើញសកល",
     "pad.settings.language": "ភាសា៖",
     "pad.importExport.import_export": "នាំចូល/នាំចេញ",
+    "pad.importExport.import": "ផ្ទុក​ឡើង​ឯកសារ​អត្ថបទ​ណាមួយ",
     "pad.importExport.importSuccessful": "ដោយជោគជ័យ!",
+    "pad.importExport.export": "នាំ​ចេញ​ផេត​បច្ចុប្បន្ន​ជា៖",
     "pad.importExport.exporthtml": "HTML",
     "pad.importExport.exportplain": "Plain text",
     "pad.importExport.exportword": "Microsoft Word",
@@ -37,8 +49,32 @@
     "pad.importExport.exportopen": "ODF (Open Document Format)",
     "pad.importExport.exportdokuwiki": "DokuWiki",
     "pad.modals.connected": "បាន​តភ្ជាប់​។",
+    "pad.modals.reconnecting": "កំពុង​ភ្ជាប់​ទៅ​ផេត​របស់​អ្នក​ម្ដង​ទៀត..",
+    "pad.modals.forcereconnect": "បង្ខំ​ឲ្យ​ភ្ជាប់​ឡើង​វិញ",
+    "pad.modals.userdup": "បាន​បើក​ក្នុង​វីនដូ​មួយ​ទៀត",
+    "pad.modals.unauth.explanation": "សិទ្ធិ​របស់​អ្នក​ត្រូវ​បាន​ប្ដូរ ខណៈ​ពេល​កំពុង​មើល​ទំព័រ​នេះ។ សូម​ព្យាយាម​ភ្ជាប់​ឡើង​វិញ។",
+    "pad.modals.looping.cause": "ប្រហែល​ជា​អ្នក​បាន​ភ្ជាប់​តាម firewall ឬ ប្រុកស៊ី ដែល​មិន​ត្រូវ​គ្នា។",
+    "pad.modals.initsocketfail": "មិន​អាច​ទៅ​ដល់​ម៉ាស៊ីន​បម្រើ។",
+    "pad.modals.initsocketfail.cause": "នេះ​អាច​ជា​បញ្ហា​ជាមួយ​កម្មវិធី​អ៊ីនធឺណិត ឬ​ការ​តភ្ជាប់​អ៊ីនធឺណិត​របស់​អ្នក។",
+    "pad.modals.slowcommit.explanation": "មិន​មាន​ចម្លើយ​តប​ពី​ម៉ាស៊ីន​បម្រើ​ទេ។",
     "pad.modals.deleted": "បាន​លុប។",
+    "pad.modals.deleted.explanation": "បាន​លុប​ផេត​នេះ​ចេញ។",
+    "pad.modals.disconnected.explanation": "បាន​បាត់​ការ​តភ្ជាប់​ទៅ​ម៉ាស៊ីន​បម្រើ",
+    "pad.share": "ចែក​រំលែក​ផេត​នេះ",
+    "pad.share.readonly": "អាន​តែ​ប៉ុណ្ណោះ",
     "pad.share.link": "តំណ​ភ្ជាប់",
+    "pad.share.emebdcode": "URL បង្កប់",
+    "pad.chat": "ជជែក",
+    "pad.chat.title": "បើក​ការ​ជជែក​សម្រាប់​ផេត​នេះ។",
+    "pad.chat.loadmessages": "ផ្ទុក​សារ​ថែម​ទៀត",
+    "timeslider.toolbar.returnbutton": "ត្រឡប់​ទៅ​ផេត",
+    "timeslider.toolbar.authors": "អ្នក​បង្កើត៖",
+    "timeslider.toolbar.authorsList": "គ្មាន​អ្នក​បង្កើត",
+    "timeslider.toolbar.exportlink.title": "នាំចេញ",
+    "timeslider.exportCurrent": "នាំ​ចេញ​កំណែ​បច្ចុប្បន្ន​ជា៖",
+    "timeslider.version": "កំណែ {{version}}",
+    "timeslider.saved": "បាន​រក្សា​ទុក {{month}} {{day}}, {{year}}",
+    "timeslider.dateformat": "{{month}}/{{day}}/{{year}} {{hours}}:{{minutes}}:{{seconds}}",
     "timeslider.month.january": "មករា",
     "timeslider.month.february": "កុម្ភៈ",
     "timeslider.month.march": "មិនា",
@@ -57,5 +93,8 @@
     "pad.userlist.deny": "បដិសេធ",
     "pad.userlist.approve": "យល់​ព្រម",
     "pad.impexp.importbutton": "នាំចូលឥឡូវនេះ",
-    "pad.impexp.importing": "កំពុងនាំចូល​..."
+    "pad.impexp.importing": "កំពុងនាំចូល​...",
-}
+    "pad.impexp.importfailed": "នាំចូល​មិន​បាន​សម្រេច",
+    "pad.impexp.copypaste": "សូម​ចម្លង​ហើយ​បិទ​ភ្ជាប់",
+    "pad.impexp.exportdisabled": "ការ​នាំចេញ​ជា {{type}} ត្រូវ​បាន​បិទ។ សូម​ទាក់ទង​អ្នក​គ្រប់​គ្រង​ប្រព័ន្ធ សម្រាប់​ព័ត៌មាន​បន្ថែម។"
+}

src/locales/ko.json

@@ -51,7 +51,7 @@
     "pad.importExport.exportpdf": "PDF",
     "pad.importExport.exportopen": "ODF (Open Document Format)",
     "pad.importExport.exportdokuwiki": "DokuWiki",
-    "pad.importExport.abiword.innerHTML": "일반 텍스트나 html 형식으로만 가져올 수 있습니다. 고급 가져오기 기능에 대해서는 \u003Ca 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\"\u003Eabiword를 설치\u003C/a\u003E하세요.",
+    "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.modals.forcereconnect": "강제로 다시 연결",
@@ -120,4 +120,4 @@
     "pad.impexp.importfailed": "가져오기를 실패했습니다",
     "pad.impexp.copypaste": "복사하여 붙여넣으세요",
     "pad.impexp.exportdisabled": "{{type}} 형식으로 내보내기가 비활성화되어 있습니다. 자세한 내용은 시스템 관리자에게 문의하시기 바랍니다."
-}
+}

src/locales/ksh.json

@@ -25,7 +25,7 @@
     "pad.toolbar.showusers.title": "Verbonge Metschriiver aanzeije",
     "pad.colorpicker.save": "Faßhallde",
     "pad.colorpicker.cancel": "Ophüüre",
-    "pad.loading": "Ben aam Laade\u0026nbsp;\u0026hellip;",
+    "pad.loading": "Ben aam Laade …",
     "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.",
@@ -50,9 +50,9 @@
     "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 \u003Ca 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\"\u003EEnschtallazjuhn met \u003Ci lang=\"en\"\u003EAbiword\u003C/i\u003E\u003C/a\u003E.",
+    "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\">Abiword</i></a>.",
     "pad.modals.connected": "Verbonge.",
-    "pad.modals.reconnecting": "Ben wider aam Verbenge\u0026nbsp;\u0026hellip;",
+    "pad.modals.reconnecting": "Ben wider aam Verbenge&nbsp;&hellip;",
     "pad.modals.forcereconnect": "Wider verbenge",
     "pad.modals.userdup": "En enem andere Finster en Ärbeid",
     "pad.modals.userdup.explanation": "Heh dat Padd schingk en mieh wi einem Finster vun enem Brauser op heh däm Rääschner op ze sin.",
@@ -112,11 +112,11 @@
     "pad.userlist.approve": "Joodheiße",
     "pad.editbar.clearcolors": "Sulle mer de Färve för de Schriiver uss_em janze Täx fott maache?",
     "pad.impexp.importbutton": "Jäz empoteere",
-    "pad.impexp.importing": "Ben aam Empotteere\u0026nbsp;\u0026hellip;",
+    "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. Wess 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ööje.",
     "pad.impexp.uploadFailed": "Et Huhlaade es donävve jejange, bes esu jood un probeer et norr_ens",
     "pad.impexp.importfailed": "Et Empoteere es donävve jejange",
     "pad.impexp.copypaste": "Bes esu jood un donn et koppeere un enfööje",
     "pad.impexp.exportdisabled": "Et Äxpotteere em {{type}}-Formmaat es affjeschalldt. De Verwallder vun heh dä Sigge künne doh velleisch wiggerhällefe."
-}
+}

src/locales/lb.json

@@ -51,4 +51,4 @@
     "pad.userlist.guest": "Gaascht",
     "pad.impexp.importbutton": "Elo importéieren",
     "pad.impexp.importing": "Importéieren..."
-}
+}

src/locales/lrc.json

@@ -64,4 +64,4 @@
     "pad.impexp.importbutton": "ایسه وارد کو",
     "pad.impexp.importing": "د حالت وارد کردن",
     "pad.impexp.copypaste": "خواهشن وردار بدیسن"
-}
+}

src/locales/lt.json

@@ -70,4 +70,4 @@
     "pad.impexp.uploadFailed": "Įkėlimas nepavyko, bandykite dar kartą",
     "pad.impexp.importfailed": "Importuoti nepavyko",
     "pad.impexp.copypaste": "Prašome nukopijuoti ir įklijuoti"
-}
+}

src/locales/lv.json

@@ -81,4 +81,4 @@
     "pad.impexp.importbutton": "Importēt tūlīt",
     "pad.impexp.importing": "Importē...",
     "pad.impexp.importfailed": "Imports neizdevās"
-}
+}

src/locales/map-bms.json

@@ -50,7 +50,7 @@
     "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 \u003Ca 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\"\u003Emasang abiword\u003C/a\u003E.",
+    "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...",
     "pad.modals.forcereconnect": "Maksa nyambung maning",
@@ -115,4 +115,4 @@
     "pad.impexp.importfailed": "Gole ngimpor gagal",
     "pad.impexp.copypaste": "Monggo salin-tempel",
     "pad.impexp.exportdisabled": "Ngekspor maring format {{type}} ora olih. Monggo takon maring administrator sisteme Rika kanggo detile."
-}
+}

src/locales/mk.json

@@ -20,7 +20,7 @@
     "pad.toolbar.clearAuthorship.title": "Поништи ги авторските бои",
     "pad.toolbar.import_export.title": "Увоз/Извоз од/во разни податотечни формати",
     "pad.toolbar.timeslider.title": "Историски преглед",
-    "pad.toolbar.savedRevision.title": "Зачувај ревизија",
+    "pad.toolbar.savedRevision.title": "Зачувај преработка",
     "pad.toolbar.settings.title": "Поставки",
     "pad.toolbar.embed.title": "Споделете и вметнете ја тетраткава",
     "pad.toolbar.showusers.title": "Прикаж. корисниците на тетраткава",
@@ -51,7 +51,7 @@
     "pad.importExport.exportpdf": "PDF",
     "pad.importExport.exportopen": "ODF (Open Document Format)",
     "pad.importExport.exportdokuwiki": "DokuWiki",
-    "pad.importExport.abiword.innerHTML": "Можете да увезувате само од прост текст и HTML-формат. Понапредни можности за увоз ќе добиете ако \u003Ca 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\"\u003Eвоспоставите AbiWord\u003C/a\u003E.",
+    "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.modals.forcereconnect": "Наметни преповрзување",
@@ -64,7 +64,7 @@
     "pad.modals.looping.cause": "Можеби сте поврзани преку нескладен огнен ѕид или застапник.",
     "pad.modals.initsocketfail": "Опслужувачот е недостапен.",
     "pad.modals.initsocketfail.explanation": "Не можев да се поврзам со усогласителниот опслужувач.",
-    "pad.modals.initsocketfail.cause": "Ова веројатно се должи на проблем со вашиот прелистувач или врската со интернет.",
+    "pad.modals.initsocketfail.cause": "Ова веројатно се должи на проблем со вашиот прелистувач или семрежната врска.",
     "pad.modals.slowcommit.explanation": "Опслужувачот не се одѕива.",
     "pad.modals.slowcommit.cause": "Ова може да се должи на проблеми со мрежното поврзување.",
     "pad.modals.badChangeset.explanation": "Опслужувачот за усогласување го смета уредувањето што го направивте за недопуштено.",
@@ -105,7 +105,7 @@
     "timeslider.month.november": "ноември",
     "timeslider.month.december": "декември",
     "timeslider.unnamedauthors": "{{num}} {[plural(num) one: неименуван автор, other: неименувани автори ]}",
-    "pad.savedrevs.marked": "Оваа ревизија сега е означена како зачувана",
+    "pad.savedrevs.marked": "Оваа преработка сега е означена како зачувана",
     "pad.userlist.entername": "Внесете го вашето име",
     "pad.userlist.unnamed": "без име",
     "pad.userlist.guest": "Гостин",
@@ -120,4 +120,4 @@
     "pad.impexp.importfailed": "Увозот не успеа",
     "pad.impexp.copypaste": "Прекопирајте",
     "pad.impexp.exportdisabled": "Извозот во форматот {{type}} е оневозможен. Ако сакате да дознаете повеќе за ова, обратете се кај системскиот администратор."
-}
+}

src/locales/ml.json

@@ -10,7 +10,7 @@
     },
     "index.newPad": "പുതിയ പാഡ്",
     "index.createOpenPad": "അല്ലെങ്കിൽ പേരുപയോഗിച്ച് പാഡ് സൃഷ്ടിക്കുക/തുറക്കുക:",
-    "pad.toolbar.bold.title": "കടുപ്പത്തിൽ (Ctrl-B)",
+    "pad.toolbar.bold.title": "കടുപ്പത്തിലെഴുതുക (Ctrl-B)",
     "pad.toolbar.italic.title": "ചെരിച്ചെഴുതുക (Ctrl-I)",
     "pad.toolbar.underline.title": "അടിവരയിടുക (Ctrl-U)",
     "pad.toolbar.strikethrough.title": "വെട്ടുക",
@@ -54,7 +54,7 @@
     "pad.importExport.exportpdf": "പി.ഡി.എഫ്.",
     "pad.importExport.exportopen": "ഒ.ഡി.എഫ്. (ഓപ്പൺ ഡോക്യുമെന്റ് ഫോർമാറ്റ്)",
     "pad.importExport.exportdokuwiki": "ഡോകുവിക്കി",
-    "pad.importExport.abiword.innerHTML": "പ്ലെയിൻ ടെക്സ്റ്റോ എച്ച്.റ്റി.എം.എൽ. തരമോ മാത്രമേ താങ്കൾക്ക് ഇറക്കുമതി ചെയ്യാനാവൂ. കൂടുതൽ വിപുലീകൃത ഇറക്കുമതി സൗകര്യങ്ങൾക്കായി ദയവായി \u003Ca 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\"\u003Eഅബിവേഡ് ഇൻസ്റ്റോൾ ചെയ്യുക\u003C/a\u003E.",
+    "pad.importExport.abiword.innerHTML": "പ്ലെയിൻ ടെക്സ്റ്റോ എച്ച്.റ്റി.എം.എൽ. തരമോ മാത്രമേ താങ്കൾക്ക് ഇറക്കുമതി ചെയ്യാനാവൂ. കൂടുതൽ വിപുലീകൃത ഇറക്കുമതി സൗകര്യങ്ങൾക്കായി ദയവായി <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-in-Ubuntu-or-OpenSuse-or-SLES-with-AbiWord\">അബിവേഡ് ഇൻസ്റ്റോൾ ചെയ്യുക</a>.",
     "pad.modals.connected": "ബന്ധിപ്പിച്ചിരിക്കുന്നു.",
     "pad.modals.reconnecting": "താങ്കളുടെ പാഡിലേയ്ക്ക് വീണ്ടും ബന്ധിപ്പിക്കുന്നു...",
     "pad.modals.forcereconnect": "എന്തായാലും ബന്ധിപ്പിക്കുക",
@@ -123,4 +123,4 @@
     "pad.impexp.importfailed": "ഇറക്കുമതി പരാജയപ്പെട്ടു",
     "pad.impexp.copypaste": "ദയവായി പകർത്തി ചേർക്കുക",
     "pad.impexp.exportdisabled": "{{type}} ഫോർമാറ്റിൽ കയറ്റുമതി ചെയ്യുന്നത് തടഞ്ഞിരിക്കുന്നു. കൂടുതൽ വിവരങ്ങൾക്ക് താങ്കളുടെ സിസ്റ്റം അഡ്മിനിസ്ട്രേറ്ററുമായി ബന്ധപ്പെടുക."
-}
+}

src/locales/mr.json

@@ -54,4 +54,4 @@
     "pad.impexp.importing": "आयात करीत आहे...",
     "pad.impexp.importfailed": "आयात अयशस्वी",
     "pad.impexp.copypaste": "कृपया नकल-डकवा"
-}
+}

src/locales/ms.json

@@ -50,7 +50,7 @@
     "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 \u003Ca 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\"\u003Ememasang abiword\u003C/a\u003E.",
+    "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...",
     "pad.modals.forcereconnect": "Sambung semula secara paksa",
@@ -119,4 +119,4 @@
     "pad.impexp.importfailed": "Import gagal",
     "pad.impexp.copypaste": "Sila salin tampal",
     "pad.impexp.exportdisabled": "Mengeksport dalam format {{type}} dilarang. Sila hubungi pentadbir sistem anda untuk keterangan lanjut."
-}
+}

src/locales/nb.json

@@ -50,7 +50,7 @@
     "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, \u003Ca 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\"\u003Einstaller abiword\u003C/a\u003E.",
+    "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...",
     "pad.modals.forcereconnect": "Tving gjenoppkobling",
@@ -115,4 +115,4 @@
     "pad.impexp.importfailed": "Import feilet",
     "pad.impexp.copypaste": "Vennligst kopier og lim inn",
     "pad.impexp.exportdisabled": "Eksporterer som {{type}} er deaktivert. Vennligst kontakt din systemadministrator for detaljer."
-}
+}

src/locales/nds.json

@@ -51,7 +51,7 @@
     "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 \u003Ca 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\"\u003E köönt Se ok anner Saken röverhalen. Dorför mööt Se bidde abiword inrichten\u003C/a\u003E.",
+    "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 ...",
     "pad.modals.forcereconnect": "Noch mal verbinnen",
@@ -116,4 +116,4 @@
     "pad.impexp.importfailed": "Dat Rinhalen hett nich slumpt",
     "pad.impexp.copypaste": "Bidde koperen un rinsetten",
     "pad.impexp.exportdisabled": "Du kannst dat nich in dat {{type}}-Format rutschicken. Wenn du mehr weten wullt, fraag man den Systemadministrator."
-}
+}

src/locales/ne.json

@@ -83,4 +83,4 @@
     "pad.userlist.guest": "पाहुना",
     "pad.userlist.deny": "अस्वीकार गर्ने",
     "pad.userlist.approve": "स्वीकृत गर्ने"
-}
+}

src/locales/nl.json

@@ -50,7 +50,7 @@
     "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. \u003Ca 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\"\u003EInstalleer abiword\u003C/a\u003E om meer geavanceerde importmogelijkheden te krijgen.",
+    "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...",
     "pad.modals.forcereconnect": "Opnieuw verbinden",
@@ -119,4 +119,4 @@
     "pad.impexp.importfailed": "Importeren is mislukt",
     "pad.impexp.copypaste": "Gebruik kopiëren en plakken",
     "pad.impexp.exportdisabled": "Exporteren als {{type}} is uitgeschakeld. Neem contact op met de systeembeheerder voor details."
-}
+}

src/locales/nn.json

@@ -49,7 +49,7 @@
     "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 \u003Ca 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\"\u003Einstaller Abiword\u003C/a\u003E om du treng meir avanserte importfunksjonar.",
+    "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 …",
     "pad.modals.forcereconnect": "Tving gjentilkopling",
@@ -112,4 +112,4 @@
     "pad.impexp.importfailed": "Feil ved importering",
     "pad.impexp.copypaste": "Ver venleg og kopier og lim inn",
     "pad.impexp.exportdisabled": "Eksport av {{type}} er skrudd av. Ver venleg og ta kontakt med systemadministrator for meir informasjon."
-}
+}

src/locales/oc.json

@@ -50,7 +50,7 @@
     "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, \u003Ca 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\"\u003Einstallatz abiword\u003C/a\u003E.",
+    "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...",
     "pad.modals.forcereconnect": "Forçar la reconnexion.",
@@ -119,4 +119,4 @@
     "pad.impexp.importfailed": "Fracàs de l'importacion",
     "pad.impexp.copypaste": "Copiatz/pegatz",
     "pad.impexp.exportdisabled": "Exportar al format {{type}} es desactivat. Contactatz vòstre administrator del sistèma per mai de detalhs."
-}
+}

src/locales/os.json

@@ -50,7 +50,7 @@
     "pad.importExport.exportpdf": "PDF",
     "pad.importExport.exportopen": "ODF (Open Document Format)",
     "pad.importExport.exportdokuwiki": "DokuWiki",
-    "pad.importExport.abiword.innerHTML": "Дӕ бон у импорт кӕнын ӕрмӕст хуымӕтӕг текст кӕнӕ html форматӕй. Лӕмбынӕг импорты миниуджытӕн, дӕ хорзӕхӕй, \u003Ca 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\"\u003Eсӕвӕр abiword\u003C/a\u003E.",
+    "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.modals.forcereconnect": "Тыххӕй баиу кӕнын",
@@ -115,4 +115,4 @@
     "pad.impexp.importfailed": "Импорт нӕ рауад",
     "pad.impexp.copypaste": "Дӕ хорзӕхӕй, къопи кӕн ӕмӕ ӕвӕр",
     "pad.impexp.exportdisabled": "{{type}} форматы экспорт хицӕн у. Дӕ хорзӕхӕй, бадзур дӕ системон администратортӕм фылдӕр базонынӕн."
-}
+}

src/locales/pa.json

@@ -101,4 +101,4 @@
     "pad.impexp.uploadFailed": "ਅੱਪਲੋਡ ਲਈ ਫੇਲ੍ਹ ਹੈ, ਫੇਰ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ।",
     "pad.impexp.importfailed": "ਇੰਪੋਰਟ ਫੇਲ੍ਹ ਹੈ",
     "pad.impexp.copypaste": "ਕਾਪੀ ਕਰੋ ਚੇਪੋ ਜੀ"
-}
+}

src/locales/pl.json

@@ -53,7 +53,7 @@
     "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, \u003Ca 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\"\u003Ezainstaluj abiword\u003C/a\u003E.",
+    "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...",
     "pad.modals.forcereconnect": "Wymuś ponowne połączenie",
@@ -122,4 +122,4 @@
     "pad.impexp.importfailed": "Importowanie nie powiodło się",
     "pad.impexp.copypaste": "Proszę skopiować i wkleić",
     "pad.impexp.exportdisabled": "Eksport do formatu {{type}} jest wyłączony. Proszę skontaktować się z administratorem aby uzyskać więcej szczegółów."
-}
+}

src/locales/ps.json

@@ -60,11 +60,12 @@
     "timeslider.month.october": "اکتوبر",
     "timeslider.month.november": "نومبر",
     "timeslider.month.december": "ډيسمبر",
-    "timeslider.unnamedauthors": "{{num}} بېنومه ليکوالان",
+    "timeslider.unnamedauthors": "{{num}} بې نومه {[ډېرگړي(num) يو: ليکوال، نور: ليکوالان ]}",
     "pad.savedrevs.marked": "اوس دا مخکتنه د يوې خوندي شوې مخکتنې په توگه په نښه شوه",
     "pad.userlist.entername": "نوم مو ورکړۍ",
     "pad.userlist.unnamed": "بې نومه",
     "pad.userlist.guest": "مېلمه",
     "pad.userlist.deny": "ردول",
-    "pad.userlist.approve": "منل"
+    "pad.userlist.approve": "منل",
-}
+    "pad.impexp.copypaste": "لطفاً لمېسل لېښل ترسره کړئ"
+}

src/locales/pt-br.json

@@ -55,7 +55,7 @@
     "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 \u003Ca 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\"\u003Einstale o abiword\u003C/a\u003E.",
+    "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...",
     "pad.modals.forcereconnect": "Forçar reconexão",
@@ -124,4 +124,4 @@
     "pad.impexp.importfailed": "A importação falhou",
     "pad.impexp.copypaste": "Copie e cole",
     "pad.impexp.exportdisabled": "A expostação em formato {{type}} está desativada. Comunique-se com o administrador do sistema para detalhes."
-}
+}

src/locales/pt.json

@@ -4,7 +4,8 @@
             "Hamilton Abreu",
             "Luckas",
             "Tuliouel",
-            "Waldir"
+            "Waldir",
+            "Imperadeiro98"
         ]
     },
     "index.newPad": "Nova Nota",
@@ -13,8 +14,8 @@
     "pad.toolbar.italic.title": "Itálico (Ctrl-I)",
     "pad.toolbar.underline.title": "Sublinhado (Ctrl-U)",
     "pad.toolbar.strikethrough.title": "Riscar",
-    "pad.toolbar.ol.title": "Lista numerada",
+    "pad.toolbar.ol.title": "Lista ordenada",
-    "pad.toolbar.ul.title": "Lista",
+    "pad.toolbar.ul.title": "Lista desordenada",
     "pad.toolbar.indent.title": "Avançar",
     "pad.toolbar.unindent.title": "Recuar",
     "pad.toolbar.undo.title": "Desfazer (Ctrl-Z)",
@@ -24,15 +25,20 @@
     "pad.toolbar.timeslider.title": "Linha de tempo",
     "pad.toolbar.savedRevision.title": "Salvar revisão",
     "pad.toolbar.settings.title": "Configurações",
-    "pad.toolbar.embed.title": "Incorporar este Pad",
+    "pad.toolbar.embed.title": "Compartilhar e incorporar este pad",
     "pad.toolbar.showusers.title": "Mostrar os utilizadores nesta Nota",
     "pad.colorpicker.save": "Gravar",
     "pad.colorpicker.cancel": "Cancelar",
     "pad.loading": "A carregar…",
+    "pad.passwordRequired": "Precisa de uma senha para aceder a este pad",
+    "pad.permissionDenied": "Não tem permissão para aceder a este pad.",
+    "pad.wrongPassword": "A palavra-chave está errada",
     "pad.settings.padSettings": "Configurações da Nota",
     "pad.settings.myView": "Minha vista",
+    "pad.settings.stickychat": "Bate-papo sempre no ecrã",
     "pad.settings.colorcheck": "Cores de autoria",
     "pad.settings.linenocheck": "Números de linha",
+    "pad.settings.rtlcheck": "Ler o conteúdo da direita para a esquerda?",
     "pad.settings.fontType": "Tipo de letra:",
     "pad.settings.fontType.normal": "Normal",
     "pad.settings.fontType.monospaced": "Monoespaçada",
@@ -40,6 +46,7 @@
     "pad.settings.language": "Língua:",
     "pad.importExport.import_export": "Importar/Exportar",
     "pad.importExport.import": "Carregar qualquer ficheiro de texto ou documento",
+    "pad.importExport.importSuccessful": "Bem sucedido!",
     "pad.importExport.export": "Exportar a Nota atual como:",
     "pad.importExport.exporthtml": "HTML",
     "pad.importExport.exportplain": "Texto simples",
@@ -50,10 +57,31 @@
     "pad.modals.connected": "Ligado.",
     "pad.modals.reconnecting": "Reconectando-se ao seu bloco…",
     "pad.modals.forcereconnect": "Forçar reconexão",
+    "pad.modals.userdup": "Aberto noutra janela",
+    "pad.modals.userdup.explanation": "Este pad parece estar aberto em mais do que uma janela do navegador neste computador.",
     "pad.modals.unauth": "Não autorizado",
-    "pad.modals.slowcommit.explanation": "O servidor não está respondendo.",
+    "pad.modals.looping.explanation": "Existem problemas de comunicação com o servidor de sincronização.",
+    "pad.modals.initsocketfail": "O servidor está inacessível.",
+    "pad.modals.initsocketfail.explanation": "Não foi possível a conexão ao servidor de sincronização.",
+    "pad.modals.slowcommit.explanation": "O servidor não está a responder.",
+    "pad.modals.deleted": "Eliminado.",
+    "pad.modals.deleted.explanation": "Este pad foi removido.",
+    "pad.modals.disconnected": "Você foi desconectado.",
+    "pad.modals.disconnected.explanation": "A conexão com o servidor foi perdida",
+    "pad.modals.disconnected.cause": "O servidor pode estar indisponível. Por favor, notifique o administrador de serviço se isto continuar a acontecer.",
+    "pad.share": "Compartilhar este pad",
+    "pad.share.readonly": "Somente para leitura",
+    "pad.chat": "Bate-papo",
+    "pad.chat.title": "Abrir o bate-papo para este pad.",
+    "pad.chat.loadmessages": "Carregar mais mensagens",
+    "timeslider.toolbar.returnbutton": "Voltar ao pad",
     "timeslider.toolbar.authors": "Autores:",
+    "timeslider.toolbar.authorsList": "Sem Autores",
     "timeslider.toolbar.exportlink.title": "Exportar",
+    "timeslider.exportCurrent": "Exportar versão atual como:",
+    "timeslider.version": "Versão {{version}}",
+    "timeslider.saved": "Gravado a {{day}} de {{month}} de {{ano}}",
+    "timeslider.dateformat": "{{day}}/{{month}}/{{year}} {{hours}}:{{minutes}}:{{seconds}}",
     "timeslider.month.january": "Janeiro",
     "timeslider.month.february": "Fevereiro",
     "timeslider.month.march": "Março",
@@ -66,11 +94,17 @@
     "timeslider.month.october": "Outubro",
     "timeslider.month.november": "Novembro",
     "timeslider.month.december": "Dezembro",
+    "pad.savedrevs.marked": "Esta revisão está agora marcada como gravada",
     "pad.userlist.entername": "Insira o seu nome",
     "pad.userlist.unnamed": "sem nome",
     "pad.userlist.guest": "Convidado",
     "pad.userlist.deny": "Negar",
     "pad.userlist.approve": "Aprovar",
+    "pad.editbar.clearcolors": "Deseja limpar as cores de autoria em todo o documento?",
     "pad.impexp.importbutton": "Importar agora",
-    "pad.impexp.importing": "Importando..."
+    "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.uploadFailed": "O upload falhou. Por favor, tente novamente",
+    "pad.impexp.importfailed": "A importação falhou",
+    "pad.impexp.copypaste": "Por favor, copie e cole"
+}

src/locales/ru.json

@@ -16,8 +16,8 @@
     "pad.toolbar.strikethrough.title": "зачёркивание",
     "pad.toolbar.ol.title": "Упорядоченный список",
     "pad.toolbar.ul.title": "Неупорядоченный список",
-    "pad.toolbar.indent.title": "Отступ",
+    "pad.toolbar.indent.title": "Отступ (TAB)",
-    "pad.toolbar.unindent.title": "Выступ",
+    "pad.toolbar.unindent.title": "Выступ (Shift+TAB)",
     "pad.toolbar.undo.title": "Отменить (Ctrl-Z)",
     "pad.toolbar.redo.title": "Вернуть (Ctrl-Y)",
     "pad.toolbar.clearAuthorship.title": "Очистить цвета документа",
@@ -54,7 +54,7 @@
     "pad.importExport.exportpdf": "PDF",
     "pad.importExport.exportopen": "ODF (документ OpenOffice)",
     "pad.importExport.exportdokuwiki": "DokuWiki",
-    "pad.importExport.abiword.innerHTML": "Вы можете импортировать только из обычного текста или HTML. Для более продвинутых функций импорта, пожалуйста, \u003Ca 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\"\u003Eустановите AbiWord\u003C/a\u003E.",
+    "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.modals.forcereconnect": "Принудительное переподключение",
@@ -123,4 +123,4 @@
     "pad.impexp.importfailed": "Ошибка при импортировании",
     "pad.impexp.copypaste": "Пожалуйста, скопируйте",
     "pad.impexp.exportdisabled": "Экспорт в формате {{type}} отключен. Для подробной информации обратитесь к системному администратору."
-}
+}

src/locales/sco.json

@@ -0,0 +1,122 @@
+{
+    "@metadata": {
+        "authors": [
+            "John Reid"
+        ]
+    },
+    "index.newPad": "New Pad",
+    "index.createOpenPad": "or mak/apen ae Pad wi 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": "Cross-oot",
+    "pad.toolbar.ol.title": "Ordered leet",
+    "pad.toolbar.ul.title": "Onordered Leet",
+    "pad.toolbar.indent.title": "Indent (TAB)",
+    "pad.toolbar.unindent.title": "Ootdent (Shift+TAB)",
+    "pad.toolbar.undo.title": "Ondae (Ctrl-Z)",
+    "pad.toolbar.redo.title": "Redae (Ctrl-Y)",
+    "pad.toolbar.clearAuthorship.title": "Clear Authorship Colours",
+    "pad.toolbar.import_export.title": "Import/Export fae/til different file formats",
+    "pad.toolbar.timeslider.title": "Timeslider",
+    "pad.toolbar.savedRevision.title": "Hain Reveesion",
+    "pad.toolbar.settings.title": "Settins",
+    "pad.toolbar.embed.title": "Shair n Embed this pad",
+    "pad.toolbar.showusers.title": "Shaw the uisers oan this pad",
+    "pad.colorpicker.save": "Hain",
+    "pad.colorpicker.cancel": "Cancel",
+    "pad.loading": "Laidin...",
+    "pad.passwordRequired": "Ye need ae passwaird fer tae access this pad",
+    "pad.permissionDenied": "Ye dinna hae permeession tae access this pad",
+    "pad.wrongPassword": "Yer password wis wrang",
+    "pad.settings.padSettings": "Pad Settins",
+    "pad.settings.myView": "Ma Luik",
+    "pad.settings.stickychat": "Tauk aye oan screen",
+    "pad.settings.colorcheck": "Authorship colours",
+    "pad.settings.linenocheck": "Line nummers",
+    "pad.settings.rtlcheck": "Read content fae richt til cair?",
+    "pad.settings.fontType": "Font type:",
+    "pad.settings.fontType.normal": "Normal",
+    "pad.settings.fontType.monospaced": "Monospace",
+    "pad.settings.globalView": "The Global Luik",
+    "pad.settings.language": "Leid:",
+    "pad.importExport.import_export": "Import/Export",
+    "pad.importExport.import": "Upload oni tex file or document",
+    "pad.importExport.importSuccessful": "Success!",
+    "pad.importExport.export": "Export current pad as:",
+    "pad.importExport.exporthtml": "HTML",
+    "pad.importExport.exportplain": "Plain tex",
+    "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..",
+    "pad.modals.forcereconnect": "Force reconnect",
+    "pad.modals.userdup": "Apened in anither windae",
+    "pad.modals.userdup.explanation": "This pad seems tae be apened in mair than yin brouser windae on this computer.",
+    "pad.modals.userdup.advice": "Reconnect fer tae uise this windae instead.",
+    "pad.modals.unauth": "Naw authorized",
+    "pad.modals.unauth.explanation": "Yer permeessions hae chynged while viewing this page. Try tae reconnect.",
+    "pad.modals.looping.explanation": "Thaur ar communication proablems wi the synchronization server.",
+    "pad.modals.looping.cause": "Meyhaps ye connected through aen incompatible firewa or proxy.",
+    "pad.modals.initsocketfail": "Server canna be reached.",
+    "pad.modals.initsocketfail.explanation": "Coudna connect til the synchronization server.",
+    "pad.modals.initsocketfail.cause": "This is possably cause o ae problem wi yer brouser or yer wab connection.",
+    "pad.modals.slowcommit.explanation": "The server isna respondin.",
+    "pad.modals.slowcommit.cause": "This coud be cause o problems wi netwairk connecteevitie.",
+    "pad.modals.badChangeset.explanation": "Aen eedit that ye'v makit wis classeefied aes onlegal bi the synchronization server.",
+    "pad.modals.badChangeset.cause": "This coud be cause o ae wrang server confeeguration or some ither onexpected behavior. Please contact the service admeenistrator, gif ye feel that this is ae mistak. Try tae reconnect in order tae continue editing.",
+    "pad.modals.corruptPad.explanation": "The pad ye'r trying te access is mingin.",
+    "pad.modals.corruptPad.cause": "This micht be cause o ae wrang server confeeguration or some ither onexpected behavior. Please contact the service admeenistrater.",
+    "pad.modals.deleted": "Delytit.",
+    "pad.modals.deleted.explanation": "This pad has been hif't.",
+    "pad.modals.disconnected": "Ye'v been disconnected.",
+    "pad.modals.disconnected.explanation": "The connection til the server wis loast",
+    "pad.modals.disconnected.cause": "The server micht be onavailable. Please notify the service admeenistrater gif this continues tae happen.",
+    "pad.share": "Share this pad",
+    "pad.share.readonly": "Read yinly",
+    "pad.share.link": "Airtin",
+    "pad.share.emebdcode": "Embed URL",
+    "pad.chat": "Chait",
+    "pad.chat.title": "Apen the tauk fer this pad.",
+    "pad.chat.loadmessages": "Laid mair messages",
+    "timeslider.pageTitle": "{{appTitle}} Timeslider",
+    "timeslider.toolbar.returnbutton": "Return til pad",
+    "timeslider.toolbar.authors": "Authers:",
+    "timeslider.toolbar.authorsList": "Nae Authers",
+    "timeslider.toolbar.exportlink.title": "Export",
+    "timeslider.exportCurrent": "Export current version as:",
+    "timeslider.version": "Version {{version}}",
+    "timeslider.saved": "Saved {{day}} {{month}}, {{year}}",
+    "timeslider.dateformat": "{{day}}/{{month}}/{{year}} {{hours}}:{{minutes}}:{{seconds}}",
+    "timeslider.month.january": "Januair",
+    "timeslider.month.february": "Febuair",
+    "timeslider.month.march": "Mairch",
+    "timeslider.month.april": "Apryle",
+    "timeslider.month.may": "Mey",
+    "timeslider.month.june": "Juin",
+    "timeslider.month.july": "Julie",
+    "timeslider.month.august": "August",
+    "timeslider.month.september": "September",
+    "timeslider.month.october": "October",
+    "timeslider.month.november": "November",
+    "timeslider.month.december": "Dizember",
+    "timeslider.unnamedauthors": "{{num}} onnamed {[plural(num) one: writer, other: writers ]}",
+    "pad.savedrevs.marked": "This reveesion is nou tagged aes ae hained reveesion",
+    "pad.userlist.entername": "Enter yer name",
+    "pad.userlist.unnamed": "onnamed",
+    "pad.userlist.guest": "Guest",
+    "pad.userlist.deny": "Bar",
+    "pad.userlist.approve": "Appruiv",
+    "pad.editbar.clearcolors": "Clear authership colours oan the entire document?",
+    "pad.impexp.importbutton": "Import Nou",
+    "pad.impexp.importing": "Importing...",
+    "pad.impexp.confirmimport": "Importin ae file will owerwrite the current tex o the pad. Ar ye sair ye want tae proceed?",
+    "pad.impexp.convertFailed": "We coudna import this file. Please uise ae different document format or copy paste manually",
+    "pad.impexp.uploadFailed": "The upload failed, please try again",
+    "pad.impexp.importfailed": "The import failed",
+    "pad.impexp.copypaste": "Please copy paste",
+    "pad.impexp.exportdisabled": "Exporting as {{type}} format is disabled. Please contact yer system admeenistrator fer details."
+}

src/locales/sk.json

@@ -2,7 +2,8 @@
     "@metadata": {
         "authors": [
             "Teslaton",
-            "Kusavica"
+            "Kusavica",
+            "Rudko"
         ]
     },
     "index.newPad": "Nový Pad",
@@ -51,7 +52,7 @@
     "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 „\u003Ca 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\"\u003EAbiword\u003C/a\u003E“.",
+    "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...",
     "pad.modals.forcereconnect": "Vynútiť znovupripojenie",
@@ -67,6 +68,10 @@
     "pad.modals.initsocketfail.cause": "Príčinou je pravdepodobne problém s prehliadačom alebo internetovým pripojením.",
     "pad.modals.slowcommit.explanation": "Server neodpovedá.",
     "pad.modals.slowcommit.cause": "Príčinou môže byť problém so sieťovým pripojením.",
+    "pad.modals.badChangeset.explanation": "Editácia, kterú ste vykonali byla synchronizáciou serveru vyhodnotená ako nepovolená.",
+    "pad.modals.badChangeset.cause": "To môže byť z dôvodu nesprávnej konfigurácie servera alebo iného neočakávaného správania. Ak máte pocit že došlo k chybe, kontaktuje prosím správcu služby. Pokúste sa pripojiť znova a pokračovať v úpravách.",
+    "pad.modals.corruptPad.explanation": "Pad ku ktorému sa snažíte získať prístup je poškodený.",
+    "pad.modals.corruptPad.cause": "To môže byť z dôvodu nesprávnej konfigurácie servera alebo iného neočakávaného správania. Prosím, obráťte sa na správcu služby.",
     "pad.modals.deleted": "Odstránené.",
     "pad.modals.deleted.explanation": "Tento Pad bol odstránený.",
     "pad.modals.disconnected": "Boli ste odpojení.",
@@ -116,4 +121,4 @@
     "pad.impexp.importfailed": "Import zlyhal",
     "pad.impexp.copypaste": "Vložte prosím kópiu cez schránku",
     "pad.impexp.exportdisabled": "Export do formátu {{type}} nie je povolený. Kontaktujte prosím administrátora pre zistenie detailov."
-}
+}

src/locales/sl.json

@@ -51,7 +51,7 @@
     "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 \u003Ca 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\\\"\u003Eprogram Abiword\u003C/a\u003E.",
+    "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 ...",
     "pad.modals.forcereconnect": "Vsili ponovno povezavo.",
@@ -120,4 +120,4 @@
     "pad.impexp.importfailed": "Uvoz je spodletel.",
     "pad.impexp.copypaste": "Vsebino kopirajte in prilepite.",
     "pad.impexp.exportdisabled": "Izvoz v zapis {{type}} je onemogočen. Za več podrobnosti stopite v stik s skrbnikom."
-}
+}

src/locales/sq.json

@@ -50,7 +50,7 @@
     "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, \u003Ca 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\"\u003Einstaloni Abiword-in\u003C/a\u003E.",
+    "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",
@@ -118,4 +118,4 @@
     "pad.impexp.importfailed": "Importimi dështoi",
     "pad.impexp.copypaste": "Ju lutemi, kopjojeni dhe ngjiteni",
     "pad.impexp.exportdisabled": "Eksportimi në formatin {{type}} është i çaktivizuar. Për hollësi, ju lutemi, lidhuni me administratorin e sistemit."
-}
+}

src/locales/sv.json

@@ -2,7 +2,8 @@
     "@metadata": {
         "authors": [
             "Lokal Profil",
-            "WikiPhoenix"
+            "WikiPhoenix",
+            "Jopparn"
         ]
     },
     "index.newPad": "Nytt block",
@@ -12,7 +13,7 @@
     "pad.toolbar.underline.title": "Understruken (Ctrl-U)",
     "pad.toolbar.strikethrough.title": "Genomstruken",
     "pad.toolbar.ol.title": "Numrerad lista",
-    "pad.toolbar.ul.title": "Ta bort numrerad lista",
+    "pad.toolbar.ul.title": "Osorterad lista",
     "pad.toolbar.indent.title": "Öka indrag (TABB)",
     "pad.toolbar.unindent.title": "Minska indrag (Shift+TABB)",
     "pad.toolbar.undo.title": "Ångra (Ctrl-Z)",
@@ -28,7 +29,7 @@
     "pad.colorpicker.cancel": "Avbryt",
     "pad.loading": "Läser in...",
     "pad.passwordRequired": "Du behöver ett lösenord för att få tillgång till detta block",
-    "pad.permissionDenied": "Du har inte behörighet 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",
@@ -42,7 +43,7 @@
     "pad.settings.globalView": "Global vy",
     "pad.settings.language": "Språk:",
     "pad.importExport.import_export": "Importera/Exportera",
-    "pad.importExport.import": "Ladda upp en textfil eller dokument",
+    "pad.importExport.import": "Ladda upp textfiler eller dokument",
     "pad.importExport.importSuccessful": "Åtgärden slutfördes!",
     "pad.importExport.export": "Export aktuellt block som:",
     "pad.importExport.exporthtml": "HTML",
@@ -51,7 +52,7 @@
     "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 \u003Ca 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\"\u003Einstallera abiword\u003C/a\u003E.",
+    "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",
@@ -62,18 +63,18 @@
     "pad.modals.unauth.explanation": "Din behörighet ändrades medan du visar 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 inte kan nås.",
+    "pad.modals.initsocketfail": "Servern kan inte nås.",
     "pad.modals.initsocketfail.explanation": "Det gick inte att ansluta till synkroniseringsservern.",
-    "pad.modals.initsocketfail.cause": "Detta är beror troligen på ett problem med din webbläsare eller din internetanslutning.",
+    "pad.modals.initsocketfail.cause": "Detta beror troligen på ett problem med din webbläsare eller din internetanslutning.",
     "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 gjorde klassificerades som ogiltig av synkroniseringsservern.",
+    "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.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.",
     "pad.modals.deleted.explanation": "Detta block har tagits bort.",
-    "pad.modals.disconnected": "Du har kopplats från.",
+    "pad.modals.disconnected": "Du har blivit frånkopplad.",
     "pad.modals.disconnected.explanation": "Anslutningen till servern avbröts",
     "pad.modals.disconnected.cause": "Servern kanske är otillgänglig. Var god meddela tjänstadministratören om detta fortsätter att hända.",
     "pad.share": "Dela detta block",
@@ -120,4 +121,4 @@
     "pad.impexp.importfailed": "Importering misslyckades",
     "pad.impexp.copypaste": "Var god kopiera och klistra in",
     "pad.impexp.exportdisabled": "Exportering av formatet {{type}} är inaktiverad. Var god kontakta din systemadministratör för mer information."
-}
+}

src/locales/te.json

@@ -3,7 +3,9 @@
         "authors": [
             "JVRKPRASAD",
             "Malkum",
-            "Veeven"
+            "Veeven",
+            "Chaduvari",
+            "Ravichandra"
         ]
     },
     "index.newPad": "కొత్త పలక",
@@ -54,6 +56,8 @@
     "pad.modals.userdup.advice": "బదులుగా ఈ గవాక్షమును వాడడానికి మరల సంబంధం కలపండి",
     "pad.modals.unauth": "అధికారం లేదు",
     "pad.modals.unauth.explanation": "మీరు ఈ పుటను చూస్తూన్నప్పుడు మీ అనుమతులు మారాయి. మరల సంబంధం కలపడానికి ప్రయత్నించండి.",
+    "pad.modals.initsocketfail": "సర్వరు అందుబాటులో లేదు.",
+    "pad.modals.slowcommit.explanation": "సర్వరు స్పందించడం లేదు.",
     "pad.modals.deleted": "తొలగించబడింది ( తొలగించినది )",
     "pad.share": "ఈ పలకను పంచుకొను",
     "pad.share.readonly": "చదువుటకు మాత్రమే",
@@ -61,11 +65,15 @@
     "pad.share.emebdcode": "యు ఆర్ ఎల్ ను పొదగించండి",
     "pad.chat": "మాటామంతి",
     "pad.chat.title": "ఈ పలకకు మాటామంతిని తెరిచి ఉంచండి.",
+    "pad.chat.loadmessages": "మరిన్ని సందేశాలు తీసుకురా",
     "timeslider.pageTitle": "{{appTitle}} పనిసమయ సూచిక పరికరం",
     "timeslider.toolbar.returnbutton": "పలకకి తిరిగి వెళ్ళండి",
     "timeslider.toolbar.authors": "రచయితలు:",
     "timeslider.toolbar.authorsList": "రచయితలు లేరు",
+    "timeslider.toolbar.exportlink.title": "ఎగుమతి చెయ్యి",
     "timeslider.exportCurrent": "ప్రస్తుత అవతారాన్ని ఈ విధంగా ఎగుమతి చేయుము:",
+    "timeslider.saved": "{{year}}, {{month}} {{day}} న భద్రపరచబడింది",
+    "timeslider.dateformat": "{{month}}/{{day}}/{{year}} {{hours}}:{{minutes}}:{{seconds}}",
     "timeslider.month.january": "జనవరి",
     "timeslider.month.february": "ఫిబ్రవరి",
     "timeslider.month.march": "మార్చి",
@@ -77,5 +85,17 @@
     "timeslider.month.september": "సెప్టెంబరు",
     "timeslider.month.october": "అక్టోబరు",
     "timeslider.month.november": "నవంబరు",
-    "timeslider.month.december": "డిసెంబరు"
+    "timeslider.month.december": "డిసెంబరు",
-}
+    "pad.userlist.entername": "మీ పేరు ఇవ్వండి",
+    "pad.userlist.unnamed": "అనామకం",
+    "pad.userlist.guest": "అతిథి",
+    "pad.userlist.deny": "తిరస్కరించు",
+    "pad.userlist.approve": "ఆమోదించు",
+    "pad.impexp.importbutton": "దిగుమతి చేసెయ్యి",
+    "pad.impexp.importing": "దిగుమతి చేస్తున్నాం...",
+    "pad.impexp.confirmimport": "దిగుమతి చేసుకోవడం వల్ల ప్యాడ్ లోఉన్న పాఠ్యం తుడిచిపెట్టుకుపోతుంది. ఇది మీకు అంగీకారమేనా?",
+    "pad.impexp.convertFailed": "ఈ ఫైలును దిగుమతి చేసుకోలేకపోయాం. వేరే డాక్యుమెంట్ ఫార్మాటును వాడండి లేదా మీరే కాపీ చేసి అతికించండి",
+    "pad.impexp.uploadFailed": "ఎక్కింపు విఫలమైంది, మళ్ళీ ప్రయత్నించండి.",
+    "pad.impexp.importfailed": "దిగుమతి విఫలమైంది",
+    "pad.impexp.copypaste": "నకలు చేసి అతికించండి"
+}

src/locales/tr.json

@@ -53,7 +53,7 @@
     "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 \u003Ca 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\"\u003EAbiWord'ü yükleyin\u003C/a\u003E.",
+    "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...",
     "pad.modals.forcereconnect": "Yeniden bağlanmaya zorla",
@@ -122,4 +122,4 @@
     "pad.impexp.importfailed": "İçe aktarım başarısız oldu",
     "pad.impexp.copypaste": "Lütfen kopyala yapıştır yapın",
     "pad.impexp.exportdisabled": "{{type}} biçimiyle dışa aktarma devre dışı bırakıldı. Ayrıntılar için sistem yöneticinizle iletişime geçiniz."
-}
+}

src/locales/uk.json

@@ -16,8 +16,8 @@
     "pad.toolbar.strikethrough.title": "Закреслення",
     "pad.toolbar.ol.title": "Упорядкований список",
     "pad.toolbar.ul.title": "Неупорядкований список",
-    "pad.toolbar.indent.title": "Відступ",
+    "pad.toolbar.indent.title": "Відступ (TAB)",
-    "pad.toolbar.unindent.title": "Виступ",
+    "pad.toolbar.unindent.title": "Виступ (Shift+TAB)",
     "pad.toolbar.undo.title": "Скасувати (Ctrl-Z)",
     "pad.toolbar.redo.title": "Повторити (Ctrl-Y)",
     "pad.toolbar.clearAuthorship.title": "Очистити кольори документу",
@@ -54,7 +54,7 @@
     "pad.importExport.exportpdf": "PDF",
     "pad.importExport.exportopen": "ODF (документ OpenOffice)",
     "pad.importExport.exportdokuwiki": "DokuWiki",
-    "pad.importExport.abiword.innerHTML": "Ви можете імпортувати лище формати простого тексту або html. Для більш просунутих способів імпорту \u003Ca 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\"\u003Eвстановіть abiword\u003C/a\u003E.",
+    "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.modals.forcereconnect": "Примусове перепідключення",
@@ -123,4 +123,4 @@
     "pad.impexp.importfailed": "Помилка при імпортуванні",
     "pad.impexp.copypaste": "Будь ласка, скопіюйте та вставте",
     "pad.impexp.exportdisabled": "Експорт у формат {{type}} вимкнено. Будь ласка, зв'яжіться із Вашим системним адміністратором за деталями."
-}
+}

src/locales/vi.json

@@ -52,7 +52,7 @@
     "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 \u003Ca 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\"\u003Ecài đặt abiword\u003C/a\u003E.",
+    "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",
     "pad.modals.forcereconnect": "Ép kết nối lại",
@@ -121,4 +121,4 @@
     "pad.impexp.importfailed": "Nhập thất bại",
     "pad.impexp.copypaste": "Xin vui lòng sao chép và dán",
     "pad.impexp.exportdisabled": "Xuất ra định dạng {{type}} đã bị vô hiệu hóa. Xin hãy liên hệ với quản trị viên hệ thống để biết thêm thông tin chi tiết."
-}
+}

src/locales/zh-hans.json

@@ -59,7 +59,7 @@
     "pad.importExport.exportpdf": "PDF",
     "pad.importExport.exportopen": "ODF（开放文档格式）",
     "pad.importExport.exportdokuwiki": "DokuWiki",
-    "pad.importExport.abiword.innerHTML": "您只能导入纯文本或HTML格式。\u003Ca 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\"\u003E安裝abiword\u003C/a\u003E取得更多高级的导入功能。",
+    "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.modals.forcereconnect": "强制重新连接",
@@ -128,4 +128,4 @@
     "pad.impexp.importfailed": "导入失败",
     "pad.impexp.copypaste": "请复制粘贴",
     "pad.impexp.exportdisabled": "{{type}} 格式的导出被禁用。有关详情，请与您的系统管理员联系。"
-}
+}

src/locales/zh-hant.json

@@ -54,7 +54,7 @@
     "pad.importExport.exportpdf": "PDF",
     "pad.importExport.exportopen": "ODF（開放文件格式）",
     "pad.importExport.exportdokuwiki": "DokuWiki",
-    "pad.importExport.abiword.innerHTML": "您只可以純文字或html格式檔匯入。\u003Ca 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\"\u003E安裝abiword\u003C/a\u003E取得更多進階的匯入功能。",
+    "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": "強制重新連線",
@@ -123,4 +123,4 @@
     "pad.impexp.importfailed": "匯入失敗",
     "pad.impexp.copypaste": "請複製貼上",
     "pad.impexp.exportdisabled": "{{type}}格式的匯出被禁用。有關詳情，請與您的系統管理員聯繫。"
-}
+}

src/node/db/SessionManager.js

@@ -263,12 +263,16 @@ exports.deleteSession = function(sessionID, callback)
       db.remove("session:" + sessionID);
       
       //remove session from group2sessions
-      delete group2sessions.sessionIDs[sessionID];
+      if(group2sessions != null) { // Maybe the group was already deleted
-      db.set("group2sessions:" + groupID, group2sessions);
+          delete group2sessions.sessionIDs[sessionID];
-      
+          db.set("group2sessions:" + groupID, group2sessions);
+      }
+
       //remove session from author2sessions
-      delete author2sessions.sessionIDs[sessionID];
+      if(author2sessions != null) { // Maybe the author was already deleted
-      db.set("author2sessions:" + authorID, author2sessions);
+          delete author2sessions.sessionIDs[sessionID];
+          db.set("author2sessions:" + authorID, author2sessions);
+      }
       
       callback();
     }

src/node/handler/PadMessageHandler.js

@@ -167,7 +167,8 @@ exports.handleMessage = function(client, message)
   {
     return;
   }
-  if(!sessioninfos[client.id]) {
+  var thisSession = sessioninfos[client.id]
+  if(!thisSession) {
     messageLogger.warn("Dropped message from an unknown connection.")
     return;
   }
@@ -196,7 +197,7 @@ exports.handleMessage = function(client, message)
     } else if(message.type == "CHANGESET_REQ") {
       handleChangesetRequest(client, message);
     } else if(message.type == "COLLABROOM") {
-      if (sessioninfos[client.id].readonly) {
+      if (thisSession.readonly) {
         messageLogger.warn("Dropped message, COLLABROOM for readonly pad");
       } else if (message.data.type == "USER_CHANGES") {
         stats.counter('pendingEdits').inc()
@@ -588,6 +589,14 @@ function handleUserChanges(data, cb)
     messageLogger.warn("Dropped message, USER_CHANGES Message has no changeset!");
     return cb();
   }
+  //TODO: this might happen with other messages too => find one place to copy the session 
+  //and always use the copy. atm a message will be ignored if the session is gone even 
+  //if the session was valid when the message arrived in the first place
+  if(!sessioninfos[client.id])
+  {
+    messageLogger.warn("Dropped message, disconnect happened in the mean time");
+    return cb();
+  }
 
   //get all Vars we need
   var baseRev = message.data.baseRev;
@@ -1372,7 +1381,7 @@ function getChangesetInfo(padId, startNum, endNum, granularity, callback)
       while (compositeStart < endNum)
       {
         var compositeEnd = compositeStart + granularity;
-        if (compositeEnd > endNum || compositeEnd > head_revision)
+        if (compositeEnd > endNum || compositeEnd > head_revision+1)
         {
           break;
         }
@@ -1500,8 +1509,8 @@ function composePadChangesets(padId, startNum, endNum, callback)
       var changesetsNeeded=[];
 
       var headNum = pad.getHeadRevisionNumber();
-      if (endNum > headNum)
+      if (endNum > headNum+1)
-        endNum = headNum;
+        endNum = headNum+1;
       if (startNum < 0)
         startNum = 0;
       //create a array for all changesets, we will

src/node/hooks/express/specialpages.js

@@ -1,5 +1,7 @@
 var path = require('path');
 var eejs = require('ep_etherpad-lite/node/eejs');
+var toolbar = require("ep_etherpad-lite/node/utils/toolbar");
+var hooks = require('ep_etherpad-lite/static/js/pluginfw/hooks');
 
 exports.expressCreateServer = function (hook_name, args, cb) {
   // expose current stats
@@ -30,14 +32,28 @@ exports.expressCreateServer = function (hook_name, args, cb) {
 
   //serve pad.html under /p
   args.app.get('/p/:pad', function(req, res, next)
-  {    
+  {
-    res.send(eejs.require("ep_etherpad-lite/templates/pad.html", {req: req}));
+    hooks.callAll("padInitToolbar", {
+      toolbar: toolbar
+    });
+
+    res.send(eejs.require("ep_etherpad-lite/templates/pad.html", {
+      req: req,
+      toolbar: toolbar
+    }));
   });
 
   //serve timeslider.html under /p/$padname/timeslider
   args.app.get('/p/:pad/timeslider', function(req, res, next)
   {
-    res.send(eejs.require("ep_etherpad-lite/templates/timeslider.html", {req: req}));
+    hooks.callAll("padInitToolbar", {
+      toolbar: toolbar
+    });
+    
+    res.send(eejs.require("ep_etherpad-lite/templates/timeslider.html", {
+      req: req,
+      toolbar: toolbar
+    }));
   });
 
   //serve favicon.ico from all path levels except as a pad name

src/node/hooks/express/webaccess.js

@@ -41,7 +41,7 @@ exports.basicAuth = function (req, res, next) {
         req.session.user = settings.users[username];
         return cb(true);
       }
-        return hooks.aCallFirst("authenticate", {req: req, res:res, next:next, username: username, password: password}, hookResultMangle(cb));
+      return hooks.aCallFirst("authenticate", {req: req, res:res, next:next, username: username, password: password}, hookResultMangle(cb));
     }
     hooks.aCallFirst("authenticate", {req: req, res:res, next:next}, hookResultMangle(cb));
   }

src/node/utils/Settings.js

@@ -79,6 +79,26 @@ exports.dbSettings = { "filename" : path.join(exports.root, "dirty.db") };
  */
 exports.defaultPadText = "Welcome to Etherpad!\n\nThis pad text is synchronized as you type, so that everyone viewing this page sees the same text. This allows you to collaborate seamlessly on documents!\n\nEtherpad on Github: http:\/\/j.mp/ep-lite\n";
 
+/**
+ * The toolbar buttons and order.
+ */
+exports.toolbar = {
+  left: [
+    ["bold", "italic", "underline", "strikethrough"],
+    ["orderedlist", "unorderedlist", "indent", "outdent"],
+    ["undo", "redo"],
+    ["clearauthorship"]
+  ],
+  right: [
+    ["importexport", "timeslider", "savedrevision"],
+    ["settings", "embed"],
+    ["showusers"]
+  ],
+  timeslider: [
+    ["timeslider_export", "timeslider_returnToPad"]
+  ]
+}
+
 /**
  * A flag that requires any user to have a valid session (via the api) before accessing a pad
  */

src/node/utils/toolbar.js

@@ -0,0 +1,239 @@
+/**
+ * The Toolbar Module creates and renders the toolbars and buttons
+ */
+var _ = require("underscore")
+  , tagAttributes
+  , tag
+  , defaultButtons
+  , Button
+  , ButtonsGroup
+  , Separator
+  , defaultButtonAttributes;
+
+defaultButtonAttributes = function (name, overrides) {
+  return {
+    command: name,
+    localizationId: "pad.toolbar." + name + ".title",
+    class: "buttonicon buttonicon-" + name
+  };
+};
+
+tag = function (name, attributes, contents) {
+  var aStr = tagAttributes(attributes);
+
+  if (_.isString(contents) && contents.length > 0) {
+    return '<' + name + aStr + '>' + contents + '</' + name + '>';
+  }
+  else {
+    return '<' + name + aStr + '></' + name + '>';
+  }
+};
+
+tagAttributes = function (attributes) {
+  attributes = _.reduce(attributes || {}, function (o, val, name) {
+    if (!_.isUndefined(val)) {
+      o[name] = val;
+    }
+    return o;
+  }, {});
+
+  return " " + _.map(attributes, function (val, name) {
+    return "" + name + '="' + _.escape(val) + '"';
+  }).join(" ");
+};
+
+ButtonsGroup = function () {
+  this.buttons = [];
+};
+
+ButtonsGroup.fromArray = function (array) {
+  var btnGroup = new this;
+  _.each(array, function (btnName) {
+    btnGroup.addButton(Button.load(btnName));
+  });
+  return btnGroup;
+};
+
+ButtonsGroup.prototype.addButton = function (button) {
+  this.buttons.push(button);
+  return this;
+};
+
+ButtonsGroup.prototype.render = function () {
+  if (this.buttons.length == 1) {
+    this.buttons[0].grouping = "";
+  }
+  else {
+    _.first(this.buttons).grouping = "grouped-left";
+    _.last(this.buttons).grouping = "grouped-right";
+    _.each(this.buttons.slice(1, -1), function (btn) {
+      btn.grouping = "grouped-middle"
+    });
+  }
+
+  return _.map(this.buttons, function (btn) {
+    return btn.render();
+  }).join("\n");
+};
+
+Button = function (attributes) {
+  this.attributes = attributes;
+};
+
+Button.load = function (btnName) {
+  var button = module.exports.availableButtons[btnName];
+  if (button.constructor === Button || button.constructor === SelectButton) {
+    return button;
+  }
+  else {
+    return new Button(button);
+  }
+};
+
+_.extend(Button.prototype, {
+  grouping: "",
+
+  render: function () {
+    var liAttributes = {
+      "data-type": "button",
+      "data-key": this.attributes.command,
+    };
+    return tag("li", liAttributes,
+      tag("a", { "class": this.grouping },
+        tag("span", { "class": " "+ this.attributes.class, "data-l10n-id": this.attributes.localizationId })
+      )
+    );
+  }
+});
+
+SelectButton = function (attributes) {
+  this.attributes = attributes;
+  this.options = [];
+};
+
+_.extend(SelectButton.prototype, Button.prototype, {
+  addOption: function (value, text, attributes) {
+    this.options.push({
+      value: value,
+      text: text,
+      attributes: attributes
+    });
+    return this;
+  },
+
+  select: function (attributes) {
+    var self = this
+      , options = [];
+
+    _.each(this.options, function (opt) {
+      var a = _.extend({
+        value: opt.value
+      }, opt.attributes);
+
+      options.push( tag("option", a, opt.text) );
+    });
+    return tag("select", attributes, options.join(""));
+  },
+
+  render: function () {
+    var attributes = {
+      id: this.attributes.id,
+      "data-key": this.attributes.command,
+      "data-type": "select"
+    };
+    return tag("li", attributes,
+      this.select({ id: this.attributes.selectId })
+    );
+  }
+});
+
+Separator = function () {};
+Separator.prototype.render = function () {
+  return tag("li", { "class": "separator" });
+};
+
+module.exports = {
+  availableButtons: {
+    bold: defaultButtonAttributes("bold"),
+    italic: defaultButtonAttributes("italic"),
+    underline: defaultButtonAttributes("underline"),
+    strikethrough: defaultButtonAttributes("strikethrough"),
+
+    orderedlist: {
+      command: "insertorderedlist",
+      localizationId: "pad.toolbar.ol.title",
+      class: "buttonicon buttonicon-insertorderedlist"
+    },
+
+    unorderedlist: {
+      command: "insertunorderedlist",
+      localizationId: "pad.toolbar.ul.title",
+      class: "buttonicon buttonicon-insertunorderedlist"
+    },
+
+    indent: defaultButtonAttributes("indent"),
+    outdent: {
+      command: "outdent",
+      localizationId: "pad.toolbar.unindent.title",
+      class: "buttonicon buttonicon-outdent"
+    },
+
+    undo: defaultButtonAttributes("undo"),
+    redo: defaultButtonAttributes("redo"),
+
+    clearauthorship: {
+      command: "clearauthorship",
+      localizationId: "pad.toolbar.clearAuthorship.title",
+      class: "buttonicon buttonicon-clearauthorship"
+    },
+
+    importexport: {
+      command: "import_export",
+      localizationId: "pad.toolbar.import_export.title",
+      class: "buttonicon buttonicon-import_export"
+    },
+
+    timeslider: {
+      command: "showTimeSlider",
+      localizationId: "pad.toolbar.timeslider.title",
+      class: "buttonicon buttonicon-history"
+    },
+
+    savedrevision: defaultButtonAttributes("savedRevision"),
+    settings: defaultButtonAttributes("settings"),
+    embed: defaultButtonAttributes("embed"),
+    showusers: defaultButtonAttributes("showusers"),
+    
+    timeslider_export: {
+      command: "import_export",
+      localizationId: "timeslider.toolbar.exportlink.title",
+      class: "buttonicon buttonicon-import_export"
+    },
+    
+    timeslider_returnToPad: {
+      command: "timeslider_returnToPad",
+      localizationId: "timeslider.toolbar.returnbutton",
+      class: "buttontext"
+    }
+  },
+
+  registerButton: function (buttonName, buttonInfo) {
+    this.availableButtons[buttonName] = buttonInfo;
+  },
+
+  button: function (attributes) {
+    return new Button(attributes);
+  },
+  separator: function () {
+    return (new Separator).render();
+  },
+  selectButton: function (attributes) {
+    return new SelectButton(attributes);
+  },
+  menu: function (buttons) {
+    var groups = _.map(buttons, function (group) {
+      return ButtonsGroup.fromArray(group).render();
+    });
+    return groups.join(this.separator());
+  }
+};

src/package.json

@@ -52,5 +52,5 @@
   "repository"     : { "type" : "git",
                        "url" : "http://github.com/ether/etherpad-lite.git"
                      },
-  "version"        : "1.3.0"
+  "version"        : "1.4.0"
 }

src/static/css/pad.css

@@ -126,6 +126,10 @@ a img {
   position: relative;
   top: 1px;
 }
+.toolbar ul li a .buttontext {
+  color: #222;
+  font-size: 14px;
+}
 .toolbar ul li a.grouped-left {
   border-radius: 3px 0 0 3px;
 }

src/static/css/timeslider.css

@@ -157,13 +157,6 @@
 #editbarright {
   float: right
 }
-#returnbutton {
-  color: #222;
-  font-size: 16px;
-  line-height: 29px;
-  margin-top: 0;
-  padding-right: 6px;
-}
 #settings,
 #importexport,
 #embed,

src/static/js/Changeset.js

@@ -1867,7 +1867,7 @@ exports.inverse = function (cs, lines, alines, pool) {
       curLineOpIterLine = curLine;
       var indexIntoLine = 0;
       var done = false;
-      while (!done) {
+      while (!done && curLineOpIter.hasNext()) {
         curLineOpIter.next(curLineNextOp);
         if (indexIntoLine + curLineNextOp.chars >= curChar) {
           curLineNextOp.chars -= (curChar - indexIntoLine);

src/static/js/ace2_inner.js

@@ -3751,7 +3751,7 @@ function Ace2Inner(){
           specialHandled = true;
         }
         if((evt.which == 36 && evt.ctrlKey == true)){ setScrollY(0); } // Control Home send to Y = 0
-        if((evt.which == 33 || evt.which == 34) && type == 'keydown'){
+        if((evt.which == 33 || evt.which == 34) && type == 'keydown' && !evt.ctrlKey){
 
           evt.preventDefault(); // This is required, browsers will try to do normal default behavior on page up / down and the default behavior SUCKS
 

src/static/js/domline.js

@@ -102,8 +102,6 @@ domline.createDomLine = function(nonEmpty, doesWrap, optBrowser, optDocument)
       var listType = /(?:^| )list:(\S+)/.exec(cls);
       var start = /(?:^| )start:(\S+)/.exec(cls);
 
-      console.log("WUT", cls, lineAttributeMarker)
-
       _.map(hooks.callAll("aceDomLinePreProcessLineAttributes", {
         domline: domline,
         cls: cls
@@ -121,8 +119,8 @@ domline.createDomLine = function(nonEmpty, doesWrap, optBrowser, optDocument)
         {
           if(listType.indexOf("number") < 0)
           {
-            preHtml = '<ul class="list-' + Security.escapeHTMLAttribute(listType) + '"><li>';
+            preHtml += '<ul class="list-' + Security.escapeHTMLAttribute(listType) + '"><li>';
-            postHtml = '</li></ul>';
+            postHtml = '</li></ul>' + postHtml;
           }
           else
           {
@@ -130,16 +128,15 @@ domline.createDomLine = function(nonEmpty, doesWrap, optBrowser, optDocument)
               if(start[1] == 1){ // if its the first one at this level?
                 lineClass = lineClass + " " + "list-start-" + listType; // Add start class to DIV node
               }
-              preHtml = '<ol start='+start[1]+' class="list-' + Security.escapeHTMLAttribute(listType) + '"><li>';
+              preHtml += '<ol start='+start[1]+' class="list-' + Security.escapeHTMLAttribute(listType) + '"><li>';
             }else{
-               preHtml = '<ol class="list-' + Security.escapeHTMLAttribute(listType) + '"><li>'; // Handles pasted contents into existing lists
+              preHtml += '<ol class="list-' + Security.escapeHTMLAttribute(listType) + '"><li>'; // Handles pasted contents into existing lists
             }
-            postHtml = '</li></ol>';
+            postHtml += '</li></ol>';
           }
         } 
         processedMarker = true;
       }
-      
       _.map(hooks.callAll("aceDomLineProcessLineAttributes", {
         domline: domline,
         cls: cls
@@ -149,13 +146,10 @@ domline.createDomLine = function(nonEmpty, doesWrap, optBrowser, optDocument)
         postHtml += modifier.postHtml;
         processedMarker |= modifier.processedMarker;
       });
-      
       if( processedMarker ){
         result.lineMarker += txt.length;
         return; // don't append any text
       } 
-
-
     }
     var href = null;
     var simpleTags = null;
@@ -258,7 +252,6 @@ domline.createDomLine = function(nonEmpty, doesWrap, optBrowser, optDocument)
   {
     return curHTML || '';
   };
-
   return result;
 };
 

src/static/js/pad.js

@@ -254,8 +254,9 @@ function handshake()
     //the access was not granted, give the user a message
     if(obj.accessStatus)
     {
-      if(!receivedClientVars)
+      if(!receivedClientVars){
         $('.passForm').submit(require(module.id).savePassword);
+      }
 
       if(obj.accessStatus == "deny")
       {

src/static/js/pad_editbar.js

@@ -1,5 +1,5 @@
 /**
- * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This code is mostly from the old Etherpad. Please help us to comment this code.
  * This helps other people to understand this code better and helps them to improve it.
  * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
  */
@@ -20,18 +20,60 @@
  * limitations under the License.
  */
 
+var hooks = require('./pluginfw/hooks');
 var padutils = require('./pad_utils').padutils;
 var padeditor = require('./pad_editor').padeditor;
 var padsavedrevs = require('./pad_savedrevs');
 
-function indexOf(array, value) {
+var ToolbarItem = function (element) {
-  for (var i = 0, ii = array.length; i < ii; i++) {
+  this.$el = element;
-    if (array[i] == value) {
+};
-      return i;
+
-    }
+ToolbarItem.prototype.getCommand = function () {
+  return this.$el.attr("data-key");
+};
+
+ToolbarItem.prototype.getValue = function () {
+  if (this.isSelect()) {
+    return this.$el.find("select").val();
   }
-  return -1;
+};
-}
+
+ToolbarItem.prototype.setValue = function (val) {
+  if (this.isSelect()) {
+    return this.$el.find("select").val(val);
+  }
+};
+
+
+ToolbarItem.prototype.getType = function () {
+  return this.$el.attr("data-type");
+};
+
+ToolbarItem.prototype.isSelect = function () {
+  return this.getType() == "select";
+};
+
+ToolbarItem.prototype.isButton = function () {
+  return this.getType() == "button";
+};
+
+ToolbarItem.prototype.bind = function (callback) {
+  var self = this;
+
+  if (self.isButton()) {
+    self.$el.click(function (event) {
+      callback(self.getCommand(), self);
+      event.preventDefault();
+    });
+  }
+  else if (self.isSelect()) {
+    self.$el.find("select").change(function () {
+      callback(self.getCommand(), self);
+    });
+  }
+};
+
 
 var padeditbar = (function()
 {
@@ -95,17 +137,24 @@ var padeditbar = (function()
   }());
 
   var self = {
-    init: function()
+    init: function() {
-    {
       var self = this;
+      self.dropdowns = [];
+      
       $("#editbar .editbarbutton").attr("unselectable", "on"); // for IE
       $("#editbar").removeClass("disabledtoolbar").addClass("enabledtoolbar");
-      $("#editbar [data-key]").each(function (i, e) {
+      $("#editbar [data-key]").each(function () {
-        $(e).click(function (event) {
+        (new ToolbarItem($(this))).bind(function (command, item) {
-          self.toolbarClick($(e).attr('data-key'));
+          self.triggerCommand(command, item);
-          event.preventDefault();
         });
       });
+
+      registerDefaultCommands(self);
+
+      hooks.callAll("postToolbarInit", {
+        toolbar: self,
+        ace: padeditor.ace
+      });
     },
     isEnabled: function()
     {
@@ -116,114 +165,70 @@ var padeditbar = (function()
     {
       $("#editbar").addClass('disabledtoolbar').removeClass("enabledtoolbar");
     },
-    toolbarClick: function(cmd)
+    commands: {},
-    {  
+    registerCommand: function (cmd, callback) {
-      if (self.isEnabled())
+      this.commands[cmd] = callback;
-      {
+      return this;
-        if(cmd == "showusers")
+    },
-        {
+    registerDropdownCommand: function (cmd, dropdown) {
-          self.toggleDropDown("users");
+      dropdown = dropdown || cmd;
-        }
+      self.dropdowns.push(dropdown)
-        else if (cmd == 'settings')
+      this.registerCommand(cmd, function () {
-        {
+        self.toggleDropDown(dropdown);
-              self.toggleDropDown("settings");
+      });
-        }
+    },
-        else if (cmd == 'connectivity')
+    registerAceCommand: function (cmd, callback) {
-        {
+      this.registerCommand(cmd, function (cmd, ace) {
-              self.toggleDropDown("connectivity");
+        ace.callWithAce(function (ace) {
-        }
+          callback(cmd, ace);
-        else if (cmd == 'embed')
+        }, cmd, true);
-        {
+      });
-          self.setEmbedLinks();
+    },
-          $('#linkinput').focus().select();
+    triggerCommand: function (cmd, item) {
-          self.toggleDropDown("embed");
+      if (self.isEnabled() && this.commands[cmd]) {
-        }
+        this.commands[cmd](cmd, padeditor.ace, item);
-        else if (cmd == 'import_export')
-        {
-          self.toggleDropDown("importexport");
-        }
-        else if (cmd == 'savedRevision')
-        {
-          padsavedrevs.saveNow();
-        }
-        else
-        {
-          padeditor.ace.callWithAce(function(ace)
-          {
-            if (cmd == 'bold' || cmd == 'italic' || cmd == 'underline' || cmd == 'strikethrough') ace.ace_toggleAttributeOnSelection(cmd);
-            else if (cmd == 'undo' || cmd == 'redo') ace.ace_doUndoRedo(cmd);
-            else if (cmd == 'insertunorderedlist') ace.ace_doInsertUnorderedList();
-            else if (cmd == 'insertorderedlist') ace.ace_doInsertOrderedList();
-            else if (cmd == 'indent')
-            {
-              ace.ace_doIndentOutdent(false);
-            }
-            else if (cmd == 'outdent')
-            {
-              ace.ace_doIndentOutdent(true);
-            }
-            else if (cmd == 'clearauthorship')
-            {
-              if ((!(ace.ace_getRep().selStart && ace.ace_getRep().selEnd)) || ace.ace_isCaret())
-              {
-                if (window.confirm(html10n.get("pad.editbar.clearcolors")))
-                {
-                  ace.ace_performDocumentApplyAttributesToCharRange(0, ace.ace_getRep().alltext.length, [
-                    ['author', '']
-                  ]);
-                }
-              }
-              else
-              {
-                ace.ace_setAttributeOnSelection('author', '');
-              }
-            }
-          }, cmd, true);
-        }
       }
       if(padeditor.ace) padeditor.ace.focus();
     },
     toggleDropDown: function(moduleName, cb)
     {
-      var modules = ["settings", "connectivity", "importexport", "embed", "users"];
-      
       // hide all modules and remove highlighting of all buttons
       if(moduleName == "none")
       {
         var returned = false
-        for(var i=0;i<modules.length;i++)
+        for(var i=0;i<self.dropdowns.length;i++)
         {
           //skip the userlist
-          if(modules[i] == "users")
+          if(self.dropdowns[i] == "users")
             continue;
-          
+
-          var module = $("#" + modules[i]);
+          var module = $("#" + self.dropdowns[i]);
-        
+
           if(module.css('display') != "none")
           {
-            $("#" + modules[i] + "link").removeClass("selected");
+            $("#" + self.dropdowns[i] + "link").removeClass("selected");
             module.slideUp("fast", cb);
             returned = true;
           }
         }
         if(!returned && cb) return cb();
       }
-      else 
+      else
       {
         // hide all modules that are not selected and remove highlighting
         // respectively add highlighting to the corresponding button
-        for(var i=0;i<modules.length;i++)
+        for(var i=0;i<self.dropdowns.length;i++)
         {
-          var module = $("#" + modules[i]);
+          var module = $("#" + self.dropdowns[i]);
-        
+
           if(module.css('display') != "none")
           {
-            $("#" + modules[i] + "link").removeClass("selected");
+            $("#" + self.dropdowns[i] + "link").removeClass("selected");
             module.slideUp("fast");
           }
-          else if(modules[i]==moduleName)
+          else if(self.dropdowns[i]==moduleName)
           {
-            $("#" + modules[i] + "link").addClass("selected");
+            $("#" + self.dropdowns[i] + "link").addClass("selected");
             module.slideDown("fast", cb);
           }
         }
@@ -257,6 +262,85 @@ var padeditbar = (function()
       }
     }
   };
+
+  function aceAttributeCommand(cmd, ace) {
+    ace.ace_toggleAttributeOnSelection(cmd);
+  }
+
+  function registerDefaultCommands(toolbar) {
+    toolbar.registerDropdownCommand("showusers", "users");
+    toolbar.registerDropdownCommand("settings");
+    toolbar.registerDropdownCommand("connectivity");
+    toolbar.registerDropdownCommand("import_export", "importexport");
+    toolbar.registerDropdownCommand("embed");
+
+    toolbar.registerCommand("embed", function () {
+      toolbar.setEmbedLinks();
+      $('#linkinput').focus().select();
+      toolbar.toggleDropDown("embed");
+    });
+
+    toolbar.registerCommand("savedRevision", function () {
+      padsavedrevs.saveNow();
+    });
+
+    toolbar.registerCommand("showTimeSlider", function () {
+      document.location = document.location.pathname+ '/timeslider';
+    });
+
+    toolbar.registerAceCommand("bold", aceAttributeCommand);
+    toolbar.registerAceCommand("italic", aceAttributeCommand);
+    toolbar.registerAceCommand("underline", aceAttributeCommand);
+    toolbar.registerAceCommand("strikethrough", aceAttributeCommand);
+
+    toolbar.registerAceCommand("undo", function (cmd, ace) {
+      ace.ace_doUndoRedo(cmd);
+    });
+
+    toolbar.registerAceCommand("redo", function (cmd, ace) {
+      ace.ace_doUndoRedo(cmd);
+    });
+
+    toolbar.registerAceCommand("insertunorderedlist", function (cmd, ace) {
+      ace.ace_doInsertUnorderedList();
+    });
+
+    toolbar.registerAceCommand("insertorderedlist", function (cmd, ace) {
+      ace.ace_doInsertOrderedList();
+    });
+
+    toolbar.registerAceCommand("indent", function (cmd, ace) {
+      if (!ace.ace_doIndentOutdent(false)) {
+        ace.ace_doInsertUnorderedList();
+      }
+    });
+
+    toolbar.registerAceCommand("outdent", function (cmd, ace) {
+      ace.ace_doIndentOutdent(true);
+    });
+
+    toolbar.registerAceCommand("clearauthorship", function (cmd, ace) {
+      if ((!(ace.ace_getRep().selStart && ace.ace_getRep().selEnd)) || ace.ace_isCaret()) {
+        if (window.confirm(html10n.get("pad.editbar.clearcolors"))) {
+          ace.ace_performDocumentApplyAttributesToCharRange(0, ace.ace_getRep().alltext.length, [
+            ['author', '']
+          ]);
+        }
+      }
+      else {
+        ace.ace_setAttributeOnSelection('author', '');
+      }
+    });
+
+    toolbar.registerCommand('timeslider_returnToPad', function(cmd) {
+      if( document.referrer.length > 0 && document.referrer.substring(document.referrer.lastIndexOf("/")-1, document.referrer.lastIndexOf("/")) === "p") {
+        document.location = document.referrer;
+      } else {
+        document.location = document.location.href.substring(0,document.location.href.lastIndexOf("/"));
+      }
+    });
+  }
+
   return self;
 }());
 

src/static/js/timeslider.js

@@ -95,12 +95,6 @@ function init() {
     //get all the export links
     export_links = $('#export > .exportlink')
 
-    if(document.referrer.length > 0 && document.referrer.substring(document.referrer.lastIndexOf("/")-1,document.referrer.lastIndexOf("/")) === "p") {
-      $("#returnbutton").attr("href", document.referrer);
-    } else {
-      $("#returnbutton").attr("href", document.location.href.substring(0,document.location.href.lastIndexOf("/")));
-    }
-
     $('button#forcereconnect').click(function()
     {
       window.location.reload();

src/templates/pad.html

@@ -1,6 +1,8 @@
 <%
   var settings = require("ep_etherpad-lite/node/utils/Settings")
+    , hooks = require('ep_etherpad-lite/static/js/pluginfw/hooks')
     , langs = require("ep_etherpad-lite/node/hooks/i18n").availableLangs
+    ;
 %>
 <!doctype html>
 <% e.begin_block("htmlHead"); %>
@@ -54,103 +56,15 @@
             <div id="overlay">
                 <div id="overlay-inner"></div>
             </div>
+
             <ul class="menu_left">
                 <% e.begin_block("editbarMenuLeft"); %>
-                <li class="acl-write" id="bold" data-key="bold">
+                <%- toolbar.menu(settings.toolbar.left) %>
-                    <a class="grouped-left" data-l10n-id="pad.toolbar.bold.title">
-                      <span class="buttonicon buttonicon-bold"></span>
-                    </a>
-                </li>
-                <li class="acl-write" id="italic" data-key="italic">
-                    <a class="grouped-middle" data-l10n-id="pad.toolbar.italic.title">
-                      <span class="buttonicon buttonicon-italic"></span>
-                    </a>
-                </li>
-                <li class="acl-write" id="underline" data-key="underline">
-                    <a class="grouped-middle" data-l10n-id="pad.toolbar.underline.title">
-                      <span class="buttonicon buttonicon-underline"></span>
-                    </a>
-                </li>
-                <li class="acl-write" id="strikethrough" data-key="strikethrough">
-                    <a class="grouped-right" data-l10n-id="pad.toolbar.strikethrough.title">
-                      <span class="buttonicon buttonicon-strikethrough"></span>
-                    </a>
-                </li>
-                <li class="acl-write separator"></li>
-                <li class="acl-write" id="oderedlist" data-key="insertorderedlist">
-                    <a class="grouped-left" data-l10n-id="pad.toolbar.ol.title">
-                      <span class="buttonicon buttonicon-insertorderedlist"></span>
-                    </a>
-                </li>
-                <li class="acl-write" id="unoderedlist" data-key="insertunorderedlist">
-                    <a class="grouped-middle" data-l10n-id="pad.toolbar.ul.title">
-                      <span class="buttonicon buttonicon-insertunorderedlist"></span>
-                    </a>
-                </li>
-                <li class="acl-write" id="indent" data-key="indent">
-                    <a class="grouped-middle" data-l10n-id="pad.toolbar.indent.title">
-                      <span class="buttonicon buttonicon-indent"></span>
-                    </a>
-                </li>
-                <li class="acl-write" id="outdent" data-key="outdent">
-                    <a class="grouped-right" data-l10n-id="pad.toolbar.unindent.title">
-                      <span class="buttonicon buttonicon-outdent"></span>
-                    </a>
-                </li>
-                <li class="acl-write separator"></li>
-                <li class="acl-write" id="undo" data-key="undo">
-                    <a class="grouped-left" data-l10n-id="pad.toolbar.undo.title">
-                      <span class="buttonicon buttonicon-undo"></span>
-                    </a>
-                </li>
-                <li class="acl-write" id="redo" data-key="redo">
-                    <a class="grouped-right" data-l10n-id="pad.toolbar.redo.title">
-                      <span class="buttonicon buttonicon-redo"></span>
-                    </a>
-                </li>
-                <li class="acl-write separator"></li>
-                <li class="acl-write" id="clearAuthorship" data-key="clearauthorship">
-                    <a data-l10n-id="pad.toolbar.clearAuthorship.title">
-                      <span class="buttonicon buttonicon-clearauthorship"></span>
-                    </a>
-                </li>
                 <% e.end_block(); %>
             </ul>
             <ul class="menu_right">
                 <% e.begin_block("editbarMenuRight"); %>
-                <li data-key="import_export">
+                <%- toolbar.menu(settings.toolbar.right) %>
-                    <a class="grouped-left" id="importexportlink" data-l10n-id="pad.toolbar.import_export.title">
-                        <span class="buttonicon buttonicon-import_export"></span>
-                    </a>
-                </li>
-                <li onClick="document.location = document.location.pathname+ '/timeslider'">
-                    <a id="timesliderlink" class="grouped-middle" data-l10n-id="pad.toolbar.timeslider.title">
-                        <span class="buttonicon buttonicon-history"></span>
-                    </a>
-                </li>
-                <li class="acl-write" data-key="savedRevision">
-                    <a class="grouped-right" id="revisionlink" data-l10n-id="pad.toolbar.savedRevision.title">
-                        <span class="buttonicon buttonicon-savedRevision"></span>
-                    </a>
-                </li>
-                <li class="acl-write separator"></li>
-                <li class="acl-write" data-key="settings">
-                    <a class="grouped-left" id="settingslink" data-l10n-id="pad.toolbar.settings.title">
-                        <span class="buttonicon buttonicon-settings"></span>
-                    </a>
-                </li>
-                <li data-key="embed">
-                    <a class="grouped-right" id="embedlink" data-l10n-id="pad.toolbar.embed.title">
-                        <span class="grouped-right buttonicon buttonicon-embed"></span>
-                    </a>
-                </li>
-                <li class="separator"></li>
-                <li id="usericon" data-key="showusers">
-                    <a data-l10n-id="pad.toolbar.showusers.title">
-                        <span class="buttonicon buttonicon-showusers"></span>
-                        <span id="online_count">1</span>
-                    </a>
-                </li>
                 <% e.end_block(); %>
             </ul>
         </div>
@@ -295,7 +209,7 @@
                 <% e.end_block(); %>
             </div>
         </div>
-        
+
         <div id="connectivity" class="popup">
             <% e.begin_block("modals"); %>
                 <div class="connected visible">
@@ -411,7 +325,7 @@
         <% e.begin_block("scripts"); %>
         <script type="text/javascript">
             (function() {
-              // Display errors on page load to the user 
+              // Display errors on page load to the user
               // (Gets overridden by padutils.setupGlobalExceptionHandler)
               var originalHandler = window.onerror;
               window.onerror = function(msg, url, line) {
@@ -424,7 +338,7 @@
               };
             })();
         </script>
-        
+
         <script type="text/javascript" src="../static/js/require-kernel.js"></script>
         <script type="text/javascript" src="../socket.io/socket.io.js"></script>
 
@@ -439,10 +353,10 @@
             var clientVars = {};
             (function () {
               var pathComponents = location.pathname.split('/');
-              
+
               // Strip 'p' and the padname from the pathname and set as baseURL
               var baseURL = pathComponents.slice(0,pathComponents.length-2).join('/') + '/';
-                            
+
               require.setRootURI(baseURL + "javascripts/src");
               require.setLibraryURI(baseURL + "javascripts/lib");
               require.setGlobalKeyPath("require");

src/templates/timeslider.html

@@ -80,14 +80,9 @@
           <div class="editbarright toolbar" id="editbar">
             <% e.begin_block("timesliderEditbarRight"); %>
             <ul>
-              <li onClick="window.padeditbar.toolbarClick('import_export');return false;">
+              <%- toolbar.menu(settings.toolbar.timeslider) %>
-                <a id="exportlink" data-l10n-id="timeslider.toolbar.exportlink.title">
-                  <div class="buttonicon buttonicon-import_export"></div>
-                </a>
-              </li>
             </ul>
-            <a id="returnbutton" data-l10n-id="timeslider.toolbar.returnbutton"></a>
+            <% e.end_block(); %>
-          <% e.end_block(); %>
           </div>
 
           <div>
@@ -241,6 +236,8 @@
       /* TODO: These globals shouldn't exist. */
       padeditbar = require('ep_etherpad-lite/static/js/pad_editbar').padeditbar;
       padimpexp = require('ep_etherpad-lite/static/js/pad_impexp').padimpexp;
+
+      padeditbar.init()
     });
   })();
 </script>