build(deps-dev): bump sinon from 17.0.0 to 17.0.1 in /src (#6020)

Bumps [sinon](https://github.com/sinonjs/sinon) from 17.0.0 to 17.0.1.
- [Release notes](https://github.com/sinonjs/sinon/releases)
- [Changelog](https://github.com/sinonjs/sinon/blob/main/docs/changelog.md)
- [Commits](https://github.com/sinonjs/sinon/compare/v17.0.0...v17.0.1)

---
updated-dependencies:
- dependency-name: sinon
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/workflows/backend-tests.yml

@@ -18,13 +18,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [12, 14, 16]
+        node: [16, 18, 20]
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       -
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
           cache: 'npm'
@@ -55,13 +55,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [12, 14, 16]
+        node: [16, 18, 20]
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       -
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
           cache: 'npm'
@@ -120,11 +120,11 @@ jobs:
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       -
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 12
+          node-version: 20
           cache: 'npm'
           cache-dependency-path: |
             src/package-lock.json
@@ -153,11 +153,11 @@ jobs:
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       -
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 12
+          node-version: 20
           cache: 'npm'
           cache-dependency-path: |
             src/package-lock.json

.github/workflows/codeql-analysis.yml

@@ -23,7 +23,7 @@ jobs:
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           # We must fetch at least the immediate parents so that if this is
           # a pull request then we can checkout the head.

.github/workflows/dependency-review.yml

@@ -15,6 +15,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Checkout Repository'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: 'Dependency Review'
-        uses: actions/dependency-review-action@v1
+        uses: actions/dependency-review-action@v3

.github/workflows/docker.yml

@@ -17,17 +17,17 @@ jobs:
     steps:
       -
         name: Check out
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       -
         name: Set up QEMU
         if: github.event_name == 'push'
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v3
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
       -
         name: Build and export to Docker
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v5
         with:
           context: .
           load: true
@@ -36,7 +36,7 @@ jobs:
           cache-to: type=gha,mode=max
       -
         name: Set up Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 'lts/*'
           cache: 'npm'
@@ -64,7 +64,7 @@ jobs:
         name: Docker meta
         if: github.event_name == 'push'
         id: meta
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v5
         with:
           images: etherpad/etherpad
           tags: |
@@ -75,14 +75,14 @@ jobs:
       -
         name: Log in to Docker Hub
         if: github.event_name == 'push'
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       -
         name: Build and push
         if: github.event_name == 'push'
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v5
         with:
           context: .
           platforms: linux/amd64,linux/arm64

.github/workflows/frontend-admin-tests.yml

@@ -3,28 +3,22 @@ name: "Frontend admin tests powered by Sauce Labs"
 
 on: [push]
 
+permissions:
+  contents: read # to fetch code (actions/checkout)
+
 jobs:
   withplugins:
+    if: ${{ github.actor != 'dependabot[bot]' }}
     name: with plugins
     runs-on: ubuntu-latest
 
+#        node: [16, 19, 20] >> Disabled node 16 and 18 because they do not work
     strategy:
       fail-fast: false
       matrix:
-        node: [12, 14, 16]
+        node: [19, 20]
 
     steps:
-      -
-        name: Fail if Dependabot
-        if: github.actor == 'dependabot[bot]'
-        run: |
-          cat <<EOF >&2
-          Frontend tests skipped because Dependabot can't access secrets.
-          Manually re-run the jobs to run the frontend tests.
-          For more information, see:
-          https://github.blog/changelog/2021-02-19-github-actions-workflows-triggered-by-dependabot-prs-will-run-with-read-only-permissions/
-          EOF
-          exit 1
       -
         name: Generate Sauce Labs strings
         id: sauce_strings
@@ -33,9 +27,9 @@ jobs:
           printf %s\\n '::set-output name=tunnel_id::${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}-node${{ matrix.node }}'
       -
         name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       -
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
           cache: 'npm'
@@ -76,11 +70,15 @@ jobs:
       -
         name: increase maxHttpBufferSize
         run: "sed -i 's/\"maxHttpBufferSize\": 10000/\"maxHttpBufferSize\": 100000/' settings.json"
+      -
+        name: Disable import/export rate limiting
+        run: |
+          sed -e '/^ *"importExportRateLimiting":/,/^ *\}/ s/"max":.*/"max": 1000000/' -i settings.json
       -
         name: Remove standard frontend test files, so only admin tests are run
         run: mv src/tests/frontend/specs/* /tmp && mv /tmp/admin*.js src/tests/frontend/specs
       -
-        uses: saucelabs/sauce-connect-action@v2.1.1
+        uses: saucelabs/sauce-connect-action@v2.3.5
         with:
           username: ${{ secrets.SAUCE_USERNAME }}
           accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}

.github/workflows/frontend-tests.yml

@@ -3,22 +3,16 @@ name: "Frontend tests powered by Sauce Labs"
 
 on: [push]
 
+permissions:
+  contents: read # to fetch code (actions/checkout)
+
 jobs:
   withoutplugins:
     name: without plugins
     runs-on: ubuntu-latest
+    if: ${{ github.actor != 'dependabot[bot]' }}
+
     steps:
-      -
-        name: Fail if Dependabot
-        if: github.actor == 'dependabot[bot]'
-        run: |
-          cat <<EOF >&2
-          Frontend tests skipped because Dependabot can't access secrets.
-          Manually re-run the jobs to run the frontend tests.
-          For more information, see:
-          https://github.blog/changelog/2021-02-19-github-actions-workflows-triggered-by-dependabot-prs-will-run-with-read-only-permissions/
-          EOF
-          exit 1
       -
         name: Generate Sauce Labs strings
         id: sauce_strings
@@ -27,11 +21,11 @@ jobs:
           printf %s\\n '::set-output name=tunnel_id::${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}'
       -
         name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       -
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 12
+          node-version: 20
           cache: 'npm'
           cache-dependency-path: |
             src/package-lock.json
@@ -49,9 +43,9 @@ jobs:
       -
         name: Disable import/export rate limiting
         run: |
-          sed -e '/^ *"importExportRateLimiting":/,/^ *\}/ s/"max":.*/"max": 0/' -i settings.json
+          sed -e '/^ *"importExportRateLimiting":/,/^ *\}/ s/"max":.*/"max": 100000000/' -i settings.json
       -
-        uses: saucelabs/sauce-connect-action@v2.1.1
+        uses: saucelabs/sauce-connect-action@v2.3.5
         with:
           username: ${{ secrets.SAUCE_USERNAME }}
           accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
@@ -71,18 +65,9 @@ jobs:
   withplugins:
     name: with plugins
     runs-on: ubuntu-latest
+    if: ${{ github.actor != 'dependabot[bot]' }}
+
     steps:
-      -
-        name: Fail if Dependabot
-        if: github.actor == 'dependabot[bot]'
-        run: |
-          cat <<EOF >&2
-          Frontend tests skipped because Dependabot can't access secrets.
-          Manually re-run the jobs to run the frontend tests.
-          For more information, see:
-          https://github.blog/changelog/2021-02-19-github-actions-workflows-triggered-by-dependabot-prs-will-run-with-read-only-permissions/
-          EOF
-          exit 1
       -
         name: Generate Sauce Labs strings
         id: sauce_strings
@@ -91,11 +76,11 @@ jobs:
           printf %s\\n '::set-output name=tunnel_id::${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}'
       -
         name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       -
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 12
+          node-version: 20
           cache: 'npm'
           cache-dependency-path: |
             src/package-lock.json
@@ -123,7 +108,7 @@ jobs:
       # Etherpad core dependencies must be installed after installing the
       # plugin's dependencies, otherwise npm will try to hoist common
       # dependencies by removing them from src/node_modules and installing them
-      # in the top-level node_modules. As of v6.14.10, npm's hoist logic appears
+      # in the top-level node_modules. As of v6.20.10, npm's hoist logic appears
       # to be buggy, because it sometimes removes dependencies from
       # src/node_modules but fails to add them to the top-level node_modules.
       # Even if npm correctly hoists the dependencies, the hoisting seems to
@@ -142,13 +127,13 @@ jobs:
       -
         name: Disable import/export rate limiting
         run: |
-          sed -e '/^ *"importExportRateLimiting":/,/^ *\}/ s/"max":.*/"max": 0/' -i settings.json
+          sed -e '/^ *"importExportRateLimiting":/,/^ *\}/ s/"max":.*/"max": 1000000/' -i settings.json
       # XXX we should probably run all tests, because plugins could effect their results
       -
         name: Remove standard frontend test files, so only plugin tests are run
         run: rm src/tests/frontend/specs/*
       -
-        uses: saucelabs/sauce-connect-action@v2.1.1
+        uses: saucelabs/sauce-connect-action@v2.3.5
         with:
           username: ${{ secrets.SAUCE_USERNAME }}
           accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}

.github/workflows/lint-package-lock.yml

@@ -18,18 +18,18 @@ jobs:
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       -
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 12
+          node-version: 20
           cache: 'npm'
           cache-dependency-path: |
             src/package-lock.json
             src/bin/doc/package-lock.json
       -
         name: Install lockfile-lint
-        run: npm install --no-save lockfile-lint
+        run: npm install --no-save lockfile-lint --legacy-peer-deps
       -
         name: Run lockfile-lint on package-lock.json
         run: >

.github/workflows/load-test.yml

@@ -18,11 +18,11 @@ jobs:
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       -
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 12
+          node-version: 20
           cache: 'npm'
           cache-dependency-path: |
             src/package-lock.json
@@ -48,11 +48,11 @@ jobs:
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       -
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 12
+          node-version: 20
           cache: 'npm'
           cache-dependency-path: |
             src/package-lock.json
@@ -105,11 +105,11 @@ jobs:
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       -
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 12
+          node-version: 20
           cache: 'npm'
           cache-dependency-path: |
             src/package-lock.json

.github/workflows/rate-limit.yml

@@ -18,11 +18,11 @@ jobs:
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       -
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 12
+          node-version: 20
           cache: 'npm'
           cache-dependency-path: |
             src/package-lock.json

.github/workflows/stale.yml

@@ -9,28 +9,10 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v5
+      - uses: actions/stale@v8
         with:
           close-issue-label: wontfix
           close-pr-label: wontfix
           days-before-close: -1
-          exempt-issue-labels:
-            - pinned
-            - security
-            - Bug
-            - Serious Bug
-            - Minor bug
-            - Black hole bug
-            - Special case Bug
-            - Upstream bug
-            - Feature Request
-          exempt-pr-labels:
-            - pinned
-            - security
-            - Bug
-            - Serious Bug
-            - Minor bug
-            - Black hole bug
-            - Special case Bug
-            - Upstream bug
-            - Feature Request
+          exempt-issue-labels: 'pinned,security,Bug,Serious Bug,Minor bug,Black hole bug,Special case Bug,Upstream bug,Feature Request'
+          exempt-pr-labels: 'pinned,security,Bug,Serious Bug,Minor bug,Black hole bug,Special case Bug,Upstream bug,Feature Request'

.github/workflows/upgrade-from-latest-release.yml

@@ -18,15 +18,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [12, 14, 16]
+        node: [16, 18, 20]
     steps:
       -
         name: Check out latest release
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: master
       -
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
           cache: 'npm'
@@ -67,7 +67,7 @@ jobs:
       -
         name: Run the backend tests
         run: cd src && npm test
-      # Because actions/checkout@v3 is called with "ref: master" and without
+      # Because actions/checkout@v4 is called with "ref: master" and without
       # "fetch-depth: 0", the local clone does not have the ${GITHUB_SHA}
       # commit. Fetch ${GITHUB_REF} to get the ${GITHUB_SHA} commit. Note that a
       # plain "git fetch" only fetches "normal" references (refs/heads/* and
@@ -90,7 +90,7 @@ jobs:
         run: cd src && npm test
       -
         name: Install Cypress
-        run: cd src && npm install cypress
+        run: cd src && npm install cypress --legacy-peer-deps
       -
         name: Run Etherpad & Test Frontend
         run: |

.github/workflows/windows.yml

@@ -24,11 +24,11 @@ jobs:
             zip
       -
         name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       -
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 12
+          node-version: 20
           cache: 'npm'
           cache-dependency-path: |
             src/package-lock.json
@@ -62,7 +62,7 @@ jobs:
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       -
         name: Download .zip
         uses: actions/download-artifact@v3
@@ -75,7 +75,7 @@ jobs:
         run: 7z x etherpad-win.zip -oetherpad-zip
       -
         name: Create installer
-        uses: joncloud/makensis-action@v3.6
+        uses: joncloud/makensis-action@v3.7
         with:
           script-file: 'src/bin/nsis/etherpad.nsi'
       -
@@ -89,7 +89,7 @@ jobs:
     # run on pushes to any branch
     # run on PRs from external forks
     permissions:
-      contents: none
+      contents: write
     if: |
       (github.event_name != 'pull_request')
       || (github.event.pull_request.head.repo.id != github.event.pull_request.base.repo.id)
@@ -106,16 +106,16 @@ jobs:
         name: Extract Etherpad
         run: 7z x etherpad-win.zip -oetherpad
       -
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 12
+          node-version: 20
           cache: 'npm'
           cache-dependency-path: |
             etherpad/src/package-lock.json
             etherpad/src/bin/doc/package-lock.json
       -
         name: Install Cypress
-        run: cd src && npm install cypress
+        run: cd etherpad && cd src && npm install cypress --legacy-peer-deps
       -
         name: Run Etherpad
         run: |
@@ -123,3 +123,13 @@ jobs:
           node node_modules\ep_etherpad-lite\node\server.js &
           curl --connect-timeout 10 --max-time 20 --retry 5 --retry-delay 10 --retry-max-time 60 --retry-connrefused http://127.0.0.1:9001/p/test
           src\node_modules\cypress\bin\cypress run --config-file src\tests\frontendcypress\cypress.config.js
+      # On release, upload windows zip to GitHub release tab
+      -
+        name: Rename to etherpad-lite-win.zip
+        shell: powershell
+        run: mv etherpad-win.zip etherpad-lite-win.zip
+      - name: upload binaries to release
+        uses: softprops/action-gh-release@v1
+        if: ${{startsWith(github.ref, 'refs/tags/v') }}
+        with:
+            files: etherpad-lite-win.zip

CHANGELOG.md

@@ -1,4 +1,76 @@
-# 1.9.0 (not yet released)
+# 1.9.4
+
+### Compability changes
+
+* Log4js has been updated to the latest version. As it involved a bump of 6 major version. 
+  A lot has changed since then. Most notably the console appender has been deprecated. You can find out more about it [here](https://github.com/log4js-node/log4js-node)
+
+### Notable enhancements and fixes
+
+* Fix for MySQL: The logger calls were incorrectly configured leading to a crash when e.g. somebody uses a different encoding than standard MySQL encoding. 
+
+# 1.9.3
+
+### Compability changes
+
+* express-rate-limit has been bumped to 7.0.0: This involves the breaking change that "max: 0"
+in the importExportRateLimiting is set to always trigger. So set it to your desired value.
+If you haven't changed that value in the settings.json you are all set. 
+
+### Notable enhancements and fixes
+
+* Bugfixes
+  * Fix etherpad crashing with mongodb database
+
+* Enhancements
+  * Add surrealdb database support. You can find out more about this database [here](https://surrealdb.com).
+  * Make sqlite faster: The sqlite library has been switched to better-sqlite3. This should lead to better performance.
+
+# 1.9.2
+
+### Notable enhancements and fixes
+
+* Security
+  * Enable session key rotation: This setting can be enabled in the settings.json. It changes the signing key for the cookie authentication in a fixed interval.
+
+* Bugfixes
+  * Fix appendRevision when creating a new pad via the API without a text. 
+
+
+* Enhancements
+  * Bump JQuery to version 3.7
+  * Update elasticsearch connector to version 8
+
+### Compatibility changes
+
+* No compability changes as JQuery maintains excellent backwards compatibility. 
+
+#### For plugin authors
+
+* Please update to JQuery 3.7. There is an excellent deprecation guide over [here](https://api.jquery.com/category/deprecated/). Version 3.1 to 3.7 are relevant for the upgrade. 
+
+# 1.9.1
+
+### Notable enhancements and fixes
+
+* Security
+  * Limit requested revisions in timeslider and export to head revision. (affects v1.9.0)
+  
+* Bugfixes
+  * revisions in `CHANGESET_REQ` (timeslider) and export (txt, html, custom)
+    are now checked to be numbers.
+  * bump sql for audit fix
+* Enhancements
+  * Add keybinding meta-backspace to delete to beginning of line
+  * Fix automatic Windows build via GitHub Actions
+  * Enable docs to be build cross platform thanks to asciidoctor
+
+### Compatibility changes
+* tests: drop windows 7 test coverage & use chrome latest for admin tests
+* Require Node 16 for Etherpad and target Node 20 for testing
+
+    
+# 1.9.0
 
 ### Notable enhancements and fixes
 
@@ -16,6 +88,11 @@
     session expires (with some exceptions that will be fixed in the future).
   * Requests for static content (e.g., `/robots.txt`) and special pages (e.g.,
     the HTTP API, `/stats`) no longer create login session state.
+  * The secret used to sign the `express_sid` cookie is now automatically
+    regenerated every day (called *key rotation*) by default. If key rotation is
+    enabled, the now-deprecated `SESSIONKEY.txt` file can be safely deleted
+    after Etherpad starts up (its content is read and saved to the database and
+    used to validate signatures from old cookies until they expire).
 * The following settings from `settings.json` are now applied as expected (they
   were unintentionally ignored before):
   * `padOptions.lang`
@@ -68,10 +145,13 @@
   access for the current message only.
 * The `init_<pluginName>` server-side hooks have a new `logger` context
   property that plugins can use to log messages.
+* Prevent infinite loop when exiting the server
+* Bump dependencies
+
 
 ### Compatibility changes
 
-* Node.js v12.17.0 or later is now required.
+* Node.js v14.15.0 or later is now required.
 * The default login session expiration (applicable if `requireAuthentication` is
   `true`) changed from never to 10 days after the user leaves.
 
@@ -112,6 +192,8 @@
 * The exported database records covered by the `exportEtherpadAdditionalContent`
   server-side hook now include keys like `${customPrefix}:${padId}:*`, not just
   `${customPrefix}:${padId}`.
+* Plugin locales should overwrite core's locales Stale
+* Plugin locales overwrite core locales
 
 # 1.8.18
 

Dockerfile

@@ -4,15 +4,21 @@
 #
 # Author: muxator
 
-FROM node:lts-slim
+FROM node:lts-alpine
 LABEL maintainer="Etherpad team, https://github.com/ether/etherpad-lite"
 
 ARG TIMEZONE=
+
 RUN \
   [ -z "${TIMEZONE}" ] || { \
-    ln -sf /usr/share/zoneinfo/"${TIMEZONE#/usr/share/zoneinfo/}" /etc/localtime; \
-    dpkg-reconfigure -f noninteractive tzdata; \
+    apk add --no-cache tzdata && \
+    cp /usr/share/zoneinfo/${TIMEZONE} /etc/localtime && \
+    echo "${TIMEZONE}" > /etc/timezone; \
   }
+ENV TIMEZONE=${TIMEZONE}
+
+# Control the configuration file to be copied into the container.
+ARG SETTINGS=./settings.json.docker
 
 # plugins to install while building the container. By default no plugins are
 # installed.
@@ -42,7 +48,9 @@ ARG INSTALL_SOFFICE=
 # leaner (development dependencies are not installed) and runs faster (among
 # other things, assets are minified & compressed).
 ENV NODE_ENV=production
-
+ENV ETHERPAD_PRODUCTION=true
+# Install dependencies required for modifying access.
+RUN apk add shadow bash
 # Follow the principle of least privilege: run as unprivileged user.
 #
 # Running as non-root enables running this image in platforms like OpenShift
@@ -54,6 +62,9 @@ ARG EP_HOME=
 ARG EP_UID=5001
 ARG EP_GID=0
 ARG EP_SHELL=
+
+ENV NODE_ENV=production
+
 RUN groupadd --system ${EP_GID:+--gid "${EP_GID}" --non-unique} etherpad && \
     useradd --system ${EP_UID:+--uid "${EP_UID}" --non-unique} --gid etherpad \
         ${EP_HOME:+--home-dir "${EP_HOME}"} --create-home \
@@ -64,18 +75,14 @@ RUN mkdir -p "${EP_DIR}" && chown etherpad:etherpad "${EP_DIR}"
 
 # the mkdir is needed for configuration of openjdk-11-jre-headless, see
 # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=863199
-RUN export DEBIAN_FRONTEND=noninteractive; \
+RUN  \
     mkdir -p /usr/share/man/man1 && \
-    apt-get -qq update && \
-    apt-get -qq dist-upgrade && \
-    apt-get -qq --no-install-recommends install \
+    apk update && apk upgrade && \
+    apk add  \
         ca-certificates \
         git \
-        ${INSTALL_ABIWORD:+abiword} \
-        ${INSTALL_SOFFICE:+libreoffice} \
-        && \
-    apt-get -qq clean && \
-    rm -rf /var/lib/apt/lists/*
+        ${INSTALL_ABIWORD:+abiword abiword-plugin-command} \
+        ${INSTALL_SOFFICE:+libreoffice openjdk8-jre libreoffice-common}
 
 USER etherpad
 
@@ -97,7 +104,7 @@ RUN { [ -z "${ETHERPAD_PLUGINS}" ] || \
     rm -rf ~/.npm
 
 # Copy the configuration file.
-COPY --chown=etherpad:etherpad ./settings.json.docker "${EP_DIR}"/settings.json
+COPY --chown=etherpad:etherpad ${SETTINGS} "${EP_DIR}"/settings.json
 
 # Fix group permissions
 RUN chmod -R g=u .

Makefile

@@ -1,32 +0,0 @@
-doc_sources = $(wildcard doc/*/*.md) $(wildcard doc/*.md)
-outdoc_files = $(addprefix out/,$(doc_sources:.md=.html))
-
-docassets = $(addprefix out/,$(wildcard doc/assets/*))
-
-VERSION = $(shell node -e "console.log( require('./src/package.json').version )")
-UNAME := $(shell uname -s)
-
-ensure_marked_is_installed:
-	set -eu; \
-	hash npm; \
-	if [ $(shell npm list --prefix src/bin/doc >/dev/null 2>/dev/null; echo $$?) -ne "0" ]; then \
-		npm ci --prefix=src/bin/doc; \
-	fi
-
-docs: ensure_marked_is_installed $(outdoc_files) $(docassets)
-
-out/doc/assets/%: doc/assets/%
-	mkdir -p $(@D)
-	cp $< $@
-
-out/doc/%.html: doc/%.md
-	mkdir -p $(@D)
-	node src/bin/doc/generate.js --format=html --template=doc/template.html $< > $@
-ifeq ($(UNAME),Darwin)
-	sed -i '' 's/__VERSION__/${VERSION}/' $@
-else
-	sed -i 's/__VERSION__/${VERSION}/' $@
-endif
-
-clean:
-	rm -rf out/

README.md

@@ -12,35 +12,15 @@ capabilities, and runs on _your_ server, under _your_ control.
 
 ## Try it out
 
-Etherpad is extremely flexible providing you the means to modify it to solve
-whatever problem your community has. We provide some demo instances for you try
-different experiences available within Etherpad. Pad content is automatically
-removed after 24 hours.
-
-  * [Rich Editing](https://rich.etherpad.com) - A full rich text WYSIWYG editor.
-  * [Minimalist editor](https://minimalist.etherpad.com) - A minimalist editor
-    that can be embedded within your tool.
-  * [Dark Mode](https://dark.etherpad.com) - Theme settings to have Etherpad
-    start in dark mode, ideal for using Etherpad at night or for long durations.
-  * [Images](https://image.etherpad.com) - Plugins to improve provide Image
-    support within a pad.
-  * [Video Chat](https://video.etherpad.com) - Plugins to enable Video and Audio
-    chat in a pad.
-  * [Collaboration++](https://collab.etherpad.com) - Plugins to improve the
-    really-real time collaboration experience, suitable for busy pads.
-  * [Document Analysis](https://analysis.etherpad.com) - Plugins to improve
-    author and document analysis during and post creation.
-  * [Scale](https://shard.etherpad.com) - Etherpad running at scale with pad
-    sharding which allows Etherpad to scale to ∞ number of Active Pads with up
-    to ~20,000 edits per second, per pad.
+Wikimedia provide a [public Etherpad instance for you to Try Etherpad out.](https://etherpad.wikimedia.org) or [use another public Etherpad instance to see other features](https://github.com/ether/etherpad-lite/wiki/Sites-That-Run-Etherpad#sites-that-run-etherpad)
 
 ## Project Status
 
+We're looking for maintainers and have some funding available.  Please contact John McLear if you can help.
+
 ### Code Quality
 
 [![Code Quality](https://github.com/ether/etherpad-lite/actions/workflows/codeql-analysis.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad-lite/actions/workflows/codeql-analysis.yml)
-[![Total alerts](https://img.shields.io/lgtm/alerts/g/ether/etherpad-lite.svg?logo=lgtm&logoWidth=18&color=%2344b492)](https://lgtm.com/projects/g/ether/etherpad-lite/alerts/)
-[![Language grade: JavaScript](https://img.shields.io/lgtm/grade/javascript/g/ether/etherpad-lite.svg?logo=lgtm&logoWidth=18&color=%2344b492)](https://lgtm.com/projects/g/ether/etherpad-lite/context:javascript)
 [![package.lock](https://github.com/ether/etherpad-lite/actions/workflows/lint-package-lock.yml/badge.svg?color=%2344b492)](https://github.com/ether/etherpad-lite/actions/workflows/lint-package-lock.yml)
 
 ### Testing
@@ -66,7 +46,7 @@ removed after 24 hours.
 
 ### Requirements
 
-[Node.js](https://nodejs.org/) >= **12.17.0**.
+[Node.js](https://nodejs.org/) >= **16.20.1**.
 
 ### GNU/Linux and other UNIX-like systems
 
@@ -136,7 +116,7 @@ following:
 
 ### Docker container
 
-Find [here](doc/docker.md) information on running Etherpad in a container.
+Find [here](doc/docker.adoc) information on running Etherpad in a container.
 
 ## Plugins
 

doc/api/api.adoc

@@ -0,0 +1,19 @@
+include::./embed_parameters.adoc[]
+
+include::./http_api.adoc[]
+
+include::./hooks_overview.adoc[]
+
+include::./hooks_client-side.adoc[]
+
+include::./hooks_server-side.adoc[]
+
+include::./editorInfo.adoc[]
+
+include::./changeset_library.adoc[]
+
+include::./pluginfw.adoc[]
+
+include::./toolbar.adoc[]
+
+include::./editbar.adoc[]

doc/api/api.md

@@ -1,10 +0,0 @@
-@include embed_parameters
-@include http_api
-@include hooks_overview
-@include hooks_client-side
-@include hooks_server-side
-@include editorInfo
-@include changeset_library
-@include pluginfw
-@include toolbar
-@include editbar

doc/api/changeset_library.adoc

@@ -1,14 +1,15 @@
-# Changeset Library
+== Changeset Library
 
-The [changeset
-library](https://github.com/ether/etherpad-lite/blob/develop/src/static/js/Changeset.js)
+The https://github.com/ether/etherpad-lite/blob/develop/src/static/js/Changeset.js[changeset
+library]
 provides tools to create, read, and apply changesets.
 
-## Changeset
+=== Changeset
 
-```javascript
+[source,javascript]
+----
 const Changeset = require('ep_etherpad-lite/static/js/Changeset');
-```
+----
 
 A changeset describes the difference between two revisions of a document. When a
 user edits a pad, the browser generates and sends a changeset to the server,
@@ -17,28 +18,29 @@ is accessible).
 
 A transmitted changeset looks like this:
 
-```
+[source]
+----
 'Z:z>1|2=m=b*0|1+1$\n'
-```
+----
 
-## Attribute Pool
+=== Attribute Pool
 
-```javascript
+[source,javascript]
+----
 const AttributePool = require('ep_etherpad-lite/static/js/AttributePool');
-```
+----
 
 Changesets do not include any attribute key–value pairs. Instead, they use
-numeric identifiers that reference attributes kept in an [attribute
-pool](https://github.com/ether/etherpad-lite/blob/develop/src/static/js/AttributePool.js).
+numeric identifiers that reference attributes kept in an https://github.com/ether/etherpad-lite/blob/develop/src/static/js/AttributePool.js[attribute pool].
 This attribute interning reduces the transmission overhead of attributes that
 are used many times.
 
 There is one attribute pool per pad, and it includes every current and
 historical attribute used in the pad.
 
-## Further Reading
+=== Further Reading
 
 Detailed information about the changesets & Easysync protocol:
 
-* [Easysync Protocol](https://github.com/ether/etherpad-lite/blob/develop/doc/easysync/easysync-notes.pdf)
-* [Etherpad and EasySync Technical Manual](https://github.com/ether/etherpad-lite/blob/develop/doc/easysync/easysync-full-description.pdf)
+* https://github.com/ether/etherpad-lite/blob/develop/doc/easysync/easysync-notes.pdf[Easysync Protocol]
+* https://github.com/ether/etherpad-lite/blob/develop/doc/easysync/easysync-full-description.pdf[Etherpad and EasySync Technical Manual]

doc/api/editbar.adoc

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

doc/api/editorInfo.adoc

@@ -0,0 +1,125 @@
+== editorInfo
+
+=== editorInfo.ace_replaceRange(start, end, text)
+This function replaces a range (from `start` to `end`) with `text`.
+
+=== editorInfo.ace_getRep()
+Returns the `rep` object.
+
+=== editorInfo.ace_getAuthor()
+
+=== editorInfo.ace_inCallStack()
+
+=== editorInfo.ace_inCallStackIfNecessary(?)
+
+=== editorInfo.ace_focus(?)
+
+=== editorInfo.ace_importText(?)
+
+=== editorInfo.ace_importAText(?)
+
+=== editorInfo.ace_exportText(?)
+
+=== editorInfo.ace_editorChangedSize(?)
+
+=== editorInfo.ace_setOnKeyPress(?)
+
+=== editorInfo.ace_setOnKeyDown(?)
+
+=== editorInfo.ace_setNotifyDirty(?)
+
+=== editorInfo.ace_dispose(?)
+
+=== editorInfo.ace_setEditable(bool)
+
+=== editorInfo.ace_execCommand(?)
+
+=== editorInfo.ace_callWithAce(fn, callStack, normalize)
+
+=== editorInfo.ace_setProperty(key, value)
+
+=== editorInfo.ace_setBaseText(txt)
+
+=== editorInfo.ace_setBaseAttributedText(atxt, apoolJsonObj)
+
+=== editorInfo.ace_applyChangesToBase(c, optAuthor, apoolJsonObj)
+
+=== editorInfo.ace_prepareUserChangeset()
+
+=== editorInfo.ace_applyPreparedChangesetToBase()
+
+=== editorInfo.ace_setUserChangeNotificationCallback(f)
+
+=== editorInfo.ace_setAuthorInfo(author, info)
+
+=== editorInfo.ace_fastIncorp(?)
+
+=== editorInfo.ace_isCaret(?)
+
+=== editorInfo.ace_getLineAndCharForPoint(?)
+
+=== editorInfo.ace_performDocumentApplyAttributesToCharRange(?)
+
+=== editorInfo.ace_setAttributeOnSelection(attribute, enabled)
+
+Sets an attribute on current range.
+Example: `call.editorInfo.ace_setAttributeOnSelection("turkey::balls", true); // turkey is the attribute here, balls is the value
+Notes: to remove the attribute pass enabled as false
+
+=== editorInfo.ace_toggleAttributeOnSelection(?)
+
+=== editorInfo.ace_getAttributeOnSelection(attribute, prevChar)
+Returns a boolean if an attribute exists on a selected range.
+prevChar value should be true if you want to get the previous Character attribute instead of the current selection for example
+if the caret is at position 0,1 (after first character) it's probable you want the attributes on the character at 0,0
+The attribute should be the string name of the attribute applied to the selection IE subscript
+Example usage: Apply the activeButton Class to a button if an attribute is on a highlighted/selected caret position or range.
+Example `var isItThere = documentAttributeManager.getAttributeOnSelection("turkey::balls", true);`
+
+See the ep_subscript plugin for an example of this function in action.
+Notes: Does not work on first or last character of a line.  Suffers from a race condition if called with aceEditEvent.
+
+=== editorInfo.ace_performSelectionChange(?)
+
+=== editorInfo.ace_doIndentOutdent(?)
+
+=== editorInfo.ace_doUndoRedo(?)
+
+=== editorInfo.ace_doInsertUnorderedList(?)
+
+=== editorInfo.ace_doInsertOrderedList(?)
+
+=== editorInfo.ace_performDocumentApplyAttributesToRange()
+
+=== editorInfo.ace_getAuthorInfos()
+Returns an info object about the author. Object key = author_id and info includes author's bg color value.
+Use to define your own authorship.
+
+=== editorInfo.ace_performDocumentReplaceRange(start, end, newText)
+This function replaces a range (from [x1,y1] to [x2,y2]) with `newText`.
+
+=== editorInfo.ace_performDocumentReplaceCharRange(startChar, endChar, newText)
+This function replaces a range (from y1 to y2) with `newText`.
+
+=== editorInfo.ace_renumberList(lineNum)
+If you delete a line, calling this method will fix the line numbering.
+
+=== editorInfo.ace_doReturnKey()
+Forces a return key at the current caret position.
+
+=== editorInfo.ace_isBlockElement(element)
+Returns true if your passed element is registered as a block element
+
+=== editorInfo.ace_getLineListType(lineNum)
+Returns the line's html list type.
+
+=== editorInfo.ace_caretLine()
+Returns X position of the caret.
+
+=== editorInfo.ace_caretColumn()
+Returns Y position of the caret.
+
+=== editorInfo.ace_caretDocChar()
+Returns the Y offset starting from [x=0,y=0]
+
+=== editorInfo.ace_isWordChar(?)

doc/api/editorInfo.md

@@ -1,79 +0,0 @@
-# editorInfo
-
-## editorInfo.ace_replaceRange(start, end, text)
-This function replaces a range (from `start` to `end`) with `text`.
-
-## editorInfo.ace_getRep()
-Returns the `rep` object.
-
-## editorInfo.ace_getAuthor()
-## editorInfo.ace_inCallStack()
-## editorInfo.ace_inCallStackIfNecessary(?)
-## editorInfo.ace_focus(?)
-## editorInfo.ace_importText(?)
-## editorInfo.ace_importAText(?)
-## editorInfo.ace_exportText(?)
-## editorInfo.ace_editorChangedSize(?)
-## editorInfo.ace_setOnKeyPress(?)
-## editorInfo.ace_setOnKeyDown(?)
-## editorInfo.ace_setNotifyDirty(?)
-## editorInfo.ace_dispose(?)
-## editorInfo.ace_setEditable(bool)
-## editorInfo.ace_execCommand(?)
-## editorInfo.ace_callWithAce(fn, callStack, normalize)
-## editorInfo.ace_setProperty(key, value)
-## editorInfo.ace_setBaseText(txt)
-## editorInfo.ace_setBaseAttributedText(atxt, apoolJsonObj)
-## editorInfo.ace_applyChangesToBase(c, optAuthor, apoolJsonObj)
-## editorInfo.ace_prepareUserChangeset()
-## editorInfo.ace_applyPreparedChangesetToBase()
-## editorInfo.ace_setUserChangeNotificationCallback(f)
-## editorInfo.ace_setAuthorInfo(author, info)
-## editorInfo.ace_fastIncorp(?)
-## editorInfo.ace_isCaret(?)
-## editorInfo.ace_getLineAndCharForPoint(?)
-## editorInfo.ace_performDocumentApplyAttributesToCharRange(?)
-## editorInfo.ace_setAttributeOnSelection(attribute, enabled)
-Sets an attribute on current range.
-Example: `call.editorInfo.ace_setAttributeOnSelection("turkey::balls", true); // turkey is the attribute here, balls is the value
-Notes: to remove the attribute pass enabled as false
-## editorInfo.ace_toggleAttributeOnSelection(?)
-## editorInfo.ace_getAttributeOnSelection(attribute, prevChar)
-Returns a boolean if an attribute exists on a selected range.
-prevChar value should be true if you want to get the previous Character attribute instead of the current selection for example
-if the caret is at position 0,1 (after first character) it's probable you want the attributes on the character at 0,0
-The attribute should be the string name of the attribute applied to the selection IE subscript
-Example usage: Apply the activeButton Class to a button if an attribute is on a highlighted/selected caret position or range.
-Example `var isItThere = documentAttributeManager.getAttributeOnSelection("turkey::balls", true);`
-
-See the ep_subscript plugin for an example of this function in action.
-Notes: Does not work on first or last character of a line.  Suffers from a race condition if called with aceEditEvent.
-## editorInfo.ace_performSelectionChange(?)
-## editorInfo.ace_doIndentOutdent(?)
-## editorInfo.ace_doUndoRedo(?)
-## editorInfo.ace_doInsertUnorderedList(?)
-## editorInfo.ace_doInsertOrderedList(?)
-## editorInfo.ace_performDocumentApplyAttributesToRange()
-
-## editorInfo.ace_getAuthorInfos()
-Returns an info object about the author. Object key = author_id and info includes author's bg color value.
-Use to define your own authorship.
-## editorInfo.ace_performDocumentReplaceRange(start, end, newText)
-This function replaces a range (from [x1,y1] to [x2,y2]) with `newText`.
-## editorInfo.ace_performDocumentReplaceCharRange(startChar, endChar, newText)
-This function replaces a range (from y1 to y2) with `newText`.
-## editorInfo.ace_renumberList(lineNum)
-If you delete a line, calling this method will fix the line numbering.
-## editorInfo.ace_doReturnKey()
-Forces a return key at the current caret position.
-## editorInfo.ace_isBlockElement(element)
-Returns true if your passed element is registered as a block element
-## editorInfo.ace_getLineListType(lineNum)
-Returns the line's html list type.
-## editorInfo.ace_caretLine()
-Returns X position of the caret.
-## editorInfo.ace_caretColumn()
-Returns Y position of the caret.
-## editorInfo.ace_caretDocChar()
-Returns the Y offset starting from [x=0,y=0]
-## editorInfo.ace_isWordChar(?)

doc/api/embed_parameters.adoc

@@ -1,72 +1,73 @@
-# Embed parameters
+== Embed parameters
 You can easily embed your etherpad-lite into any webpage by using iframes. You can configure the embedded pad using embed parameters.
 
 Example:
 
 Cut and paste the following code into any webpage to embed a pad. The parameters below will hide the chat and the line numbers and will auto-focus on Line 4.
 
-```
+[source, html]
+----
 <iframe src='http://pad.test.de/p/PAD_NAME#L4?showChat=false&showLineNumbers=false' width=600 height=400></iframe>
-```
+----
 
-## showLineNumbers
+=== showLineNumbers
  * Boolean
 
 Default: true
 
-## showControls
+=== showControls
  * Boolean
 
 Default: true
 
-## showChat
+=== showChat
  * Boolean
 
 Default: true
 
-## useMonospaceFont
+=== useMonospaceFont
  * Boolean
 
 Default: false
 
-## userName
+=== userName
  * String
 
 Default: "unnamed"
 
 Example: `userName=Etherpad%20User`
 
-## userColor
+=== userColor
  * String (css hex color value)
 
 Default: randomly chosen by pad server
 
 Example: `userColor=%23ff9900`
 
-## noColors
+=== noColors
  * Boolean
 
 Default: false
 
-## alwaysShowChat
+=== alwaysShowChat
  * Boolean
 
 Default: false
 
-## lang
+=== lang
  * String
 
 Default: en
 
 Example: `lang=ar` (translates the interface into Arabic)
 
-## rtl
+=== rtl
  * Boolean
 
 Default: true
 Displays pad text from right to left.
 
-## #L
+=== #L
  * Int
 
 Default: 0

doc/api/hooks_client-side.adoc

@@ -1,9 +1,9 @@
-# Client-side hooks
+== Client-side hooks
 
 Most of these hooks are called during or in order to set up the formatting
 process.
 
-## documentReady
+=== documentReady
 Called from: src/templates/pad.html
 
 Things in context:
@@ -12,7 +12,7 @@ nothing
 
 This hook proxies the functionality of jQuery's `$(document).ready` event.
 
-## aceDomLinePreProcessLineAttributes
+=== aceDomLinePreProcessLineAttributes
 
 Called from: src/static/js/domline.js
 
@@ -34,7 +34,7 @@ The preHtml and postHtml values will be added to the HTML display of the
 element, and if processedMarker is true, the engine won't try to process it any
 more.
 
-## aceDomLineProcessLineAttributes
+=== aceDomLineProcessLineAttributes
 
 Called from: src/static/js/domline.js
 
@@ -56,7 +56,7 @@ The preHtml and postHtml values will be added to the HTML display of the
 element, and if processedMarker is true, the engine won't try to process it any
 more.
 
-## aceCreateDomLine
+=== aceCreateDomLine
 
 Called from: src/static/js/domline.js
 
@@ -76,7 +76,7 @@ The return value of this hook should have the following structure:
 extraOpenTags and extraCloseTags will be added before and after the element in
 question, and cls will be the new class of the element going forward.
 
-## acePostWriteDomLineHTML
+=== acePostWriteDomLineHTML
 
 Called from: src/static/js/domline.js
 
@@ -87,7 +87,7 @@ Things in context:
 This hook is for right after a node has been fully formatted and written to the
 page.
 
-## aceAttribsToClasses
+=== aceAttribsToClasses
 
 Called from: src/static/js/linestylefilter.js
 
@@ -105,7 +105,7 @@ into the DOM.
 The return value for this function should be a list of classes, which will then
 be parsed into a valid class string.
 
-## aceAttribClasses
+=== aceAttribClasses
 
 Called from: src/static/js/linestylefilter.js
 
@@ -116,14 +116,16 @@ This hook is called when attributes are investigated on a line. It is useful if
 you want to add another attribute type or property type to a pad.
 
 Example:
-```
+
+[source,javascript]
+----
 exports.aceAttribClasses = function(hook_name, attr, cb){
   attr.sub = 'tag:sub';
   cb(attr);
 }
-```
+----
 
-## aceGetFilterStack
+=== aceGetFilterStack
 
 Called from: src/static/js/linestylefilter.js
 
@@ -139,7 +141,7 @@ links. They use it to find the telltale `[[ ]]` syntax that signifies internal
 links, and finding that syntax, they add in the internalHref attribute to be
 later used by the aceCreateDomLine hook (documented above).
 
-## aceEditorCSS
+=== aceEditorCSS
 
 Called from: src/static/js/ace.js
 
@@ -148,7 +150,7 @@ Things in context: None
 This hook is provided to allow custom CSS files to be loaded. The return value
 should be an array of resource urls or paths relative to the plugins directory.
 
-## aceInitInnerdocbodyHead
+=== aceInitInnerdocbodyHead
 
 Called from: src/static/js/ace.js
 
@@ -161,7 +163,7 @@ have lines of HTML added to it, giving the plugin author a chance to add in
 meta, script, link, and other tags that go into the `<head>` element of the
 editor HTML document.
 
-## aceEditEvent
+=== aceEditEvent
 
 Called from: src/static/js/ace2_inner.js
 
@@ -178,7 +180,7 @@ changes are made. Currently you can change the editor information, some of the
 meanings of the edit, and so on. You can also make internal changes (internal to
 your plugin) that use the information provided by the edit event.
 
-## aceRegisterNonScrollableEditEvents
+=== aceRegisterNonScrollableEditEvents
 
 Called from: src/static/js/ace2_inner.js
 
@@ -191,13 +193,15 @@ not scroll viewport. The return value of this hook should be a list of event
 names.
 
 Example:
-```
+
+[source, javascript]
+----
 exports.aceRegisterNonScrollableEditEvents = function(){
   return [ 'repaginate', 'updatePageCount' ];
 }
-```
+----
 
-## aceRegisterBlockElements
+=== aceRegisterBlockElements
 
 Called from: src/static/js/ace2_inner.js
 
@@ -207,7 +211,7 @@ The return value of this hook will add elements into the "lineMarkerAttribute"
 category, making the aceDomLineProcessLineAttributes hook (documented below)
 call for those elements.
 
-## aceInitialized
+=== aceInitialized
 
 Called from: src/static/js/ace2_inner.js
 
@@ -222,7 +226,7 @@ Things in context:
 This hook is for inserting further information into the ace engine, for later
 use in formatting hooks.
 
-## postAceInit
+=== postAceInit
 
 Called from: src/static/js/pad.js
 
@@ -234,7 +238,7 @@ Things in context:
    `clientVars` server-side hook.
 3. pad - the pad object of the current pad.
 
-## postToolbarInit
+=== postToolbarInit
 
 Called from: src/static/js/pad_editbar.js
 
@@ -247,16 +251,16 @@ Can be used to register custom actions to the toolbar.
 
 Usage examples:
 
-* [https://github.com/tiblu/ep_authorship_toggle]()
+* https://github.com/tiblu/ep_authorship_toggle
 
-## postTimesliderInit
+=== postTimesliderInit
 
 Called from: src/static/js/timeslider.js
 
 There doesn't appear to be any example available of this particular hook being
 used, but it gets fired after the timeslider is all set up.
 
-## goToRevisionEvent
+=== goToRevisionEvent
 
 Called from: src/static/js/broadcast.js
 
@@ -268,7 +272,7 @@ This hook gets fired both on timeslider load (as timeslider shows a new
 revision) and when the new revision is showed to a user. There doesn't appear to
 be any example available of this particular hook being used.
 
-## userJoinOrUpdate
+=== userJoinOrUpdate
 
 Called from: src/static/js/pad_userlist.js
 
@@ -279,7 +283,7 @@ 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`
+=== chatNewMessage
 
 Called from: `src/static/js/chat.js`
 
@@ -315,7 +319,7 @@ Context properties:
 * `duration`: How long (in milliseconds) to display the gritter notification (0
   to disable).
 
-## `chatSendMessage`
+=== chatSendMessage
 
 Called from: `src/static/js/chat.js`
 
@@ -327,7 +331,7 @@ Context properties:
 
 * `message`: The message object that will be sent to the Etherpad server.
 
-## collectContentPre
+=== collectContentPre
 
 Called from: src/static/js/contentcollector.js
 
@@ -351,7 +355,7 @@ If you want to specify also a value, call cc.doAttrib(state,
 "attributeName::value") which results in an attribute attributeName=value.
 
 
-## collectContentImage
+=== collectContentImage
 
 Called from: src/static/js/contentcollector.js
 
@@ -370,14 +374,15 @@ content of the pad.
 
 Example:
 
-```
+[source, javascript]
+----
 exports.collectContentImage = function(name, context){
   context.state.lineAttributes.img = context.node.outerHTML;
 }
 
-```
+----
 
-## collectContentPost
+=== collectContentPost
 
 Called from: src/static/js/contentcollector.js
 
@@ -393,7 +398,7 @@ This hook is called after the content of a node is collected by the usual
 methods. The cc object can be used to do a bunch of things that modify the
 content of the pad. See, for example, the heading1 plugin for etherpad original.
 
-## handleClientMessage_`name`
+=== handleClientMessage_`name`
 
 Called from: `src/static/js/collab_client.js`
 
@@ -410,7 +415,7 @@ also use this to handle existing types.
 `collab_client.js` has a pretty extensive list of message types, if you want to
 take a look.
 
-## aceStartLineAndCharForPoint-aceEndLineAndCharForPoint
+=== aceStartLineAndCharForPoint-aceEndLineAndCharForPoint
 
 Called from: src/static/js/ace2_inner.js
 
@@ -426,7 +431,7 @@ Things in context:
 This hook is provided to allow a plugin to turn DOM node selection into
 [line,char] selection. The return value should be an array of [line,char]
 
-## aceKeyEvent
+=== aceKeyEvent
 
 Called from: src/static/js/ace2_inner.js
 
@@ -441,7 +446,7 @@ Things in context:
 This hook is provided to allow a plugin to handle key events.
 The return value should be true if you have handled the event.
 
-## collectContentLineText
+=== collectContentLineText
 
 Called from: src/static/js/contentcollector.js
 
@@ -462,13 +467,14 @@ server side. To change the text, either:
 
 Example:
 
-```
+[source,javascript]
+----
 exports.collectContentLineText = (hookName, context) => {
   context.text = tweakText(context.text);
 };
-```
+----
 
-## collectContentLineBreak
+=== collectContentLineBreak
 
 Called from: src/static/js/contentcollector.js
 
@@ -481,7 +487,7 @@ Things in context:
 This hook is provided to allow whether the br tag should induce a new magic
 domline or not. The return value should be either true(break the line) or false.
 
-## disableAuthorColorsForThisLine
+=== disableAuthorColorsForThisLine
 
 Called from: src/static/js/linestylefilter.js
 
@@ -497,7 +503,7 @@ multiple authors. Multiple authors in one line cause the creation of magic span
 lines. This might not suit you and now you can disable it and handle your own
 deliniation. The return value should be either true(disable) or false.
 
-## aceSetAuthorStyle
+=== aceSetAuthorStyle
 
 Called from: src/static/js/ace2_inner.js
 
@@ -514,7 +520,7 @@ This hook is provided to allow author highlight style to be modified. Registered
 hooks should return 1 if the plugin handles highlighting. If no plugin returns
 1, the core will use the default background-based highlighting.
 
-## aceSelectionChanged
+=== aceSelectionChanged
 
 Called from: src/static/js/ace2_inner.js
 

doc/api/hooks_overview.adoc

@@ -1,4 +1,4 @@
-# Hooks
+== Hooks
 
 A hook function is registered with a hook via the plugin's `ep.json` file. See
 the Plugins section for details. A hook may have many registered functions from
@@ -8,12 +8,12 @@ Some hooks call their registered functions one at a time until one of them
 returns a value. Others always call all of their registered functions and
 combine the results (if applicable).
 
-## Registered hook functions
+=== Registered hook functions
 
 Note: The documentation in this section applies to every hook unless the
 hook-specific documentation says otherwise.
 
-### Arguments
+==== Arguments
 
 Hook functions are called with three arguments:
 
@@ -26,7 +26,7 @@ Hook functions are called with three arguments:
    section for general information that applies to most hooks). This callback
    always returns `undefined`.
 
-### Expected behavior
+==== Expected behavior
 
 The presence of a callback parameter suggests that every hook function can run
 asynchronously. While that is the eventual goal, there are some legacy hooks
@@ -54,15 +54,13 @@ Note that the acceptable behaviors for asynchronous hook functions is a superset
 of the acceptable behaviors for synchronous hook functions.
 
 WARNING: The number of parameters is determined by examining
-[Function.length](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Function/length),
-which does not count [default
-parameters](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Functions/Default_parameters)
-or ["rest"
-parameters](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Functions/rest_parameters).
+https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Function/length[Function.length],
+which does not count https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Functions/Default_parameters[default parameters]
+or https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Functions/rest_parameters["rest" parameters].
 To avoid problems, do not use default or rest parameters when defining hook
 functions.
 
-### Return values
+==== Return values
 
 A hook function can provide a value to Etherpad in one of the following ways:
 
@@ -77,7 +75,8 @@ A hook function can provide a value to Etherpad in one of the following ways:
 
 Examples:
 
-```javascript
+[source,javascript]
+----
 exports.exampleOne = (hookName, context, callback) => {
   return 'valueOne';
 };
@@ -104,7 +103,7 @@ exports.exampleFive = async (hookName, context) => {
   // is resolved to 'valueFive'.
   return 'valueFive';
 };
-```
+----
 
 Etherpad collects the values provided by the hook functions into an array,
 filters out all `undefined` values, then flattens the array one level.

doc/api/hooks_server-side.adoc

@@ -1,7 +1,7 @@
-# Server-side hooks
+== Server-side hooks
 These hooks are called on server-side.
 
-## loadSettings
+=== loadSettings
 Called from: src/node/server.js
 
 Things in context:
@@ -10,7 +10,7 @@ Things in context:
 
 Use this hook to receive the global settings in your plugin.
 
-## shutdown
+=== shutdown
 Called from: src/node/server.js
 
 Things in context: None
@@ -25,14 +25,15 @@ Returning `callback(value)` will return a Promise that is resolved to `value`.
 
 Example:
 
-```
+[source, javascript]
+----
 // using an async function
 exports.shutdown = async (hookName, context) => {
   await flushBuffers();
 };
-```
+----
 
-## pluginUninstall
+=== pluginUninstall
 Called from: src/static/js/pluginfw/installer.js
 
 Things in context:
@@ -41,7 +42,7 @@ Things in context:
 
 If this hook returns an error, the callback to the uninstall function gets an error as well. This mostly seems useful for handling additional features added in based on the installation of other plugins, which is pretty cool!
 
-## pluginInstall
+=== pluginInstall
 Called from: src/static/js/pluginfw/installer.js
 
 Things in context:
@@ -50,7 +51,7 @@ Things in context:
 
 If this hook returns an error, the callback to the install function gets an error, too. This seems useful for adding in features when a particular plugin is installed.
 
-## `init_<plugin name>`
+=== init_<plugin name>
 
 Called from: `src/static/js/pluginfw/plugins.js`
 
@@ -61,12 +62,12 @@ Context properties:
   * `logger`: An object with the following `console`-like methods: `debug`,
     `info`, `log`, `warn`, `error`.
 
-## `expressPreSession`
+=== expressPreSession
 
 Called from: `src/node/hooks/express.js`
 
 Called during server startup just before the
-[`express-session`](https://www.npmjs.com/package/express-session) middleware is
+https://www.npmjs.com/package/express-session[`express-session`] middleware is
 added to the Express Application object. Use this hook to add route handlers or
 middleware that executes before `express-session` state is created and
 authentication is performed. This is useful for creating public endpoints that
@@ -79,33 +80,34 @@ handler itself authenticates the user.
 
 Context properties:
 
-* `app`: The Express [Application](https://expressjs.com/en/4x/api.html#app)
+* `app`: The Express https://expressjs.com/en/4x/api.html==app[Application]
   object.
 
 Example:
 
-```javascript
+[source,javascript]
+----
 exports.expressPreSession = async (hookName, {app}) => {
   app.get('/hello-world', (req, res) => res.send('hello world'));
 };
-```
+----
 
-## `expressConfigure`
+=== expressConfigure
 
 Called from: `src/node/hooks/express.js`
 
 Called during server startup just after the
-[`express-session`](https://www.npmjs.com/package/express-session) middleware is
+https://www.npmjs.com/package/express-session[`express-session`] middleware is
 added to the Express Application object. Use this hook to add route handlers or
 middleware that executes after `express-session` state is created and
 authentication is performed.
 
 Context properties:
 
-* `app`: The Express [Application](https://expressjs.com/en/4x/api.html#app)
+* `app`: The Express https://expressjs.com/en/4x/api.html==app[Application]
   object.
 
-## `expressCreateServer`
+=== expressCreateServer
 
 Called from: `src/node/hooks/express.js`
 
@@ -114,12 +116,12 @@ other) except this hook's context includes the HTTP Server object.
 
 Context properties:
 
-* `app`: The Express [Application](https://expressjs.com/en/4x/api.html#app)
+* `app`: The Express https://expressjs.com/en/4x/api.html==app[Application]
   object.
-* `server`: The [http.Server](https://nodejs.org/api/http.html#class-httpserver)
-  or [https.Server](https://nodejs.org/api/https.html#class-httpsserver) object.
+* `server`: The https://nodejs.org/api/http.html==class-httpserver[http.Server]
+  or https://nodejs.org/api/https.html==class-httpsserver[https.Server] object.
 
-## expressCloseServer
+=== expressCloseServer
 
 Called from: src/node/hooks/express.js
 
@@ -132,13 +134,14 @@ not already be closed when this hook executes.
 
 Example:
 
-```
+[source, javascript]
+----
 exports.expressCloseServer = async () => {
   await doSomeCleanup();
 };
-```
+----
 
-## eejsBlock_`<name>`
+=== eejsBlock_`<name>`
 Called from: src/node/eejs/index.js
 
 Things in context:
@@ -181,7 +184,7 @@ Available blocks in `pad.html` are:
  * `indexWrapper` - contains the form for creating new pads
  * `indexCustomScripts` - contains the `index.js` `<script>` tag, allows you to add your own or to customize the one provided by the active skin
 
-## padInitToolbar
+=== padInitToolbar
 Called from: src/node/hooks/express/specialpages.js
 
 Things in context:
@@ -194,7 +197,7 @@ Usage examples:
 
 * https://github.com/tiblu/ep_authorship_toggle
 
-## onAccessCheck
+=== onAccessCheck
 Called from: src/node/db/SecurityManager.js
 
 Things in context:
@@ -207,7 +210,7 @@ Things in context:
 This hook gets called when the access to the concrete pad is being checked.
 Return `false` to deny access.
 
-## `getAuthorId`
+=== getAuthorId
 
 Called from `src/node/db/AuthorManager.js`
 
@@ -243,7 +246,8 @@ Context properties:
 
 Example:
 
-```javascript
+[source,javascript]
+----
 exports.getAuthorId = async (hookName, context) => {
   const {username} = context.user || {};
   // If the user has not authenticated, or has "authenticated" as the guest
@@ -261,9 +265,9 @@ exports.getAuthorId = async (hookName, context) => {
   // username-derived database key.
   return '';
 };
-```
+----
 
-## `padCreate`
+=== padCreate
 
 Called from: `src/node/db/Pad.js`
 
@@ -275,7 +279,7 @@ Context properties:
 * `authorId`: The ID of the author who created the pad.
 * `author` (**deprecated**): Synonym of `authorId`.
 
-## `padDefaultContent`
+=== padDefaultContent
 
 Called from `src/node/db/Pad.js`
 
@@ -300,7 +304,7 @@ Context properties:
   be updated to match. Plugins must check the value of the `type` property
   before reading this value.
 
-## `padLoad`
+=== padLoad
 
 Called from: `src/node/db/PadManager.js`
 
@@ -310,7 +314,8 @@ Context properties:
 
 * `pad`: The Pad object.
 
-## `padUpdate`
+[#_padupdate]
+=== padUpdate
 
 Called from: `src/node/db/Pad.js`
 
@@ -322,10 +327,9 @@ Context properties:
 * `authorId`: The ID of the author who updated the pad.
 * `author` (**deprecated**): Synonym of `authorId`.
 * `revs`: The index of the new revision.
-* `changeset`: The changeset of this revision (see [Changeset
-  Library](#index_changeset_library)).
+* `changeset`: The changeset of this revision (see <<_padupdate>>).
 
-## `padCopy`
+=== padCopy
 
 Called from: `src/node/db/Pad.js`
 
@@ -351,7 +355,7 @@ Usage examples:
 
   * https://github.com/ether/ep_comments_page
 
-## `padRemove`
+=== padRemove
 
 Called from: `src/node/db/Pad.js`
 
@@ -366,7 +370,7 @@ Usage examples:
 
   * https://github.com/ether/ep_comments_page
 
-## `padCheck`
+=== padCheck
 
 Called from: `src/node/db/Pad.js`
 
@@ -378,7 +382,7 @@ Context properties:
 
   * `pad`: The Pad object that is being checked.
 
-## socketio
+=== socketio
 Called from: src/node/hooks/express/socketio.js
 
 Things in context:
@@ -389,7 +393,7 @@ Things in context:
 
 I have no idea what this is useful for, someone else will have to add this description.
 
-## `preAuthorize`
+=== preAuthorize
 
 Called from: `src/node/hooks/express/webaccess.js`
 
@@ -420,8 +424,8 @@ Return values:
 
 Context properties:
 
-* `req`: The Express [Request](https://expressjs.com/en/4x/api.html#req) object.
-* `res`: The Express [Response](https://expressjs.com/en/4x/api.html#res)
+* `req`: The Express https://expressjs.com/en/4x/api.html==req[Request] object.
+* `res`: The Express https://expressjs.com/en/4x/api.html==res[Response]
   object.
 * `next`: Callback to immediately hand off handling to the next Express
   middleware/handler, or to the next matching route if `'route'` is passed as
@@ -429,16 +433,17 @@ Context properties:
 
 Example:
 
-```javascript
+[source,javascript]
+----
 exports.preAuthorize = async (hookName, {req}) => {
   if (await ipAddressIsFirewalled(req)) return false;
   if (requestIsForStaticContent(req)) return true;
   if (requestIsForOAuthCallback(req)) return true;
   // Defer the decision to the next step by returning undefined.
 };
-```
+----
 
-## authorize
+=== authorize
 Called from: src/node/hooks/express/webaccess.js
 
 Things in context:
@@ -484,7 +489,8 @@ You can pass the following values to the provided callback:
 
 Example:
 
-```
+[source, javascript]
+----
 exports.authorize = (hookName, context, cb) => {
   const user = context.req.session.user;
   const path = context.req.path;  // or context.resource
@@ -492,9 +498,9 @@ exports.authorize = (hookName, context, cb) => {
   if (isExplicitlyAllowed(user, path)) return cb([true]);
   return cb([]);  // Let the next authorization plugin decide
 };
-```
+----
 
-## authenticate
+=== authenticate
 Called from: src/node/hooks/express/webaccess.js
 
 Things in context:
@@ -532,7 +538,8 @@ object should come from global settings (`context.users[username]`).
 
 Example:
 
-```
+[source, javascript]
+----
 exports.authenticate = (hook_name, context, cb) => {
   if (notApplicableToThisPlugin(context)) {
     return cb([]);  // Let the next authentication plugin decide
@@ -549,9 +556,9 @@ exports.authenticate = (hook_name, context, cb) => {
   context.req.session.user = users[username];
   return cb([true]);
 };
-```
+----
 
-## authFailure
+=== authFailure
 Called from: src/node/hooks/express/webaccess.js
 
 Things in context:
@@ -586,7 +593,8 @@ failure or a generic 403 page for an authorization failure).
 
 Example:
 
-```
+[source, javascript]
+----
 exports.authFailure = (hookName, context, cb) => {
   if (notApplicableToThisPlugin(context)) {
     return cb([]);  // Let the next plugin handle the error
@@ -594,9 +602,9 @@ exports.authFailure = (hookName, context, cb) => {
   context.res.redirect(makeLoginURL(context.req));
   return cb([true]);
 };
-```
+----
 
-## preAuthzFailure
+=== preAuthzFailure
 Called from: src/node/hooks/express/webaccess.js
 
 Things in context:
@@ -617,15 +625,16 @@ another plugin (if any, otherwise fall back to a generic 403 error page).
 
 Example:
 
-```
+[source, javascript]
+----
 exports.preAuthzFailure = (hookName, context, cb) => {
   if (notApplicableToThisPlugin(context)) return cb([]);
   context.res.status(403).send(renderFancy403Page(context.req));
   return cb([true]);
 };
-```
+----
 
-## authnFailure
+=== authnFailure
 Called from: src/node/hooks/express/webaccess.js
 
 Things in context:
@@ -649,15 +658,16 @@ another plugin (if any, otherwise fall back to the deprecated authFailure hook).
 
 Example:
 
-```
+[source, javascript]
+----
 exports.authnFailure = (hookName, context, cb) => {
   if (notApplicableToThisPlugin(context)) return cb([]);
   context.res.redirect(makeLoginURL(context.req));
   return cb([true]);
 };
-```
+----
 
-## authzFailure
+=== authzFailure
 Called from: src/node/hooks/express/webaccess.js
 
 Things in context:
@@ -677,7 +687,8 @@ another plugin (if any, otherwise fall back to the deprecated authFailure hook).
 
 Example:
 
-```
+[source, javascript]
+----
 exports.authzFailure = (hookName, context, cb) => {
   if (notApplicableToThisPlugin(context)) return cb([]);
   if (needsPremiumAccount(context.req) && !context.req.session.user.premium) {
@@ -687,9 +698,9 @@ exports.authzFailure = (hookName, context, cb) => {
   // Use the generic 403 forbidden response.
   return cb([]);
 };
-```
+----
 
-## `handleMessage`
+=== handleMessage
 
 Called from: `src/node/handler/PadMessageHandler.js`
 
@@ -711,7 +722,8 @@ Context properties:
 
 Example:
 
-```javascript
+[source,javascript]
+----
 exports.handleMessage = async (hookName, {message, socket}) => {
   if (message.type === 'USERINFO_UPDATE') {
     // Force the display name to the name associated with the account.
@@ -719,9 +731,9 @@ exports.handleMessage = async (hookName, {message, socket}) => {
     if (user.name) message.data.userInfo.name = user.name;
   }
 };
-```
+----
 
-## `handleMessageSecurity`
+=== handleMessageSecurity
 
 Called from: `src/node/handler/PadMessageHandler.js`
 
@@ -755,15 +767,16 @@ Context properties:
 
 Example:
 
-```javascript
+[source,javascript]
+----
 exports.handleMessageSecurity = async (hookName, context) => {
   const {message, sessionInfo: {readOnly}} = context;
   if (!readOnly || message.type !== 'COLLABROOM') return;
   if (await messageIsBenign(message)) return 'permitOnce';
 };
-```
+----
 
-## clientVars
+=== clientVars
 Called from: src/node/handler/PadMessageHandler.js
 
 Things in context:
@@ -791,7 +804,8 @@ If needed, you can access the user's account information (if authenticated) via
 
 Examples:
 
-```
+[source, javascript]
+----
 // Using an async function
 exports.clientVars = async (hookName, context) => {
   const user = context.socket.client.request.session.user || {};
@@ -803,9 +817,9 @@ exports.clientVars = (hookName, context, callback) => {
   const user = context.socket.client.request.session.user || {};
   return callback({'accountUsername': user.username || '<unknown>'});
 };
-```
+----
 
-## `getLineHTMLForExport`
+=== getLineHTMLForExport
 
 Called from: `src/node/utils/ExportHtml.js`
 
@@ -823,7 +837,8 @@ Context properties:
 
 Example:
 
-```javascript
+[source,javascript]
+----
 const AttributeMap = require('ep_etherpad-lite/static/js/AttributeMap');
 const Changeset = require('ep_etherpad-lite/static/js/Changeset');
 
@@ -835,9 +850,9 @@ exports.getLineHTMLForExport = async (hookName, context) => {
   if (!heading) return;
   context.lineContent = `<${heading}>${context.lineContent}</${heading}>`;
 };
-```
+----
 
-## exportHTMLAdditionalContent
+=== exportHTMLAdditionalContent
 Called from: src/node/utils/ExportHtml.js
 
 Things in context:
@@ -849,13 +864,14 @@ the body of the exported HTML.
 
 Example:
 
-```
+[source, javascript]
+----
 exports.exportHTMLAdditionalContent = async (hookName, {padId}) => {
   return 'I am groot in ' + padId;
 };
-```
+----
 
-## stylesForExport
+=== stylesForExport
 Called from: src/node/utils/ExportHtml.js
 
 Things in context:
@@ -866,13 +882,14 @@ This hook will allow a plug-in developer to append Styles to the Exported HTML.
 
 Example:
 
-```
+[source, javascript]
+----
 exports.stylesForExport = function(hook, padId, cb){
   cb("body{font-size:13.37em !important}");
 }
-```
+----
 
-## aceAttribClasses
+=== aceAttribClasses
 Called from: src/static/js/linestylefilter.js
 
 This hook is called when attributes are investigated on a line. It is useful if
@@ -884,15 +901,16 @@ or provide an object whose properties will be assigned to the attributes object.
 
 Example:
 
-```
+[source, javascript]
+----
 exports.aceAttribClasses = (hookName, attrs, cb) => {
   return cb([{
     sub: 'tag:sub',
   }]);
 };
-```
+----
 
-## exportFileName
+=== exportFileName
 Called from src/node/handler/ExportHandler.js
 
 Things in context:
@@ -903,13 +921,14 @@ This hook will allow a plug-in developer to modify the file name of an exported
 
 Example:
 
-```
+[source, javascript]
+----
 exports.exportFileName = function(hook, padId, callback){
   callback("newFileName"+padId);
 }
-```
+----
 
-## exportHtmlAdditionalTags
+=== exportHtmlAdditionalTags
 Called from src/node/utils/ExportHtml.js
 
 Things in context:
@@ -919,15 +938,17 @@ Things in context:
 This hook will allow a plug-in developer to include more properties and attributes to support during HTML Export. If tags are stored as `['color', 'red']` on the attribute pool, use `exportHtmlAdditionalTagsWithData` instead. An Array should be returned.
 
 Example:
-```
+
+[source, javascript]
+----
 // Add the props to be supported in export
 exports.exportHtmlAdditionalTags = function(hook, pad, cb){
   var padId = pad.id;
   cb(["massive","jugs"]);
 };
-```
+----
 
-## exportHtmlAdditionalTagsWithData
+=== exportHtmlAdditionalTagsWithData
 Called from src/node/utils/ExportHtml.js
 
 Things in context:
@@ -937,15 +958,17 @@ Things in context:
 Identical to `exportHtmlAdditionalTags`, but for tags that are stored with a specific value (not simply `true`) on the attribute pool. For example `['color', 'red']`, instead of `['bold', true]`. This hook will allow a plug-in developer to include more properties and attributes to support during HTML Export. An Array of arrays should be returned. The exported HTML will contain tags like `<span data-color="red">` for the content where attributes are `['color', 'red']`.
 
 Example:
-```
+
+[source, javascript]
+----
 // Add the props to be supported in export
 exports.exportHtmlAdditionalTagsWithData = function(hook, pad, cb){
   var padId = pad.id;
   cb([["color", "red"], ["color", "blue"]]);
 };
-```
+----
 
-## `exportEtherpadAdditionalContent`
+=== exportEtherpadAdditionalContent
 
 Called from `src/node/utils/ExportEtherpad.js` and
 `src/node/utils/ImportEtherpad.js`.
@@ -961,12 +984,13 @@ Context properties: None.
 
 Example:
 
-```
+[source, javascript]
+----
 // Add support for exporting comments metadata
 exports.exportEtherpadAdditionalContent = () => ['comments'];
-```
+----
 
-## `exportEtherpad`
+=== exportEtherpad
 
 Called from `src/node/utils/ExportEtherpad.js`.
 
@@ -989,7 +1013,7 @@ Context properties:
     should not assume that it is either the pad's real writable ID or its
     read-only ID.
 
-## `importEtherpad`
+=== importEtherpad
 
 Called from `src/node/utils/ImportEtherpad.js`.
 
@@ -1008,7 +1032,7 @@ Context properties:
     modified.
   * `srcPadId`: The pad ID used for the pad-specific information in `data`.
 
-## `import`
+=== import
 
 Called from: `src/node/handler/ImportHandler.js`
 
@@ -1026,18 +1050,19 @@ Context properties:
 * `ImportError`: Subclass of Error that can be thrown to provide a specific
   error message to the user. The constructor's first argument must be a string
   matching one of the [known error
-  identifiers](https://github.com/ether/etherpad-lite/blob/1.8.16/src/static/js/pad_impexp.js#L80-L86).
+  identifiers](https://github.com/ether/etherpad-lite/blob/1.8.16/src/static/js/pad_impexp.js==L80-L86).
 
 Example:
 
-```javascript
+[source,javascript]
+----
 exports.import = async (hookName, {fileEnding, ImportError}) => {
   // Reject all *.etherpad imports with a permission denied message.
   if (fileEnding === '.etherpad') throw new ImportError('permission');
 };
-```
+----
 
-## `userJoin`
+=== userJoin
 
 Called from: `src/node/handler/PadMessageHandler.js`
 
@@ -1061,7 +1086,7 @@ exports.userJoin = async (hookName, {authorId, displayName, padId}) => {
 };
 ```
 
-## `userLeave`
+=== userLeave
 
 Called from: `src/node/handler/PadMessageHandler.js`
 
@@ -1078,13 +1103,14 @@ Context properties:
 
 Example:
 
-```javascript
+[source,javascript]
+----
 exports.userLeave = async (hookName, {author, padId}) => {
   console.log(`${author} left pad ${padId}`);
 };
-```
+----
 
-## `chatNewMessage`
+=== chatNewMessage
 
 Called from: `src/node/handler/PadMessageHandler.js`
 

doc/api/http_api.adoc

@@ -1,6 +1,6 @@
-# HTTP API
+== HTTP API
 
-## What can I do with this API?
+=== What can I do with this API?
 The API gives another web application control of the pads. The basic functions are
 
 * create/delete pads
@@ -9,15 +9,15 @@ The API gives another web application control of the pads. The basic functions a
 
 The API is designed in a way, so you can reuse your existing user system with their permissions, and map it to Etherpad. Means: Your web application still has to do authentication, but you can tell Etherpad via the api, which visitors should get which permissions. This allows Etherpad to fit into any web application and extend it with real-time functionality. You can embed the pads via an iframe into your website.
 
-Take a look at [HTTP API client libraries](https://github.com/ether/etherpad-lite/wiki/HTTP-API-client-libraries) to check if a library in your favorite programming language is available.
+Take a look at https://github.com/ether/etherpad-lite/wiki/HTTP-API-client-libraries[HTTP API client libraries] to check if a library in your favorite programming language is available.
 
-### OpenAPI
+==== OpenAPI
 
-OpenAPI (formerly swagger) definitions are exposed under `/api/openapi.json` (latest) and `/api/{version}/openapi.json`. You can use official tools like [Swagger Editor](https://editor.swagger.io/) to view and explore them.
+OpenAPI (formerly swagger) definitions are exposed under `/api/openapi.json` (latest) and `/api/{version}/openapi.json`. You can use official tools like https://editor.swagger.io/[Swagger Editor] to view and explore them.
 
-## Examples
+=== Examples
 
-### Example 1
+==== Example 1
 
 A portal (such as WordPress) wants to give a user access to a new pad. Let's assume the user have the internal id 7 and his name is michael.
 
@@ -47,7 +47,7 @@ Portal starts the session for the user on the group:
 
 Portal places the cookie "sessionID" with the given value on the client and creates an iframe including the pad.
 
-### Example 2
+==== Example 2
 
 A portal (such as WordPress) wants to transform the contents of a pad that multiple admins edited into a blog post.
 
@@ -62,14 +62,14 @@ Portal submits content into new blog post
 > Portal.AddNewBlog(content)
 >
 
-## Usage
+=== Usage
 
-### API version
+==== API version
 The latest version is `1.2.15`
 
 The current version can be queried via /api.
 
-### Request Format
+==== Request Format
 
 The API is accessible via HTTP. Starting from **1.8**, API endpoints can be invoked indifferently via GET or POST.
 
@@ -80,30 +80,37 @@ When invoking via GET (mandatory until **1.7.5** included), parameters must be i
 Starting from Etherpad **1.8** it is also possible to invoke the HTTP API via POST. In this case, querystring parameters will still be accepted, but **any parameter with the same name sent via POST will take precedence**. If you need to send large chunks of text (for example, for `setText()`) it is advisable to invoke via POST.
 
 Example with cURL using GET (toy example, no encoding):
-```
+
+[source,bash]
+----
 curl "http://pad.domain/api/1/setText?apikey=secret&padID=padname&text=this_text_will_NOT_be_encoded_by_curl_use_next_example"
-```
+----
 
 Example with cURL using GET (better example, encodes text):
-```
+
+[source,bash]
+----
 curl "http://pad.domain/api/1/setText?apikey=secret&padID=padname" --get --data-urlencode "text=Text sent via GET with proper encoding. For big documents, please use POST"
-```
+----
 
 Example with cURL using POST:
-```
-curl "http://pad.domain/api/1/setText?apikey=secret&padID=padname" --data-urlencode "text=Text sent via POST with proper encoding. For big texts (>8 KB), use this method"
-```
 
-### Response Format
+[source,bash]
+----
+curl "http://pad.domain/api/1/setText?apikey=secret&padID=padname" --data-urlencode "text=Text sent via POST with proper encoding. For big texts (>8 KB), use this method"
+----
+
+==== Response Format
 Responses are valid JSON in the following format:
 
-```json
+[source,jsonlines]
+----
 {
   "code": number,
   "message": string,
   "data": obj
 }
-```
+----
 
 * **code** a return code
   * **0** everything ok
@@ -114,11 +121,11 @@ Responses are valid JSON in the following format:
 * **message** a status message. It's ok if everything is fine, else it contains an error message
 * **data** the payload
 
-### Overview
+==== Overview
 
-![API Overview](https://i.imgur.com/d0nWp.png)
+image::https://i.imgur.com/d0nWp.png[API Overview]
 
-## Data Types
+=== Data Types
 
 * **groupID**  a string, the unique id of a group. Format is g.16RANDOMCHARS, for example g.s8oes9dhwrvt0zif
 * **sessionID** a string, the unique id of a session. Format is s.16RANDOMCHARS, for example s.s8oes9dhwrvt0zif
@@ -126,175 +133,191 @@ Responses are valid JSON in the following format:
 * **readOnlyID** a string, the unique id of a readonly relation to a pad. Format is r.16RANDOMCHARS, for example r.s8oes9dhwrvt0zif
 * **padID** a string, format is GROUPID$PADNAME, for example the pad test of group g.s8oes9dhwrvt0zif has padID g.s8oes9dhwrvt0zif$test
 
-### Authentication
+==== Authentication
 
 Authentication works via a token that is sent with each request as a post parameter.  There is a single token per Etherpad deployment.  This token will be random string, generated by Etherpad at the first start. It will be saved in APIKEY.txt in the root folder of Etherpad. Only Etherpad and the requesting application knows this key. Token management will not be exposed through this API.
 
-### Node Interoperability
+==== Node Interoperability
 
 All functions will also be available through a node module accessible from other node.js applications.
 
-## API Methods
+=== API Methods
 
-### Groups
+==== Groups
 Pads can belong to a group. The padID of grouppads is starting with a groupID like g.asdfasdfasdfasdf$test
 
-#### createGroup()
+===== createGroup()
  * API >= 1
 
 creates a new group
 
-*Example returns:*
-  * `{code: 0, message:"ok", data: {groupID: g.s8oes9dhwrvt0zif}}`
+_Example returns:_
 
-#### createGroupIfNotExistsFor(groupMapper)
+* `{code: 0, message:"ok", data: {groupID: g.s8oes9dhwrvt0zif}}`
+
+===== createGroupIfNotExistsFor(groupMapper)
  * API >= 1
 
 this functions helps you to map your application group ids to Etherpad group ids
 
-*Example returns:*
+_Example returns:_
+
   * `{code: 0, message:"ok", data: {groupID: g.s8oes9dhwrvt0zif}}`
 
-#### deleteGroup(groupID)
+===== deleteGroup(groupID)
  * API >= 1
 
 deletes a group
 
-*Example returns:*
+_Example returns:_
+
   * `{code: 0, message:"ok", data: null}`
   * `{code: 1, message:"groupID does not exist", data: null}`
 
-#### listPads(groupID)
+===== listPads(groupID)
  * API >= 1
 
 returns all pads of this group
 
-*Example returns:*
+_Example returns:_
+
   * `{code: 0, message:"ok", data: {padIDs : ["g.s8oes9dhwrvt0zif$test", "g.s8oes9dhwrvt0zif$test2"]}`
   * `{code: 1, message:"groupID does not exist", data: null}`
 
-#### createGroupPad(groupID, padName, [text], [authorId])
+===== createGroupPad(groupID, padName, [text], [authorId])
  * API >= 1
  * `authorId` in API >= 1.3.0
 
 creates a new pad in this group
 
-*Example returns:*
+_Example returns:_
+
   * `{code: 0, message:"ok", data: {padID: "g.s8oes9dhwrvt0zif$test"}`
   * `{code: 1, message:"padName does already exist", data: null}`
   * `{code: 1, message:"groupID does not exist", data: null}`
 
-#### listAllGroups()
+===== listAllGroups()
  * API >= 1.1
 
 lists all existing groups
 
-*Example returns:*
+_Example returns:_
+
   * `{code: 0, message:"ok", data: {groupIDs: ["g.mKjkmnAbSMtCt8eL", "g.3ADWx6sbGuAiUmCy"]}}`
   * `{code: 0, message:"ok", data: {groupIDs: []}}`
 
-### Author
+==== Author
 These authors are bound to the attributes the users choose (color and name).
 
-#### createAuthor([name])
+===== createAuthor([name])
  * API >= 1
 
 creates a new author
 
-*Example returns:*
+_Example returns:_
+
   * `{code: 0, message:"ok", data: {authorID: "a.s8oes9dhwrvt0zif"}}`
 
-#### createAuthorIfNotExistsFor(authorMapper [, name])
+===== createAuthorIfNotExistsFor(authorMapper [, name])
  * API >= 1
 
 this functions helps you to map your application author ids to Etherpad author ids
 
-*Example returns:*
+_Example returns:_
+
   * `{code: 0, message:"ok", data: {authorID: "a.s8oes9dhwrvt0zif"}}`
 
-#### listPadsOfAuthor(authorID)
+===== listPadsOfAuthor(authorID)
  * API >= 1
 
 returns an array of all pads this author contributed to
 
-*Example returns:*
+_Example returns:_
+
   * `{code: 0, message:"ok", data: {padIDs: ["g.s8oes9dhwrvt0zif$test", "g.s8oejklhwrvt0zif$foo"]}}`
   * `{code: 1, message:"authorID does not exist", data: null}`
 
-#### getAuthorName(authorID)
+===== getAuthorName(authorID)
  * API >= 1.1
 
 Returns the Author Name of the author
 
-*Example returns:*
+_Example returns:_
+
   * `{code: 0, message:"ok", data: {authorName: "John McLear"}}`
 
 -> can't be deleted cause this would involve scanning all the pads where this author was
 
-### Session
+==== Session
 Sessions can be created between a group and an author. This allows an author to access more than one group. The sessionID will be set as a cookie to the client and is valid until a certain date. The session cookie can also contain multiple comma-separated sessionIDs, allowing a user to edit pads in different groups at the same time. Only users with a valid session for this group, can access group pads. You can create a session after you authenticated the user at your web application, to give them access to the pads. You should save the sessionID of this session and delete it after the user logged out.
 
-#### createSession(groupID, authorID, validUntil)
+===== createSession(groupID, authorID, validUntil)
  * API >= 1
 
 creates a new session. validUntil is an unix timestamp in seconds
 
-*Example returns:*
+_Example returns:_
+
   * `{code: 0, message:"ok", data: {sessionID: "s.s8oes9dhwrvt0zif"}}`
   * `{code: 1, message:"groupID doesn't exist", data: null}`
   * `{code: 1, message:"authorID doesn't exist", data: null}`
   * `{code: 1, message:"validUntil is in the past", data: null}`
 
-#### deleteSession(sessionID)
+===== deleteSession(sessionID)
  * API >= 1
 
 deletes a session
 
-*Example returns:*
+_Example returns:_
+
   * `{code: 0, message:"ok", data: null}`
   * `{code: 1, message:"sessionID does not exist", data: null}`
 
-#### getSessionInfo(sessionID)
+===== getSessionInfo(sessionID)
  * API >= 1
 
 returns information about a session
 
-*Example returns:*
+_Example returns:_
+
   * `{code: 0, message:"ok", data: {authorID: "a.s8oes9dhwrvt0zif", groupID: g.s8oes9dhwrvt0zif, validUntil: 1312201246}}`
   * `{code: 1, message:"sessionID does not exist", data: null}`
 
-#### listSessionsOfGroup(groupID)
+===== listSessionsOfGroup(groupID)
  * API >= 1
 
 returns all sessions of a group
 
-*Example returns:*
+_Example returns:_
+
   * `{"code":0,"message":"ok","data":{"s.oxf2ras6lvhv2132":{"groupID":"g.s8oes9dhwrvt0zif","authorID":"a.akf8finncvomlqva","validUntil":2312905480}}}`
   * `{code: 1, message:"groupID does not exist", data: null}`
 
-#### listSessionsOfAuthor(authorID)
+===== listSessionsOfAuthor(authorID)
  * API >= 1
 
 returns all sessions of an author
 
-*Example returns:*
+_Example returns:_
+
   * `{"code":0,"message":"ok","data":{"s.oxf2ras6lvhv2132":{"groupID":"g.s8oes9dhwrvt0zif","authorID":"a.akf8finncvomlqva","validUntil":2312905480}}}`
   * `{code: 1, message:"authorID does not exist", data: null}`
 
-### Pad Content
+==== Pad Content
 
 Pad content can be updated and retrieved through the API
 
-#### getText(padID, [rev])
+===== getText(padID, [rev])
  * API >= 1
 
 returns the text of a pad
 
-*Example returns:*
+_Example returns:_
+
   * `{code: 0, message:"ok", data: {text:"Welcome Text"}}`
   * `{code: 1, message:"padID does not exist", data: null}`
 
-#### setText(padID, text, [authorId])
+===== setText(padID, text, [authorId])
  * API >= 1
  * `authorId` in API >= 1.3.0
 
@@ -302,12 +325,13 @@ Sets the text of a pad.
 
 If your text is long (>8 KB), please invoke via POST and include `text` parameter in the body of the request, not in the URL (since Etherpad **1.8**).
 
-*Example returns:*
+_Example returns:_
+
   * `{code: 0, message:"ok", data: null}`
   * `{code: 1, message:"padID does not exist", data: null}`
   * `{code: 1, message:"text too long", data: null}`
 
-#### appendText(padID, text, [authorId])
+===== appendText(padID, text, [authorId])
  * API >= 1.2.13
  * `authorId` in API >= 1.3.0
 
@@ -315,21 +339,23 @@ Appends text to a pad.
 
 If your text is long (>8 KB), please invoke via POST and include `text` parameter in the body of the request, not in the URL (since Etherpad **1.8**).
 
-*Example returns:*
+_Example returns:_
+
   * `{code: 0, message:"ok", data: null}`
   * `{code: 1, message:"padID does not exist", data: null}`
   * `{code: 1, message:"text too long", data: null}`
 
-#### getHTML(padID, [rev])
+===== getHTML(padID, [rev])
  * API >= 1
 
 returns the text of a pad formatted as HTML
 
-*Example returns:*
+_Example returns:_
+
   * `{code: 0, message:"ok", data: {html:"Welcome Text<br>More Text"}}`
   * `{code: 1, message:"padID does not exist", data: null}`
 
-#### setHTML(padID, html, [authorId])
+===== setHTML(padID, html, [authorId])
  * API >= 1
  * `authorId` in API >= 1.3.0
 
@@ -337,16 +363,18 @@ sets the text of a pad based on HTML, HTML must be well-formed. Malformed HTML w
 
 If `html` is long (>8 KB), please invoke via POST and include `html` parameter in the body of the request, not in the URL (since Etherpad **1.8**).
 
-*Example returns:*
+_Example returns:_
+
   * `{code: 0, message:"ok", data: null}`
   * `{code: 1, message:"padID does not exist", data: null}`
 
-#### getAttributePool(padID)
+===== getAttributePool(padID)
  * API >= 1.2.8
 
 returns the attribute pool of a pad
 
-*Example returns:*
+_Example returns:_
+
   * `{ "code":0,
        "message":"ok",
        "data": {
@@ -369,12 +397,13 @@ returns the attribute pool of a pad
      }`
   * `{"code":1,"message":"padID does not exist","data":null}`
 
-#### getRevisionChangeset(padID, [rev])
+===== getRevisionChangeset(padID, [rev])
  * API >= 1.2.8
 
 get the changeset at a given revision, or last revision if 'rev' is not defined.
 
-*Example returns:*
+_Example returns:_
+
   * `{ "code" : 0,
        "message" : "ok",
        "data" : "Z:1>6b|5+6b$Welcome to Etherpad!\n\nThis pad text is synchronized as you type, so that everyone viewing this page sees the same text. This allows you to collaborate seamlessly on documents!\n\nGet involved with Etherpad at https://etherpad.org\n"
@@ -382,27 +411,30 @@ get the changeset at a given revision, or last revision if 'rev' is not defined.
   * `{"code":1,"message":"padID does not exist","data":null}`
   * `{"code":1,"message":"rev is higher than the head revision of the pad","data":null}`
 
-#### createDiffHTML(padID, startRev, endRev)
+===== createDiffHTML(padID, startRev, endRev)
  * API >= 1.2.7
 
 returns an object of diffs from 2 points in a pad
 
-*Example returns:*
+_Example returns:_
+
   * `{"code":0,"message":"ok","data":{"html":"<style>\n.authora_HKIv23mEbachFYfH {background-color: #a979d9}\n.authora_n4gEeMLsv1GivNeh {background-color: #a9b5d9}\n.removed {text-decoration: line-through; -ms-filter:'progid:DXImageTransform.Microsoft.Alpha(Opacity=80)'; filter: alpha(opacity=80); opacity: 0.8; }\n</style>Welcome to Etherpad!<br><br>This pad text is synchronized as you type, so that everyone viewing this page sees the same text. This allows you to collaborate seamlessly on documents!<br><br>Get involved with Etherpad at <a href=\"http&#x3a;&#x2F;&#x2F;etherpad&#x2e;org\">http:&#x2F;&#x2F;etherpad.org</a><br><span class=\"authora_HKIv23mEbachFYfH\">aw</span><br><br>","authors":["a.HKIv23mEbachFYfH",""]}}`
   * `{"code":4,"message":"no or wrong API Key","data":null}`
 
-#### restoreRevision(padId, rev, [authorId])
+===== restoreRevision(padId, rev, [authorId])
  * API >= 1.2.11
  * `authorId` in API >= 1.3.0
 
 Restores revision from past as new changeset
 
-*Example returns:*
+_Example returns:_
+
   * {code:0, message:"ok", data:null}
   * {code: 1, message:"padID does not exist", data: null}
 
-### Chat
-#### getChatHistory(padID, [start, end])
+==== Chat
+
+===== getChatHistory(padID, [start, end])
  * API >= 1.2.7
 
 returns
@@ -411,230 +443,251 @@ returns
 * the whole chat history, when no extra parameters are given
 
 
-*Example returns:*
+_Example returns:_
 
 * `{"code":0,"message":"ok","data":{"messages":[{"text":"foo","userId":"a.foo","time":1359199533759,"userName":"test"},{"text":"bar","userId":"a.foo","time":1359199534622,"userName":"test"}]}}`
 * `{code: 1, message:"start is higher or equal to the current chatHead", data: null}`
 * `{code: 1, message:"padID does not exist", data: null}`
 
-#### getChatHead(padID)
+===== getChatHead(padID)
  * API >= 1.2.7
 
 returns the chatHead (last number of the last chat-message) of the pad
 
 
-*Example returns:*
+_Example returns:_
 
 * `{code: 0, message:"ok", data: {chatHead: 42}}`
 * `{code: 1, message:"padID does not exist", data: null}`
 
-#### appendChatMessage(padID, text, authorID [, time])
+===== appendChatMessage(padID, text, authorID [, time])
  * API >= 1.2.12
 
 creates a chat message, saves it to the database and sends it to all connected clients of this pad
 
 
-*Example returns:*
+_Example returns:_
 
 * `{code: 0, message:"ok", data: null}`
 * `{code: 1, message:"text is no string", data: null}`
 
-### Pad
+=== Pad
 Group pads are normal pads, but with the name schema GROUPID$PADNAME. A security manager controls access of them and it's forbidden for normal pads to include a $ in the name.
 
-#### createPad(padID, [text], [authorId])
+==== createPad(padID, [text], [authorId])
  * API >= 1
  * `authorId` in API >= 1.3.0
 
 creates a new (non-group) pad.  Note that if you need to create a group Pad, you should call **createGroupPad**.
 You get an error message if you use one of the following characters in the padID: "/", "?", "&" or "#".
 
-*Example returns:*
+_Example returns:_
+
   * `{code: 0, message:"ok", data: null}`
   * `{code: 1, message:"padID does already exist", data: null}`
   * `{code: 1, message:"malformed padID: Remove special characters", data: null}`
 
-#### getRevisionsCount(padID)
+==== getRevisionsCount(padID)
  * API >= 1
 
 returns the number of revisions of this pad
 
-*Example returns:*
+_Example returns:_
+
   * `{code: 0, message:"ok", data: {revisions: 56}}`
   * `{code: 1, message:"padID does not exist", data: null}`
 
-#### getSavedRevisionsCount(padID)
+==== getSavedRevisionsCount(padID)
  * API >= 1.2.11
 
 returns the number of saved revisions of this pad
 
-*Example returns:*
+_Example returns:_
+
   * `{code: 0, message:"ok", data: {savedRevisions: 42}}`
   * `{code: 1, message:"padID does not exist", data: null}`
 
-#### listSavedRevisions(padID)
+==== listSavedRevisions(padID)
  * API >= 1.2.11
 
 returns the list of saved revisions of this pad
 
-*Example returns:*
+_Example returns:_
+
   * `{code: 0, message:"ok", data: {savedRevisions: [2, 42, 1337]}}`
   * `{code: 1, message:"padID does not exist", data: null}`
 
-#### saveRevision(padID [, rev])
+==== saveRevision(padID [, rev])
  * API >= 1.2.11
 
 saves a revision
 
-*Example returns:*
+_Example returns:_
+
   * `{code: 0, message:"ok", data: null}`
   * `{code: 1, message:"padID does not exist", data: null}`
 
-#### padUsersCount(padID)
+==== padUsersCount(padID)
  * API >= 1
 
 returns the number of user that are currently editing this pad
 
-*Example returns:*
+_Example returns:_
+
   * `{code: 0, message:"ok", data: {padUsersCount: 5}}`
 
-#### padUsers(padID)
+==== padUsers(padID)
  * API >= 1.1
 
 returns the list of users that are currently editing this pad
 
-*Example returns:*
+_Example returns:_
+
   * `{code: 0, message:"ok", data: {padUsers: [{colorId:"#c1a9d9","name":"username1","timestamp":1345228793126,"id":"a.n4gEeMLsvg12452n"},{"colorId":"#d9a9cd","name":"Hmmm","timestamp":1345228796042,"id":"a.n4gEeMLsvg12452n"}]}}`
   * `{code: 0, message:"ok", data: {padUsers: []}}`
 
-#### deletePad(padID)
+==== deletePad(padID)
  * API >= 1
 
 deletes a pad
 
-*Example returns:*
+_Example returns:_
+
   * `{code: 0, message:"ok", data: null}`
   * `{code: 1, message:"padID does not exist", data: null}`
 
-#### copyPad(sourceID, destinationID[, force=false])
+==== copyPad(sourceID, destinationID[, force=false])
  * API >= 1.2.8
 
 copies a pad with full history and chat. If force is true and the destination pad exists, it will be overwritten.
 
-*Example returns:*
+_Example returns:_
+
   * `{code: 0, message:"ok", data: null}`
   * `{code: 1, message:"padID does not exist", data: null}`
 
-#### copyPadWithoutHistory(sourceID, destinationID, [force=false], [authorId])
+==== copyPadWithoutHistory(sourceID, destinationID, [force=false], [authorId])
 * API >= 1.2.15
  * `authorId` in API >= 1.3.0
 
 copies a pad without copying the history and chat. If force is true and the destination pad exists, it will be overwritten.
 Note that all the revisions will be lost! In most of the cases one should use `copyPad` API instead.
 
-*Example returns:*
+_Example returns:_
+
 * `{code: 0, message:"ok", data: null}`
 * `{code: 1, message:"padID does not exist", data: null}`
 
-#### movePad(sourceID, destinationID[, force=false])
+==== movePad(sourceID, destinationID[, force=false])
  * API >= 1.2.8
 
 moves a pad. If force is true and the destination pad exists, it will be overwritten.
 
-*Example returns:*
+_Example returns:_
+
   * `{code: 0, message:"ok", data: null}`
   * `{code: 1, message:"padID does not exist", data: null}`
 
-#### getReadOnlyID(padID)
+==== getReadOnlyID(padID)
  * API >= 1
 
 returns the read only link of a pad
 
-*Example returns:*
+_Example returns:_
+
   * `{code: 0, message:"ok", data: {readOnlyID: "r.s8oes9dhwrvt0zif"}}`
   * `{code: 1, message:"padID does not exist", data: null}`
 
-#### getPadID(readOnlyID)
+==== getPadID(readOnlyID)
  * API >= 1.2.10
 
 returns the id of a pad which is assigned to the readOnlyID
 
-*Example returns:*
+_Example returns:_
+
   * `{code: 0, message:"ok", data: {padID: "p.s8oes9dhwrvt0zif"}}`
   * `{code: 1, message:"padID does not exist", data: null}`
 
-#### setPublicStatus(padID, publicStatus)
+==== setPublicStatus(padID, publicStatus)
  * API >= 1
 
 sets a boolean for the public status of a group pad
 
-*Example returns:*
+_Example returns:_
+
   * `{code: 0, message:"ok", data: null}`
   * `{code: 1, message:"padID does not exist", data: null}`
   * `{code: 1, message:"You can only get/set the publicStatus of pads that belong to a group", data: null}`
 
-#### getPublicStatus(padID)
+==== getPublicStatus(padID)
  * API >= 1
 
 return true of false
 
-*Example returns:*
+_Example returns:_
+
   * `{code: 0, message:"ok", data: {publicStatus: true}}`
   * `{code: 1, message:"padID does not exist", data: null}`
   * `{code: 1, message:"You can only get/set the publicStatus of pads that belong to a group", data: null}`
 
-#### listAuthorsOfPad(padID)
+==== listAuthorsOfPad(padID)
  * API >= 1
 
 returns an array of authors who contributed to this pad
 
-*Example returns:*
+_Example returns:_
+
   * `{code: 0, message:"ok", data: {authorIDs : ["a.s8oes9dhwrvt0zif", "a.akf8finncvomlqva"]}`
   * `{code: 1, message:"padID does not exist", data: null}`
 
-#### getLastEdited(padID)
+==== getLastEdited(padID)
  * API >= 1
 
 returns the timestamp of the last revision of the pad
 
-*Example returns:*
+_Example returns:_
+
   * `{code: 0, message:"ok", data: {lastEdited: 1340815946602}}`
   * `{code: 1, message:"padID does not exist", data: null}`
 
-#### sendClientsMessage(padID, msg)
+==== sendClientsMessage(padID, msg)
  * API >= 1.1
 
 sends a custom message of type `msg` to the pad
 
-*Example returns:*
+_Example returns:_
+
   * `{code: 0, message:"ok", data: {}}`
   * `{code: 1, message:"padID does not exist", data: null}`
 
-#### checkToken()
+==== checkToken()
  * API >= 1.2
 
 returns ok when the current api token is valid
 
-*Example returns:*
+_Example returns:_
+
   * `{"code":0,"message":"ok","data":null}`
   * `{"code":4,"message":"no or wrong API Key","data":null}`
 
-### Pads
+=== Pads
 
-#### listAllPads()
+==== listAllPads()
  * API >= 1.2.1
 
 lists all pads on this epl instance
 
-*Example returns:*
+_Example returns:_
+
  * `{code: 0, message:"ok", data: {padIDs: ["testPad", "thePadsOfTheOthers"]}}`
 
-### Global
+==== Global
 
-#### getStats()
+===== getStats()
  *  API >= 1.2.14
 
 get stats of the etherpad instance
 
-*Example returns*
+_Example returns_:
+
  * `{"code":0,"message":"ok","data":{"totalPads":3,"totalSessions": 2,"totalActivePads": 1}}`

doc/api/pluginfw.adoc

@@ -1,22 +1,22 @@
-# Plugin Framework
+== Plugin Framework
 
 `require("ep_etherpad-lite/static/js/plugingfw/plugins")`
 
-## plugins.update
+=== plugins.update
 
 `require("ep_etherpad-lite/static/js/plugingfw/plugins").update()` will use npm
 to list all installed modules and read their ep.json files, registering the
 contained hooks. A hook registration is a pair of a hook name and a function
 reference (filename for require() plus function name)
 
-## hooks.callAll
+=== hooks.callAll
 
 `require("ep_etherpad-lite/static/js/plugingfw/hooks").callAll("hook_name",
 {argname:value})` will call all hook functions registered for `hook_name` with
 `{argname:value}`.
 
-## hooks.aCallAll
+=== hooks.aCallAll
 
 ?
 
-## ...
+=== ...

doc/api/toolbar.adoc

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

doc/assets/style.css

@@ -1,9 +1,9 @@
 body {
   border-top: solid #44b492 5pt;
-  line-height:150%;
-  font-family: 'Quicksand',sans-serif;
+  line-height: 150%;
+  font-family: "Quicksand", sans-serif;
   color: #313b4a;
-  max-width:800px;
+  max-width: 1440px;
   margin: 0 auto;
   padding: 20px;
 }
@@ -12,9 +12,26 @@ a {
   color: #555;
 }
 
-h1 {
+h1,
+h2 {
   color: #44b492;
-  line-height:100%;
+  line-height: 100%;
+}
+
+h2 {
+  font-size: 48px;
+}
+
+h3 {
+  font-size: 1.8rem;
+}
+
+h4 {
+  font-size: 1.5rem;
+}
+
+h5 {
+  font-size: 1.2rem;
 }
 
 a:hover {
@@ -23,7 +40,7 @@ a:hover {
 
 pre {
   background-color: #e0e0e0;
-  padding:20px;
+  padding: 20px;
 }
 
 code {
@@ -34,7 +51,9 @@ img {
   max-width: 100%;
 }
 
-table, th, td {
+table,
+th,
+td {
   text-align: left;
   border: 1px solid gray;
   border-collapse: collapse;
@@ -42,7 +61,7 @@ table, th, td {
 
 th {
   padding: 0.5em;
-  background: #EEE;
+  background: #eee;
 }
 
 td {

doc/cookies.adoc

@@ -0,0 +1,74 @@
+== Cookies
+Cookies used by Etherpad.
+
+[cols="1,1,1,1,1,1,1,1"]
+|===
+
+| Name
+| Sample value
+| Domain
+| Path
+| Expires/max-age
+| Http-only
+| Secure
+|  Usage description
+|express_sid
+| s%3A7yCNjRmTW8ylGQ53I2IhOwYF9...
+| example.org
+|/
+| Session
+| true
+| true
+| Session ID of the https://expressjs.com[Express web framework]. When Etherpad is behind a reverse proxy, and an administrator wants to use session stickiness, he may use this cookie. If you are behind a reverse proxy, please remember to set `trustProxy: true` in `settings.json`. Set in https://github.com/ether/etherpad-lite/blob/01497aa399690e44393e91c19917d11d025df71b/src/node/hooks/express/webaccess.js#L131[webaccess.js#L131].
+
+
+|language
+| en
+| example.org
+| /
+| Session
+| false
+| true
+| The language of the UI (e.g.: `en-GB`, `it`). Set in https://github.com/ether/etherpad-lite/blob/01497aa399690e44393e91c19917d11d025df71b/src/static/js/pad_editor.js#L111[pad_editor.js#L111].
+
+
+|prefs / prefsHttp
+| %7B%22epThemesExtTheme%22...
+| example.org
+| /p
+| year 3000
+| false
+| true
+| Client-side preferences (e.g.: font family, chat always visible, show authorship colors, ...). Set in https://github.com/ether/etherpad-lite/blob/01497aa399690e44393e91c19917d11d025df71b/src/static/js/pad_cookie.js#L49[pad_cookie.js#L49]. `prefs` is used if Etherpad is accessed over HTTPS, `prefsHttp` if accessed over HTTP. For more info see https://github.com/ether/etherpad-lite/issues/3179.
+
+
+
+|token
+| t.tFzkihhhBf4xKEpCK3PU
+| example.org
+| /
+| 60 days
+| false
+| true
+| A random token representing the author, of the form `t.randomstring_of_lenght_20`. The random string is generated by the client, at https://github.com/ether/etherpad-lite/blob/01497aa399690e44393e91c19917d11d025df71b/src/static/js/pad.js#L55-L66[pad.js#L55-L66]. This cookie is always set by the client at https://github.com/ether/etherpad-lite/blob/01497aa399690e44393e91c19917d11d025df71b/src/static/js/pad.js#L153-L158[pad.js#L153-L158] without any solicitation from the server. It is used for all the pads accessed via the web UI (not used for the HTTP API). On the server side, its value is accessed at https://github.com/ether/etherpad-lite/blob/01497aa399690e44393e91c19917d11d025df71b/src/node/db/SecurityManager.js#L33[SecurityManager.js#L33].
+|===
+
+For more info, visit the related discussion at https://github.com/ether/etherpad-lite/issues/3563.
+
+Etherpad HTTP API clients may make use (if they choose so) to send another cookie:
+
+
+[cols="1,1,1"]
+|===
+
+| Name
+| Sample value
+| Domain
+| Usage description
+
+
+| sessionID
+| s.1c70968b333b25476a2c7bdd0e0bed17
+| example.org
+| Sessions can be created between a group and an author. This allows an author to access more than one group. The sessionID will be set as a cookie to the client and is valid until a certain date. The session cookie can also contain multiple comma-separated sessionIDs, allowing a user to edit pads in different groups at the same time. More info - https://github.com/ether/etherpad-lite/blob/develop/doc/api/http_api.md#session
+|===

doc/cookies.md

@@ -1,18 +0,0 @@
-# Cookies
-
-Cookies used by Etherpad.
-
-| Name            | Sample value                       | Domain      | Path | Expires/max-age | Http-only| Secure |  Usage description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
-|-----------------|------------------------------------|-------------|------|-----------------|----------|--------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-|express_sid      | s%3A7yCNjRmTW8ylGQ53I2IhOwYF9...   | example.org | /    | Session         | true     | true   | Session ID of the [Express web framework](https://expressjs.com). When Etherpad is behind a reverse proxy, and an administrator wants to use session stickiness, he may use this cookie. If you are behind a reverse proxy, please remember to set `trustProxy: true` in `settings.json`. Set in [webaccess.js#L131](https://github.com/ether/etherpad-lite/blob/01497aa399690e44393e91c19917d11d025df71b/src/node/hooks/express/webaccess.js#L131).                                                                                                                                                                                                                                                                                                                                      |
-|language         | en                                 | example.org | /    | Session         | false    | true   | The language of the UI (e.g.: `en-GB`, `it`). Set in [pad_editor.js#L111](https://github.com/ether/etherpad-lite/blob/01497aa399690e44393e91c19917d11d025df71b/src/static/js/pad_editor.js#L111).                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
-|prefs / prefsHttp| %7B%22epThemesExtTheme%22...       | example.org | /p   | year 3000       | false    | true   | Client-side preferences (e.g.: font family, chat always visible, show authorship colors, ...). Set in [pad_cookie.js#L49](https://github.com/ether/etherpad-lite/blob/01497aa399690e44393e91c19917d11d025df71b/src/static/js/pad_cookie.js#L49). `prefs` is used if Etherpad is accessed over HTTPS, `prefsHttp` if accessed over HTTP. For more info see https://github.com/ether/etherpad-lite/issues/3179.                                                                                                                                                                                                                                                                                                                                                                             |
-|token            | t.tFzkihhhBf4xKEpCK3PU             | example.org | /    | 60 days         | false    | true   | A random token representing the author, of the form `t.randomstring_of_lenght_20`. The random string is generated by the client, at ([pad.js#L55-L66](https://github.com/ether/etherpad-lite/blob/01497aa399690e44393e91c19917d11d025df71b/src/static/js/pad.js#L55-L66)). This cookie is always set by the client (at [pad.js#L153-L158](https://github.com/ether/etherpad-lite/blob/01497aa399690e44393e91c19917d11d025df71b/src/static/js/pad.js#L153-L158)) without any solicitation from the server. It is used for all the pads accessed via the web UI (not used for the HTTP API). On the server side, its value is accessed at [SecurityManager.js#L33](https://github.com/ether/etherpad-lite/blob/01497aa399690e44393e91c19917d11d025df71b/src/node/db/SecurityManager.js#L33).|
-
-For more info, visit the related discussion at https://github.com/ether/etherpad-lite/issues/3563.
-
-Etherpad HTTP API clients may make use (if they choose so) to send another cookie:
-
-| Name            | Sample value                       | Domain      | Usage description                                                                                                                                                                                                                                                                                                                                                                                                                          |
-|-----------------|------------------------------------|-------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-|sessionID        | s.1c70968b333b25476a2c7bdd0e0bed17 | example.org | Sessions can be created between a group and an author. This allows an author to access more than one group. The sessionID will be set as a cookie to the client and is valid until a certain date. The session cookie can also contain multiple comma-separated sessionIDs, allowing a user to edit pads in different groups at the same time. More info - https://github.com/ether/etherpad-lite/blob/develop/doc/api/http_api.md#session |

doc/database.adoc

@@ -1,11 +1,11 @@
-# Database structure
+== Database structure
 
-## Keys and their values
+=== Keys and their values
 
-### groups
+==== groups
 A list of all existing groups (a JSON object with groupIDs as keys and `1` as values).
 
-### pad:$PADID
+==== pad:$PADID
 Contains all information about pads
 
 * **atext** - the latest attributed text
@@ -15,7 +15,7 @@ Contains all information about pads
 * **public** - flag that disables security for this pad
 * **passwordHash** - string that contains a salted sha512 sum of this pad's password
 
-### pad:$PADID:revs:$REVNUM
+==== pad:$PADID:revs:$REVNUM
 Saves a revision $REVNUM of pad $PADID
 
 * **meta**
@@ -23,45 +23,50 @@ Saves a revision $REVNUM of pad $PADID
   * **timestamp** - the timestamp of when this revision was created
 * **changeset** - the changeset of this revision
 
-### pad:$PADID:chat:$CHATNUM
+==== pad:$PADID:chat:$CHATNUM
 Saves a chat entry with num $CHATNUM of pad $PADID
 
 * **text** - the text of this chat entry
 * **userId** - the authorID of this chat entry
 * **time** - the timestamp of this chat entry
 
-### pad2readonly:$PADID
+==== pad2readonly:$PADID
 Translates a padID to a readonlyID
-### readonly2pad:$READONLYID
+
+==== readonly2pad:$READONLYID
 Translates a readonlyID to a padID
-### token2author:$TOKENID
+
+==== token2author:$TOKENID
 Translates a token to an authorID
-### globalAuthor:$AUTHORID
+
+==== globalAuthor:$AUTHORID
 Information about an author
 
 * **name** - the name of this author as shown in the pad
 * **colorID** - the colorID of this author as shown in the pad
 
-### mapper2group:$MAPPER
+==== mapper2group:$MAPPER
 Maps an external application identifier to an internal group
-### mapper2author:$MAPPER
+
+==== mapper2author:$MAPPER
 Maps an external application identifier to an internal author
-### group:$GROUPID
+
+==== group:$GROUPID
 a group of pads
 
 * **pads** - object with pad names in it, values are 1
-### session:$SESSIONID
+==== session:$SESSIONID
 a session between an author and a group
 
 * **groupID** - the groupID the session belongs too
 * **authorID** - the authorID the session belongs too
 * **validUntil** - the timestamp until this session is valid
 
-### author2sessions:$AUTHORID
+==== author2sessions:$AUTHORID
 saves the sessions of an author
 
 * **sessionsIDs** - object with sessionIDs in it, values are 1
 
-### group2sessions:$GROUPID
+==== group2sessions:$GROUPID
 
 * **sessionsIDs** - object with sessionIDs in it, values are 1

doc/docker.adoc

@@ -0,0 +1,538 @@
+== Docker
+
+The official Docker image is available on https://hub.docker.com/r/etherpad/etherpad.
+
+=== Downloading from Docker Hub
+If you are ok downloading a https://hub.docker.com/r/etherpad/etherpad[prebuilt image from Docker Hub], these are the commands:
+
+[source, bash]
+----
+# gets the latest published version
+docker pull etherpad/etherpad
+
+# gets a specific version
+docker pull etherpad/etherpad:1.8.0
+----
+
+=== Build a personalized container
+
+If you want to use a personalized settings file, **you will have to rebuild your image**.
+All of the following instructions are as a member of the `docker` group.
+By default, the Etherpad Docker image is built and run in `production` mode: no development dependencies are installed, and asset bundling speeds up page load time.
+
+==== Rebuilding with custom settings
+Edit `<BASEDIR>/settings.json.docker` at your will. When rebuilding the image, this file will be copied inside your image and renamed to `settings.json`.
+
+**Each configuration parameter can also be set via an environment variable**, using the syntax `"${ENV_VAR}"` or `"${ENV_VAR:default_value}"`. For details, refer to `settings.json.template`.
+
+==== Rebuilding including some plugins
+If you want to install some plugins in your container, it is sufficient to list them in the ETHERPAD_PLUGINS build variable.
+The variable value has to be a space separated, double quoted list of plugin names (see examples).
+
+Some plugins will need personalized settings. Just refer to the previous section, and include them in your custom `settings.json.docker`.
+
+==== Rebuilding including export functionality for DOC/PDF/ODT
+
+If you want to be able to export your pads to DOC/PDF/ODT files, you can install
+either Abiword or Libreoffice via setting a build variable.
+
+===== Via Abiword
+
+For installing Abiword, set the `INSTALL_ABIWORD` build variable to any value.
+
+Also, you will need to configure the path to the abiword executable
+via setting the `abiword` property in `<BASEDIR>/settings.json.docker` to
+`/usr/bin/abiword` or via setting the environment variable  `ABIWORD` to
+`/usr/bin/abiword`.
+
+===== Via Libreoffice
+
+For installing Libreoffice instead, set the `INSTALL_SOFFICE` build variable
+to any value.
+
+Also, you will need to configure the path to the libreoffice executable
+via setting the `soffice` property in `<BASEDIR>/settings.json.docker` to
+`/usr/bin/soffice` or via setting the environment variable  `SOFFICE` to
+`/usr/bin/soffice`.
+
+==== Examples
+
+Build a Docker image from the currently checked-out code:
+
+[source,bash]
+----
+docker build --tag <YOUR_USERNAME>/etherpad .
+----
+
+Include two plugins in the container:
+
+[source,bash]
+----
+docker build --build-arg ETHERPAD_PLUGINS="ep_comments_page ep_author_neat" --tag <YOUR_USERNAME>/etherpad .
+----
+
+=== Running your instance:
+
+To run your instance:
+
+[source,bash]
+----
+docker run --detach --publish <DESIRED_PORT>:9001 <YOUR_USERNAME>/etherpad
+----
+
+And point your browser to `http://<YOUR_IP>:<DESIRED_PORT>`
+
+=== Options available by default
+
+The `settings.json.docker` available by default allows to control almost every setting via environment variables.
+
+==== General
+
+[cols="1,1,1"]
+|===
+| Variable
+| Description
+| Default
+| `TITLE`
+| The name of the instance
+| `Etherpad`
+
+| `FAVICON`
+| favicon default name, or a fully specified URL to your own favicon
+| `favicon.ico`
+| `DEFAULT_PAD_TEXT`
+| The default text of a pad
+| `Welcome to Etherpad! This pad text is synchronized as you type, so that everyone viewing this page sees the same text. This allows you to collaborate seamlessly on documents! Get involved with Etherpad at https://etherpad.org`
+
+| `IP`
+| IP which etherpad should bind at. Change to `::` for IPv6
+| `0.0.0.0`
+| `PORT`
+| port which etherpad should bind at
+| `9001`
+| `ADMIN_PASSWORD`
+| the password for the `admin` user (leave unspecified if you do not want to create it)
+|
+| `USER_PASSWORD`
+| the password for the first user `user` (leave unspecified if you do not want to create it)
+|
+|===
+
+==== Database
+
+[cols="1,1,1"]
+|===
+| Variable
+| Description
+| Default
+
+| `DB_TYPE`     | a database supported by https://www.npmjs.com/package/ueberdb2 | not set, thus will fall back to `DirtyDB` (please choose one instead)
+| `DB_HOST`     | the host of the database
+|
+
+| `DB_PORT`
+| the port of the database
+|
+
+| `DB_NAME`
+| the database name
+|
+
+| `DB_USER`
+| a database user with sufficient permissions to create tables
+|
+
+| `DB_PASS`
+| the password for the database username
+|
+
+| `DB_CHARSET`
+| the character set for the tables (only required for MySQL)
+|
+
+| `DB_FILENAME`
+| in case `DB_TYPE` is `DirtyDB` or `sqlite`, the database file.
+| `var/dirty.db`, `var/etherpad.sq3`
+|===
+
+If your database needs additional settings, you will have to use a personalized `settings.json.docker` and rebuild the container (or otherwise put the updated `settings.json` inside your image).
+
+
+==== Pad Options
+
+[cols="1,1,1"]
+|===
+
+| Variable
+| Description
+| Default
+
+
+| `PAD_OPTIONS_NO_COLORS`
+|
+| `false`
+
+
+| `PAD_OPTIONS_SHOW_CONTROLS`
+|
+| `true`
+
+| `PAD_OPTIONS_SHOW_CHAT`
+|
+| `true`
+
+| `PAD_OPTIONS_SHOW_LINE_NUMBERS`
+|
+| `true`
+
+| `PAD_OPTIONS_USE_MONOSPACE_FONT`
+|
+| `false`
+
+| `PAD_OPTIONS_USER_NAME`
+|
+| `null`
+
+| `PAD_OPTIONS_USER_COLOR`
+|
+| `null`
+
+| `PAD_OPTIONS_RTL`
+|
+| `false`
+
+| `PAD_OPTIONS_ALWAYS_SHOW_CHAT`
+|
+| `false`
+
+| `PAD_OPTIONS_CHAT_AND_USERS`
+|
+|  `false`
+
+| `PAD_OPTIONS_LANG`
+|
+| `null`
+|===
+
+==== Shortcuts
+
+[cols="1,1,1"]
+|===
+| Variable
+| Description
+| Default
+
+
+| `PAD_SHORTCUTS_ENABLED_ALT_F9`
+| focus on the File Menu and/or editbar
+| `true`
+
+| `PAD_SHORTCUTS_ENABLED_ALT_C`
+| focus on the Chat window
+| `true`
+
+| `PAD_SHORTCUTS_ENABLED_CMD_S`
+| save a revision
+| `true`
+
+| `PAD_SHORTCUTS_ENABLED_CMD_Z`
+| undo/redo
+| `true`
+
+| `PAD_SHORTCUTS_ENABLED_CMD_Y`
+| redo
+| `true`
+
+| `PAD_SHORTCUTS_ENABLED_CMD_I`
+| italic
+| `true`
+
+| `PAD_SHORTCUTS_ENABLED_CMD_B`
+| bold
+| `true`
+
+| `PAD_SHORTCUTS_ENABLED_CMD_U`
+| underline
+| `true`
+
+| `PAD_SHORTCUTS_ENABLED_CMD_H`
+| backspace
+| `true`
+
+| `PAD_SHORTCUTS_ENABLED_CMD_5`
+| strike through
+| `true`
+
+| `PAD_SHORTCUTS_ENABLED_CMD_SHIFT_1`
+| ordered list
+| `true`
+
+| `PAD_SHORTCUTS_ENABLED_CMD_SHIFT_2`
+| shows a gritter popup showing a line author
+| `true`
+
+| `PAD_SHORTCUTS_ENABLED_CMD_SHIFT_L`
+| unordered list
+| `true`
+
+| `PAD_SHORTCUTS_ENABLED_CMD_SHIFT_N`
+| ordered list
+|`true`
+
+| `PAD_SHORTCUTS_ENABLED_CMD_SHIFT_C`
+| clear authorship
+| `true`
+
+| `PAD_SHORTCUTS_ENABLED_DELETE`
+|
+| `true`
+
+
+| `PAD_SHORTCUTS_ENABLED_RETURN`
+|
+| `true`
+
+| `PAD_SHORTCUTS_ENABLED_ESC`
+| in mozilla versions 14-19 avoid reconnecting pad
+| `true`
+
+| `PAD_SHORTCUTS_ENABLED_TAB`
+| indent
+| `true`
+
+| `PAD_SHORTCUTS_ENABLED_CTRL_HOME`
+| scroll to top of pad
+| `true`
+
+| `PAD_SHORTCUTS_ENABLED_PAGE_UP`
+|
+| `true`
+
+| `PAD_SHORTCUTS_ENABLED_PAGE_DOWN`
+|
+| `true`
+|===
+
+==== Skins
+
+You can use the UI skin variants builder at `/p/test#skinvariantsbuilder`
+
+For the colibris skin only, you can choose how to render the three main containers:
+  * toolbar (top menu with icons)
+  * editor (containing the text of the pad)
+  * background (area outside of editor, mostly visible when using page style)
+
+For each of the 3 containers you can choose 4 color combinations:
+   * super-light
+   * light
+   * dark
+   * super-dark
+
+For the editor container, you can also make it full width by adding `full-width-editor` variant (by default editor is rendered as a page, with a max-width of 900px).
+
+[cols="1,1,1"]
+|===
+| Variable
+| Description
+| Default
+
+| `SKIN_NAME`
+| either `no-skin`, `colibris` or an existing directory under `src/static/skins`
+| `colibris`
+
+| `SKIN_VARIANTS`
+| multiple skin variants separated by spaces
+| `super-light-toolbar super-light-editor light-background`
+|===
+
+==== Logging
+
+[cols="1,1,1"]
+|===
+| Variable
+| Description
+| Default
+
+
+| `LOGLEVEL`
+| valid values are `DEBUG`, `INFO`, `WARN` and `ERROR` | `INFO`
+
+| `DISABLE_IP_LOGGING`
+| Privacy: disable IP logging
+| `false`
+|===
+
+==== Advanced
+
+[cols="1,1,1"]
+|===
+| Variable
+| Description
+| Default
+
+|`COOKIE_KEY_ROTATION_INTERVAL`
+|How often (ms) to rotate in a new secret for signing cookies
+|`86400000` (1 day)
+
+| `COOKIE_SAME_SITE`
+| Value of the SameSite cookie property.
+| `"Lax"`
+
+| `COOKIE_SESSION_LIFETIME`
+| How long (ms) a user can be away before they must log in again.
+| `864000000` (10 days)
+
+| `COOKIE_SESSION_REFRESH_INTERVAL`
+| How often (ms) to write the latest cookie expiration time.
+| `86400000` (1 day)
+
+| `SHOW_SETTINGS_IN_ADMIN_PAGE`
+| hide/show the settings.json in admin page
+| `true`
+
+| `TRUST_PROXY`
+| set to `true` if you are using a reverse proxy in front of Etherpad (for example: Traefik for SSL termination via Let's Encrypt). This will affect security and correctness of the logs if not done
+| `false`
+
+| `IMPORT_MAX_FILE_SIZE`
+| maximum allowed file size when importing a pad, in bytes.
+| `52428800` (50 MB)
+
+| `IMPORT_EXPORT_MAX_REQ_PER_IP`
+| maximum number of import/export calls per IP.
+| `10`
+
+| `IMPORT_EXPORT_RATE_LIMIT_WINDOW`
+| the call rate for import/export requests will be estimated in this time window (in milliseconds)
+| `90000`
+
+| `COMMIT_RATE_LIMIT_DURATION`
+| duration of the rate limit window for commits by individual users/IPs (in seconds)                               | `1`
+
+| `COMMIT_RATE_LIMIT_POINTS`
+| maximum number of changes per IP to allow during the rate limit window
+| `10`
+
+| `SUPPRESS_ERRORS_IN_PAD_TEXT`
+| Should we suppress errors from being visible in the default Pad Text?
+| `false
+
+| `REQUIRE_SESSION`
+| If this option is enabled, a user must have a session to access pads. This effectively allows only group pads to be accessed.
+| `false`
+
+| `EDIT_ONLY`
+| Users may edit pads but not create new ones. Pad creation is only via the API. This applies both to group pads and regular pads.
+| `false`
+
+| `MINIFY`
+| If true, all css & js will be minified before sending to the client. This will improve the loading performance massively, but makes it difficult to debug the javascript/css
+| `true`
+
+| `MAX_AGE`
+| How long may clients use served javascript code (in seconds)? Not setting this may cause problems during deployment. Set to 0 to disable caching.
+| `21600` (6 hours)
+
+| `ABIWORD`
+| Absolute path to the Abiword executable. Abiword is needed to get advanced import/export features of pads. Setting it to null disables Abiword and will only allow plain text and HTML import/exports.
+| `null`
+
+| `SOFFICE`
+| This is the absolute path to the soffice executable. LibreOffice can be used in lieu of Abiword to export pads. Setting it to null disables LibreOffice exporting.
+| `null`
+
+| `TIDY_HTML`
+| Path to the Tidy executable. Tidy is used to improve the quality of exported pads. Setting it to null disables Tidy.
+| `null`
+
+| `ALLOW_UNKNOWN_FILE_ENDS`
+| Allow import of file types other than the supported ones: txt, doc, docx, rtf, odt, html & htm
+| `true`
+
+| `REQUIRE_AUTHENTICATION`
+| This setting is used if you require authentication of all users. Note: "/admin" always requires authentication.
+| `false`
+
+| `REQUIRE_AUTHORIZATION`
+| Require authorization by a module, or a user with is_admin set, see below.
+| `false`
+
+| `AUTOMATIC_RECONNECTION_TIMEOUT`
+| Time (in seconds) to automatically reconnect pad when a "Force reconnect" message is shown to user. Set to 0 to disable automatic reconnection.
+| `0`
+
+| `FOCUS_LINE_PERCENTAGE_ABOVE`
+| Percentage of viewport height to be additionally scrolled. e.g. 0.5, to place caret line in the middle of viewport, when user edits a line above of the viewport. Set to 0 to disable extra scrolling
+| `0`
+
+| `FOCUS_LINE_PERCENTAGE_BELOW`
+| Percentage of viewport height to be additionally scrolled. e.g. 0.5, to place caret line in the middle of viewport, when user edits a line below of the viewport. Set to 0 to disable extra scrolling
+| `0`
+
+| `FOCUS_LINE_PERCENTAGE_ARROW_UP`
+| Percentage of viewport height to be additionally scrolled when user presses arrow up in the line of the top of the viewport. Set to 0 to let the scroll to be handled as default by Etherpad
+| `0`
+
+| `FOCUS_LINE_DURATION`
+| Time (in milliseconds) used to animate the scroll transition. Set to 0 to disable animation
+| `0`
+
+| `FOCUS_LINE_CARET_SCROLL`
+| Flag to control if it should scroll when user places the caret in the last line of the viewport
+| `false`
+
+| `SOCKETIO_MAX_HTTP_BUFFER_SIZE`
+| The maximum size (in bytes) of a single message accepted via Socket.IO. If a client sends a larger message, its connection gets closed to prevent DoS (memory exhaustion) attacks.
+| `10000`
+
+| `LOAD_TEST`
+| Allow Load Testing tools to hit the Etherpad Instance. WARNING: this will disable security on the instance.
+| `false`
+
+| `DUMP_ON_UNCLEAN_EXIT`
+| Enable dumping objects preventing a clean exit of Node.js. WARNING: this has a significant performance impact.
+| `false`
+
+| `EXPOSE_VERSION`
+| Expose Etherpad version in the web interface and in the Server http header. Do not enable on production machines.
+| `false`
+|===
+
+==== Examples
+
+Use a Postgres database, no admin user enabled:
+
+[source,bash]
+----
+docker run -d \
+	--name etherpad         \
+	-p 9001:9001            \
+	-e 'DB_TYPE=postgres'   \
+	-e 'DB_HOST=db.local'   \
+	-e 'DB_PORT=4321'       \
+	-e 'DB_NAME=etherpad'   \
+	-e 'DB_USER=dbusername' \
+	-e 'DB_PASS=mypassword' \
+	etherpad/etherpad
+----
+
+Run enabling the administrative user `admin`:
+
+[source,bash]
+----
+docker run -d \
+	--name etherpad \
+	-p 9001:9001 \
+	-e 'ADMIN_PASSWORD=supersecret' \
+	etherpad/etherpad
+----
+
+Run a test instance running DirtyDB on a persistent volume:
+
+[source, bash]
+----
+docker run -d \
+	-v etherpad_data:/opt/etherpad-lite/var \
+	-p 9001:9001 \
+	etherpad/etherpad
+----

doc/docker.md

@@ -1,257 +0,0 @@
-# Docker
-
-The official Docker image is available on https://hub.docker.com/r/etherpad/etherpad.
-
-## Downloading from Docker Hub
-If you are ok downloading a [prebuilt image from Docker Hub](https://hub.docker.com/r/etherpad/etherpad), these are the commands:
-```bash
-# gets the latest published version
-docker pull etherpad/etherpad
-
-# gets a specific version
-docker pull etherpad/etherpad:1.8.0
-```
-
-## Build a personalized container
-
-If you want to use a personalized settings file, **you will have to rebuild your image**.
-All of the following instructions are as a member of the `docker` group.
-By default, the Etherpad Docker image is built and run in `production` mode: no development dependencies are installed, and asset bundling speeds up page load time.
-
-### Rebuilding with custom settings
-Edit `<BASEDIR>/settings.json.docker` at your will. When rebuilding the image, this file will be copied inside your image and renamed to `settings.json`.
-
-**Each configuration parameter can also be set via an environment variable**, using the syntax `"${ENV_VAR}"` or `"${ENV_VAR:default_value}"`. For details, refer to `settings.json.template`.
-
-### Rebuilding including some plugins
-If you want to install some plugins in your container, it is sufficient to list them in the ETHERPAD_PLUGINS build variable.
-The variable value has to be a space separated, double quoted list of plugin names (see examples).
-
-Some plugins will need personalized settings. Just refer to the previous section, and include them in your custom `settings.json.docker`.
-
-### Rebuilding including export functionality for DOC/PDF/ODT
-
-If you want to be able to export your pads to DOC/PDF/ODT files, you can install
-either Abiword or Libreoffice via setting a build variable.
-
-#### Via Abiword
-
-For installing Abiword, set the `INSTALL_ABIWORD` build variable to any value.
-
-Also, you will need to configure the path to the abiword executable
-via setting the `abiword` property in `<BASEDIR>/settings.json.docker` to 
-`/usr/bin/abiword` or via setting the environment variable  `ABIWORD` to 
-`/usr/bin/abiword`.
-
-#### Via Libreoffice
-
-For installing Libreoffice instead, set the `INSTALL_SOFFICE` build variable
-to any value.
-
-Also, you will need to configure the path to the libreoffice executable
-via setting the `soffice` property in `<BASEDIR>/settings.json.docker` to 
-`/usr/bin/soffice` or via setting the environment variable  `SOFFICE` to 
-`/usr/bin/soffice`.
-
-### Examples
-
-Build a Docker image from the currently checked-out code:
-```bash
-docker build --tag <YOUR_USERNAME>/etherpad .
-```
-
-Include two plugins in the container:
-```bash
-docker build --build-arg ETHERPAD_PLUGINS="ep_comments_page ep_author_neat" --tag <YOUR_USERNAME>/etherpad .
-```
-
-## Running your instance:
-
-To run your instance:
-```bash
-docker run --detach --publish <DESIRED_PORT>:9001 <YOUR_USERNAME>/etherpad
-```
-
-And point your browser to `http://<YOUR_IP>:<DESIRED_PORT>`
-
-## Options available by default
-
-The `settings.json.docker` available by default allows to control almost every setting via environment variables.
-
-### General
-
-| Variable           | Description                                                                                | Default                                                                                                                                                                                                                             |
-| ------------------ | ------------------------------------------------------------------------------------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `TITLE`            | The name of the instance                                                                   | `Etherpad`                                                                                                                                                                                                                          |
-| `FAVICON`          | favicon default name, or a fully specified URL to your own favicon                         | `favicon.ico`                                                                                                                                                                                                                       |
-| `DEFAULT_PAD_TEXT` | The default text of a pad                                                                  | `Welcome to Etherpad! This pad text is synchronized as you type, so that everyone viewing this page sees the same text. This allows you to collaborate seamlessly on documents! Get involved with Etherpad at https://etherpad.org` |
-| `IP`               | IP which etherpad should bind at. Change to `::` for IPv6                                  | `0.0.0.0`                                                                                                                                                                                                                           |
-| `PORT`             | port which etherpad should bind at                                                         | `9001`                                                                                                                                                                                                                              |
-| `ADMIN_PASSWORD`   | the password for the `admin` user (leave unspecified if you do not want to create it)      |                                                                                                                                                                                                                                     |
-| `USER_PASSWORD`    | the password for the first user `user` (leave unspecified if you do not want to create it) |                                                                                                                                                                                                                                     |
-
-
-### Database
-
-| Variable      | Description                                                    | Default                                                               |
-| ------------- | -------------------------------------------------------------- | --------------------------------------------------------------------- |
-| `DB_TYPE`     | a database supported by https://www.npmjs.com/package/ueberdb2 | not set, thus will fall back to `DirtyDB` (please choose one instead) |
-| `DB_HOST`     | the host of the database                                       |                                                                       |
-| `DB_PORT`     | the port of the database                                       |                                                                       |
-| `DB_NAME`     | the database name                                              |                                                                       |
-| `DB_USER`     | a database user with sufficient permissions to create tables   |                                                                       |
-| `DB_PASS`     | the password for the database username                         |                                                                       |
-| `DB_CHARSET`  | the character set for the tables (only required for MySQL)     |                                                                       |
-| `DB_FILENAME` | in case `DB_TYPE` is `DirtyDB` or `sqlite`, the database file. | `var/dirty.db`, `var/etherpad.sq3`                                    |
-
-If your database needs additional settings, you will have to use a personalized `settings.json.docker` and rebuild the container (or otherwise put the updated `settings.json` inside your image).
-
-
-### Pad Options
-
-| Variable                         | Description | Default |
-| -------------------------------- | ----------- | ------- |
-| `PAD_OPTIONS_NO_COLORS`          |             | `false` |
-| `PAD_OPTIONS_SHOW_CONTROLS`      |             | `true`  |
-| `PAD_OPTIONS_SHOW_CHAT`          |             | `true`  |
-| `PAD_OPTIONS_SHOW_LINE_NUMBERS`  |             | `true`  |
-| `PAD_OPTIONS_USE_MONOSPACE_FONT` |             | `false` |
-| `PAD_OPTIONS_USER_NAME`          |             | `null`  |
-| `PAD_OPTIONS_USER_COLOR`         |             | `null`  |
-| `PAD_OPTIONS_RTL`                |             | `false` |
-| `PAD_OPTIONS_ALWAYS_SHOW_CHAT`   |             | `false` |
-| `PAD_OPTIONS_CHAT_AND_USERS`     |             | `false` |
-| `PAD_OPTIONS_LANG`               |             | `null`  |
-
-
-### Shortcuts
-
-| Variable                            | Description                                      | Default |
-| ----------------------------------- | ------------------------------------------------ | ------- |
-| `PAD_SHORTCUTS_ENABLED_ALT_F9`      | focus on the File Menu and/or editbar            | `true`  |
-| `PAD_SHORTCUTS_ENABLED_ALT_C`       | focus on the Chat window                         | `true`  |
-| `PAD_SHORTCUTS_ENABLED_CMD_S`       | save a revision                                  | `true`  |
-| `PAD_SHORTCUTS_ENABLED_CMD_Z`       | undo/redo                                        | `true`  |
-| `PAD_SHORTCUTS_ENABLED_CMD_Y`       | redo                                             | `true`  |
-| `PAD_SHORTCUTS_ENABLED_CMD_I`       | italic                                           | `true`  |
-| `PAD_SHORTCUTS_ENABLED_CMD_B`       | bold                                             | `true`  |
-| `PAD_SHORTCUTS_ENABLED_CMD_U`       | underline                                        | `true`  |
-| `PAD_SHORTCUTS_ENABLED_CMD_H`       | backspace                                        | `true`  |
-| `PAD_SHORTCUTS_ENABLED_CMD_5`       | strike through                                   | `true`  |
-| `PAD_SHORTCUTS_ENABLED_CMD_SHIFT_1` | ordered list                                     | `true`  |
-| `PAD_SHORTCUTS_ENABLED_CMD_SHIFT_2` | shows a gritter popup showing a line author      | `true`  |
-| `PAD_SHORTCUTS_ENABLED_CMD_SHIFT_L` | unordered list                                   | `true`  |
-| `PAD_SHORTCUTS_ENABLED_CMD_SHIFT_N` | ordered list                                     | `true`  |
-| `PAD_SHORTCUTS_ENABLED_CMD_SHIFT_C` | clear authorship                                 | `true`  |
-| `PAD_SHORTCUTS_ENABLED_DELETE`      |                                                  | `true`  |
-| `PAD_SHORTCUTS_ENABLED_RETURN`      |                                                  | `true`  |
-| `PAD_SHORTCUTS_ENABLED_ESC`         | in mozilla versions 14-19 avoid reconnecting pad | `true`  |
-| `PAD_SHORTCUTS_ENABLED_TAB`         | indent                                           | `true`  |
-| `PAD_SHORTCUTS_ENABLED_CTRL_HOME`   | scroll to top of pad                             | `true`  |
-| `PAD_SHORTCUTS_ENABLED_PAGE_UP`     |                                                  | `true`  |
-| `PAD_SHORTCUTS_ENABLED_PAGE_DOWN`   |                                                  | `true`  |
-
-
-### Skins
-
-You can use the UI skin variants builder at `/p/test#skinvariantsbuilder`
-
-For the colibris skin only, you can choose how to render the three main containers:
-  * toolbar (top menu with icons)
-  * editor (containing the text of the pad)
-  * background (area outside of editor, mostly visible when using page style)
-
-For each of the 3 containers you can choose 4 color combinations:
-   * super-light
-   * light
-   * dark
-   * super-dark
-
-For the editor container, you can also make it full width by adding `full-width-editor` variant (by default editor is rendered as a page, with a max-width of 900px).
-
-| Variable        | Description                                                                    | Default                                                   |
-| --------------- | ------------------------------------------------------------------------------ | --------------------------------------------------------- |
-| `SKIN_NAME`     | either `no-skin`, `colibris` or an existing directory under `src/static/skins` | `colibris`                                                |
-| `SKIN_VARIANTS` | multiple skin variants separated by spaces                                     | `super-light-toolbar super-light-editor light-background` |
-
-
-### Logging
-
-| Variable             | Description                                          | Default |
-| -------------------- | ---------------------------------------------------- | ------- |
-| `LOGLEVEL`           | valid values are `DEBUG`, `INFO`, `WARN` and `ERROR` | `INFO`  |
-| `DISABLE_IP_LOGGING` | Privacy: disable IP logging                          | `false` |
-
-
-### Advanced
-
-| Variable                          | Description                                                                                                                                                                                            | Default               |
-| --------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------    |
-| `COOKIE_SAME_SITE`                | Value of the SameSite cookie property.                                                                                                                                                                 | `"Lax"`               |
-| `COOKIE_SESSION_LIFETIME`         | How long (ms) a user can be away before they must log in again.                                                                                                                                        | `864000000` (10 days) |
-| `COOKIE_SESSION_REFRESH_INTERVAL` | How often (ms) to write the latest cookie expiration time.                                                                                                                                             | `86400000` (1 day)    |
-| `SHOW_SETTINGS_IN_ADMIN_PAGE`     | hide/show the settings.json in admin page                                                                                                                                                              | `true`                |
-| `TRUST_PROXY`                     | set to `true` if you are using a reverse proxy in front of Etherpad (for example: Traefik for SSL termination via Let's Encrypt). This will affect security and correctness of the logs if not done    | `false`               |
-| `IMPORT_MAX_FILE_SIZE`            | maximum allowed file size when importing a pad, in bytes.                                                                                                                                              | `52428800` (50 MB)    |
-| `IMPORT_EXPORT_MAX_REQ_PER_IP`    | maximum number of import/export calls per IP.                                                                                                                                                          | `10`                  |
-| `IMPORT_EXPORT_RATE_LIMIT_WINDOW` | the call rate for import/export requests will be estimated in this time window (in milliseconds)                                                                                                       | `90000`               |
-| `COMMIT_RATE_LIMIT_DURATION`      | duration of the rate limit window for commits by individual users/IPs (in seconds)                                                                                                                     | `1`                   |
-| `COMMIT_RATE_LIMIT_POINTS`        | maximum number of changes per IP to allow during the rate limit window                                                                                                                                 | `10`                  |
-| `SUPPRESS_ERRORS_IN_PAD_TEXT`     | Should we suppress errors from being visible in the default Pad Text?                                                                                                                                  | `false`               |
-| `REQUIRE_SESSION`                 | If this option is enabled, a user must have a session to access pads. This effectively allows only group pads to be accessed.                                                                          | `false`               |
-| `EDIT_ONLY`                       | Users may edit pads but not create new ones. Pad creation is only via the API. This applies both to group pads and regular pads.                                                                       | `false`               |
-| `MINIFY`                          | If true, all css & js will be minified before sending to the client. This will improve the loading performance massively, but makes it difficult to debug the javascript/css                           | `true`                |
-| `MAX_AGE`                         | How long may clients use served javascript code (in seconds)? Not setting this may cause problems during deployment. Set to 0 to disable caching.                                                      | `21600` (6 hours)     |
-| `ABIWORD`                         | Absolute path to the Abiword executable. Abiword is needed to get advanced import/export features of pads. Setting it to null disables Abiword and will only allow plain text and HTML import/exports. | `null`                |
-| `SOFFICE`                         | This is the absolute path to the soffice executable. LibreOffice can be used in lieu of Abiword to export pads. Setting it to null disables LibreOffice exporting.                                     | `null`                |
-| `TIDY_HTML`                       | Path to the Tidy executable. Tidy is used to improve the quality of exported pads. Setting it to null disables Tidy.                                                                                   | `null`                |
-| `ALLOW_UNKNOWN_FILE_ENDS`         | Allow import of file types other than the supported ones: txt, doc, docx, rtf, odt, html & htm                                                                                                         | `true`                |
-| `REQUIRE_AUTHENTICATION`          | This setting is used if you require authentication of all users. Note: "/admin" always requires authentication.                                                                                        | `false`               |
-| `REQUIRE_AUTHORIZATION`           | Require authorization by a module, or a user with is_admin set, see below.                                                                                                                             | `false`               |
-| `AUTOMATIC_RECONNECTION_TIMEOUT`  | Time (in seconds) to automatically reconnect pad when a "Force reconnect" message is shown to user. Set to 0 to disable automatic reconnection.                                                        | `0`                   |
-| `FOCUS_LINE_PERCENTAGE_ABOVE`     | Percentage of viewport height to be additionally scrolled. e.g. 0.5, to place caret line in the middle of viewport, when user edits a line above of the viewport. Set to 0 to disable extra scrolling  | `0`                   |
-| `FOCUS_LINE_PERCENTAGE_BELOW`     | Percentage of viewport height to be additionally scrolled. e.g. 0.5, to place caret line in the middle of viewport, when user edits a line below of the viewport. Set to 0 to disable extra scrolling  | `0`                   |
-| `FOCUS_LINE_PERCENTAGE_ARROW_UP`  | Percentage of viewport height to be additionally scrolled when user presses arrow up in the line of the top of the viewport. Set to 0 to let the scroll to be handled as default by Etherpad           | `0`                   |
-| `FOCUS_LINE_DURATION`             | Time (in milliseconds) used to animate the scroll transition. Set to 0 to disable animation                                                                                                            | `0`                   |
-| `FOCUS_LINE_CARET_SCROLL`         | Flag to control if it should scroll when user places the caret in the last line of the viewport                                                                                                        | `false`               |
-| `SOCKETIO_MAX_HTTP_BUFFER_SIZE`   | The maximum size (in bytes) of a single message accepted via Socket.IO. If a client sends a larger message, its connection gets closed to prevent DoS (memory exhaustion) attacks.                     | `10000`               |
-| `LOAD_TEST`                       | Allow Load Testing tools to hit the Etherpad Instance. WARNING: this will disable security on the instance.                                                                                            | `false`               |
-| `DUMP_ON_UNCLEAN_EXIT`            | Enable dumping objects preventing a clean exit of Node.js. WARNING: this has a significant performance impact.                                                                                         | `false`               |
-| `EXPOSE_VERSION`                  | Expose Etherpad version in the web interface and in the Server http header. Do not enable on production machines.                                                                                      | `false`               |
-
-
-### Examples
-
-Use a Postgres database, no admin user enabled:
-
-```shell
-docker run -d \
-	--name etherpad         \
-	-p 9001:9001            \
-	-e 'DB_TYPE=postgres'   \
-	-e 'DB_HOST=db.local'   \
-	-e 'DB_PORT=4321'       \
-	-e 'DB_NAME=etherpad'   \
-	-e 'DB_USER=dbusername' \
-	-e 'DB_PASS=mypassword' \
-	etherpad/etherpad
-```
-
-Run enabling the administrative user `admin`:
-
-```shell
-docker run -d \
-	--name etherpad \
-	-p 9001:9001 \
-	-e 'ADMIN_PASSWORD=supersecret' \
-	etherpad/etherpad
-```
-
-Run a test instance running DirtyDB on a persistent volume:
-
-```
-docker run -d \
-	-v etherpad_data:/opt/etherpad-lite/var \
-	-p 9001:9001 \
-	etherpad/etherpad
-```

doc/documentation.adoc

@@ -1,6 +1,4 @@
-# About this Documentation
-
-<!-- type=misc -->
+== About this Documentation
 
 The goal of this documentation is to comprehensively explain Etherpad,
 both from a reference as well as a conceptual point of view.

doc/index.adoc

@@ -0,0 +1,25 @@
+:version: {VERSION}
+
+= Etherpad v{version} Manual & Documentation
+:stylesheet: assets/style.css
+:toc:
+:toclevels: 4
+:source-highlighter: highlight.js
+
+include::./documentation.adoc[]
+
+include::./stats.adoc[]
+
+include::./localization.adoc[]
+
+include::./docker.adoc[]
+
+include::./skins.adoc[]
+
+include::./api/api.adoc[]
+
+include::./plugins.adoc[]
+
+include::./cookies.adoc[]
+
+include::./database.adoc[]

doc/index.md

@@ -1,9 +0,0 @@
-@include documentation
-@include stats
-@include localization
-@include docker
-@include skins
-@include api/api
-@include plugins
-@include cookies
-@include database

doc/localization.adoc

@@ -1,105 +1,125 @@
-# Localization
+== Localization
 Etherpad provides a multi-language user interface, that's apart from your users' content, so users from different countries can collaborate on a single document, while still having the user interface displayed in their mother tongue.
 
 
-## Translating
+=== Translating
 We rely on https://translatewiki.net to handle the translation process for us, so if you'd like to help...
 
 1. Sign up at https://translatewiki.net
-2. Visit our [TWN project page](https://translatewiki.net/wiki/Translating:Etherpad_lite)
+2. Visit our https://translatewiki.net/wiki/Translating:Etherpad_lite[TWN project page]
 3. Click on `Translate Etherpad lite interface`
 4. Choose a target language, you'd like to translate our interface to, and hit `Fetch`
 5. Start translating!
 
 Translations will be send back to us regularly and will eventually appear in the next release.
 
-## Implementation
+=== Implementation
 
-### Server-side
+==== Server-side
 `/src/locales` contains files for all supported languages which contain the translated strings. Translation files are simple `*.json` files and look like this:
 
-```json
-{ "pad.modals.connected": "Connecté."
-, "pad.modals.uderdup": "Ouvrir dans une nouvelle fenêtre."
-, "pad.toolbar.unindent.title": "Dèsindenter"
-, "pad.toolbar.undo.title": "Annuler (Ctrl-Z)"
-, "timeslider.pageTitle": "{{appTitle}} Curseur temporel"
-, ...
+[source,json]
+----
+{ 
+  "pad.modals.connected": "Connecté.",
+  "pad.modals.uderdup": "Ouvrir dans une nouvelle fenêtre.",
+  "pad.toolbar.unindent.title": "Dèsindenter",
+  "pad.toolbar.undo.title": "Annuler (Ctrl-Z)",
+  "timeslider.pageTitle": "{{appTitle}} Curseur temporel",
+  ...
 }
-```
+----
 
 Each translation consists of a key (the id of the string that is to be translated) and the translated string. Terms in curly braces must not be touched but left as they are, since they represent a dynamically changing part of the string like a variable. Imagine a message welcoming a user: `Welcome, {{userName}}!` would be translated as `Ahoy, {{userName}}!` in pirate.
 
-### Client-side
-We use a `language` cookie to save your language settings if you change them. If you don't, we autodetect your locale using information from your browser. Then, the preferred language is fed into a library called [html10n.js](https://github.com/marcelklehr/html10n.js), which loads the appropriate translations and applies them to our templates. Its features include translation params, pluralization, include rules and a nice javascript API.
+==== Client-side
+We use a `language` cookie to save your language settings if you change them. If you don't, we autodetect your locale using information from your browser. Then, the preferred language is fed into a library called https://github.com/marcelklehr/html10n.js[html10n.js], which loads the appropriate translations and applies them to our templates. Its features include translation params, pluralization, include rules and a nice javascript API.
 
 
 
-## Localizing plugins
+=== Localizing plugins
 
-### 1. Mark the strings to translate
+==== 1. Mark the strings to translate
 
 In the template files of your plugin, change all hardcoded messages/strings...
 
 from:
-```html
+
+[source,html]
+----
 <option value="0">Heading 1</option>
-```
+----
 to:
-```html
+
+[source,html]
+----
 <option data-l10n-id="ep_heading.h1" value="0"></option>
-```
+----
 
 In the javascript files of your plugin, change all hardcoded messages/strings...
 
 from:
-```js
-alert ('Chat');
-```
-to:
-```js
-alert(window._('pad.chat'));
-```
-### 2. Create translate files in the locales directory of your plugin
 
-* The name of the file must be the language code of the language it contains translations for (see [supported lang codes](https://joker-x.github.com/languages4translatewiki/test/); e.g. en ? English, es ? Spanish...)
+[source,js]
+----
+alert ('Chat');
+----
+to:
+
+[source,js]
+----
+alert(window._('pad.chat'));
+----
+==== 2. Create translate files in the locales directory of your plugin
+
+* The name of the file must be the language code of the language it contains translations for (see https://joker-x.github.io/languages4translatewiki/test/[supported lang codes]; e.g. en ? English, es ? Spanish...)
 * The extension of the file must be `.json`
 * The default language is English, so your plugin should always provide `en.json`
 * In order to avoid naming conflicts, your message keys should start with the name of your plugin followed by a dot (see below)
 
 *ep_your-plugin/locales/en.json*
-```
-{ "ep_your-plugin.h1": "Heading 1"
+
+[source, json]
+----
+{ 
+  "ep_your-plugin.h1": "Heading 1"
 }
-```
+----
 
 *ep_your-plugin/locales/es.json*
-```
-{ "ep_your-plugin.h1": "Título 1"
+
+[source, json]
+----
+{ 
+  "ep_your-plugin.h1": "Título 1"
 }
-```
+----
 
 Every time the http server is started, it will auto-detect your messages and merge them automatically with the core messages.
 
-### Overwrite core messages
+==== Overwrite core messages
 
 You can overwrite Etherpad's core messages in your plugin's locale files.
 For example, if you want to replace `Chat` with `Notes`, simply add...
 
 *ep_your-plugin/locales/en.json*
-```
-{ "ep_your-plugin.h1": "Heading 1"
-, "pad.chat": "Notes"
-}
-```
 
-## Customization for Administrators
+[source,json]
+----
+{ 
+  "ep_your-plugin.h1": "Heading 1",
+  "pad.chat": "Notes"
+}
+----
+
+=== Customization for Administrators
 
 As an Etherpad administrator, it is possible to overwrite core messages as well as messages in plugins. These include error messages, labels, and user instructions. Whereas the localization in the source code is in separate files separated by locale, an administrator's custom localizations are in `settings.json` under the `customLocaleStrings` key, with each locale separated by a sub-key underneath.
 
 For example, let's say you want to change the text on the "New Pad" button on Etherpad's home page. If you look in `locales/en.json` (or `locales/en-gb.json`) you'll see the key for this text is `"index.newPad"`. You could add the following to `settings.json`:
 
-```
+[source,json]
+----
   "customLocaleStrings": {
     "fr": {
       "index.newPad": "Créer un document"
@@ -111,4 +131,4 @@ For example, let's say you want to change the text on the "New Pad" button on Et
       "index.newPad": "Create a document"
     }
   }
-```
+----

doc/plugins.adoc

@@ -1,4 +1,4 @@
-# Plugins
+== Plugins
 
 Etherpad allows you to extend its functionality with plugins. A plugin registers
 hooks (functions) for certain events (thus certain features) in Etherpad to
@@ -14,11 +14,12 @@ You can also browse to `http://yourEtherpadInstan.ce/admin/plugins`, which will
 list all installed plugins and those available on npm. It even provides
 functionality to search through all available plugins.
 
-## Folder structure
+=== Folder structure
 
 Ideally a plugin has the following folder structure:
 
-```
+[source]
+----
 ep_<plugin>/
  ├ .github/
  │  └ workflows/
@@ -44,7 +45,7 @@ ep_<plugin>/
  ├ index.js              ◄─ server-side code
  ├ package.json
  └ package-lock.json
-```
+----
 
 If your plugin includes client-side hooks, put them in `static/js/`. If you're
 adding in CSS or image files, you should put those files in `static/css/ `and
@@ -58,14 +59,15 @@ plugin run. If you want to make use of our i18n system, you need to put your
 translations into `locales/`, though, in order to have them integrated. (See
 "Localization" for more info on how to localize your plugin.)
 
-## Plugin definition
+=== Plugin definition
 
 Your plugin definition goes into `ep.json`. In this file you register your hook
 functions, indicate the parts of your plugin and the order of execution. (A
 documentation of all available events to hook into can be found in chapter
-[hooks](#all_hooks).)
+<<Server-side hooks>>.)
 
-```json
+[source,json]
+----
 {
   "parts": [
     {
@@ -80,13 +82,13 @@ documentation of all available events to hook into can be found in chapter
     }
   ]
 }
-```
+----
 
 A hook function registration maps a hook name to a hook function specification.
 The hook function specification looks like `ep_example/file.js:functionName`. It
 consists of two parts separated by a colon: a module name to `require()` and the
 name of a function exported by the named module. See
-[`module.exports`](https://nodejs.org/docs/latest/api/modules.html#modules_module_exports)
+https://nodejs.org/docs/latest/api/modules.html#modules_module_exports[`module.exports`]
 for how to export a function.
 
 For the module name you can omit the `.js` suffix, and if the file is `index.js`
@@ -119,7 +121,7 @@ function in `index.js` from the `ep_example` plugin:
 * `"authorize": ":"`
 * `"authorize": ""`
 
-### Client hooks and server hooks
+==== Client hooks and server hooks
 
 There are server hooks, which will be executed on the server (e.g.
 `expressCreateServer`), and there are client hooks, which are executed on the
@@ -128,7 +130,7 @@ environment your code is running in, e.g. don't try to access `process`, if you
 know your code will be run on the client, and likewise, don't try to access
 `window` on the server...
 
-### Styling
+==== Styling
 
 When you install a client-side plugin (e.g. one that implements at least one
 client-side hook), the plugin name is added to the `class` attribute of the div
@@ -137,35 +139,38 @@ tuning the appearance of the main UI in your plugin.
 
 For example, this is the markup with no plugins installed:
 
-```html
+[source,html]
+----
 <div id="editorcontainerbox" class="">
-```
+----
 
 and this is the contents after installing `someplugin`:
 
-```html
+[source,html]
+----
 <div id="editorcontainerbox" class="ep_someplugin">
-```
+----
 
 This feature was introduced in Etherpad **1.8**.
 
-### Parts
+==== Parts
 
 As your plugins become more and more complex, you will find yourself in the need
 to manage dependencies between plugins. E.g. you want the hooks of a certain
 plugin to be executed before (or after) yours. You can also manage these
 dependencies in your plugin definition file `ep.json`:
 
-```json
+[source,json]
+----
 {
   "parts": [
     {
       "name": "onepart",
       "pre": [],
-      "post": ["ep_onemoreplugin/partone"]
+      "post": ["ep_onemoreplugin/partone"],
       "hooks": {
         "storeBar": "ep_monospace/plugin:storeBar",
-        "getFoo": "ep_monospace/plugin:getFoo",
+        "getFoo": "ep_monospace/plugin:getFoo"
       }
     },
     {
@@ -179,14 +184,14 @@ dependencies in your plugin definition file `ep.json`:
     }
   ]
 }
-```
+----
 
 Usually a plugin will add only one functionality at a time, so it will probably
 only use one `part` definition to register its hooks. However, sometimes you
 have to put different (unrelated) functionalities into one plugin. For this you
 will want use parts, so other plugins can depend on them.
 
-#### pre/post
+===== pre/post
 
 The `"pre"` and `"post"` definitions, affect the order in which parts of a
 plugin are executed. This ensures that plugins and their hooks are executed in
@@ -207,17 +212,18 @@ environment, `"post"` could definitely be useful.
 Also, note that dependencies should *also* be listed in your package.json, so
 they can be `npm install`'d automagically when your plugin gets installed.
 
-## Package definition
+=== Package definition
 
-Your plugin must also contain a [package definition
-file](https://docs.npmjs.com/files/package.json), called package.json, in the
+Your plugin must also contain a https://docs.npmjs.com/files/package.json[package definition
+file], called package.json, in the
 project root - this file contains various metadata relevant to your plugin, such
 as the name and version number, author, project hompage, contributors, a short
 description, etc. If you publish your plugin on npm, these metadata are used for
 package search etc., but it's necessary for Etherpad plugins, even if you don't
 publish your plugin.
 
-```json
+[source,json]
+----
 {
   "name": "ep_PLUGINNAME",
   "version": "0.0.1",
@@ -227,9 +233,9 @@ publish your plugin.
   "dependencies": {"MODULE": "0.3.20"},
   "engines": {"node": ">=12.17.0"}
 }
-```
+----
 
-## Templates
+=== Templates
 
 If your plugin adds or modifies the front end HTML (e.g. adding buttons or
 changing their functions), you should put the necessary HTML code for such
@@ -237,7 +243,7 @@ operations in `templates/`, in files of type ".ejs", since Etherpad uses EJS for
 HTML templating. See the following link for more information about EJS:
 <https://github.com/visionmedia/ejs>.
 
-## Writing and running front-end tests for your plugin
+=== Writing and running front-end tests for your plugin
 
 Etherpad allows you to easily create front-end tests for plugins.
 

doc/skins.adoc

@@ -1,4 +1,4 @@
-# Skins
+== Skins
 You can customize Etherpad appearance using skins.
 A skin is a directory located under `static/skins/<skin_name>`, with the following contents:
 

doc/stats.adoc

@@ -1,4 +1,5 @@
-# Statistics
+== Statistics
+
 Etherpad keeps track of the goings-on inside the edit machinery. If you'd like to have a look at this, just point your browser to `/stats`.
 
 We currently measure:
@@ -13,6 +14,6 @@ We currently measure:
  - http500 (meter)
  - memoryUsage (gauge)
 
-Under the hood, we are happy to rely on [measured](https://github.com/felixge/node-measured) for all our metrics needs.
+Under the hood, we are happy to rely on https://github.com/felixge/node-measured[measured] for all our metrics needs.
 
-To modify or simply access our stats in your plugin, simply `require('ep_etherpad-lite/stats')` which is a [`measured.Collection`](https://yaorg.github.io/node-measured/packages/measured-core/Collection.html).
+To modify or simply access our stats in your plugin, simply `require('ep_etherpad-lite/stats')` which is a https://yaorg.github.io/node-measured/packages/measured-core/Collection.html[`measured.Collection`].

doc/template.html

@@ -1,23 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-  <meta charset="utf-8">
-  <title>__SECTION__ - Etherpad v__VERSION__ Manual &amp; Documentation</title>
-  <link rel="stylesheet" href="assets/style.css">
-</head>
-<body class="apidoc" id="api-section-__FILENAME__">
-  <header id="header">
-    <h1>Etherpad v__VERSION__ Manual &amp; Documentation</h1>
-  </header>
-
-  <div id="toc">
-    <h2>Table of Contents</h2>
-    __TOC__
-  </div>
-
-  <div id="apicontent">
-    __CONTENT__
-  </div>
-
-</body>
-</html>

make_docs.js

@@ -0,0 +1,58 @@
+const { exec } = require('child_process');
+const fs = require('fs')
+const path = require('path')
+
+
+const pjson = require('./src/package.json')
+const VERSION=pjson.version
+console.log(`Building docs for version ${VERSION}`)
+
+const createDirIfNotExists = (dir) => {
+    if (!fs.existsSync(dir)){
+        fs.mkdirSync(dir)
+    }
+}
+
+
+function copyFolderSync(from, to) {
+   if(fs.existsSync(to)){
+       const stat = fs.lstatSync(to)
+       if (stat.isDirectory()){
+           fs.rmSync(to, { recursive: true })
+       }
+       else{
+           fs.rmSync(to)
+       }
+   }
+    fs.mkdirSync(to);
+    fs.readdirSync(from).forEach(element => {
+        if (fs.lstatSync(path.join(from, element)).isFile()) {
+            fs.copyFileSync(path.join(from, element), path.join(to, element))
+        } else {
+            copyFolderSync(path.join(from, element), path.join(to, element))
+        }
+    });
+}
+
+exec('asciidoctor -v', (err,stdout)=>{
+    if (err){
+        console.log('Please install asciidoctor')
+        console.log('https://asciidoctor.org/docs/install-toolchain/')
+        process.exit(1)
+    }
+});
+
+
+createDirIfNotExists('./out')
+createDirIfNotExists('./out/doc')
+createDirIfNotExists('./out/doc/api')
+
+
+
+exec(`asciidoctor -D out/doc doc/index.adoc */**.adoc -a VERSION=${VERSION}`)
+exec(`asciidoctor -D out/doc/api  ./doc/api/*.adoc -a VERSION=${VERSION}`)
+
+copyFolderSync('./doc/easysync', './out/doc/easysync')
+copyFolderSync('./doc/assets', './out/doc/assets')
+copyFolderSync('./doc/easysync', './out/doc/easysync')
+copyFolderSync('./doc/images', './out/doc/images')

settings.json.docker

@@ -207,15 +207,15 @@
 
   "dbType": "${DB_TYPE:dirty}",
   "dbSettings": {
-    "host":     "${DB_HOST:undefined}",
-    "port":     "${DB_PORT:undefined}",
-    "database": "${DB_NAME:undefined}",
-    "user":     "${DB_USER:undefined}",
-    "password": "${DB_PASS:undefined}",
-    "charset":  "${DB_CHARSET:undefined}",
-    "filename": "${DB_FILENAME:var/dirty.db}",
+    "host":       "${DB_HOST:undefined}",
+    "port":       "${DB_PORT:undefined}",
+    "database":   "${DB_NAME:undefined}",
+    "user":       "${DB_USER:undefined}",
+    "password":   "${DB_PASS:undefined}",
+    "charset":    "${DB_CHARSET:undefined}",
+    "filename":   "${DB_FILENAME:var/dirty.db}",
     "collection": "${DB_COLLECTION:undefined}",
-    "url":      "${DB_URL:undefined}"
+    "url":        "${DB_URL:undefined}"
   },
 
   /*
@@ -363,6 +363,23 @@
    * Settings controlling the session cookie issued by Etherpad.
    */
   "cookie": {
+    /*
+     * How often (in milliseconds) the key used to sign the express_sid cookie
+     * should be rotated. Long rotation intervals reduce signature verification
+     * overhead (because there are fewer historical keys to check) and database
+     * load (fewer historical keys to store, and less frequent queries to
+     * get/update the keys). Short rotation intervals are slightly more secure.
+     *
+     * Multiple Etherpad processes sharing the same database (table) is
+     * supported as long as the clock sync error is significantly less than this
+     * value.
+     *
+     * Key rotation can be disabled (not recommended) by setting this to 0 or
+     * null, or by disabling session expiration (see sessionLifetime).
+     */
+    // 86400000 = 1d * 24h/d * 60m/h * 60s/m * 1000ms/s
+    "keyRotationInterval": "${COOKIE_KEY_ROTATION_INTERVAL:86400000}",
+
     /*
      * Value of the SameSite cookie property. "Lax" is recommended unless
      * Etherpad will be embedded in an iframe from another site, in which case
@@ -392,6 +409,8 @@
      *     indefinitely without consulting authentication or authorization
      *     hooks, so once a user has accessed a pad, the user can continue to
      *     use the pad until the user leaves for longer than sessionLifetime.
+     *   - More historical keys (sessionLifetime / keyRotationInterval) must be
+     *     checked when verifying signatures.
      *
      * Session lifetime can be set to infinity (not recommended) by setting this
      * to null or 0. Note that if the session does not expire, most browsers
@@ -634,5 +653,10 @@
   "customLocaleStrings": {},
 
   /* Disable Admin UI tests */
-  "enableAdminUITests": false
+  "enableAdminUITests": false,
+
+  /*
+   * Enable/Disable case-insensitive pad names.
+   */
+  "lowerCasePadIds": "${LOWER_CASE_PAD_IDS:false}"
 }

settings.json.template

@@ -364,6 +364,22 @@
    * Settings controlling the session cookie issued by Etherpad.
    */
   "cookie": {
+    /*
+     * How often (in milliseconds) the key used to sign the express_sid cookie
+     * should be rotated. Long rotation intervals reduce signature verification
+     * overhead (because there are fewer historical keys to check) and database
+     * load (fewer historical keys to store, and less frequent queries to
+     * get/update the keys). Short rotation intervals are slightly more secure.
+     *
+     * Multiple Etherpad processes sharing the same database (table) is
+     * supported as long as the clock sync error is significantly less than this
+     * value.
+     *
+     * Key rotation can be disabled (not recommended) by setting this to 0 or
+     * null, or by disabling session expiration (see sessionLifetime).
+     */
+    "keyRotationInterval": 86400000, // = 1d * 24h/d * 60m/h * 60s/m * 1000ms/s
+
     /*
      * Value of the SameSite cookie property. "Lax" is recommended unless
      * Etherpad will be embedded in an iframe from another site, in which case
@@ -393,6 +409,8 @@
      *     indefinitely without consulting authentication or authorization
      *     hooks, so once a user has accessed a pad, the user can continue to
      *     use the pad until the user leaves for longer than sessionLifetime.
+     *   - More historical keys (sessionLifetime / keyRotationInterval) must be
+     *     checked when verifying signatures.
      *
      * Session lifetime can be set to infinity (not recommended) by setting this
      * to null or 0. Note that if the session does not expire, most browsers
@@ -635,5 +653,10 @@
   "customLocaleStrings": {},
 
   /* Disable Admin UI tests */
-  "enableAdminUITests": false
+  "enableAdminUITests": false,
+
+  /*
+   * Enable/Disable case-insensitive pad names.
+   */
+  "lowerCasePadIds": false
 }

src/bin/buildForWindows.sh

@@ -19,6 +19,9 @@ workdir=$(try git rev-parse --show-toplevel) || exit 1
 try cd "${workdir}"
 [ -f src/package.json ] || fatal "failed to cd to etherpad root directory"
 
+# See https://github.com/msys2/MSYS2-packages/issues/1216
+export MSYSTEM=winsymlinks:lnk
+
 OUTPUT=${workdir}/etherpad-win.zip
 
 TMP_FOLDER=$(try mktemp -d) || exit 1
@@ -26,10 +29,12 @@ trap 'exit 1' HUP INT TERM
 trap 'log "cleaning up..."; try cd / && try rm -rf "${TMP_FOLDER}"' EXIT
 
 log "create a clean environment in $TMP_FOLDER..."
-try git archive --format=tar HEAD | (try cd "${TMP_FOLDER}" && try tar xf -) \
+try export GIT_WORK_TREE=${TMP_FOLDER}; git checkout HEAD -f \
     || fatal "failed to copy etherpad to temporary folder"
 try mkdir "${TMP_FOLDER}"/.git
 try git rev-parse HEAD >${TMP_FOLDER}/.git/HEAD
+try cp -r ./src/node_modules "${TMP_FOLDER}"/src/node_modules
+
 try cd "${TMP_FOLDER}"
 [ -f src/package.json ] || fatal "failed to copy etherpad to temporary folder"
 

src/bin/doc/package-lock.json

@@ -5,9 +5,9 @@
   "requires": true,
   "dependencies": {
     "marked": {
-      "version": "4.0.15",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.15.tgz",
-      "integrity": "sha512-esX5lPdTfG4p8LDkv+obbRCyOKzB+820ZZyMOXJZygZBHrH9b3xXR64X4kT3sPe9Nx8qQXbmcz6kFSMt4Nfk6Q=="
+      "version": "9.1.4",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-9.1.4.tgz",
+      "integrity": "sha512-Mq83CCaClhXqhf8sLQ57c1unNelHEuFadK36ga+GeXR4FeT/5ssaC5PaCRVqMA74VYorzYRqdAaxxteIanh3Kw=="
     }
   }
 }

src/bin/doc/package.json

@@ -7,7 +7,7 @@
     "node": ">=12.17.0"
   },
   "dependencies": {
-    "marked": "^4.0.15"
+    "marked": "^9.1.4"
   },
   "devDependencies": {},
   "optionalDependencies": {},

src/bin/installDeps.sh

@@ -1,5 +1,6 @@
 #!/bin/sh
 
+
 # Move to the Etherpad base directory.
 MY_DIR=$(cd "${0%/*}" && pwd -P) || exit 1
 cd "${MY_DIR}/../.." || exit 1
@@ -36,14 +37,22 @@ if [ ! -f "$settings" ]; then
   cp settings.json.template "$settings" || exit 1
 fi
 
+
 log "Installing dependencies..."
-(
-  mkdir -p node_modules &&
-  cd node_modules &&
-  { [ -d ep_etherpad-lite ] || ln -sf ../src ep_etherpad-lite; } &&
-  cd ep_etherpad-lite &&
-  npm ci --no-optional
-) || exit 1
+(mkdir -p node_modules &&
+cd node_modules &&
+{ [ -d ep_etherpad-lite ] || ln -sf ../src ep_etherpad-lite; } &&
+cd ep_etherpad-lite)
+
+cd src
+
+if [ -z "${ETHERPAD_PRODUCTION}" ]; then
+  log "Installing dev dependencies"
+ npm ci --no-optional --omit=optional --include=dev --lockfile-version 1 || exit 1
+else
+  log "Installing production dependencies"
+  npm ci --no-optional --omit=optional --omit=dev --lockfile-version 1 --production || exit 1
+fi
 
 # Remove all minified data to force node creating it new
 log "Clearing minified cache..."

src/bin/installOnWindows.bat

@@ -14,7 +14,7 @@ cd /D node_modules
 mklink /D "ep_etherpad-lite" "..\src"
 
 cd /D "ep_etherpad-lite"
-cmd /C npm ci || exit /B 1
+cmd /C npm ci --legacy-peer-deps || exit /B 1
 
 cd /D "%~dp0\..\.."
 

src/bin/release.js

@@ -9,8 +9,12 @@ const childProcess = require('child_process');
 const log4js = require('log4js');
 const path = require('path');
 const semver = require('semver');
+const {exec} = require('child_process');
 
-log4js.replaceConsole();
+log4js.configure({appenders: {console: {type: 'console'}},
+  categories: {
+    default: {appenders: ['console'], level: 'info'},
+  }});
 
 /*
 
@@ -76,6 +80,15 @@ const assertUpstreamOk = (branch, opts = {}) => {
   }
 };
 
+// Check if asciidoctor is installed
+exec('asciidoctor -v', (err, stdout) => {
+  if (err) {
+    console.log('Please install asciidoctor');
+    console.log('https://asciidoctor.org/docs/install-toolchain/');
+    process.exit(1);
+  }
+});
+
 const dirExists = (dir) => {
   try {
     return fs.statSync(dir).isDirectory();
@@ -132,9 +145,9 @@ try {
 
   // Many users will be using the latest LTS version of npm, and the latest LTS version of npm uses
   // lockfileVersion 1. Enforce v1 so that users don't see a (benign) compatibility warning.
-  if (readJson('./src/package-lock.json').lockfileVersion !== 1) {
-    throw new Error('Please regenerate package-lock.json with npm v6.x.');
-  }
+  const pkglock = readJson('./src/package-lock.json');
+  pkglock.lockfileVersion = 1;
+  writeJson('./src/package-lock.json', pkglock);
 
   run('git add src/package.json');
   run('git add src/package-lock.json');
@@ -168,12 +181,12 @@ try {
 
 try {
   console.log('Building documentation...');
-  run('make docs');
+  run('node ./make_docs.js');
   console.log('Updating ether.github.com master branch...');
   run('git pull --ff-only', {cwd: '../ether.github.com/'});
   console.log('Committing documentation...');
-  run(`cp -R out/doc/ ../ether.github.com/doc/v'${newVersion}'`);
-  run(`rm -f latest && ln -s 'v${newVersion}' latest`, {cwd: '../ether.github.com/doc/'});
+  run(`cp -R out/doc/ ../ether.github.com/public/doc/v'${newVersion}'`);
+  run(`npm version ${newVersion}`, {cwd: '../ether.github.com'});
   run('git add .', {cwd: '../ether.github.com/'});
   run(`git commit -m '${newVersion} docs'`, {cwd: '../ether.github.com/'});
 } catch (err) {
@@ -193,12 +206,9 @@ console.log('  (cd ../ether.github.com && git show)');
 console.log('If everything looks good then push:');
 console.log(`  git push origin master develop '${newVersion}'`);
 console.log('  (cd ../ether.github.com && git push)');
-console.log('Create a Windows build:');
-console.log('  bin/buildForWindows.sh');
+console.log('Creating a Windows build is not necessary anymore and will be created by GitHub action');
 console.log('Visit https://github.com/ether/etherpad-lite/releases/new and create a new release ' +
-            `with 'master' as the target and the version is ${newVersion}.  Include the windows ` +
-            'zip as an asset');
-console.log('Once the new docs are uploaded then modify the download links (replace ' +
-            `${currentVersion} with ${newVersion} on etherpad.org and then pull master onto ` +
-            'develop)');
+            `with 'master' as the target and the version is ${newVersion}. `);
+console.log('The docs are updated automatically with the new version. While the windows build' +
+    ' is generated people can still download the older versions.');
 console.log('Finally go public with an announcement via our comms channels :)');

src/locales/ar.json

@@ -15,21 +15,29 @@
 			"محمد أحمد عبد الفتاح"
 		]
 	},
-	"admin_plugins": "مدير المساعد",
-	"admin_plugins.available": "الإضافات المتوفرة",
-	"admin_plugins.available_not-found": "لم يتم العثور على مكونات إضافية.",
-	"admin_plugins.available_fetching": "جارٍ الجلب...",
-	"admin_plugins.available_install.value": "تنصيب",
-	"admin_plugins.available_search.placeholder": " تنصيب عن الإضافات لتثبيتها",
+	"admin.page-title": "لوحة تحكم المسؤول - Etherpad",
 	"admin_plugins.description": "الوصف",
-	"admin_plugins.installed_uninstall.value": "فك التنصيب",
-	"admin_plugins.last-update": "آخر تحديث",
+	"admin_plugins.installed": "الإضافات المثبتة",
+	"admin_plugins.installed_fetching": "جارٍ إحضار المكونات الإضافية المثبتة ...",
+	"admin_plugins.installed_nothing": "لم تقم بتثبيت أي مكونات إضافية حتى الآن.",
 	"admin_plugins.name": "الاسم",
+	"admin_plugins.page-title": "مدير البرنامج المساعد - Etherpad",
 	"admin_plugins.version": "الإصدار",
-	"admin_plugins_info.version_latest": "أحدث نسخة متاحة",
+	"admin_plugins_info": "معلومات استكشاف الأخطاء وإصلاحها",
+	"admin_plugins_info.hooks": "خطافات مثبتة",
+	"admin_plugins_info.hooks_client": "خطاطيف من جانب العميل",
+	"admin_plugins_info.hooks_server": "خطاطيف من جانب الخادم",
+	"admin_plugins_info.parts": "الأجزاء المثبتة",
+	"admin_plugins_info.plugins": "الإضافات المثبتة",
+	"admin_plugins_info.page-title": "معلومات البرنامج المساعد - Etherpad",
+	"admin_plugins_info.version": "إصدار Etherpad",
 	"admin_plugins_info.version_number": "رقم الإصدار",
 	"admin_settings": "إعدادات",
-	"admin_settings.current": "التكوين الحالي",
+	"admin_settings.current_example-devel": "مثال على قالب إعدادات التطوير",
+	"admin_settings.current_example-prod": "مثال على قالب إعدادات الإنتاج",
+	"admin_settings.current_restart.value": "أعد تشغيل Etherpad",
+	"admin_settings.current_save.value": "حفظ الإعدادات",
+	"admin_settings.page-title": "الإعدادات - Etherpad",
 	"index.newPad": "باد جديد",
 	"index.createOpenPad": "أو صنع/فتح باد بوضع اسمه:",
 	"index.openPad": "افتح باد موجودة بالاسم:",
@@ -101,8 +109,8 @@
 	"pad.modals.corruptPad.cause": "قد يكون هذا بسبب تكوين ملقم خاطئ أو بسبب سلوك آخر غير متوقع. يرجى الاتصال بمسؤول الخدمة.",
 	"pad.modals.deleted": "محذوف.",
 	"pad.modals.deleted.explanation": "تمت إزالة هذا الباد.",
-	"pad.modals.rateLimited.explanation": "لقد أرسلت عددًا كبيرًا جدًا من الرسائل إلى هذه اللوحة ، لذا فقد قطع اتصالك.",
-	"pad.modals.rejected.explanation": "رفض الخادم رسالة أرسلها متصفحك.",
+	"pad.modals.rateLimited": "معدل محدود.",
+	"pad.modals.rejected.cause": "ربما تم تحديث الخادم أثناء عرض اللوحة ، أو ربما كان هناك خطأ في Etherpad. حاول إعادة تحميل الصفحة.",
 	"pad.modals.disconnected": "لم تعد متصلا.",
 	"pad.modals.disconnected.explanation": "تم فقدان الاتصال بالخادم",
 	"pad.modals.disconnected.cause": "قد يكون الخادم غير متوفر. يرجى إعلام مسؤول الخدمة إذا كان هذا لا يزال يحدث.",
@@ -115,6 +123,7 @@
 	"pad.chat.loadmessages": "تحميل المزيد من الرسائل",
 	"pad.chat.stick.title": "ألصق الدردشة بالشاشة",
 	"pad.chat.writeMessage.placeholder": "اكتب رسالتك هنا",
+	"timeslider.followContents": "اتبع تحديثات محتوى الوسادة",
 	"timeslider.pageTitle": "{{appTitle}} متصفح التاريخ",
 	"timeslider.toolbar.returnbutton": "العودة إلى الباد",
 	"timeslider.toolbar.authors": "المؤلفون:",

src/locales/ast.json

@@ -1,7 +1,8 @@
 {
 	"@metadata": {
 		"authors": [
-			"Xuacu"
+			"Xuacu",
+			"YoaR"
 		]
 	},
 	"index.newPad": "Nuevu bloc",
@@ -25,9 +26,9 @@
 	"pad.toolbar.embed.title": "Compartir ya incrustar esti bloc",
 	"pad.toolbar.showusers.title": "Amosar los usuarios d'esti bloc",
 	"pad.colorpicker.save": "Guardar",
-	"pad.colorpicker.cancel": "Encaboxar",
+	"pad.colorpicker.cancel": "Zarrar",
 	"pad.loading": "Cargando...",
-	"pad.noCookie": "Nun pudo alcontrase la cookie. ¡Por favor, permite les cookies nel navegador! La sesión y preferencies  nun se guarden ente visites. Esto pué debese a qu'Etherpad inclúyese nun iFrame en dalgunos restoladores. Asegúrate de qu'Etherpad tea nel mesmu subdominiu/dominiu que la iFrame padre",
+	"pad.noCookie": "Nun pudo alcontrase la cookie. ¡Por favor, permite les cookies nel navegador! La sesión y preferencies  nun se guarden ente visites. Esto pue debese a qu'Etherpad inclúyese nun iFrame en dalgunos restoladores. Asegúrate de qu'Etherpad tea nel mesmu subdominiu/dominiu que l'iFrame padre",
 	"pad.permissionDenied": "Nun tienes permisu pa entrar a esti bloc",
 	"pad.settings.padSettings": "Configuración del bloc",
 	"pad.settings.myView": "la mio vista",
@@ -56,7 +57,7 @@
 	"pad.modals.reconnecting": "Reconeutando col to bloc...",
 	"pad.modals.forcereconnect": "Forzar la reconexón",
 	"pad.modals.reconnecttimer": "Tentando reconeutar en",
-	"pad.modals.cancel": "Encaboxar",
+	"pad.modals.cancel": "Zarrar",
 	"pad.modals.userdup": "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.",

src/locales/awa.json

@@ -1,7 +1,8 @@
 {
 	"@metadata": {
 		"authors": [
-			"1AnuraagPandey"
+			"1AnuraagPandey",
+			"बडा काजी"
 		]
 	},
 	"index.newPad": "नयाँ प्याड",
@@ -35,7 +36,7 @@
 	"pad.modals.unauth": "अनाधिकृत",
 	"pad.modals.initsocketfail": "सर्भरमा पहुँच से बहरे है ।",
 	"pad.share.readonly": "पढय वाला खाली",
-	"pad.share.link": "लिङ्क",
+	"pad.share.link": "कडी",
 	"pad.share.emebdcode": "URL जोडा जाय",
 	"pad.chat": "बातचीत",
 	"timeslider.pageTitle": "{{appTitle}} समय रेखा",

src/locales/bcc.json

@@ -2,13 +2,29 @@
 	"@metadata": {
 		"authors": [
 			"Baloch Afghanistan",
+			"Moshtank",
 			"Sultanselim baloch"
 		]
 	},
+	"admin.page-title": "کارمسترءِ کُرسی - اترپَد",
+	"admin_plugins": "گݔشانکانءِ کار ءُ بار",
+	"admin_plugins.available": "دسترسݔن گݔشانک",
+	"admin_plugins.available_not-found": "گݔشانکے نݔست اَت۔",
+	"admin_plugins.available_install.value": "پِررݔنَگ",
+	"admin_plugins.available_search.placeholder": "گݔشانکان شۏھاز پہ پِررݔنَگا",
+	"admin_plugins.description": "سرۏشتادی",
+	"admin_plugins.installed": "گݔشانک پِررݔنگ بیت",
+	"admin_plugins.installed_fetching": "پِررݔنتَگݔن گݔشانکانءِ پچ کنگ",
+	"admin_plugins.installed_nothing": "شما ھنگت ھچ گݔشانکے نہ پِررݔنتَگ۔",
+	"admin_plugins.installed_uninstall.value": "پِررݔنتَگݔنءِ بند کنگ",
+	"admin_plugins.last-update": "گُڈی پہ رۏچان",
+	"admin_plugins.name": "نام",
+	"admin_plugins.page-title": "گݔشانکءِ کارمستری - اترپد",
+	"admin_plugins.version": "ورژن",
 	"index.newPad": "دفترچه یادداشت تازه",
 	"index.createOpenPad": "یا ایجاد/بازکردن یک دفترچه یادداشت با نام:",
 	"pad.toolbar.bold.title": "پررنگ (Ctrl-B)",
-	"pad.toolbar.italic.title": "کج (Ctrl-I)",
+	"pad.toolbar.italic.title": "کَش (Ctrl-I)",
 	"pad.toolbar.underline.title": "زیرخط (Ctrl-U)",
 	"pad.toolbar.strikethrough.title": "خط خورده",
 	"pad.toolbar.ol.title": "فهرست مرتب شده",
@@ -21,12 +37,12 @@
 	"pad.toolbar.import_export.title": "درون‌ریزی/برون‌ریزی از/به قالب‌های مختلف",
 	"pad.toolbar.timeslider.title": "لغزندهٔ زمان",
 	"pad.toolbar.savedRevision.title": "ذخیره‌سازی نسخه",
-	"pad.toolbar.settings.title": "تنظیمات",
+	"pad.toolbar.settings.title": "ردانکان",
 	"pad.toolbar.embed.title": "اشتراک و جاسازی این دفترچه یادداشت",
 	"pad.toolbar.showusers.title": "نمایش کاربران در این دفترچه یادداشت",
-	"pad.colorpicker.save": "زاپاس کورتین",
-	"pad.colorpicker.cancel": "کنسیل",
-	"pad.loading": "...بار بیت",
+	"pad.colorpicker.save": "سَپت",
+	"pad.colorpicker.cancel": "بجَگ",
+	"pad.loading": "بییگئن...",
 	"pad.permissionDenied": "شرمنده، شما را اجازت په دسترسی ای صفحه نیست.",
 	"pad.settings.padSettings": "تنظیمات دفترچه یادداشت",
 	"pad.settings.myView": "منی سۏج",
@@ -39,7 +55,7 @@
 	"pad.settings.language": "زبان:",
 	"pad.importExport.import_export": "درون‌ریزی/برون‌ریزی",
 	"pad.importExport.import": "بارگذاری پرونده‌ی متنی یا سند",
-	"pad.importExport.importSuccessful": "موفقیت آمیز بود!",
+	"pad.importExport.importSuccessful": "سۏبݔن بیت!",
 	"pad.importExport.export": "برون‌ریزی این دفترچه یادداشت با قالب:",
 	"pad.importExport.exporthtml": "HTML",
 	"pad.importExport.exportplain": "سادگین متن",
@@ -66,21 +82,21 @@
 	"pad.modals.badChangeset.cause": "این می‌تواند به دلیل پیکربندی اشتباه یا سایر رفتارهای غیرمنتظره باشد. اگر فکر می‌کنید این یک خطا است لطفاً با مدیر خدمت تماس بگیرید. برای ادامهٔ ویرایش سعی کنید که دوباره متصل شوید.",
 	"pad.modals.corruptPad.explanation": "پدی که شما سعی دارید دسترسی پیدا کنید خراب است.",
 	"pad.modals.corruptPad.cause": "این احتمالاً به دلیل تنظیمات اشتباه کارساز یا سایر رفتارهای غیرمنتظره است. لطفاً با مدیر خدمت تماس حاصل کنید.",
-	"pad.modals.deleted": "پاک کورتین",
-	"pad.modals.deleted.explanation": "این دفترچه یادداشت پاک شده‌است.",
+	"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.link": "لینک",
 	"pad.share.emebdcode": "جاسازی نشانی",
 	"pad.chat": "گفتگو",
 	"pad.chat.title": "بازکردن گفتگو برای این دفترچه یادداشت",
 	"pad.chat.loadmessages": "گݔشترݔں پیگامء چارگ",
 	"timeslider.pageTitle": "لغزندهٔ زمان {{appTitle}}",
-	"timeslider.toolbar.returnbutton": "بازگشت به دفترچه یادداشت",
-	"timeslider.toolbar.authors": "نویسوک:",
+	"timeslider.toolbar.returnbutton": "چَھر کنگ پہ یاددپترا",
+	"timeslider.toolbar.authors": "لککۏک:",
 	"timeslider.toolbar.authorsList": "بدون نویسنده",
 	"timeslider.toolbar.exportlink.title": "درگیزگ",
 	"timeslider.exportCurrent": "برون‌ریزی نگارش کنونی به عنوان:",

src/locales/da.json

@@ -4,13 +4,29 @@
 			"Christian List",
 			"Joedalton",
 			"Peter Alberti",
+			"Peterleth",
 			"Saederup92",
 			"Steenth"
 		]
 	},
+	"admin.page-title": "Admin Dashboard - Etherpad",
+	"admin_plugins": "Plugin manager",
+	"admin_plugins.available": "Tilgængelige Plugins",
+	"admin_plugins.available_not-found": "Ingen plugins fundet.",
 	"admin_plugins.available_fetching": "Henter...",
+	"admin_plugins.available_install.value": "Installer",
+	"admin_plugins.available_search.placeholder": "Søg efter plugins der kan installeres",
 	"admin_plugins.description": "Beskrivelse",
+	"admin_plugins.installed": "Installerede plugins",
+	"admin_plugins.installed_fetching": "Henter installerede plugins...",
+	"admin_plugins.installed_nothing": "Du har ikke installeret nogen plugins endnu.",
+	"admin_plugins.installed_uninstall.value": "Afinstaller",
+	"admin_plugins.last-update": "Sidst opdateret",
 	"admin_plugins.name": "Navn",
+	"admin_plugins.page-title": "Plugin manager - Etherpad",
+	"admin_plugins.version": "Version",
+	"admin_plugins_info": "Fejlfindingsoplysninger",
+	"admin_plugins_info.hooks": "Installerede hooks",
 	"admin_settings": "Indstillinger",
 	"index.newPad": "Ny Pad",
 	"index.createOpenPad": "eller opret/åbn en Pad med navnet:",

src/locales/de.json

@@ -3,11 +3,13 @@
 		"authors": [
 			"Bjarncraft",
 			"Dom",
+			"Justman10000",
 			"Killarnee",
 			"Metalhead64",
 			"Mklehr",
 			"Nipsky",
 			"Predatorix",
+			"SamTV",
 			"Sebastian Wallroth",
 			"Thargon",
 			"Tim.krieger",
@@ -16,7 +18,7 @@
 		]
 	},
 	"admin.page-title": "Admin Dashboard - Etherpad",
-	"admin_plugins": "Plugins verwalten",
+	"admin_plugins": "Pluginverwaltung",
 	"admin_plugins.available": "Verfügbare Plugins",
 	"admin_plugins.available_not-found": "Keine Plugins gefunden.",
 	"admin_plugins.available_fetching": "Wird abgerufen...",
@@ -39,11 +41,12 @@
 	"admin_plugins_info.plugins": "Installierte Plugins",
 	"admin_plugins_info.page-title": "Plugin Informationen - Etherpad",
 	"admin_plugins_info.version": "Etherpad Version",
-	"admin_plugins_info.version_latest": "Neueste Version",
+	"admin_plugins_info.version_latest": "Neueste verfügbare Version",
 	"admin_plugins_info.version_number": "Versionsnummer",
 	"admin_settings": "Einstellungen",
 	"admin_settings.current": "Derzeitige Konfiguration",
 	"admin_settings.current_example-devel": "Beispielhafte Entwicklungseinstellungs-Templates",
+	"admin_settings.current_example-prod": "Beispiel eines produktiven Templates",
 	"admin_settings.current_restart.value": "Etherpad neustarten",
 	"admin_settings.current_save.value": "Einstellungen speichern",
 	"admin_settings.page-title": "Einstellungen - Etherpad",
@@ -69,9 +72,9 @@
 	"pad.toolbar.showusers.title": "Benutzer dieses Pads anzeigen",
 	"pad.colorpicker.save": "Speichern",
 	"pad.colorpicker.cancel": "Abbrechen",
-	"pad.loading": "Lade …",
+	"pad.loading": "Laden …",
 	"pad.noCookie": "Das Cookie konnte nicht gefunden werden. Bitte erlaube Cookies in deinem Browser! Deine Sitzung und Einstellungen werden zwischen den Besuchen nicht gespeichert.  Dies kann darauf zurückzuführen sein, dass Etherpad in einigen Browsern in einem iFrame enthalten ist.  Bitte stelle sicher, dass sich Etherpad auf der gleichen Subdomain/Domain wie der übergeordnete iFrame befindet.",
-	"pad.permissionDenied": "Du hast keine Berechtigung, um auf dieses Pad zuzugreifen",
+	"pad.permissionDenied": "Du hast keine Berechtigung, um auf dieses Pad zuzugreifen.",
 	"pad.settings.padSettings": "Pad-Einstellungen",
 	"pad.settings.myView": "Eigene Ansicht",
 	"pad.settings.stickychat": "Unterhaltung immer anzeigen",
@@ -83,7 +86,7 @@
 	"pad.settings.fontType.normal": "Normal",
 	"pad.settings.language": "Sprache:",
 	"pad.settings.about": "Über",
-	"pad.settings.poweredBy": "Powered by",
+	"pad.settings.poweredBy": "Betrieben von",
 	"pad.importExport.import_export": "Import/Export",
 	"pad.importExport.import": "Textdatei oder Dokument hochladen",
 	"pad.importExport.importSuccessful": "Erfolgreich!",
@@ -118,9 +121,10 @@
 	"pad.modals.corruptPad.cause": "Dies könnte an einer falschen Serverkonfiguration oder einem anderen unerwarteten Verhalten liegen. Bitte kontaktiere den Administrator dieses Dienstes.",
 	"pad.modals.deleted": "Gelöscht.",
 	"pad.modals.deleted.explanation": "Dieses Pad wurde entfernt.",
-	"pad.modals.rateLimited": "Begrenzte Rate.",
+	"pad.modals.rateLimited": "Durchsatzratenbegrenzt",
 	"pad.modals.rateLimited.explanation": "Sie haben zu viele Nachrichten an dieses Pad gesendet, so dass die Verbindung unterbrochen wurde.",
 	"pad.modals.rejected.explanation": "Der Server hat eine Nachricht abgelehnt, die von deinem Browser gesendet wurde.",
+	"pad.modals.rejected.cause": "Möglicherweise wurde der Server aktualisiert, während du das Pad angesehen hast, oder es existiert ein Fehler in Etherpad. Versuche, die Seite neu zu laden.",
 	"pad.modals.disconnected": "Ihre Verbindung wurde getrennt.",
 	"pad.modals.disconnected.explanation": "Die Verbindung zum Server wurde unterbrochen.",
 	"pad.modals.disconnected.cause": "Möglicherweise ist der Server nicht erreichbar. Bitte benachrichtige den Dienstadministrator, falls dies weiterhin passiert.",
@@ -137,7 +141,7 @@
 	"timeslider.pageTitle": "{{appTitle}} Bearbeitungsverlauf",
 	"timeslider.toolbar.returnbutton": "Zurück zum Pad",
 	"timeslider.toolbar.authors": "Autoren:",
-	"timeslider.toolbar.authorsList": "keine Autoren",
+	"timeslider.toolbar.authorsList": "Keine Autoren",
 	"timeslider.toolbar.exportlink.title": "Diese Version exportieren",
 	"timeslider.exportCurrent": "Exportiere diese Version als:",
 	"timeslider.version": "Version {{version}}",
@@ -160,7 +164,7 @@
 	"timeslider.month.december": "Dezember",
 	"timeslider.unnamedauthors": "{{num}} {[plural(num) one: unbenannter Autor, other: unbenannte Autoren ]}",
 	"pad.savedrevs.marked": "Diese Version wurde jetzt als gespeicherte Version gekennzeichnet",
-	"pad.savedrevs.timeslider": "Du kannst gespeicherte Versionen durch den Aufruf des Bearbeitungsverlaufes ansehen.",
+	"pad.savedrevs.timeslider": "Du kannst gespeicherte Versionen durch den Aufruf des Bearbeitungsverlaufs ansehen.",
 	"pad.userlist.entername": "Dein Name?",
 	"pad.userlist.unnamed": "unbenannt",
 	"pad.editbar.clearcolors": "Autorenfarben im gesamten Dokument zurücksetzen? Dies kann nicht rückgängig gemacht werden",

src/locales/dsb.json

@@ -4,19 +4,53 @@
 			"Michawiki"
 		]
 	},
+	"admin.page-title": "Administratorowa delka – Etherpad",
+	"admin_plugins": "Zastojnik tykacow",
+	"admin_plugins.available": "K dispoziciji stojece tykace",
+	"admin_plugins.available_not-found": "Žedne tykace namakane.",
+	"admin_plugins.available_fetching": "Wobstarujo se …",
+	"admin_plugins.available_install.value": "Instalěrowaś",
+	"admin_plugins.available_search.placeholder": "Tykace za instalaciju pytaś",
+	"admin_plugins.description": "Wopisanje",
+	"admin_plugins.installed": "Zainstalěrowane tykace",
+	"admin_plugins.installed_fetching": "Zainstalěrowane tykace se wobstaruju …",
+	"admin_plugins.installed_nothing": "Hyšći njejsćo zainstalěrował tykace.",
+	"admin_plugins.installed_uninstall.value": "Wótinstalěrowaś",
+	"admin_plugins.last-update": "Slědna aktualizacija",
+	"admin_plugins.name": "Mě",
+	"admin_plugins.page-title": "Zastojnik tykacow – Etherpad",
+	"admin_plugins.version": "Wersija",
+	"admin_plugins_info": "Informacije wó rozwězanju problemow",
+	"admin_plugins_info.hooks": "Zainstalěrowane kokulki",
+	"admin_plugins_info.hooks_client": "Kokulki z boka klienta",
+	"admin_plugins_info.hooks_server": "Kokulki z boka serwera",
+	"admin_plugins_info.parts": "Zainstalěrowane źěle",
+	"admin_plugins_info.plugins": "Zainstalěrowane tykace",
+	"admin_plugins_info.page-title": "Tykacowe informacije – Ehterpad",
+	"admin_plugins_info.version": "Wersija Etherpad",
+	"admin_plugins_info.version_latest": "Nejnowša wersija",
+	"admin_plugins_info.version_number": "Wersijowy numer",
+	"admin_settings": "Nastajenja",
+	"admin_settings.current": "Aktualna konfiguracija",
+	"admin_settings.current_example-devel": "Pśikładowa pśedłoga wuwijańskich nastajenjow",
+	"admin_settings.current_example-prod": "Pśikładowa pśedłoga produkciskich nastajenjow",
+	"admin_settings.current_restart.value": "Etherpad znowego startowaś",
+	"admin_settings.current_save.value": "Nastajenja składowaś",
+	"admin_settings.page-title": "Nastajenja – Etherpad",
 	"index.newPad": "Nowy zapisnik",
 	"index.createOpenPad": "abo napóraj/wócyń zapisnik z mjenim:",
+	"index.openPad": "wócyńśo eksistěrujucy Pad z mjenim:",
 	"pad.toolbar.bold.title": "Tucny (Strg-B)",
 	"pad.toolbar.italic.title": "Kursiwny (Strg-I)",
 	"pad.toolbar.underline.title": "Pódšmarnuś (Strg-U)",
-	"pad.toolbar.strikethrough.title": "Pśešmarnuś",
-	"pad.toolbar.ol.title": "Numerěrowana lisćina",
-	"pad.toolbar.ul.title": "Nalicenje",
+	"pad.toolbar.strikethrough.title": "Pśešmarnuś (Strg+5)",
+	"pad.toolbar.ol.title": "Numerěrowana lisćina (Strg+Umsch+N)",
+	"pad.toolbar.ul.title": "Nalicenje (Strg+Umsch+L)",
 	"pad.toolbar.indent.title": "Zasunuś (TAB)",
 	"pad.toolbar.unindent.title": "Wusunuś (Umsch+TAB)",
 	"pad.toolbar.undo.title": "Anulěrowaś (Strg-Z)",
 	"pad.toolbar.redo.title": "Wóspjetowaś (Strg-Y)",
-	"pad.toolbar.clearAuthorship.title": "Awtorowe barwy lašowaś",
+	"pad.toolbar.clearAuthorship.title": "Awtorowe barwy lašowaś (Strg+Umsch+C)",
 	"pad.toolbar.import_export.title": "Import/Eksport z/do drugich datajowych formatow",
 	"pad.toolbar.timeslider.title": "Wersijowa historija",
 	"pad.toolbar.savedRevision.title": "Wersiju składowaś",
@@ -26,29 +60,36 @@
 	"pad.colorpicker.save": "Składowaś",
 	"pad.colorpicker.cancel": "Pśetergnuś",
 	"pad.loading": "Zacytujo se...",
+	"pad.noCookie": "Cookie njejo se namakał. Pšosym dowólśo cookieje w swójom wobglědowaku! Wašo pósejźenje a waše nastajenja se mjazy dwěma woglědoma njeskładuju. To móžo se stas, gaž Etherpad jo w někotarych wobglědowakach w iFrame wopśimjony. Pšosym zawěsććo, až Etherpad jo na samskej póddomenje/domenje ako nadrědowany iFrame",
 	"pad.permissionDenied": "Njamaš pśistupne pšawo za toś ten zapisnik.",
 	"pad.settings.padSettings": "Nastajenja zapisnika",
 	"pad.settings.myView": "Mój naglěd",
 	"pad.settings.stickychat": "Chat pśecej na wobrazowce pokazaś",
+	"pad.settings.chatandusers": "Chat a wužywarje pokazaś",
 	"pad.settings.colorcheck": "Awtorowe barwy",
 	"pad.settings.linenocheck": "Smužkowe numery",
 	"pad.settings.rtlcheck": "Wopśimjeśe wótpšawa nalěwo cytaś?",
 	"pad.settings.fontType": "Pismowa družyna:",
 	"pad.settings.fontType.normal": "Normalny",
 	"pad.settings.language": "Rěc:",
+	"pad.settings.about": "Wó",
+	"pad.settings.poweredBy": "Pódpěrany wót",
 	"pad.importExport.import_export": "Import/Eksport",
 	"pad.importExport.import": "Tekstowu dataju abo dokument nagraś",
 	"pad.importExport.importSuccessful": "Wuspěšny!",
 	"pad.importExport.export": "Aktualny zapisnik eksportěrowaś ako:",
+	"pad.importExport.exportetherpad": "Etherpad",
 	"pad.importExport.exporthtml": "HTML",
 	"pad.importExport.exportplain": "Lutny tekst",
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.abiword.innerHTML": "Móžoš jano z fprmatow lutnego teksta abo z HTML-formata importěrowaś. Za wěcej rozšyrjone importěrowańske funkcije <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-in-Ubuntu-or-OpenSuse-or-SLES-with-AbiWord\">instalěruj pšosym Abiword</a>.",
+	"pad.importExport.abiword.innerHTML": "Móžoš jano z fprmatow lutnego teksta abo z HTML-formata importěrowaś. Za wěcej rozšyrjone importěrowańske funkcije <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-with-AbiWord\">instalěruj pšosym Abiword abo LibreOffice</a>.",
 	"pad.modals.connected": "Zwězany.",
 	"pad.modals.reconnecting": "Zwězujo se znowego z twójim zapisnikom...",
 	"pad.modals.forcereconnect": "Znowego zwězaś",
+	"pad.modals.reconnecttimer": "Wopytaj se znowego zwězaś w",
+	"pad.modals.cancel": "Pśetergnuś",
 	"pad.modals.userdup": "W drugem woknje wócynjony",
 	"pad.modals.userdup.explanation": "Zda se, až toś ten zapisnik jo se we wěcej ako jadnem woknje wobglědowaka na toś tom licadłu wócynił.",
 	"pad.modals.userdup.advice": "Zwězaj znowego, aby toś to wokno město togo wužywał.",
@@ -67,6 +108,10 @@
 	"pad.modals.corruptPad.cause": "To jo se snaź wopacneje serweroweje konfiguracije dla abo drugego njewócakanego zaźaržanja dla stało. Pšosym staj se ze słužbowym administratorom do zwiska.",
 	"pad.modals.deleted": "Wulašowany.",
 	"pad.modals.deleted.explanation": "Toś ten zapisnik jo se wótpórał.",
+	"pad.modals.rateLimited": "Wobgranicowana rata.",
+	"pad.modals.rateLimited.explanation": "Sćo pósłał pśewjele powěsćow na zapisnik, togodla jo se zwisk źělił.",
+	"pad.modals.rejected.explanation": "Serwer jo wótpokazał powěsć, kótaraž jo se pósłał pśez waš wobglědowak pósłał.",
+	"pad.modals.rejected.cause": "Serwer jo se snaź zaktualizěrował, mjaztym až sy se woglědał zapisnik, abo dajo snaź zmólku w Etherpad. Wopytaj bok znowego zacytaś.",
 	"pad.modals.disconnected": "Zwisk jo pśetergnjony.",
 	"pad.modals.disconnected.explanation": "Zwisk ze serwerom jo se zgubił",
 	"pad.modals.disconnected.cause": "Serwer njestoj k dispoziciji. Pšosym informěruj słužbowego administratora, jolic to se dalej stawa.",
@@ -77,6 +122,9 @@
 	"pad.chat": "Chat",
 	"pad.chat.title": "Chat za toś ten zapisnik wócyniś",
 	"pad.chat.loadmessages": "Dalšne powěsći zacytaś",
+	"pad.chat.stick.title": "Chat k wobrazowce pśipěś",
+	"pad.chat.writeMessage.placeholder": "Piš swóju powěsć how",
+	"timeslider.followContents": "Aktualizacijam wopśimjeśa zapisnika slědowaś",
 	"timeslider.pageTitle": "{{appTitle}} - wersijowa historija",
 	"timeslider.toolbar.returnbutton": "Slědk k zapisnikoju",
 	"timeslider.toolbar.authors": "Awtory:",
@@ -85,6 +133,9 @@
 	"timeslider.exportCurrent": "Aktualnu wersiju eksportěrowaś ako:",
 	"timeslider.version": "Wersija {{version}}",
 	"timeslider.saved": "Składowany {{day}}. {{month}} {{year}}",
+	"timeslider.playPause": "Wopśimjeśe zapisnika wótgraś/pawzěrowaś",
+	"timeslider.backRevision": "Wó jadnu wersiju w toś tom dokumenśe slědk hyś",
+	"timeslider.forwardRevision": "Wó jadnu wersiju w toś tom dokumenśe doprědka hyś",
 	"timeslider.dateformat": "{{day}}. {{month}} {{year}} {{hours}}:{{minutes}}:{{seconds}}",
 	"timeslider.month.january": "januara",
 	"timeslider.month.february": "februara",
@@ -100,15 +151,18 @@
 	"timeslider.month.december": "decembra",
 	"timeslider.unnamedauthors": "{{num}} {[plural(num) one: awtor, two: awtora, few: awtory, other: awtorow ]} bźez mjenja",
 	"pad.savedrevs.marked": "Toś ta wersija jo se něnto ako składowana wersija markěrowała",
+	"pad.savedrevs.timeslider": "Móžoš se skłaźone wersije woglědowaś, gaž se k historiji dokumenta woglědujoś.",
 	"pad.userlist.entername": "Zapódaj swójo mě",
 	"pad.userlist.unnamed": "bźez mjenja",
-	"pad.editbar.clearcolors": "Awtorowe barwy w cełem dokumenśe lašowaś?",
+	"pad.editbar.clearcolors": "Awtorowe barwy w cełem dokumenśe lašowaś? To njedajo se anulěrowaś",
 	"pad.impexp.importbutton": "Něnto importěrowaś",
 	"pad.impexp.importing": "Importěrujo se...",
 	"pad.impexp.confirmimport": "Importowanje dataje pśepišo aktualny tekst zapisnika. Coš napšawdu pókšacowaś?",
 	"pad.impexp.convertFailed": "Njejsmy mógli toś tu dataju importěrowaś. Pšosym wužyj drugi dokumentowy format abo kopěruj manuelnje",
+	"pad.impexp.padHasData": "Njejsmy mógli toś tu dataju importěrowaś, dokulaž toś ten dokument južo změny wopśimujo, pšosym importěruj nowy dokument.",
 	"pad.impexp.uploadFailed": "Nagraśe njejo se raźiło, pšosym wopytaj hyšći raz",
 	"pad.impexp.importfailed": "Import njejo se raził",
 	"pad.impexp.copypaste": "Pšosym kopěrowaś a zasajźiś",
-	"pad.impexp.exportdisabled": "Eksport ako format {{type}} jo znjemóžnjony. Pšosym staj se ze swójim systemowym administratorom za drobnostki do zwiska."
+	"pad.impexp.exportdisabled": "Eksport ako format {{type}} jo znjemóžnjony. Pšosym staj se ze swójim systemowym administratorom za drobnostki do zwiska.",
+	"pad.impexp.maxFileSize": "Dataja jo pśewjelika. Staj se ze swójim sedłowym administratorom do zwiska, aby dowólonu datajowu wjelikosć za import pówušył"
 }

src/locales/dty.json

@@ -2,6 +2,7 @@
 	"@metadata": {
 		"authors": [
 			"Nirajan pant",
+			"बडा काजी",
 			"रमेश सिंह बोहरा",
 			"राम प्रसाद जोशी"
 		]
@@ -78,7 +79,7 @@
 	"pad.modals.disconnected.cause": "सर्भर अनुपलब्ध होइसकन्छ। यदि यो हुनोइ रयाबर कृपया सेवा व्यवस्थापकलाई सूचित अरऽ।",
 	"pad.share": "यस प्याडलाई बाड्न्या",
 	"pad.share.readonly": "पड्‍ड्या मात्तरै",
-	"pad.share.link": "लिङ्क",
+	"pad.share.link": "कडी",
 	"pad.share.emebdcode": "URL थप्प्या",
 	"pad.chat": "कुरणिकानी",
 	"pad.chat.title": "येइ प्याड खिलाइ गफ खोलऽ",

src/locales/el.json

@@ -15,10 +15,31 @@
 	"admin_plugins.available": "Διαθέσιμα πρόσθετα",
 	"admin_plugins.available_not-found": "Δεν βρέθηκαν πρόσθετα.",
 	"admin_plugins.available_install.value": "Εγκατάσταση",
+	"admin_plugins.available_search.placeholder": "Αναζητήστε πρόσθετα για εγκατάσταση",
 	"admin_plugins.description": "Περιγραφή",
 	"admin_plugins.installed": "Εγκατεστημένα πρόσθετα",
 	"admin_plugins.installed_nothing": "Δεν έχετε εγκαταστήσει πρόσθετα ακόμη.",
 	"admin_plugins.installed_uninstall.value": "Απεγκατάσταση",
+	"admin_plugins.last-update": "Τελευταία ενημέρωση",
+	"admin_plugins.name": "Όνομα",
+	"admin_plugins.page-title": "Διαχειριστής πρόσθετων - Etherpad",
+	"admin_plugins.version": "Έκδοση",
+	"admin_plugins_info": "Πληροφορίες αντιμετώπισης προβλημάτων",
+	"admin_plugins_info.hooks": "Εγκατεστημένα άγκιστρα",
+	"admin_plugins_info.hooks_server": "Άγκιστρα από την πλευρά του διακομιστή",
+	"admin_plugins_info.parts": "Εγκατεστημένα εξαρτήματα",
+	"admin_plugins_info.plugins": "Εγκατεστημένα πρόσθετα",
+	"admin_plugins_info.page-title": "Πληροφορίες πρόσθετου - Etherpad",
+	"admin_plugins_info.version": "Έκδοση Etherpad",
+	"admin_plugins_info.version_latest": "Τελευταία διαθέσιμη έκδοση",
+	"admin_plugins_info.version_number": "Αριθμός έκδοσης",
+	"admin_settings": "Ρυθμίσεις",
+	"admin_settings.current": "Τρέχουσα διαμόρφωση",
+	"admin_settings.current_example-devel": "Παράδειγμα προτύπου ρυθμίσεων ανάπτυξης",
+	"admin_settings.current_example-prod": "Παράδειγμα προτύπου ρυθμίσεων παραγωγής",
+	"admin_settings.current_restart.value": "Επανεκκινήστε το Etherpad",
+	"admin_settings.current_save.value": "Αποθήκευση Ρυθμίσεων",
+	"admin_settings.page-title": "Ρυθμίσεις - Etherpad",
 	"index.newPad": "Νέος Κοινόχρηστος Πίνακας",
 	"index.createOpenPad": "ή δημιουργία/άνοιγμα ενός κοινόχρηστου πίνακα με όνομα:",
 	"index.openPad": "άνοιγμα υπάρχοντος κοινόχρηστού πίνακα με όνομα:",
@@ -29,7 +50,7 @@
 	"pad.toolbar.ol.title": "Ταξινομημένη λίστα (Ctrl+Shift+N)",
 	"pad.toolbar.ul.title": "Λίστα χωρίς ταξινόμηση (Ctrl+Shift+L)",
 	"pad.toolbar.indent.title": "Εσοχή (TAB)",
-	"pad.toolbar.unindent.title": "Δεξιά εσοχή (Shift+TAB)",
+	"pad.toolbar.unindent.title": "Εσοχή (Shift+TAB)",
 	"pad.toolbar.undo.title": "Αναίρεση (Ctrl-Z)",
 	"pad.toolbar.redo.title": "Επανάληψη (Ctrl-Y)",
 	"pad.toolbar.clearAuthorship.title": "Εκκαθάριση χρωμάτων σύνταξης κειμένου (Ctrl+Shift+C)",
@@ -90,6 +111,7 @@
 	"pad.modals.corruptPad.cause": "Αυτό μπορεί να οφείλεται σε ένα λάθος στη ρύθμιση του διακομιστή ή κάποια άλλη απρόβλεπτη συμπεριφορά. Παρακαλώ επικοινωνήστε με τον διαχειριστή της υπηρεσίας.",
 	"pad.modals.deleted": "Διεγράφη.",
 	"pad.modals.deleted.explanation": "Αυτό το pad έχει καταργηθεί.",
+	"pad.modals.rejected.explanation": "Ο διακομιστής απέρριψε ένα μήνυμα που στάλθηκε από το πρόγραμμα περιήγησής σας.",
 	"pad.modals.disconnected": "Είστε αποσυνδεδεμένοι.",
 	"pad.modals.disconnected.explanation": "Χάθηκε η σύνδεση με τον διακομιστή",
 	"pad.modals.disconnected.cause": "Ο διακομιστής μπορεί να μην είναι διαθέσιμος. Παρακαλούμε ειδοποιήστε τον διαχειριστή της υπηρεσίας εάν εξακολουθεί να συμβαίνει αυτό.",

src/locales/es.json

@@ -2,6 +2,7 @@
 	"@metadata": {
 		"authors": [
 			"Armando-Martin",
+			"Atzerritik",
 			"DDPAT",
 			"Dgstranz",
 			"Fitoschido",
@@ -74,7 +75,7 @@
 	"pad.colorpicker.save": "Guardar",
 	"pad.colorpicker.cancel": "Cancelar",
 	"pad.loading": "Cargando...",
-	"pad.noCookie": "No se pudo encontrar la «cookie». Permite la utilización de «cookies» en el navegador.",
+	"pad.noCookie": "No se pudo encontrar la galleta. ¡Por favor, permita las cookies en su navegador! Su sesión y configuración no se guardarán entre las visitas. Esto puede deberse a que Etherpad está incluido en un iFrame en algunos navegadores. Por favor asegúrese de que Etherpad está en el mismo subdominio/dominio que el iFrame padre",
 	"pad.permissionDenied": "No tienes permiso para acceder a este pad",
 	"pad.settings.padSettings": "Configuración del pad",
 	"pad.settings.myView": "Preferencias personales",
@@ -98,7 +99,7 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.abiword.innerHTML": "Solo es posible importar texto sin formato o en HTML. Para obtener funciones de importación más avanzadas es necesario <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-with-AbiWord\">instalar AbiWord</a>.",
+	"pad.importExport.abiword.innerHTML": "Solo se puede importar desde texto plano o formatos HTML. Para obtener funciones de importación más avanzadas, <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-with-AbiWord\">instale AbiWord o LibreOffice</a>.",
 	"pad.modals.connected": "Conectado.",
 	"pad.modals.reconnecting": "Reconectando a tu pad...",
 	"pad.modals.forcereconnect": "Forzar reconexión",

src/locales/eu.json

@@ -10,7 +10,7 @@
 			"Xabier Armendaritz"
 		]
 	},
-	"admin.page-title": "Admin Aginte-panela - Etherpad",
+	"admin.page-title": "Kudeaketa panela - Etherpad",
 	"admin_plugins": "Plugin-en kudeaketa",
 	"admin_plugins.available": "Eskuragarri dauden plugin-ak",
 	"admin_plugins.available_not-found": "Ez da plugin-ik aurkitu",

src/locales/ff.json

@@ -0,0 +1,167 @@
+{
+	"@metadata": {
+		"authors": [
+			"Ibrahima Malal Sarr"
+		]
+	},
+	"admin.page-title": "Tiimtorde Jiiloowo - Etherpad",
+	"admin_plugins": "Toppitorde Ceŋe",
+	"admin_plugins.available": "Ceŋe goodaaɗe",
+	"admin_plugins.available_not-found": "Alaa ceŋe njiytaa.",
+	"admin_plugins.available_fetching": "Nana balloo…",
+	"admin_plugins.available_install.value": "Aaf",
+	"admin_plugins.available_search.placeholder": "Yiylo ceŋe aafeteeɗe",
+	"admin_plugins.description": "Cifol",
+	"admin_plugins.installed": "Ceŋe aafaaɗe",
+	"admin_plugins.installed_fetching": "Nana yiyloo ceŋe aafaaɗe…",
+	"admin_plugins.installed_nothing": "A aafaani ceŋe tawo.",
+	"admin_plugins.installed_uninstall.value": "Aaftu",
+	"admin_plugins.last-update": "Kesɗitinal cakkitiingal",
+	"admin_plugins.name": "Innde",
+	"admin_plugins.page-title": "Toppitorde ceŋe - Etherpad",
+	"admin_plugins.version": "Yamre",
+	"admin_plugins_info": "Humpito njiylaw caɗe",
+	"admin_plugins_info.hooks": "Logge aafaaɗe",
+	"admin_plugins_info.hooks_client": "Logge senngo-kuutoro",
+	"admin_plugins_info.hooks_server": "Logge senngo-sarworde",
+	"admin_plugins_info.parts": "Terɗe aafaaɗe",
+	"admin_plugins_info.plugins": "Ceŋe aafaaɗe",
+	"admin_plugins_info.page-title": "Humpito ceŋe - Etherpad",
+	"admin_plugins_info.version": "Yamre Etherpad",
+	"admin_plugins_info.version_latest": "Yamre sakkitiinde woodunde",
+	"admin_plugins_info.version_number": "Tonngoode yamre",
+	"admin_settings": "Teelte",
+	"admin_settings.current": "Teeltannde wonaango",
+	"admin_settings.current_example-devel": "Yeru tugnorgal teelte topagol",
+	"admin_settings.current_example-prod": "Yeru tugnorgal teelte baayino",
+	"admin_settings.current_restart.value": "Hurmitin Etherpad",
+	"admin_settings.current_save.value": "Danndu Teelte",
+	"admin_settings.page-title": "Teelte - Etherpad",
+	"index.newPad": "Alluwal Kesal",
+	"index.createOpenPad": "walla sos/uddit Alluwal e innde:",
+	"index.openPad": "Uddit paɗo woodungo e ndee innde:",
+	"pad.toolbar.bold.title": "Buutol (Ctrl+B)",
+	"pad.toolbar.italic.title": "Italik (Ctrl+I)",
+	"pad.toolbar.underline.title": "Diidoles (Ctrl+U)",
+	"pad.toolbar.strikethrough.title": "Baar (Ctrl+5)",
+	"pad.toolbar.ol.title": "Doggol leemtangol(Ctrl+Shift+N)",
+	"pad.toolbar.ul.title": "Doggol ngol lemtaaka",
+	"pad.toolbar.indent.title": "Ɓeydu taaɓal (TAB)",
+	"pad.toolbar.unindent.title": "Ruttu taaɓal (Shift+TAB)",
+	"pad.toolbar.undo.title": "Firtu (Ctrl+Z)",
+	"pad.toolbar.redo.title": "Waɗtu (Ctrl+Y)",
+	"pad.toolbar.clearAuthorship.title": "Momtu Noone Wallifɓe (Ctrl+Shift+C)",
+	"pad.toolbar.import_export.title": "Jiggo/Jiggito iwde/faade mbayka piille goɗɗe",
+	"pad.toolbar.timeslider.title": "Daasorde tuma",
+	"pad.toolbar.savedRevision.title": "Dannde Baylital",
+	"pad.toolbar.settings.title": "Teelte",
+	"pad.toolbar.embed.title": "Lollin maa soomtor ngoo faɗo",
+	"pad.toolbar.showusers.title": "Hollu huutorɓe e ngoo faɗo",
+	"pad.colorpicker.save": "Danndu",
+	"pad.colorpicker.cancel": "Haaytin",
+	"pad.loading": "Nana loowa...",
+	"pad.noCookie": "Kukii yiytaaka. Tiiɗno yamir kukiije e wanngorde maa!\nNaatal maa e teelte maa danndetaake hakkunde njulluuji. Ɗuum ena waawi tawa Etherpad ena soomaa e nder iFrame e won e banngorɗe. Tiiɗno ƴeewto so Etherpad woni ko e domen/lesdomen iFrame yumma oo.",
+	"pad.permissionDenied": "A alaa yamiroore naatde e ngoo faɗo",
+	"pad.settings.padSettings": "Teelte Faɗo",
+	"pad.settings.myView": "Jiytol am",
+	"pad.settings.stickychat": "Yeewtere e yaynirde sahaa kala",
+	"pad.settings.chatandusers": "Hollu Yeewtere e Huutorɓe",
+	"pad.settings.colorcheck": "Noone Wallifɓe",
+	"pad.settings.linenocheck": "Tonngooɗe gori",
+	"pad.settings.rtlcheck": "Tar loowdi iwde ñaamo faya nano?",
+	"pad.settings.fontType": "Fannu binndi:",
+	"pad.settings.language": "Ɗemngal:",
+	"pad.settings.about": "Baɗte",
+	"pad.settings.poweredBy": "Dognata ko",
+	"pad.importExport.import_export": "Jiggo/Jiggito",
+	"pad.importExport.import": "Yollu fiilde binndol maa fiilannde",
+	"pad.importExport.importSuccessful": "Ɓennii no haaniri!",
+	"pad.importExport.export": "Jiggito faɗo wonaango e innde:",
+	"pad.importExport.exportetherpad": "Etherpad",
+	"pad.importExport.exporthtml": "HTML",
+	"pad.importExport.exportplain": "Binndi ɓolɓolti",
+	"pad.importExport.exportword": "Microsoft Word",
+	"pad.importExport.exportpdf": "PDF",
+	"pad.importExport.exportopen": "ODF (Open Document Format)",
+	"pad.importExport.abiword.innerHTML": "Mbaaw-ɗaa jiggaade tan ko baykaaji binndi ɓolɓolti maa HTML. Ngam heɓde fannuuji jiggagol ɓurɗi seeɓde, tiiɗno yillo <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-with-AbiWord\">install AbiWord or LibreOffice</a>.",
+	"pad.modals.connected": "Seŋiima.",
+	"pad.modals.reconnecting": "Nana seŋoo e faɗo maa…",
+	"pad.modals.forcereconnect": "Forsu ceŋagol kadi",
+	"pad.modals.reconnecttimer": "Nana etoo seŋaade kadi ɗoo e",
+	"pad.modals.cancel": "Haaytin",
+	"pad.modals.userdup": "Uddit e henorde woɗnde",
+	"pad.modals.userdup.explanation": "Ngoo faɗo ellee ena udditii e ko ɓuri henorde wanngorde wootere e ndee komputere.",
+	"pad.modals.userdup.advice": "Seŋo kadi ngam huutoraade ndee henorde kisa.",
+	"pad.modals.unauth": "Yamiraaka",
+	"pad.modals.unauth.explanation": "Jamirooje maa mbayliima tuma nde ƴeewataa ngoo hello. Eto seŋaade kadi.",
+	"pad.modals.looping.explanation": "Caɗeele jokkondiral ena ngoodi faade e sarworde canngoɗinal ndee.",
+	"pad.modals.looping.cause": "Ma a taw ko a ceŋoriiɗo proxy maa ɓalal-jayngue.",
+	"pad.modals.initsocketfail": "Sorworde heɓotaako.",
+	"pad.modals.initsocketfail.explanation": "Horiima seŋaade e sarworde canngoɗinal ndee.",
+	"pad.modals.initsocketfail.cause": "Ɗuum ena gasa waɗi ɗum ko saɗeede wonnde e wanngorde maa maa ceŋol Enternet maa.",
+	"pad.modals.slowcommit.explanation": "Sarworde ndee jaabaaki.",
+	"pad.modals.slowcommit.cause": "Ɗuum ena gasa ko caɗeele ceŋagol laylaytol.",
+	"pad.modals.badChangeset.explanation": "Taƴtol ngol mbaɗ-ɗaa joopaama rewaani laawol to sarworde canngoɗinal ndee.",
+	"pad.modals.badChangeset.cause": "Ɗuum ena gasa ko teeltol sarworde ngol moƴƴaani maa geɗel ngel tijjanooka. Tiiɗno jokkondir e jiiloowo sarwiis oo, so aɗa sikki ɗuum ko juumre. Eto seŋaade kadi ngam jokkude taƴtagol maa.",
+	"pad.modals.corruptPad.explanation": "Faɗo ngo etoto-ɗaa naatde ngoo nattii moƴƴude.",
+	"pad.modals.corruptPad.cause": "Ɗuum ena gasa addi ɗum ko teeltol sarworde ngol feewaani maa geɗel ngel tijjanooka. Tiiɗno jokkondir e jiiloowo.",
+	"pad.modals.deleted": "Momtaama.",
+	"pad.modals.deleted.explanation": "Ngoo faɗo ko momtaango.",
+	"pad.modals.rateLimited": "Cookol happinaama.",
+	"pad.modals.rateLimited.explanation": "A neldii ɓatakuuje keewɗe haa ɓurti e ngoo faɗo, wadde e seŋtaama.",
+	"pad.modals.rejected.explanation": "Sarworde ndee riiwtii ɓatakuru ngu wanngorde maa neldunoo.",
+	"pad.modals.rejected.cause": "Sarworde ndee ena gasa koko hesɗitinanoo tuma nde ngon-ɗaa e ƴeewde faɗo ngoo, walla ma a taw ena woodi buggere e Etherpad. Eto loowtude hello ngoo.",
+	"pad.modals.disconnected": "A seŋtaama.",
+	"pad.modals.disconnected.explanation": "Ceŋagol to sarworde waasaama",
+	"pad.modals.disconnected.cause": "Sarworde ndee ena gasa heɓotaako. Tiiɗno habru jiiloowo sarwii soo so ɗum nattaani.",
+	"pad.share": "Lollin ngoo faɗo",
+	"pad.share.readonly": "Targol tan",
+	"pad.share.link": "Jokkorde",
+	"pad.share.emebdcode": "Soomtor URL",
+	"pad.chat": "Yeewtere",
+	"pad.chat.title": "Uddit yeewtere ngoo faɗo.",
+	"pad.chat.loadmessages": "Loow ɓatakuuje goɗɗe",
+	"pad.chat.stick.title": "Hedde e yaynirde yeewtere",
+	"pad.chat.writeMessage.placeholder": "Winndu ɗoo ɓatakuru maa",
+	"timeslider.followContents": "Rewindo kesɗitine loowdi faɗo",
+	"timeslider.pageTitle": "{{appTitle}} Daasorde tuma",
+	"timeslider.toolbar.returnbutton": "Rutto to faɗo",
+	"timeslider.toolbar.authors": "Willifɓe:",
+	"timeslider.toolbar.authorsList": "Alaa ballifo",
+	"timeslider.toolbar.exportlink.title": "Jiggito",
+	"timeslider.exportCurrent": "Jiggito yamre wonaande e innde:",
+	"timeslider.version": "Yamre {{version}}",
+	"timeslider.saved": "Danndaama {{month}} {{day}} {{year}}",
+	"timeslider.playPause": "Tar / Dartin Loowdi Faɗo",
+	"timeslider.backRevision": "Rutto to baylital e ngoo Faɗo",
+	"timeslider.forwardRevision": "Yah yeeso to baylital en ngoo Faɗo",
+	"timeslider.dateformat": "{{month}}/{{day}}/{{year}} {{hours}}:{{minutes}}:{{seconds}}",
+	"timeslider.month.january": "Siilo",
+	"timeslider.month.february": "Colte",
+	"timeslider.month.march": "MBooy",
+	"timeslider.month.april": "Seeɗto",
+	"timeslider.month.may": "Duujal",
+	"timeslider.month.june": "Korse",
+	"timeslider.month.july": "Morso",
+	"timeslider.month.august": "Juko",
+	"timeslider.month.september": "Silto",
+	"timeslider.month.october": "Yarkomaa",
+	"timeslider.month.november": "Jolal",
+	"timeslider.month.december": "Bowte",
+	"timeslider.unnamedauthors": "{{num}} innitaaka {[plural(num) goo: ballifo, goɗɗo: wallifɓe]}",
+	"pad.savedrevs.marked": "Ndee yamre maantaama jooni ko baylital danndangal",
+	"pad.savedrevs.timeslider": "Aɗa waawi yiyde baylitte danndaaɗe so yillaade daasorde tuma ndee",
+	"pad.userlist.entername": " Naatnu innde maa",
+	"pad.userlist.unnamed": "innitaaki",
+	"pad.editbar.clearcolors": "Momtu noone wallifɓe e fiilannde ndee fof? Ɗum waawaa firteede",
+	"pad.impexp.importbutton": "Jiggito Jooni",
+	"pad.impexp.importing": "Nana Jiggitoo...",
+	"pad.impexp.confirmimport": "Jiggitaade fiilde maa winndito e dow winndannde wonaande ndee. Aɗa yenanaa yiɗde jokkude?",
+	"pad.impexp.convertFailed": "Min koriima jiggitaade ndee fiilde. Tiiɗno huutoro mbayka fiilannde ngoɗka walla natto ɗakkiraa junngo",
+	"pad.impexp.padHasData": "Min koriima jiggitaade ndee fiilde sabu ngoo Faɗo meeɗii wayleede, tiiɗno jiggito faade e faɗo heso",
+	"pad.impexp.uploadFailed": "Jollugol woorii, tiiɗno fuɗɗito",
+	"pad.impexp.importfailed": "Jiggitol woorii",
+	"pad.impexp.copypaste": "Tiiɗno natto ɗakkaa",
+	"pad.impexp.exportdisabled": "Jiggitaade e mbayka {{type}} koko daaƴaa. Tuuɗno jokkondir e jiiloowo yuɓɓo maa ngam ɓeydude faamade.",
+	"pad.impexp.maxFileSize": "Fiilde ena mawni haa ɓurti. Jokkondir e jiiloowo ngam ɓeydude ɓetol fiilde jamirangol ngam jiggeede"
+}

src/locales/fi.json

@@ -25,6 +25,7 @@
 	"admin_plugins": "Lisäosien hallinta",
 	"admin_plugins.available": "Saatavilla olevat liitännäiset",
 	"admin_plugins.available_not-found": "Lisäosia ei löytynyt.",
+	"admin_plugins.available_fetching": "Noudetaan…",
 	"admin_plugins.available_install.value": "Asenna",
 	"admin_plugins.available_search.placeholder": "Etsi asennettavia laajennuksia",
 	"admin_plugins.description": "Kuvaus",
@@ -49,6 +50,7 @@
 	"admin_settings": "Asetukset",
 	"admin_settings.current": "Nykyinen kokoonpano",
 	"admin_settings.current_example-devel": "Esimerkki kehitysasetusten mallista",
+	"admin_settings.current_restart.value": "Käynnistä Etherpad uudelleen",
 	"admin_settings.current_save.value": "Tallenna asetukset",
 	"admin_settings.page-title": "asetukset - Etherpad",
 	"index.newPad": "Uusi muistio",

src/locales/fr.json

@@ -177,11 +177,11 @@
 	"timeslider.unnamedauthors": "{{num}} {[plural(num) one: auteur anonyme, other: auteurs anonymes ]}",
 	"pad.savedrevs.marked": "Cette révision est maintenant marquée comme révision enregistrée",
 	"pad.savedrevs.timeslider": "Vous pouvez voir les révisions enregistrées en ouvrant l’historique",
-	"pad.userlist.entername": "Entrez votre nom",
+	"pad.userlist.entername": "Saisissez votre nom",
 	"pad.userlist.unnamed": "anonyme",
 	"pad.editbar.clearcolors": "Effacer le surlignage par auteur dans tout le document ? Cette action ne peut être annulée.",
 	"pad.impexp.importbutton": "Importer maintenant",
-	"pad.impexp.importing": "Import en cours...",
+	"pad.impexp.importing": "Importation en cours...",
 	"pad.impexp.confirmimport": "Importer un fichier écrasera le contenu actuel du bloc-notes. Êtes-vous sûr de vouloir le faire ?",
 	"pad.impexp.convertFailed": "Nous ne pouvons pas importer ce fichier. Veuillez utiliser un autre format de document ou faire manuellement un copier/coller du texte brut",
 	"pad.impexp.padHasData": "Nous n’avons pas pu importer ce fichier parce que ce bloc-notes a déjà été modifié ; veuillez l’importer vers un nouveau bloc-notes.",

src/locales/gl.json

@@ -48,13 +48,13 @@
 	"pad.toolbar.strikethrough.title": "Riscar (Ctrl+5)",
 	"pad.toolbar.ol.title": "Lista ordenada (Ctrl+Shift+N)",
 	"pad.toolbar.ul.title": "Lista sen ordenar (Ctrl+Shift+L)",
-	"pad.toolbar.indent.title": "Sangría (TAB)",
-	"pad.toolbar.unindent.title": "Sen sangría (Maiús.+TAB)",
+	"pad.toolbar.indent.title": "Sangrar (TAB)",
+	"pad.toolbar.unindent.title": "Sen sangrar (Maiús.+TAB)",
 	"pad.toolbar.undo.title": "Desfacer (Ctrl-Z)",
 	"pad.toolbar.redo.title": "Refacer (Ctrl-Y)",
-	"pad.toolbar.clearAuthorship.title": "Eliminar as cores que identifican ás autoras (Ctrl+Shift+C)",
+	"pad.toolbar.clearAuthorship.title": "Eliminar as cores que identifican ás participantes (Ctrl+Shift+C)",
 	"pad.toolbar.import_export.title": "Importar/Exportar desde/a diferentes formatos de ficheiro",
-	"pad.toolbar.timeslider.title": "Liña do tempo",
+	"pad.toolbar.timeslider.title": "Cronoloxía",
 	"pad.toolbar.savedRevision.title": "Gardar a revisión",
 	"pad.toolbar.settings.title": "Axustes",
 	"pad.toolbar.embed.title": "Compartir e incorporar este documento",
@@ -65,9 +65,9 @@
 	"pad.noCookie": "Non se puido atopar a cookie. Por favor, habilita as cookies no teu navegador! A túa sesión e axustes non se gardarán entre visitas. Esto podería deberse a que Etherpad está incluído nalgún iFrame nalgúns navegadores. Asegúrate de que Etherpad está no mesmo subdominio/dominio que o iFrame pai",
 	"pad.permissionDenied": "Non tes permiso para acceder a este documento",
 	"pad.settings.padSettings": "Configuracións do documento",
-	"pad.settings.myView": "A miña vista",
+	"pad.settings.myView": "Ver",
 	"pad.settings.stickychat": "Chat sempre visible",
-	"pad.settings.chatandusers": "Mostrar o chat e os usuarios",
+	"pad.settings.chatandusers": "Mostrar o chat e as usuarias",
 	"pad.settings.colorcheck": "Cores de identificación",
 	"pad.settings.linenocheck": "Números de liña",
 	"pad.settings.rtlcheck": "Queres ler o contido da dereita á esquerda?",
@@ -88,7 +88,7 @@
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
 	"pad.importExport.abiword.innerHTML": "Só podes importar texto simple ou formatos HTML. Para obter máis información sobre as características de importación avanzadas <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-with-AbiWord\">instala AbiWord</a>.",
 	"pad.modals.connected": "Conectado.",
-	"pad.modals.reconnecting": "Reconectando co teu documento...",
+	"pad.modals.reconnecting": "Reconectando co seu documento...",
 	"pad.modals.forcereconnect": "Forzar a reconexión",
 	"pad.modals.reconnecttimer": "Intentarase reconectar en",
 	"pad.modals.cancel": "Cancelar",
@@ -127,10 +127,10 @@
 	"pad.chat.stick.title": "Pegar a conversa á pantalla",
 	"pad.chat.writeMessage.placeholder": "Escribe aquí a túa mensaxe",
 	"timeslider.followContents": "Segue as actualizacións do contido",
-	"timeslider.pageTitle": "Liña do tempo de {{appTitle}}",
+	"timeslider.pageTitle": "Cronoloxía de {{appTitle}}",
 	"timeslider.toolbar.returnbutton": "Volver ao documento",
-	"timeslider.toolbar.authors": "Autores:",
-	"timeslider.toolbar.authorsList": "Ningún autor",
+	"timeslider.toolbar.authors": "Editoras:",
+	"timeslider.toolbar.authorsList": "Sen Editoras",
 	"timeslider.toolbar.exportlink.title": "Exportar",
 	"timeslider.exportCurrent": "Exportar a versión actual en formato:",
 	"timeslider.version": "Versión {{version}}",
@@ -151,12 +151,12 @@
 	"timeslider.month.october": "outubro",
 	"timeslider.month.november": "novembro",
 	"timeslider.month.december": "decembro",
-	"timeslider.unnamedauthors": "{{num}} {[plural(num) one: autor anónimo, other: autores anónimos ]}",
+	"timeslider.unnamedauthors": "{{num}} {[plural(num) one: editora anónima, other: editora anónima ]}",
 	"pad.savedrevs.marked": "Esta revisión está agora marcada como revisión gardada",
-	"pad.savedrevs.timeslider": "Pode consultar as revisións gardadas visitando a liña do tempo",
+	"pad.savedrevs.timeslider": "Pode consultar as revisións gardadas visitando a cronoloxía",
 	"pad.userlist.entername": "Insira o seu nome",
 	"pad.userlist.unnamed": "anónimo",
-	"pad.editbar.clearcolors": "Eliminar as cores relativas aos autores en todo o documento? Non se poderán recuperar",
+	"pad.editbar.clearcolors": "Eliminar as cores relativas ás participantes en todo o documento? Non se poderán recuperar",
 	"pad.impexp.importbutton": "Importar agora",
 	"pad.impexp.importing": "Importando...",
 	"pad.impexp.confirmimport": "A importación dun ficheiro ha sobrescribir o texto actual do documento. Está seguro de querer continuar?",

src/locales/hr.json

@@ -2,7 +2,8 @@
 	"@metadata": {
 		"authors": [
 			"Bugoslav",
-			"Hmxhmx"
+			"Hmxhmx",
+			"Ponor"
 		]
 	},
 	"index.newPad": "Novi blokić",
@@ -89,7 +90,7 @@
 	"pad.chat.title": "Otvori čavrljanje uz ovaj blokić.",
 	"pad.chat.loadmessages": "Učitaj više poruka",
 	"pad.chat.stick.title": "Prilijepi razgovor na zaslon",
-	"pad.chat.writeMessage.placeholder": "Napišite Vašu poruku ovdje",
+	"pad.chat.writeMessage.placeholder": "Ovdje napišite svoju poruku",
 	"timeslider.followContents": "Prati ažuriranja sadržaja blokića",
 	"timeslider.pageTitle": "{{appTitle}} Vremenska lenta",
 	"timeslider.toolbar.returnbutton": "Vrati se natrag na blokić",

src/locales/hsb.json

@@ -4,8 +4,42 @@
 			"Michawiki"
 		]
 	},
+	"admin.page-title": "Administratorowa deska – Etherpad",
+	"admin_plugins": "Zrjadowak tykačow",
+	"admin_plugins.available": "K dispoziciji stejace tykače",
+	"admin_plugins.available_not-found": "Žane tykače namakane.",
+	"admin_plugins.available_fetching": "Wobstaruje so …",
+	"admin_plugins.available_install.value": "Instalować",
+	"admin_plugins.available_search.placeholder": "Tykače za instalaciju pytać",
+	"admin_plugins.description": "Wopisanje",
+	"admin_plugins.installed": "Instalowane tykače",
+	"admin_plugins.installed_fetching": "Instalowane tykače so wobstaruja …",
+	"admin_plugins.installed_nothing": "Hišće njejsće tykače instalował.",
+	"admin_plugins.installed_uninstall.value": "Wotinstalować",
+	"admin_plugins.last-update": "Poslednja aktualizacija",
+	"admin_plugins.name": "Mjeno",
+	"admin_plugins.page-title": "Zrjadowak tykačow – Etherpad",
+	"admin_plugins.version": "Wersija",
+	"admin_plugins_info": "Informacije wo rozrisanju problemow",
+	"admin_plugins_info.hooks": "Instalowane hoki",
+	"admin_plugins_info.hooks_client": "Hoki ze strony klienta",
+	"admin_plugins_info.hooks_server": "Hoki ze strony serwera",
+	"admin_plugins_info.parts": "Instalowane dźěle",
+	"admin_plugins_info.plugins": "Instalowane tykače",
+	"admin_plugins_info.page-title": "Tykačowe informacije – Ehterpad",
+	"admin_plugins_info.version": "Wersija Etherpad",
+	"admin_plugins_info.version_latest": "Najnowša wersija",
+	"admin_plugins_info.version_number": "Wersijowe čisło",
+	"admin_settings": "Nastajenja",
+	"admin_settings.current": "Aktualna konfiguracija",
+	"admin_settings.current_example-devel": "Přikładowa předłoha wuwiwanskich nastajenjow",
+	"admin_settings.current_example-prod": "Přikładowa předłoha produkciskich nastajenjow",
+	"admin_settings.current_restart.value": "Etherpad znowa startować",
+	"admin_settings.current_save.value": "Nastajenja składować",
+	"admin_settings.page-title": "Nastajenja – Etherpad",
 	"index.newPad": "Nowy zapisnik",
 	"index.createOpenPad": "abo wutwor/wočiń zapisnik z mjenom:",
+	"index.openPad": "wočińće eksistowacy Pad z mjenom:",
 	"pad.toolbar.bold.title": "Tučny (Strg-B)",
 	"pad.toolbar.italic.title": "Kursiwny (Strg-I)",
 	"pad.toolbar.underline.title": "Podšmórnyć (Strg-U)",
@@ -26,7 +60,7 @@
 	"pad.colorpicker.save": "Składować",
 	"pad.colorpicker.cancel": "Přetorhnyć",
 	"pad.loading": "Začituje so...",
-	"pad.noCookie": "Plack njeje so namakał. Prošu dopušćće placki w swojim wobhladowaku!",
+	"pad.noCookie": "Plack njeje so namakał. Prošu dowolće placki w swojim wobhladowaku! Waše posedźenje a nastajenja so mjez dwěmaj wopytomaj njeskładuja. To móže so stać, hdyž Etherpad je w někotrych wobhladowakach w iFrame wobsahowany. Prošu zawěsćće, zo Etherpad je na samsnej poddomenje/domenje kaž nadrjadowany iFrame",
 	"pad.permissionDenied": "Nimaće prawo za přistup na tutón zapisnik.",
 	"pad.settings.padSettings": "Nastajenja zapisnika",
 	"pad.settings.myView": "Mój napohlad",
@@ -38,6 +72,8 @@
 	"pad.settings.fontType": "Pismowa družina:",
 	"pad.settings.fontType.normal": "Normalny",
 	"pad.settings.language": "Rěč:",
+	"pad.settings.about": "Wo",
+	"pad.settings.poweredBy": "Spěchowany wot",
 	"pad.importExport.import_export": "Import/Eksport",
 	"pad.importExport.import": "Tekstowu dataju abo dokument nahrać",
 	"pad.importExport.importSuccessful": "Wuspěšny!",
@@ -48,10 +84,12 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.abiword.innerHTML": "Móžeš jenož z formatow luteho teksta abo z HTML-formata importować. Za bóle rozšěrjene importowanske funkcije <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-in-Ubuntu-or-OpenSuse-or-SLES-with-AbiWord\">instaluj prošu Abiword</a>.",
+	"pad.importExport.abiword.innerHTML": "Móžeš jenož z formatow luteho teksta abo z HTML-formata importować. Za bóle rozšěrjene importowe funkcije <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-with-AbiWord\">instaluj prošu Abiword abo LibreOffice</a>.",
 	"pad.modals.connected": "Zwjazany.",
 	"pad.modals.reconnecting": "Zwjazuje so znowa z twojim zapisnikom...",
 	"pad.modals.forcereconnect": "Znowa zwjazać",
+	"pad.modals.reconnecttimer": "Spytaj so znowa zwjazać w",
+	"pad.modals.cancel": "Přetorhnyć",
 	"pad.modals.userdup": "W druhim woknje wočinjeny",
 	"pad.modals.userdup.explanation": "Zda so, zo tutón zapisnik je so we wjace hač jednym woknje wobhladowaka na tutym ličaku wočinił.",
 	"pad.modals.userdup.advice": "Zwjazaj znowa, zo by tute wokno město toho wužiwał.",
@@ -70,6 +108,10 @@
 	"pad.modals.corruptPad.cause": "To je so snano wopačneje serweroweje konfiguracije dla abo druheho njewočakowaneho zadźerženja dla stało. Prošu staj so ze słužbowym administratorom do zwiska.",
 	"pad.modals.deleted": "Zhašany.",
 	"pad.modals.deleted.explanation": "Tutón zapisnik je so wotstronił.",
+	"pad.modals.rateLimited": "Wobmjezowana rata.",
+	"pad.modals.rateLimited.explanation": "Sće přewjele powěsćow na zapisnik pósłał, tohodla je so zwisk dźělił.",
+	"pad.modals.rejected.explanation": "Serwer je powěsć wotpokazał, kotraž je so přez waš wobhladowak pósłał.",
+	"pad.modals.rejected.cause": "Serwer je so snano zaktualizował, mjeztym zo sy sej zapisnik wobhladał, abo je snano zmylk w Etherpad. Spytaj stronu znowa začitać.",
 	"pad.modals.disconnected": "Zwisk je přetorhnjeny.",
 	"pad.modals.disconnected.explanation": "Zwisk ze serwerom je so zhubił",
 	"pad.modals.disconnected.cause": "Serwer k dispoziciji njesteji. Prošu informuj słužboweho administratora, jeli to so dale stawa.",
@@ -80,6 +122,9 @@
 	"pad.chat": "Chat",
 	"pad.chat.title": "Chat za tutón zapisnik wočinić",
 	"pad.chat.loadmessages": "Dalše powěsće začitać",
+	"pad.chat.stick.title": "Chat k wobrazowce připjeć",
+	"pad.chat.writeMessage.placeholder": "Pisajće swoju powěsć tu",
+	"timeslider.followContents": "Aktualizacijam wobsaha zapisnika slědować",
 	"timeslider.pageTitle": "{{appTitle}} - wersijowa historija",
 	"timeslider.toolbar.returnbutton": "Wróćo k zapisnikej",
 	"timeslider.toolbar.authors": "Awtorojo:",
@@ -88,7 +133,7 @@
 	"timeslider.exportCurrent": "Aktualnu wersiju eksportować jako:",
 	"timeslider.version": "Wersija {{version}}",
 	"timeslider.saved": "Składowany {{day}}. {{month}} {{year}}",
-	"timeslider.playPause": "Wobdźěłanje wothrać/pawzować",
+	"timeslider.playPause": "Wobsah zapisnika wothrać/pawsěrować",
 	"timeslider.backRevision": "Wo jednu wersiju w tutym dokumenće wróćo hić",
 	"timeslider.forwardRevision": "Wo jednu wersiju w tutym dokumenće doprědka hić",
 	"timeslider.dateformat": "{{day}}. {{month}} {{year}} {{hours}}:{{minutes}}:{{seconds}}",
@@ -109,7 +154,7 @@
 	"pad.savedrevs.timeslider": "Móžeš sej składowane wersije wobhladować, wopytujo historiju dokumenta.",
 	"pad.userlist.entername": "Zapodaj swoje mjeno",
 	"pad.userlist.unnamed": "bjez mjena",
-	"pad.editbar.clearcolors": "Awtorowe barby w cyłym dokumenće zhašeć?",
+	"pad.editbar.clearcolors": "Awtorowe barby w cyłym dokumenće zhašeć? To njeda so cofnyć",
 	"pad.impexp.importbutton": "Nětko importować",
 	"pad.impexp.importing": "Importuje so...",
 	"pad.impexp.confirmimport": "Importowanje dataje přepisa aktualny tekst zapisnika. Chceš woprawdźe pokročować?",
@@ -118,5 +163,6 @@
 	"pad.impexp.uploadFailed": "Nahraće njeje so poradźiło, prošu spytaj hišće raz",
 	"pad.impexp.importfailed": "Import njeje so poradźiło",
 	"pad.impexp.copypaste": "Prošu kopěrować a zasadźić",
-	"pad.impexp.exportdisabled": "Eksport jako format {{type}} je znjemóžnjeny. Prošu staj so ze swojim systemowym administratorom za podrobnosće do zwiska."
+	"pad.impexp.exportdisabled": "Eksport jako format {{type}} je znjemóžnjeny. Prošu staj so ze swojim systemowym administratorom za podrobnosće do zwiska.",
+	"pad.impexp.maxFileSize": "Dataja je přewulka. Stajće so ze swojim sydłowym administratorom do zwiska, zo by dowolenu datajowu wulkosć za import powyšił"
 }

src/locales/hy.json

@@ -1,6 +1,7 @@
 {
 	"@metadata": {
 		"authors": [
+			"Armenoid",
 			"Kareyac"
 		]
 	},
@@ -26,7 +27,7 @@
 	"pad.settings.fontType": "Տառատեսակի տեսակը",
 	"pad.settings.language": "Լեզու",
 	"pad.importExport.import_export": "Ներմուծում/արտահանում",
-	"pad.importExport.import": "Բեռնել ցանկացած տեքստային ֆայլը կամ փաստաթուղթ",
+	"pad.importExport.import": "Վերբեռնել ցանկացած տեքստային նիշք կամ փաստաթուղթ",
 	"pad.importExport.importSuccessful": "Հաջողություն",
 	"pad.importExport.export": "Արտահանել ընթացիկ փաստաթուղթ է որպես",
 	"pad.importExport.exportplain": "Պարզ տեքստ",

src/locales/ia.json

@@ -4,8 +4,42 @@
 			"McDutchie"
 		]
 	},
+	"admin.page-title": "Pannello administrative – Etherpad",
+	"admin_plugins": "Gestor de plug-ins",
+	"admin_plugins.available": "Plug-ins disponibile",
+	"admin_plugins.available_not-found": "Necun plug-in trovate.",
+	"admin_plugins.available_fetching": "Obtention…",
+	"admin_plugins.available_install.value": "Installar",
+	"admin_plugins.available_search.placeholder": "Cercar plug-ins a installar",
+	"admin_plugins.description": "Description",
+	"admin_plugins.installed": "Plug-ins installate",
+	"admin_plugins.installed_fetching": "Obtene plug-ins installate…",
+	"admin_plugins.installed_nothing": "Tu non ha ancora installate alcun plug-in.",
+	"admin_plugins.installed_uninstall.value": "Disinstallar",
+	"admin_plugins.last-update": "Ultime actualisation",
+	"admin_plugins.name": "Nomine",
+	"admin_plugins.page-title": "Gestor de plug-ins – Etherpad",
+	"admin_plugins.version": "Version",
+	"admin_plugins_info": "Resolution de problemas",
+	"admin_plugins_info.hooks": "Uncinos installate",
+	"admin_plugins_info.hooks_client": "Uncinos al latere del cliente",
+	"admin_plugins_info.hooks_server": "Uncinos al latere del servitor",
+	"admin_plugins_info.parts": "Partes installate",
+	"admin_plugins_info.plugins": "Plug-ins installate",
+	"admin_plugins_info.page-title": "Information sur le plug-in – Etherpad",
+	"admin_plugins_info.version": "Version de Etherpad",
+	"admin_plugins_info.version_latest": "Ultime version disponibile",
+	"admin_plugins_info.version_number": "Numero de version",
+	"admin_settings": "Parametros",
+	"admin_settings.current": "Configuration actual",
+	"admin_settings.current_example-devel": "Exemplo de patrono de parametros de disveloppamento",
+	"admin_settings.current_example-prod": "Exemplo de patrono de parametros de production",
+	"admin_settings.current_restart.value": "Reinitiar Etherpad",
+	"admin_settings.current_save.value": "Salveguardar parametros",
+	"admin_settings.page-title": "Parametros – Etherpad",
 	"index.newPad": "Nove pad",
 	"index.createOpenPad": "o crear/aperir un pad con le nomine:",
+	"index.openPad": "aperir un Pad existente con le nomine:",
 	"pad.toolbar.bold.title": "Grasse (Ctrl-B)",
 	"pad.toolbar.italic.title": "Italic (Ctrl-I)",
 	"pad.toolbar.underline.title": "Sublinear (Ctrl-U)",
@@ -38,6 +72,8 @@
 	"pad.settings.fontType": "Typo de litteras:",
 	"pad.settings.fontType.normal": "Normal",
 	"pad.settings.language": "Lingua:",
+	"pad.settings.about": "A proposito",
+	"pad.settings.poweredBy": "Actionate per",
 	"pad.importExport.import_export": "Importar/Exportar",
 	"pad.importExport.import": "Incargar qualcunque file de texto o documento",
 	"pad.importExport.importSuccessful": "Succedite!",
@@ -72,6 +108,10 @@
 	"pad.modals.corruptPad.cause": "Isto pote esser debite a un configuration incorrecte del servitor o a alcun altere comportamento impreviste. Per favor contacta le administrator del servicio.",
 	"pad.modals.deleted": "Delite.",
 	"pad.modals.deleted.explanation": "Iste pad ha essite removite.",
+	"pad.modals.rateLimited": "Frequentia limitate.",
+	"pad.modals.rateLimited.explanation": "Tu ha inviate troppo de messages a iste pad, dunque illo te ha disconnectite.",
+	"pad.modals.rejected.explanation": "Le servitor ha rejectate un message que tu navigator ha inviate.",
+	"pad.modals.rejected.cause": "Es possibile que le servitor ha essite actualisate durante que tu legeva le pad, o que il ha un falta in Etherpad. Tenta recargar le pagina.",
 	"pad.modals.disconnected": "Tu ha essite disconnectite.",
 	"pad.modals.disconnected.explanation": "Le connexion al servitor ha essite perdite.",
 	"pad.modals.disconnected.cause": "Le servitor pote esser indisponibile. Per favor notifica le administrator del servicio si isto continua a producer se.",
@@ -82,6 +122,9 @@
 	"pad.chat": "Chat",
 	"pad.chat.title": "Aperir le chat pro iste pad.",
 	"pad.chat.loadmessages": "Cargar plus messages",
+	"pad.chat.stick.title": "Ancorar le chat sur le schermo",
+	"pad.chat.writeMessage.placeholder": "Scribe tu message hic",
+	"timeslider.followContents": "Sequer le actualisationes de contento del pad",
 	"timeslider.pageTitle": "Glissa-tempore pro {{appTitle}}",
 	"timeslider.toolbar.returnbutton": "Retornar al pad",
 	"timeslider.toolbar.authors": "Autores:",
@@ -120,5 +163,6 @@
 	"pad.impexp.uploadFailed": "Le incargamento ha fallite. Per favor reproba.",
 	"pad.impexp.importfailed": "Importation fallite",
 	"pad.impexp.copypaste": "Per favor copia e colla",
-	"pad.impexp.exportdisabled": "Le exportation in formato {{type}} es disactivate. Per favor contacta le administrator del systema pro detalios."
+	"pad.impexp.exportdisabled": "Le exportation in formato {{type}} es disactivate. Per favor contacta le administrator del systema pro detalios.",
+	"pad.impexp.maxFileSize": "Le file es troppo grande. Contacta le administrator de tu sito pro augmentar le grandor de file autorisate pro importation."
 }

src/locales/krc.json

@@ -1,26 +1,142 @@
 {
 	"@metadata": {
 		"authors": [
-			"Ernác"
+			"Ernác",
+			"Къарачайлы"
 		]
 	},
+	"admin.page-title": "Администраторну панели — Etherpad",
+	"admin_plugins": "Плагин менеджер",
+	"admin_plugins.available": "Киришли плагинле",
+	"admin_plugins.available_not-found": "Плагинле табылмадыла.",
+	"admin_plugins.available_fetching": "Келтириле турады...",
+	"admin_plugins.available_install.value": "Къур",
+	"admin_plugins.available_search.placeholder": "Къурур ючюн плагинлени изле",
+	"admin_plugins.description": "Ачыкълау",
+	"admin_plugins.installed": "Къурулгъан плагинле",
+	"admin_plugins.installed_fetching": "Къурулгъан плагинле алына турадыла...",
+	"admin_plugins.installed_nothing": "Алкъын бир плагин да къурмагъансыз.",
+	"admin_plugins.installed_uninstall.value": "Къорат",
+	"admin_plugins.last-update": "Ахыр джангыртыу",
+	"admin_plugins.name": "Ат",
+	"admin_plugins.page-title": "Плагин менеджер - Etherpad",
+	"admin_plugins.version": "Версия",
+	"admin_plugins_info": "Бузукъланы кетериулени юсюнден информация",
+	"admin_plugins_info.hooks": "Къурулгъан ыргъакъла",
+	"admin_plugins_info.hooks_client": "Клиентни джанындагъы ыргъакъла",
+	"admin_plugins_info.hooks_server": "Сервер джанындагъы ыргъакъла",
+	"admin_plugins_info.parts": "Къурулгъан юлюшле",
+	"admin_plugins_info.plugins": "Къурулгъан плагинле",
+	"admin_plugins_info.page-title": "Плагин информация — Etherpad",
+	"admin_plugins_info.version": "Etherpad версия",
+	"admin_plugins_info.version_latest": "Ахыр киришли версия",
+	"admin_plugins_info.version_number": "Версияны номери",
+	"admin_settings": "Джарашдырыўла",
+	"admin_settings.current": "Баргъан конфигурация",
+	"admin_settings.current_example-devel": "Юлгю хазырлау джарашдырыуланы шаблону",
+	"admin_settings.current_example-prod": "Юлгю чыгъарыу джарашдырыуланы шаблону",
+	"admin_settings.current_restart.value": "Etherpad-ны джангыдан башлат",
+	"admin_settings.current_save.value": "Джарашдырыуланы Сакъла",
+	"admin_settings.page-title": "Джарашдырыула — Etherpad",
+	"index.newPad": "Джангы Блокнот",
+	"index.createOpenPad": "неда бу ат бла Блокнот болдур/ач:",
+	"index.openPad": "бу ат бла бар болгъан Блокнотну ачыгъыз:",
+	"pad.toolbar.bold.title": "Къалын (Ctrl+B)",
+	"pad.toolbar.italic.title": "Курсив (Ctrl-I)",
+	"pad.toolbar.underline.title": "Тюбю чертилген (Ctrl+U)",
+	"pad.toolbar.strikethrough.title": "Юсю сызылгъан (Ctrl+5)",
+	"pad.toolbar.ol.title": "Кёзюулю тизме (Ctrl+Shift+N)",
+	"pad.toolbar.ul.title": "Кёзюуге этилмеген тизме (Ctrl+Shift+L)",
+	"pad.toolbar.indent.title": "Абзац (TAB)",
+	"pad.toolbar.unindent.title": "Чыгъыш (Shift+TAB)",
+	"pad.toolbar.undo.title": "Кери ал (Ctrl+Z)",
+	"pad.toolbar.redo.title": "Къайтар (Ctrl+Y)",
+	"pad.toolbar.clearAuthorship.title": "Авторлукъну боялурын тазала (Ctrl+Shift+C)",
+	"pad.toolbar.import_export.title": "Файлланы башха форматларын (а/дан) импорт/экспорт",
+	"pad.toolbar.timeslider.title": "Заман шкала",
+	"pad.toolbar.savedRevision.title": "Версияны сакъла",
 	"pad.toolbar.settings.title": "Джарашдырыула",
+	"pad.toolbar.embed.title": "Бу блокнотну Джай эмда Ичине сал",
+	"pad.toolbar.showusers.title": "Хайырланыучуланы бу блокнотда кёргюзт",
 	"pad.colorpicker.save": "Сакъла",
+	"pad.colorpicker.cancel": "Ызына ал",
 	"pad.loading": "Джюклениу...",
+	"pad.noCookie": "Куки табылмадыла. Бразуеригизде кукилени бир джандырсагъыз! Сизни кириулеригизни арасында сессиягъыз эмда джарашдырыуларыгъыз сакъланныкъ тюлдюле. Буну чуруму, бир къауум браузерледе Etherpad iFrame ичинде болгъаны болургъа болур. Тилейбиз, Etherpad эмда аны башындагъы iFrame бир тюбдоменде/доменде болгъанындан ишексиз болугъуз.",
+	"pad.permissionDenied": "Бу блокнотха кириш  эркинлигигиз джокъду",
+	"pad.settings.padSettings": "Блокнотну джарашдырыулары",
+	"pad.settings.myView": "Кёрюнюмюм",
+	"pad.settings.stickychat": "Ушакъны хар заман да экранда кёргюзт",
+	"pad.settings.chatandusers": "Ушакъ бла къошулуучуланы кёргюзт",
+	"pad.settings.colorcheck": "Авторлукъ бояула",
+	"pad.settings.linenocheck": "Сатырланы номерлери",
+	"pad.settings.rtlcheck": "Ичиндеги онгдан солгъа окъулсунму?",
+	"pad.settings.fontType": "Шрифтни типи:",
 	"pad.settings.fontType.normal": "Нормал",
 	"pad.settings.language": "Тил:",
+	"pad.settings.about": "Юсюнден",
+	"pad.settings.poweredBy": "Этген:",
 	"pad.importExport.import_export": "Импорт/экспорт",
+	"pad.importExport.import": "Къаллай болса да текст файл неда документ джюкле",
 	"pad.importExport.importSuccessful": "Тыйыншлы!",
+	"pad.importExport.export": "Баргъан блокнотну бу шекилде экспорт эт:",
+	"pad.importExport.exportetherpad": "Etherpad",
 	"pad.importExport.exporthtml": "HTML",
 	"pad.importExport.exportplain": "Тюз текст",
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (OpenOffice'ни документи)",
+	"pad.importExport.abiword.innerHTML": "Сиз къуру тюз текстни неда HTML импорт этерге боллукъсуз. Импортну андан кенг функциялары ючюн <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-with-AbiWord\">AbiWord не LibreOffice къуругъуз</a>.",
+	"pad.modals.connected": "Байланды.",
+	"pad.modals.reconnecting": "Блокнотугъузгъа джангыдан байлана турады...",
+	"pad.modals.forcereconnect": "Джангыдан зор бла байланыу",
+	"pad.modals.reconnecttimer": "Джангыдан байланыргъа кюрешеди",
+	"pad.modals.cancel": "Ызына алыу",
+	"pad.modals.userdup": "Башха терезеде ачыкъды",
+	"pad.modals.userdup.explanation": "Бу блокнот, бу компьютерде бирден аслам бразуре терезеде ачылгъаннга ушайды.",
+	"pad.modals.userdup.advice": "Бу терезени хайырланыб джангыдан байлан",
+	"pad.modals.unauth": "Авторизацияны ётмегенди",
+	"pad.modals.unauth.explanation": "Бу бетни къарагъан заманда, эркинликлеригиз тюрленнгедиле. Джангыдан байланыб кёрюгюз.",
+	"pad.modals.looping.explanation": "Синхронизация сервер бла байлам проблемала боладыла.",
+	"pad.modals.looping.cause": "Келишмеген фаерволл неда прокси бла байланнган болурсуз.",
+	"pad.modals.initsocketfail": "Серверге джетишилимейди.",
+	"pad.modals.initsocketfail.explanation": "Синхронизация серверге байланылалмады.",
+	"pad.modals.initsocketfail.cause": "Бу проблема браузеригиз бла, неда интернет байламыгъыз бла чурумланады.",
+	"pad.modals.slowcommit.explanation": "Сервер джууаб бермейди.",
+	"pad.modals.slowcommit.cause": "Бу болум ау байлам бла болгъан проблемала ючюн чыгъаргъа боллукъду.",
+	"pad.modals.badChangeset.explanation": "Этген тюзетиуюгюзню, синхронизация сервер джараусузча класслагъанды.",
+	"pad.modals.badChangeset.cause": "Буну чуруму джангылыч сервер конфигурация неда башха сакъланмагъан этиу болургъа боллукъду. Тилейбиз, буну халатха санай эсегиз, къуллукъну администратору бла байланыгъыз. Тюзетиуню андан ары бардырыр ючюн, джангыдан байланыб кёрюгюз.",
+	"pad.modals.corruptPad.explanation": "Кириш алыргъа  излеген блокнот бузукъду.",
+	"pad.modals.corruptPad.cause": "Буну чуруму джангылыч сервер конфигурация неда башха сакъланмагъан этиу болургъа боллукъду. Тилейбиз, къуллукъну администратору бла байланыгъыз.",
+	"pad.modals.deleted": "Кетерилди.",
+	"pad.modals.deleted.explanation": "Бу блокнот къоратылгъанды.",
+	"pad.modals.rateLimited": "Терклик чеклендирилгенди.",
+	"pad.modals.rateLimited.explanation": "Бу блокнотха асыры кёб билдириу джибергенигиз ючюн, байлам кесилди.",
+	"pad.modals.rejected.explanation": "Браузеригиз джибергени билдириуюгюзню алыргъа унамады.",
+	"pad.modals.rejected.cause": "Блоконтха къарай тургъанлайыгъызгъа, сервер джангыртылыргъа болур неда Etherpad халатлы болургъа болур. Бетни джангыдан джюклеб кёрюгюз.",
+	"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": "Бу блокнот ючюн ушакъны ач",
+	"pad.chat.loadmessages": "Мындан аслам билдириу джюкле",
+	"pad.chat.stick.title": "Ушакъны экраннга джабышдыр",
+	"pad.chat.writeMessage.placeholder": "Билдириуюгюзню былайда джазыгъыз",
+	"timeslider.followContents": "Блокнот ичин джангыртыуун марагъыз",
+	"timeslider.pageTitle": "{{appTitle}} Заман Шкала",
 	"timeslider.toolbar.returnbutton": "Документге",
 	"timeslider.toolbar.authors": "Авторла:",
+	"timeslider.toolbar.authorsList": "Автор джокъду",
 	"timeslider.toolbar.exportlink.title": "Эспорт эт",
+	"timeslider.exportCurrent": "Баргъан версияны бу шекилде экспорт эт:",
 	"timeslider.version": "{{version}} версия",
+	"timeslider.saved": "{{day}} {{month}} {{year}} датада сакъланнганды",
+	"timeslider.playPause": "Блокнотну ичин Ойнат / Пауза",
+	"timeslider.backRevision": "Бу блокнотдагъы версиягъа кери къайт",
+	"timeslider.forwardRevision": "Блокнотда эндиги версиягъа бар",
 	"timeslider.dateformat": "{{day}}/{{month}}/{{year}} {{hours}}.{{minutes}}.{{seconds}}",
 	"timeslider.month.january": "январь",
 	"timeslider.month.february": "февраль",
@@ -34,5 +150,20 @@
 	"timeslider.month.october": "октябрь",
 	"timeslider.month.november": "ноябрь",
 	"timeslider.month.december": "декабрь",
-	"pad.impexp.importing": "Импорт этиу…"
+	"timeslider.unnamedauthors": "{{num}} атсыз {[plural(num) one: автор, other: автор ]}",
+	"pad.savedrevs.marked": "Бу версия, артыкъ сакъланнган версия болуб белгиленнгенди",
+	"pad.savedrevs.timeslider": "Заман шкалагъа кириб, сакъланнган версияланы кёрюрге боллукъсуз",
+	"pad.userlist.entername": "Атынгы киргизт",
+	"pad.userlist.unnamed": "атсыз",
+	"pad.editbar.clearcolors": "Буютеу документдеги автор бояула сюртюлсюнмю? Бу этиу кери алынамаз",
+	"pad.impexp.importbutton": "Энди импорт эт",
+	"pad.impexp.importing": "Импорт этиу…",
+	"pad.impexp.confirmimport": "Файлны импорту баргъан текстни джангыдан джазарыкъды. Андан ары бардырыргъа излегенигизден ишексизмисиз?",
+	"pad.impexp.convertFailed": "Бу файлны импорт эталмадыкъ. Тилейбиз, башха форматны хайырланыгъыз, неда къол бла копия этиб джабышдырыгъыз",
+	"pad.impexp.padHasData": "Бу блокнотда алайсыз да тюрлениуле болгъаны ючюн бу файлны импорт эталмадыкъ, тилейбиз джангы блокнотха импорт этигиз",
+	"pad.impexp.uploadFailed": "Джюклеу джетишимсиз болду, тилейбизщ джангыдан сынагъыз",
+	"pad.impexp.importfailed": "Импорт этилалмады",
+	"pad.impexp.copypaste": "Тилейбиз, копия этиб джабышдыргъыз",
+	"pad.impexp.exportdisabled": "{{type}} форматда экспорт джукъланыбды. Ачыкълаула ючюн система администраторлагъа байланыгъыз.",
+	"pad.impexp.maxFileSize": "Файл асыры уллуду. Импорт ючюн эркинлик берилген файл ёлчемини уллу этер ючюн сайтны администратору бла байланыгъыз"
 }

src/locales/ku-latn.json

@@ -1,6 +1,7 @@
 {
 	"@metadata": {
 		"authors": [
+			"Balyozxane",
 			"Bikarhêner",
 			"Dilyaramude",
 			"George Animal",
@@ -59,7 +60,7 @@
 	"timeslider.toolbar.returnbutton": "Vegere bloknotê",
 	"timeslider.toolbar.authors": "Nivîser:",
 	"timeslider.toolbar.authorsList": "Nivîser Tine",
-	"timeslider.version": "Guhertoya {{version}}",
+	"timeslider.version": "Guhartoya {{version}}",
 	"timeslider.saved": "Di dîroka {{day}} {{month}} {{year}} de hate tomarkirin",
 	"timeslider.dateformat": "{{day}}/{{month}}/{{year}} {{hours}}.{{minutes}}.{{seconds}}",
 	"timeslider.month.january": "kanûna paşîn",

src/locales/lb.json

@@ -3,12 +3,21 @@
 		"authors": [
 			"Gromper",
 			"Robby",
-			"Soued031"
+			"Soued031",
+			"Volvox"
 		]
 	},
-	"admin_plugins_info.version": "Etherpad Versioun",
+	"admin_plugins.available_install.value": "Installéieren",
+	"admin_plugins.description": "Beschreiwung",
+	"admin_plugins.installed_uninstall.value": "Desinstalléieren",
+	"admin_plugins.name": "Numm",
+	"admin_plugins.version": "Versioun",
+	"admin_plugins_info.version": "Etherpad-Versioun",
 	"admin_plugins_info.version_latest": "Lescht disponibel Versioun",
+	"admin_plugins_info.version_number": "Versiounsnummer",
 	"admin_settings": "Astellungen",
+	"admin_settings.current_save.value": "Astellunge späicheren",
+	"admin_settings.page-title": "Astellungen - Etherpad",
 	"index.newPad": "Neie Pad",
 	"index.createOpenPad": "oder maacht ee Pad mat dësem Numm op:",
 	"pad.toolbar.bold.title": "Fett (Strg-B)",
@@ -29,7 +38,8 @@
 	"pad.loading": "Lueden...",
 	"pad.noCookie": "Cookie gouf net fonnt. Erlaabt wgl. Cookien an Ärem Browser! Är Sessioun an Är Astellungen ginn net tëscht de Visitte gespäichert. Dëst kann doduerch bedéngt sinn datt Etherpad a verschiddene Browser an iFrameën agebaut ass. Vergewëssert Iech wgl. datt Etherpad am selwechten Subdomain/Domain ass wéi den iwwergeuerdneten iFrame",
 	"pad.permissionDenied": "Dir hutt net déi néideg Rechter fir dëse Pad opzemaachen",
-	"pad.settings.myView": "Méng Usiicht",
+	"pad.settings.padSettings": "Pad-Astellungen",
+	"pad.settings.myView": "Meng Usiicht",
 	"pad.settings.linenocheck": "Zeilennummeren",
 	"pad.settings.rtlcheck": "Inhalt vu riets no lénks liesen?",
 	"pad.settings.fontType": "Schrëftart:",
@@ -49,17 +59,21 @@
 	"pad.modals.connected": "Verbonnen.",
 	"pad.modals.cancel": "Ofbriechen",
 	"pad.modals.userdup": "An enger anerer Fënster opgemaach",
+	"pad.modals.userdup.explanation": "Et schéngt, datt dëse Pad a méi wéi enger Browserfënster op dësem Computer opgemaach ginn ass.",
 	"pad.modals.unauth": "Net autoriséiert",
 	"pad.modals.unauth.explanation": "Är Rechter hu geännert während deem Dir dës säit gekuckt hutt. Probéiert fir Iech nei ze connectéieren.",
 	"pad.modals.looping.explanation": "Et gëtt Kommunikatiounsproblemer mam Synchronisatiouns-Server.",
 	"pad.modals.initsocketfail": "De Server kann net erreecht ginn.",
 	"pad.modals.slowcommit.explanation": "De Server äntwert net.",
 	"pad.modals.deleted": "Geläscht.",
+	"pad.modals.deleted.explanation": "Dëse Pad gouf geläscht.",
 	"pad.modals.disconnected": "Äre Verbindung ass ofgebrach.",
 	"pad.modals.disconnected.explanation": "D'Verbindung mam Server ass verluergaang.",
+	"pad.share": "Dëse Pad deelen",
 	"pad.share.readonly": "Nëmme liesen",
 	"pad.share.link": "Link",
 	"pad.chat": "Chat",
+	"pad.chat.title": "Den Chat fir dëse Pad opmaachen.",
 	"pad.chat.loadmessages": "Méi Message lueden",
 	"pad.chat.writeMessage.placeholder": "Schreift Äre Message hei",
 	"timeslider.toolbar.authors": "Auteuren:",

src/locales/lt.json

@@ -5,12 +5,44 @@
 			"I-svetaines",
 			"Mantak111",
 			"Naktis",
+			"Nokeoo",
 			"Vogone",
 			"Zygimantus"
 		]
 	},
+	"admin.page-title": "Administratoriaus prietaisų skydelis – Etherpad",
+	"admin_plugins": "Įskiepių tvarkyklė",
+	"admin_plugins.available": "Galimi įskiepiai",
+	"admin_plugins.available_not-found": "Įskiepių nerasta.",
+	"admin_plugins.available_fetching": "Gaunama…",
+	"admin_plugins.available_install.value": "Įdiegti",
+	"admin_plugins.available_search.placeholder": "Ieškokite įskiepių įdiegimui",
+	"admin_plugins.description": "Aprašymas",
+	"admin_plugins.installed": "Įdiegti įskiepiai",
+	"admin_plugins.installed_fetching": "Gaunami įdiegti papildiniai…",
+	"admin_plugins.installed_nothing": "Dar neįdiegėte jokių papildinių.",
+	"admin_plugins.installed_uninstall.value": "Išinstaluoti",
+	"admin_plugins.last-update": "Paskutinis atnaujinimas",
+	"admin_plugins.name": "Pavadinimas",
+	"admin_plugins.page-title": "Papildinių tvarkyklė – Etherpad",
+	"admin_plugins.version": "Versija",
+	"admin_plugins_info": "Trikčių šalinimo informacija",
+	"admin_plugins_info.parts": "Įdiegtos dalys",
+	"admin_plugins_info.plugins": "Įdiegti papildiniai",
+	"admin_plugins_info.page-title": "Papildinio informacija – Etherpad",
+	"admin_plugins_info.version": "Etherpad versija",
+	"admin_plugins_info.version_latest": "Naujausia prieinama versija",
+	"admin_plugins_info.version_number": "Versijos numeris",
+	"admin_settings": "Nustatymai",
+	"admin_settings.current": "Dabartinė konfigūracija",
+	"admin_settings.current_example-devel": "Kūrimo nustatymų šablono pavyzdys",
+	"admin_settings.current_example-prod": "Gamybos nustatymų šablono pavyzdys",
+	"admin_settings.current_restart.value": "Iš naujo paleisti Etherpad",
+	"admin_settings.current_save.value": "Išsaugoti nustatymus",
+	"admin_settings.page-title": "Nustatymai – Etherpad",
 	"index.newPad": "Naujas bloknotas",
 	"index.createOpenPad": "arba sukurkite/atidarykite Bloknotą su pavadinimu:",
+	"index.openPad": "atidaryti egzistuojantį bloknotą su pavadinimu:",
 	"pad.toolbar.bold.title": "Paryškintasis (Ctrl-B)",
 	"pad.toolbar.italic.title": "Pasvirasis (Ctrl-I)",
 	"pad.toolbar.underline.title": "Pabraukimas (Ctrl-U)",
@@ -43,6 +75,8 @@
 	"pad.settings.fontType": "Šrifto tipas:",
 	"pad.settings.fontType.normal": "Normalus",
 	"pad.settings.language": "Kalba:",
+	"pad.settings.about": "Apie",
+	"pad.settings.poweredBy": "Palaiko",
 	"pad.importExport.import_export": "Importuoti/Eksportuoti",
 	"pad.importExport.import": "Įkelkite bet kokį tekstinį failą arba dokumentą",
 	"pad.importExport.importSuccessful": "Pavyko!",
@@ -53,9 +87,9 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Atvirasis dokumento formatas)",
-	"pad.importExport.abiword.innerHTML": "Galite importuoti tik iš paprasto teksto ar HTML formato. Dėl išplėstinių importavimo funkcijų prašome <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\">įdiegti AbiWord</a>.",
+	"pad.importExport.abiword.innerHTML": "Galite importuoti tik iš paprasto teksto ar HTML formatų. Dėl išplėstinių importavimo funkcijų prašome <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\">įdiegti AbiWord ar LibreOffice</a>.",
 	"pad.modals.connected": "Prisijungta.",
-	"pad.modals.reconnecting": "Iš naujo prisijungiama prie Jūsų bloknoto",
+	"pad.modals.reconnecting": "Iš naujo prisijungiama prie jūsų bloknoto…",
 	"pad.modals.forcereconnect": "Priversti prisijungti iš naujo",
 	"pad.modals.reconnecttimer": "Bandoma vėl prisijungti",
 	"pad.modals.cancel": "Atšaukti",
@@ -77,6 +111,9 @@
 	"pad.modals.corruptPad.cause": "Tai gali nutikti dėl neteisingos serverio konfigūracijos ar kitos netikėtos elgsenos. Prašome susisiekti su paslaugos administratoriumi.",
 	"pad.modals.deleted": "Ištrintas.",
 	"pad.modals.deleted.explanation": "Bloknotas buvo pašalintas.",
+	"pad.modals.rateLimited.explanation": "Išsiuntėte per daug pranešimų į šį bloknotą, todėl jis atjungė jus.",
+	"pad.modals.rejected.explanation": "Serveris atmetė jūsų naršyklės išsiųstą pranešimą.",
+	"pad.modals.rejected.cause": "Gali būti, kad serveris buvo atnaujintas jums peržiūrint bloknotą, o gal tai Etherpad klaida. Pabandykite iš naujo įkelti puslapį.",
 	"pad.modals.disconnected": "Jūs atsijungėte.",
 	"pad.modals.disconnected.explanation": "Ryšys su serveriu nutrūko",
 	"pad.modals.disconnected.cause": "Gali būti, kad serveris yra nepasiekiamas. Prašome informuoti paslaugos administratorių jei tai tęsiasi.",
@@ -89,6 +126,7 @@
 	"pad.chat.loadmessages": "Įkrauti daugiau pranešimų",
 	"pad.chat.stick.title": "Priklijuoti pokalbį",
 	"pad.chat.writeMessage.placeholder": "Rašykite savo žinutę čia",
+	"timeslider.followContents": "Sekite bloknoto turinio atnaujinimus",
 	"timeslider.pageTitle": "{{appTitle}} Laiko slinkiklis",
 	"timeslider.toolbar.returnbutton": "Grįžti į bloknotą",
 	"timeslider.toolbar.authors": "Autoriai:",
@@ -118,7 +156,7 @@
 	"pad.savedrevs.timeslider": "Galite peržiūrėti išsaugotas peržiūras apsilankydami laiko slinkiklyje",
 	"pad.userlist.entername": "Įveskite savo vardą",
 	"pad.userlist.unnamed": "bevardis",
-	"pad.editbar.clearcolors": "Išvalyti autorystės spalvas visame dokumente?",
+	"pad.editbar.clearcolors": "Išvalyti autorystės spalvas visame dokumente? To negalima atšaukti",
 	"pad.impexp.importbutton": "Importuoti dabar",
 	"pad.impexp.importing": "Importuojama...",
 	"pad.impexp.confirmimport": "Failo importavimas pakeis dabartinį bloknoto tekstą. Ar tikrai norite tęsti?",
@@ -127,5 +165,6 @@
 	"pad.impexp.uploadFailed": "Įkėlimas nepavyko, bandykite dar kartą",
 	"pad.impexp.importfailed": "Importuoti nepavyko",
 	"pad.impexp.copypaste": "Prašome nukopijuoti ir įklijuoti",
-	"pad.impexp.exportdisabled": "Eksportavimas {{type}} formatu yra išjungtas. Prašome susisiekti su savo sistemos administratoriumi dėl informacijos."
+	"pad.impexp.exportdisabled": "Eksportavimas {{type}} formatu yra išjungtas. Prašome susisiekti su savo sistemos administratoriumi dėl informacijos.",
+	"pad.impexp.maxFileSize": "Failas per didelis. Susisiekite su svetainės administratoriumi, kad padidintų leistiną importuoti failo dydį"
 }

src/locales/nap.json

@@ -3,9 +3,11 @@
 		"authors": [
 			"C.R.",
 			"Chelin",
+			"Finizio",
 			"Ruthven"
 		]
 	},
+	"admin_plugins.name": "Nomme",
 	"index.newPad": "Nuovo Pad",
 	"index.createOpenPad": "o crià o arape nu Pad cu 'o nomme:",
 	"pad.toolbar.bold.title": "Grassetto (Ctrl-B)",

src/locales/ne.json

@@ -67,7 +67,7 @@
 	"pad.modals.disconnected.explanation": "तपाईंको सर्भरसँगको जडान अवरुद्ध भयो",
 	"pad.share": "यस प्यडलाई बाड्ने",
 	"pad.share.readonly": "पढ्ने मात्र",
-	"pad.share.link": "लिङ्क",
+	"pad.share.link": "कडी",
 	"pad.share.emebdcode": "URL थप्ने",
 	"pad.chat": "कुराकानी",
 	"pad.chat.title": "यस प्याडको लागि कुराकानी खोल्ने",

src/locales/nl.json

@@ -33,7 +33,7 @@
 	"admin_plugins.name": "Naam",
 	"admin_plugins.page-title": "Plugin beheer - Etherpad",
 	"admin_plugins.version": "Versie",
-	"admin_plugins_info": "Info",
+	"admin_plugins_info": "Probleemoplossingsinformatie",
 	"admin_plugins_info.hooks": "Geïnstalleerde hooks",
 	"admin_plugins_info.hooks_client": "Client-side hooks",
 	"admin_plugins_info.hooks_server": "Server-side hooks",
@@ -45,7 +45,7 @@
 	"admin_plugins_info.version_number": "Versie nummer",
 	"admin_settings": "Instellingen",
 	"admin_settings.current": "Huidige configuratie",
-	"admin_settings.current_example-devel": "Development instellingen template",
+	"admin_settings.current_example-devel": "Voorbeeldsjabloon voor ontwikkelingsinstellingen",
 	"admin_settings.current_example-prod": "Productie instellingen template",
 	"admin_settings.current_restart.value": "Herstart Etherpad",
 	"admin_settings.current_save.value": "Bewaar instellingen",
@@ -121,7 +121,7 @@
 	"pad.modals.corruptPad.cause": "Dit kan komen door een onjuiste serverinstelling of door ander onverwacht gedrag. Neem contact op met de servicebeheerder.",
 	"pad.modals.deleted": "Verwijderd.",
 	"pad.modals.deleted.explanation": "Dit pad is verwijderd.",
-	"pad.modals.rateLimited": "Rate is beperkt.",
+	"pad.modals.rateLimited": "Snelheid begrensd.",
 	"pad.modals.rateLimited.explanation": "Je hebt te veel berichten naar deze pad gestuurd. Daarom is je verbinding verbroken.",
 	"pad.modals.rejected.explanation": "De server heeft een bericht afgewezen dat door je browser is verzonden.",
 	"pad.modals.rejected.cause": "Mogelijks is de server bijgewerkt terwijl je de pad aan het bekijken was. Of misschien is er een bug in Etherpad. Probeer de pagina opnieuw te laden.",
@@ -135,7 +135,7 @@
 	"pad.chat": "Chatten",
 	"pad.chat.title": "Chat voor dit pad opnenen",
 	"pad.chat.loadmessages": "Meer berichten laden",
-	"pad.chat.stick.title": "Zet de chat op het scherm",
+	"pad.chat.stick.title": "Chat op scherm vastzetten",
 	"pad.chat.writeMessage.placeholder": "Schrijf je bericht hier",
 	"timeslider.followContents": "Volg de inhoudelijke updates van de pad",
 	"timeslider.pageTitle": "Tijdlijn voor {{appTitle}}",

src/locales/sc.json

@@ -0,0 +1,168 @@
+{
+	"@metadata": {
+		"authors": [
+			"Adr mm"
+		]
+	},
+	"admin.page-title": "Pannellu de amministratzione - Etherpad",
+	"admin_plugins": "Gestore de connetores",
+	"admin_plugins.available": "Connetores a disponimentu",
+	"admin_plugins.available_not-found": "Nissunu connetore a disponimentu",
+	"admin_plugins.available_fetching": "Recuperende...",
+	"admin_plugins.available_install.value": "Installa",
+	"admin_plugins.available_search.placeholder": "Chirca connetores de installare",
+	"admin_plugins.description": "Descritzione",
+	"admin_plugins.installed": "Connetores installados",
+	"admin_plugins.installed_fetching": "Recuperende connetores installados...",
+	"admin_plugins.installed_nothing": "No as installadu ancora nissunu connetore.",
+	"admin_plugins.installed_uninstall.value": "Disinstalla",
+	"admin_plugins.last-update": "Ùrtima atualizatzione",
+	"admin_plugins.name": "Nòmine",
+	"admin_plugins.page-title": "Gestore de connetores - Etherpad",
+	"admin_plugins.version": "Versione",
+	"admin_plugins_info": "Informatzione pro sa risolutzione de problemas",
+	"admin_plugins_info.hooks": "Gantzos installados",
+	"admin_plugins_info.hooks_client": "Gantzos dae su costadu de su cliente",
+	"admin_plugins_info.hooks_server": "Gantzos dae su costadu de su serbidore",
+	"admin_plugins_info.parts": "Partes installadas",
+	"admin_plugins_info.plugins": "Connetores installados",
+	"admin_plugins_info.page-title": "Informatzione de su connetore - Etherpad",
+	"admin_plugins_info.version": "Versione de Etherpad",
+	"admin_plugins_info.version_latest": "Ùrtima versione a disponimentu",
+	"admin_plugins_info.version_number": "Nùmeru de versione",
+	"admin_settings": "Cunfiguratzione",
+	"admin_settings.current": "Cunfiguratzione atuale",
+	"admin_settings.current_example-devel": "Modellu de esempru de cunfiguratzione de isvilupu",
+	"admin_settings.current_example-prod": "Modellu de esempru de cunfiguratzione de produtzione",
+	"admin_settings.current_restart.value": "Torra a aviare Etherpad",
+	"admin_settings.current_save.value": "Sarva sa cunfiguratzione",
+	"admin_settings.page-title": "Cunfiguratzione - Etherpad",
+	"index.newPad": "Pad nou",
+	"index.createOpenPad": "o crea/aberi unu pad cun su nòmine:",
+	"index.openPad": "aberi unu pad esistente cun su nòmine:",
+	"pad.toolbar.bold.title": "Grassetu (Ctrl+B)",
+	"pad.toolbar.italic.title": "Cursivu (Ctrl+I)",
+	"pad.toolbar.underline.title": "Sutaliniadu (Ctrl+U)",
+	"pad.toolbar.strikethrough.title": "Istangadu (Ctrl+5)",
+	"pad.toolbar.ol.title": "Lista numerada (Ctrl+Shift+N)",
+	"pad.toolbar.ul.title": "Lista cun puntos (Ctrl+Shift+L)",
+	"pad.toolbar.indent.title": "Indentatzione a dereta (Tab)",
+	"pad.toolbar.unindent.title": "Indentatzione a manca (Shift+Tab)",
+	"pad.toolbar.undo.title": "Iscontza (Ctrl+Z)",
+	"pad.toolbar.redo.title": "Torra a fàghere (Ctrl+Y)",
+	"pad.toolbar.clearAuthorship.title": "Lìmpia is colores de autoria (Ctrl+Shift+C)",
+	"pad.toolbar.import_export.title": "Importa/esporta dae/a formados de archìviu diferentes",
+	"pad.toolbar.timeslider.title": "Presentatzione cronologia",
+	"pad.toolbar.savedRevision.title": "Sarva sa versione",
+	"pad.toolbar.settings.title": "Cunfiguratzione",
+	"pad.toolbar.embed.title": "Cumpartzi e incòrpora custu pad",
+	"pad.toolbar.showusers.title": "Ammustra is utentes in custu pad",
+	"pad.colorpicker.save": "Sarva",
+	"pad.colorpicker.cancel": "Annulla",
+	"pad.loading": "Carrighende...",
+	"pad.noCookie": "Su testimòngiu no est istètiu agatadu. Permite is testimòngios in su navigadore tuo. Sa sessione e sa cunfiguratzione tuas no ant a èssere sarvadas intre bìsitas. Podet èssere pro more de s'inclusione de Etherpad comente iFrame in tzertos navigadores. Assegura·ti chi Etherpad s'agatat in su pròpiu sutadomìniu/domìniu chi s'iFrame printzipale",
+	"pad.permissionDenied": "Non tenes permissu pro atzèdere a custu pad",
+	"pad.settings.padSettings": "Cunfiguratzione de su pad",
+	"pad.settings.myView": "Sa visualizatzione mia",
+	"pad.settings.stickychat": "Ammustra semper sa tzarrada",
+	"pad.settings.chatandusers": "Ammustra sa tzarrada e is utentes",
+	"pad.settings.colorcheck": "Colores de autoria",
+	"pad.settings.linenocheck": "Nùmeros de lìnia",
+	"pad.settings.rtlcheck": "Boles lèghere su cuntenutu dae dereta a manca?",
+	"pad.settings.fontType": "Tipu de caràtere:",
+	"pad.settings.fontType.normal": "Normale",
+	"pad.settings.language": "Lìngua:",
+	"pad.settings.about": "Informatziones",
+	"pad.settings.poweredBy": "Realizadu cun",
+	"pad.importExport.import_export": "Importatzione/esportatzione",
+	"pad.importExport.import": "Càrriga un'archìviu de testu o unu documentu",
+	"pad.importExport.importSuccessful": "Carrigadu.",
+	"pad.importExport.export": "Esporta su pad atuale comente:",
+	"pad.importExport.exportetherpad": "Etherpad",
+	"pad.importExport.exporthtml": "HTML",
+	"pad.importExport.exportplain": "Testu sèmplitze",
+	"pad.importExport.exportword": "Microsoft Word",
+	"pad.importExport.exportpdf": "PDF",
+	"pad.importExport.exportopen": "ODF (Open Documentu Formadu)",
+	"pad.importExport.abiword.innerHTML": "Isceti is formados de testu sèmplitze o HTML podent èssere importados. Pro mètodos avantzados de importatzione, <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-with-AbiWord\">installa AbiWord o LibreOffice</a>.",
+	"pad.modals.connected": "Connètidu.",
+	"pad.modals.reconnecting": "Connetende a su pad tuo...",
+	"pad.modals.forcereconnect": "Fortza sa connesione",
+	"pad.modals.reconnecttimer": "Torrende a connètere in",
+	"pad.modals.cancel": "Annulla",
+	"pad.modals.userdup": "Abertu in una àtera ventana",
+	"pad.modals.userdup.explanation": "Podet dare chi custu pad siat abertu in un'àtera ischeda de custu navigadore in custu ordinadore.",
+	"pad.modals.userdup.advice": "Torra a connètere pro impreare custa ventana.",
+	"pad.modals.unauth": "Chena autorizatzione",
+	"pad.modals.unauth.explanation": "Is permissos tuos sunt istados cambiados in su mentras chi fias bidende custa pàgina. Prova de ti torrare a connètere.",
+	"pad.modals.looping.explanation": "Bi sunt problemas de comunicatzione cun su serbidore de sincronizatzione.",
+	"pad.modals.looping.cause": "Forsis sa connessione at impreadu unu serbidore intermediàriu (proxy) o unu firewall chi no est cumpatìbile.",
+	"pad.modals.initsocketfail": "Su serbidore no est atzessìbile.",
+	"pad.modals.initsocketfail.explanation": "Impossìbile connètere cun su serbidore de sincronizatzione.",
+	"pad.modals.initsocketfail.cause": "Podet èssere a càusa de unu problema cun su navigadore tuo o cun sa connessione de internet.",
+	"pad.modals.slowcommit.explanation": "Su serbidore non rispondet.",
+	"pad.modals.slowcommit.cause": "Podet èssere a càusa de problemas cun sa connessione de internet.",
+	"pad.modals.badChangeset.explanation": "Una modìfica tua est istada cunsiderada illegale dae su serbidore de sincronizatzione.",
+	"pad.modals.badChangeset.cause": "Podet èssere a càusa de una cunfiguratzione de serbidore isballiada o calicunu àteru cumportamentu imprevistu. Iscrie a s'amministratzione de su servìtziu si pensas chi siat un'errore. Prova a connètere torra pro sighire a modificare.",
+	"pad.modals.corruptPad.explanation": "Su pad a su chi ses chirchende de atzèdere est dannadu.",
+	"pad.modals.corruptPad.cause": "Podet èssere a càusa de una cunfiguratzione de serbidore non curreta o pro unu cumportamentu imprevistu. Iscrie a s'amministratzione de su servìtziu.",
+	"pad.modals.deleted": "Cantzelladu.",
+	"pad.modals.deleted.explanation": "Pad cantzelladu.",
+	"pad.modals.rateLimited": "Frecuèntzia limitada.",
+	"pad.modals.rateLimited.explanation": "As imbiadu tropu messàgios a custu pad e t'at disconnètidu.",
+	"pad.modals.rejected.explanation": "Su serbidore at rifiutadu unu messàgiu imbiadu dae su navigadore tuo.",
+	"pad.modals.rejected.cause": "Podet èssere chi su serbidore siat istadu atualizadu in su mentras chi fias bidende su pad, o podet èssere chi bi siat un'errore in Etherpad. Prova a atualizare sa pàgina.",
+	"pad.modals.disconnected": "Disconnètidu.",
+	"pad.modals.disconnected.explanation": "Connessione cun su serbidore pèrdida.",
+	"pad.modals.disconnected.cause": "Su serbidore no est a disponimentu. Iscrie a s'amministratzione de su servìtziu si su problema persistet.",
+	"pad.share": "Cumpartzi custu pad",
+	"pad.share.readonly": "Letura isceti",
+	"pad.share.link": "Ligàmene",
+	"pad.share.emebdcode": "Incòrpora URL",
+	"pad.chat": "Tzarrada",
+	"pad.chat.title": "Aberi sa tzarrada pro custu pad.",
+	"pad.chat.loadmessages": "Càrriga àteros messàgios",
+	"pad.chat.stick.title": "Apica sa tzarrada in s'ischermu",
+	"pad.chat.writeMessage.placeholder": "Iscrie su messàgiu tuo inoghe",
+	"timeslider.followContents": "Sighi sas atualizatziones de cuntenutu de su pad",
+	"timeslider.pageTitle": "Cronologia {{appTitle}}",
+	"timeslider.toolbar.returnbutton": "Torra a su pad",
+	"timeslider.toolbar.authors": "Autores:",
+	"timeslider.toolbar.authorsList": "Nissunu autore",
+	"timeslider.toolbar.exportlink.title": "Esporta",
+	"timeslider.exportCurrent": "Esporta sa versione atuale comente:",
+	"timeslider.version": "Versione {{version}}",
+	"timeslider.saved": "Sarvadu su {{day}} de {{month}} de su {{year}}",
+	"timeslider.playPause": "Riprodutzione/pàusa de is cuntenutos de su pad",
+	"timeslider.backRevision": "Bae a una versione pretzedente de custu pad",
+	"timeslider.forwardRevision": "Bae a una versione imbeniente de custu pad",
+	"timeslider.dateformat": "{{day}}/{{month}}/{{year}} {{hours}}:{{minutes}}:{{seconds}}",
+	"timeslider.month.january": "Ghennàrgiu",
+	"timeslider.month.february": "Freàrgiu",
+	"timeslider.month.march": "Martzu",
+	"timeslider.month.april": "Abrile",
+	"timeslider.month.may": "Maju",
+	"timeslider.month.june": "Làmpadas",
+	"timeslider.month.july": "Mese de argiolas",
+	"timeslider.month.august": "Austu",
+	"timeslider.month.september": "Cabudanni",
+	"timeslider.month.october": "Ledàmine",
+	"timeslider.month.november": "Onniasantu",
+	"timeslider.month.december": "Mese de idas",
+	"timeslider.unnamedauthors": "{{num}} {[plural(num) one: autore, other: autores ]} chena nòmine",
+	"pad.savedrevs.marked": "Custa revisione est istada marcada comente revisione sarvada",
+	"pad.savedrevs.timeslider": "Podes bìdere is versiones sarvadas bisitende sa cronologia",
+	"pad.userlist.entername": "Inserta su nòmine tuo",
+	"pad.userlist.unnamed": "Chena nòmine",
+	"pad.editbar.clearcolors": "Seguru chi boles limpiare is colores de autoria de totu su documentu? Custa atzione no dda podes annullare",
+	"pad.impexp.importbutton": "Importa immoe",
+	"pad.impexp.importing": "Importende...",
+	"pad.impexp.confirmimport": "S'importatzione de un'archìviu at a subraiscrìere su testu atuale de su pad. Seguru chi boles sighire?",
+	"pad.impexp.convertFailed": "Impossìbile importare custu archìviu. Imprea unu formadu de documentu diferente o còpia e incolla a manu",
+	"pad.impexp.padHasData": "Impossìbile importare custu archìviu pro ite custu pad est istadu giai modificadu. Importa·ddu in unu pad nou",
+	"pad.impexp.uploadFailed": "Errore in sa càrriga. Torra a provare",
+	"pad.impexp.importfailed": "Errore de importatzione",
+	"pad.impexp.copypaste": "Còpia e incolla",
+	"pad.impexp.exportdisabled": "S'esportatzione comente {{type}} est disativada. Iscrie a s'amministratzione de su sistema pro àteras informatziones.",
+	"pad.impexp.maxFileSize": "S'archìviu est tropu manu. Iscrie a s'amministratzione pro ismanniare sa dimensione permìtida pro s'importatzione"
+}

src/locales/sco.json

@@ -2,6 +2,7 @@
 	"@metadata": {
 		"authors": [
 			"AmaryllisGardener",
+			"CiphriusKane",
 			"John Reid",
 			"Nintendofan885"
 		]
@@ -50,7 +51,7 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.abiword.innerHTML": "Ye can yinly import fae plain tex or HTML formats. Fer mair advanced import features please <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-in-Ubuntu-or-OpenSuse-or-SLES-with-AbiWord\">install abiword</a>.",
+	"pad.importExport.abiword.innerHTML": "Ye can anely import fae plain tex or HTML formats. Fur mair advanced import features please <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-in-Ubuntu-or-OpenSuse-or-SLES-with-AbiWord\">install abiword</a>.",
 	"pad.modals.connected": "Connected.",
 	"pad.modals.reconnecting": "Reconnectin til yer pad..",
 	"pad.modals.forcereconnect": "Force reconnect",
@@ -76,7 +77,7 @@
 	"pad.modals.disconnected.explanation": "The connection til the server wis loast",
 	"pad.modals.disconnected.cause": "The server micht be onavailable. Please notify the service admeenistrater gif this continues tae happen.",
 	"pad.share": "Share this pad",
-	"pad.share.readonly": "Read yinly",
+	"pad.share.readonly": "Read anely",
 	"pad.share.link": "Airtin",
 	"pad.share.emebdcode": "Embed URL",
 	"pad.chat": "Chait",

src/locales/sh.json

@@ -5,8 +5,16 @@
 			"Vlad5250"
 		]
 	},
+	"admin_plugins.available_not-found": "Nijedan plugin nije pronađen.",
+	"admin_plugins.description": "Opis",
+	"admin_plugins.installed_uninstall.value": "Deinstaliraj",
+	"admin_plugins.last-update": "Posljednja podnova",
+	"admin_plugins.name": "Naziv",
+	"admin_plugins.version": "Verzija",
+	"admin_settings.current_save.value": "Sačuvaj podešavanja",
 	"index.newPad": "Novi blokić",
 	"index.createOpenPad": "ili napravite/otvorite blokić s imenom:",
+	"index.openPad": "otvori postojeći blokić Etherpada s imenom:",
 	"pad.toolbar.bold.title": "Podebljano (Ctrl+B)",
 	"pad.toolbar.italic.title": "Ukošeno (Ctrl+I)",
 	"pad.toolbar.underline.title": "Podcrtano (Ctrl+U)",
@@ -14,7 +22,7 @@
 	"pad.toolbar.ol.title": "Poredani spisak (Ctrl+Shift+N)",
 	"pad.toolbar.ul.title": "Neporedani spisak (Ctrl+Shift+L)",
 	"pad.toolbar.indent.title": "Uvlaka (TAB)",
-	"pad.toolbar.unindent.title": "Izvlaka (Shift+TAB)",
+	"pad.toolbar.unindent.title": "Izvlačenje (Shift+TAB)",
 	"pad.toolbar.undo.title": "Vrati (Ctrl+Z)",
 	"pad.toolbar.redo.title": "Ponovi (Ctrl+Y)",
 	"pad.toolbar.clearAuthorship.title": "Ukloni boje autorstva (Ctrl+Shift+C)",
@@ -27,7 +35,7 @@
 	"pad.colorpicker.save": "Snimi",
 	"pad.colorpicker.cancel": "Otkaži",
 	"pad.loading": "Učitavam...",
-	"pad.noCookie": "Nisam mogao pronaći kolačić. Omogućite kolačiće u vašem pregledniku!",
+	"pad.noCookie": "Kolačić nije pronađen. Molimo Vas, omogućite kolačiće u Vašem pregledniku! Sesija i podešavanja neće biti sačuvana uz sljedeće posjećivanje. Razlog može biti uključenost Etherpada u iFrame u nekim preglednicima. Molimo Vas, osigurajte da je Etherpad na istoj poddomeni/domeni kao i roditeljski iFrame",
 	"pad.permissionDenied": "Za ovdje nije potrebna dozvola za pristup",
 	"pad.settings.padSettings": "Postavke blokića",
 	"pad.settings.myView": "Moj prikaz",
@@ -38,6 +46,8 @@
 	"pad.settings.rtlcheck": "Da prikažem sadržaj zdesna ulijevo?",
 	"pad.settings.fontType": "Tip fonta:",
 	"pad.settings.language": "Jezik:",
+	"pad.settings.about": "O projektu",
+	"pad.settings.poweredBy": "Omogućeno od strane",
 	"pad.importExport.import_export": "Uvoz/Izvoz",
 	"pad.importExport.import": "Otpremanje bilo koje tekstualne datoteke ili dokumenta",
 	"pad.importExport.importSuccessful": "Uspješno!",
@@ -48,7 +58,7 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.abiword.innerHTML": "Možete uvoziti samo iz običnog teksta te HTML-formata. Naprednije mogućnosti uvoza dobit ćete ako <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-with-AbiWord\">uspostavite AbiWord</a>.",
+	"pad.importExport.abiword.innerHTML": "Možete uvoziti samo iz običnog teksta te datoteke u formatima HTML-a. Naprednije mogućnosti uvoza dobit ćete ako <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-with-AbiWord\">instalirajte AbiWord ili LibreOffice</a>.",
 	"pad.modals.connected": "Povezano.",
 	"pad.modals.reconnecting": "Prepovezujemo Vas s blokićem...",
 	"pad.modals.forcereconnect": "Nametni prepovezivanje",
@@ -72,6 +82,10 @@
 	"pad.modals.corruptPad.cause": "Ovo može biti zbog pogrešne postavljenosti poslužitelja ili nekog drugog neočekivanog ponašanja. Obratite se administratoru.",
 	"pad.modals.deleted": "Obrisano.",
 	"pad.modals.deleted.explanation": "Ovaj blokić je uklonjen.",
+	"pad.modals.rateLimited": "Ograničenje stopa.",
+	"pad.modals.rateLimited.explanation": "Poslali ste previše poruka na ovaj blokić, te ste stoga odspojeni.",
+	"pad.modals.rejected.explanation": "Poslužitelj je odbio poruku koju je poslao vaš preglednik.",
+	"pad.modals.rejected.cause": "Poslužitelj je možda podnovljen dok ste gledali blokić, ili možda postoji greška u Etherpadu. Pokušajte ponovo učitati stranicu.",
 	"pad.modals.disconnected": "Veza je prekinuta.",
 	"pad.modals.disconnected.explanation": "Veza s poslužiteljem je prekinuta",
 	"pad.modals.disconnected.cause": "Moguće je da server nije dostupan. Obavijestite administratora ako se ovo nastavi događati.",
@@ -84,6 +98,7 @@
 	"pad.chat.loadmessages": "Učitaj više poruka",
 	"pad.chat.stick.title": "Zalijepi ćaskanje na ekranu",
 	"pad.chat.writeMessage.placeholder": "Ovdje napišite poruku",
+	"timeslider.followContents": "Prati podnove sadržaja blokića",
 	"timeslider.pageTitle": "{{appTitle}} Historijski pregled",
 	"timeslider.toolbar.returnbutton": "Natrag na blokić",
 	"timeslider.toolbar.authors": "Autori:",
@@ -113,7 +128,7 @@
 	"pad.savedrevs.timeslider": "Možete pogledati spremljene inačice rabeći vremesledni klizač",
 	"pad.userlist.entername": "Upišite svoje ime",
 	"pad.userlist.unnamed": "bez imena",
-	"pad.editbar.clearcolors": "Ukloniti boje autorstva sa cijelog dokumenta?",
+	"pad.editbar.clearcolors": "Ukloniti boje autorstva sa cijelog dokumenta? Radnju nije moguće poništiti",
 	"pad.impexp.importbutton": "Uvezi odmah",
 	"pad.impexp.importing": "Uvozim...",
 	"pad.impexp.confirmimport": "Uvoženje datoteke presnimit će trenutni sadržaj blokića.\nJeste li sigurni da želite nastaviti?",
@@ -122,5 +137,6 @@
 	"pad.impexp.uploadFailed": "Postavljanje nije uspjelo. Pokušajte ponovo.",
 	"pad.impexp.importfailed": "Uvoz nije uspio",
 	"pad.impexp.copypaste": "Prekopirajte",
-	"pad.impexp.exportdisabled": "Izvoz u formatu {{type}} je onemogućen. Ako želite saznati više o ovome, obratite se administratoru sustava."
+	"pad.impexp.exportdisabled": "Izvoz u formatu {{type}} je onemogućen. Ako želite saznati više o ovome, obratite se administratoru sustava.",
+	"pad.impexp.maxFileSize": "Datoteka je prevelika. Kontaktirajte administratora kako biste zatražili povećanje dopuštene veličine datoteke za uvoz"
 }

src/locales/skr-arab.json

@@ -4,10 +4,29 @@
 			"Saraiki"
 		]
 	},
+	"admin_plugins": "پلگ ان منیجر",
+	"admin_plugins.available": "دستیاب پلگ ان",
+	"admin_plugins.available_not-found": "کوئی پلگ ان کائنی لبھے۔",
+	"admin_plugins.available_install.value": "انسٹال",
+	"admin_plugins.description": "تفصیل",
+	"admin_plugins.installed_uninstall.value": "ان انسٹال",
+	"admin_plugins.last-update": "چھیکڑی تبدیلی",
+	"admin_plugins.name": "ناں",
+	"admin_plugins.version": "ورژن",
+	"admin_plugins_info.parts": "انسٹال تھئے حصے",
+	"admin_plugins_info.plugins": "انسٹال تھئے پلگ ان",
+	"admin_plugins_info.version_number": "ورشن نمبر",
+	"admin_settings": "ترتیباں",
+	"admin_settings.current_save.value": "ترتیباں محفوظ کرو",
+	"admin_settings.page-title": "ترتیباں ــ ایتھرپیڈ",
 	"index.newPad": "نواں پیڈ",
 	"pad.toolbar.bold.title": "بولڈ(Ctrl+B)",
 	"pad.toolbar.italic.title": "ترچھے (Ctrl+I)",
 	"pad.toolbar.underline.title": "ہیٹھ لکیر (Ctrl+U)",
+	"pad.toolbar.indent.title": "حاشیہ (ٹیب)",
+	"pad.toolbar.unindent.title": "حاشیہ ٻاہر دوں (شفٹ + ٹیٻ)",
+	"pad.toolbar.undo.title": "اݨ کیتا (کنٹرول + زیڈ)",
+	"pad.toolbar.redo.title": "ولدا کرو (کنٹرول + وائی)",
 	"pad.toolbar.savedRevision.title": "رویژن بچاؤ",
 	"pad.toolbar.settings.title": "ترتیباں",
 	"pad.colorpicker.save": "بچاؤ",
@@ -16,6 +35,8 @@
 	"pad.settings.padSettings": "پیڈ ترتیباں",
 	"pad.settings.fontType": "فونٹ قسم:",
 	"pad.settings.language": "زبان:",
+	"pad.settings.about": "تعارف",
+	"pad.settings.poweredBy": "تکڑا کرݨ آلے",
 	"pad.importExport.importSuccessful": "کامیاب!",
 	"pad.importExport.exportetherpad": "ایتھرپیڈ",
 	"pad.importExport.exporthtml": "ایچ ٹی ایم ایل",

src/locales/sl.json

@@ -9,130 +9,165 @@
 			"Upwinxp"
 		]
 	},
+	"admin.page-title": "Administratorska nadzorna plošča – Etherpad",
+	"admin_plugins": "Upravitelj vtičnikov",
+	"admin_plugins.available": "Razpoložljivi vtičniki",
+	"admin_plugins.available_not-found": "Ni najdenih vtičnikov.",
+	"admin_plugins.available_fetching": "Pridobivanje ...",
+	"admin_plugins.available_install.value": "Namesti",
+	"admin_plugins.available_search.placeholder": "Poiščite vtičnike za namestitev",
 	"admin_plugins.description": "Opis",
+	"admin_plugins.installed": "Nameščeni vtičniki",
+	"admin_plugins.installed_fetching": "Pridobivanje nameščenih vtičnikov ...",
+	"admin_plugins.installed_nothing": "Namestili niste še nobenega vtičnika.",
+	"admin_plugins.installed_uninstall.value": "Odmesti",
 	"admin_plugins.last-update": "Zadnja posodobitev",
 	"admin_plugins.name": "Ime",
+	"admin_plugins.page-title": "Upravitelj vtičnikov – Etherpad",
 	"admin_plugins.version": "Različica",
+	"admin_plugins_info": "Informacije o odpravljanju težav",
+	"admin_plugins_info.hooks": "Nameščene razširitvene točke",
+	"admin_plugins_info.hooks_client": "Razširitvene točke na strani odjemalca",
+	"admin_plugins_info.hooks_server": "Razširitvene točke na strani strežnika",
+	"admin_plugins_info.parts": "Nameščeni deli",
+	"admin_plugins_info.plugins": "Nameščeni vtičniki",
+	"admin_plugins_info.page-title": "Informacije o vtičniku – Etherpad",
+	"admin_plugins_info.version": "Različica Etherpada",
+	"admin_plugins_info.version_latest": "Najnovejša razpoložljiva različica",
+	"admin_plugins_info.version_number": "Številka različice",
 	"admin_settings": "Nastavitve",
+	"admin_settings.current": "Trenutna konfiguracija",
+	"admin_settings.current_example-devel": "Zgled predloge za razvojne nastavitve",
+	"admin_settings.current_example-prod": "Zgled predloge za roizvodne nastavitve",
+	"admin_settings.current_restart.value": "Znova zaženi Etherpad",
 	"admin_settings.current_save.value": "Shrani nastavitve",
-	"index.newPad": "Nov dokument",
-	"index.createOpenPad": "ali pa ustvari/odpri dokument z imenom:",
-	"pad.toolbar.bold.title": "Krepko (Ctrl-B)",
-	"pad.toolbar.italic.title": "Ležeče (Ctrl-I)",
-	"pad.toolbar.underline.title": "Podčrtano (Ctrl-U)",
-	"pad.toolbar.strikethrough.title": "Prečrtano (Ctrl+5)",
-	"pad.toolbar.ol.title": "Urejen seznam (Ctrl+Shift+N)",
-	"pad.toolbar.ul.title": "Neurejen seznam (Ctrl+Shift+L)",
+	"admin_settings.page-title": "Nastavitve – Etherpad",
+	"index.newPad": "Nov blokec",
+	"index.createOpenPad": "ali pa ustvari/odpri blokec z imenom:",
+	"index.openPad": "odpri obstoječ blokec z imenom:",
+	"pad.toolbar.bold.title": "Krepko (Ctrl + B)",
+	"pad.toolbar.italic.title": "Ležeče (Ctrl + I)",
+	"pad.toolbar.underline.title": "Podčrtano (Ctrl + U)",
+	"pad.toolbar.strikethrough.title": "Prečrtano (Ctrl + 5)",
+	"pad.toolbar.ol.title": "Urejen seznam (Ctrl + dvigalka + N)",
+	"pad.toolbar.ul.title": "Neurejen seznam (Ctrl + dvigalka + L)",
 	"pad.toolbar.indent.title": "Zamik desno (TAB)",
 	"pad.toolbar.unindent.title": "Zmanjšanje zamika (Shift+TAB)",
-	"pad.toolbar.undo.title": "Razveljavi (Ctrl-Z)",
-	"pad.toolbar.redo.title": "Ponovno uveljavi (Ctrl-Y)",
-	"pad.toolbar.clearAuthorship.title": "Počisti barve avtorstva (Ctrl+Shift+C)",
-	"pad.toolbar.import_export.title": "Uvozi/Izvozi različne oblike zapisov",
+	"pad.toolbar.undo.title": "Razveljavi (Ctrl + Z)",
+	"pad.toolbar.redo.title": "Znova uveljavi (Ctrl + Y)",
+	"pad.toolbar.clearAuthorship.title": "Počisti barve avtorstva (Ctrl + dvigalka + C)",
+	"pad.toolbar.import_export.title": "Uvozi/Izvozi iz/v različne datotečne formate",
 	"pad.toolbar.timeslider.title": "Časovni trak",
 	"pad.toolbar.savedRevision.title": "Shrani redakcijo",
 	"pad.toolbar.settings.title": "Nastavitve",
-	"pad.toolbar.embed.title": "Deli in vključi ta dokument",
-	"pad.toolbar.showusers.title": "Pokaži uporabnike dokumenta",
+	"pad.toolbar.embed.title": "Deli in vključi ta blokec",
+	"pad.toolbar.showusers.title": "Pokaži uporabnike blokca",
 	"pad.colorpicker.save": "Shrani",
 	"pad.colorpicker.cancel": "Prekliči",
 	"pad.loading": "Nalaganje ...",
 	"pad.noCookie": "Piškotka ni bilo mogoče najti. Prosimo, dovolite piškotke v vašem brskalniku! Vaša seja in nastavitve se med obiski ne bodo shranili. Razlog za to je morda, da je Etherpad v nekaterih brskalnikih vključen v iFrame. Zsgotovite, da je Etherpad na isti poddomeni/domeni kot nadrejeni iFrame.",
-	"pad.permissionDenied": "Nimate dovoljenja za dostop do tega dokumenta.",
-	"pad.settings.padSettings": "Nastavitve dokumenta",
+	"pad.permissionDenied": "Nimate dovoljenja za dostop do tega bkokca.",
+	"pad.settings.padSettings": "Nastavitve blokca.",
 	"pad.settings.myView": "Moj prikaz",
 	"pad.settings.stickychat": "Vsebina klepeta je vedno na zaslonu",
 	"pad.settings.chatandusers": "Prikaži klepet in uporabnike",
 	"pad.settings.colorcheck": "Barve avtorstva",
 	"pad.settings.linenocheck": "Številke vrstic",
-	"pad.settings.rtlcheck": "Ali naj se vsebina prebira od desne proti levi?",
+	"pad.settings.rtlcheck": "Ali naj se vsebina bera od desne proti levi?",
 	"pad.settings.fontType": "Vrsta pisave:",
 	"pad.settings.fontType.normal": "Normalno",
 	"pad.settings.language": "Jezik:",
+	"pad.settings.about": "Kolofon",
 	"pad.settings.poweredBy": "Omogoča",
 	"pad.importExport.import_export": "Uvoz/Izvoz",
-	"pad.importExport.import": "Naloži katerokoli besedilno datoteko ali dokument.",
-	"pad.importExport.importSuccessful": "Opravilo je uspešno končano!",
-	"pad.importExport.export": "Izvozi trenutni dokument kot:",
+	"pad.importExport.import": "Naložite katero koli besedilno datoteko ali dokument.",
+	"pad.importExport.importSuccessful": "Uspešno!",
+	"pad.importExport.export": "Izvozi trenutni blokec kot:",
 	"pad.importExport.exportetherpad": "Etherpad",
-	"pad.importExport.exporthtml": "HTML (oblikovano besedilo)",
-	"pad.importExport.exportplain": "TXT (neoblikovano besedilo)",
-	"pad.importExport.exportword": "DOC (zapis Microsoft Word)",
-	"pad.importExport.exportpdf": "PDF (zapis Acrobat PDF)",
-	"pad.importExport.exportopen": "ODF (zapis Open Document)",
-	"pad.importExport.abiword.innerHTML": "Uvoziti je mogoče le neoblikovano besedilo in zapise HTML. Za naprednejše možnosti uvoza namestite program <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-with-AbiWord\">AbiWord</a>.",
+	"pad.importExport.exporthtml": "HTML",
+	"pad.importExport.exportplain": "Golo besedilo",
+	"pad.importExport.exportword": "Microsoft Word",
+	"pad.importExport.exportpdf": "PDF",
+	"pad.importExport.exportopen": "ODF",
+	"pad.importExport.abiword.innerHTML": "Uvoziti je mogoče le golo besedilo in formate HTML. Za naprednejše možnosti uvoza namestite program <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-with-AbiWord\">AbiWord</a>.",
 	"pad.modals.connected": "Povezano.",
-	"pad.modals.reconnecting": "Poteka povezovanje z dokumentom ...",
+	"pad.modals.reconnecting": "Poteka povezovanje z blokcem ...",
 	"pad.modals.forcereconnect": "Vsili ponovno povezavo",
 	"pad.modals.reconnecttimer": "Poskus ponovne vzpostavitve povezave čez",
 	"pad.modals.cancel": "Prekliči",
-	"pad.modals.userdup": "Dokument je že odprt v v drugem oknu",
-	"pad.modals.userdup.explanation": "Videti je, da je ta dokument odprt v več kot enem oknu brskalnika na tem računalniku.",
-	"pad.modals.userdup.advice": "Ponovno vzpostavite povezavo in uporabljajte to okno.",
+	"pad.modals.userdup": "Blokec je že odprt v drugem oknu",
+	"pad.modals.userdup.explanation": "Videti je, da je ta blokec na tem računalniku odprt v več kot enem oknu brskalnika.",
+	"pad.modals.userdup.advice": "Znova vzpostavite povezavo in uporabljajte to okno.",
 	"pad.modals.unauth": "Nepooblaščen dostop",
-	"pad.modals.unauth.explanation": "Med ogledovanjem strani so se dovoljenja za ogled spremenila. Poskusite se znova povezati.",
-	"pad.modals.looping.explanation": "Zaznane so težave pri komunikaciji s strežnikom za usklajevanje.",
-	"pad.modals.looping.cause": "Morda ste se povezali skozi neustrezno nastavljen požarni zid ali s posredniškim strežnikom.",
+	"pad.modals.unauth.explanation": "Med ogledovanjem strani so se vaša dovoljenja za ogled spremenila. Poskusite se znova povezati.",
+	"pad.modals.looping.explanation": "Pri komunikaciji s sinhronizacijskim strežnikom je prišlo do težav.",
+	"pad.modals.looping.cause": "Morda ste se povezali skozi neustrezno nastavljen požarni zid ali prek posredniškega strežnika.",
 	"pad.modals.initsocketfail": "Strežnik je nedosegljiv.",
-	"pad.modals.initsocketfail.explanation": "Povezava s strežnikom za usklajevanje ni mogoča.",
-	"pad.modals.initsocketfail.cause": "Najverjetneje gre za težavo z vašim brskalnikom, ali internetno povezavo.",
+	"pad.modals.initsocketfail.explanation": "Povezovanje s sinhronizacijskim strežnikom ni uspelo.",
+	"pad.modals.initsocketfail.cause": "Najverjetneje gre za težavo z vašim brskalnikom ali internetno povezavo.",
 	"pad.modals.slowcommit.explanation": "Strežnik se ne odziva.",
 	"pad.modals.slowcommit.cause": "Možen vzrok so težave z omrežno povezljivostjo.",
-	"pad.modals.badChangeset.explanation": "Urejanje, ki ste ga naredili, je strežnik za usklajevanje označil kot nedovoljeno.",
-	"pad.modals.badChangeset.cause": "Razlog za to je morda napačna konfiguracija strežnika ali neko drugo nepričakovano vedenje. Prosimo, stopite v stik z skrbnikom storitve, če menite, da gre za napako. Poskusite se ponovno povezati, da nadaljujete z urejanjem.",
-	"pad.modals.corruptPad.explanation": "Dokument, do katerega želite dostopati, je poškodovan.",
-	"pad.modals.corruptPad.cause": "Razlog za to je morda napačna konfiguracija strežnika ali neko drugo nepričakovano vedenje. Prosimo, stopite v stik s skrbnikom storitve.",
+	"pad.modals.badChangeset.explanation": "Urejanje, ki ste ga naredili, je sinhronizacijski strežnik prepoznal kot nedovoljeno.",
+	"pad.modals.badChangeset.cause": "Razlog za to je morda napačna konfiguracija strežnika ali neko drugo nepričakovano vedenje. Če menite, da gre za napako, stopite v stik z administratorjem storitve. Za nadaljevanje urejanja se poskusite znova povezati.",
+	"pad.modals.corruptPad.explanation": "Blokec, do katerega želite dostopati, je poškodovan.",
+	"pad.modals.corruptPad.cause": "Razlog za to je morda napačna konfiguracija strežnika ali neko drugo nepričakovano vedenje. Prosimo, stopite v stik z administratorjem storitve.",
 	"pad.modals.deleted": "Izbrisano.",
-	"pad.modals.deleted.explanation": "Dokument je odstranjen.",
+	"pad.modals.deleted.explanation": "Blokec je odstranjen.",
+	"pad.modals.rateLimited": "Omejena hitrost.",
+	"pad.modals.rateLimited.explanation": "Na ta blokec ste poslali preveč sporočil, zato ste bili odklopljeni.",
+	"pad.modals.rejected.explanation": "Strežnik je zavrnil sporočilo, ki ga je poslal vaš brskalnik.",
+	"pad.modals.rejected.cause": "Strežnik je bil morda posodobljen, ko ste si ogledovali blokec, ali pa je v Etherpadu napaka. Poskusite znova naložiti stran.",
 	"pad.modals.disconnected": "Vaša povezava je bila prekinjena.",
 	"pad.modals.disconnected.explanation": "Povezava s strežnikom je bila izgubljena.",
-	"pad.modals.disconnected.cause": "Strežnik morda ni na voljo. Prosimo, obvestite skrbnika storitve, če se to zgodi večkrat.",
-	"pad.share": "Določi souporabo dokumenta",
+	"pad.modals.disconnected.cause": "Strežnik morda ni na voljo. Če se to ponavlja, obvestite administratorja storitve.",
+	"pad.share": "Deljenje blokca",
 	"pad.share.readonly": "Samo za branje",
 	"pad.share.link": "Povezava",
 	"pad.share.emebdcode": "URL za vključitev",
 	"pad.chat": "Klepet",
-	"pad.chat.title": "Odpri klepetalno okno dokumenta.",
+	"pad.chat.title": "Odpri klepetalno okno za blokec.",
 	"pad.chat.loadmessages": "Naloži več sporočil",
 	"pad.chat.stick.title": "Prilepi klepet na zaslon",
 	"pad.chat.writeMessage.placeholder": "Napišite sporočilo",
+	"timeslider.followContents": "Spremljajte posodobitve vsebine blokca",
 	"timeslider.pageTitle": "Časovni trak {{appTitle}}",
-	"timeslider.toolbar.returnbutton": "Vrni se na dokument",
+	"timeslider.toolbar.returnbutton": "Nazaj na blokec",
 	"timeslider.toolbar.authors": "Avtorji:",
 	"timeslider.toolbar.authorsList": "Ni določenih avtorjev",
 	"timeslider.toolbar.exportlink.title": "Izvozi",
 	"timeslider.exportCurrent": "Izvozi trenutno različico kot:",
 	"timeslider.version": "Različica {{version}}",
 	"timeslider.saved": "Shranjeno {{day}}.{{month}}.{{year}}",
-	"timeslider.playPause": "Predvajaj/začasno ustavi vsebino dokumenta",
-	"timeslider.backRevision": "Pojdi eno redakcijo nazaj v tem dokumentu",
-	"timeslider.forwardRevision": "Pojdi eno redakcijo naprej v tem dokumentu",
+	"timeslider.playPause": "Predvajaj/zaustavi vsebino blokca",
+	"timeslider.backRevision": "Pojdi v tem blokcu eno redakcijo nazaj",
+	"timeslider.forwardRevision": "Pojdi v tem blokcu eno redakcijo naprej",
 	"timeslider.dateformat": "{{day}}.{{month}}.{{year}} {{hours}}:{{minutes}}:{{seconds}}",
-	"timeslider.month.january": "Januar",
-	"timeslider.month.february": "Februar",
-	"timeslider.month.march": "Marec",
-	"timeslider.month.april": "April",
-	"timeslider.month.may": "Maj",
-	"timeslider.month.june": "Junij",
-	"timeslider.month.july": "Julij",
-	"timeslider.month.august": "August",
-	"timeslider.month.september": "September",
-	"timeslider.month.october": "Oktober",
-	"timeslider.month.november": "November",
-	"timeslider.month.december": "December",
+	"timeslider.month.january": "januarja",
+	"timeslider.month.february": "februarja",
+	"timeslider.month.march": "marca",
+	"timeslider.month.april": "aprila",
+	"timeslider.month.may": "maja",
+	"timeslider.month.june": "junija",
+	"timeslider.month.july": "julija",
+	"timeslider.month.august": "avgusta",
+	"timeslider.month.september": "septembra",
+	"timeslider.month.october": "oktobra",
+	"timeslider.month.november": "novembra",
+	"timeslider.month.december": "decembra",
 	"timeslider.unnamedauthors": "{{num}} {[plural(num) one: neimenovan avtor, plural(num) two: neimenovana avtorja, plural(num) few: neimenovani avtorji, other: neimenovanih avtorjev ]}",
 	"pad.savedrevs.marked": "Ta redakcija je zdaj označena kot shranjena redakcija",
-	"pad.savedrevs.timeslider": "Shranjene redakcije si lahko ogledate s pomočjo časovnega traku",
+	"pad.savedrevs.timeslider": "Shranjene redakcije si lahko ogledate z odprtjem časovnega traku",
 	"pad.userlist.entername": "Vnesite svoje ime",
 	"pad.userlist.unnamed": "neimenovana oseba",
-	"pad.editbar.clearcolors": "Ali naj se počistijo barve avtorstva v celotnem dokumentu? Tega ni mogoče razveljaviti.",
+	"pad.editbar.clearcolors": "Ali naj se počistijo barve avtorstva v vsem dokumentu? Tega ni mogoče razveljaviti.",
 	"pad.impexp.importbutton": "Uvozi takoj",
 	"pad.impexp.importing": "Poteka uvažanje ...",
-	"pad.impexp.confirmimport": "Uvoz datoteke prepiše obstoječe besedilo dokumenta. Ali ste prepričani, da želite nadaljevati?",
-	"pad.impexp.convertFailed": "Datoteke ni bilo mogoče uvoziti. Prosimo uporabite drug podprt zapis dokumenta ali pa vsebino prilepite ročno",
-	"pad.impexp.padHasData": "Nismo mogli uvoziti datoteke, ker dokument že vsebuje spremembe. Prosimo, uvozite datoteko v nov dokument",
+	"pad.impexp.confirmimport": "Uvoz datoteke bo prepisal obstoječe besedilo blokca. Ali res želite nadaljevati?",
+	"pad.impexp.convertFailed": "Datoteke ni bilo mogoče uvoziti. Prosimo, uporabite drug format dokumenta ali pa vsebino kopirajte in prilepite ročno.",
+	"pad.impexp.padHasData": "Datoteke ni bilo mogoče uvoziti, ker blokec že vsebuje spremembe. Prosimo, uvozite datoteko v nov blokec.",
 	"pad.impexp.uploadFailed": "Nalaganje je spodletelo, prosimo poskusite znova",
 	"pad.impexp.importfailed": "Uvoz je spodletel",
 	"pad.impexp.copypaste": "Vsebino kopirajte in prilepite",
-	"pad.impexp.exportdisabled": "Izvoz v zapis {{type}} je onemogočen. Za več podrobnosti stopite v stik s skrbnikom."
+	"pad.impexp.exportdisabled": "Izvoz v format {{type}} je onemogočen. Za več podrobnosti stopite v stik z administratorjem.",
+	"pad.impexp.maxFileSize": "Datoteka je prevelika. Za povečanje dovoljene velikosti datoteke za uvoz se obrnite na administratorja spletnega mesta"
 }

src/locales/sms.json

@@ -25,6 +25,7 @@
 	"pad.settings.chatandusers": "Čuäʹjet čääʹtt da õõʹnnʼjid",
 	"pad.settings.language": "Ǩiõll:",
 	"pad.settings.about": "Lââʹssteâđ",
+	"pad.settings.poweredBy": "Kääzzkõõzz vueiʹtlvâstt",
 	"pad.importExport.importSuccessful": "Oʹnnsti!",
 	"pad.importExport.exportetherpad": "Etherpad",
 	"pad.importExport.exporthtml": "HTML",
@@ -38,7 +39,7 @@
 	"pad.share": "Jueʼjj mošttʼtõspõʹmmai",
 	"pad.share.link": "Liŋkk",
 	"pad.chat": "Čäʹtt",
-	"pad.chat.writeMessage.placeholder": "Ǩeeʹrjet tuu saaǥǥ täzz",
+	"pad.chat.writeMessage.placeholder": "Ǩeeʹrjet jiijjad saaǥǥ täzz",
 	"timeslider.toolbar.returnbutton": "Määʹcc mošttʼtõspõʹmma",
 	"timeslider.version": "Versio {{version}}",
 	"timeslider.saved": "Ruõkkum {{month}} {{day}}. peeiʹv {{year}}",
@@ -55,5 +56,5 @@
 	"timeslider.month.october": "kålggmannu",
 	"timeslider.month.november": "skamm-mannu",
 	"timeslider.month.december": "rosttovmannu",
-	"pad.userlist.entername": "Ǩeeʹrjet tuu nõõm"
+	"pad.userlist.entername": "Ǩeeʹrjet jiijjad nõõm"
 }

src/locales/sq.json

@@ -7,7 +7,7 @@
 			"Liridon"
 		]
 	},
-	"admin.page-title": "Paneli i Administratorit - Etherpad",
+	"admin.page-title": "Pult Përgjegjësi - Etherpad",
 	"admin_plugins": "Përgjegjës shtojcash",
 	"admin_plugins.available": "Shtojca të gatshme",
 	"admin_plugins.available_not-found": "S’u gjetën shtojca.",
@@ -63,7 +63,7 @@
 	"pad.colorpicker.save": "Ruaje",
 	"pad.colorpicker.cancel": "Anuloje",
 	"pad.loading": "Po ngarkohet…",
-	"pad.noCookie": "S’u gjet dot cookie. Ju lutemi, lejoni cookie-t te shfletuesi juaj! Sesioni dhe rregullimet tuaja s’do të ruhen nga një sesion në tjetër. Kjo mund të vijë ngaqë Etherpad përfshihet brenda një iFrame në disa shfletues. Ju lutemi, sigurohuni që Etherpad-i të jetë në të njëjtën nënpërkatësi/përkatësi si iFrame-i mëmë.",
+	"pad.noCookie": "S’u gjet dot cookie. Ju lutemi, lejoni cookie-t te shfletuesi juaj! Sesioni dhe rregullimet tuaja s’do të ruhen nga një sesion në tjetër. Kjo mund të vijë ngaqë, në disa shfletues, Etherpad përfshihet brenda një iFrame. Ju lutemi, sigurohuni që Etherpad-i të jetë në të njëjtën nënpërkatësi/përkatësi si iFrame-i mëmë.",
 	"pad.permissionDenied": "S’keni leje të hyni në këtë bllok",
 	"pad.settings.padSettings": "Rregullime Blloku",
 	"pad.settings.myView": "Pamja Ime",
@@ -78,7 +78,7 @@
 	"pad.settings.about": "Mbi",
 	"pad.settings.poweredBy": "Bazuar në",
 	"pad.importExport.import_export": "Import/Eksport",
-	"pad.importExport.import": "Ngarkoni cilëndo kartelë teksti ose dokument",
+	"pad.importExport.import": "Ngarkoni cilëndo kartelë tekst ose dokument",
 	"pad.importExport.importSuccessful": "Me sukses!",
 	"pad.importExport.export": "Eksportojeni bllokun e tanishëm si:",
 	"pad.importExport.exportetherpad": "Etherpad",

src/locales/sr-ec.json

@@ -9,6 +9,7 @@
 			"Obsuser",
 			"Srdjan m",
 			"Srđan",
+			"Zenfiric",
 			"Милан Јелисавчић"
 		]
 	},
@@ -34,7 +35,6 @@
 	"pad.colorpicker.save": "Сачувај",
 	"pad.colorpicker.cancel": "Откажи",
 	"pad.loading": "Учитавам…",
-	"pad.noCookie": "Колачић није пронађен. Молимо да укључите колачиће у вашем прегледавачу!",
 	"pad.permissionDenied": "Немате дозволу да приступите овом паду",
 	"pad.settings.padSettings": "Подешавања пада",
 	"pad.settings.myView": "Мој приказ",

src/locales/sro.json

@@ -0,0 +1,162 @@
+{
+	"@metadata": {
+		"authors": [
+			"Adr mm",
+			"F Samaritani"
+		]
+	},
+	"admin.page-title": "Pannellu amministrativu - Etherpad",
+	"admin_plugins": "Gestore de connetores",
+	"admin_plugins.available": "Connetores a disponimentu",
+	"admin_plugins.available_not-found": "Nissunu connetore a disponimentu",
+	"admin_plugins.available_fetching": "Recuperende...",
+	"admin_plugins.available_install.value": "Installa",
+	"admin_plugins.available_search.placeholder": "Chirca connetores de installare",
+	"admin_plugins.description": "Descritzione",
+	"admin_plugins.installed": "Connetores installados",
+	"admin_plugins.installed_fetching": "Recuperende connetores installados...",
+	"admin_plugins.installed_nothing": "No as installadu ancora nissunu connetore.",
+	"admin_plugins.installed_uninstall.value": "Disinstalla",
+	"admin_plugins.last-update": "Ùrtima atualizatzione",
+	"admin_plugins.name": "Nòmine",
+	"admin_plugins.page-title": "Gestore de connetores - Etherpad",
+	"admin_plugins.version": "Versione",
+	"admin_plugins_info": "Informatzione pro sa risolutzione de problemas",
+	"admin_plugins_info.parts": "Partes installadas",
+	"admin_plugins_info.plugins": "Connetores installados",
+	"admin_plugins_info.page-title": "Informatzione de su connetore - Etherpad",
+	"admin_plugins_info.version": "Versione de Etherpad",
+	"admin_plugins_info.version_latest": "Ùrtima versione a disponimentu",
+	"admin_plugins_info.version_number": "Nùmeru de versione",
+	"admin_settings": "Cunfiguratzione",
+	"admin_settings.current": "Cunfiguratzione atuale",
+	"admin_settings.current_restart.value": "Torra a aviare Etherpad",
+	"admin_settings.current_save.value": "Sarva sa cunfiguratzione",
+	"admin_settings.page-title": "Cunfiguratzione - Etherpad",
+	"index.newPad": "Pad nou",
+	"index.createOpenPad": "o crea/aberi unu pad cun su nòmine:",
+	"index.openPad": "aberi unu pad esistente cun su nòmine:",
+	"pad.toolbar.bold.title": "Grassetu (Ctrl+B)",
+	"pad.toolbar.italic.title": "Cursivu (Ctrl+I)",
+	"pad.toolbar.underline.title": "Sutaliniadu (Ctrl+U)",
+	"pad.toolbar.strikethrough.title": "Istangadu (Ctrl+5)",
+	"pad.toolbar.ol.title": "Lista numerada (Ctrl+Shift+N)",
+	"pad.toolbar.ul.title": "Lista cun puntos (Ctrl+Shift+L)",
+	"pad.toolbar.indent.title": "Indentatzione a dereta (Tab)",
+	"pad.toolbar.unindent.title": "Indentatzione a manca (Shift+Tab)",
+	"pad.toolbar.undo.title": "Iscontza (Ctrl+Z)",
+	"pad.toolbar.redo.title": "Torra a fàghere (Ctrl+Y)",
+	"pad.toolbar.clearAuthorship.title": "Lìmpia is colores de autoria (Ctrl+Shift+C)",
+	"pad.toolbar.import_export.title": "Importa/esporta dae/a formados de archìviu diferentes",
+	"pad.toolbar.timeslider.title": "Presentatzione cronologia",
+	"pad.toolbar.savedRevision.title": "Sarva sa versione",
+	"pad.toolbar.settings.title": "Cunfiguratzione",
+	"pad.toolbar.embed.title": "Cumpartzi e incòrpora custu Pad",
+	"pad.toolbar.showusers.title": "Ammustra is utentes in custu Pad",
+	"pad.colorpicker.save": "Sarva",
+	"pad.colorpicker.cancel": "Annulla",
+	"pad.loading": "Carrighende...",
+	"pad.noCookie": "Su testimòngiu no est istètiu agatadu. Permite is testimòngios in su navigadore tuo. Sa sessione e sa cunfiguratzione tuas no ant a èssere sarvadas intre bìsitas. Podet èssere pro more de s'inclusione de Etherpad comente iFrame in tzertos navigadores. Assegura·ti chi Etherpad s'agatat in su pròpiu sutadomìniu/domìniu chi s'iFrame printzipale",
+	"pad.permissionDenied": "Non tenes permissu pro atzèdere a custu pad",
+	"pad.settings.padSettings": "Cunfiguratzione de su pad",
+	"pad.settings.myView": "Sa visualizatzione mia",
+	"pad.settings.stickychat": "Ammustra semper sa tzarrada",
+	"pad.settings.chatandusers": "Ammustra sa tzarrada e is utentes",
+	"pad.settings.colorcheck": "Colores de autoria",
+	"pad.settings.linenocheck": "Nùmeros de lìnia",
+	"pad.settings.rtlcheck": "Cuntenutu dae manca a dereta",
+	"pad.settings.fontType": "Tipu de caràtere:",
+	"pad.settings.fontType.normal": "Normale",
+	"pad.settings.language": "Lìngua:",
+	"pad.settings.about": "Informatziones",
+	"pad.settings.poweredBy": "Realizadu cun",
+	"pad.importExport.import_export": "Importatzione/esportatzione",
+	"pad.importExport.import": "Càrriga un'archìviu de testu o unu documentu",
+	"pad.importExport.importSuccessful": "Carrigadu.",
+	"pad.importExport.export": "Esporta su pad atuale comente:",
+	"pad.importExport.exportetherpad": "Etherpad",
+	"pad.importExport.exporthtml": "HTML",
+	"pad.importExport.exportplain": "Testu sèmplitze",
+	"pad.importExport.exportword": "Microsoft Word",
+	"pad.importExport.exportpdf": "PDF",
+	"pad.importExport.exportopen": "ODF (Open Document Format)",
+	"pad.importExport.abiword.innerHTML": "Isceti is formados de testu sèmplitze o HTML podent èssere importados. Pro mètodos avantzados de importatzione, <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-with-AbiWord\">installa AbiWord o LibreOffice</a>.",
+	"pad.modals.connected": "Connètidu.",
+	"pad.modals.reconnecting": "Connetende a su pad tuo...",
+	"pad.modals.forcereconnect": "Fortza sa connesione",
+	"pad.modals.reconnecttimer": "Torrende a connètere in",
+	"pad.modals.cancel": "Annulla",
+	"pad.modals.userdup": "Abertu in un'àtera ventana",
+	"pad.modals.userdup.explanation": "Podet èssere chi custu pad siat abertu in un'àtera ischeda de custu navigadore in custu ordinadore.",
+	"pad.modals.userdup.advice": "Torra a connètere pro impreare custa ventana.",
+	"pad.modals.unauth": "Chena autorizatzione",
+	"pad.modals.unauth.explanation": "Is permissos tuos funt istètios cambiados in su mentras chi fias bidende custa pàgina. Prova de ti torrare a connètere.",
+	"pad.modals.looping.explanation": "Nci funt problemas de comunicatzione cun su serbidore de sincronizatzione.",
+	"pad.modals.looping.cause": "Forsis sa connessione at impreadu unu serbidore intermediàriu (proxy) o unu firewall chi no est cumpatìbile.",
+	"pad.modals.initsocketfail": "Su serbidore no est atzessìbile.",
+	"pad.modals.initsocketfail.explanation": "Impossìbile connètere cun su serbidore de sincronizatzione.",
+	"pad.modals.initsocketfail.cause": "Podet èssere a càusa de unu problema cun su navigadore tuo o cun sa connessione de internet.",
+	"pad.modals.slowcommit.explanation": "Su serbidore non rispondet.",
+	"pad.modals.slowcommit.cause": "Podet èssere a càusa de problemas cun sa connessione de internet.",
+	"pad.modals.badChangeset.explanation": "Una modìfica tua est istètia cunsiderada illegale dae su serbidore de sincronizatzione.",
+	"pad.modals.badChangeset.cause": "Podet èssere a càusa de una cunfiguratzione de serbidore isballiada o calicunu àteru cumportamentu imprevistu. Iscrie a s'amministratzione de su servìtziu si pensas chi siat un'errore. Prova a connètere torra pro sighire a modificare.",
+	"pad.modals.corruptPad.explanation": "Su pad a su chi ses chirchende de atzèdere est dannadu.",
+	"pad.modals.corruptPad.cause": "Podet èssere a càusa de una cunfiguratzione de serbidore non curreta o pro unu cumportamentu imprevistu. Iscrie a s'amministratzione de su servìtziu.",
+	"pad.modals.deleted": "Cantzelladu.",
+	"pad.modals.deleted.explanation": "Pad cantzelladu.",
+	"pad.modals.rateLimited.explanation": "As imbiadu tropu messàgios a custu pad e t'at disconnètidu.",
+	"pad.modals.rejected.explanation": "Su serbidore at rifiutadu unu messàgiu imbiadu dae su navigadore tuo.",
+	"pad.modals.rejected.cause": "Podet èssere chi su serbidore siat istètiu atualizadu in su mentras chi fias bidende su pad, o podet èssere chi nci siat un'errore in Etherpad. Prova a atualizare sa pàgina.",
+	"pad.modals.disconnected": "Disconnètidu.",
+	"pad.modals.disconnected.explanation": "Connessione cun su serbidore pèrdida.",
+	"pad.modals.disconnected.cause": "Su serbidore no est a disponimentu. Iscrie a s'amministratzione de su servìtziu si su problema persistet.",
+	"pad.share": "Cumpartzi custu pad",
+	"pad.share.link": "Ligòngiu",
+	"pad.share.emebdcode": "Incòrpora URL",
+	"pad.chat": "Tzarrada",
+	"pad.chat.title": "Aberi sa tzarrada pro custu pad.",
+	"pad.chat.loadmessages": "Càrriga àteros messàgios",
+	"pad.chat.stick.title": "Apica sa tzarrada in s'ischermu",
+	"pad.chat.writeMessage.placeholder": "Iscrie su messàgiu tuo inoghe",
+	"timeslider.followContents": "Sighi is atualizatziones de cuntenutu de su pad",
+	"timeslider.pageTitle": "Cronologia {{appTitle}}",
+	"timeslider.toolbar.returnbutton": "Torra a su pad",
+	"timeslider.toolbar.authors": "Autores:",
+	"timeslider.toolbar.authorsList": "Nissunu autore",
+	"timeslider.toolbar.exportlink.title": "Esporta",
+	"timeslider.exportCurrent": "Esporta sa versione atuale comente:",
+	"timeslider.version": "Versione {{version}}",
+	"timeslider.saved": "Sarvadu su {{day}} de {{month}} de su {{year}}",
+	"timeslider.playPause": "Riprodutzione/pàusa de is cuntenutos de su pad",
+	"timeslider.backRevision": "Bae a una versione pretzedente de custu pad",
+	"timeslider.forwardRevision": "Bae a una versione imbeniente de custu pad",
+	"timeslider.dateformat": "{{day}}/{{month}}/{{year}} {{hours}}:{{minutes}}:{{seconds}}",
+	"timeslider.month.january": "Ghennàrgiu",
+	"timeslider.month.february": "Freàrgiu",
+	"timeslider.month.march": "Martzu",
+	"timeslider.month.april": "Abrile",
+	"timeslider.month.may": "Maju",
+	"timeslider.month.june": "Làmpadas",
+	"timeslider.month.july": "Mese de argiolas",
+	"timeslider.month.august": "Austu",
+	"timeslider.month.september": "Cabudanni",
+	"timeslider.month.october": "Ledàmine",
+	"timeslider.month.november": "Onniasantu",
+	"timeslider.month.december": "Mese de idas",
+	"timeslider.unnamedauthors": "{{num}} {[plural(num) one: autore, other: autores ]} chena nòmine",
+	"pad.savedrevs.marked": "Custa revisione est istètia marcada comente revisione sarvada",
+	"pad.savedrevs.timeslider": "Podes bìdere is versiones sarvadas bisitende sa cronologia",
+	"pad.userlist.entername": "Inserta su nòmine tuo",
+	"pad.userlist.unnamed": "Chena nòmine",
+	"pad.editbar.clearcolors": "Seguru chi boles limpiare is colores de autoria de totu su documentu? Custa atzione no dda podes annullare",
+	"pad.impexp.importbutton": "Importa immoe",
+	"pad.impexp.importing": "Importende...",
+	"pad.impexp.confirmimport": "S'importatzione de un'archìviu at a subraiscrìere su testu atuale de su pad. Seguru chi boles sighire?",
+	"pad.impexp.convertFailed": "Impossìbile importare custu archìviu. Imprea unu formadu de documentu diferente o còpia e incolla a manu",
+	"pad.impexp.padHasData": "Impossìbile importare custu archìviu pro ite custu pad est istètiu giai modificadu. Importa·ddu in unu pad nou",
+	"pad.impexp.uploadFailed": "Errore in sa càrriga. Torra a provare",
+	"pad.impexp.importfailed": "Errore de importatzione",
+	"pad.impexp.copypaste": "Còpia e incolla",
+	"pad.impexp.exportdisabled": "S'esportatzione comente {{type}} est disativada. Iscrie a s'amministratzione de su sistema pro àteras informatziones.",
+	"pad.impexp.maxFileSize": "S'archìviu est tropu manu. Iscrie a s'amministratzione pro ismanniare sa dimensione permìtida pro s'importatzione"
+}

src/locales/zh-hans.json

@@ -2,6 +2,7 @@
 	"@metadata": {
 		"authors": [
 			"94rain",
+			"Cosing",
 			"Dimension",
 			"GuoPC",
 			"Hydra",
@@ -168,7 +169,7 @@
 	"timeslider.month.december": "12月",
 	"timeslider.unnamedauthors": "{{num}}个匿名作者",
 	"pad.savedrevs.marked": "这一修订现在被标记为已保存的修订版本",
-	"pad.savedrevs.timeslider": "您可以使用时间滑块查阅已保存的版本",
+	"pad.savedrevs.timeslider": "您可以使用时间轴查阅已保存的版本",
 	"pad.userlist.entername": "输入您的姓名",
 	"pad.userlist.unnamed": "匿名",
 	"pad.editbar.clearcolors": "清除整个文档的作者颜色吗？此操作无法撤消",

src/locales/zh-hant.json

@@ -9,7 +9,8 @@
 			"Shangkuanlc",
 			"Shirayuki",
 			"Simon Shek",
-			"Wehwei"
+			"Wehwei",
+			"Winston Sung"
 		]
 	},
 	"admin.page-title": "管理員面板 - Etherpad",
@@ -134,7 +135,7 @@
 	"pad.chat.writeMessage.placeholder": "在此編寫您的訊息",
 	"timeslider.followContents": "關注記事本內容更新",
 	"timeslider.pageTitle": "{{appTitle}}時間軸",
-	"timeslider.toolbar.returnbutton": "返回到記事本",
+	"timeslider.toolbar.returnbutton": "返回記事本",
 	"timeslider.toolbar.authors": "協作者：",
 	"timeslider.toolbar.authorsList": "無協作者",
 	"timeslider.toolbar.exportlink.title": "匯出",

src/node/db/API.js

@@ -33,6 +33,7 @@ const exportTxt = require('../utils/ExportTxt');
 const importHtml = require('../utils/ImportHtml');
 const cleanText = require('./Pad').cleanText;
 const PadDiff = require('../utils/padDiff');
+const {checkValidRev, isInt} = require('../utils/checkValidRev');
 
 /* ********************
  * GROUP FUNCTIONS ****
@@ -192,6 +193,13 @@ Example returns:
 {code: 1, message:"padID does not exist", data: null}
 {code: 1, message:"text too long", data: null}
 */
+/**
+ *
+ * @param {String} padID the id of the pad
+ * @param {String} text the text of the pad
+ * @param {String} authorId the id of the author, defaulting to empty string
+ * @returns {Promise<void>}
+ */
 exports.setText = async (padID, text, authorId = '') => {
   // text is required
   if (typeof text !== 'string') {
@@ -213,7 +221,10 @@ Example returns:
 {code: 0, message:"ok", data: null}
 {code: 1, message:"padID does not exist", data: null}
 {code: 1, message:"text too long", data: null}
-*/
+ @param {String} padID the id of the pad
+ @param {String} text the text of the pad
+ @param {String} authorId the id of the author, defaulting to empty string
+ */
 exports.appendText = async (padID, text, authorId = '') => {
   // text is required
   if (typeof text !== 'string') {
@@ -232,6 +243,9 @@ Example returns:
 
 {code: 0, message:"ok", data: {text:"Welcome <strong>Text</strong>"}}
 {code: 1, message:"padID does not exist", data: null}
+ @param {String} padID the id of the pad
+ @param {String} rev the revision number, defaulting to the latest revision
+ @return {Promise<{html: string}>} the html of the pad
 */
 exports.getHTML = async (padID, rev) => {
   if (rev !== undefined) {
@@ -264,6 +278,10 @@ Example returns:
 
 {code: 0, message:"ok", data: null}
 {code: 1, message:"padID does not exist", data: null}
+
+ @param {String} padID the id of the pad
+ @param {String} html the html of the pad
+ @param {String} authorId the id of the author, defaulting to empty string
 */
 exports.setHTML = async (padID, html, authorId = '') => {
   // html string is required
@@ -302,6 +320,9 @@ Example returns:
 {code: 1, message:"start is higher or equal to the current chatHead", data: null}
 
 {code: 1, message:"padID does not exist", data: null}
+ @param {String} padID the id of the pad
+ @param {Number} start the start point of the chat-history
+ @param {Number} end the end point of the chat-history
 */
 exports.getChatHistory = async (padID, start, end) => {
   if (start && end) {
@@ -348,6 +369,10 @@ Example returns:
 
 {code: 0, message:"ok", data: null}
 {code: 1, message:"padID does not exist", data: null}
+ @param {String} padID the id of the pad
+ @param {String} text the text of the chat-message
+ @param {String} authorID the id of the author
+ @param {Number} time the timestamp of the chat-message
 */
 exports.appendChatMessage = async (padID, text, authorID, time) => {
   // text is required
@@ -377,6 +402,7 @@ Example returns:
 
 {code: 0, message:"ok", data: {revisions: 56}}
 {code: 1, message:"padID does not exist", data: null}
+ @param {String} padID the id of the pad
 */
 exports.getRevisionsCount = async (padID) => {
   // get the pad
@@ -391,6 +417,7 @@ Example returns:
 
 {code: 0, message:"ok", data: {savedRevisions: 42}}
 {code: 1, message:"padID does not exist", data: null}
+ @param {String} padID the id of the pad
 */
 exports.getSavedRevisionsCount = async (padID) => {
   // get the pad
@@ -405,6 +432,7 @@ Example returns:
 
 {code: 0, message:"ok", data: {savedRevisions: [2, 42, 1337]}}
 {code: 1, message:"padID does not exist", data: null}
+ @param {String} padID the id of the pad
 */
 exports.listSavedRevisions = async (padID) => {
   // get the pad
@@ -419,6 +447,8 @@ Example returns:
 
 {code: 0, message:"ok", data: null}
 {code: 1, message:"padID does not exist", data: null}
+    @param {String} padID the id of the pad
+     @param {Number} rev the revision number, defaulting to the latest revision
 */
 exports.saveRevision = async (padID, rev) => {
   // check if rev is a number
@@ -450,6 +480,8 @@ Example returns:
 
 {code: 0, message:"ok", data: {lastEdited: 1340815946602}}
 {code: 1, message:"padID does not exist", data: null}
+    @param {String} padID the id of the pad
+ @return {Promise<{lastEdited: number}>} the timestamp of the last revision of the pad
 */
 exports.getLastEdited = async (padID) => {
   // get the pad
@@ -465,6 +497,9 @@ Example returns:
 
 {code: 0, message:"ok", data: null}
 {code: 1, message:"pad does already exist", data: null}
+ @param {String} padName the name of the new pad
+    @param {String} text the initial text of the pad
+     @param {String} authorId the id of the author, defaulting to empty string
 */
 exports.createPad = async (padID, text, authorId = '') => {
   if (padID) {
@@ -490,6 +525,7 @@ Example returns:
 
 {code: 0, message:"ok", data: null}
 {code: 1, message:"padID does not exist", data: null}
+ @param {String} padID the id of the pad
 */
 exports.deletePad = async (padID) => {
   const pad = await getPadSafe(padID, true);
@@ -503,6 +539,9 @@ exports.deletePad = async (padID) => {
 
  {code:0, message:"ok", data:null}
  {code: 1, message:"padID does not exist", data: null}
+ @param {String} padID the id of the pad
+ @param {Number} rev the revision number, defaulting to the latest revision
+ @param {String} authorId the id of the author, defaulting to empty string
  */
 exports.restoreRevision = async (padID, rev, authorId = '') => {
   // check if rev is a number
@@ -567,6 +606,9 @@ Example returns:
 
 {code: 0, message:"ok", data: {padID: destinationID}}
 {code: 1, message:"padID does not exist", data: null}
+ @param {String} sourceID the id of the source pad
+ @param {String} destinationID the id of the destination pad
+ @param {Boolean} force whether to overwrite the destination pad if it exists
 */
 exports.copyPad = async (sourceID, destinationID, force) => {
   const pad = await getPadSafe(sourceID, true);
@@ -581,6 +623,10 @@ Example returns:
 
 {code: 0, message:"ok", data: {padID: destinationID}}
 {code: 1, message:"padID does not exist", data: null}
+ @param {String} sourceID the id of the source pad
+ @param {String} destinationID the id of the destination pad
+ @param {Boolean} force whether to overwrite the destination pad if it exists
+ @param {String} authorId the id of the author, defaulting to empty string
 */
 exports.copyPadWithoutHistory = async (sourceID, destinationID, force, authorId = '') => {
   const pad = await getPadSafe(sourceID, true);
@@ -595,6 +641,9 @@ Example returns:
 
 {code: 0, message:"ok", data: {padID: destinationID}}
 {code: 1, message:"padID does not exist", data: null}
+ @param {String} sourceID the id of the source pad
+ @param {String} destinationID the id of the destination pad
+ @param {Boolean} force whether to overwrite the destination pad if it exists
 */
 exports.movePad = async (sourceID, destinationID, force) => {
   const pad = await getPadSafe(sourceID, true);
@@ -609,6 +658,7 @@ Example returns:
 
 {code: 0, message:"ok", data: null}
 {code: 1, message:"padID does not exist", data: null}
+ @param {String} padID the id of the pad
 */
 exports.getReadOnlyID = async (padID) => {
   // we don't need the pad object, but this function does all the security stuff for us
@@ -627,6 +677,7 @@ Example returns:
 
 {code: 0, message:"ok", data: {padID: padID}}
 {code: 1, message:"padID does not exist", data: null}
+    @param {String} roID the readonly id of the pad
 */
 exports.getPadID = async (roID) => {
   // get the PadId
@@ -645,6 +696,8 @@ Example returns:
 
 {code: 0, message:"ok", data: null}
 {code: 1, message:"padID does not exist", data: null}
+    @param {String} padID the id of the pad
+     @param {Boolean} publicStatus the public status of the pad
 */
 exports.setPublicStatus = async (padID, publicStatus) => {
   // ensure this is a group pad
@@ -668,6 +721,7 @@ Example returns:
 
 {code: 0, message:"ok", data: {publicStatus: true}}
 {code: 1, message:"padID does not exist", data: null}
+     @param {String} padID the id of the pad
 */
 exports.getPublicStatus = async (padID) => {
   // ensure this is a group pad
@@ -685,6 +739,7 @@ Example returns:
 
 {code: 0, message:"ok", data: {authorIDs : ["a.s8oes9dhwrvt0zif", "a.akf8finncvomlqva"]}
 {code: 1, message:"padID does not exist", data: null}
+     @param {String} padID the id of the pad
 */
 exports.listAuthorsOfPad = async (padID) => {
   // get the pad
@@ -714,6 +769,8 @@ Example returns:
 
 {code: 0, message:"ok"}
 {code: 1, message:"padID does not exist"}
+     @param {String} padID the id of the pad
+     @param {String} msg the message to send
 */
 
 exports.sendClientsMessage = async (padID, msg) => {
@@ -739,6 +796,8 @@ Example returns:
 
 {code: 0, message:"ok", data: {chatHead: 42}}
 {code: 1, message:"padID does not exist", data: null}
+     @param {String} padID the id of the pad
+     @return {Promise<{chatHead: number}>} the chatHead of the pad
 */
 exports.getChatHead = async (padID) => {
   // get the pad
@@ -762,7 +821,9 @@ Example returns:
   }
 }
 {"code":4,"message":"no or wrong API Key","data":null}
-
+  @param {String} padID the id of the pad
+ @param {Number} startRev the start revision number
+ @param {Number} endRev the end revision number
 */
 exports.createDiffHTML = async (padID, startRev, endRev) => {
   // check if startRev is a number
@@ -777,6 +838,11 @@ exports.createDiffHTML = async (padID, startRev, endRev) => {
 
   // get the pad
   const pad = await getPadSafe(padID, true);
+  const headRev = pad.getHeadRevisionNumber();
+  if (startRev > headRev) startRev = headRev;
+
+  if (endRev > headRev) endRev = headRev;
+
   let padDiff;
   try {
     padDiff = new PadDiff(pad, startRev, endRev);
@@ -802,7 +868,6 @@ exports.createDiffHTML = async (padID, startRev, endRev) => {
  {"code":0,"message":"ok","data":{"totalPads":3,"totalSessions": 2,"totalActivePads": 1}}
  {"code":4,"message":"no or wrong API Key","data":null}
  */
-
 exports.getStats = async () => {
   const sessionInfos = padMessageHandler.sessioninfos;
 
@@ -822,9 +887,6 @@ exports.getStats = async () => {
  ** INTERNAL HELPER FUNCTIONS *
  **************************** */
 
-// checks if a number is an int
-const isInt = (value) => (parseFloat(value) === parseInt(value, 10)) && !isNaN(value);
-
 // gets a pad safe
 const getPadSafe = async (padID, shouldExist, text, authorId = '') => {
   // check if padID is a string
@@ -854,31 +916,6 @@ const getPadSafe = async (padID, shouldExist, text, authorId = '') => {
   return padManager.getPad(padID, text, authorId);
 };
 
-// checks if a rev is a legal number
-// pre-condition is that `rev` is not undefined
-const checkValidRev = (rev) => {
-  if (typeof rev !== 'number') {
-    rev = parseInt(rev, 10);
-  }
-
-  // check if rev is a number
-  if (isNaN(rev)) {
-    throw new CustomError('rev is not a number', 'apierror');
-  }
-
-  // ensure this is not a negative number
-  if (rev < 0) {
-    throw new CustomError('rev is not a negative number', 'apierror');
-  }
-
-  // ensure this is not a float value
-  if (!isInt(rev)) {
-    throw new CustomError('rev is a float value', 'apierror');
-  }
-
-  return rev;
-};
-
 // checks if a padID is part of a group
 const checkGroupPad = (padID, field) => {
   // ensure this is a group pad

src/node/db/AuthorManager.js

@@ -93,6 +93,7 @@ exports.getColorPalette = () => [
 
 /**
  * Checks if the author exists
+ * @param {String} authorID The id of the author
  */
 exports.doesAuthorExist = async (authorID) => {
   const author = await db.get(`globalAuthor:${authorID}`);
@@ -100,50 +101,12 @@ exports.doesAuthorExist = async (authorID) => {
   return author != null;
 };
 
-/* exported for backwards compatibility */
+/**
+ exported for backwards compatibility
+ @param {String} authorID The id of the author
+  */
 exports.doesAuthorExists = exports.doesAuthorExist;
 
-const getAuthor4Token = async (token) => {
-  const author = await mapAuthorWithDBKey('token2author', token);
-
-  // return only the sub value authorID
-  return author ? author.authorID : author;
-};
-
-exports.getAuthorId = async (token, user) => {
-  const context = {dbKey: token, token, user};
-  let [authorId] = await hooks.aCallFirst('getAuthorId', context);
-  if (!authorId) authorId = await getAuthor4Token(context.dbKey);
-  return authorId;
-};
-
-/**
- * Returns the AuthorID for a token.
- *
- * @deprecated Use `getAuthorId` instead.
- * @param {String} token The token
- */
-exports.getAuthor4Token = async (token) => {
-  warnDeprecated(
-      'AuthorManager.getAuthor4Token() is deprecated; use AuthorManager.getAuthorId() instead');
-  return await getAuthor4Token(token);
-};
-
-/**
- * Returns the AuthorID for a mapper.
- * @param {String} token The mapper
- * @param {String} name The name of the author (optional)
- */
-exports.createAuthorIfNotExistsFor = async (authorMapper, name) => {
-  const author = await mapAuthorWithDBKey('mapper2author', authorMapper);
-
-  if (name) {
-    // set the name of this author
-    await exports.setAuthorName(author.authorID, name);
-  }
-
-  return author;
-};
 
 /**
  * Returns the AuthorID for a mapper. We can map using a mapperkey,
@@ -174,6 +137,60 @@ const mapAuthorWithDBKey = async (mapperkey, mapper) => {
   return {authorID: author};
 };
 
+/**
+ * Returns the AuthorID for a token.
+ * @param {String} token The token of the author
+ * @return {Promise<string|*|{authorID: string}|{authorID: *}>}
+ */
+const getAuthor4Token = async (token) => {
+  const author = await mapAuthorWithDBKey('token2author', token);
+
+  // return only the sub value authorID
+  return author ? author.authorID : author;
+};
+
+/**
+ * Returns the AuthorID for a token.
+ * @param {String} token
+ * @param {Object} user
+ * @return {Promise<*>}
+ */
+exports.getAuthorId = async (token, user) => {
+  const context = {dbKey: token, token, user};
+  let [authorId] = await hooks.aCallFirst('getAuthorId', context);
+  if (!authorId) authorId = await getAuthor4Token(context.dbKey);
+  return authorId;
+};
+
+/**
+ * Returns the AuthorID for a token.
+ *
+ * @deprecated Use `getAuthorId` instead.
+ * @param {String} token The token
+ */
+exports.getAuthor4Token = async (token) => {
+  warnDeprecated(
+      'AuthorManager.getAuthor4Token() is deprecated; use AuthorManager.getAuthorId() instead');
+  return await getAuthor4Token(token);
+};
+
+/**
+ * Returns the AuthorID for a mapper.
+ * @param {String} authorMapper The mapper
+ * @param {String} name The name of the author (optional)
+ */
+exports.createAuthorIfNotExistsFor = async (authorMapper, name) => {
+  const author = await mapAuthorWithDBKey('mapper2author', authorMapper);
+
+  if (name) {
+    // set the name of this author
+    await exports.setAuthorName(author.authorID, name);
+  }
+
+  return author;
+};
+
+
 /**
  * Internal function that creates the database entry for an author
  * @param {String} name The name of the author
@@ -231,7 +248,7 @@ exports.setAuthorName = async (author, name) => await db.setSub(
 
 /**
  * Returns an array of all pads this author contributed to
- * @param {String} author The id of the author
+ * @param {String} authorID The id of the author
  */
 exports.listPadsOfAuthor = async (authorID) => {
   /* There are two other places where this array is manipulated:
@@ -255,7 +272,7 @@ exports.listPadsOfAuthor = async (authorID) => {
 
 /**
  * Adds a new pad to the list of contributions
- * @param {String} author The id of the author
+ * @param {String} authorID The id of the author
  * @param {String} padID The id of the pad the author contributes to
  */
 exports.addPad = async (authorID, padID) => {
@@ -282,7 +299,7 @@ exports.addPad = async (authorID, padID) => {
 
 /**
  * Removes a pad from the list of contributions
- * @param {String} author The id of the author
+ * @param {String} authorID The id of the author
  * @param {String} padID The id of the pad the author contributes to
  */
 exports.removePad = async (authorID, padID) => {

src/node/db/GroupManager.js

@@ -25,6 +25,10 @@ const db = require('./DB');
 const padManager = require('./PadManager');
 const sessionManager = require('./SessionManager');
 
+/**
+ * Lists all groups
+ * @return {Promise<{groupIDs: string[]}>} The ids of all groups
+ */
 exports.listAllGroups = async () => {
   let groups = await db.get('groups');
   groups = groups || {};
@@ -33,6 +37,11 @@ exports.listAllGroups = async () => {
   return {groupIDs};
 };
 
+/**
+ * Deletes a group and all associated pads
+ * @param {String} groupID The id of the group
+ * @return {Promise<void>} Resolves when the group is deleted
+ */
 exports.deleteGroup = async (groupID) => {
   const group = await db.get(`group:${groupID}`);
 
@@ -68,6 +77,11 @@ exports.deleteGroup = async (groupID) => {
   await db.remove(`group:${groupID}`);
 };
 
+/**
+ * Checks if a group exists
+ * @param {String} groupID the id of the group to delete
+ * @return {Promise<boolean>} Resolves to true if the group exists
+ */
 exports.doesGroupExist = async (groupID) => {
   // try to get the group entry
   const group = await db.get(`group:${groupID}`);
@@ -75,6 +89,10 @@ exports.doesGroupExist = async (groupID) => {
   return (group != null);
 };
 
+/**
+ * Creates a new group
+ * @return {Promise<{groupID: string}>} the id of the new group
+ */
 exports.createGroup = async () => {
   const groupID = `g.${randomString(16)}`;
   await db.set(`group:${groupID}`, {pads: {}, mappings: {}});
@@ -85,6 +103,11 @@ exports.createGroup = async () => {
   return {groupID};
 };
 
+/**
+ * Creates a new group if it does not exist already and returns the group ID
+ * @param groupMapper the mapper of the group
+ * @return {Promise<{groupID: string}|{groupID: *}>} a promise that resolves to the group ID
+ */
 exports.createGroupIfNotExistsFor = async (groupMapper) => {
   if (typeof groupMapper !== 'string') {
     throw new CustomError('groupMapper is not a string', 'apierror');
@@ -103,6 +126,14 @@ exports.createGroupIfNotExistsFor = async (groupMapper) => {
   return result;
 };
 
+/**
+ * Creates a group pad
+ * @param {String} groupID The id of the group
+ * @param {String} padName The name of the pad
+ * @param {String} text The text of the pad
+ * @param {String} authorId The id of the author
+ * @return {Promise<{padID: string}>} a promise that resolves to the id of the new pad
+ */
 exports.createGroupPad = async (groupID, padName, text, authorId = '') => {
   // create the padID
   const padID = `${groupID}$${padName}`;
@@ -131,6 +162,11 @@ exports.createGroupPad = async (groupID, padName, text, authorId = '') => {
   return {padID};
 };
 
+/**
+ * Lists all pads of a group
+ * @param {String} groupID The id of the group
+ * @return {Promise<{padIDs: string[]}>} a promise that resolves to the ids of all pads of the group
+ */
 exports.listPads = async (groupID) => {
   const exists = await exports.doesGroupExist(groupID);
 

src/node/db/Pad.js

@@ -25,7 +25,8 @@ const promises = require('../utils/promises');
 /**
  * Copied from the Etherpad source code. It converts Windows line breaks to Unix
  * line breaks and convert Tabs to spaces
- * @param txt
+ * @param {String} txt The text to clean
+ * @returns {String} The cleaned text
  */
 exports.cleanText = (txt) => txt.replace(/\r\n/g, '\n')
     .replace(/\r/g, '\n')
@@ -73,9 +74,16 @@ class Pad {
     return this.publicStatus;
   }
 
+  /**
+   * Appends a new revision
+   * @param {Object} aChangeset The changeset to append to the pad
+   * @param {String} authorId The id of the author
+   * @return {Promise<number|string>}
+   */
   async appendRevision(aChangeset, authorId = '') {
     const newAText = Changeset.applyToAText(aChangeset, this.atext, this.pool);
-    if (newAText.text === this.atext.text && newAText.attribs === this.atext.attribs) {
+    if (newAText.text === this.atext.text && newAText.attribs === this.atext.attribs &&
+        this.head !== -1) {
       return this.head;
     }
     Changeset.copyAText(newAText, this.atext);
@@ -158,6 +166,10 @@ class Pad {
     return await this.db.getSub(`pad:${this.id}:revs:${revNum}`, ['meta', 'atext']);
   }
 
+  /**
+   * Returns all authors that worked on this pad
+   * @return {[String]} The id of authors who contributed to this pad
+   */
   getAllAuthors() {
     const authorIds = [];
 
@@ -172,6 +184,8 @@ class Pad {
 
   async getInternalRevisionAText(targetRev) {
     const keyRev = this.getKeyRevisionNumber(targetRev);
+    const headRev = this.getHeadRevisionNumber();
+    if (targetRev > headRev) targetRev = headRev;
     const [keyAText, changesets] = await Promise.all([
       this._getKeyRevisionAText(keyRev),
       Promise.all(

src/node/db/PadManager.js

@@ -22,6 +22,7 @@
 const CustomError = require('../utils/customError');
 const Pad = require('../db/Pad');
 const db = require('./DB');
+const settings = require('../utils/Settings');
 
 /**
  * A cache of all loaded Pads.
@@ -58,6 +59,7 @@ const padList = new class {
 
   /**
    * Returns all pads in alphabetical order as array.
+   * @returns {Promise<string[]>} A promise that resolves to an array of pad IDs.
    */
   async getPads() {
     if (!this._loaded) {
@@ -170,6 +172,8 @@ exports.sanitizePadId = async (padId) => {
     padId = padId.replace(from, to);
   }
 
+  if (settings.lowerCasePadIds) padId = padId.toLowerCase();
+
   // we're out of possible transformations, so just return it
   return padId;
 };

src/node/db/ReadOnlyManager.js

@@ -26,13 +26,15 @@ const randomString = require('../utils/randomstring');
 
 /**
  * checks if the id pattern matches a read-only pad id
- * @param {String} the pad's id
+ * @param {String} id the pad's id
+ * @return {Boolean} true if the id is readonly
  */
 exports.isReadOnlyId = (id) => id.startsWith('r.');
 
 /**
  * returns a read only id for a pad
  * @param {String} padId the id of the pad
+ * @return {String} the read only id
  */
 exports.getReadOnlyId = async (padId) => {
   // check if there is a pad2readonly entry
@@ -53,12 +55,14 @@ exports.getReadOnlyId = async (padId) => {
 /**
  * returns the padId for a read only id
  * @param {String} readOnlyId read only id
+ * @return {String} the padId
  */
 exports.getPadId = async (readOnlyId) => await db.get(`readonly2pad:${readOnlyId}`);
 
 /**
  * returns the padId and readonlyPadId in an object for any id
- * @param {String} padIdOrReadonlyPadId read only id or real pad id
+ * @param {String} id read only id or real pad id
+ * @return {Object} an object with the padId and readonlyPadId
  */
 exports.getIds = async (id) => {
   const readonly = exports.isReadOnlyId(id);

src/node/db/SecurityManager.js

@@ -49,6 +49,11 @@ const DENY = Object.freeze({accessStatus: 'deny'});
  *
  * WARNING: Tokens and session IDs MUST be kept secret, otherwise users will be able to impersonate
  * each other (which might allow them to gain privileges).
+ * @param {String} padID
+ * @param {String} sessionCookie
+ * @param {String} token
+ * @param {Object} userSettings
+ * @return {DENY|{accessStatus: String, authorID: String}}
  */
 exports.checkAccess = async (padID, sessionCookie, token, userSettings) => {
   if (!padID) {

src/node/db/SessionManager.js

@@ -81,6 +81,11 @@ exports.findAuthorID = async (groupID, sessionCookie) => {
   return sessionInfo.authorID;
 };
 
+/**
+ * Checks if a session exists
+ * @param {String} sessionID The id of the session
+ * @return {Promise<boolean>} Resolves to true if the session exists
+ */
 exports.doesSessionExist = async (sessionID) => {
   // check if the database entry of this session exists
   const session = await db.get(`session:${sessionID}`);
@@ -89,6 +94,10 @@ exports.doesSessionExist = async (sessionID) => {
 
 /**
  * Creates a new session between an author and a group
+ * @param {String} groupID The id of the group
+ * @param {String} authorID The id of the author
+ * @param {Number} validUntil The unix timestamp when the session should expire
+ * @return {Promise<{sessionID: string}>} the id of the new session
  */
 exports.createSession = async (groupID, authorID, validUntil) => {
   // check if the group exists
@@ -146,6 +155,11 @@ exports.createSession = async (groupID, authorID, validUntil) => {
   return {sessionID};
 };
 
+/**
+ * Returns the sessioninfos for a session
+ * @param {String} sessionID The id of the session
+ * @return {Promise<Object>} the sessioninfos
+ */
 exports.getSessionInfo = async (sessionID) => {
   // check if the database entry of this session exists
   const session = await db.get(`session:${sessionID}`);
@@ -161,6 +175,8 @@ exports.getSessionInfo = async (sessionID) => {
 
 /**
  * Deletes a session
+ * @param {String} sessionID The id of the session
+ * @return {Promise<void>} Resolves when the session is deleted
  */
 exports.deleteSession = async (sessionID) => {
   // ensure that the session exists
@@ -186,6 +202,11 @@ exports.deleteSession = async (sessionID) => {
   await db.remove(`session:${sessionID}`);
 };
 
+/**
+ * Returns an array of all sessions of a group
+ * @param {String} groupID The id of the group
+ * @return {Promise<Object>} The sessioninfos of all sessions of this group
+ */
 exports.listSessionsOfGroup = async (groupID) => {
   // check that the group exists
   const exists = await groupManager.doesGroupExist(groupID);
@@ -197,6 +218,11 @@ exports.listSessionsOfGroup = async (groupID) => {
   return sessions;
 };
 
+/**
+ * Returns an array of all sessions of an author
+ * @param {String} authorID The id of the author
+ * @return {Promise<Object>} The sessioninfos of all sessions of this author
+ */
 exports.listSessionsOfAuthor = async (authorID) => {
   // check that the author exists
   const exists = await authorManager.doesAuthorExist(authorID);
@@ -204,12 +230,16 @@ exports.listSessionsOfAuthor = async (authorID) => {
     throw new CustomError('authorID does not exist', 'apierror');
   }
 
-  const sessions = await listSessionsWithDBKey(`author2sessions:${authorID}`);
-  return sessions;
+  return await listSessionsWithDBKey(`author2sessions:${authorID}`);
 };
 
 // this function is basically the code listSessionsOfAuthor and listSessionsOfGroup has in common
 // required to return null rather than an empty object if there are none
+/**
+ * Returns an array of all sessions of a group
+ * @param {String} dbkey The db key to use to get the sessions
+ * @return {Promise<*>}
+ */
 const listSessionsWithDBKey = async (dbkey) => {
   // get the group2sessions entry
   const sessionObject = await db.get(dbkey);
@@ -218,8 +248,7 @@ const listSessionsWithDBKey = async (dbkey) => {
   // iterate through the sessions and get the sessioninfos
   for (const sessionID of Object.keys(sessions || {})) {
     try {
-      const sessionInfo = await exports.getSessionInfo(sessionID);
-      sessions[sessionID] = sessionInfo;
+      sessions[sessionID] = await exports.getSessionInfo(sessionID);
     } catch (err) {
       if (err.name === 'apierror') {
         console.warn(`Found bad session ${sessionID} in ${dbkey}`);
@@ -233,5 +262,9 @@ const listSessionsWithDBKey = async (dbkey) => {
   return sessions;
 };
 
-// checks if a number is an int
+/**
+ * checks if a number is an int
+ * @param {number|string} value
+ * @return {boolean} If the value is an integer
+ */
 const isInt = (value) => (parseFloat(value) === parseInt(value)) && !isNaN(value);

src/node/handler/APIHandler.js

@@ -165,12 +165,13 @@ exports.version = version;
 
 /**
  * Handles a HTTP API call
- * @param functionName the name of the called function
+ * @param {String} apiVersion the version of the api
+ * @param {String} functionName the name of the called function
  * @param fields the params of the called function
  * @req express request object
  * @res express response object
  */
-exports.handle = async function (apiVersion, functionName, fields, req, res) {
+exports.handle = async function (apiVersion, functionName, fields) {
   // say goodbye if this is an unknown API version
   if (!(apiVersion in version)) {
     throw new createHTTPError.NotFound('no such api version');

src/node/handler/ExportHandler.js

@@ -29,6 +29,7 @@ const os = require('os');
 const hooks = require('../../static/js/pluginfw/hooks');
 const TidyHtml = require('../utils/TidyHtml');
 const util = require('util');
+const { checkValidRev } = require('../utils/checkValidRev');
 
 const fsp_writeFile = util.promisify(fs.writeFile);
 const fsp_unlink = util.promisify(fs.unlink);
@@ -37,6 +38,11 @@ const tempDirectory = os.tmpdir();
 
 /**
  * do a requested export
+ * @param {Object} req the request object
+ * @param {Object} res the response object
+ * @param {String} padId the pad id to export
+ * @param {String} readOnlyId the read only id of the pad to export
+ * @param {String} type the type to export
  */
 exports.doExport = async (req, res, padId, readOnlyId, type) => {
   // avoid naming the read-only file as the original pad's id
@@ -53,6 +59,12 @@ exports.doExport = async (req, res, padId, readOnlyId, type) => {
   // tell the browser that this is a downloadable file
   res.attachment(`${fileName}.${type}`);
 
+  if (req.params.rev !== undefined) {
+    // ensure revision is a number
+    // modify req, as we use it in a later call to exportConvert
+    req.params.rev = checkValidRev(req.params.rev);
+  }
+
   // if this is a plain text export, we can do this directly
   // We have to over engineer this because tabs are stored as attributes and not plain text
   if (type === 'etherpad') {

src/node/handler/ImportHandler.js

@@ -73,6 +73,10 @@ const tmpDirectory = os.tmpdir();
 
 /**
  * do a requested import
+ * @param {Object} req the request object
+ * @param {Object} res the response object
+ * @param {String} padId the pad id to export
+ * @param {String} authorId the author id to use for the import
  */
 const doImport = async (req, res, padId, authorId) => {
   // pipe to a file
@@ -89,24 +93,24 @@ const doImport = async (req, res, padId, authorId) => {
     maxFileSize: settings.importMaxFileSize,
   });
 
-  // locally wrapped Promise, since form.parse requires a callback
-  let srcFile = await new Promise((resolve, reject) => {
-    form.parse(req, (err, fields, files) => {
-      if (err != null) {
-        logger.warn(`Import failed due to form error: ${err.stack || err}`);
-        // I hate doing indexOf here but I can't see anything to use...
-        if (err && err.stack && err.stack.indexOf('maxFileSize') !== -1) {
-          return reject(new ImportError('maxFileSize'));
-        }
-        return reject(new ImportError('uploadFailed'));
-      }
-      if (!files.file) {
-        logger.warn('Import failed because form had no file');
-        return reject(new ImportError('uploadFailed'));
-      }
-      resolve(files.file.filepath);
-    });
-  });
+  let srcFile;
+  let files;
+  let fields;
+  try {
+    [fields, files] = await form.parse(req);
+  } catch (err) {
+    logger.warn(`Import failed due to form error: ${err.stack || err}`);
+    if (err.code === Formidable.formidableErrors.biggerThanMaxFileSize) {
+      throw new ImportError('maxFileSize');
+    }
+    throw new ImportError('uploadFailed');
+  }
+  if (!files.file) {
+    logger.warn('Import failed because form had no file');
+    throw new ImportError('uploadFailed');
+  } else {
+    srcFile = files.file[0].filepath;
+  }
 
   // ensure this is a file ending we know, else we change the file ending to .txt
   // this allows us to accept source code files like .c or .java
@@ -233,6 +237,14 @@ const doImport = async (req, res, padId, authorId) => {
   return false;
 };
 
+/**
+ * Handles the request to import a file
+ * @param {Request} req the request object
+ * @param {Response} res the response object
+ * @param {String} padId the pad id to export
+ * @param {String} authorId the author id to use for the import
+ * @return {Promise<void>} a promise
+ */
 exports.doImport = async (req, res, padId, authorId = '') => {
   let httpStatus = 200;
   let code = 0;