diff --git a/README.md b/README.md
deleted file mode 100644
index 7d3a73f52..000000000
--- a/README.md
+++ /dev/null
@@ -1,126 +0,0 @@
-# Making collaborative editing the standard on the web
-
-# About
-Etherpad lite is a really-real time collaborative editor spawned from the Hell fire of Etherpad.
-We're reusing the well tested Etherpad easysync library to make it really realtime. Etherpad Lite
-is based on node.js ergo is much lighter and more stable than the original Etherpad. Our hope
-is that this will encourage more users to use and install a realtime collaborative editor. A smaller, manageable and well
-documented codebase makes it easier for developers to improve the code and contribute towards the project.
-
-**Etherpad vs Etherpad lite**
-
-
-
Etherpad
Etherpad Lite
-
-
-
Size of the folder (without git history)
30 MB
1.5 MB
-
-
-
Languages used server side
Javascript (Rhino), Java, Scala
Javascript (node.js)
-
-
-
Lines of server side Javascript code
~101k
~9k
-
-
-
RAM Usage immediately after start
257 MB (grows to ~1GB)
16 MB (grows to ~30MB)
-
-
-
-
-Etherpad Lite is designed to be easily embeddable and provides a [HTTP API](https://github.com/ether/etherpad-lite/wiki/HTTP-API)
-that allows your web application to manage pads, users and groups. It is recommended to use the client implementations available for this API, listed on [this wiki page](https://github.com/ether/etherpad-lite/wiki/HTTP-API-client-libraries).
-There is also a [jQuery plugin](https://github.com/johnyma22/etherpad-lite-jquery-plugin) that helps you to embed Pads into your website
-
-**Visit [beta.etherpad.org](http://beta.etherpad.org) to test it live**
-
-Also, check out the **[FAQ](https://github.com/ether/etherpad-lite/wiki/FAQ)**, really!
-
-# Installation
-
-## Windows
-
-### Prebuilt windows package
-This package works out of the box on any windows machine, but it's not very useful for developing purposes...
-
-1. Download the windows package
-2. Extract the folder
-
-Now, run `start.bat` and open in your browser. You like it? [Next steps](#next-steps).
-
-### Fancy install
-You'll need [node.js](http://nodejs.org) and (optionally, though recommended) git.
-
-1. Grab the source, either
- - download
- - or `git clone https://github.com/ether/etherpad-lite.git` (for this you need git, obviously)
-2. start `bin\installOnWindows.bat`
-
-Now, run `start.bat` and open in your browser.
-
-Update to the latest version with `git pull origin`, then run `bin\installOnWindows.bat`, again.
-
-[Next steps](#next-steps).
-
-## Linux
-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"`
-
-Additionally, you'll need [node.js](http://nodejs.org).
-
-**As any user (we recommend creating a separate user called etherpad-lite):**
-
-1. Move to a folder where you want to install Etherpad Lite. Clone the git repository `git clone git://github.com/ether/etherpad-lite.git`
-2. Change into the new directory containing the cloned source code `cd etherpad-lite`
-
-Now, run `bin/run.sh` and open in your browser.
-
-Update to the latest version with `git pull origin`. The next start with bin/run.sh will update the dependencies.
-
-You like it? [Next steps](#next-steps).
-
-# Next Steps
-
-## Tweak the settings
-You can modify the settings in `settings.json`. (If you need to handle multiple settings files, you can pass the path to a settings file to `bin/run.sh` using the `-s|--settings` option. This allows you to run multiple Etherpad Lite instances from the same installation.)
-
-You should use a dedicated database such as "mysql", if you are planning on using etherpad-lite in a production environment, since the "dirtyDB" database driver is only for testing and/or development purposes.
-
-## Helpful resources
-The [wiki](https://github.com/ether/etherpad-lite/wiki) is your one-stop resource for Tutorials and How-to's, really check it out! Also, feel free to improve these wiki pages.
-
-Documentation can be found in `docs/`.
-
-# Development
-
-## Things you should know
-Read this [git guide](http://learn.github.com/p/intro.html) and watch this [video on getting started with Etherpad Lite Development](http://youtu.be/67-Q26YH97E).
-
-If you're new to node.js, start with Ryan Dahl's [Introduction to Node.js](http://youtu.be/jo_B4LTHi3I).
-
-You can debug Etherpad lite using `bin/debugRun.sh`.
-
-If you want to find out how Etherpad's `Easysync` works (the library that makes it really realtime), start with this [PDF](https://github.com/ether/etherpad-lite/raw/master/doc/easysync/easysync-full-description.pdf) (complex, but worth reading).
-
-## Getting started
-You know all this and just want to know how you can help?
-
-Look at the [TODO list](https://github.com/ether/etherpad-lite/wiki/TODO) and our [Issue tracker](https://github.com/ether/etherpad-lite/issues). (Please consider using [jshint](http://www.jshint.com/about/), if you plan to contribute code.)
-
-Also, and most importantly, read our [**Developer Guidelines**](https://github.com/ether/etherpad-lite/wiki/Developer-Guidelines), really!
-
-# Get in touch
-Join the [mailinglist](http://groups.google.com/group/etherpad-lite-dev) and make some noise on our freenode irc channel [#etherpad-lite-dev](http://webchat.freenode.net?channels=#etherpad-lite-dev)!
-
-# Modules created for this project
-
-* [ueberDB](https://github.com/ether/ueberDB) "transforms every database into a object key value store" - manages all database access
-* [channels](https://github.com/ether/channels) "Event channels in node.js" - ensures that ueberDB operations are atomic and in series for each key
-* [async-stacktrace](https://github.com/ether/async-stacktrace) "Improves node.js stacktraces and makes it easier to handle errors"
-
-# Donate!
-* [Flattr] (http://flattr.com/thing/71378/Etherpad-Foundation)
-* Paypal - Press the donate button on [etherpad.org](http://etherpad.org)
-
-# License
-[Apache License v2](http://www.apache.org/licenses/LICENSE-2.0.html)
diff --git a/src/locales/ar.ini b/src/locales/ar.ini
new file mode 100644
index 000000000..b06d21412
--- /dev/null
+++ b/src/locales/ar.ini
@@ -0,0 +1,56 @@
+; Exported from translatewiki.net
+; Author: Ali1
+; Author: Tux-tn
+[ar]
+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 = إزاحة
+pad.toolbar.unindent.title = حذف الإزاحة
+pad.toolbar.undo.title = فك (Ctrl-Z)
+pad.toolbar.redo.title = تكرار (Ctrl-Y)
+pad.toolbar.import_export.title = استيراد/تصدير من/إلى تنسيقات ملفات مختلفة
+pad.toolbar.timeslider.title = متصفح التاريخ
+pad.toolbar.savedRevision.title = التنقيحات المحفوظة
+pad.toolbar.settings.title = الإعدادات
+pad.colorpicker.save = تسجيل
+pad.colorpicker.cancel = إلغاء
+pad.loading = جاري التحميل...
+pad.settings.stickychat = الدردشة دائما على الشاشة
+pad.settings.linenocheck = أرقام الأسطر
+pad.settings.fontType = نوع الخط:
+pad.settings.fontType.normal = عادي
+pad.settings.fontType.monospaced = ثابت العرض
+pad.settings.language = اللغة:
+pad.importExport.import_export = استيراد/تصدير
+pad.importExport.import = تحميل أي ملف نصي أو وثيقة
+pad.importExport.successful = ناجح!
+pad.importExport.exporthtml = إتش تي إم إل
+pad.importExport.exportplain = نص عادي
+pad.importExport.exportword = مايكروسوفت وورد
+pad.importExport.exportpdf = صيغة المستندات المحمولة
+pad.importExport.exportopen = ODF (نسق المستند المفتوح)
+pad.importExport.exportdokuwiki = دوکوويكي
+pad.modals.connected = متصل.
+pad.modals.forcereconnect = فرض إعادة الاتصال
+pad.modals.uderdup = مفتوح في نافذة أخرى
+pad.modals.unauth = غير مخول
+pad.modals.looping = تم قطع الاتصال.
+pad.modals.initsocketfail = لا يمكن الوصول إلى الخادم
+pad.modals.initsocketfail.explanation = تعذر الاتصال بخادم المزامنة.
+pad.modals.slowcommit = تم قطع الاتصال.
+pad.modals.slowcommit.explanation = الخادم لا يستجيب.
+pad.modals.slowcommit.cause = يمكن أن يكون هذا بسبب مشاكل في الاتصال بالشبكة.
+pad.modals.deleted = محذوف.
+pad.modals.disconnected = لم تعد متّصل.
+pad.modals.disconnected.explanation = تم فقدان الإتصال بالخادم
+pad.modals.disconnected.cause = قد يكون الخادم غير متوفر. الرجاء إعلامنا إذا تكرر هذا.
+pad.share.readonly = للقراءة فقط
+pad.share.link = رابط
+pad.chat = دردشة
+timeslider.toolbar.authors = المؤلفون:
+timeslider.toolbar.authorsList = بدون مؤلفين
+timeslider.exportCurrent = تصدير النسخة الحالية ك:
diff --git a/src/locales/ast.ini b/src/locales/ast.ini
new file mode 100644
index 000000000..ab7e3a7cb
--- /dev/null
+++ b/src/locales/ast.ini
@@ -0,0 +1,78 @@
+; Exported from translatewiki.net
+; Author: Xuacu
+[ast]
+index.newPad = Nuevu bloc
+index.createOpenPad = o crear/abrir un bloc col nome:
+pad.toolbar.bold.title = Negrina (Ctrl-B)
+pad.toolbar.italic.title = Cursiva (Ctrl-I)
+pad.toolbar.underline.title = Sorrayáu (Ctrl-U)
+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.unindent.title = Sangría inversa
+pad.toolbar.undo.title = Desfacer (Ctrl-Z)
+pad.toolbar.redo.title = Refacer (Ctrl-Y)
+pad.toolbar.clearAuthorship.title = Llimpiar los colores d'autoría
+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.settings.title = Configuración
+pad.toolbar.embed.title = Incrustar esti bloc
+pad.toolbar.showusers.title = Amosar los usuarios d'esti bloc
+pad.colorpicker.save = Guardar
+pad.colorpicker.cancel = Encaboxar
+pad.loading = Cargando...
+pad.settings.padSettings = Configuración del bloc
+pad.settings.myView = la mio vista
+pad.settings.stickychat = Alderique en pantalla siempres
+pad.settings.colorcheck = Colores d'autoría
+pad.settings.linenocheck = Númberos de llinia
+pad.settings.fontType = Tipografía:
+pad.settings.fontType.normal = Normal
+pad.settings.fontType.monospaced = Monoespaciada
+pad.settings.globalView = Vista global
+pad.settings.language = Llingua:
+pad.importExport.import_export = Importar/Esportar
+pad.importExport.import = Xubir cualquier ficheru o documentu de testu
+pad.importExport.successful = ¡Correuto!
+pad.importExport.export = Esportar el bloc actual como:
+pad.importExport.exporthtml = HTML
+pad.importExport.exportplain = Testu simple
+pad.importExport.exportword = Microsoft Word
+pad.importExport.exportpdf = PDF
+pad.importExport.exportopen = ODF (Open Document Format)
+pad.importExport.exportdokuwiki = DokuWiki
+pad.modals.connected = Coneutáu.
+pad.modals.reconnecting = Reconeutando col to bloc...
+pad.modals.forcereconnect = Forzar la reconexón
+pad.modals.uderdup = Abiertu n'otra ventana
+pad.modals.userdup.explanation = Esti bloc paez que ta abiertu en más d'una ventana del navegador d'esti ordenador.
+pad.modals.userdup.advice = Reconeutar pa usar esta ventana.
+pad.modals.unauth = Non autorizáu.
+pad.modals.unauth.explanation = Los tos permisos camudaron mientres vies esta páxina. Intenta volver a coneutar.
+pad.modals.looping = Desconeutáu.
+pad.modals.looping.explanation = Hai problemes de comunicación col sirvidor de sincronización.
+pad.modals.looping.cause = Pues tar coneutáu per un torgafueos o un proxy incompatibles.
+pad.modals.initsocketfail = Sirvidor incalcanzable.
+pad.modals.initsocketfail.explanation = Nun se pudo coneutar col sirvidor de sincronización.
+pad.modals.initsocketfail.cause = Probablemente ye por aciu d'un problema col navegador o cola to conexón a internet.
+pad.modals.slowcommit = Desconeutáu.
+pad.modals.slowcommit.explanation = El sirvidor nun respuende.
+pad.modals.slowcommit.cause = Pue ser por problemes de coneutividá de la rede.
+pad.modals.deleted = Desaniciáu
+pad.modals.deleted.explanation = Esti bloc se desanició.
+pad.modals.disconnected = Te desconeutasti.
+pad.modals.disconnected.explanation = Perdióse la conexón col sirvidor
+pad.modals.disconnected.cause = El sirvidor podría nun tar disponible. Por favor, avisanos si sigue pasando esto.
+pad.share = Compartir esti bloc
+pad.share.readonly = Sólo llectura
+pad.share.link = Enllaz
+pad.share.emebdcode = Incrustar URL
+pad.chat = Chat
+pad.chat.title = Abrir el chat d'esti bloc.
+timeslider.pageTitle = Eslizador de tiempu de {{appTitle}}
+timeslider.toolbar.returnbutton = Tornar al bloc
+timeslider.toolbar.authors = Autores:
+timeslider.toolbar.authorsList = Nun hai autores
+timeslider.exportCurrent = Esportar la versión actual como:
diff --git a/src/locales/azb.ini b/src/locales/azb.ini
new file mode 100644
index 000000000..74db395ad
--- /dev/null
+++ b/src/locales/azb.ini
@@ -0,0 +1,71 @@
+; Exported from translatewiki.net
+; Author: Amir a57
+[azb]
+index.newPad = یئنی یادداشت دفترچه سی
+index.createOpenPad = یا دا ایجاد /بیر پد آدلا برابر آچماق:
+pad.toolbar.bold.title = بویوت
+pad.toolbar.italic.title = مورب
+pad.toolbar.underline.title = خطدین آلتی
+pad.toolbar.strikethrough.title = خط یئمیش
+pad.toolbar.ol.title = جوتدنمیش فهرست
+pad.toolbar.ul.title = جوتدنممیش فهرست
+pad.toolbar.indent.title = ایچری باتدیگی
+pad.toolbar.unindent.title = ائشیگه چیخدیگی
+pad.toolbar.undo.title = باطل ائتمک
+pad.toolbar.redo.title = یئنی دن
+pad.toolbar.clearAuthorship.title = یازیچی رنگ لری پوزماق
+pad.toolbar.import_export.title = آیری قالیب لردن /ایچری توکمه / ائشیگه توکمه
+pad.toolbar.timeslider.title = زمان اسلایدی
+pad.toolbar.savedRevision.title = ساخلانمیش نسخه لر
+pad.toolbar.settings.title = تنظیملر
+pad.toolbar.embed.title = بو یادداشت دفترچه سین یئرلتمک
+pad.toolbar.showusers.title = بو دفترچه یادداشت دا اولان کاربرلری گوستر
+pad.colorpicker.save = قئید ائت
+pad.colorpicker.cancel = لغو ائت
+pad.loading = یوکلنیر...
+pad.settings.padSettings = یادداشت دفترچه سینین تنظیملر
+pad.settings.myView = منیم گورنتوم
+pad.settings.stickychat = نمایش صفحه سینده همیشه چت اولسون
+pad.settings.colorcheck = یازیچی رنگ لری
+pad.settings.linenocheck = خطوط شماره سی
+pad.settings.fontType = قلم نوعی
+pad.settings.fontType.normal = نورمال
+pad.settings.fontType.monospaced = مونو اسپئیس
+pad.settings.globalView = سراسر گورونتو
+pad.settings.language = دیل
+pad.importExport.import_export = ایچری توکمه /ائشیگه توکمه
+pad.importExport.import = سند یا دا متنی پرونده یوکله
+pad.importExport.successful = موفق آمیزی دیر!
+pad.importExport.export = بو یادداشت دفترچه سی عنوانا ایچری توکمه
+pad.importExport.exporthtml = اچ تی ام ال
+pad.importExport.exportplain = ساده متن
+pad.importExport.exportword = مایکروسافت وورد
+pad.importExport.exportpdf = پی دی اف
+pad.importExport.exportopen = او دی اف
+pad.importExport.exportdokuwiki = دوکو ویکی
+pad.modals.connected = متصل اولدی
+pad.modals.reconnecting = سیزین یادداشت دفترچه سینه یئنی دن متصیل اولدی
+pad.modals.forcereconnect = یئنی اتصال اوچون زورلاما
+pad.modals.uderdup = یئنی پنجرده آچیلدی
+pad.modals.userdup.advice = بو پئنجره دن ایستفاده ائتمک اوچون یئنی دن متصیل اول
+pad.modals.unauth = اولماز
+pad.modals.unauth.explanation = سیزین ال چتما مسئله سی بو صفحه نین گورونوش زمانیندا دییشیلیب دیر .
+سعی ائدین یئنی دن متصیل اولاسینیز
+pad.modals.looping = اتیصال قطع اولدی
+pad.modals.looping.explanation = ارتیباطی موشکیل بیر ائتمه سرور ده وار دیر
+pad.modals.looping.cause = بلکه سیز دوز دئمیین بیر فایروال یادا پروکسی طریقی ایله متصیل اولوب سینیز
+pad.modals.initsocketfail = دسترسی اولمویان سرور دیر
+pad.modals.initsocketfail.explanation = بیرلشدیریلمه سرور لرینه متصیل اولا بیلمه دی
+pad.modals.deleted = سیلیندی.
+pad.modals.deleted.explanation = بو یادداشت دفترچه سی سیلینیب دیر.
+pad.modals.disconnected = سیزین اتصالینیز قطع اولوب دور.
+pad.modals.disconnected.explanation = سروره اتصال قطع اولوب دور.
+pad.share.readonly = اوخومالی فقط
+pad.share.link = باغلانتی
+pad.share.emebdcode = نشانی نی یئرلتمک
+pad.chat = چت
+pad.chat.title = بو یادداشت دفترچه نی چت اوچون آچ
+timeslider.pageTitle = {{appTitle}}زمان اسلایدری
+timeslider.toolbar.returnbutton = یادداشت دفترچه سینه قاییت
+timeslider.toolbar.authors = یازیچیلار
+timeslider.toolbar.authorsList = یازیچی سیز
diff --git a/src/locales/da.ini b/src/locales/da.ini
new file mode 100644
index 000000000..6f6d4b1d9
--- /dev/null
+++ b/src/locales/da.ini
@@ -0,0 +1,79 @@
+; Exported from translatewiki.net
+; Author: Christian List
+; Author: Emilkris33
+[da]
+index.newPad = Ny Pad
+index.createOpenPad = eller opret/åbn en Pad med navnet:
+pad.toolbar.bold.title = Fed (Ctrl-B)
+pad.toolbar.italic.title = Kursiv (Ctrl-I)
+pad.toolbar.underline.title = Understregning (Ctrl-U)
+pad.toolbar.strikethrough.title = Gennemstregning
+pad.toolbar.ol.title = Sorteret liste
+pad.toolbar.ul.title = Usorteret liste
+pad.toolbar.indent.title = Indrykning
+pad.toolbar.unindent.title = Ryk ud
+pad.toolbar.undo.title = Fortryd (Ctrl-Z)
+pad.toolbar.redo.title = Annuller Fortryd (Ctrl-Y)
+pad.toolbar.clearAuthorship.title = Fjern farver for forfatterskab
+pad.toolbar.import_export.title = Import/eksport fra/til forskellige filformater
+pad.toolbar.timeslider.title = Timeslider
+pad.toolbar.savedRevision.title = Gemte revisioner
+pad.toolbar.settings.title = Indstillinger
+pad.toolbar.embed.title = Integrer denne pad
+pad.toolbar.showusers.title = Vis brugere på denne pad
+pad.colorpicker.save = Gem
+pad.colorpicker.cancel = Afbryd
+pad.loading = Indlæser ...
+pad.settings.padSettings = Pad indstillinger
+pad.settings.myView = Min visning
+pad.settings.stickychat = Chat altid på skærmen
+pad.settings.colorcheck = Forfatterskabsfarver
+pad.settings.linenocheck = Linjenumre
+pad.settings.fontType = Skrifttype:
+pad.settings.fontType.normal = Normal
+pad.settings.fontType.monospaced = Fastbredde
+pad.settings.globalView = Global visning
+pad.settings.language = Sprog:
+pad.importExport.import_export = Import/Eksport
+pad.importExport.import = Uploade en tekstfil eller dokument
+pad.importExport.successful = Vellykket!
+pad.importExport.export = Eksporter aktuelle pad som:
+pad.importExport.exporthtml = HTML
+pad.importExport.exportplain = Almindelig tekst
+pad.importExport.exportword = Microsoft Word
+pad.importExport.exportpdf = PDF
+pad.importExport.exportopen = ODF (Open Document Format)
+pad.importExport.exportdokuwiki = DokuWiki
+pad.modals.connected = Forbundet.
+pad.modals.reconnecting = Genopretter forbindelsen til din pad...
+pad.modals.forcereconnect = Gennemtving genoprettelse af forbindelsen
+pad.modals.uderdup = Åbnet i et andet vindue
+pad.modals.userdup.explanation = Denne pad synes at være åbnet i mere end ét browservindue på denne computer.
+pad.modals.userdup.advice = Tilslut igen for at bruge dette vindue i stedet.
+pad.modals.unauth = Ikke tilladt
+pad.modals.unauth.explanation = Dine rettigheder er ændret mens du ser på denne side. Prøv at oprette forbindelsen igen.
+pad.modals.looping = Forbindelse afbrudt.
+pad.modals.looping.explanation = Der er kommunikationsproblemer med synkroniseringsserveren.
+pad.modals.looping.cause = Måske tilsluttede du via en inkompatibel firewall eller proxy.
+pad.modals.initsocketfail = Serveren er ikke tilgængelig.
+pad.modals.initsocketfail.explanation = Kunne ikke oprette forbindelse til synkroniseringsserveren.
+pad.modals.initsocketfail.cause = Det skyldes sandsynligvis et problem med din browser eller din internetforbindelse.
+pad.modals.slowcommit = Forbindelse afbrudt.
+pad.modals.slowcommit.explanation = Serveren svarer ikke.
+pad.modals.slowcommit.cause = Det kan skyldes problemer med netværksforbindelsen.
+pad.modals.deleted = Slettet.
+pad.modals.deleted.explanation = Denne pad er blevet fjernet.
+pad.modals.disconnected = Du har fået afbrudt forbindelsen.
+pad.modals.disconnected.explanation = Forbindelsen til serveren blev afbrudt
+pad.modals.disconnected.cause = Serveren er muligvis ikke tilgængelig. Gør os venligst opmærksom på hvis dette fortsætter med at ske.
+pad.share = Del denne pad
+pad.share.readonly = Skrivebeskyttet
+pad.share.link = Link
+pad.share.emebdcode = Integrerings URL
+pad.chat = Chat
+pad.chat.title = Åben chat for denne pad.
+timeslider.pageTitle = {{appTitle}} Timeslider
+timeslider.toolbar.returnbutton = Tilbage til pad
+timeslider.toolbar.authors = Forfattere:
+timeslider.toolbar.authorsList = Ingen Forfattere
+timeslider.exportCurrent = Eksporter aktuelle version som:
diff --git a/src/locales/de.ini b/src/locales/de.ini
index 1de2ad890..f153ba770 100644
--- a/src/locales/de.ini
+++ b/src/locales/de.ini
@@ -16,11 +16,11 @@ pad.toolbar.undo.title = Rückgängig (Strg-Z)
pad.toolbar.redo.title = Wiederholen (Strg-Y)
pad.toolbar.clearAuthorship.title = Autorenfarben zurücksetzen
pad.toolbar.import_export.title = Import/Export in verschiedenen Dateiformaten
-pad.toolbar.timeslider.title = Pad-Geschichte anzeigen
+pad.toolbar.timeslider.title = Pad-Versionsgeschichte anzeigen
pad.toolbar.savedRevision.title = Diese Revision markieren
pad.toolbar.settings.title = Einstellungen
pad.toolbar.embed.title = Dieses Pad teilen oder einbetten
-pad.toolbar.showusers.title = Verbundene Benutzer anzeigen
+pad.toolbar.showusers.title = Aktuell verbundene Benutzer anzeigen
pad.colorpicker.save = Speichern
pad.colorpicker.cancel = Abbrechen
pad.loading = Laden...
@@ -56,17 +56,17 @@ pad.modals.looping = Verbindung unterbrochen.
pad.modals.looping.explanation = Es gibt Probleme bei der Kommunikation mit dem Pad-Server.
pad.modals.looping.cause = Möglicherweise sind Sie durch eine inkompatible Firewall oder über einen inkompatiblen Proxy mit dem Padserver verbunden.
pad.modals.initsocketfail = Pad-Server nicht erreichbar.
-pad.modals.initsocketfail.explanation = Es konnte keine Verbindung zum Synchronisationsserver hergestellt werden.
+pad.modals.initsocketfail.explanation = Es konnte keine Verbindung zum Pad-Server hergestellt werden.
pad.modals.initsocketfail.cause = Dies könnte an Ihrem Browser oder Ihrer Internet-Verbindung liegen.
pad.modals.slowcommit = Verbindung unterbrochen.
pad.modals.slowcommit.explanation = Der Pad-Server reagiert nicht.
-pad.modals.slowcommit.cause = Dies könnte ein Problemen der Netzwerkverbindung sein, oder der Pad-Server ist momentan überlastet.
+pad.modals.slowcommit.cause = Dies könnte ein Netzwerkverbindungsproblem sein oder eine momentane Überlastung des Pad-Servers.
pad.modals.deleted = Gelöscht.
pad.modals.deleted.explanation = Dieses Pad wurde gelöscht.
pad.modals.disconnected = Verbindung unterbrochen.
pad.modals.disconnected.explanation = Die Verbindung zum Pad-Server wurde unterbrochen.
pad.modals.disconnected.cause = Möglicherweise ist der Pad-Server nicht erreichbar. Bitte benachrichtigen Sie uns, falls dies weiterhin passiert.
-pad.share = Dieses Pad teilen
+pad.share = Dieses Pad anderen mitteilen
pad.share.readonly = Eingeschränkter Nur-Lese-Zugriff
pad.share.link = Link
pad.share.emebdcode = In Webseite einbetten
diff --git a/src/locales/el.ini b/src/locales/el.ini
new file mode 100644
index 000000000..e94407a41
--- /dev/null
+++ b/src/locales/el.ini
@@ -0,0 +1,80 @@
+; Exported from translatewiki.net
+; Author: Evropi
+; Author: Glavkos
+; Author: Monopatis
+[el]
+index.newPad = Νέο Pad
+index.createOpenPad = ή δημιουργία/άνοιγμα ενός Pad με το όνομα:
+pad.toolbar.bold.title = Έντονα (Ctrl-B)
+pad.toolbar.italic.title = Πλάγια (Ctrl-I)
+pad.toolbar.underline.title = Υπογράμμιση (Ctrl-U)
+pad.toolbar.strikethrough.title = Διακριτή διαγραφή
+pad.toolbar.ol.title = Ταξινομημένη λίστα
+pad.toolbar.ul.title = Λίστα χωρίς σειρά
+pad.toolbar.indent.title = Εσοχή
+pad.toolbar.unindent.title = Εσοχή
+pad.toolbar.undo.title = Αναίρεση (Ctrl-Z)
+pad.toolbar.redo.title = Επανάληψη (Ctrl-Y)
+pad.toolbar.clearAuthorship.title = Καθαρισμός Χρωμάτων Συντακτών
+pad.toolbar.import_export.title = Εισαγωγή/Εξαγωγή από/σε διαφορετικούς τύπους αρχείων
+pad.toolbar.timeslider.title = Χρονοδιάγραμμα
+pad.toolbar.savedRevision.title = Αποθηκευμένες Εκδόσεις
+pad.toolbar.settings.title = Ρυθμίσεις
+pad.toolbar.embed.title = Ενσωματώστε αυτό το pad
+pad.toolbar.showusers.title = Εμφάνιση των χρηστών αυτού του pad
+pad.colorpicker.save = Αποθήκευση
+pad.colorpicker.cancel = Άκυρο
+pad.loading = Φόρτωση...
+pad.settings.padSettings = Ρυθμίσεις Pad
+pad.settings.myView = Η προβολή μου
+pad.settings.stickychat = Η Συνομιλία να είναι πάντα ορατή
+pad.settings.colorcheck = Χρώματα συντάκτη
+pad.settings.linenocheck = Αριθμοί γραμμής
+pad.settings.fontType = Τύπος γραμματοσειράς:
+pad.settings.fontType.normal = Κανονική
+pad.settings.fontType.monospaced = Καθορισμένου πλάτους
+pad.settings.globalView = Γενική Προβολή
+pad.settings.language = Γλώσσα:
+pad.importExport.import_export = Εισαγωγή/Εξαγωγή
+pad.importExport.import = Αποστολή οποιουδήποτε αρχείου κειμένου ή εγγράφου
+pad.importExport.successful = Επιτυχής!
+pad.importExport.export = Εξαγωγή τρέχοντος pad ως:
+pad.importExport.exporthtml = HTML
+pad.importExport.exportplain = Απλό κείμενο
+pad.importExport.exportword = Microsoft Word
+pad.importExport.exportpdf = PDF
+pad.importExport.exportopen = ODF (Open Document Format)
+pad.importExport.exportdokuwiki = DokuWiki
+pad.modals.connected = Συνδεμένοι.
+pad.modals.reconnecting = Επανασύνδεση στο pad σας...
+pad.modals.forcereconnect = Επιβολή επανασύνδεσης
+pad.modals.uderdup = Ανοιγμένο σε άλλο παράθυρο
+pad.modals.userdup.explanation = Αυτό το pad φαίνεται να είναι ανοιχτό σε περισσότερα από ένα παράθυρο του προγράμματος περιήγησης σε αυτόν τον υπολογιστή.
+pad.modals.userdup.advice = Επανασύνδεση για να χρησιμοποιήσετε αυτό το παράθυρο.
+pad.modals.unauth = Δεν επιτρέπεται
+pad.modals.unauth.explanation = Τα δικαιώματά σας άλλαξαν όσο βλέπατε αυτήν τη σελίδα. Δοκιμάστε να επανασυνδεθείτε.
+pad.modals.looping = Αποσυνδέθηκε.
+pad.modals.looping.explanation = Υπάρχουν προβλήματα επικοινωνίας με το διακομιστή συγχρονισμού.
+pad.modals.looping.cause = Ίσως συνδεθήκατε μέσω ενός μη συμβατού τείχους προστασίας ή διακομιστή μεσολάβησης.
+pad.modals.initsocketfail = Αδύνατη ή επικοινωνία με τον διακομιστή.
+pad.modals.initsocketfail.explanation = Δεν ήταν δυνατή η σύνδεση με τον διακομιστή συγχρονισμού.
+pad.modals.initsocketfail.cause = Αυτό οφείλεται πιθανώς σε πρόβλημα με το πρόγραμμα περιήγησης ή της σύνδεσής σας στο διαδίκτυο.
+pad.modals.slowcommit = Αποσυνδέθηκε.
+pad.modals.slowcommit.explanation = Ο διακομιστής δεν αποκρίνεται.
+pad.modals.slowcommit.cause = Αυτό μπορεί να οφείλεται σε προβλήματα σύνδεσης δικτύου.
+pad.modals.deleted = Διεγράφη.
+pad.modals.deleted.explanation = Αυτό το pad έχει καταργηθεί.
+pad.modals.disconnected = Έχετε αποσυνδεθεί.
+pad.modals.disconnected.explanation = Χάθηκε η σύνδεση με το διακομιστή
+pad.modals.disconnected.cause = Ο διακομιστής μπορεί να μην είναι διαθέσιμος. Παρακαλώ ειδοποιήστε μας εάν αυτό εξακολουθεί να συμβαίνει.
+pad.share = Μοιραστείτε αυτό το pad
+pad.share.readonly = Μόνο για ανάγνωση
+pad.share.link = Σύνδεσμος
+pad.share.emebdcode = Ενσωματώστε URL
+pad.chat = Συνομιλία
+pad.chat.title = Άνοιγμα της συνομιλίας για αυτό το pad.
+timeslider.pageTitle = {{appTitle}} Χρονοδιάγραμμα
+timeslider.toolbar.returnbutton = Επιστροφή στο pad
+timeslider.toolbar.authors = Συντάκτες:
+timeslider.toolbar.authorsList = Κανένας Συντάκτης
+timeslider.exportCurrent = Εξαγωγή τρέχουσας έκδοσης ως:
diff --git a/src/locales/es.ini b/src/locales/es.ini
index dd2c0d142..95c731efe 100644
--- a/src/locales/es.ini
+++ b/src/locales/es.ini
@@ -1,5 +1,7 @@
; Exported from translatewiki.net
+; Author: Jacobo
; Author: McDutchie
+; Author: Xuacu
[es]
index.newPad = Nuevo Pad
index.createOpenPad = o puedes crear/abrir un Pad con el nombre:
@@ -36,8 +38,7 @@ pad.settings.language = Idioma:
pad.importExport.import_export = Importar/Exportar
pad.importExport.import = Subir cualquier texto o documento
pad.importExport.successful = ¡Operación exitosa!
-; Fuzzy
-pad.importExport.export = Exporta el pad actual como
+pad.importExport.export = Exporta el pad actual como:
pad.importExport.exporthtml = HTML
pad.importExport.exportplain = Texto plano
pad.importExport.exportword = Microsoft Word
@@ -56,7 +57,7 @@ pad.modals.looping = Desconectado.
pad.modals.looping.explanation = Estamos teniendo problemas con la sincronización en el servidor.
pad.modals.looping.cause = Quizás su conexión fluya a través de un proxy o un cortafuegos incompatible.
pad.modals.initsocketfail = Servidor incalcanzable.
-pad.modals.initsocketfail.explanation = No se pudo conectar al sevidor de sincronización.
+pad.modals.initsocketfail.explanation = No se pudo conectar al servidor de sincronización.
pad.modals.initsocketfail.cause = Puede ser a causa de tu navegador o de una caída en tu conexión de Internet.
pad.modals.slowcommit = Desconectado.
pad.modals.slowcommit.explanation = El servidor no responde.
diff --git a/src/locales/fi.ini b/src/locales/fi.ini
index 29ddd87a8..0a9c4f6c3 100644
--- a/src/locales/fi.ini
+++ b/src/locales/fi.ini
@@ -1,10 +1,11 @@
; Exported from translatewiki.net
; Author: Artnay
; Author: Jl
+; Author: Nedergard
; Author: Nike
[fi]
index.newPad = Uusi muistio
-index.createOpenPad = tai avaa muistio nimellä:
+index.createOpenPad = tai luo/avaa muistio nimellä:
pad.toolbar.bold.title = Lihavointi (Ctrl-B)
pad.toolbar.italic.title = Kursivointi (Ctrl-I)
pad.toolbar.underline.title = Alleviivaus (Ctrl-U)
@@ -16,14 +17,14 @@ pad.toolbar.unindent.title = Ulonna
pad.toolbar.undo.title = Kumoa (Ctrl-Z)
pad.toolbar.redo.title = Tee uudelleen (Ctrl-Y)
pad.toolbar.clearAuthorship.title = Poista kirjoittajavärit
-pad.toolbar.import_export.title = Tuo tai vie eri muotoihin
+pad.toolbar.import_export.title = Tuo tai vie eri tiedostomuodoista tai -muotoihin
pad.toolbar.timeslider.title = Aikajana
pad.toolbar.savedRevision.title = Tallennetut versiot
pad.toolbar.settings.title = Asetukset
pad.toolbar.embed.title = Upota muistio
pad.toolbar.showusers.title = Näytä muistion käyttäjät
pad.colorpicker.save = Tallenna
-pad.colorpicker.cancel = Peru
+pad.colorpicker.cancel = Peruuta
pad.loading = Ladataan…
pad.settings.padSettings = Muistion asetukset
pad.settings.myView = Oma näkymä
@@ -78,3 +79,18 @@ timeslider.toolbar.returnbutton = Palaa muistioon
timeslider.toolbar.authors = Tekijät:
timeslider.toolbar.authorsList = Ei tekijöitä
timeslider.exportCurrent = Vie nykyinen versio muodossa:
+timeslider.version = Versio {{version}}
+timeslider.saved = Tallennettu {{day}}. {{month}}ta {{year}}
+timeslider.dateformat = {{day}}.{{month}}.{{year}} {{hours}}:{{minutes}}:{{seconds}}
+timeslider.month.january = tammikuu
+timeslider.month.february = helmikuu
+timeslider.month.march = maaliskuu
+timeslider.month.april = huhtikuu
+timeslider.month.may = toukokuu
+timeslider.month.june = kesäkuu
+timeslider.month.july = heinäkuu
+timeslider.month.august = elokuu
+timeslider.month.september = syyskuu
+timeslider.month.october = lokakuu
+timeslider.month.november = marraskuu
+timeslider.month.december = joulukuu
diff --git a/src/locales/fr.ini b/src/locales/fr.ini
index 853c9ba88..7ac51f9c9 100644
--- a/src/locales/fr.ini
+++ b/src/locales/fr.ini
@@ -1,10 +1,13 @@
; Exported from translatewiki.net
+; Author: Crochet.david
; Author: Gomoko
+; Author: Jean-Frédéric
; Author: Leviathan
; Author: McDutchie
+; Author: Od1n
[fr]
index.newPad = Nouveau Pad
-index.createOpenPad = ou créer/ouvrir un Pad intitulé
+index.createOpenPad = ou créer/ouvrir un Pad intitulé :
pad.toolbar.bold.title = Gras (Ctrl-B)
pad.toolbar.italic.title = Italique (Ctrl-I)
pad.toolbar.underline.title = Souligner (Ctrl-U)
@@ -17,41 +20,41 @@ pad.toolbar.undo.title = Annuler (Ctrl-Z)
pad.toolbar.redo.title = Rétablir (Ctrl-Y)
pad.toolbar.clearAuthorship.title = Effacer les couleurs identifiant les auteurs
pad.toolbar.import_export.title = Importer/Exporter de/vers un format de fichier différent
-pad.toolbar.timeslider.title = Navigateur d'historique
+pad.toolbar.timeslider.title = Navigateur d’historique
pad.toolbar.savedRevision.title = Versions enregistrées
pad.toolbar.settings.title = Paramètres
pad.toolbar.embed.title = Intégrer ce Pad
pad.toolbar.showusers.title = Afficher les utilisateurs du Pad
-pad.colorpicker.save = Sauver
+pad.colorpicker.save = Enregistrer
pad.colorpicker.cancel = Annuler
-pad.loading = Chargement...
+pad.loading = Chargement…
pad.settings.padSettings = Paramètres du Pad
pad.settings.myView = Ma vue
pad.settings.stickychat = Messagerie toujours affichée
-pad.settings.colorcheck = Couleurs d'identification
+pad.settings.colorcheck = Couleurs d’identification
pad.settings.linenocheck = Numéros des lignes
-pad.settings.fontType = Type de police:
+pad.settings.fontType = Type de police :
pad.settings.fontType.normal = Normal
pad.settings.fontType.monospaced = Monospace
-pad.settings.globalView = Vue d'ensemble
-pad.settings.language = Langue:
+pad.settings.globalView = Vue d’ensemble
+pad.settings.language = Langue :
pad.importExport.import_export = Importer/Exporter
pad.importExport.import = Charger un texte ou un document
-pad.importExport.successful = Traitement effectué!
-pad.importExport.export = Exporter le Pad actuel comme:
+pad.importExport.successful = Traitement effectué !
+pad.importExport.export = Exporter le Pad actuel comme :
pad.importExport.exporthtml = HTML
pad.importExport.exportplain = Texte brut
pad.importExport.exportword = Microsoft Word
-pad.importExport.exportpdf = PDf
+pad.importExport.exportpdf = PDF
pad.importExport.exportopen = ODF (Open Document Format)
pad.importExport.exportdokuwiki = DokuWiki
pad.modals.connected = Connecté.
pad.modals.reconnecting = Reconnexion vers votre Pad...
pad.modals.forcereconnect = Forcer la reconnexion.
pad.modals.uderdup = Ouvert dans une autre fenêtre
-pad.modals.userdup.explanation = Ce Pad semble avoir été ouvert dans plusieurs fenêtres de votre fureteur sur cet ordinateur.
+pad.modals.userdup.explanation = Il semble que ce Pad soit ouvert dans plusieurs fenêtres de votre navigateur sur cet ordinateur.
pad.modals.userdup.advice = Se reconnecter en utilisant cette fenêtre.
-pad.modals.unauth = Not authorized Non authorisé
+pad.modals.unauth = Non autorisé
pad.modals.unauth.explanation = Vos permissions ont été changées lors de la visualisation de cette page. Essayer de vous reconnecter.
pad.modals.looping = Déconnecté.
pad.modals.looping.explanation = Nous éprouvons un problème de communication au serveur de synchronisation.
@@ -59,9 +62,9 @@ pad.modals.looping.cause = Il est possible que leur connection soit protégée p
pad.modals.initsocketfail = Le serveur est introuvable.
pad.modals.initsocketfail.explanation = Impossible de se connecter au serveur de synchronisation.
pad.modals.initsocketfail.cause = La cause de ce problème peut être liée à votre fureteur web.
-pad.modals.slowcommit = Disconnected. Déconnecté
+pad.modals.slowcommit = Déconnecté.
pad.modals.slowcommit.explanation = Le serveur ne répond pas.
-pad.modals.slowcommit.cause = La cause de ce problème peut être liée à une erreur de connectivité du réseau.
+pad.modals.slowcommit.cause = La cause de ce problème peut être liée à une erreur de connectivité du réseau.
pad.modals.deleted = Supprimé.
pad.modals.deleted.explanation = Ce Pad a été supprimé.
pad.modals.disconnected = Vous avez été déconnecté.
@@ -75,6 +78,6 @@ pad.chat = Messagerie
pad.chat.title = Ouvrir la messagerie liée au Pad.
timeslider.pageTitle = {{appTitle}} Curseur temporel
timeslider.toolbar.returnbutton = Retour à ce Pad.
-timeslider.toolbar.authors = Auteurs:
+timeslider.toolbar.authors = Auteurs :
timeslider.toolbar.authorsList = Aucun auteur
-timeslider.exportCurrent = Exporter version actuelle vers:
+timeslider.exportCurrent = Exporter version actuelle vers :
diff --git a/src/locales/gl.ini b/src/locales/gl.ini
new file mode 100644
index 000000000..017c61f21
--- /dev/null
+++ b/src/locales/gl.ini
@@ -0,0 +1,78 @@
+; Exported from translatewiki.net
+; Author: Toliño
+[gl]
+index.newPad = Novo documento
+index.createOpenPad = ou cree/abra un documento co nome:
+pad.toolbar.bold.title = Negra (Ctrl-B)
+pad.toolbar.italic.title = Cursiva (Ctrl-I)
+pad.toolbar.underline.title = Subliñar (Ctrl-U)
+pad.toolbar.strikethrough.title = Riscar
+pad.toolbar.ol.title = Lista ordenada
+pad.toolbar.ul.title = Lista sen ordenar
+pad.toolbar.indent.title = Sangría
+pad.toolbar.unindent.title = Sen sangría
+pad.toolbar.undo.title = Desfacer (Ctrl-Z)
+pad.toolbar.redo.title = Refacer (Ctrl-Y)
+pad.toolbar.clearAuthorship.title = Limpar as cores de identificación dos autores
+pad.toolbar.import_export.title = Importar/Exportar desde/a diferentes formatos de ficheiro
+pad.toolbar.timeslider.title = Liña do tempo
+pad.toolbar.savedRevision.title = Revisións gardadas
+pad.toolbar.settings.title = Configuracións
+pad.toolbar.embed.title = Incorporar este documento
+pad.toolbar.showusers.title = Mostrar os usuarios deste documento
+pad.colorpicker.save = Gardar
+pad.colorpicker.cancel = Cancelar
+pad.loading = Cargando...
+pad.settings.padSettings = Configuracións do documento
+pad.settings.myView = A miña vista
+pad.settings.stickychat = Chat sempre visible
+pad.settings.colorcheck = Cores de identificación
+pad.settings.linenocheck = Números de liña
+pad.settings.fontType = Tipo de letra:
+pad.settings.fontType.normal = Normal
+pad.settings.fontType.monospaced = Monoespazada
+pad.settings.globalView = Vista global
+pad.settings.language = Lingua:
+pad.importExport.import_export = Importar/Exportar
+pad.importExport.import = Cargar un ficheiro de texto ou documento
+pad.importExport.successful = Correcto!
+pad.importExport.export = Exportar o documento actual en formato:
+pad.importExport.exporthtml = HTML
+pad.importExport.exportplain = Texto simple
+pad.importExport.exportword = Microsoft Word
+pad.importExport.exportpdf = PDF
+pad.importExport.exportopen = ODF (Open Document Format)
+pad.importExport.exportdokuwiki = DokuWiki
+pad.modals.connected = Conectado.
+pad.modals.reconnecting = Reconectando co seu documento...
+pad.modals.forcereconnect = Forzar a reconexión
+pad.modals.uderdup = Aberto noutra ventá
+pad.modals.userdup.explanation = Semella que este documento está aberto en varias ventás do navegador neste ordenador.
+pad.modals.userdup.advice = Reconectar para usar esta ventá.
+pad.modals.unauth = Non autorizado
+pad.modals.unauth.explanation = Os seus permisos cambiaron mentres estaba nesta páxina. Intente a reconexión.
+pad.modals.looping = Desconectado.
+pad.modals.looping.explanation = Hai un problema de comunicación co servidor de sincronización.
+pad.modals.looping.cause = Seica a súa conexión pasa a través dun firewall ou proxy incompatible.
+pad.modals.initsocketfail = Non se pode alcanzar o servidor.
+pad.modals.initsocketfail.explanation = Non se pode conectar co servidor de sincronización.
+pad.modals.initsocketfail.cause = Isto acontece probablemente debido a un problema co navegador ou coa conexión á internet.
+pad.modals.slowcommit = Desconectado.
+pad.modals.slowcommit.explanation = O servidor non responde.
+pad.modals.slowcommit.cause = Isto pode deberse a un problema de conexión á rede.
+pad.modals.deleted = Borrado.
+pad.modals.deleted.explanation = Este documento foi eliminado.
+pad.modals.disconnected = Foi desconectado.
+pad.modals.disconnected.explanation = Perdeuse a conexión co servidor
+pad.modals.disconnected.cause = O servidor non está dispoñible. Póñase en contacto con nós se o problema continúa.
+pad.share = Compartir este documento
+pad.share.readonly = Lectura só
+pad.share.link = Ligazón
+pad.share.emebdcode = Incorporar o URL
+pad.chat = Chat
+pad.chat.title = Abrir o chat deste documento.
+timeslider.pageTitle = Liña do tempo de {{appTitle}}
+timeslider.toolbar.returnbutton = Volver ao documento
+timeslider.toolbar.authors = Autores:
+timeslider.toolbar.authorsList = Ningún autor
+timeslider.exportCurrent = Exportar a versión actual en formato:
diff --git a/src/locales/hu.ini b/src/locales/hu.ini
index da76f32e0..cc79d034c 100644
--- a/src/locales/hu.ini
+++ b/src/locales/hu.ini
@@ -1,4 +1,5 @@
; Exported from translatewiki.net
+; Author: R-Joe
; Author: Tgr
[hu]
index.newPad = Új notesz
@@ -25,8 +26,8 @@ pad.colorpicker.cancel = Mégsem
pad.loading = Betöltés…
pad.settings.padSettings = Notesz beállításai
pad.settings.myView = Az én nézetem
-pad.settings.stickychat = Mindig mutasd a chat-dobozt
-pad.settings.colorcheck = Szerzők szíbei
+pad.settings.stickychat = Mindig mutasd a csevegés-dobozt
+pad.settings.colorcheck = Szerzők színei
pad.settings.linenocheck = Sorok számozása
pad.settings.fontType = Betűtípus:
pad.settings.fontType.normal = Szokásos
@@ -41,7 +42,7 @@ pad.importExport.exporthtml = HTML
pad.importExport.exportplain = Sima szöveg
pad.importExport.exportword = Microsoft Word
pad.importExport.exportpdf = PDF
-pad.importExport.exportopen = ODF (Open Document Format)
+pad.importExport.exportopen = ODF (Open Document formátum)
pad.importExport.exportdokuwiki = DokuWiki
pad.modals.connected = Kapcsolódva.
pad.modals.reconnecting = Újrakapcsolódás a noteszhez...
@@ -69,8 +70,8 @@ pad.share = Notesz megosztása
pad.share.readonly = Csak olvasható
pad.share.link = Hivatkozás
pad.share.emebdcode = URL beágyazása
-pad.chat = Chat
-pad.chat.title = A noteszhez tartozó chat megnyitása.
+pad.chat = Csevegés
+pad.chat.title = A noteszhez tartozó csevegés megnyitása.
timeslider.pageTitle = {{appTitle}} időcsúszka
timeslider.toolbar.returnbutton = Vissza a noteszhez
timeslider.toolbar.authors = Szerzők:
diff --git a/src/locales/it.ini b/src/locales/it.ini
new file mode 100644
index 000000000..2e47d2932
--- /dev/null
+++ b/src/locales/it.ini
@@ -0,0 +1,78 @@
+; Exported from translatewiki.net
+; Author: Gianfranco
+[it]
+index.newPad = Nuovo Pad
+index.createOpenPad = o creare o aprire un Pad con il nome:
+pad.toolbar.bold.title = Grassetto (Ctrl-B)
+pad.toolbar.italic.title = Corsivo (Ctrl-I)
+pad.toolbar.underline.title = Sottolinea (Ctrl-U)
+pad.toolbar.strikethrough.title = Barrato
+pad.toolbar.ol.title = Elenco ordinato
+pad.toolbar.ul.title = Elenco non ordinato
+pad.toolbar.indent.title = Rientro
+pad.toolbar.unindent.title = Riduci rientro
+pad.toolbar.undo.title = Annulla (Ctrl-Z)
+pad.toolbar.redo.title = Ripeti (Ctrl-Y)
+pad.toolbar.clearAuthorship.title = Elimina i colori che indicano gli autori
+pad.toolbar.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.settings.title = Impostazioni
+pad.toolbar.embed.title = Incorpora questo pad
+pad.toolbar.showusers.title = Visualizza gli utenti su questo pad
+pad.colorpicker.save = Salva
+pad.colorpicker.cancel = Annulla
+pad.loading = Caricamento in corso…
+pad.settings.padSettings = Impostazioni del Pad
+pad.settings.myView = Mia visualizzazione
+pad.settings.stickychat = Chat sempre sullo schermo
+pad.settings.colorcheck = Colori che indicano gli autori
+pad.settings.linenocheck = Numeri di riga
+pad.settings.fontType = Tipo di carattere:
+pad.settings.fontType.normal = Normale
+pad.settings.fontType.monospaced = Monospace
+pad.settings.globalView = Visualizzazione globale
+pad.settings.language = Lingua:
+pad.importExport.import_export = Importazione/esportazione
+pad.importExport.import = Carica qualsiasi file di testo o documento
+pad.importExport.successful = Riuscito!
+pad.importExport.export = Esportare il pad corrente come:
+pad.importExport.exporthtml = HTML
+pad.importExport.exportplain = Solo testo
+pad.importExport.exportword = Microsoft Word
+pad.importExport.exportpdf = PDF
+pad.importExport.exportopen = ODF (Open Document Format)
+pad.importExport.exportdokuwiki = DokuWiki
+pad.modals.connected = Connesso.
+pad.modals.reconnecting = Riconnessione al tuo pad in corso...
+pad.modals.forcereconnect = Forza la riconnessione
+pad.modals.uderdup = Aperto in un'altra finestra
+pad.modals.userdup.explanation = Questo pad sembra essere aperto in più di una finestra del browser su questo computer.
+pad.modals.userdup.advice = Riconnettiti per utilizzare invece questa finestra.
+pad.modals.unauth = Non autorizzato
+pad.modals.unauth.explanation = Le tue autorizzazioni sono state modificate durante la visualizzazione di questa pagina. Prova a riconnetterti.
+pad.modals.looping = Disconnesso.
+pad.modals.looping.explanation = Ci sono problemi di comunicazione con il server di sincronizzazione.
+pad.modals.looping.cause = Forse sei connesso attraverso un firewall o un server proxy non compatibili.
+pad.modals.initsocketfail = Il server non è raggiungibile.
+pad.modals.initsocketfail.explanation = Impossibile connettersi al server di sincronizzazione.
+pad.modals.initsocketfail.cause = Questo è probabilmente dovuto a un problema con il tuo browser o con la tua connessione a internet.
+pad.modals.slowcommit = Disconnesso.
+pad.modals.slowcommit.explanation = Il server non risponde.
+pad.modals.slowcommit.cause = Questo potrebbe essere dovuto a problemi con la connettività di rete.
+pad.modals.deleted = Cancellato.
+pad.modals.deleted.explanation = Questo pad è stato rimosso.
+pad.modals.disconnected = Sei stato disconnesso.
+pad.modals.disconnected.explanation = La connessione al server è stata persa
+pad.modals.disconnected.cause = Il server potrebbe essere non disponibile. Per favore, fateci sapere se il problema persiste.
+pad.share = Condividi questo pad
+pad.share.readonly = Sola lettura
+pad.share.link = Link
+pad.share.emebdcode = Incorpora URL
+pad.chat = Chat
+pad.chat.title = Apri la chat per questo pad.
+timeslider.pageTitle = Cronologia {{appTitle}}
+timeslider.toolbar.returnbutton = Ritorna al pad
+timeslider.toolbar.authors = Autori:
+timeslider.toolbar.authorsList = Nessun autore
+timeslider.exportCurrent = Esporta la versione corrente come:
diff --git a/src/locales/nl.ini b/src/locales/nl.ini
index 868cd9870..94dcb32de 100644
--- a/src/locales/nl.ini
+++ b/src/locales/nl.ini
@@ -37,7 +37,6 @@ pad.settings.language = Taal:
pad.importExport.import_export = Importeren/exporteren
pad.importExport.import = Upload een tekstbestand of document
pad.importExport.successful = Afgerond
-; Fuzzy
pad.importExport.export = Huidige pad exporteren als
pad.importExport.exporthtml = HTML
pad.importExport.exportplain = Tekst zonder opmaak
@@ -50,7 +49,7 @@ pad.modals.reconnecting = Opnieuw verbinding maken met uw pad...
pad.modals.forcereconnect = Opnieuw verbinden
pad.modals.uderdup = In een ander venster geopend
pad.modals.userdup.explanation = Dit pad is meer dan één keer geopend in een browservenster op deze computer.
-pad.modals.userdup.advice = Als u dit venster wilt gebruiken maakt u opnieuw verbinding.
+pad.modals.userdup.advice = Maak opnieuw verbinding als u dit venster wilt gebruiken.
pad.modals.unauth = Niet toegestaan
pad.modals.unauth.explanation = Uw rechten zijn gewijzigd terwijl u de pagina aan het bekijken was. Probeer opnieuw te verbinden.
pad.modals.looping = Verbinding verbroken.
diff --git a/src/locales/pl.ini b/src/locales/pl.ini
new file mode 100644
index 000000000..0eefc3eff
--- /dev/null
+++ b/src/locales/pl.ini
@@ -0,0 +1,78 @@
+; Exported from translatewiki.net
+; Author: Woytecr
+[pl]
+index.newPad = Nowy Dokument
+index.createOpenPad = lub stwórz/otwórz dokument o nazwie:
+pad.toolbar.bold.title = Pogrubienie (Ctrl-B)
+pad.toolbar.italic.title = Kursywa (Ctrl-I)
+pad.toolbar.underline.title = Podkreślenie (Ctrl-U)
+pad.toolbar.strikethrough.title = Przekreślenie
+pad.toolbar.ol.title = Lista uporządkowana
+pad.toolbar.ul.title = Lista nieuporządkowana
+pad.toolbar.indent.title = Wcięcie
+pad.toolbar.unindent.title = Zmniejsz wcięcie
+pad.toolbar.undo.title = Cofnij (Ctrl-Z)
+pad.toolbar.redo.title = Ponów (Ctrl-Y)
+pad.toolbar.clearAuthorship.title = Usuń kolory autorów
+pad.toolbar.import_export.title = Import/eksport z/do różnych formatów plików
+pad.toolbar.timeslider.title = Oś czasu
+pad.toolbar.savedRevision.title = Zapisane wersje
+pad.toolbar.settings.title = Ustawienia
+pad.toolbar.embed.title = Umieść ten Notatnik
+pad.toolbar.showusers.title = Pokaż użytkowników
+pad.colorpicker.save = Zapisz
+pad.colorpicker.cancel = Anuluj
+pad.loading = Ładowanie...
+pad.settings.padSettings = Ustawienia dokumentu
+pad.settings.myView = Mój widok
+pad.settings.stickychat = Czat zawsze na ekranie
+pad.settings.colorcheck = Kolory autorstwa
+pad.settings.linenocheck = Numery linii
+pad.settings.fontType = Rodzaj czcionki:
+pad.settings.fontType.normal = Normalna
+pad.settings.fontType.monospaced = Monospace
+pad.settings.globalView = Widok ogólny
+pad.settings.language = Język:
+pad.importExport.import_export = Import/eksport
+pad.importExport.import = Prześlij dowolny plik tekstowy lub dokument
+pad.importExport.successful = Sukces!
+pad.importExport.export = Eksportuj bieżący dokument jako:
+pad.importExport.exporthtml = HTML
+pad.importExport.exportplain = Zwykły tekst
+pad.importExport.exportword = Microsoft Word
+pad.importExport.exportpdf = PDF
+pad.importExport.exportopen = ODF (Open Document Format)
+pad.importExport.exportdokuwiki = DokuWiki
+pad.modals.connected = Połączony.
+pad.modals.reconnecting = Ponowne łączenie z dokumentem...
+pad.modals.forcereconnect = Wymuś ponowne połączenie
+pad.modals.uderdup = Otwarty w innym oknie
+pad.modals.userdup.explanation = Ten dokument prawdopodobnie został otwarty w więcej niż jednym oknie przeglądarki.
+pad.modals.userdup.advice = Połącz ponownie przy użyciu tego okna.
+pad.modals.unauth = Brak autoryzacji
+pad.modals.unauth.explanation = Twoje uprawnienia uległy zmianie podczas przeglądania tej strony. Spróbuj ponownie się połączyć.
+pad.modals.looping = Rozłączony.
+pad.modals.looping.explanation = Wystąpiły problemy z komunikacją z serwerem synchronizacji.
+pad.modals.looping.cause = Być może jesteś połączony przez niezgodną zaporę lub serwer proxy.
+pad.modals.initsocketfail = Serwer jest nieosiągalny.
+pad.modals.initsocketfail.explanation = Nie udało się połączyć z serwerem synchronizacji.
+pad.modals.initsocketfail.cause = Przyczyną są prawdopodobnie problemy z przeglądarka lub połączeniem z internetem.
+pad.modals.slowcommit = Rozłączony.
+pad.modals.slowcommit.explanation = Serwer nie odpowiada.
+pad.modals.slowcommit.cause = Może być to spowodowane problemami z Twoim połączeniem z siecią.
+pad.modals.deleted = Usunięto.
+pad.modals.deleted.explanation = Ten dokument został usunięty.
+pad.modals.disconnected = Zostałeś rozłączony.
+pad.modals.disconnected.explanation = Utracono połączenie z serwerem
+pad.modals.disconnected.cause = Serwer może być niedostępny. Poinformuj nas jeżeli problem będzie się powtarzał.
+pad.share = Udostępnij ten dokument
+pad.share.readonly = Tylko do odczytu
+pad.share.link = Link
+pad.share.emebdcode = Kod do umieszczenia
+pad.chat = Czat
+pad.chat.title = Otwórz czat dla tego dokumentu.
+timeslider.pageTitle = Oś czasu {{appTitle}}
+timeslider.toolbar.returnbutton = Powróć do dokumentu
+timeslider.toolbar.authors = Autorzy:
+timeslider.toolbar.authorsList = Brak autorów
+timeslider.exportCurrent = Eksportuj bieżącą wersję jako:
diff --git a/src/locales/pt.ini b/src/locales/pt.ini
new file mode 100644
index 000000000..a210e64ac
--- /dev/null
+++ b/src/locales/pt.ini
@@ -0,0 +1,45 @@
+; Exported from translatewiki.net
+; Author: Waldir
+[pt]
+index.newPad = Novo Pad
+index.createOpenPad = ou criar/abrir um Pad com o nome:
+pad.toolbar.bold.title = Negrito (Ctrl-B)
+pad.toolbar.italic.title = Itálico (Ctrl-I)
+pad.toolbar.underline.title = Sublinhado (Ctrl-U)
+pad.toolbar.ol.title = Lista numerada
+pad.toolbar.ul.title = Lista
+pad.toolbar.undo.title = Desfazer (Ctrl-Z)
+pad.toolbar.redo.title = Refazer (Ctrl-Y)
+pad.toolbar.clearAuthorship.title = Limpar cores de autoria
+pad.toolbar.import_export.title = Importar/exportar de/para diferentes formatos de ficheiro
+pad.toolbar.timeslider.title = Linha de tempo
+pad.toolbar.savedRevision.title = Versões gravadas
+pad.toolbar.settings.title = Configurações
+pad.toolbar.embed.title = Incorporar este Pad
+pad.toolbar.showusers.title = Mostrar os utilizadores neste Pad
+pad.colorpicker.save = Gravar
+pad.colorpicker.cancel = Cancelar
+pad.loading = A carregar…
+pad.settings.padSettings = Configurações do Pad
+pad.settings.myView = Minha vista
+pad.settings.colorcheck = Cores de autoria
+pad.settings.linenocheck = Números de linha
+pad.settings.fontType = Tipo de letra:
+pad.settings.fontType.normal = Normal
+pad.settings.fontType.monospaced = Monoespaçada
+pad.settings.globalView = Vista global
+pad.settings.language = Língua:
+pad.importExport.import_export = Importar/Exportar
+pad.importExport.import = Carregar qualquer ficheiro de texto ou documento
+pad.importExport.successful = Bem sucedido!
+pad.importExport.export = Exportar o Pad actual como:
+pad.importExport.exporthtml = HTML
+pad.importExport.exportplain = Texto simples
+pad.importExport.exportword = Microsoft Word
+pad.importExport.exportpdf = PDF
+pad.importExport.exportopen = ODF (Open Document Format)
+pad.importExport.exportdokuwiki = DokuWiki
+pad.modals.connected = Ligado.
+pad.modals.reconnecting = Reconectando-se ao seu bloco…
+pad.modals.forcereconnect = Forçar reconexão
+pad.modals.uderdup = Aberto noutra janela
diff --git a/src/locales/sv.ini b/src/locales/sv.ini
new file mode 100644
index 000000000..bd3c1e5c3
--- /dev/null
+++ b/src/locales/sv.ini
@@ -0,0 +1,78 @@
+; Exported from translatewiki.net
+; Author: WikiPhoenix
+[sv]
+index.newPad = Nytt block
+index.createOpenPad = eller skapa/öppna ett block med namnet:
+pad.toolbar.bold.title = Fet (Ctrl-B)
+pad.toolbar.italic.title = Kursiv (Ctrl-I)
+pad.toolbar.underline.title = Understruken (Ctrl-U)
+pad.toolbar.strikethrough.title = Genomstruken
+pad.toolbar.ol.title = Numrerad lista
+pad.toolbar.ul.title = Ta bort numrerad lista
+pad.toolbar.indent.title = Öka indrag
+pad.toolbar.unindent.title = Minska indrag
+pad.toolbar.undo.title = Ångra (Ctrl-Z)
+pad.toolbar.redo.title = Gör om (Ctrl-Y)
+pad.toolbar.clearAuthorship.title = Rensa färger för författarskap
+pad.toolbar.import_export.title = Importera/exportera från/till olika filformat
+pad.toolbar.timeslider.title = Tidsreglage
+pad.toolbar.savedRevision.title = Sparade revisioner
+pad.toolbar.settings.title = Inställningar
+pad.toolbar.embed.title = Bädda in detta block
+pad.toolbar.showusers.title = Visa användarna på detta block
+pad.colorpicker.save = Spara
+pad.colorpicker.cancel = Avbryt
+pad.loading = Läser in...
+pad.settings.padSettings = Blockinställningar
+pad.settings.myView = Min vy
+pad.settings.stickychat = Chatten alltid på skärmen
+pad.settings.colorcheck = Författarskapsfärger
+pad.settings.linenocheck = Radnummer
+pad.settings.fontType = Typsnitt:
+pad.settings.fontType.normal = Normal
+pad.settings.fontType.monospaced = Fast breddsteg
+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.successful = Åtgärden slutfördes!
+pad.importExport.export = Export aktuellt block som:
+pad.importExport.exporthtml = HTML
+pad.importExport.exportplain = Oformaterad text
+pad.importExport.exportword = Microsoft Word
+pad.importExport.exportpdf = PDF
+pad.importExport.exportopen = ODF (Open Document Format)
+pad.importExport.exportdokuwiki = DokuWiki
+pad.modals.connected = Ansluten.
+pad.modals.reconnecting = Återansluter till ditt block...
+pad.modals.forcereconnect = Tvinga återanslutning
+pad.modals.uderdup = Öppnas i ett nytt fönster
+pad.modals.userdup.explanation = Detta block verkar vara öppet i mer än ett fönster på denna dator.
+pad.modals.userdup.advice = Återanslut för att använda detta fönster istället.
+pad.modals.unauth = Inte godkänd
+pad.modals.unauth.explanation = Din behörighet ändrades medan du visar denna sida. Försök att återansluta.
+pad.modals.looping = Frånkopplad.
+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.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.slowcommit = Frånkopplad.
+pad.modals.slowcommit.explanation = Servern svarar inte.
+pad.modals.slowcommit.cause = Detta kan bero på problem med nätverksanslutningen.
+pad.modals.deleted = Raderad.
+pad.modals.deleted.explanation = Detta block har tagits bort.
+pad.modals.disconnected = Du har kopplats från.
+pad.modals.disconnected.explanation = Anslutningen till servern avbröts
+pad.modals.disconnected.cause = Servern kanske inte är tillgänglig. Var god meddela oss om detta fortsätter att hända.
+pad.share = Dela detta block
+pad.share.readonly = Skrivskyddad
+pad.share.link = Länk
+pad.share.emebdcode = Bädda in URL
+pad.chat = Chatt
+pad.chat.title = Öppna chatten för detta block.
+timeslider.pageTitle = Tidsreglage för {{appTitle}}
+timeslider.toolbar.returnbutton = Återvänd till blocket
+timeslider.toolbar.authors = Författare:
+timeslider.toolbar.authorsList = Ingen författare
+timeslider.exportCurrent = Exportera aktuell version som:
diff --git a/src/locales/uk.ini b/src/locales/uk.ini
new file mode 100644
index 000000000..03cb18366
--- /dev/null
+++ b/src/locales/uk.ini
@@ -0,0 +1,78 @@
+; Exported from translatewiki.net
+; Author: Base
+[uk]
+index.newPad = Створити
+index.createOpenPad = або створити/відкрити документ з назвою:
+pad.toolbar.bold.title = Напівжирний (Ctrl-B)
+pad.toolbar.italic.title = Курсив (Ctrl-I)
+pad.toolbar.underline.title = Підкреслення (Ctrl-U)
+pad.toolbar.strikethrough.title = Закреслення
+pad.toolbar.ol.title = Упорядкований список
+pad.toolbar.ul.title = Неупорядкований список
+pad.toolbar.indent.title = Відступ
+pad.toolbar.unindent.title = Виступ
+pad.toolbar.undo.title = Скасувати (Ctrl-Z)
+pad.toolbar.redo.title = Повторити (Ctrl-Y)
+pad.toolbar.clearAuthorship.title = Очистити кольори документу
+pad.toolbar.import_export.title = Імпорт/Експорт з використанням різних форматів файлів
+pad.toolbar.timeslider.title = Шкала часу
+pad.toolbar.savedRevision.title = Збережені версії
+pad.toolbar.settings.title = Налаштування
+pad.toolbar.embed.title = Вбудувати цей документ
+pad.toolbar.showusers.title = Показати користувачів цього документу
+pad.colorpicker.save = Зберегти
+pad.colorpicker.cancel = Скасувати
+pad.loading = Завантаження…
+pad.settings.padSettings = Налаштування документу
+pad.settings.myView = Мій Вигляд
+pad.settings.stickychat = Завжди відображувати чат
+pad.settings.colorcheck = Кольори документу
+pad.settings.linenocheck = Номери рядків
+pad.settings.fontType = Тип шрифту:
+pad.settings.fontType.normal = Звичайний
+pad.settings.fontType.monospaced = Моноширинний
+pad.settings.globalView = Загальний вигляд
+pad.settings.language = Мова:
+pad.importExport.import_export = Імпорт/Експорт
+pad.importExport.import = Завантажити будь-який текстовий файл або документ
+pad.importExport.successful = Успішно!
+pad.importExport.export = Експортувати поточний документ як:
+pad.importExport.exporthtml = HTML
+pad.importExport.exportplain = Звичайний текст
+pad.importExport.exportword = Microsoft Word
+pad.importExport.exportpdf = PDF
+pad.importExport.exportopen = ODF (документ OpenOffice)
+pad.importExport.exportdokuwiki = DokuWiki
+pad.modals.connected = З'єднано.
+pad.modals.reconnecting = Перепідлючення до Вашого документу..
+pad.modals.forcereconnect = Примусове перепідключення
+pad.modals.uderdup = Відкрито у іншому вікні
+pad.modals.userdup.explanation = Документ, можливо, відкрито більш ніж в одному вікні браузера на цьому комп'ютері.
+pad.modals.userdup.advice = Перепідключитись використовуючи це вікно.
+pad.modals.unauth = Не авторизовано
+pad.modals.unauth.explanation = Ваші права було змінено під час перегляду цієї сторінк. Спробуйте перепідключитись.
+pad.modals.looping = Від'єднано.
+pad.modals.looping.explanation = Проблеми зв'єзку з сервером синхронізації.
+pad.modals.looping.cause = Можливо, підключились через несумісний брандмауер або проксі-сервер.
+pad.modals.initsocketfail = Сервер недоступний.
+pad.modals.initsocketfail.explanation = Не вдалося підключитися до сервера синхронізації.
+pad.modals.initsocketfail.cause = Ймовірно, це пов'язано з Вашим браузером або інтернет-з'єднанням.
+pad.modals.slowcommit = Від'єднано.
+pad.modals.slowcommit.explanation = Сервер не відповідає.
+pad.modals.slowcommit.cause = Це може бути через проблем з підключенням до мережі.
+pad.modals.deleted = Вилучено.
+pad.modals.deleted.explanation = Цей документ було вилучено.
+pad.modals.disconnected = Вас було від'єднано.
+pad.modals.disconnected.explanation = З'єднання з сервером втрачено
+pad.modals.disconnected.cause = Сервер, можливо, недоступний. Будь ласка, повідомте нам, якщо це повторюватиметься.
+pad.share = Поділитись
+pad.share.readonly = Тільки читання
+pad.share.link = Посилання
+pad.share.emebdcode = Вставити URL
+pad.chat = Чат
+pad.chat.title = Відкрити чат для цього документу.
+timeslider.pageTitle = Часова шкала {{appTitle}}
+timeslider.toolbar.returnbutton = Повернутись до документу
+timeslider.toolbar.authors = Автори:
+timeslider.toolbar.authorsList = Немає авторів
+timeslider.exportCurrent = Експортувати поточну версію як:
diff --git a/src/node/hooks/express/socketio.js b/src/node/hooks/express/socketio.js
index 546ba2af6..c2b9ff6c7 100644
--- a/src/node/hooks/express/socketio.js
+++ b/src/node/hooks/express/socketio.js
@@ -36,13 +36,10 @@ exports.expressCreateServer = function (hook_name, args, cb) {
});
});
- // the following has been successfully tested with the following browsers
- // works also behind reverse proxy
- // Firefox 14.0.1
- // IE8 with Native XMLHTTP support
- // IE8 without Native XMLHTTP support
- // Chrome 21.0.1180.79
- io.set('transports', ['jsonp-polling']);
+ // there shouldn#t be a browser that isn't compatible to all
+ // transports in this list at once
+ // e.g. XHR is disabled in IE by default, so in IE it should use jsonp-polling
+ io.set('transports', ['xhr-polling', 'jsonp-polling', 'htmlfile']);
var socketIOLogger = log4js.getLogger("socket.io");
io.set('logger', {
diff --git a/src/node/utils/Settings.js b/src/node/utils/Settings.js
index 9caa2b0be..fb2a592cb 100644
--- a/src/node/utils/Settings.js
+++ b/src/node/utils/Settings.js
@@ -38,6 +38,8 @@ exports.title = "Etherpad Lite";
* The app favicon fully specified url, visible e.g. in the browser window
*/
exports.favicon = "favicon.ico";
+exports.faviconPad = "../" + exports.favicon;
+exports.faviconTimeslider = "../../" + exports.favicon;
/**
* The IP ep-lite should listen to
diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js
index b3bc91a9f..87132603e 100644
--- a/src/static/js/ace2_inner.js
+++ b/src/static/js/ace2_inner.js
@@ -3561,7 +3561,6 @@ function Ace2Inner(){
inCallStackIfNecessary("handleKeyEvent", function()
{
-
if (type == "keypress" || (isTypeForSpecialKey && keyCode == 13 /*return*/ ))
{
// in IE, special keys don't send keypress, the keydown does the action
@@ -3575,7 +3574,6 @@ function Ace2Inner(){
{
outsideKeyDown(evt);
}
-
if (!stopped)
{
var specialHandledInHook = hooks.callAll('aceKeyEvent', {
@@ -3614,6 +3612,12 @@ function Ace2Inner(){
}, 0);
specialHandled = true;
}
+ if ((!specialHandled) && isTypeForCmdKey && String.fromCharCode(which).toLowerCase() == "s" && (evt.metaKey || evt.ctrlKey)) /* Do a saved revision on ctrl S */
+ {
+ evt.preventDefault();
+ parent.parent.pad.collabClient.sendMessage({"type":"SAVE_REVISION"}); /* The parent.parent part of this is BAD and I feel bad.. It may break something */
+ specialHandled = true;
+ }
if ((!specialHandled) && isTypeForSpecialKey && keyCode == 9 && !(evt.metaKey || evt.ctrlKey))
{
// tab
diff --git a/src/templates/pad.html b/src/templates/pad.html
index 3f3eee4f1..c1300d5e3 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -32,7 +32,7 @@
-
+