Merge branch 'develop' of github.com:ether/etherpad-lite into caret-refactor

CHANGELOG.md

@@ -1,3 +1,18 @@
+# 1.2.91
+ * NEW: Authors can now send custom object messages to other Authors making 3 way conversations possible.  This introduces WebRTC plugin support.
+ * NEW: Hook for Chat Messages Allows for Desktop Notification support
+ * NEW: FreeBSD installation docs
+ * Fix: Cookies inside of plugins
+ * Fix: Refactor Caret navigation with Arrow and Pageup/down keys stops cursor being lost
+ * Fix: Long lines in Firefox now wrap properly
+ * Fix: Log HTTP on DEBUG log level
+ * Fix: Server wont crash on import fails on 0 file import.
+ * Fix: Import no longer fails consistantly
+ * Fix: Language support for non existing languages
+ * Fix: Mobile support for chat notifications are now usable
+ * Fix: Re-Enable Editbar buttons on reconnect
+ * Fix: Clearing authorship colors no longer disconnects all clients
+
 # 1.2.9
  * Fix: MAJOR Security issue, where a hacker could submit content as another user
  * Fix: security issue due to unescaped user input
@@ -6,7 +21,7 @@
  * Fix: PadUsers API endpoint
  * NEW: A script to import data to all dbms
  * NEW: Add authorId to chat and userlist as a data attribute
- * NEW Refactor and fix our frontend tests
+ * NEW: Refactor and fix our frontend tests
  * NEW: Localisation updates
  
 

README.md

@@ -62,10 +62,11 @@ Update to the latest version with `git pull origin`, then run `bin\installOnWind
 
 [Next steps](#next-steps).
 
-## Linux
+## Linux/Unix
 You'll need gzip, git, curl, libssl develop libraries, python and gcc.  
 *For Debian/Ubuntu*: `apt-get install gzip git-core curl python libssl-dev pkg-config build-essential`  
 *For Fedora/CentOS*: `yum install gzip git-core curl python openssl-devel && yum groupinstall "Development Tools"`
+*For FreeBSD*: `portinstall node node, npm and git (optional)`
 
 Additionally, you'll need [node.js](http://nodejs.org) installed, Ideally the latest stable version, be careful of installing nodejs from apt.
 

doc/api/hooks_client-side.md

@@ -143,6 +143,20 @@ Things in context:
 
 This hook is called on the client side whenever a user joins or changes. This can be used to create notifications or an alternate user list.
 
+## chatNewMessage
+Called from: src/static/js/chat.js
+
+Things in context:
+
+1. authorName - The user that wrote this message
+2. author - The authorID of the user that wrote the message
+2. text - the message text
+3. sticky (boolean) - if you want the gritter notification bubble to fade out on its own or just sit there
+3. timestamp - the timestamp of the chat message
+4. timeStr - the timestamp as a formatted string
+
+This hook is called on the client side whenever a chat message is received from the server. It can be used to create different notifications for chat messages.
+
 ## collectContentPre
 Called from: src/static/js/contentcollector.js
 

doc/api/http_api.md

@@ -458,4 +458,4 @@ returns ok when the current api token is valid
 lists all pads on this epl instance
 
 *Example returns:*
- * `{code: 0, message:"ok", data: ["testPad", "thePadsOfTheOthers"]}`
+ * `{code: 0, message:"ok", data: {padIDs: ["testPad", "thePadsOfTheOthers"]}}`

src/locales/ast.json

@@ -19,7 +19,7 @@
 	"pad.toolbar.clearAuthorship.title": "Llimpiar los colores d'autor\u00eda",
 	"pad.toolbar.import_export.title": "Importar\/Esportar ente distintos formatos de ficheru",
 	"pad.toolbar.timeslider.title": "Eslizador de tiempu",
-	"pad.toolbar.savedRevision.title": "Revisiones guardaes",
+	"pad.toolbar.savedRevision.title": "Guardar revisi\u00f3n",
 	"pad.toolbar.settings.title": "Configuraci\u00f3n",
 	"pad.toolbar.embed.title": "Incrustar esti bloc",
 	"pad.toolbar.showusers.title": "Amosar los usuarios d'esti bloc",
@@ -34,6 +34,7 @@
 	"pad.settings.stickychat": "Alderique en pantalla siempres",
 	"pad.settings.colorcheck": "Colores d'autor\u00eda",
 	"pad.settings.linenocheck": "N\u00famberos de llinia",
+	"pad.settings.rtlcheck": "\u00bfLleer el conten\u00edu de drecha a izquierda?",
 	"pad.settings.fontType": "Tipograf\u00eda:",
 	"pad.settings.fontType.normal": "Normal",
 	"pad.settings.fontType.monospaced": "Monoespaciada",

src/locales/be-tarask.json

@@ -0,0 +1,61 @@
+{
+	"@metadata": {
+		"authors": [
+			"Jim-by",
+			"Wizardist"
+		]
+	},
+	"index.newPad": "\u0421\u0442\u0432\u0430\u0440\u044b\u0446\u044c",
+	"index.createOpenPad": "\u0446\u0456 \u0442\u0432\u0430\u0440\u044b\u0446\u044c\/\u0430\u0434\u043a\u0440\u044b\u0446\u044c \u0434\u0430\u043a\u0443\u043c\u044d\u043d\u0442 \u0437 \u043d\u0430\u0437\u0432\u0430\u0439:",
+	"pad.toolbar.bold.title": "\u0422\u043e\u045e\u0441\u0442\u044b (Ctrl-B)",
+	"pad.toolbar.italic.title": "\u041a\u0443\u0440\u0441\u0456\u045e (Ctrl-I)",
+	"pad.toolbar.underline.title": "\u041f\u0430\u0434\u043a\u0440\u044d\u0441\u044c\u043b\u0456\u0432\u0430\u043d\u044c\u043d\u0435 (Ctrl-U)",
+	"pad.toolbar.strikethrough.title": "\u0417\u0430\u043a\u0440\u044d\u0441\u044c\u043b\u0456\u0432\u0430\u043d\u044c\u043d\u0435",
+	"pad.toolbar.ol.title": "\u0423\u043f\u0430\u0440\u0430\u0434\u043a\u0430\u0432\u0430\u043d\u044b \u0441\u044c\u043f\u0456\u0441",
+	"pad.toolbar.ul.title": "\u041d\u0435\u045e\u043f\u0430\u0440\u0430\u0434\u043a\u0430\u0432\u0430\u043d\u044b \u0441\u044c\u043f\u0456\u0441",
+	"pad.toolbar.indent.title": "\u0412\u043e\u0434\u0441\u0442\u0443\u043f",
+	"pad.toolbar.unindent.title": "\u0412\u044b\u0441\u0442\u0443\u043f",
+	"pad.toolbar.undo.title": "\u0421\u043a\u0430\u0441\u0430\u0432\u0430\u0446\u044c(Ctrl-Z)",
+	"pad.toolbar.redo.title": "\u0412\u044f\u0440\u043d\u0443\u0446\u044c (Ctrl-Y)",
+	"pad.toolbar.clearAuthorship.title": "\u041f\u0440\u044b\u0431\u0440\u0430\u0446\u044c \u043a\u043e\u043b\u0435\u0440 \u0434\u0430\u043a\u0443\u043c\u044d\u043d\u0442\u0443",
+	"pad.toolbar.import_export.title": "\u0406\u043c\u043f\u0430\u0440\u0442\/\u042d\u043a\u0441\u043f\u0430\u0440\u0442 \u0437 \u0432\u044b\u043a\u0430\u0440\u044b\u0441\u0442\u0430\u043d\u044c\u043d\u0435 \u0440\u043e\u0437\u043d\u044b\u0445 \u0444\u0430\u0440\u043c\u0430\u0442\u0430\u045e \u0444\u0430\u0439\u043b\u0430\u045e",
+	"pad.toolbar.timeslider.title": "\u0428\u043a\u0430\u043b\u0430 \u0447\u0430\u0441\u0443",
+	"pad.toolbar.savedRevision.title": "\u0417\u0430\u0445\u0430\u0432\u0430\u0446\u044c \u0432\u044d\u0440\u0441\u0456\u044e",
+	"pad.toolbar.settings.title": "\u041d\u0430\u043b\u0430\u0434\u044b",
+	"pad.toolbar.embed.title": "\u0423\u0431\u0443\u0434\u0430\u0432\u0430\u0446\u044c \u0433\u044d\u0442\u044b \u0434\u0430\u043a\u0443\u043c\u044d\u043d\u0442",
+	"pad.toolbar.showusers.title": "\u041f\u0430\u043a\u0430\u0437\u0430\u0446\u044c \u043a\u0430\u0440\u044b\u0441\u0442\u0430\u043b\u044c\u043d\u0456\u043a\u0430\u045e \u0443 \u0433\u044d\u0442\u044b\u043c \u0434\u0430\u043a\u0443\u043c\u044d\u043d\u0446\u0435",
+	"pad.colorpicker.save": "\u0417\u0430\u0445\u0430\u0432\u0430\u0446\u044c",
+	"pad.colorpicker.cancel": "\u0421\u043a\u0430\u0441\u0430\u0432\u0430\u0446\u044c",
+	"pad.loading": "\u0417\u0430\u0433\u0440\u0443\u0437\u043a\u0430...",
+	"pad.passwordRequired": "\u0414\u043b\u044f \u0434\u043e\u0441\u0442\u0443\u043f\u0443 \u0434\u0430 \u0433\u044d\u0442\u0430\u0433\u0430 \u0434\u0430\u043a\u0443\u043c\u044d\u043d\u0442\u0430 \u043f\u0430\u0442\u0440\u044d\u0431\u043d\u044b \u043f\u0430\u0440\u043e\u043b\u044c",
+	"pad.permissionDenied": "\u0412\u044b \u043d\u044f \u043c\u0430\u0435\u0446\u0435 \u0434\u0430\u0437\u0432\u043e\u043b\u0443 \u043d\u0430 \u0434\u043e\u0441\u0442\u0443\u043f \u0434\u0430 \u0433\u044d\u0442\u0430\u0433\u0430 \u0434\u0430\u043a\u0443\u043c\u044d\u043d\u0442\u0430",
+	"pad.wrongPassword": "\u0412\u044b \u045e\u0432\u044f\u043b\u0456 \u043d\u044f\u0441\u043b\u0443\u0448\u043d\u044b \u043f\u0430\u0440\u043e\u043b\u044c",
+	"pad.settings.padSettings": "\u041d\u0430\u043b\u0430\u0434\u044b \u0434\u0430\u043a\u0443\u043c\u044d\u043d\u0442\u0430",
+	"pad.settings.myView": "\u041c\u043e\u0439 \u0432\u044b\u0433\u043b\u044f\u0434",
+	"pad.settings.stickychat": "\u0417\u0430\u045e\u0441\u0451\u0434\u044b \u043f\u0430\u043a\u0430\u0437\u0432\u0430\u0446\u044c \u0447\u0430\u0442",
+	"pad.settings.colorcheck": "\u041a\u043e\u043b\u0435\u0440\u044b \u0430\u045e\u0442\u0430\u0440\u0441\u0442\u0432\u0430",
+	"pad.settings.linenocheck": "\u041d\u0443\u043c\u0430\u0440\u044b \u0440\u0430\u0434\u043a\u043e\u045e",
+	"pad.settings.rtlcheck": "\u0422\u044d\u043a\u0441\u0442 \u0441\u043f\u0440\u0430\u0432\u0430-\u043d\u0430\u043b\u0435\u0432\u0430",
+	"pad.settings.fontType": "\u0422\u044b\u043f \u0448\u0440\u044b\u0444\u0442\u0443:",
+	"pad.settings.fontType.normal": "\u0417\u0432\u044b\u0447\u0430\u0439\u043d\u044b",
+	"pad.settings.fontType.monospaced": "\u041c\u043e\u043d\u0430\u0448\u044b\u0440\u044b\u043d\u043d\u044b",
+	"pad.settings.globalView": "\u0410\u0433\u0443\u043b\u044c\u043d\u044b \u0432\u044b\u0433\u043b\u044f\u0434",
+	"pad.settings.language": "\u041c\u043e\u0432\u0430:",
+	"pad.importExport.import_export": "\u0406\u043c\u043f\u0430\u0440\u0442\/\u042d\u043a\u0441\u043f\u0430\u0440\u0442",
+	"pad.importExport.import": "\u0417\u0430\u0433\u0440\u0443\u0437\u0456\u0436\u0430\u0439\u0446\u0435 \u043b\u044e\u0431\u044b\u044f \u0442\u044d\u043a\u0441\u0442\u0430\u0432\u044b\u044f \u0444\u0430\u0439\u043b\u044b \u0430\u0431\u043e \u0434\u0430\u043a\u0443\u043c\u044d\u043d\u0442\u044b",
+	"pad.importExport.importSuccessful": "\u041f\u0430\u0441\u044c\u043f\u044f\u0445\u043e\u0432\u0430!",
+	"pad.importExport.export": "\u042d\u043a\u0441\u043f\u0430\u0440\u0442\u0430\u0432\u0430\u0446\u044c \u0431\u044f\u0433\u0443\u0447\u044b \u0434\u0430\u043a\u0443\u043c\u044d\u043d\u0442 \u044f\u043a:",
+	"pad.importExport.exporthtml": "HTML",
+	"pad.importExport.exportplain": "\u041f\u0440\u043e\u0441\u0442\u044b \u0442\u044d\u043a\u0441\u0442",
+	"pad.importExport.exportword": "Microsoft Word",
+	"pad.importExport.exportpdf": "PDF",
+	"pad.importExport.exportopen": "ODF (Open Document Format)",
+	"pad.importExport.exportdokuwiki": "DokuWiki",
+	"pad.modals.connected": "\u041f\u0430\u0434\u043b\u0443\u0447\u044b\u043b\u0456\u0441\u044f.",
+	"pad.modals.reconnecting": "\u041f\u0435\u0440\u0430\u043f\u0430\u0434\u043b\u0443\u0447\u044d\u043d\u044c\u043d\u0435 \u0434\u0430 \u0432\u0430\u0448\u0430\u0433\u0430 \u0434\u0430\u043a\u0443\u043c\u044d\u043d\u0442\u0430...",
+	"pad.modals.forcereconnect": "\u041f\u0440\u044b\u043c\u0443\u0441\u043e\u0432\u0430\u0435 \u043f\u0435\u0440\u0430\u043f\u0430\u0434\u043b\u0443\u0447\u044d\u043d\u044c\u043d\u0435",
+	"pad.share": "\u041f\u0430\u0434\u0437\u044f\u043b\u0456\u0446\u0446\u0430 \u0434\u0430\u043a\u0443\u043c\u044d\u043d\u0442\u0430\u043c",
+	"pad.share.readonly": "\u0422\u043e\u043b\u044c\u043a\u0456 \u0434\u043b\u044f \u0447\u044b\u0442\u0430\u043d\u044c\u043d\u044f",
+	"pad.share.link": "\u0421\u043f\u0430\u0441\u044b\u043b\u043a\u0430",
+	"pad.chat": "\u0427\u0430\u0442"
+}

src/locales/br.json

@@ -37,6 +37,7 @@
 	"pad.settings.stickychat": "Diskwel ar flap bepred",
 	"pad.settings.colorcheck": "Livio\u00f9 anaout",
 	"pad.settings.linenocheck": "Niverenno\u00f9 linenno\u00f9",
+	"pad.settings.rtlcheck": "Lenn an danvez a-zehou da gleiz ?",
 	"pad.settings.fontType": "Seurt font :",
 	"pad.settings.fontType.normal": "Reizh",
 	"pad.settings.fontType.monospaced": "Monospas",

src/locales/ca.json

@@ -28,6 +28,7 @@
 	"pad.settings.stickychat": "Xateja sempre a la pantalla",
 	"pad.settings.colorcheck": "Colors d'autoria",
 	"pad.settings.linenocheck": "N\u00fameros de l\u00ednia",
+	"pad.settings.rtlcheck": "Llegir el contingut de dreta a esquerra?",
 	"pad.settings.fontType": "Tipus de lletra:",
 	"pad.settings.fontType.normal": "Normal",
 	"pad.settings.fontType.monospaced": "D'amplada fixa",

src/locales/da.json

@@ -1,9 +1,10 @@
 {
 	"@metadata": {
-		"authors": [
+		"authors": {
-			"Christian List",
+			"0": "Christian List",
-			"Peter Alberti"
+			"1": "Peter Alberti",
-		]
+			"3": "Steenth"
+		}
 	},
 	"index.newPad": "Ny Pad",
 	"index.createOpenPad": "eller opret\/\u00e5bn en Pad med navnet:",
@@ -20,7 +21,7 @@
 	"pad.toolbar.clearAuthorship.title": "Fjern farver for forfatterskab",
 	"pad.toolbar.import_export.title": "Import\/eksport fra\/til forskellige filformater",
 	"pad.toolbar.timeslider.title": "Timeslider",
-	"pad.toolbar.savedRevision.title": "Gemte revisioner",
+	"pad.toolbar.savedRevision.title": "Gem Revision",
 	"pad.toolbar.settings.title": "Indstillinger",
 	"pad.toolbar.embed.title": "Integrer denne pad",
 	"pad.toolbar.showusers.title": "Vis brugere p\u00e5 denne pad",
@@ -35,6 +36,7 @@
 	"pad.settings.stickychat": "Chat altid p\u00e5 sk\u00e6rmen",
 	"pad.settings.colorcheck": "Forfatterskabsfarver",
 	"pad.settings.linenocheck": "Linjenumre",
+	"pad.settings.rtlcheck": "L\u00e6se indhold fra h\u00f8jre mod venstre?",
 	"pad.settings.fontType": "Skrifttype:",
 	"pad.settings.fontType.normal": "Normal",
 	"pad.settings.fontType.monospaced": "Fastbredde",

src/locales/de.json

@@ -37,6 +37,7 @@
 	"pad.settings.stickychat": "Chat immer anzeigen",
 	"pad.settings.colorcheck": "Autorenfarben anzeigen",
 	"pad.settings.linenocheck": "Zeilennummern",
+	"pad.settings.rtlcheck": "Inhalt von rechts nach links lesen?",
 	"pad.settings.fontType": "Schriftart:",
 	"pad.settings.fontType.normal": "Normal",
 	"pad.settings.fontType.monospaced": "Monospace",

src/locales/el.json

@@ -22,7 +22,7 @@
 	"pad.toolbar.clearAuthorship.title": "\u039a\u03b1\u03b8\u03b1\u03c1\u03b9\u03c3\u03bc\u03cc\u03c2 \u03a7\u03c1\u03c9\u03bc\u03ac\u03c4\u03c9\u03bd \u03a3\u03c5\u03bd\u03c4\u03b1\u03ba\u03c4\u03ce\u03bd",
 	"pad.toolbar.import_export.title": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae\/\u0395\u03be\u03b1\u03b3\u03c9\u03b3\u03ae \u03b1\u03c0\u03cc\/\u03c3\u03b5 \u03b4\u03b9\u03b1\u03c6\u03bf\u03c1\u03b5\u03c4\u03b9\u03ba\u03bf\u03cd\u03c2 \u03c4\u03cd\u03c0\u03bf\u03c5\u03c2 \u03b1\u03c1\u03c7\u03b5\u03af\u03c9\u03bd",
 	"pad.toolbar.timeslider.title": "\u03a7\u03c1\u03bf\u03bd\u03bf\u03b4\u03b9\u03ac\u03b3\u03c1\u03b1\u03bc\u03bc\u03b1",
-	"pad.toolbar.savedRevision.title": "\u0391\u03c0\u03bf\u03b8\u03b7\u03ba\u03b5\u03c5\u03bc\u03ad\u03bd\u03b5\u03c2 \u0391\u03bd\u03b1\u03b8\u03b5\u03c9\u03c1\u03ae\u03c3\u03b5\u03b9\u03c2",
+	"pad.toolbar.savedRevision.title": "\u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7 \u0391\u03bd\u03b1\u03b8\u03b5\u03ce\u03c1\u03b7\u03c3\u03b7\u03c2",
 	"pad.toolbar.settings.title": "\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2",
 	"pad.toolbar.embed.title": "\u0395\u03bd\u03c3\u03c9\u03bc\u03ac\u03c4\u03c9\u03c3\u03b7 \u03c4\u03bf\u03c5 pad",
 	"pad.toolbar.showusers.title": "\u0395\u03bc\u03c6\u03ac\u03bd\u03b9\u03c3\u03b7 \u03c4\u03c9\u03bd \u03c7\u03c1\u03b7\u03c3\u03c4\u03ce\u03bd \u03b1\u03c5\u03c4\u03bf\u03cd \u03c4\u03bf\u03c5 pad",
@@ -37,6 +37,7 @@
 	"pad.settings.stickychat": "\u0397 \u03a3\u03c5\u03bd\u03bf\u03bc\u03b9\u03bb\u03af\u03b1 \u03bd\u03b1 \u03b5\u03af\u03bd\u03b1\u03b9 \u03c0\u03ac\u03bd\u03c4\u03b1 \u03bf\u03c1\u03b1\u03c4\u03ae",
 	"pad.settings.colorcheck": "\u03a7\u03c1\u03ce\u03bc\u03b1\u03c4\u03b1 \u03c3\u03c5\u03bd\u03c4\u03ac\u03ba\u03c4\u03b7",
 	"pad.settings.linenocheck": "\u0391\u03c1\u03b9\u03b8\u03bc\u03bf\u03af \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2",
+	"pad.settings.rtlcheck": "\u0398\u03ad\u03bb\u03b5\u03c4\u03b5 \u03bd\u03b1 \u03b4\u03b9\u03b1\u03b2\u03ac\u03c3\u03b5\u03c4\u03b5 \u03c4\u03bf \u03c0\u03b5\u03c1\u03b9\u03b5\u03c7\u03cc\u03bc\u03b5\u03bd\u03bf \u03b1\u03c0\u03cc \u03b4\u03b5\u03be\u03b9\u03ac \u03c0\u03c1\u03bf\u03c2 \u03c4\u03b1 \u03b1\u03c1\u03b9\u03c3\u03c4\u03b5\u03c1\u03ac;",
 	"pad.settings.fontType": "\u03a4\u03cd\u03c0\u03bf\u03c2 \u03b3\u03c1\u03b1\u03bc\u03bc\u03b1\u03c4\u03bf\u03c3\u03b5\u03b9\u03c1\u03ac\u03c2:",
 	"pad.settings.fontType.normal": "\u039a\u03b1\u03bd\u03bf\u03bd\u03b9\u03ba\u03ae",
 	"pad.settings.fontType.monospaced": "\u039a\u03b1\u03b8\u03bf\u03c1\u03b9\u03c3\u03bc\u03ad\u03bd\u03bf\u03c5 \u03c0\u03bb\u03ac\u03c4\u03bf\u03c5\u03c2",

src/locales/fa.json

@@ -3,7 +3,8 @@
 		"authors": {
 			"0": "BMRG14",
 			"1": "Dalba",
-			"3": "ZxxZxxZ"
+			"3": "ZxxZxxZ",
+			"4": "\u0627\u0644\u0646\u0627\u0632"
 		}
 	},
 	"index.newPad": "\u062f\u0641\u062a\u0631\u0686\u0647 \u06cc\u0627\u062f\u062f\u0627\u0634\u062a \u062a\u0627\u0632\u0647",
@@ -21,7 +22,7 @@
 	"pad.toolbar.clearAuthorship.title": "\u067e\u0627\u06a9 \u06a9\u0631\u062f\u0646 \u0631\u0646\u06af\u200c\u0647\u0627\u06cc \u0646\u0648\u06cc\u0633\u0646\u062f\u06af\u06cc",
 	"pad.toolbar.import_export.title": "\u062f\u0631\u0648\u0646\u200c\u0631\u06cc\u0632\u06cc\/\u0628\u0631\u0648\u0646\u200c\u0631\u06cc\u0632\u06cc \u0627\u0632\/\u0628\u0647 \u0642\u0627\u0644\u0628\u200c\u0647\u0627\u06cc \u0645\u062e\u062a\u0644\u0641",
 	"pad.toolbar.timeslider.title": "\u0627\u0633\u0644\u0627\u06cc\u062f\u0631 \u0632\u0645\u0627\u0646",
-	"pad.toolbar.savedRevision.title": "\u0630\u062e\u06cc\u0631\u0647\u200c\u0633\u0627\u0632\u06cc \u0646\u0633\u062e\u0647",
+	"pad.toolbar.savedRevision.title": "\u0630\u062e\u06cc\u0631\u0647\u200c\u06cc \u0628\u0627\u0632\u0646\u0648\u06cc\u0633\u06cc",
 	"pad.toolbar.settings.title": "\u062a\u0646\u0638\u06cc\u0645\u0627\u062a",
 	"pad.toolbar.embed.title": "\u062c\u0627\u0633\u0627\u0632\u06cc \u0627\u06cc\u0646 \u062f\u0641\u062a\u0631\u0686\u0647 \u06cc\u0627\u062f\u062f\u0627\u0634\u062a",
 	"pad.toolbar.showusers.title": "\u0646\u0645\u0627\u06cc\u0634 \u06a9\u0627\u0631\u0628\u0631\u0627\u0646 \u062f\u0631 \u0627\u06cc\u0646 \u062f\u0641\u062a\u0631\u0686\u0647 \u06cc\u0627\u062f\u062f\u0627\u0634\u062a",
@@ -36,6 +37,7 @@
 	"pad.settings.stickychat": "\u06af\u0641\u062a\u06af\u0648 \u0647\u0645\u06cc\u0634\u0647 \u0631\u0648\u06cc \u0635\u0641\u062d\u0647 \u0646\u0645\u0627\u06cc\u0634 \u0628\u0627\u0634\u062f",
 	"pad.settings.colorcheck": "\u0631\u0646\u06af\u200c\u0647\u0627\u06cc \u0646\u0648\u06cc\u0633\u0646\u062f\u06af\u06cc",
 	"pad.settings.linenocheck": "\u0634\u0645\u0627\u0631\u0647\u200c\u06cc \u062e\u0637\u0648\u0637",
+	"pad.settings.rtlcheck": "\u062e\u0648\u0627\u0646\u062f\u0646 \u0645\u062d\u062a\u0648\u0627 \u0627\u0632 \u0631\u0627\u0633\u062a \u0628\u0647 \u0686\u067e\u061f",
 	"pad.settings.fontType": "\u0646\u0648\u0639 \u0642\u0644\u0645:",
 	"pad.settings.fontType.normal": "\u0633\u0627\u062f\u0647",
 	"pad.settings.fontType.monospaced": "Monospace",

src/locales/fi.json

@@ -39,6 +39,7 @@
 	"pad.settings.stickychat": "Keskustelu aina n\u00e4kyviss\u00e4",
 	"pad.settings.colorcheck": "Kirjoittajav\u00e4rit",
 	"pad.settings.linenocheck": "Rivinumerot",
+	"pad.settings.rtlcheck": "Luetaanko sis\u00e4lt\u00f6 oikealta vasemmalle?",
 	"pad.settings.fontType": "Kirjasintyyppi:",
 	"pad.settings.fontType.normal": "normaali",
 	"pad.settings.fontType.monospaced": "tasalevyinen",

src/locales/fr.json

@@ -28,7 +28,7 @@
 	"pad.toolbar.clearAuthorship.title": "Effacer les couleurs identifiant les auteurs",
 	"pad.toolbar.import_export.title": "Importer\/Exporter de\/vers un format de fichier diff\u00e9rent",
 	"pad.toolbar.timeslider.title": "Historique dynamique",
-	"pad.toolbar.savedRevision.title": "Versions enregistr\u00e9es",
+	"pad.toolbar.savedRevision.title": "Enregistrer la r\u00e9vision",
 	"pad.toolbar.settings.title": "Param\u00e8tres",
 	"pad.toolbar.embed.title": "Int\u00e9grer ce Pad",
 	"pad.toolbar.showusers.title": "Afficher les utilisateurs du Pad",
@@ -43,6 +43,7 @@
 	"pad.settings.stickychat": "Toujours afficher le chat",
 	"pad.settings.colorcheck": "Couleurs d\u2019identification",
 	"pad.settings.linenocheck": "Num\u00e9ros de lignes",
+	"pad.settings.rtlcheck": "Lire le contenu de la droite vers la gauche?",
 	"pad.settings.fontType": "Type de police :",
 	"pad.settings.fontType.normal": "Normal",
 	"pad.settings.fontType.monospaced": "Monospace",

src/locales/gl.json

@@ -19,7 +19,7 @@
 	"pad.toolbar.clearAuthorship.title": "Limpar as cores de identificaci\u00f3n dos autores",
 	"pad.toolbar.import_export.title": "Importar\/Exportar desde\/a diferentes formatos de ficheiro",
 	"pad.toolbar.timeslider.title": "Li\u00f1a do tempo",
-	"pad.toolbar.savedRevision.title": "Revisi\u00f3ns gardadas",
+	"pad.toolbar.savedRevision.title": "Gardar a revisi\u00f3n",
 	"pad.toolbar.settings.title": "Configuraci\u00f3ns",
 	"pad.toolbar.embed.title": "Incorporar este documento",
 	"pad.toolbar.showusers.title": "Mostrar os usuarios deste documento",
@@ -34,6 +34,7 @@
 	"pad.settings.stickychat": "Chat sempre visible",
 	"pad.settings.colorcheck": "Cores de identificaci\u00f3n",
 	"pad.settings.linenocheck": "N\u00fameros de li\u00f1a",
+	"pad.settings.rtlcheck": "Quere ler o contido da dereita \u00e1 esquerda?",
 	"pad.settings.fontType": "Tipo de letra:",
 	"pad.settings.fontType.normal": "Normal",
 	"pad.settings.fontType.monospaced": "Monoespazada",

src/locales/he.json

@@ -20,7 +20,7 @@
 	"pad.toolbar.clearAuthorship.title": "\u05e0\u05d9\u05e7\u05d5\u05d9 \u05e6\u05d1\u05e2\u05d9\u05dd",
 	"pad.toolbar.import_export.title": "\u05d9\u05d9\u05d1\u05d5\u05d0\/\u05d9\u05d9\u05e6\u05d0 \u05d1\u05ea\u05e1\u05d3\u05d9\u05e8\u05d9 \u05e7\u05d1\u05e6\u05d9\u05dd \u05e9\u05d5\u05e0\u05d9\u05dd",
 	"pad.toolbar.timeslider.title": "\u05d2\u05d5\u05dc\u05dc \u05d6\u05de\u05df",
-	"pad.toolbar.savedRevision.title": "\u05d2\u05e8\u05e1\u05d0\u05d5\u05ea \u05e9\u05de\u05d5\u05e8\u05d5\u05ea",
+	"pad.toolbar.savedRevision.title": "\u05e9\u05de\u05d9\u05e8\u05ea \u05d2\u05e8\u05e1\u05d4",
 	"pad.toolbar.settings.title": "\u05d4\u05d2\u05d3\u05e8\u05d5\u05ea",
 	"pad.toolbar.embed.title": "\u05d4\u05d8\u05de\u05e2\u05ea \u05d4\u05e4\u05e0\u05e7\u05e1 \u05d4\u05d6\u05d4",
 	"pad.toolbar.showusers.title": "\u05d4\u05e6\u05d2\u05ea \u05d4\u05de\u05e9\u05ea\u05de\u05e9\u05d9\u05dd \u05d1\u05e4\u05e0\u05e7\u05e1 \u05d4\u05d6\u05d4",
@@ -35,6 +35,7 @@
 	"pad.settings.stickychat": "\u05d4\u05e9\u05d9\u05d7\u05d4 \u05ea\u05de\u05d9\u05d3 \u05e2\u05dc \u05d4\u05de\u05e1\u05da",
 	"pad.settings.colorcheck": "\u05e6\u05d1\u05d9\u05e2\u05d4 \u05dc\u05e4\u05d9 \u05de\u05d7\u05d1\u05e8",
 	"pad.settings.linenocheck": "\u05de\u05e1\u05e4\u05e8\u05d9 \u05e9\u05d5\u05e8\u05d5\u05ea",
+	"pad.settings.rtlcheck": "\u05dc\u05e7\u05e8\u05d5\u05d0 \u05d0\u05ea \u05d4\u05ea\u05d5\u05db\u05df \u05de\u05d9\u05de\u05d9\u05df \u05dc\u05e9\u05de\u05d0\u05dc?",
 	"pad.settings.fontType": "\u05e1\u05d5\u05d2 \u05d2\u05d5\u05e4\u05df:",
 	"pad.settings.fontType.normal": "\u05e8\u05d2\u05d9\u05dc",
 	"pad.settings.fontType.monospaced": "\u05d1\u05e8\u05d5\u05d7\u05d1 \u05e7\u05d1\u05d5\u05e2",

src/locales/ia.json

@@ -34,6 +34,7 @@
 	"pad.settings.stickychat": "Chat sempre visibile",
 	"pad.settings.colorcheck": "Colores de autor",
 	"pad.settings.linenocheck": "Numeros de linea",
+	"pad.settings.rtlcheck": "Leger le contento de dextra a sinistra?",
 	"pad.settings.fontType": "Typo de litteras:",
 	"pad.settings.fontType.normal": "Normal",
 	"pad.settings.fontType.monospaced": "Monospatial",

src/locales/it.json

@@ -22,7 +22,7 @@
 	"pad.toolbar.clearAuthorship.title": "Elimina i colori che indicano gli autori",
 	"pad.toolbar.import_export.title": "Importa\/esporta da\/a diversi formati di file",
 	"pad.toolbar.timeslider.title": "Presentazione cronologia",
-	"pad.toolbar.savedRevision.title": "Revisioni salvate",
+	"pad.toolbar.savedRevision.title": "Versione salvata",
 	"pad.toolbar.settings.title": "Impostazioni",
 	"pad.toolbar.embed.title": "Incorpora questo Pad",
 	"pad.toolbar.showusers.title": "Visualizza gli utenti su questo Pad",
@@ -37,6 +37,7 @@
 	"pad.settings.stickychat": "Chat sempre sullo schermo",
 	"pad.settings.colorcheck": "Colori che indicano gli autori",
 	"pad.settings.linenocheck": "Numeri di riga",
+	"pad.settings.rtlcheck": "Leggere il contenuto da destra a sinistra?",
 	"pad.settings.fontType": "Tipo di carattere:",
 	"pad.settings.fontType.normal": "Normale",
 	"pad.settings.fontType.monospaced": "A larghezza fissa",

src/locales/ja.json

@@ -34,6 +34,7 @@
 	"pad.settings.stickychat": "\u753b\u9762\u306b\u30c1\u30e3\u30c3\u30c8\u3092\u5e38\u306b\u8868\u793a",
 	"pad.settings.colorcheck": "\u4f5c\u8005\u306e\u8272\u5206\u3051",
 	"pad.settings.linenocheck": "\u884c\u756a\u53f7",
+	"pad.settings.rtlcheck": "\u53f3\u6a2a\u66f8\u304d\u306b\u3059\u308b",
 	"pad.settings.fontType": "\u30d5\u30a9\u30f3\u30c8\u306e\u7a2e\u985e:",
 	"pad.settings.fontType.normal": "\u901a\u5e38",
 	"pad.settings.fontType.monospaced": "\u56fa\u5b9a\u5e45",

src/locales/ko.json

@@ -19,7 +19,7 @@
 	"pad.toolbar.clearAuthorship.title": "\uc800\uc790\uc758 \uc0c9 \uc9c0\uc6b0\uae30",
 	"pad.toolbar.import_export.title": "\ub2e4\ub978 \ud30c\uc77c \ud615\uc2dd\uc73c\ub85c \uac00\uc838\uc624\uae30\/\ub0b4\ubcf4\ub0b4\uae30",
 	"pad.toolbar.timeslider.title": "\uc2dc\uac04\uc2ac\ub77c\uc774\ub354",
-	"pad.toolbar.savedRevision.title": "\uc800\uc7a5\ud55c \ud310",
+	"pad.toolbar.savedRevision.title": "\ud310 \uc800\uc7a5",
 	"pad.toolbar.settings.title": "\uc124\uc815",
 	"pad.toolbar.embed.title": "\uc774 \ud328\ub4dc \ud3ec\ud568\ud558\uae30",
 	"pad.toolbar.showusers.title": "\uc774 \ud328\ub4dc\uc5d0 \uc0ac\uc6a9\uc790 \ubcf4\uae30",
@@ -34,6 +34,7 @@
 	"pad.settings.stickychat": "\ud654\uba74\uc5d0 \ud56d\uc0c1 \ub300\ud654 \ubcf4\uae30",
 	"pad.settings.colorcheck": "\uc800\uc790 \uc0c9",
 	"pad.settings.linenocheck": "\uc904 \ubc88\ud638",
+	"pad.settings.rtlcheck": "\uc6b0\ud6a1\uc11c(\uc624\ub978\ucabd\uc5d0\uc11c \uc67c\ucabd\uc73c\ub85c)\uc785\ub2c8\uae4c?",
 	"pad.settings.fontType": "\uae00\uaf34 \uc885\ub958:",
 	"pad.settings.fontType.normal": "\ubcf4\ud1b5",
 	"pad.settings.fontType.monospaced": "\uace0\uc815 \ud3ed",

src/locales/mk.json

@@ -20,7 +20,7 @@
 	"pad.toolbar.clearAuthorship.title": "\u041f\u043e\u043d\u0438\u0448\u0442\u0438 \u0433\u0438 \u0430\u0432\u0442\u043e\u0440\u0441\u043a\u0438\u0442\u0435 \u0431\u043e\u0438",
 	"pad.toolbar.import_export.title": "\u0423\u0432\u043e\u0437\/\u0418\u0437\u0432\u043e\u0437 \u043e\u0434\/\u0432\u043e \u0440\u0430\u0437\u043d\u0438 \u043f\u043e\u0434\u0430\u0442\u043e\u0442\u0435\u0447\u043d\u0438 \u0444\u043e\u0440\u043c\u0430\u0442\u0438",
 	"pad.toolbar.timeslider.title": "\u0418\u0441\u0442\u043e\u0440\u0438\u0441\u043a\u0438 \u043f\u0440\u0435\u0433\u043b\u0435\u0434",
-	"pad.toolbar.savedRevision.title": "\u0417\u0430\u0447\u0443\u0432\u0430\u043d\u0438 \u0440\u0435\u0432\u0438\u0437\u0438\u0438",
+	"pad.toolbar.savedRevision.title": "\u0417\u0430\u0447\u0443\u0432\u0430\u0458 \u0440\u0435\u0432\u0438\u0437\u0438\u0458\u0430",
 	"pad.toolbar.settings.title": "\u041f\u043e\u0441\u0442\u0430\u0432\u043a\u0438",
 	"pad.toolbar.embed.title": "\u0412\u043c\u0435\u0442\u043d\u0438 \u0458\u0430 \u0442\u0435\u0442\u0440\u0430\u0442\u043a\u0430\u0432\u0430",
 	"pad.toolbar.showusers.title": "\u041f\u0440\u0438\u043a\u0430\u0436. \u043a\u043e\u0440\u0438\u0441\u043d\u0438\u0446\u0438\u0442\u0435 \u043d\u0430 \u0442\u0435\u0442\u0440\u0430\u0442\u043a\u0430\u0432\u0430",
@@ -35,6 +35,7 @@
 	"pad.settings.stickychat": "\u0420\u0430\u0437\u0433\u043e\u0432\u043e\u0440\u0438\u0442\u0435 \u0441\u0435\u043a\u043e\u0433\u0430\u0448 \u043d\u0430 \u0435\u043a\u0440\u0430\u043d\u043e\u0442",
 	"pad.settings.colorcheck": "\u0410\u0432\u0442\u043e\u0440\u0441\u043a\u0438 \u0431\u043e\u0438",
 	"pad.settings.linenocheck": "\u0411\u0440\u043e\u0435\u0432\u0438 \u043d\u0430 \u0440\u0435\u0434\u043e\u0432\u0438\u0442\u0435",
+	"pad.settings.rtlcheck": "\u0421\u043e\u0434\u0440\u0436\u0438\u043d\u0438\u0442\u0435 \u0434\u0430 \u0441\u0435 \u0447\u0438\u0442\u0430\u0430\u0442 \u043e\u0434 \u0434\u0435\u0441\u043d\u043e \u043d\u0430 \u043b\u0435\u0432\u043e?",
 	"pad.settings.fontType": "\u0422\u0438\u043f \u043d\u0430 \u0444\u043e\u043d\u0442:",
 	"pad.settings.fontType.normal": "\u041d\u043e\u0440\u043c\u0430\u043b\u0435\u043d",
 	"pad.settings.fontType.monospaced": "\u041d\u0435\u043f\u0440\u043e\u043f\u043e\u0440\u0446\u0438\u043e\u043d\u0430\u043b\u0435\u043d",

src/locales/ml.json

@@ -21,7 +21,7 @@
 	"pad.toolbar.clearAuthorship.title": "\u0d30\u0d1a\u0d2f\u0d3f\u0d24\u0d3e\u0d15\u0d4d\u0d15\u0d7e\u0d15\u0d4d\u0d15\u0d41\u0d33\u0d4d\u0d33 \u0d28\u0d3f\u0d31\u0d02 \u0d15\u0d33\u0d2f\u0d41\u0d15",
 	"pad.toolbar.import_export.title": "\u0d35\u0d4d\u0d2f\u0d24\u0d4d\u0d2f\u0d38\u0d4d\u0d24 \u0d2b\u0d2f\u0d7d \u0d24\u0d30\u0d19\u0d4d\u0d19\u0d33\u0d3f\u0d32\u0d47\u0d15\u0d4d\u0d15\u0d4d\/\u0d24\u0d30\u0d19\u0d4d\u0d19\u0d33\u0d3f\u0d7d \u0d28\u0d3f\u0d28\u0d4d\u0d28\u0d4d \u0d07\u0d31\u0d15\u0d4d\u0d15\u0d41\u0d2e\u0d24\u0d3f\/\u0d15\u0d2f\u0d31\u0d4d\u0d31\u0d41\u0d2e\u0d24\u0d3f \u0d1a\u0d46\u0d2f\u0d4d\u0d2f\u0d41\u0d15",
 	"pad.toolbar.timeslider.title": "\u0d38\u0d2e\u0d2f\u0d30\u0d47\u0d16",
-	"pad.toolbar.savedRevision.title": "\u0d38\u0d47\u0d35\u0d4d \u0d1a\u0d46\u0d2f\u0d4d\u0d24\u0d3f\u0d1f\u0d4d\u0d1f\u0d41\u0d33\u0d4d\u0d33 \u0d28\u0d3e\u0d7e\u0d2a\u0d4d\u0d2a\u0d24\u0d3f\u0d2a\u0d4d\u0d2a\u0d41\u0d15\u0d7e",
+	"pad.toolbar.savedRevision.title": "\u0d28\u0d3e\u0d7e\u0d2a\u0d4d\u0d2a\u0d24\u0d3f\u0d2a\u0d4d\u0d2a\u0d4d \u0d38\u0d47\u0d35\u0d4d \u0d1a\u0d46\u0d2f\u0d4d\u0d2f\u0d41\u0d15",
 	"pad.toolbar.settings.title": "\u0d38\u0d1c\u0d4d\u0d1c\u0d40\u0d15\u0d30\u0d23\u0d19\u0d4d\u0d19\u0d7e",
 	"pad.toolbar.embed.title": "\u0d08 \u0d2a\u0d3e\u0d21\u0d4d \u0d0e\u0d02\u0d2c\u0d46\u0d21\u0d4d \u0d1a\u0d46\u0d2f\u0d4d\u0d2f\u0d41\u0d15",
 	"pad.toolbar.showusers.title": "\u0d08 \u0d2a\u0d3e\u0d21\u0d3f\u0d32\u0d41\u0d33\u0d4d\u0d33 \u0d09\u0d2a\u0d2f\u0d4b\u0d15\u0d4d\u0d24\u0d3e\u0d15\u0d4d\u0d15\u0d33\u0d46 \u0d2a\u0d4d\u0d30\u0d26\u0d7c\u0d36\u0d3f\u0d2a\u0d4d\u0d2a\u0d3f\u0d15\u0d4d\u0d15\u0d41\u0d15",
@@ -36,6 +36,7 @@
 	"pad.settings.stickychat": "\u0d24\u0d24\u0d4d\u0d38\u0d2e\u0d2f\u0d02 \u0d38\u0d02\u0d35\u0d3e\u0d26\u0d02 \u0d0e\u0d2a\u0d4d\u0d2a\u0d4b\u0d34\u0d41\u0d02 \u0d38\u0d4d\u0d15\u0d4d\u0d30\u0d40\u0d28\u0d3f\u0d7d \u0d15\u0d3e\u0d23\u0d3f\u0d15\u0d4d\u0d15\u0d41\u0d15",
 	"pad.settings.colorcheck": "\u0d0e\u0d34\u0d41\u0d24\u0d4d\u0d24\u0d41\u0d15\u0d3e\u0d7c\u0d15\u0d4d\u0d15\u0d41\u0d33\u0d4d\u0d33 \u0d28\u0d3f\u0d31\u0d19\u0d4d\u0d19\u0d7e",
 	"pad.settings.linenocheck": "\u0d35\u0d30\u0d3f\u0d15\u0d33\u0d41\u0d1f\u0d46 \u0d15\u0d4d\u0d30\u0d2e\u0d38\u0d02\u0d16\u0d4d\u0d2f",
+	"pad.settings.rtlcheck": "\u0d09\u0d33\u0d4d\u0d33\u0d1f\u0d15\u0d4d\u0d15\u0d02 \u0d35\u0d32\u0d24\u0d4d\u0d24\u0d41\u0d28\u0d3f\u0d28\u0d4d\u0d28\u0d4d \u0d07\u0d1f\u0d24\u0d4d\u0d24\u0d4b\u0d1f\u0d4d\u0d1f\u0d3e\u0d23\u0d4b \u0d35\u0d3e\u0d2f\u0d3f\u0d15\u0d4d\u0d15\u0d47\u0d23\u0d4d\u0d1f\u0d24\u0d4d?",
 	"pad.settings.fontType": "\u0d2b\u0d4b\u0d23\u0d4d\u0d1f\u0d4d \u0d24\u0d30\u0d02:",
 	"pad.settings.fontType.normal": "\u0d38\u0d3e\u0d27\u0d3e\u0d30\u0d23\u0d02",
 	"pad.settings.fontType.monospaced": "\u0d2e\u0d4b\u0d23\u0d4b\u0d38\u0d4d\u0d2a\u0d47\u0d38\u0d4d",
@@ -51,6 +52,7 @@
 	"pad.importExport.exportpdf": "\u0d2a\u0d3f.\u0d21\u0d3f.\u0d0e\u0d2b\u0d4d.",
 	"pad.importExport.exportopen": "\u0d12.\u0d21\u0d3f.\u0d0e\u0d2b\u0d4d. (\u0d13\u0d2a\u0d4d\u0d2a\u0d7a \u0d21\u0d4b\u0d15\u0d4d\u0d2f\u0d41\u0d2e\u0d46\u0d28\u0d4d\u0d31\u0d4d \u0d2b\u0d4b\u0d7c\u0d2e\u0d3e\u0d31\u0d4d\u0d31\u0d4d)",
 	"pad.importExport.exportdokuwiki": "\u0d21\u0d4b\u0d15\u0d41\u0d35\u0d3f\u0d15\u0d4d\u0d15\u0d3f",
+	"pad.importExport.abiword.innerHTML": "\u0d2a\u0d4d\u0d32\u0d46\u0d2f\u0d3f\u0d7b \u0d1f\u0d46\u0d15\u0d4d\u0d38\u0d4d\u0d31\u0d4d\u0d31\u0d4b \u0d0e\u0d1a\u0d4d\u0d1a\u0d4d.\u0d31\u0d4d\u0d31\u0d3f.\u0d0e\u0d02.\u0d0e\u0d7d. \u0d24\u0d30\u0d2e\u0d4b \u0d2e\u0d3e\u0d24\u0d4d\u0d30\u0d2e\u0d47 \u0d24\u0d3e\u0d19\u0d4d\u0d15\u0d7e\u0d15\u0d4d\u0d15\u0d4d \u0d07\u0d31\u0d15\u0d4d\u0d15\u0d41\u0d2e\u0d24\u0d3f \u0d1a\u0d46\u0d2f\u0d4d\u0d2f\u0d3e\u0d28\u0d3e\u0d35\u0d42. \u0d15\u0d42\u0d1f\u0d41\u0d24\u0d7d \u0d35\u0d3f\u0d2a\u0d41\u0d32\u0d40\u0d15\u0d43\u0d24 \u0d07\u0d31\u0d15\u0d4d\u0d15\u0d41\u0d2e\u0d24\u0d3f \u0d38\u0d57\u0d15\u0d30\u0d4d\u0d2f\u0d19\u0d4d\u0d19\u0d7e\u0d15\u0d4d\u0d15\u0d3e\u0d2f\u0d3f \u0d26\u0d2f\u0d35\u0d3e\u0d2f\u0d3f <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\">\u0d05\u0d2c\u0d3f\u0d35\u0d47\u0d21\u0d4d \u0d07\u0d7b\u0d38\u0d4d\u0d31\u0d4d\u0d31\u0d4b\u0d7e \u0d1a\u0d46\u0d2f\u0d4d\u0d2f\u0d41\u0d15<\/a>.",
 	"pad.modals.connected": "\u0d2c\u0d28\u0d4d\u0d27\u0d3f\u0d2a\u0d4d\u0d2a\u0d3f\u0d1a\u0d4d\u0d1a\u0d3f\u0d30\u0d3f\u0d15\u0d4d\u0d15\u0d41\u0d28\u0d4d\u0d28\u0d41.",
 	"pad.modals.reconnecting": "\u0d24\u0d3e\u0d19\u0d4d\u0d15\u0d33\u0d41\u0d1f\u0d46 \u0d2a\u0d3e\u0d21\u0d3f\u0d32\u0d47\u0d2f\u0d4d\u0d15\u0d4d\u0d15\u0d4d \u0d35\u0d40\u0d23\u0d4d\u0d1f\u0d41\u0d02 \u0d2c\u0d28\u0d4d\u0d27\u0d3f\u0d2a\u0d4d\u0d2a\u0d3f\u0d15\u0d4d\u0d15\u0d41\u0d28\u0d4d\u0d28\u0d41...",
 	"pad.modals.forcereconnect": "\u0d0e\u0d28\u0d4d\u0d24\u0d3e\u0d2f\u0d3e\u0d32\u0d41\u0d02 \u0d2c\u0d28\u0d4d\u0d27\u0d3f\u0d2a\u0d4d\u0d2a\u0d3f\u0d15\u0d4d\u0d15\u0d41\u0d15",
@@ -101,6 +103,8 @@
 	"timeslider.month.october": "\u0d12\u0d15\u0d4d\u0d1f\u0d4b\u0d2c\u0d7c",
 	"timeslider.month.november": "\u0d28\u0d35\u0d02\u0d2c\u0d7c",
 	"timeslider.month.december": "\u0d21\u0d3f\u0d38\u0d02\u0d2c\u0d7c",
+	"timeslider.unnamedauthor": "{{num}} \u0d2a\u0d47\u0d30\u0d3f\u0d32\u0d4d\u0d32\u0d3e\u0d24\u0d4d\u0d24 \u0d30\u0d1a\u0d2f\u0d3f\u0d24\u0d3e\u0d35\u0d4d",
+	"timeslider.unnamedauthors": "{{num}} \u0d2a\u0d47\u0d30\u0d3f\u0d32\u0d4d\u0d32\u0d3e\u0d24\u0d4d\u0d24 \u0d30\u0d1a\u0d2f\u0d3f\u0d24\u0d3e\u0d15\u0d4d\u0d15\u0d7e",
 	"pad.savedrevs.marked": "\u0d08 \u0d28\u0d3e\u0d7e\u0d2a\u0d4d\u0d2a\u0d24\u0d3f\u0d2a\u0d4d\u0d2a\u0d4d \u0d38\u0d47\u0d35\u0d4d \u0d1a\u0d46\u0d2f\u0d4d\u0d24\u0d3f\u0d1f\u0d4d\u0d1f\u0d41\u0d33\u0d4d\u0d33 \u0d28\u0d3e\u0d7e\u0d2a\u0d4d\u0d2a\u0d24\u0d3f\u0d2a\u0d4d\u0d2a\u0d3e\u0d2f\u0d3f \u0d05\u0d1f\u0d2f\u0d3e\u0d33\u0d2a\u0d4d\u0d2a\u0d46\u0d1f\u0d41\u0d24\u0d4d\u0d24\u0d3f\u0d2f\u0d3f\u0d30\u0d3f\u0d15\u0d4d\u0d15\u0d41\u0d28\u0d4d\u0d28\u0d41",
 	"pad.userlist.entername": "\u0d24\u0d3e\u0d19\u0d4d\u0d15\u0d33\u0d41\u0d1f\u0d46 \u0d2a\u0d47\u0d30\u0d4d \u0d28\u0d7d\u0d15\u0d41\u0d15",
 	"pad.userlist.unnamed": "\u0d2a\u0d47\u0d30\u0d3f\u0d32\u0d4d\u0d32\u0d3e\u0d24\u0d4d\u0d24",

src/locales/ms.json

@@ -19,7 +19,7 @@
 	"pad.toolbar.clearAuthorship.title": "Padamkan Warna Pengarang",
 	"pad.toolbar.import_export.title": "Import\/Eksport dari\/ke format-format fail berbeza",
 	"pad.toolbar.timeslider.title": "Gelangsar masa",
-	"pad.toolbar.savedRevision.title": "Semakan Tersimpan",
+	"pad.toolbar.savedRevision.title": "Simpan Semakan",
 	"pad.toolbar.settings.title": "Tetapan",
 	"pad.toolbar.embed.title": "Benamkan pad ini",
 	"pad.toolbar.showusers.title": "Tunjukkan pengguna pada pad ini",
@@ -34,6 +34,7 @@
 	"pad.settings.stickychat": "Sentiasa bersembang pada skrin",
 	"pad.settings.colorcheck": "Warna pengarang",
 	"pad.settings.linenocheck": "Nombor baris",
+	"pad.settings.rtlcheck": "Membaca dari kanan ke kiri?",
 	"pad.settings.fontType": "Jenis fon:",
 	"pad.settings.fontType.normal": "Normal",
 	"pad.settings.fontType.monospaced": "Monospace",

src/locales/nl.json

@@ -34,6 +34,7 @@
 	"pad.settings.stickychat": "Chat altijd zichtbaar",
 	"pad.settings.colorcheck": "Kleuren auteurs",
 	"pad.settings.linenocheck": "Regelnummers",
+	"pad.settings.rtlcheck": "Inhoud van rechts naar links lezen?",
 	"pad.settings.fontType": "Lettertype:",
 	"pad.settings.fontType.normal": "Normaal",
 	"pad.settings.fontType.monospaced": "Monospace",

src/locales/ru.json

@@ -22,7 +22,7 @@
 	"pad.toolbar.clearAuthorship.title": "\u041e\u0447\u0438\u0441\u0442\u0438\u0442\u044c \u0446\u0432\u0435\u0442\u0430 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430",
 	"pad.toolbar.import_export.title": "\u0418\u043c\u043f\u043e\u0440\u0442\/\u044d\u043a\u0441\u043f\u043e\u0440\u0442 \u0441 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0435\u043c \u0440\u0430\u0437\u043b\u0438\u0447\u043d\u044b\u0445 \u0444\u043e\u0440\u043c\u0430\u0442\u043e\u0432 \u0444\u0430\u0439\u043b\u043e\u0432",
 	"pad.toolbar.timeslider.title": "\u0428\u043a\u0430\u043b\u0430 \u0432\u0440\u0435\u043c\u0435\u043d\u0438",
-	"pad.toolbar.savedRevision.title": "\u0421\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u043d\u044b\u0435 \u0432\u0435\u0440\u0441\u0438\u0438",
+	"pad.toolbar.savedRevision.title": "\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u0432\u0435\u0440\u0441\u0438\u044e",
 	"pad.toolbar.settings.title": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438",
 	"pad.toolbar.embed.title": "\u0412\u0441\u0442\u0440\u043e\u0438\u0442\u044c \u044d\u0442\u043e\u0442 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442",
 	"pad.toolbar.showusers.title": "\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u044c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439 \u0432 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0435",
@@ -37,6 +37,7 @@
 	"pad.settings.stickychat": "\u0412\u0441\u0435\u0433\u0434\u0430 \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u0442\u044c \u0447\u0430\u0442",
 	"pad.settings.colorcheck": "\u0426\u0432\u0435\u0442\u0430 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430",
 	"pad.settings.linenocheck": "\u041d\u043e\u043c\u0435\u0440\u0430 \u0441\u0442\u0440\u043e\u043a",
+	"pad.settings.rtlcheck": "\u0427\u0438\u0442\u0430\u0442\u044c \u0441\u043e\u0434\u0435\u0440\u0436\u0438\u043c\u043e\u0435 \u0441\u043f\u0440\u0430\u0432\u0430 \u043d\u0430\u043b\u0435\u0432\u043e?",
 	"pad.settings.fontType": "\u0422\u0438\u043f \u0448\u0440\u0438\u0444\u0442\u0430:",
 	"pad.settings.fontType.normal": "\u041e\u0431\u044b\u0447\u043d\u044b\u0439",
 	"pad.settings.fontType.monospaced": "\u041c\u043e\u043d\u043e\u0448\u0438\u0440\u0438\u043d\u043d\u044b\u0439",

src/locales/sl.json

@@ -19,7 +19,7 @@
 	"pad.toolbar.clearAuthorship.title": "Po\u010disti barvo avtorstva",
 	"pad.toolbar.import_export.title": "Izvozi\/Uvozi razli\u010dne oblike zapisov",
 	"pad.toolbar.timeslider.title": "Drsnik zgodovine",
-	"pad.toolbar.savedRevision.title": "Shranjene predelave",
+	"pad.toolbar.savedRevision.title": "Shrani predelavo",
 	"pad.toolbar.settings.title": "Nastavitve",
 	"pad.toolbar.embed.title": "Vstavi dokument",
 	"pad.toolbar.showusers.title": "Poka\u017ei uporabnike dokumenta",
@@ -34,6 +34,7 @@
 	"pad.settings.stickychat": "Vsebina klepeta je vedno na zaslonu.",
 	"pad.settings.colorcheck": "Barve avtorstva",
 	"pad.settings.linenocheck": "\u0160tevilke vrstic",
+	"pad.settings.rtlcheck": "Ali naj se vsebina prebira od desne proti levi?",
 	"pad.settings.fontType": "Vrsta pisave:",
 	"pad.settings.fontType.normal": "Obi\u010dajno",
 	"pad.settings.fontType.monospaced": "Monospace",

src/locales/sv.json

@@ -19,7 +19,7 @@
 	"pad.toolbar.clearAuthorship.title": "Rensa f\u00f6rfattarf\u00e4rger",
 	"pad.toolbar.import_export.title": "Importera\/exportera fr\u00e5n\/till olika filformat",
 	"pad.toolbar.timeslider.title": "Tidsreglage",
-	"pad.toolbar.savedRevision.title": "Sparade revisioner",
+	"pad.toolbar.savedRevision.title": "Spara revision",
 	"pad.toolbar.settings.title": "Inst\u00e4llningar",
 	"pad.toolbar.embed.title": "B\u00e4dda in detta block",
 	"pad.toolbar.showusers.title": "Visa anv\u00e4ndarna p\u00e5 detta block",
@@ -34,6 +34,7 @@
 	"pad.settings.stickychat": "Chatten alltid p\u00e5 sk\u00e4rmen",
 	"pad.settings.colorcheck": "F\u00f6rfattarskapsf\u00e4rger",
 	"pad.settings.linenocheck": "Radnummer",
+	"pad.settings.rtlcheck": "Vill du l\u00e4sa inneh\u00e5llet fr\u00e5n h\u00f6ger till v\u00e4nster?",
 	"pad.settings.fontType": "Typsnitt:",
 	"pad.settings.fontType.normal": "Normal",
 	"pad.settings.fontType.monospaced": "Fast breddsteg",

src/locales/te.json

@@ -26,7 +26,7 @@
 	"pad.colorpicker.save": "\u0c2d\u0c26\u0c4d\u0c30\u0c2a\u0c30\u0c1a\u0c41",
 	"pad.colorpicker.cancel": "\u0c30\u0c26\u0c4d\u0c26\u0c41\u0c1a\u0c47\u0c2f\u0c3f",
 	"pad.loading": "\u0c32\u0c4b\u0c21\u0c35\u0c41\u0c24\u0c4b\u0c02\u0c26\u0c3f...",
-	"pad.wrongPassword": "\u0c2e\u0c40 \u0c30\u0c39\u0c38\u0c4d\u0c2f\u0c2a\u0c26\u0c02 \u0c24\u0c2a\u0c41",
+	"pad.wrongPassword": "\u0c2e\u0c40 \u0c38\u0c02\u0c15\u0c47\u0c24\u0c2a\u0c26\u0c02 \u0c24\u0c2a\u0c4d\u0c2a\u0c41",
 	"pad.settings.padSettings": "\u0c2a\u0c32\u0c15 \u0c05\u0c2e\u0c30\u0c3f\u0c15\u0c32\u0c41",
 	"pad.settings.myView": "\u0c28\u0c3e \u0c09\u0c26\u0c4d\u0c26\u0c47\u0c36\u0c4d\u0c2f\u0c2e\u0c41",
 	"pad.settings.stickychat": "\u0c24\u0c46\u0c30\u0c2a\u0c48\u0c28\u0c47 \u0c2e\u0c3e\u0c1f\u0c3e\u0c2e\u0c02\u0c24\u0c3f\u0c28\u0c3f \u0c0e\u0c32\u0c4d\u0c32\u0c2a\u0c41\u0c21\u0c41 \u0c1a\u0c47\u0c2f\u0c41\u0c2e\u0c41",

src/locales/zh-hant.json

@@ -35,6 +35,7 @@
 	"pad.settings.stickychat": "\u6c38\u9060\u5728\u5c4f\u5e55\u4e0a\u986f\u793a\u804a\u5929",
 	"pad.settings.colorcheck": "\u4f5c\u8005\u984f\u8272",
 	"pad.settings.linenocheck": "\u884c\u865f",
+	"pad.settings.rtlcheck": "\u5f9e\u53f3\u81f3\u5de6\u8b80\u53d6\u5167\u5bb9\uff1f",
 	"pad.settings.fontType": "\u5b57\u9ad4\u985e\u578b\uff1a",
 	"pad.settings.fontType.normal": "\u6b63\u5e38",
 	"pad.settings.fontType.monospaced": "\u7b49\u5bec",

src/node/handler/ImportHandler.js

@@ -60,7 +60,7 @@ exports.doImport = function(req, res, padId)
       form.parse(req, function(err, fields, files) { 
         //the upload failed, stop at this point
         if(err || files.file === undefined) {
-          console.warn("Uploading Error: " + err.stack);
+          if(err) console.warn("Uploading Error: " + err.stack);
           callback("uploadFailed");
         }
         //everything ok, continue

src/node/hooks/express/swagger.js

@@ -354,7 +354,6 @@ exports.expressCreateServer = function (hook_name, args, cb) {
     // Let's put this under /rest for now
     var subpath = express();
 
-    args.app.use(express.bodyParser());
     args.app.use(basePath, subpath);
 
     swagger.setAppHandler(subpath);

src/node/hooks/express/webaccess.js

@@ -94,7 +94,7 @@ exports.expressConfigure = function (hook_name, args, cb) {
   // If the log level specified in the config file is WARN or ERROR the application server never starts listening to requests as reported in issue #158.
   // Not installing the log4js connect logger when the log level has a higher severity than INFO since it would not log at that level anyway.
   if (!(settings.loglevel === "WARN" || settings.loglevel == "ERROR"))
-    args.app.use(log4js.connectLogger(httpLogger, { level: log4js.levels.INFO, format: ':status, :method :url'}));
+    args.app.use(log4js.connectLogger(httpLogger, { level: log4js.levels.DEBUG, format: ':status, :method :url -- :response-timems'}));
 
   /* Do not let express create the session, so that we can retain a
    * reference to it for socket.io to use. Also, set the key (cookie

src/node/utils/Abiword.js

@@ -63,7 +63,7 @@ if(os.type().indexOf("Windows") > -1)
 
       callback();
     });
-  }
+  };
   
   exports.convertFile = function(srcFile, destFile, type, callback)
   {
@@ -121,7 +121,7 @@ else
         firstPrompt = false;
       }
     });
-  }
+  };
   spawnAbiword();
 
   doConvertTask = function(task, callback)
@@ -135,7 +135,7 @@ else
       console.log("queue continue");
       task.callback(err);
     };
-  }
+  };
   
   //Queue with the converts we have to do
   var queue = async.queue(doConvertTask, 1);

src/node/utils/ExportDokuWiki.js

@@ -316,7 +316,7 @@ exports.getPadDokuWikiDocument = function (padId, revNum, callback)
 
     getPadDokuWiki(pad, revNum, callback);
   });
-}
+};
 
 function _escapeDokuWiki(s)
 {

src/node/utils/ExportHelper.js

@@ -45,7 +45,7 @@ exports.getPadPlainText = function(pad, revNum){
   }
 
   return pieces.join('');
-}
+};
 
 
 exports._analyzeLine = function(text, aline, apool){
@@ -77,11 +77,11 @@ exports._analyzeLine = function(text, aline, apool){
     line.aline = aline;
   }
   return line;
-}
+};
 
 
 exports._encodeWhitespace = function(s){
   return s.replace(/[^\x21-\x7E\s\t\n\r]/g, function(c){
-    return "&#" +c.charCodeAt(0) + ";"
+    return "&#" +c.charCodeAt(0) + ";";
   });
-}
+};

src/node/utils/ExportHtml.js

@@ -21,7 +21,7 @@ var padManager = require("../db/PadManager");
 var ERR = require("async-stacktrace");
 var Security = require('ep_etherpad-lite/static/js/security');
 var hooks = require('ep_etherpad-lite/static/js/pluginfw/hooks');
-var getPadPlainText = require('./ExportHelper').getPadPlainText
+var getPadPlainText = require('./ExportHelper').getPadPlainText;
 var _analyzeLine = require('./ExportHelper')._analyzeLine;
 var _encodeWhitespace = require('./ExportHelper')._encodeWhitespace;
 
@@ -515,7 +515,7 @@ exports.getPadHTMLDocument = function (padId, revNum, noDocType, callback)
       callback(null, head + html + foot);
     });
   });
-}
+};
 
 
 // copied from ACE
@@ -595,4 +595,3 @@ function _processSpaces(s){
   }
   return parts.join('');
 }
-

src/node/utils/ExportTxt.js

@@ -289,5 +289,4 @@ exports.getPadTXTDocument = function (padId, revNum, noDocType, callback)
       callback(null, html);
     });
   });
-}
+};
-

src/node/utils/Minify.js

@@ -125,11 +125,11 @@ function requestURIs(locations, method, headers, callback) {
   }
 
   function completed() {
-    var statuss = responses.map(function (x) {return x[0]});
+    var statuss = responses.map(function (x) {return x[0];});
-    var headerss = responses.map(function (x) {return x[1]});
+    var headerss = responses.map(function (x) {return x[1];});
-    var contentss = responses.map(function (x) {return x[2]});
+    var contentss = responses.map(function (x) {return x[2];});
     callback(statuss, headerss, contentss);
-  };
+  }
 }
 
 /**
@@ -263,7 +263,7 @@ function getAceFile(callback) {
       var filename = item.match(/"([^"]*)"/)[1];
       var request = require('request');
 
-      var baseURI = 'http://localhost:' + settings.port
+      var baseURI = 'http://localhost:' + settings.port;
       var resourceURI = baseURI + path.normalize(path.join('/static/', filename));
       resourceURI = resourceURI.replace(/\\/g, '/'); // Windows (safe generally?)
 

src/node/utils/Settings.js

@@ -137,7 +137,7 @@ exports.abiwordAvailable = function()
   {
     return "no";
   }
-}
+};
 
 exports.reloadSettings = function reloadSettings() {
   // Discover where the settings file lives
@@ -157,7 +157,7 @@ exports.reloadSettings = function reloadSettings() {
   try {
     if(settingsStr) {
       settings = vm.runInContext('exports = '+settingsStr, vm.createContext(), "settings.json");
-      settings = JSON.parse(JSON.stringify(settings)) // fix objects having constructors of other vm.context
+      settings = JSON.parse(JSON.stringify(settings)); // fix objects having constructors of other vm.context
     }
   }catch(e){
     console.error('There was an error processing your settings.json file: '+e.message);
@@ -196,9 +196,9 @@ exports.reloadSettings = function reloadSettings() {
   }
 
   if(exports.dbType === "dirty"){
-    console.warn("DirtyDB is used. This is fine for testing but not recommended for production.")
+    console.warn("DirtyDB is used. This is fine for testing but not recommended for production.");
   }
-}
+};
 
 // initially load settings
 exports.reloadSettings();

src/node/utils/caching_middleware.js

@@ -23,7 +23,7 @@ var util = require('util');
 var settings = require('./Settings');
 var semver = require('semver');
 
-var existsSync = (semver.satisfies(process.version, '>=0.8.0')) ? fs.existsSync : path.existsSync
+var existsSync = (semver.satisfies(process.version, '>=0.8.0')) ? fs.existsSync : path.existsSync;
 
 var CACHE_DIR = path.normalize(path.join(settings.root, 'var/'));
 CACHE_DIR = existsSync(CACHE_DIR) ? CACHE_DIR : undefined;
@@ -133,7 +133,7 @@ CachingMiddleware.prototype = new function () {
           old_res.write = res.write;
           old_res.end = res.end;
           res.write = function(data, encoding) {};
-          res.end = function(data, encoding) { respond() };
+          res.end = function(data, encoding) { respond(); };
         } else {
           res.writeHead(status, headers);
         }

src/node/utils/padDiff.js

@@ -68,7 +68,7 @@ PadDiff.prototype._isClearAuthorship = function(changeset){
     return false;
     
   return true;
-}
+};
  
 PadDiff.prototype._createClearAuthorship = function(rev, callback){
   var self = this;
@@ -84,7 +84,7 @@ PadDiff.prototype._createClearAuthorship = function(rev, callback){
    
    callback(null, changeset);
   });
-}
+};
  
 PadDiff.prototype._createClearStartAtext = function(rev, callback){
   var self = this;
@@ -107,7 +107,7 @@ PadDiff.prototype._createClearStartAtext = function(rev, callback){
      callback(null, newAText);
    });
   });
-}
+};
  
 PadDiff.prototype._getChangesetsInBulk = function(startRev, count, callback) {
   var self = this;
@@ -124,7 +124,7 @@ PadDiff.prototype._getChangesetsInBulk = function(startRev, count, callback) {
   async.forEach(revisions, function(rev, callback){
     self._pad.getRevision(rev, function(err, revision){
       if(err){
-        return callback(err)
+        return callback(err);
       }
       
       var arrayNum = rev-startRev;
@@ -137,7 +137,7 @@ PadDiff.prototype._getChangesetsInBulk = function(startRev, count, callback) {
   }, function(err){
     callback(err, changesets, authors);
   });
-}
+};
  
 PadDiff.prototype._addAuthors = function(authors) {
   var self = this;
@@ -147,7 +147,7 @@ PadDiff.prototype._addAuthors = function(authors) {
       self._authors.push(author);
     }
   });
-}
+};
  
 PadDiff.prototype._createDiffAtext = function(callback) {
   var self = this;
@@ -219,7 +219,7 @@ PadDiff.prototype._createDiffAtext = function(callback) {
       }
     );
   });
-}
+};
  
 PadDiff.prototype.getHtml = function(callback){
   //cache the html
@@ -279,7 +279,7 @@ PadDiff.prototype.getAuthors = function(callback){
   } else {
     callback(null, self._authors);
   }
-}
+};
  
 PadDiff.prototype._extendChangesetWithAuthor = function(changeset, author, apool) {  
   //unpack
@@ -312,7 +312,7 @@ PadDiff.prototype._extendChangesetWithAuthor = function(changeset, author, apool
   
   //return the modified changeset
   return Changeset.pack(unpacked.oldLen, unpacked.newLen, assem.toString(), unpacked.charBank);
-}
+};
  
 //this method is 80% like Changeset.inverse. I just changed so instead of reverting, it adds deletions and attribute changes to to the atext.
 PadDiff.prototype._createDeletionChangeset = function(cs, startAText, apool) {
@@ -463,7 +463,7 @@ PadDiff.prototype._createDeletionChangeset = function(cs, startAText, apool) {
       // If the text this operator applies to is only a star, than this is a false positive and should be ignored
       if (csOp.attribs && textBank != "*") {
         var deletedAttrib = apool.putAttrib(["removed", true]);
-        var authorAttrib = apool.putAttrib(["author", ""]);;
+        var authorAttrib = apool.putAttrib(["author", ""]);
  
         attribKeys.length = 0;
         attribValues.length = 0;
@@ -473,7 +473,7 @@ PadDiff.prototype._createDeletionChangeset = function(cs, startAText, apool) {
  
           if(apool.getAttribKey(n) === "author"){
             authorAttrib = n;
-          };
+          }
         });
  
         var undoBackToAttribs = cachedStrFunc(function (attribs) {

src/package.json

@@ -16,7 +16,7 @@
                       "require-kernel"          : "1.0.5",
                       "resolve"                 : "0.2.x",
                       "socket.io"               : "0.9.x",
-                      "ueberDB"                 : "0.1.94",
+                      "ueberDB"                 : "0.1.96",
                       "async"                   : "0.1.x",
                       "express"                 : "3.x",
                       "connect"                 : "2.4.x",
@@ -24,6 +24,7 @@
                       "uglify-js"               : "1.2.5",
                       "formidable"              : "1.0.9",
                       "log4js"                  : "0.5.x",
+                      "nodemailer"              : "0.3.x",
                       "jsdom-nocontextifiy"     : "0.2.10",
                       "async-stacktrace"        : "0.0.2",
                       "npm"                     : "1.1.x",

src/static/css/iframe_editor.css

@@ -78,6 +78,7 @@ ul.list-indent8 { list-style-type: none; }
 body {
   margin: 0;
   white-space: nowrap;
+  word-wrap: normal;
 }				 
 
 #outerdocbody {
@@ -93,6 +94,7 @@ body.grayedout { background-color: #eee !important }
 
 body.doesWrap {
   white-space: normal;
+  word-wrap: break-word; /* fix for issue #1648 - firefox not wrapping long lines (without spaces) correctly */
 }
 
 #innerdocbody {

src/static/css/pad.css

@@ -559,6 +559,15 @@ table#otheruserstable {
   margin: 4px 0 0 4px;
   position: absolute;
 }
+#titlesticky{
+  font-size: 10px;
+  padding-top:2px;
+  float: right;
+  text-align: right;
+  text-decoration: none;
+  cursor: pointer;
+  color: #555;
+}
 #titlecross {
   font-size: 25px;
   float: right;
@@ -828,7 +837,44 @@ input[type=checkbox] {
       padding: 4px 1px
     }
 }
-@media screen and (max-width: 400px){
+@media all and (max-width: 400px){
+  #gritter-notice-wrapper{
+    max-height:172px;
+    overflow:hidden;
+    width:100% !important;
+    background-color: #ccc;
+    bottom:20px;
+    left:0px;
+    right:0px;
+    color:#000;
+  } 
+  .gritter-close {
+    display:block !important;
+    left: auto !important;
+    right:5px;
+  }
+  #gritter-notice-wrapper.bottom-right{
+    left:0px !important;
+    bottom:30px !important;
+    right:0px !important;
+  }
+  .gritter-item p{
+    color:black;
+    font-size:16px;
+  }
+  .gritter-title{
+    text-shadow: none !important;
+    color:black;
+  }
+  .gritter-item{
+    padding:2px 11px 8px 4px;
+  }
+  .gritter-item-wrapper{
+    margin:0;
+  }
+  .gritter-item-wrapper > div{
+    background: none;
+  }
   #editorcontainer { 
     top: 68px;
   }

src/static/js/ace2_inner.js

@@ -1013,6 +1013,11 @@ function Ace2Inner(){
     return caughtErrors.slice();
   };
 
+  editorInfo.ace_getDocument = function()
+  {
+    return doc;
+  };
+
   editorInfo.ace_getDebugProperty = function(prop)
   {
     if (prop == "debugger")

src/static/js/chat.js

@@ -17,6 +17,7 @@
 var padutils = require('./pad_utils').padutils;
 var padcookie = require('./pad_cookie').padcookie;
 var Tinycon = require('tinycon/tinycon');
+var hooks = require('./pluginfw/hooks');
 
 var chat = (function()
 {
@@ -99,74 +100,68 @@ var chat = (function()
 
       var text = padutils.escapeHtmlWithClickableLinks(msg.text, "_blank");
 
-      /* Performs an action if your name is mentioned */
-      var myName = $('#myusernameedit').val();
-      myName = myName.toLowerCase();
-      var chatText = text.toLowerCase();
-      var wasMentioned = false;
-      if (chatText.indexOf(myName) !== -1 && myName != "undefined"){
-        wasMentioned = true;
-      }
-      /* End of new action */
-
       var authorName = msg.userName == null ? _('pad.userlist.unnamed') : padutils.escapeHtml(msg.userName);
 
-      var html = "<p data-authorId='" + msg.userId + "' class='" + authorClass + "'><b>" + authorName + ":</b><span class='time " + authorClass + "'>" + timeStr + "</span> " + text + "</p>";
+      // the hook args
-      if(isHistoryAdd)
+      var ctx = {
-        $(html).insertAfter('#chatloadmessagesbutton');
+        "authorName" : authorName,
-      else
+        "author" : msg.userId,
-        $("#chattext").append(html);
+        "text" : text,
+        "sticky" : false,
+        "timestamp" : msg.time,
+        "timeStr" : timeStr
+      }
 
-      //should we increment the counter??
+      // is the users focus already in the chatbox?
-      if(increment && !isHistoryAdd)
+      var alreadyFocused = $("#chatinput").is(":focus");
-      {
-        var count = Number($("#chatcounter").text());
-        count++;
 
-        // is the users focus already in the chatbox?
+      // does the user already have the chatbox open?
-        var alreadyFocused = $("#chatinput").is(":focus");
+      var chatOpen = $("#chatbox").is(":visible");
 
-        // does the user already have the chatbox open?
+      // does this message contain this user's name? (is the curretn user mentioned?)
-        var chatOpen = $("#chatbox").is(":visible");
+      var myName = $('#myusernameedit').val();
+      var wasMentioned = (text.toLowerCase().indexOf(myName.toLowerCase()) !== -1 && myName != "undefined");
 
-        $("#chatcounter").text(count);
+      if(wasMentioned && !alreadyFocused && !isHistoryAdd && !chatOpen)
-        // chat throb stuff -- Just make it throw for twice as long
+      { // If the user was mentioned show for twice as long and flash the browser window
-        if(wasMentioned && !alreadyFocused && !isHistoryAdd && !chatOpen)
+        chatMentions++;
-        { // If the user was mentioned show for twice as long and flash the browser window
+        Tinycon.setBubble(chatMentions);
-          $.gritter.add({
+        ctx.sticky = true;
-            // (string | mandatory) the heading of the notification
+      }
-            title: authorName,
-            // (string | mandatory) the text inside the notification
-            text: text,
-            // (bool | optional) if you want it to fade out on its own or just sit there
-            sticky: true,
-            // (int | optional) the time you want it to be alive for before fading out
-            time: '2000'
-          });
 
-          chatMentions++;
+      // Call chat message hook
-          Tinycon.setBubble(chatMentions);
+      hooks.aCallAll("chatNewMessage", ctx, function() {
-        }
+
+        var html = "<p data-authorId='" + msg.userId + "' class='" + authorClass + "'><b>" + authorName + ":</b><span class='time " + authorClass + "'>" + ctx.timeStr + "</span> " + ctx.text + "</p>";
+        if(isHistoryAdd)
+          $(html).insertAfter('#chatloadmessagesbutton');
         else
+          $("#chattext").append(html);
+
+        //should we increment the counter??
+        if(increment && !isHistoryAdd)
         {
-          if(!chatOpen){
+          // Update the counter of unread messages
+          var count = Number($("#chatcounter").text());
+          count++;
+          $("#chatcounter").text(count);
+
+          if(!chatOpen) {
             $.gritter.add({
               // (string | mandatory) the heading of the notification
-              title: authorName,
+              title: ctx.authorName,
               // (string | mandatory) the text inside the notification
-              text: text,
+              text: ctx.text,
-
               // (bool | optional) if you want it to fade out on its own or just sit there
-              sticky: false,
+              sticky: ctx.sticky,
               // (int | optional) the time you want it to be alive for before fading out
               time: '4000'
             });
-            Tinycon.setBubble(count);
-
           }
         }
-      }
+      });
-       // Clear the chat mentions when the user clicks on the chat input box
+
+      // Clear the chat mentions when the user clicks on the chat input box
       $('#chatinput').click(function(){
         chatMentions = 0;
         Tinycon.setBubble(0);

src/static/js/gritter.js

@@ -21,8 +21,6 @@
 	$.gritter.options = {
 		position: '',
 		class_name: '', // could be set to 'gritter-light' to use white notifications
-		fade_in_speed: 'medium', // how fast notifications fade in
-		fade_out_speed: 1000, // how fast the notices fade out
 		time: 6000 // hang on the screen for...
 	}
 	

src/static/js/html10n.js

@@ -23,27 +23,27 @@
 window.html10n = (function(window, document, undefined) {
   
   // fix console
-  var console = window.console;
+  var console = window.console
   function interceptConsole(method){
-      if (!console) return function() {};
+      if (!console) return function() {}
 
-      var original = console[method];
+      var original = console[method]
 
       // do sneaky stuff
       if (original.bind){
         // Do this for normal browsers
-        return original.bind(console);
+        return original.bind(console)
       }else{
         return function() {
           // Do this for IE
-          var message = Array.prototype.slice.apply(arguments).join(' ');
+          var message = Array.prototype.slice.apply(arguments).join(' ')
-          original(message);
+          original(message)
         }
       }
   }
   var consoleLog = interceptConsole('log')
     , consoleWarn = interceptConsole('warn')
-    , consoleError = interceptConsole('warn');
+    , consoleError = interceptConsole('warn')
 
 
   // fix Array.prototype.instanceOf in, guess what, IE! <3
@@ -84,14 +84,14 @@ window.html10n = (function(window, document, undefined) {
    * MicroEvent - to make any js object an event emitter (server or browser)
    */
 
-  var MicroEvent  = function(){}
+  var MicroEvent	= function(){}
   MicroEvent.prototype	= {
-    bind  : function(event, fct){
+    bind	: function(event, fct){
       this._events = this._events || {};
       this._events[event] = this._events[event]	|| [];
       this._events[event].push(fct);
     },
-    unbind  : function(event, fct){
+    unbind	: function(event, fct){
       this._events = this._events || {};
       if( event in this._events === false  )	return;
       this._events[event].splice(this._events[event].indexOf(fct), 1);
@@ -100,7 +100,7 @@ window.html10n = (function(window, document, undefined) {
       this._events = this._events || {};
       if( event in this._events === false  )	return;
       for(var i = 0; i < this._events[event].length; i++){
-        this._events[event][i].apply(this, Array.prototype.slice.call(arguments, 1));
+        this._events[event][i].apply(this, Array.prototype.slice.call(arguments, 1))
       }
     }
   };
@@ -122,50 +122,50 @@ window.html10n = (function(window, document, undefined) {
    * and caching all necessary resources
    */
   function Loader(resources) {
-    this.resources = resources;
+    this.resources = resources
-    this.cache = {}; // file => contents
+    this.cache = {} // file => contents
-    this.langs = {}; // lang => strings
+    this.langs = {} // lang => strings
   }
   
   Loader.prototype.load = function(lang, cb) {
-    if(this.langs[lang]) return cb();
+    if(this.langs[lang]) return cb()
 
     if (this.resources.length > 0) {
       var reqs = 0;
       for (var i=0, n=this.resources.length; i < n; i++) {
         this.fetch(this.resources[i], lang, function(e) {
           reqs++;
-          if(e) return setTimeout(function(){ throw e }, 0);
+          if(e) console.warn(e)
           
           if (reqs < n) return;// Call back once all reqs are completed
-          cb && cb();
+          cb && cb()
         })
       }
     }
   }
   
   Loader.prototype.fetch = function(href, lang, cb) {
-    var that = this;
+    var that = this
     
     if (this.cache[href]) {
       this.parse(lang, href, this.cache[href], cb)
       return;
     }
     
-    var xhr = new XMLHttpRequest();
+    var xhr = new XMLHttpRequest()
-    xhr.open('GET', href, /*async: */true);
+    xhr.open('GET', href, /*async: */true)
     if (xhr.overrideMimeType) {
       xhr.overrideMimeType('application/json; charset=utf-8');
     }
     xhr.onreadystatechange = function() {
       if (xhr.readyState == 4) {
         if (xhr.status == 200 || xhr.status === 0) {
-          var data = JSON.parse(xhr.responseText);
+          var data = JSON.parse(xhr.responseText)
-          that.cache[href] = data;
+          that.cache[href] = data
           // Pass on the contents for parsing
-          that.parse(lang, href, data, cb);
+          that.parse(lang, href, data, cb)
         } else {
-          cb(new Error('Failed to load '+href));
+          cb(new Error('Failed to load '+href))
         }
       }
     };
@@ -174,39 +174,39 @@ window.html10n = (function(window, document, undefined) {
   
   Loader.prototype.parse = function(lang, currHref, data, cb) {
     if ('object' != typeof data) {
-      cb(new Error('A file couldn\'t be parsed as json.'));
+      cb(new Error('A file couldn\'t be parsed as json.'))
-      return;
+      return
     }
     
-    if (!data[lang]) lang = lang.substr(0, lang.indexOf('-') == -1? lang.length : lang.indexOf('-'));
+    if (!data[lang]) lang = lang.substr(0, lang.indexOf('-') == -1? lang.length : lang.indexOf('-'))
     if (!data[lang]) {
-      cb(new Error('Couldn\'t find translations for '+lang));
+      cb(new Error('Couldn\'t find translations for '+lang))
-      return;
+      return
     }
     
     if ('string' == typeof data[lang]) {
       // Import rule
 
       // absolute path
-      var importUrl = data[lang];
+      var importUrl = data[lang]
 
       // relative path
       if(data[lang].indexOf("http") != 0 && data[lang].indexOf("/") != 0) {  
-        importUrl = currHref+"/../"+data[lang];
+        importUrl = currHref+"/../"+data[lang]
       }
 
-      this.fetch(importUrl, lang, cb);
+      this.fetch(importUrl, lang, cb)
-      return;
+      return
     }
 
     if ('object' != typeof data[lang]) {
-      cb(new Error('Translations should be specified as JSON objects!'));
+      cb(new Error('Translations should be specified as JSON objects!'))
-      return;
+      return
     }
 
-    this.langs[lang] = data[lang];
+    this.langs[lang] = data[lang]
     // TODO: Also store accompanying langs
-    cb();
+    cb()
   }
   
   
@@ -216,11 +216,11 @@ window.html10n = (function(window, document, undefined) {
   var html10n = 
   { language : null
   }
-  MicroEvent.mixin(html10n);
+  MicroEvent.mixin(html10n)
   
-  html10n.macros = {};
+  html10n.macros = {}
 
-  html10n.rtl = ["ar","dv","fa","ha","he","ks","ku","ps","ur","yi"];
+  html10n.rtl = ["ar","dv","fa","ha","he","ks","ku","ps","ur","yi"]
   
   /**
    * Get rules for plural forms (shared with JetPack), see:
@@ -664,14 +664,14 @@ window.html10n = (function(window, document, undefined) {
    * @param langs An array of lang codes defining fallbacks
    */
   html10n.localize = function(langs) {
-    var that = this;
+    var that = this
     // if only one string => create an array
-    if ('string' == typeof langs) langs = [langs];
+    if ('string' == typeof langs) langs = [langs]
     
     this.build(langs, function(er, translations) {
-      html10n.translations = translations;
+      html10n.translations = translations
-      html10n.translateElement(translations);
+      html10n.translateElement(translations)
-      that.trigger('localized');
+      that.trigger('localized')
     })
   }
 
@@ -682,78 +682,78 @@ window.html10n = (function(window, document, undefined) {
    * @param element A DOM element, if omitted, the document element will be used
    */
   html10n.translateElement = function(translations, element) {
-    element = element || document.documentElement;
+    element = element || document.documentElement
 
     var children = element? getTranslatableChildren(element) : document.childNodes;
     for (var i=0, n=children.length; i < n; i++) {
-      this.translateNode(translations, children[i]);
+      this.translateNode(translations, children[i])
     }
 
     // translate element itself if necessary
-    this.translateNode(translations, element);
+    this.translateNode(translations, element)
   }
   
   function asyncForEach(list, iterator, cb) {
     var i = 0
-      , n = list.length;
+      , n = list.length
     iterator(list[i], i, function each(err) {
-      if(err) consoleLog(err);
+      if(err) consoleLog(err)
-      i++;
+      i++
       if (i < n) return iterator(list[i],i, each);
-      cb();
+      cb()
     })
   }
   
   function getTranslatableChildren(element) {
     if(!document.querySelectorAll) {
-      if (!element) return [];
+      if (!element) return []
       var nodes = element.getElementsByTagName('*')
-        , l10nElements = [];
+        , l10nElements = []
       for (var i=0, n=nodes.length; i < n; i++) {
         if (nodes[i].getAttribute('data-l10n-id'))
           l10nElements.push(nodes[i]);
       }
-      return l10nElements;
+      return l10nElements
     }
-    return element.querySelectorAll('*[data-l10n-id]');
+    return element.querySelectorAll('*[data-l10n-id]')
   }
   
   html10n.get = function(id, args) {
-    var translations = html10n.translations;
+    var translations = html10n.translations
-    if(!translations) return consoleWarn('No translations available (yet)');
+    if(!translations) return consoleWarn('No translations available (yet)')
-    if(!translations[id]) return consoleWarn('Could not find string '+id);
+    if(!translations[id]) return consoleWarn('Could not find string '+id)
     
     // apply args
-    var str = substArguments(translations[id], args);
+    var str = substArguments(translations[id], args)
     
     // apply macros
-    return substMacros(id, str, args);
+    return substMacros(id, str, args)
     
     // replace {{arguments}} with their values or the
     // associated translation string (based on its key)
     function substArguments(str, args) {
       var reArgs = /\{\{\s*([a-zA-Z\.]+)\s*\}\}/
-        , match;
+        , match
       
       while (match = reArgs.exec(str)) {
         if (!match || match.length < 2)
-          return str; // argument key not found
+          return str // argument key not found
 
         var arg = match[1]
-          , sub = '';
+          , sub = ''
         if (arg in args) {
-          sub = args[arg];
+          sub = args[arg]
         } else if (arg in translations) {
-          sub = translations[arg];
+          sub = translations[arg]
         } else {
-          consoleWarn('Could not find argument {{' + arg + '}}');
+          consoleWarn('Could not find argument {{' + arg + '}}')
-          return str;
+          return str
         }
 
-        str = str.substring(0, match.index) + sub + str.substr(match.index + match[0].length);
+        str = str.substring(0, match.index) + sub + str.substr(match.index + match[0].length)
       }
       
-      return str;
+      return str
     }
     
     // replace {[macros]} with their values
@@ -766,21 +766,21 @@ window.html10n = (function(window, document, undefined) {
       // a macro has been found
       // Note: at the moment, only one parameter is supported
       var macroName = reMatch[1]
-        , paramName = reMatch[2];
+        , paramName = reMatch[2]
       
-      if (!(macroName in gMacros)) return str;
+      if (!(macroName in gMacros)) return str
       
-      var param;
+      var param
       if (args && paramName in args) {
-        param = args[paramName];
+        param = args[paramName]
       } else if (paramName in translations) {
-        param = translations[paramName];
+        param = translations[paramName]
       }
 
       // there's no macro parser yet: it has to be defined in gMacros
-      var macro = html10n.macros[macroName];
+      var macro = html10n.macros[macroName]
-      str = macro(translations, key, str, param);
+      str = macro(translations, key, str, param)
-      return str;
+      return str
     }
   }
   
@@ -788,26 +788,26 @@ window.html10n = (function(window, document, undefined) {
    * Applies translations to a DOM node (recursive)
    */
   html10n.translateNode = function(translations, node) {
-    var str = {};
+    var str = {}
 
     // get id
-    str.id = node.getAttribute('data-l10n-id');
+    str.id = node.getAttribute('data-l10n-id')
-    if (!str.id) return;
+    if (!str.id) return
 
-    if(!translations[str.id]) return consoleWarn('Couldn\'t find translation key '+str.id);
+    if(!translations[str.id]) return consoleWarn('Couldn\'t find translation key '+str.id)
 
     // get args
     if(window.JSON) {
-      str.args = JSON.parse(node.getAttribute('data-l10n-args'));
+      str.args = JSON.parse(node.getAttribute('data-l10n-args'))
     }else{
       try{
-        str.args = eval(node.getAttribute('data-l10n-args'));
+        str.args = eval(node.getAttribute('data-l10n-args'))
       }catch(e) {
-        consoleWarn('Couldn\'t parse args for '+str.id);
+        consoleWarn('Couldn\'t parse args for '+str.id)
       }
     }
     
-    str.str = html10n.get(str.id, str.args);
+    str.str = html10n.get(str.id, str.args)
     
     // get attribute name to apply str to
     var prop
@@ -817,31 +817,31 @@ window.html10n = (function(window, document, undefined) {
        , "innerHTML": 1
        , "alt": 1
        , "textContent": 1
-       };
+       }
     if (index > 0 && str.id.substr(index + 1) in attrList) { // an attribute has been specified
-      prop = str.id.substr(index + 1);
+      prop = str.id.substr(index + 1)
     } else { // no attribute: assuming text content by default
-      prop = document.body.textContent ? 'textContent' : 'innerText';
+      prop = document.body.textContent ? 'textContent' : 'innerText'
     }
 
     // Apply translation
     if (node.children.length === 0 || prop != 'textContent') {
-      node[prop] = str.str;
+      node[prop] = str.str
     } else {
       var children = node.childNodes,
-          found = false;
+          found = false
       for (var i=0, n=children.length; i < n; i++) {
         if (children[i].nodeType === 3 && /\S/.test(children[i].textContent)) {
           if (!found) {
-            children[i].nodeValue = str.str;
+            children[i].nodeValue = str.str
-            found = true;
+            found = true
           } else {
-            children[i].nodeValue = '';
+            children[i].nodeValue = ''
           }
         }
       }
       if (!found) {
-        consoleWarn('Unexpected error: could not translate element content for key '+str.id, node);
+        consoleWarn('Unexpected error: could not translate element content for key '+str.id, node)
       }
     }
   }
@@ -852,32 +852,32 @@ window.html10n = (function(window, document, undefined) {
    */
   html10n.build = function(langs, cb) {
     var that = this
-      , build = {};
+      , build = {}
 
     asyncForEach(langs, function (lang, i, next) {
       if(!lang) return next();
-      that.loader.load(lang, next);
+      that.loader.load(lang, next)
     }, function() {
-      var lang;
+      var lang
-      langs.reverse();
+      langs.reverse()
       
       // loop through priority array...
       for (var i=0, n=langs.length; i < n; i++) {
-        lang = langs[i];
+        lang = langs[i]
         
         if(!lang || !(lang in that.loader.langs)) continue;
         
         // ... and apply all strings of the current lang in the list
         // to our build object
         for (var string in that.loader.langs[lang]) {
-          build[string] = that.loader.langs[lang][string];
+          build[string] = that.loader.langs[lang][string]
         }
         
         // the last applied lang will be exposed as the
         // lang the page was translated to
-        that.language = lang;
+        that.language = lang
       }
-      cb(null, build);
+      cb(null, build)
     })
   }
   
@@ -893,8 +893,8 @@ window.html10n = (function(window, document, undefined) {
    * Returns the direction of the language returned be html10n#getLanguage
    */
   html10n.getDirection = function() {
-    var langCode = this.language.indexOf('-') == -1? this.language : this.language.substr(0, this.language.indexOf('-'));
+    var langCode = this.language.indexOf('-') == -1? this.language : this.language.substr(0, this.language.indexOf('-'))
-    return html10n.rtl.indexOf(langCode) == -1? 'ltr' : 'rtl';
+    return html10n.rtl.indexOf(langCode) == -1? 'ltr' : 'rtl'
   }
 
   /**
@@ -903,28 +903,28 @@ window.html10n = (function(window, document, undefined) {
   html10n.index = function () {
     // Find all <link>s
     var links = document.getElementsByTagName('link')
-       , resources = [];
+       , resources = []
     for (var i=0, n=links.length; i < n; i++) {
       if (links[i].type != 'application/l10n+json')
         continue;
-      resources.push(links[i].href);
+      resources.push(links[i].href)
     }
-    this.loader = new Loader(resources);
+    this.loader = new Loader(resources)
-    this.trigger('indexed');
+    this.trigger('indexed')
   }
   
   if (document.addEventListener) // modern browsers and IE9+
    document.addEventListener('DOMContentLoaded', function() {
-     html10n.index();
+     html10n.index()
-   }, false);
+   }, false)
   else if (window.attachEvent)
     window.attachEvent('onload', function() {
-     html10n.index();
+     html10n.index()
-   }, false);
+   }, false)
 
   // gettext-like shortcut
   if (window._ === undefined)
     window._ = html10n.get;
 
-  return html10n;
+  return html10n
-})(window, document);
+})(window, document)

src/static/js/pad.js

@@ -365,8 +365,7 @@ function handshake()
 
 $.extend($.gritter.options, { 
   position: 'bottom-right', // defaults to 'top-right' but can be 'bottom-left', 'bottom-right', 'top-left', 'top-right' (added in 1.7.1)
-  fade_in_speed: 'medium', // how fast notifications fade in (string or int)
+  fade: false, // dont fade, too jerky on mobile
-  fade_out_speed: 2000, // how fast the notices fade out
   time: 6000 // hang on the screen for...
 });
 
@@ -442,6 +441,7 @@ var pad = {
   
     //initialize the chat
     chat.init(this);
+    padcookie.init(); // initialize the cookies
     pad.initTime = +(new Date());
     pad.padOptions = clientVars.initialOptions;
 

src/templates/pad.html

@@ -369,14 +369,17 @@
             <% e.end_block(); %>
         </div>
 
-        <div id="chaticon" onclick="chat.show();return false;">
+        <div id="chaticon" onclick="chat.show();return false;" data-l10n-id="pad.chat">
             <span id="chatlabel" data-l10n-id="pad.chat"></span>
             <span class="buttonicon buttonicon-chat"></span>
             <span id="chatcounter">0</span>
         </div>
 
         <div id="chatbox">
-            <div id="titlebar"><span id ="titlelabel" data-l10n-id="pad.chat"></span><a id="titlecross" onClick="chat.hide();return false;">-&nbsp;</a></div>
+            <div id="titlebar"><span id ="titlelabel" data-l10n-id="pad.chat"></span>
+              <a id="titlecross" onClick="chat.hide();return false;">-&nbsp;</a>
+              <a id="titlesticky" onClick="chat.stickToScreen(true);$('#options-stickychat').prop('checked', true);return false;" title="Stick chat to screen">█&nbsp;&nbsp;</a>
+            </div>
             <div id="chattext" class="authorColors">
                 <img alt="loading.." id="chatloadmessagesball" class="chatloadmessages" src="../static/img/loading.gif" align="top">
                 <button id="chatloadmessagesbutton" class="chatloadmessages" data-l10n-id="pad.chat.loadmessages"></button>