fix: use data postgresql mapping

Bumps the dev-dependencies group with 4 updates: [@playwright/test](https://github.com/microsoft/playwright), [i18next-browser-languagedetector](https://github.com/i18next/i18next-browser-languageDetector), [lucide-react](https://github.com/lucide-icons/lucide/tree/HEAD/packages/lucide-react) and [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite).


Updates `@playwright/test` from 1.51.1 to 1.52.0
- [Release notes](https://github.com/microsoft/playwright/releases)
- [Commits](https://github.com/microsoft/playwright/compare/v1.51.1...v1.52.0)

Updates `i18next-browser-languagedetector` from 8.0.4 to 8.0.5
- [Changelog](https://github.com/i18next/i18next-browser-languageDetector/blob/master/CHANGELOG.md)
- [Commits](https://github.com/i18next/i18next-browser-languageDetector/compare/v8.0.4...v8.0.5)

Updates `lucide-react` from 0.488.0 to 0.501.0
- [Release notes](https://github.com/lucide-icons/lucide/releases)
- [Commits](https://github.com/lucide-icons/lucide/commits/0.501.0/packages/lucide-react)

Updates `vite` from 6.3.1 to 6.3.2
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v6.3.2/packages/vite)

---
updated-dependencies:
- dependency-name: "@playwright/test"
  dependency-version: 1.52.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: dev-dependencies
- dependency-name: i18next-browser-languagedetector
  dependency-version: 8.0.5
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: dev-dependencies
- dependency-name: lucide-react
  dependency-version: 0.501.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: dev-dependencies
- dependency-name: vite
  dependency-version: 6.3.2
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: dev-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/workflows/backend-tests.yml

@@ -24,7 +24,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [18, 20, 22]
+        node: [20, 22, 23]
     steps:
       -
         name: Checkout repository
@@ -53,7 +53,7 @@ jobs:
         run: pnpm config set auto-install-peers false
       -
         name: Install libreoffice
-        uses: awalsh128/cache-apt-pkgs-action@v1.4.2
+        uses: awalsh128/cache-apt-pkgs-action@v1.5.0
         with:
           packages: libreoffice libreoffice-pdfimport
           version: 1.0
@@ -84,7 +84,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [18, 20, 22]
+        node: [20, 22, 23]
     steps:
       -
         name: Checkout repository
@@ -113,7 +113,7 @@ jobs:
         run: pnpm config set auto-install-peers false
       -
         name: Install libreoffice
-        uses: awalsh128/cache-apt-pkgs-action@v1.4.2
+        uses: awalsh128/cache-apt-pkgs-action@v1.5.0
         with:
           packages: libreoffice libreoffice-pdfimport
           version: 1.0

.github/workflows/docker.yml

@@ -22,6 +22,9 @@ jobs:
       -
         name: Check out
         uses: actions/checkout@v4
+        with:
+          path: etherpad
+
       -
         name: Set up QEMU
         if: github.event_name == 'push'
@@ -33,7 +36,7 @@ jobs:
         name: Build and export to Docker
         uses: docker/build-push-action@v6
         with:
-          context: .
+          context: ./etherpad
           target: production
           load: true
           tags: ${{ env.TEST_TAG }}
@@ -62,6 +65,7 @@ jobs:
             ${{ runner.os }}-pnpm-store-
       -
         name: Test
+        working-directory: etherpad
         run: |
           docker run --rm -d -p 9001:9001 --name test ${{ env.TEST_TAG }}
           ./bin/installDeps.sh
@@ -98,10 +102,11 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       -
         name: Build and push
+        id: build-docker
         if: github.event_name == 'push'
         uses: docker/build-push-action@v6
         with:
-          context: .
+          context: ./etherpad
           target: production
           platforms: linux/amd64,linux/arm64
           push: true
@@ -111,7 +116,28 @@ jobs:
         uses: peter-evans/dockerhub-description@v4
         if: github.ref == 'refs/heads/master'
         with:
+          readme-filepath: ./etherpad/README.md
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
           repository: etherpad/etherpad
           enable-url-completion: true
+      - name: Check out
+        uses: actions/checkout@v4
+        with:
+          path: ether-charts
+          repository: ether/ether-charts
+          token: ${{ secrets.ETHER_CHART_TOKEN }}
+      - name: Update tag in values-dev.yaml
+        if: success() && github.ref == 'refs/heads/develop'
+        working-directory: ether-charts
+        run: |
+          sed -i 's/tag: ".*"/tag: "${{ steps.build-docker.outputs.digest }}"/' values-dev.yaml
+      - name: Commit and push changes
+        working-directory: ether-charts
+        if: success() && github.ref == 'refs/heads/develop'
+        run: |
+          git config --global user.name 'github-actions[bot]'
+          git config --global user.email 'github-actions[bot]@users.noreply.github.com'
+          git add values-dev.yaml
+          git commit -m 'Update develop image tag'
+          git push

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

@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [20, 22]
+        node: [20, 22, 23]
 
     steps:
       -

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

@@ -24,7 +24,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [18, 20, 22]
+        node: [20, 22, 23]
     steps:
       -
         name: Check out latest release
@@ -43,7 +43,7 @@ jobs:
       - name: Only install direct dependencies
         run: pnpm config set auto-install-peers false
       - name: Install libreoffice
-        uses: awalsh128/cache-apt-pkgs-action@v1.4.2
+        uses: awalsh128/cache-apt-pkgs-action@v1.5.0
         with:
           packages: libreoffice libreoffice-pdfimport
           version: 1.0
@@ -62,7 +62,7 @@ jobs:
         run: pnpm config set auto-install-peers false
       -
         name: Install libreoffice
-        uses: awalsh128/cache-apt-pkgs-action@v1.4.2
+        uses: awalsh128/cache-apt-pkgs-action@v1.5.0
         with:
           packages: libreoffice libreoffice-pdfimport
           version: 1.0

CHANGELOG.md

@@ -1,3 +1,38 @@
+# 2.3.0
+
+### Notable enhancements and fixes
+
+- Added possibility to cluster Etherpads behind reverse proxy. There is now a new reverse proxy designed for Etherpads that handles multiple Etherpads and the created pads in them. It will assign the pad assignement to an Etherpad at random but once the choice was made it will always reverse proxy the same backend. This allows to host multiple concurrent Etherpads and benefit from multi core systems even though one Etherpad is singlethreaded.
+- Added reverse proxy configuration for replacing Nginx. In the past there were some issues with nginx and its configuration. This reverse proxy allows you to handle your configuration with ease.
+
+If you want to find out more about the reverse proxy method check out the repository https://github.com/ether/etherpad-proxy . It also contains a sample docker-compose file with three Etherpads and one etherpad-proxy. Of course you need to adapt the settings.json.template to your liking and map it into the reverse proxy image before you are ready :).
+
+
+- Added client authorization to work with Etherpad. Before it would get blocked because it doesn't have the required claim. As this is now fixed etherpad-proxy can also work with your new OAuth2 configuration and retrieve a token via client credentials flow.
+
+
+
+
+# 2.2.7
+
+
+### Notable enhancements and fixes
+
+- We migrated all important pages to React 19 and React Router v7
+
+Besides that only dependency updates.
+
+
+ -> Have a merry Christmas and a happy new year.  🎄 🎁
+
+
+# 2.2.6
+
+### Notable enhancements and fixes
+
+- Added option to delete a pad by the creator. This option can be found in the settings menu. When you click on it you get a confirm dialog and after that you have the chance to completely erase the pad.
+
+
 # 2.2.5
 
 ### Notable enhancements and fixes

Dockerfile

@@ -3,9 +3,10 @@
 # https://github.com/ether/etherpad-lite
 #
 # Author: muxator
+ARG BUILD_ENV=git
 
 FROM node:alpine AS adminbuild
-RUN npm install -g pnpm@9.0.4
+RUN npm install -g pnpm@latest
 WORKDIR /opt/etherpad-lite
 COPY . .
 RUN pnpm install
@@ -99,7 +100,7 @@ RUN mkdir -p "${EP_DIR}" && chown etherpad:etherpad "${EP_DIR}"
 # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=863199
 RUN  \
     mkdir -p /usr/share/man/man1 && \
-    npm install pnpm@9.0.4 -g  && \
+    npm install pnpm@latest -g  && \
     apk update && apk upgrade && \
     apk add --no-cache \
         ca-certificates \
@@ -113,26 +114,49 @@ USER etherpad
 WORKDIR "${EP_DIR}"
 
 # etherpads version feature requires this. Only copy what is really needed
-COPY --chown=etherpad:etherpad ./.git/HEA[D] ./.git/HEAD
-COPY --chown=etherpad:etherpad ./.git/ref[s] ./.git/refs
 COPY --chown=etherpad:etherpad ${SETTINGS} ./settings.json
 COPY --chown=etherpad:etherpad ./var ./var
 COPY --chown=etherpad:etherpad ./bin ./bin
 COPY --chown=etherpad:etherpad ./pnpm-workspace.yaml ./package.json ./
 
-FROM build AS development
+
+
+FROM build AS build_git
+ONBUILD COPY --chown=etherpad:etherpad ./.git/HEA[D] ./.git/HEAD
+ONBUILD COPY --chown=etherpad:etherpad ./.git/ref[s] ./.git/refs
+
+FROM build AS build_copy
+
+
+
+
+FROM build_${BUILD_ENV} AS development
+
+ARG ETHERPAD_PLUGINS=
+ARG ETHERPAD_LOCAL_PLUGINS=
+ARG ETHERPAD_LOCAL_PLUGINS_ENV=
+ARG ETHERPAD_GITHUB_PLUGINS=
 
 COPY --chown=etherpad:etherpad ./src/ ./src/
 COPY --chown=etherpad:etherpad --from=adminbuild /opt/etherpad-lite/src/ templates/admin./src/templates/admin
 COPY --chown=etherpad:etherpad --from=adminbuild /opt/etherpad-lite/src/static/oidc ./src/static/oidc
 
+COPY --chown=etherpad:etherpad ./local_plugin[s] ./local_plugins/
+
+RUN bash -c ./bin/installLocalPlugins.sh
+
 RUN bin/installDeps.sh && \
-    if [ ! -z "${ETHERPAD_PLUGINS}" ] || [ ! -z "${ETHERPAD_LOCAL_PLUGINS}" ] || [ ! -z "${ETHERPAD_GITHUB_PLUGINS}" ]; then \
-        pnpm run plugins i ${ETHERPAD_PLUGINS} ${ETHERPAD_LOCAL_PLUGINS:+--path ${ETHERPAD_LOCAL_PLUGINS}} ${ETHERPAD_GITHUB_PLUGINS:+--github ${ETHERPAD_GITHUB_PLUGINS}}; \
+  if [ ! -z "${ETHERPAD_PLUGINS}" ] || [ ! -z "${ETHERPAD_GITHUB_PLUGINS}" ]; then \
+      pnpm run plugins i ${ETHERPAD_PLUGINS} ${ETHERPAD_GITHUB_PLUGINS:+--github ${ETHERPAD_GITHUB_PLUGINS}}; \
   fi
 
 
-FROM build AS production
+FROM build_${BUILD_ENV} AS production
+
+ARG ETHERPAD_PLUGINS=
+ARG ETHERPAD_LOCAL_PLUGINS=
+ARG ETHERPAD_LOCAL_PLUGINS_ENV=
+ARG ETHERPAD_GITHUB_PLUGINS=
 
 ENV NODE_ENV=production
 ENV ETHERPAD_PRODUCTION=true
@@ -141,9 +165,13 @@ COPY --chown=etherpad:etherpad ./src ./src
 COPY --chown=etherpad:etherpad --from=adminbuild /opt/etherpad-lite/src/templates/admin ./src/templates/admin
 COPY --chown=etherpad:etherpad --from=adminbuild /opt/etherpad-lite/src/static/oidc ./src/static/oidc
 
-RUN bin/installDeps.sh && rm -rf ~/.npm && rm -rf ~/.local && rm -rf ~/.cache && \
-    if [ ! -z "${ETHERPAD_PLUGINS}" ] || [ ! -z "${ETHERPAD_LOCAL_PLUGINS}" ] || [ ! -z "${ETHERPAD_GITHUB_PLUGINS}" ]; then \
-      pnpm run plugins i ${ETHERPAD_PLUGINS} ${ETHERPAD_LOCAL_PLUGINS:+--path ${ETHERPAD_LOCAL_PLUGINS}} ${ETHERPAD_GITHUB_PLUGINS:+--github ${ETHERPAD_GITHUB_PLUGINS}}; \
+COPY --chown=etherpad:etherpad ./local_plugin[s] ./local_plugins/
+
+RUN bash -c ./bin/installLocalPlugins.sh
+
+RUN bin/installDeps.sh && \
+  if [ ! -z "${ETHERPAD_PLUGINS}" ] || [ ! -z "${ETHERPAD_GITHUB_PLUGINS}" ]; then \
+      pnpm run plugins i ${ETHERPAD_PLUGINS} ${ETHERPAD_GITHUB_PLUGINS:+--github ${ETHERPAD_GITHUB_PLUGINS}}; \
   fi
 
 # Copy the configuration file.

README.md

@@ -90,7 +90,7 @@ services:
     # ports:
     #   - "5432:5432"
     volumes:
-      - postgres_data:/var/lib/postgresql/data/pgdata
+      - postgres_data:/var/lib/postgresql/data
 
 volumes:
   postgres_data:
@@ -174,6 +174,31 @@ following plugins:
     that each user's chosen color, display name, comment ownership, etc. is
     strongly linked to their account.
 
+### Upgrade Etherpad
+
+Run the following command in your Etherpad folder to upgrade
+
+1. Stop any running Etherpad (manual, systemd ...)
+2. Get present version
+```sh
+git -P tag --contains
+```
+3. List versions available
+```sh
+git -P tag --list "v*" --merged
+```
+4. Select the version
+```sh
+git checkout v2.2.5
+git switch -c v2.2.5
+```
+5. Upgrade Etherpad
+```sh
+./bin/run.sh
+```
+6. Stop with [CTRL-C]
+7. Restart your Etherpad service
+
 ## Next Steps
 
 ### Tweak the settings

admin/package.json

@@ -1,7 +1,7 @@
 {
   "name": "admin",
   "private": true,
-  "version": "2.2.5",
+  "version": "2.3.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -11,32 +11,32 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@radix-ui/react-switch": "^1.1.0"
+    "@radix-ui/react-switch": "^1.1.4"
   },
   "devDependencies": {
-    "@radix-ui/react-dialog": "^1.1.1",
-    "@radix-ui/react-toast": "^1.2.1",
-    "@types/react": "^18.3.8",
-    "@types/react-dom": "^18.2.25",
-    "@typescript-eslint/eslint-plugin": "^8.6.0",
-    "@typescript-eslint/parser": "^8.6.0",
-    "@vitejs/plugin-react-swc": "^3.5.0",
-    "eslint": "^9.10.0",
-    "eslint-plugin-react-hooks": "^4.6.0",
-    "eslint-plugin-react-refresh": "^0.4.12",
-    "i18next": "^23.15.1",
-    "i18next-browser-languagedetector": "^8.0.0",
-    "lucide-react": "^0.441.0",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "react-hook-form": "^7.53.0",
-    "react-i18next": "^15.0.2",
-    "react-router-dom": "^6.26.2",
-    "socket.io-client": "^4.7.5",
-    "typescript": "^5.6.2",
-    "vite": "^5.4.7",
-    "vite-plugin-static-copy": "^1.0.6",
-    "vite-plugin-svgr": "^4.2.0",
-    "zustand": "^4.5.5"
+    "@radix-ui/react-dialog": "^1.1.7",
+    "@radix-ui/react-toast": "^1.2.7",
+    "@types/react": "^19.1.2",
+    "@types/react-dom": "^19.1.2",
+    "@typescript-eslint/eslint-plugin": "^8.30.1",
+    "@typescript-eslint/parser": "^8.30.1",
+    "@vitejs/plugin-react-swc": "^3.9.0",
+    "eslint": "^9.23.0",
+    "eslint-plugin-react-hooks": "^5.2.0",
+    "eslint-plugin-react-refresh": "^0.4.19",
+    "i18next": "^25.0.0",
+    "i18next-browser-languagedetector": "^8.0.5",
+    "lucide-react": "^0.501.0",
+    "react": "^19.1.0",
+    "react-dom": "^19.1.0",
+    "react-hook-form": "^7.55.0",
+    "react-i18next": "^15.4.1",
+    "react-router-dom": "^7.5.1",
+    "socket.io-client": "^4.8.1",
+    "typescript": "^5.8.2",
+    "vite": "^6.3.2",
+    "vite-plugin-static-copy": "^2.3.1",
+    "vite-plugin-svgr": "^4.3.0",
+    "zustand": "^5.0.3"
   }
 }

admin/src/App.tsx

@@ -95,7 +95,9 @@ export const App = () => {
                     <h1>Etherpad</h1>
                 </span>
         <ul onClick={()=>{
+          if (window.innerWidth < 768) {
             setSidebarOpen(false)
+          }
         }}>
           <li><NavLink to="/plugins"><Cable/><Trans i18nKey="admin_plugins"/></NavLink></li>
           <li><NavLink to={"/settings"}><Wrench/><Trans i18nKey="admin_settings"/></NavLink></li>

admin/src/components/IconButton.tsx

@@ -1,4 +1,4 @@
-import {FC, ReactElement} from "react";
+import {FC, JSX, ReactElement} from "react";
 
 export type IconButtonProps = {
     icon: JSX.Element,

admin/src/pages/HomePage.tsx

@@ -4,7 +4,7 @@ import {InstalledPlugin, PluginDef, SearchParams} from "./Plugin.ts";
 import {useDebounce} from "../utils/useDebounce.ts";
 import {Trans, useTranslation} from "react-i18next";
 import {SearchField} from "../components/SearchField.tsx";
-import {Download, Trash} from "lucide-react";
+import {ArrowUpFromDot, Download, Trash} from "lucide-react";
 import {IconButton} from "../components/IconButton.tsx";
 import {determineSorting} from "../utils/sorting.ts";
 
@@ -12,7 +12,8 @@ import {determineSorting} from "../utils/sorting.ts";
 export const HomePage = () => {
     const pluginsSocket = useStore(state=>state.pluginsSocket)
     const [plugins,setPlugins] = useState<PluginDef[]>([])
-    const [installedPlugins, setInstalledPlugins] = useState<InstalledPlugin[]>([])
+  const installedPlugins = useStore(state=>state.installedPlugins)
+  const setInstalledPlugins = useStore(state=>state.setInstalledPlugins)
   const [searchParams, setSearchParams] = useState<SearchParams>({
     offset: 0,
     limit: 99999,
@@ -49,7 +50,7 @@ export const HomePage = () => {
   }, [plugins, searchParams])
 
     const sortedInstalledPlugins = useMemo(()=>{
-        return installedPlugins.sort((a, b)=>{
+        return useStore.getState().installedPlugins.sort((a, b)=>{
 
             if(a.name < b.name){
                 return -1
@@ -78,17 +79,16 @@ export const HomePage = () => {
         })
 
         pluginsSocket.on('results:updatable', (data) => {
-            data.updatable.forEach((pluginName: string) => {
-                setInstalledPlugins(installedPlugins.map(plugin => {
-                    if (plugin.name === pluginName) {
+          const newInstalledPlugins = useStore.getState().installedPlugins.map(plugin => {
+            if (data.updatable.includes(plugin.name)) {
               return {
                 ...plugin,
                 updatable: true
               }
             }
             return plugin
-                }))
           })
+         setInstalledPlugins(newInstalledPlugins)
         })
 
         pluginsSocket.on('finished:install', () => {
@@ -159,6 +159,7 @@ export const HomePage = () => {
         })
     }, 500, [searchTerm])
 
+
     return <div>
         <h1><Trans i18nKey="admin_plugins"/></h1>
 
@@ -180,7 +181,7 @@ export const HomePage = () => {
                     <td>
                     {
                         plugin.updatable ?
-                            <button onClick={() => installPlugin(plugin.name)}>Update</button>
+                            <IconButton onClick={() => installPlugin(plugin.name)} icon={<ArrowUpFromDot/>} title="Update"></IconButton>
                             : <IconButton disabled={plugin.name == "ep_etherpad-lite"} icon={<Trash/>} title={<Trans i18nKey="admin_plugins.installed_uninstall.value"/>} onClick={() => uninstallPlugin(plugin.name)}/>
                     }
                     </td>

admin/src/store/store.ts

@@ -1,6 +1,7 @@
 import {create} from "zustand";
 import {Socket} from "socket.io-client";
 import {PadSearchResult} from "../utils/PadSearch.ts";
+import {InstalledPlugin} from "../pages/Plugin.ts";
 
 type ToastState = {
     description?:string,
@@ -22,7 +23,9 @@ type StoreState = {
     toastState: ToastState,
     setToastState: (val: ToastState)=>void,
     pads: PadSearchResult|undefined,
-    setPads: (pads: PadSearchResult)=>void
+    setPads: (pads: PadSearchResult)=>void,
+    installedPlugins: InstalledPlugin[],
+    setInstalledPlugins: (plugins: InstalledPlugin[])=>void
 }
 
 
@@ -43,5 +46,7 @@ export const useStore = create<StoreState>()((set) => ({
         success: false
     },
     pads: undefined,
-    setPads: (pads)=>set({pads})
+    setPads: (pads)=>set({pads}),
+    installedPlugins: [],
+    setInstalledPlugins: (plugins)=>set({installedPlugins: plugins})
 }));

bin/installLocalPlugins.sh

@@ -0,0 +1,51 @@
+#!/bin/bash
+set -euo pipefail
+IFS=$'\n\t'
+
+trim() {
+    local var="$*"
+    # remove leading whitespace characters
+    var="${var#"${var%%[![:space:]]*}"}"
+    # remove trailing whitespace characters
+    var="${var%"${var##*[![:space:]]}"}"
+    printf '%s' "$var"
+}
+
+# Move to the Etherpad base directory.
+MY_DIR=$(cd "${0%/*}" && pwd -P) || exit 1
+cd "${MY_DIR}/.." || exit 1
+
+# Source constants and useful functions
+. bin/functions.sh
+
+PNPM_OPTIONS=
+if [ ! -z "${NODE_ENV-}"  ]; then
+  if [ "$NODE_ENV" == 'production' ]; then
+    PNPM_OPTIONS='--prod'
+  fi
+fi
+
+if [ ! -z "${ETHERPAD_LOCAL_PLUGINS_ENV-}"  ]; then
+  if [ "$ETHERPAD_LOCAL_PLUGINS_ENV" == 'production' ]; then
+    PNPM_OPTIONS='--prod'
+  elif [ "$ETHERPAD_LOCAL_PLUGINS_ENV" == 'development' ]; then
+    PNPM_OPTIONS='-D'
+  fi
+fi
+
+if [ ! -z "${ETHERPAD_LOCAL_PLUGINS}" ]; then
+  readarray -d ' ' plugins <<< "${ETHERPAD_LOCAL_PLUGINS}"
+  for plugin in "${plugins[@]}"; do
+    plugin=$(trim "$plugin")
+    if [ -d "local_plugins/${plugin}" ]; then
+      echo "Installing plugin: '${plugin}'"
+      pnpm install -w ${PNPM_OPTIONS:-} "local_plugins/${plugin}/"
+    else
+      ( echo "Error. Directory 'local_plugins/${plugin}' for local plugin " \
+             "'${plugin}' missing" >&2 )
+      exit 1
+    fi
+  done
+else
+  echo 'No local plugings to install.'
+fi

bin/package.json

@@ -1,23 +1,23 @@
 {
   "name": "bin",
-  "version": "2.2.5",
+  "version": "2.3.0",
   "description": "",
   "main": "checkAllPads.js",
   "directories": {
     "doc": "doc"
   },
   "dependencies": {
-    "axios": "^1.7.7",
+    "axios": "^1.8.4",
     "ep_etherpad-lite": "workspace:../src",
     "log4js": "^6.9.1",
-    "semver": "^7.6.3",
-    "tsx": "^4.19.1",
-    "ueberdb2": "^5.0.2"
+    "semver": "^7.7.1",
+    "tsx": "^4.19.3",
+    "ueberdb2": "^5.0.6"
   },
   "devDependencies": {
-    "@types/node": "^22.5.5",
-    "@types/semver": "^7.5.8",
-    "typescript": "^5.6.2"
+    "@types/node": "^22.14.1",
+    "@types/semver": "^7.7.0",
+    "typescript": "^5.8.2"
   },
   "scripts": {
     "makeDocs": "node --import tsx make_docs.ts",

doc/package.json

@@ -1,6 +1,6 @@
 {
   "devDependencies": {
-    "vitepress": "^1.3.4"
+    "vitepress": "^1.6.3"
   },
   "scripts": {
     "docs:dev": "vitepress dev",

local_plugins/.gitignore

@@ -0,0 +1,3 @@
+# ignore everything
+*
+!.gitignore

package.json

@@ -50,6 +50,6 @@
     "type": "git",
     "url": "https://github.com/ether/etherpad-lite.git"
   },
-  "version": "2.2.5",
+  "version": "2.3.0",
   "license": "Apache-2.0"
 }

pnpm-workspace.yaml

@@ -4,3 +4,7 @@ packages:
   - bin
   - doc
   - ui
+onlyBuiltDependencies:
+  - '@scarf/scarf'
+  - '@swc/core'
+  - esbuild

settings.json.docker

@@ -96,7 +96,7 @@
  * 3) if you want to use newlines in the default value of a string parameter,
  *    use "\n" as usual.
  *
- *    "defaultPadText" : "${DEFAULT_PAD_TEXT}Line 1\nLine 2"
+ *    "defaultPadText" : "${DEFAULT_PAD_TEXT:Line 1\nLine 2}"
  */
 {
   /*

settings.json.template

@@ -87,7 +87,7 @@
  * 3) if you want to use newlines in the default value of a string parameter,
  *    use "\n" as usual.
  *
- *    "defaultPadText" : "${DEFAULT_PAD_TEXT}Line 1\nLine 2"
+ *    "defaultPadText" : "${DEFAULT_PAD_TEXT:Line 1\nLine 2}"
  */
 {
   /*

src/locales/ar.json

@@ -16,10 +16,18 @@
 		]
 	},
 	"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": "الإصدار",
@@ -31,8 +39,10 @@
 	"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",
@@ -73,6 +83,8 @@
 	"pad.settings.fontType": "نوع الخط:",
 	"pad.settings.fontType.normal": "عادي",
 	"pad.settings.language": "اللغة:",
+	"pad.settings.deletePad": "حذف الوسادة",
+	"pad.delete.confirm": "هل تريد حقا حذف هذه الوسادة؟",
 	"pad.settings.about": "حول",
 	"pad.settings.poweredBy": "مدعوم من",
 	"pad.importExport.import_export": "استيراد/تصدير",
@@ -110,6 +122,8 @@
 	"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": "تم فقدان الاتصال بالخادم",

src/locales/ce.json

@@ -0,0 +1,49 @@
+{
+	"@metadata": {
+		"authors": [
+			"Умар"
+		]
+	},
+	"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.installed_uninstall.value": "ДӀайаккха",
+	"admin_plugins.last-update": "ТӀаьххьара карлайаккхар",
+	"admin_plugins.name": "ЦӀе",
+	"admin_plugins.page-title": "Плагинийн менеджер — Etherpad",
+	"admin_plugins.version": "Верси",
+	"admin_plugins_info.version_number": "Версин лоьмар",
+	"admin_settings": "Нисдаран гӀирс",
+	"admin_settings.current": "Карара конфигураци",
+	"pad.colorpicker.save": "Ӏалашйан",
+	"pad.colorpicker.cancel": "Йухайаккхар",
+	"pad.loading": "Чуйолуш…",
+	"pad.permissionDenied": "Хьан бакъонаш йац тӀекхача",
+	"pad.settings.padSettings": "Документан нисдаран гӀирс",
+	"pad.settings.myView": "Сан васт",
+	"pad.settings.stickychat": "Гуттара а гайта чат",
+	"pad.settings.language": "Мотт:",
+	"pad.settings.about": "Проектах лаьцна",
+	"pad.importExport.importSuccessful": "Кхиамца!",
+	"pad.modals.cancel": "Йухайаккхар",
+	"pad.share.link": "Хьажорг",
+	"pad.chat": "Чат",
+	"timeslider.toolbar.authors": "Авторш:",
+	"timeslider.toolbar.exportlink.title": "Экспорт",
+	"timeslider.month.january": "январь",
+	"timeslider.month.february": "февраль",
+	"timeslider.month.march": "март",
+	"timeslider.month.april": "апрель",
+	"timeslider.month.may": "май",
+	"timeslider.month.june": "июнь",
+	"timeslider.month.july": "июль",
+	"timeslider.month.august": "август",
+	"timeslider.month.september": "сентябрь",
+	"timeslider.month.october": "октябрь",
+	"timeslider.month.november": "ноябрь",
+	"timeslider.month.december": "декабрь",
+	"pad.impexp.importing": "Импорт йар..."
+}

src/locales/de.json

@@ -11,6 +11,7 @@
 			"Predatorix",
 			"SamTV",
 			"Sebastian Wallroth",
+			"Ssgl",
 			"Thargon",
 			"Tim.krieger",
 			"Wikinaut",
@@ -85,6 +86,8 @@
 	"pad.settings.fontType": "Schriftart:",
 	"pad.settings.fontType.normal": "Normal",
 	"pad.settings.language": "Sprache:",
+	"pad.settings.deletePad": "Pad löschen",
+	"pad.delete.confirm": "Möchtest du dieses Pad wirklich löschen?",
 	"pad.settings.about": "Über",
 	"pad.settings.poweredBy": "Betrieben von",
 	"pad.importExport.import_export": "Import/Export",

src/locales/diq.json

@@ -3,6 +3,7 @@
 		"authors": [
 			"1917 Ekim Devrimi",
 			"Erdemaslancan",
+			"GolyatGeri",
 			"Gorizon",
 			"Gırd",
 			"Kumkumuk",
@@ -78,6 +79,8 @@
 	"pad.settings.fontType": "Babeta nuşti:",
 	"pad.settings.fontType.normal": "Normal",
 	"pad.settings.language": "Zıwan:",
+	"pad.settings.deletePad": "Defteri bıesterê",
+	"pad.delete.confirm": "Şıma raşti wazenê ke nê defteri bıesterên?",
 	"pad.settings.about": "Heqa",
 	"pad.settings.poweredBy": "Pheştidayoğ",
 	"pad.importExport.import_export": "Zerredayış/Teberdayış",

src/locales/dsb.json

@@ -72,6 +72,8 @@
 	"pad.settings.fontType": "Pismowa družyna:",
 	"pad.settings.fontType.normal": "Normalny",
 	"pad.settings.language": "Rěc:",
+	"pad.settings.deletePad": "Zapisnik lašowaś",
+	"pad.delete.confirm": "Cośo napšawdu toś ten zapisnik lašowaś?",
 	"pad.settings.about": "Wó",
 	"pad.settings.poweredBy": "Pódpěrany wót",
 	"pad.importExport.import_export": "Import/Eksport",

src/locales/el.json

@@ -14,10 +14,12 @@
 	"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": "Τελευταία ενημέρωση",
@@ -75,6 +77,8 @@
 	"pad.settings.fontType": "Τύπος γραμματοσειράς:",
 	"pad.settings.fontType.normal": "Κανονική",
 	"pad.settings.language": "Γλώσσα:",
+	"pad.settings.deletePad": "Διαγραφή Pad",
+	"pad.delete.confirm": "Θέλετε πραγματικά να διαγράψετε αυτό το pad;",
 	"pad.settings.about": "Σχετικά",
 	"pad.settings.poweredBy": "Υποστηρίζεται από",
 	"pad.importExport.import_export": "Εισαγωγή/Εξαγωγή",
@@ -89,7 +93,7 @@
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
 	"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 σας...",
+	"pad.modals.reconnecting": "Επανασύνδεση στο pad σας…",
 	"pad.modals.forcereconnect": "Επιβολή επανασύνδεσης",
 	"pad.modals.reconnecttimer": "Προσπάθεια επανασύνδεσης σε",
 	"pad.modals.cancel": "Ακύρωση",
@@ -111,7 +115,9 @@
 	"pad.modals.corruptPad.cause": "Αυτό μπορεί να οφείλεται σε ένα λάθος στη ρύθμιση του διακομιστή ή κάποια άλλη απρόβλεπτη συμπεριφορά. Παρακαλώ επικοινωνήστε με τον διαχειριστή της υπηρεσίας.",
 	"pad.modals.deleted": "Διεγράφη.",
 	"pad.modals.deleted.explanation": "Αυτό το pad έχει καταργηθεί.",
+	"pad.modals.rateLimited.explanation": "Στείλατε πάρα πολλά μηνύματα σε αυτό το pad, επομένως σας αποσύνδεσε.",
 	"pad.modals.rejected.explanation": "Ο διακομιστής απέρριψε ένα μήνυμα που στάλθηκε από το πρόγραμμα περιήγησής σας.",
+	"pad.modals.rejected.cause": "Ο διακομιστής μπορεί να έχει ενημερωθεί ενώ προβάλλατε το pad ή ίσως υπάρχει σφάλμα στο Etherpad. Δοκιμάστε να φορτώσετε ξανά τη σελίδα.",
 	"pad.modals.disconnected": "Είστε αποσυνδεδεμένοι.",
 	"pad.modals.disconnected.explanation": "Χάθηκε η σύνδεση με τον διακομιστή",
 	"pad.modals.disconnected.cause": "Ο διακομιστής μπορεί να μην είναι διαθέσιμος. Παρακαλούμε ειδοποιήστε τον διαχειριστή της υπηρεσίας εάν εξακολουθεί να συμβαίνει αυτό.",
@@ -124,6 +130,7 @@
 	"pad.chat.loadmessages": "Φόρτωση περισσότερων μηνυμάτων",
 	"pad.chat.stick.title": "Κρατήστε τη συνομιλία στην οθόνη",
 	"pad.chat.writeMessage.placeholder": "Γράψτε το μήνυμα σας εδώ",
+	"timeslider.followContents": "Ακολουθήστε τις ενημερώσεις περιεχομένου του pad",
 	"timeslider.pageTitle": "{{appTitle}} Χρονοδιάγραμμα",
 	"timeslider.toolbar.returnbutton": "Επιστροφή στο pad",
 	"timeslider.toolbar.authors": "Συντάκτες:",

src/locales/en.json

@@ -72,6 +72,8 @@
   "pad.settings.fontType": "Font type:",
   "pad.settings.fontType.normal": "Normal",
   "pad.settings.language": "Language:",
+  "pad.settings.deletePad": "Delete Pad",
+  "pad.delete.confirm": "Do you really want to delete this pad?",
   "pad.settings.about": "About",
   "pad.settings.poweredBy": "Powered by",
 

src/locales/fi.json

@@ -87,6 +87,8 @@
 	"pad.settings.fontType": "Fonttityyppi:",
 	"pad.settings.fontType.normal": "normaali",
 	"pad.settings.language": "Kieli:",
+	"pad.settings.deletePad": "Poista muistio",
+	"pad.delete.confirm": "Haluatko todella poistaa tämän muistion?",
 	"pad.settings.about": "Tietoja",
 	"pad.settings.poweredBy": "Palvelun mahdollistaa",
 	"pad.importExport.import_export": "Tuonti/vienti",

src/locales/fr.json

@@ -14,6 +14,7 @@
 			"Jean-Frédéric",
 			"Leviathan",
 			"Macofe",
+			"Mahabarata",
 			"Maxim21",
 			"McDutchie",
 			"Metroitendo",
@@ -21,6 +22,7 @@
 			"Peter17",
 			"Quenenni",
 			"Rastus Vernon",
+			"Spf",
 			"Stephane Cottin",
 			"Thibaut120094",
 			"Tux-tn",
@@ -97,6 +99,8 @@
 	"pad.settings.fontType": "Type de police :",
 	"pad.settings.fontType.normal": "Normal",
 	"pad.settings.language": "Langue :",
+	"pad.settings.deletePad": "Supprimer le bloc-notes",
+	"pad.delete.confirm": "Voulez-vous vraiment supprimer ce bloc-notes ?",
 	"pad.settings.about": "À propos",
 	"pad.settings.poweredBy": "Propulsé par",
 	"pad.importExport.import_export": "Importer/Exporter",
@@ -157,7 +161,7 @@
 	"timeslider.toolbar.exportlink.title": "Exporter",
 	"timeslider.exportCurrent": "Exporter la version actuelle sous :",
 	"timeslider.version": "Version {{version}}",
-	"timeslider.saved": "Enregistré le {{day}} {{month}} {{year}}",
+	"timeslider.saved": "Enregistrée le {{day}} {{month}} {{year}}",
 	"timeslider.playPause": "Lecture / Pause des contenus du bloc-notes",
 	"timeslider.backRevision": "Reculer d’une révision dans ce bloc-notes",
 	"timeslider.forwardRevision": "Avancer d’une révision dans ce bloc-notes",

src/locales/gl.json

@@ -42,9 +42,9 @@
 	"index.newPad": "Novo documento",
 	"index.createOpenPad": "ou crea/abre un documento co nome:",
 	"index.openPad": "abrir un Pad existente co nome:",
-	"pad.toolbar.bold.title": "Resaltado (Ctrl-B)",
-	"pad.toolbar.italic.title": "Cursiva (Ctrl-I)",
-	"pad.toolbar.underline.title": "Subliñar (Ctrl-U)",
+	"pad.toolbar.bold.title": "Grosa (Ctrl+B)",
+	"pad.toolbar.italic.title": "Cursiva (Ctrl+I)",
+	"pad.toolbar.underline.title": "Subliñar (Ctrl+U)",
 	"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)",
@@ -74,6 +74,8 @@
 	"pad.settings.fontType": "Tipo de letra:",
 	"pad.settings.fontType.normal": "Normal",
 	"pad.settings.language": "Lingua:",
+	"pad.settings.deletePad": "Borrar o documento",
+	"pad.delete.confirm": "Queres borrar este documento?",
 	"pad.settings.about": "Acerca de",
 	"pad.settings.poweredBy": "Grazas a",
 	"pad.importExport.import_export": "Importar/Exportar",
@@ -88,7 +90,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 seu documento...",
+	"pad.modals.reconnecting": "Reconectando co teu documento...",
 	"pad.modals.forcereconnect": "Forzar a reconexión",
 	"pad.modals.reconnecttimer": "Intentarase reconectar en",
 	"pad.modals.cancel": "Cancelar",

src/locales/he.json

@@ -76,6 +76,8 @@
 	"pad.settings.fontType": "סוג גופן:",
 	"pad.settings.fontType.normal": "רגיל",
 	"pad.settings.language": "שפה:",
+	"pad.settings.deletePad": "מחיקת פנקס",
+	"pad.delete.confirm": "למחוק את הפנקס הזה?",
 	"pad.settings.about": "על אודות",
 	"pad.settings.poweredBy": "מופעל על גבי",
 	"pad.importExport.import_export": "יבוא/יצוא",

src/locales/hsb.json

@@ -72,6 +72,8 @@
 	"pad.settings.fontType": "Pismowa družina:",
 	"pad.settings.fontType.normal": "Normalny",
 	"pad.settings.language": "Rěč:",
+	"pad.settings.deletePad": "Zapisnik zhašeć",
+	"pad.delete.confirm": "Chceće woprawdźe tutón zapisnik zhašeć?",
 	"pad.settings.about": "Wo",
 	"pad.settings.poweredBy": "Spěchowany wot",
 	"pad.importExport.import_export": "Import/Eksport",

src/locales/ia.json

@@ -72,6 +72,8 @@
 	"pad.settings.fontType": "Typo de litteras:",
 	"pad.settings.fontType.normal": "Normal",
 	"pad.settings.language": "Lingua:",
+	"pad.settings.deletePad": "Deler pad",
+	"pad.delete.confirm": "Es tu secur de voler deler iste pad?",
 	"pad.settings.about": "A proposito",
 	"pad.settings.poweredBy": "Actionate per",
 	"pad.importExport.import_export": "Importar/Exportar",

src/locales/id.json

@@ -1,6 +1,7 @@
 {
 	"@metadata": {
 		"authors": [
+			"Akmaie Ajam",
 			"Atriwidada",
 			"Bennylin",
 			"IvanLanin",
@@ -19,6 +20,7 @@
 	"admin_plugins.installed": "Plugin terpasang",
 	"admin_plugins.installed_fetching": "Mengambil plugin yang terpasang…",
 	"admin_plugins.installed_nothing": "Anda belum memasang plugin apa pun.",
+	"admin_plugins.installed_uninstall.value": "Uninstal",
 	"admin_plugins.last-update": "Pembaruan terakhir",
 	"admin_plugins.name": "Nama",
 	"admin_plugins.page-title": "Manajer plugin - Etherpad",
@@ -74,6 +76,8 @@
 	"pad.settings.rtlcheck": "Membaca dari kanan ke kiri?",
 	"pad.settings.fontType": "Jenis fonta:",
 	"pad.settings.language": "Bahasa:",
+	"pad.settings.deletePad": "Hapus Pad",
+	"pad.delete.confirm": "Apakah Anda benar-benar ingin menghapus pad ini?",
 	"pad.settings.about": "Tentang",
 	"pad.settings.poweredBy": "Ditenagai oleh",
 	"pad.importExport.import_export": "Impor/Ekspor",

src/locales/ko.json

@@ -82,6 +82,8 @@
 	"pad.settings.fontType": "글꼴 종류:",
 	"pad.settings.fontType.normal": "보통",
 	"pad.settings.language": "언어:",
+	"pad.settings.deletePad": "패드 삭제",
+	"pad.delete.confirm": "이 패드를 삭제하시겠습니까?",
 	"pad.settings.about": "소개",
 	"pad.settings.poweredBy": "제공:",
 	"pad.importExport.import_export": "가져오기/내보내기",

src/locales/lb.json

@@ -82,7 +82,7 @@
 	"timeslider.toolbar.exportlink.title": "Exportéieren",
 	"timeslider.exportCurrent": "Exportéiert déi aktuell Versioun als:",
 	"timeslider.version": "Versioun {{version}}",
-	"timeslider.saved": "Gespäichert de(n) {{day}} {{month}} {{year}}",
+	"timeslider.saved": "Gespäichert de(n) {{day}}. {{month}} {{year}}",
 	"timeslider.dateformat": "{{day}}/{{month}}/{{year}} {{hours}}:{{minutes}}:{{seconds}}",
 	"timeslider.month.january": "Januar",
 	"timeslider.month.february": "Februar",

src/locales/ln.json

@@ -0,0 +1,61 @@
+{
+	"@metadata": {
+		"authors": [
+			"BOKOBA VEROLY"
+		]
+	},
+	"admin.page-title": "Admin Dashboard - Etherpad",
+	"admin_plugins": "Mokambi ya plug-in",
+	"admin_plugins.available": "Ba plugins oyo ezali",
+	"admin_plugins.available_not-found": "Ba plugins ezwamaki te.",
+	"admin_plugins.available_fetching": "Kozwa...",
+	"admin_plugins.available_install.value": "Kotya",
+	"admin_plugins.available_search.placeholder": "Bolukiluki ya ba plugins mpo na kotya",
+	"admin_plugins.description": "Ndimbola",
+	"admin_plugins.installed": "Ba plugins oyo etyamaki",
+	"admin_plugins.installed_fetching": "Kozwa ba plugins oyo etyamaki...",
+	"admin_plugins.installed_nothing": "Otikaki naino ba plugins te.",
+	"admin_plugins.installed_uninstall.value": "Kofungola esika",
+	"admin_plugins.last-update": "Makambo ya sika ya suka",
+	"admin_plugins.name": "Nkombo na yango",
+	"admin_plugins.page-title": "Gestionnaire de greffons — Etherpad",
+	"admin_plugins.version": "Libongoli",
+	"admin_plugins_info": "Informations de résolution de problème",
+	"admin_plugins_info.hooks": "Crochets installés",
+	"admin_plugins_info.hooks_client": "Crochets côté client",
+	"admin_plugins_info.hooks_server": "Crochets côté serveur",
+	"admin_plugins_info.parts": "Biteni oyo batye",
+	"admin_plugins_info.plugins": "Ba plugins oyo etyamaki",
+	"admin_plugins_info.page-title": "Makambo etali ordinatɛrɛ - Etherpad",
+	"admin_plugins_info.version": "Libongoli ya Etherpad",
+	"admin_plugins_info.version_latest": "Libongoli ya sika",
+	"admin_plugins_info.version_number": "Numero ya version",
+	"admin_settings": "Ndenge ya kobongisa yango",
+	"admin_settings.current": "Configuration ya lelo",
+	"admin_settings.current_example-devel": "Ndakisa modèle ya paramètres ya développement",
+	"admin_settings.current_example-prod": "Ndakisa modèle ya paramètres ya production",
+	"admin_settings.current_restart.value": "Bobandi lisusu Etherpad",
+	"admin_settings.current_save.value": "Bomba ba Paramètres",
+	"admin_settings.page-title": "Paramètres - Etherpad ya kosala",
+	"index.newPad": "Pad ya sika",
+	"index.createOpenPad": "to kosala/kofungola Pad na nkombo:",
+	"index.openPad": "kofungola Pad oyo ezali na nkombo:",
+	"pad.toolbar.bold.title": "Makomi ya moindo makasi (Ctrl+B)",
+	"pad.toolbar.underline.title": "Mokanda ya nse (Ctrl+U)",
+	"pad.toolbar.strikethrough.title": "Strikethrough (Ctrl+5)",
+	"pad.toolbar.ol.title": "Liste oyo esɛngami (Ctrl+Shift+N)",
+	"pad.toolbar.ul.title": "Liste oyo etyami na molongo te (Ctrl+Shift+L)",
+	"pad.toolbar.indent.title": "Indent (TAB)",
+	"pad.toolbar.unindent.title": "Mikuwa ya libándá (Shift+TAB)",
+	"pad.toolbar.undo.title": "Undo (Ctrl+Z)",
+	"pad.toolbar.redo.title": "Redo (Ctrl+Y)",
+	"pad.toolbar.clearAuthorship.title": "Langi ya polele ya mokomi (Ctrl+Shift+C)",
+	"pad.toolbar.import_export.title": "Kokotisa/kobimisa na/na ba formats ya ba fichiers ndenge na ndenge",
+	"pad.toolbar.timeslider.title": "Mokambi ya ntango",
+	"pad.toolbar.savedRevision.title": "Kobomba lisusu",
+	"pad.toolbar.settings.title": "Ndenge ya kobongisa yango",
+	"pad.toolbar.embed.title": "Kopesa mpe kobakisa yango",
+	"pad.toolbar.showusers.title": "Tyá bato oyo basalelaka yango",
+	"pad.colorpicker.save": "Kobikisa",
+	"pad.colorpicker.cancel": "Kolongola"
+}

src/locales/lt.json

@@ -63,7 +63,7 @@
 	"pad.colorpicker.save": "Išsaugoti",
 	"pad.colorpicker.cancel": "Atšaukti",
 	"pad.loading": "Įkraunama...",
-	"pad.noCookie": "Slapuko nepavyko rasti. Prašome leisti slapukus interneto naršyklėje!",
+	"pad.noCookie": "Slapuko rasti nepavyko. Prašome leisti slapukus savo naršyklėje! Jūsų sesija ir nustatymai nebus išsaugoti tarp apsilankymų. Taip gali būti dėl to, kad kai kuriose naršyklėse Etherpad yra įtrauktas į iFrame. Įsitikinkite, kad Etherpad yra tame pačiame padomenyje / domene kaip ir pirminis iFrame.",
 	"pad.permissionDenied": "Jūs neturite leidimo patekti į šį bloknotą",
 	"pad.settings.padSettings": "Bloknoto nustatymai",
 	"pad.settings.myView": "Mano Vaizdas",
@@ -75,6 +75,8 @@
 	"pad.settings.fontType": "Šrifto tipas:",
 	"pad.settings.fontType.normal": "Normalus",
 	"pad.settings.language": "Kalba:",
+	"pad.settings.deletePad": "Ištrinti bloką",
+	"pad.delete.confirm": "Ar tikrai norite ištrinti šį bloką?",
 	"pad.settings.about": "Apie",
 	"pad.settings.poweredBy": "Palaiko",
 	"pad.importExport.import_export": "Importuoti/Eksportuoti",

src/locales/mk.json

@@ -74,6 +74,8 @@
 	"pad.settings.fontType": "Тип на фонт:",
 	"pad.settings.fontType.normal": "Нормален",
 	"pad.settings.language": "Јазик:",
+	"pad.settings.deletePad": "Избриши тетратка",
+	"pad.delete.confirm": "Дали навистина сакате да ја избришете тетраткава?",
 	"pad.settings.about": "За додатоков",
 	"pad.settings.poweredBy": "Овозможено од",
 	"pad.importExport.import_export": "Увоз/Извоз",

src/locales/nl.json

@@ -85,6 +85,8 @@
 	"pad.settings.fontType": "Lettertype:",
 	"pad.settings.fontType.normal": "Normaal",
 	"pad.settings.language": "Taal:",
+	"pad.settings.deletePad": "Pad verwijderen",
+	"pad.delete.confirm": "Wilt u dit pad echt verwijderen?",
 	"pad.settings.about": "Over",
 	"pad.settings.poweredBy": "Aangedreven door",
 	"pad.importExport.import_export": "Importeren/exporteren",

src/locales/pa.json

@@ -9,6 +9,16 @@
 			"ਪ੍ਰਚਾਰਕ"
 		]
 	},
+	"admin_plugins.available_fetching": "ਲਿਆਉਣਾ ਪਿਆਂ...",
+	"admin_plugins.available_install.value": "ਜੜੋ",
+	"admin_plugins.description": "ਵੇਰਵਾ",
+	"admin_plugins.last-update": "ਆਖਰੀ ਵਾਰ ਨਵਿਆਈਆ ਗਿਆ",
+	"admin_plugins.name": "ਨਾਂ",
+	"admin_plugins_info": "ਸਮੱਸਿਆ ਨਿਵਾਰਣ ਜਾਣਕਾਰੀ",
+	"admin_settings": "ਤਰਜੀਹਾਂ",
+	"admin_settings.current": "ਮੌਜੂਦਾ ਬਣਤਰ",
+	"admin_settings.current_save.value": "ਤਰਜੀਹਾਂ ਸੰਭਾਲੋ",
+	"admin_settings.page-title": "ਤਰਜੀਹਾਂ - ਈਥਰਪੈਡ",
 	"index.newPad": "ਨਵਾਂ ਪੈਡ",
 	"index.createOpenPad": "ਜਾਂ ਨਾਂ ਨਾਲ ਨਵਾਂ ਪੈਡ ਬਣਾਓ/ਖੋਲ੍ਹੋ:",
 	"pad.toolbar.bold.title": "ਗੂੜ੍ਹਾ (Ctrl-B)",
@@ -25,7 +35,7 @@
 	"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": "ਸੰਭਾਲੋ",
@@ -40,10 +50,11 @@
 	"pad.settings.colorcheck": "ਲੇਖਕੀ ਰੰਗ",
 	"pad.settings.linenocheck": "ਲਕੀਰ ਨੰਬਰ",
 	"pad.settings.rtlcheck": "ਸਮੱਗਰੀ ਸੱਜੇ ਤੋਂ ਖੱਬੇ ਪੜ੍ਹਨੀ ਹੈ?",
-	"pad.settings.fontType": "ਫੋਂਟ ਕਿਸਮ:",
-	"pad.settings.fontType.normal": "ਸਧਾਰਨ",
+	"pad.settings.fontType": "ਅੱਖਰ ਦੀ ਕਿਸਮ:",
+	"pad.settings.fontType.normal": "ਆਮ",
 	"pad.settings.language": "ਭਾਸ਼ਾ:",
-	"pad.importExport.import_export": "ਇੰਪੋਰਟ/ਐਕਸਪੋਰਟ",
+	"pad.settings.about": "ਬਾਬਤ",
+	"pad.importExport.import_export": "ਦਰਾਮਦ/ਬਰਾਮਦ",
 	"pad.importExport.import": "ਕੋਈ ਵੀ ਟੈਕਸਟ ਫਾਇਲ ਜਾਂ ਦਸਤਾਵੇਜ਼ ਅੱਪਲੋਡ ਕਰੋ",
 	"pad.importExport.importSuccessful": "ਸਫ਼ਲ!",
 	"pad.importExport.export": "ਮੌਜੂਦਾ ਪੈਡ ਨੂੰ ਐਕਸਪੋਰਟ ਕਰੋ:",
@@ -57,6 +68,7 @@
 	"pad.modals.connected": "ਕੁਨੈਕਟ ਹੈ।",
 	"pad.modals.reconnecting": "..ਤੁਹਾਡੇ ਪੈਡ ਨਾਲ ਮੁੜ-ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ",
 	"pad.modals.forcereconnect": "ਧੱਕੇ ਨਾਲ ਮੁੜ-ਕੁਨੈਕਟ ਕਰੋ",
+	"pad.modals.cancel": "ਰੱਦ ਕਰੋ",
 	"pad.modals.userdup": "ਹੋਰ ਵਿੰਡੋ ਵਿੱਚ ਖੁੱਲ੍ਹਿਆ ਹੈ",
 	"pad.modals.userdup.explanation": "ਇਹ ਪੈਡ ਇਸ ਕੰਪਿਊਟਰ 'ਤੇ ਇੱਕ ਤੋਂ ਵੱਧ ਫਰੋਲੂ ਬਾਰੀ ਵਿੱਚ ਖੁੱਲ੍ਹਿਆ ਜਾਪਦਾ ਹੈ।",
 	"pad.modals.userdup.advice": "ਸਗੋਂ ਇਹ ਬਾਰੀ ਵਰਤਣ ਵਾਸਤੇ ਮੁੜ ਜੁੜੋ।",
@@ -80,11 +92,12 @@
 	"pad.modals.disconnected.cause": "ਸਰਵਰ ਨਾਮੌਜੂਦ ਹੋ ਸਕਦਾ ਹੈ। ਜੇਕਰ ਇਹ ਹੁੰਦਾ ਰਹੇ ਤਾਂ ਮਿਹਰਬਾਨੀ ਕਰਕੇ ਸੇਵਾ ਪ੍ਰਬੰਧਕ ਨੂੰ ਖ਼ਬਰ ਕਰੋ।",
 	"pad.share": "ਇਹ ਪੈਡ ਸਾਂਝਾ ਕਰੋ",
 	"pad.share.readonly": "ਕੇਵਲ ਪੜ੍ਹਨ ਲਈ",
-	"pad.share.link": "ਲਿੰਕ",
+	"pad.share.link": "ਕੜੀ",
 	"pad.share.emebdcode": "ਇੰਬੈੱਡ URL",
 	"pad.chat": "ਗੱਲਬਾਤ",
 	"pad.chat.title": "ਇਹ ਪੈਡ ਲਈ ਗੱਲਬਾਤ ਖੋਲ੍ਹੋ।",
-	"pad.chat.loadmessages": "ਹੋਰ ਸੁਨੇਹੇ ਲੋਡ ਕਰੋ",
+	"pad.chat.loadmessages": "ਹੋਰ ਸੁਨੇਹੇ ਲੱਦੋ",
+	"pad.chat.writeMessage.placeholder": "ਆਪਣਾ ਸੁਨੇਹਾ ਇੱਥੇ ਲਿਖੋ",
 	"timeslider.pageTitle": "{{appTitle}} ਸਮਾਂ-ਲਕੀਰ",
 	"timeslider.toolbar.returnbutton": "ਪੈਡ ਉੱਤੇ ਵਾਪਸ",
 	"timeslider.toolbar.authors": "ਲੇਖਕ:",
@@ -110,18 +123,18 @@
 	"timeslider.month.november": "ਨਵੰਬਰ",
 	"timeslider.month.december": "ਦਸੰਬਰ",
 	"timeslider.unnamedauthors": "{{num}} ਬੇਨਾਮ {[plural(num) one: ਲੇਖਕ, other: ਲੇਖਕ ]}",
-	"pad.savedrevs.marked": "ਇਹ ਰੀਵਿਜ਼ਨ ਨੂੰ ਹੁਣ ਸੰਭਾਲੇ ਹੋਏ ਰੀਵਿਜ਼ਨ ਵਜੋਂ ਮੰਨਿਆ ਗਿਆ ਹੈ",
+	"pad.savedrevs.marked": "ਇਹ ਦੁਹਰਾਅ ਨੂੰ ਹੁਣ ਸੰਭਾਲੇ ਹੋਏ ਦੁਹਰਾਅ ਵਜੋਂ ਮੰਨਿਆ ਗਿਆ ਹੈ",
 	"pad.savedrevs.timeslider": "ਤੁਸੀੰ ਸਾੰਭੀਆੰ ਹੋਈਆੰ ਵਰਜਨਾੰ ਸਮਾੰਸਲਾਈਡਰ ਤੇ ਜਾ ਕੇ ਵੇਖ ਸਕਦੇ ਹੋ",
 	"pad.userlist.entername": "ਆਪਣਾ ਨਾਂ ਦਿਉ",
 	"pad.userlist.unnamed": "ਬੇਨਾਮ",
 	"pad.editbar.clearcolors": "ਪੂਰੇ ਦਸਾਤਵੇਜ਼ ਉੱਤੇ ਪਰਮਾਣਕਿਤਾ ਰੰਗ ਸਾਫ਼ ਕਰਨੇ ਹਨ?",
-	"pad.impexp.importbutton": "ਹੁਣੇ ਇੰਪੋਰਟ ਕਰੋ",
+	"pad.impexp.importbutton": "ਹੁਣੇ ਦਰਾਮਦ ਕਰੋ",
 	"pad.impexp.importing": "...ਇੰਪੋਰਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ",
 	"pad.impexp.confirmimport": "ਕੋਈ ਫ਼ਾਈਲ ਦਰਾਮਦ ਕਾਰਨ ਨਾਲ਼ ਪੈਡ ਦੀ ਮੌਜੂਦਾ ਲਿਖਤ ਉੱਤੇ ਲਿਖਿਆ ਜਾਵੇਗਾ। ਕੀ ਤੁਸੀਂ ਸੱਚੀਂ ਇਹ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?",
 	"pad.impexp.convertFailed": "ਅਸੀਂ ਇਸ ਫ਼ਾਈਲ ਦੀ ਦਰਾਮਦ ਨਹੀਂ ਕਰ ਸਕੇ। ਮਿਹਰਬਾਨੀ ਕਰਕੇ ਕੋਈ ਵੱਖਰੀ ਦਸਤਾਵੇਜ਼ੀ ਰੂਪ-ਰੇਖਾ ਵਰਤੋ ਜਾਂ ਹੱਥੀਂ ਨਕਲ-ਚੇਪੀ ਕਰੋ।",
-	"pad.impexp.padHasData": "ਅਸੀ ਇਸ ਫਾਈਲ ਨੂੰ ਆਯਾਤ ਨਹੀੰ ਕਰ ਸਕੇ ਕਿਉੰਕਿ ਇਸ ਪੈਡ ਉੱਤੇ ਪਹਿਲਾੰ ਹੀ ਤਬਦੀਲੀਆੰ ਕੀਤੀਆੰ ਜਾ ਚੁਕੀਆੰ ਹਨ, ਕਿਰਪਾ ਕਰਕੇ ਨਵੇੰ ਪੈਡ ਵਿਚ ਆਯਾਤ ਕਰੋ",
+	"pad.impexp.padHasData": "ਅਸੀ ਇਸ ਫਾਈਲ ਨੂੰ ਦਰਾਮਦ ਨਹੀੰ ਕਰ ਸਕੇ ਕਿਉੰਕਿ ਇਸ ਕਾਗਜ਼ ਉੱਤੇ ਪਹਿਲਾਂ ਹੀ ਤਬਦੀਲੀਆਂ ਕੀਤੀਆਂ ਜਾ ਚੁਕੀਆਂ ਹਨ, ਕਿਰਪਾ ਕਰਕੇ ਨਵੇਂ ਕਾਗਜ਼ ਵਿਚ ਦਰਾਮਦ ਕਰੋ",
 	"pad.impexp.uploadFailed": "ਅੱਪਲੋਡ ਲਈ ਫੇਲ੍ਹ ਹੈ, ਫੇਰ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ।",
-	"pad.impexp.importfailed": "ਇੰਪੋਰਟ ਫੇਲ੍ਹ ਹੈ",
+	"pad.impexp.importfailed": "ਦਰਾਮਦ ਨਾਕਾਮ",
 	"pad.impexp.copypaste": "ਕਾਪੀ ਕਰੋ ਚੇਪੋ ਜੀ",
 	"pad.impexp.exportdisabled": "{{type}} ਫਾਰਮੈਟ ਵਜੋਂ ਬਰਾਮਦ ਕਰਨਾ ਬੰਦ ਹੈ। ਵੇਰਵੇ ਵਾਸਤੇ ਆਪਣੇ ਸਿਸਟਮ ਦੇ ਪਰਬੰਧਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।"
 }

src/locales/pms.json

@@ -71,6 +71,8 @@
 	"pad.settings.rtlcheck": "Ël contnù, dev-lo esse lesù da drita a snistra?",
 	"pad.settings.fontType": "Sòrt ëd caràter:",
 	"pad.settings.language": "Lenga:",
+	"pad.settings.deletePad": "Eliminé ël blochet",
+	"pad.delete.confirm": "Veul-lo për da bon eliminé cost blochet?",
 	"pad.settings.about": "A propòsit",
 	"pad.settings.poweredBy": "Potensià da",
 	"pad.importExport.import_export": "Amporté/Esporté",

src/locales/pt-br.json

@@ -23,22 +23,22 @@
 		]
 	},
 	"admin.page-title": "Painel administrativo - Etherpad",
-	"admin_plugins": "Gerente de complementos",
+	"admin_plugins": "Gerenciador de complementos",
 	"admin_plugins.available": "Plugins disponíveis",
-	"admin_plugins.available_not-found": "Nenhuma complementos encontrado.",
+	"admin_plugins.available_not-found": "Nenhum plugin encontrado.",
 	"admin_plugins.available_fetching": "Buscando…",
 	"admin_plugins.available_install.value": "Instalar",
-	"admin_plugins.available_search.placeholder": "Procure por plug-ins para instalar",
+	"admin_plugins.available_search.placeholder": "Procure plugins para instalar",
 	"admin_plugins.description": "Descrição",
-	"admin_plugins.installed": "Complementos instalados",
-	"admin_plugins.installed_fetching": "Buscando plug-ins instalados…",
-	"admin_plugins.installed_nothing": "Você ainda não instalou nenhum plug-in.",
+	"admin_plugins.installed": "Plugins instalados",
+	"admin_plugins.installed_fetching": "Buscando plugins instalados…",
+	"admin_plugins.installed_nothing": "Você ainda não instalou nenhum plugin.",
 	"admin_plugins.installed_uninstall.value": "Desinstalar",
 	"admin_plugins.last-update": "Última atualização",
 	"admin_plugins.name": "Nome",
-	"admin_plugins.page-title": "Gerenciador de plug-ins - Etherpad",
+	"admin_plugins.page-title": "Gerenciador de plugins - Etherpad",
 	"admin_plugins.version": "Versão",
-	"admin_plugins_info": "Informações sobre solução",
+	"admin_plugins_info": "Resolução de problemas",
 	"admin_plugins_info.hooks": "Ganchos instalados",
 	"admin_plugins_info.hooks_client": "Ganchos do lado do cliente",
 	"admin_plugins_info.hooks_server": "Ganchos do lado do servidor",
@@ -90,6 +90,8 @@
 	"pad.settings.fontType": "Tipo de fonte:",
 	"pad.settings.fontType.normal": "Normal",
 	"pad.settings.language": "Idioma:",
+	"pad.settings.deletePad": "Apagar Pad",
+	"pad.delete.confirm": "Tem certeza de que quer deletar este pad?",
 	"pad.settings.about": "Sobre",
 	"pad.settings.poweredBy": "Fornecido por",
 	"pad.importExport.import_export": "Importar/Exportar",
@@ -127,7 +129,7 @@
 	"pad.modals.deleted": "Excluído.",
 	"pad.modals.deleted.explanation": "Esta nota foi removida.",
 	"pad.modals.rateLimited": "Limitado.",
-	"pad.modals.rateLimited.explanation": "Você enviou muitas mensagens para este pad por isso será desconectado.",
+	"pad.modals.rateLimited.explanation": "Você enviou muitas mensagens para esta nota por isso será desconectado.",
 	"pad.modals.rejected.explanation": "O servidor rejeitou uma mensagem que foi enviada pelo seu navegador.",
 	"pad.modals.rejected.cause": "O server pode ter sido atualizado enquanto visualizava esta nota, ou talvez seja apenas um bug do Etherpad. Tenta recarregar a página.",
 	"pad.modals.disconnected": "Você foi desconectado.",
@@ -142,7 +144,7 @@
 	"pad.chat.loadmessages": "Carregar mais mensagens",
 	"pad.chat.stick.title": "Cole o bate-papo na tela",
 	"pad.chat.writeMessage.placeholder": "Escreva sua mensagem aqui",
-	"timeslider.followContents": "Siga as atualizações de conteúdo do pad",
+	"timeslider.followContents": "Siga as atualizações de conteúdo da nota",
 	"timeslider.pageTitle": "Linha do tempo de {{appTitle}}",
 	"timeslider.toolbar.returnbutton": "Retornar para a nota",
 	"timeslider.toolbar.authors": "Autores:",
@@ -151,9 +153,9 @@
 	"timeslider.exportCurrent": "Exportar a versão atual em formato:",
 	"timeslider.version": "Versão {{version}}",
 	"timeslider.saved": "Salvo em {{day}} de {{month}} de {{year}}",
-	"timeslider.playPause": "Reproduzir / Pausar conteúdo no Pad",
-	"timeslider.backRevision": "Voltar a uma revisão anterior neste Pad",
-	"timeslider.forwardRevision": "Ir a uma revisão posterior neste Pad",
+	"timeslider.playPause": "Reproduzir / Pausar conteúdos da Nota",
+	"timeslider.backRevision": "Voltar a uma revisão anterior nesta Nota",
+	"timeslider.forwardRevision": "Ir a uma revisão posterior nesta Nota",
 	"timeslider.dateformat": "{{day}}/{{month}}/{{year}} {{hours}}:{{minutes}}:{{seconds}}",
 	"timeslider.month.january": "Janeiro",
 	"timeslider.month.february": "Fevereiro",

src/locales/ru.json

@@ -87,6 +87,8 @@
 	"pad.settings.fontType": "Тип шрифта:",
 	"pad.settings.fontType.normal": "Обычный",
 	"pad.settings.language": "Язык:",
+	"pad.settings.deletePad": "Удалить документ",
+	"pad.delete.confirm": "Вы действительно хотите удалить этот документ?",
 	"pad.settings.about": "О проекте",
 	"pad.settings.poweredBy": "Проект основан на",
 	"pad.importExport.import_export": "Импорт/экспорт",

src/locales/sl.json

@@ -77,6 +77,8 @@
 	"pad.settings.fontType": "Vrsta pisave:",
 	"pad.settings.fontType.normal": "Normalno",
 	"pad.settings.language": "Jezik:",
+	"pad.settings.deletePad": "Izbriši ploščico",
+	"pad.delete.confirm": "Res želite izbrisati to ploščico?",
 	"pad.settings.about": "Kolofon",
 	"pad.settings.poweredBy": "Omogoča",
 	"pad.importExport.import_export": "Uvoz/Izvoz",

src/locales/sv.json

@@ -76,6 +76,8 @@
 	"pad.settings.fontType": "Typsnitt:",
 	"pad.settings.fontType.normal": "Normal",
 	"pad.settings.language": "Språk:",
+	"pad.settings.deletePad": "Radera block",
+	"pad.delete.confirm": "Vill du verkligen radera detta block?",
 	"pad.settings.about": "Om",
 	"pad.settings.poweredBy": "Drivs av",
 	"pad.importExport.import_export": "Importera/Exportera",

src/locales/zh-hans.json

@@ -16,6 +16,7 @@
 			"Shangkuanlc",
 			"Shizhao",
 			"Stang",
+			"TFX202X",
 			"VulpesVulpes825",
 			"Yfdyh000",
 			"乌拉跨氪",
@@ -92,6 +93,8 @@
 	"pad.settings.fontType": "字体类型：",
 	"pad.settings.fontType.normal": "正常",
 	"pad.settings.language": "语言：",
+	"pad.settings.deletePad": "删除记事本",
+	"pad.delete.confirm": "您确定要删除此记事本吗？",
 	"pad.settings.about": "关于",
 	"pad.settings.poweredBy": "技术支持来自",
 	"pad.importExport.import_export": "导入/导出",

src/locales/zh-hant.json

@@ -82,6 +82,8 @@
 	"pad.settings.fontType": "字型類型：",
 	"pad.settings.fontType.normal": "正常",
 	"pad.settings.language": "語言：",
+	"pad.settings.deletePad": "刪除記事本",
+	"pad.delete.confirm": "您確定要刪除此記事本？",
 	"pad.settings.about": "關於",
 	"pad.settings.poweredBy": "技術支援來自",
 	"pad.importExport.import_export": "導入/匯出",

src/node/handler/APIHandler.ts

@@ -20,9 +20,10 @@
  */
 
 import {MapArrayType} from "../types/MapType";
-
+import { jwtDecode } from "jwt-decode";
 const api = require('../db/API');
 const padManager = require('../db/PadManager');
+const settings = require('../utils/Settings');
 import createHTTPError from 'http-errors';
 import {Http2ServerRequest} from "node:http2";
 import {publicKeyExported} from "../security/OAuth2Provider";
@@ -182,8 +183,17 @@ exports.handle = async function (apiVersion: string, functionName: string, field
       throw new createHTTPError.Unauthorized('no or wrong API Key');
     }
     try {
-      await jwtVerify(req.headers.authorization!.replace("Bearer ", ""), publicKeyExported!, {algorithms: ['RS256'],
+      const clientIds: string[] = settings.sso.clients?.map((client: {client_id: string}) => client.client_id);
+      const jwtToCheck = req.headers.authorization.replace("Bearer ", "")
+      const payload = jwtDecode(jwtToCheck)
+      // client_credentials
+      if (clientIds.includes(<string>payload.sub)) {
+        await jwtVerify(jwtToCheck, publicKeyExported!, {algorithms: ['RS256']})
+      } else {
+        // authorization_code
+        await jwtVerify(jwtToCheck, publicKeyExported!, {algorithms: ['RS256'],
           requiredClaims: ["admin"]})
+      }
     } catch (e) {
       throw new createHTTPError.Unauthorized('no or wrong OAuth token');
     }

src/node/handler/PadMessageHandler.ts

@@ -43,7 +43,7 @@ import {RateLimiterMemory} from 'rate-limiter-flexible';
 import {ChangesetRequest, PadUserInfo, SocketClientRequest} from "../types/SocketClientRequest";
 import {APool, AText, PadAuthor, PadType} from "../types/PadType";
 import {ChangeSet} from "../types/ChangeSet";
-import {ChatMessageMessage, ClientReadyMessage, ClientSaveRevisionMessage, ClientSuggestUserName, ClientUserChangesMessage, ClientVarMessage, CustomMessage, UserNewInfoMessage} from "../../static/js/types/SocketIOMessage";
+import {ChatMessageMessage, ClientReadyMessage, ClientSaveRevisionMessage, ClientSuggestUserName, ClientUserChangesMessage, ClientVarMessage, CustomMessage, PadDeleteMessage, UserNewInfoMessage} from "../../static/js/types/SocketIOMessage";
 import {Builder} from "../../static/js/Builder";
 const webaccess = require('../hooks/express/webaccess');
 const { checkValidRev } = require('../utils/checkValidRev');
@@ -211,6 +211,45 @@ exports.handleDisconnect = async (socket:any) => {
   });
 };
 
+
+const handlePadDelete = async (socket: any, padDeleteMessage: PadDeleteMessage) => {
+  const session = sessioninfos[socket.id];
+  if (!session || !session.author || !session.padId) throw new Error('session not ready');
+  if (await padManager.doesPadExist(padDeleteMessage.data.padId)) {
+    const retrievedPad = await padManager.getPad(padDeleteMessage.data.padId)
+    // Only the one doing the first revision can delete the pad, otherwise people could troll a lot
+    const firstContributor = await retrievedPad.getRevisionAuthor(0)
+    if (session.author === firstContributor) {
+      retrievedPad.remove()
+    } else {
+
+      type ShoutMessage = {
+        message: string,
+        sticky: boolean,
+      }
+
+      const messageToShout: ShoutMessage = {
+        message: 'You are not the creator of this pad, so you cannot delete it',
+        sticky: false
+      }
+      const messageToSend = {
+        type: "COLLABROOM",
+        data: {
+          type: "shoutMessage",
+          payload: {
+            message: messageToShout,
+            timestamp: Date.now()
+          }
+        }
+      }
+      socket.emit('shout',
+        messageToSend
+      )
+    }
+  }
+}
+
+
 /**
  * Handles a message from a user
  * @param socket the socket.io Socket object for the client
@@ -350,6 +389,7 @@ exports.handleMessage = async (socket:any, message: ClientVarMessage) => {
               stats.counter('pendingEdits').inc();
               await padChannels.enqueue(thisSession.padId, {socket, message});
               break;
+            case 'PAD_DELETE': await handlePadDelete(socket, message.data as unknown as PadDeleteMessage); break;
             case 'USERINFO_UPDATE': await handleUserInfoUpdate(socket, message as unknown as UserNewInfoMessage); break;
             case 'CHAT_MESSAGE': await handleChatMessage(socket, message as unknown as ChatMessageMessage); break;
             case 'GET_CHAT_MESSAGES': await handleGetChatMessages(socket, message); break;

src/node/hooks/express/adminplugins.ts

@@ -5,11 +5,12 @@ import {ErrorCaused} from "../../types/ErrorCaused";
 import {QueryType} from "../../types/QueryType";
 
 import {getAvailablePlugins, install, search, uninstall} from "../../../static/js/pluginfw/installer";
-import {PackageData} from "../../types/PackageInfo";
-
-const pluginDefs = require('../../../static/js/pluginfw/plugin_defs');
+import {PackageData, PackageInfo} from "../../types/PackageInfo";
 import semver from 'semver';
 import log4js from 'log4js';
+import {MapArrayType} from "../../types/MapType";
+
+const pluginDefs = require('../../../static/js/pluginfw/plugin_defs');
 const logger = log4js.getLogger('adminPlugins');
 
 
@@ -20,27 +21,42 @@ exports.socketio = (hookName:string, args:ArgsExpressType, cb:Function) => {
     const {session: {user: {is_admin: isAdmin} = {}} = {}} = socket.conn.request;
     if (!isAdmin) return;
 
-    socket.on('getInstalled', (query:string) => {
+    const checkPluginForUpdates = async () => {
+      let results: MapArrayType<PackageInfo>
+      try {
+        results = await getAvailablePlugins(/* maxCacheAge:*/ 60 * 10);
+      } catch (error) {
+        console.error('Error checking for plugin updates:', error);
+        return [];
+      }
+      return Object.keys(pluginDefs.plugins).filter((plugin) => {
+        if (!results[plugin]) return false;
+
+        const latestVersion = results[plugin].version;
+        const currentVersion = pluginDefs.plugins[plugin].package.version;
+
+        return semver.gt(latestVersion, currentVersion);
+      })
+    }
+
+    socket.on('getInstalled', async (query: string) => {
       // send currently installed plugins
       const installed =
         Object.keys(pluginDefs.plugins).map((plugin) => pluginDefs.plugins[plugin].package);
 
+      const updatable = await checkPluginForUpdates();
+
+      installed.forEach((plugin) => {
+        plugin.updatable = updatable.includes(plugin.name);
+      })
+
       socket.emit('results:installed', {installed});
     });
 
     socket.on('checkUpdates', async () => {
       // Check plugins for updates
       try {
-        const results = await getAvailablePlugins(/* maxCacheAge:*/ 60 * 10);
-
-        const updatable = Object.keys(pluginDefs.plugins).filter((plugin) => {
-          if (!results[plugin]) return false;
-
-          const latestVersion = results[plugin].version;
-          const currentVersion = pluginDefs.plugins[plugin].package.version;
-
-          return semver.gt(latestVersion, currentVersion);
-        });
+        const updatable = checkPluginForUpdates();
 
         socket.emit('results:updatable', {updatable});
       } catch (err) {

src/node/hooks/express/specialpages.ts

@@ -112,7 +112,7 @@ const convertTypescript = (content: string) => {
   }
 }
 
-const handleLiveReload = async (args: any, padString: string, timeSliderString: string, indexString: any) => {
+const handleLiveReload = async (args: ArgsExpressType, padString: string, timeSliderString: string, indexString: any) => {
   const chokidar = await import('chokidar')
   const watcher = chokidar.watch(path.join(settings.root, 'src', 'static', 'js'), {});
   let routeHandlers: { [key: string]: Function } = {};
@@ -244,7 +244,7 @@ const convertTypescriptWatched = (content: string, cb: (output:string, hash: str
   })
 }
 
-exports.expressCreateServer = async (hookName: string, args: ArgsExpressType, cb: Function) => {
+exports.expressCreateServer = async (_hookName: string, args: ArgsExpressType, cb: Function) => {
   const padString =   eejs.require('ep_etherpad-lite/templates/padBootstrap.js', {
     pluginModules: (() => {
       const pluginModules = new Set();
@@ -295,32 +295,20 @@ exports.expressCreateServer = async (hookName: string, args: ArgsExpressType, cb
     fileNamePad = `padbootstrap-${padSliderWrite.hash}.min.js`
     fileNameTimeSlider = `timeSliderBootstrap-${timeSliderWrite.hash}.min.js`
     fileNameIndex = `indexBootstrap-${indexWrite.hash}.min.js`
-    const pathNamePad = path.join(outdir, fileNamePad)
-    const pathNameTimeSlider = path.join(outdir, fileNameTimeSlider)
-    const pathNameIndex = path.join(outdir, 'index.js')
 
-    if (!fs.existsSync(pathNamePad)) {
-      fs.writeFileSync(pathNamePad, padSliderWrite.output);
-    }
-
-    if (!fs.existsSync(pathNameIndex)) {
-      fs.writeFileSync(pathNameIndex, indexWrite.output);
-    }
-
-    if (!fs.existsSync(pathNameTimeSlider)) {
-      fs.writeFileSync(pathNameTimeSlider,timeSliderWrite.output)
-    }
-
-    args.app.get("/"+fileNamePad, (req: any, res: any) => {
-      res.sendFile(pathNamePad)
+    args.app.get("/"+fileNamePad, (_req, res) => {
+      res.header('Content-Type', 'application/javascript');
+      res.send(padSliderWrite.output)
     })
 
-    args.app.get("/"+fileNameIndex, (req: any, res: any) => {
-      res.sendFile(pathNameIndex)
+    args.app.get("/"+fileNameIndex, (_req, res) => {
+      res.header('Content-Type', 'application/javascript');
+      res.send(indexWrite.output)
     })
 
-    args.app.get("/"+fileNameTimeSlider, (req: any, res: any) => {
-      res.sendFile(pathNameTimeSlider)
+    args.app.get("/"+fileNameTimeSlider, (_req, res) => {
+      res.header('Content-Type', 'application/javascript');
+      res.send(timeSliderWrite.output)
     })
 
     // serve index.html under /

src/node/hooks/express/webaccess.ts

@@ -49,8 +49,21 @@ exports.userCanModify = (padId: string, req: SocketClientRequest) => {
 // Exported so that tests can set this to 0 to avoid unnecessary test slowness.
 exports.authnFailureDelayMs = 1000;
 
+const staticResources = [
+  /^\/padbootstrap-[a-zA-Z0-9]+\.min\.js$/,
+  /^\/timeSliderBootstrap-[a-zA-Z0-9]+\.min\.js$/,
+  /^\/manifest.json$/
+]
+
 const checkAccess = async (req:any, res:any, next: Function) => {
   const requireAdmin = req.path.toLowerCase().startsWith('/admin-auth');
+  for (const staticResource of staticResources) {
+    if (req.path.match(staticResource)) {
+      console.log(`Loading [${staticResource}] ${req.path}`);
+      return next()
+    }
+  }
+
 
   // ///////////////////////////////////////////////////////////////////////////////////////////////
   // Step 1: Check the preAuthorize hook for early permit/deny (permit is only allowed for non-admin

src/node/security/OAuth2Provider.ts

@@ -30,7 +30,7 @@ const configuration: Configuration = {
         if(account === undefined) {
             return undefined
         }
-        if (account.is_admin) {
+        if (account.is_admin ) {
             return {
                 accountId: id,
                 claims: () => ({

src/node/server.ts

@@ -42,6 +42,10 @@ if (settings.dumpOnUncleanExit) {
 const addProxyToAxios = (url: URL) => {
   axios.defaults.proxy = {
     host: url.hostname,
+    auth: {
+      username: url.username,
+      password: url.password,
+    },
     port: Number(url.port),
     protocol: url.protocol,
   }

src/package.json

@@ -32,89 +32,90 @@
   "dependencies": {
     "@etherpad/express-session": "^1.18.4",
     "async": "^3.2.6",
-    "axios": "^1.7.7",
-    "cookie-parser": "^1.4.6",
+    "axios": "^1.8.4",
+    "cookie-parser": "^1.4.7",
     "cross-env": "^7.0.3",
-    "cross-spawn": "^7.0.3",
+    "cross-spawn": "^7.0.6",
     "ejs": "^3.1.10",
-    "esbuild": "^0.23.1",
-    "express": "4.21.0",
-    "express-rate-limit": "^7.4.0",
+    "esbuild": "^0.25.2",
+    "express": "4.21.2",
+    "express-rate-limit": "^7.5.0",
     "fast-deep-equal": "^3.1.3",
     "find-root": "1.1.0",
-    "formidable": "^3.5.1",
+    "formidable": "^3.5.2",
     "http-errors": "^2.0.0",
-    "jose": "^5.9.2",
+    "jose": "^5.10.0",
     "js-cookie": "^3.0.5",
-    "jsdom": "^25.0.0",
+    "jsdom": "^26.0.0",
     "jsonminify": "0.4.2",
     "jsonwebtoken": "^9.0.2",
+    "jwt-decode": "^4.0.0",
     "languages4translatewiki": "0.1.3",
     "live-plugin-manager": "^1.0.0",
     "lodash.clonedeep": "4.5.0",
     "log4js": "^6.9.1",
-    "lru-cache": "^11.0.1",
+    "lru-cache": "^11.1.0",
     "measured-core": "^2.0.0",
-    "mime-types": "^2.1.35",
-    "oidc-provider": "^8.5.1",
-    "openapi-backend": "^5.11.0",
+    "mime-types": "^3.0.1",
+    "oidc-provider": "^8.8.1",
+    "openapi-backend": "^5.11.1",
     "proxy-addr": "^2.0.7",
-    "rate-limiter-flexible": "^5.0.3",
-    "rehype": "^13.0.1",
-    "rehype-minify-whitespace": "^6.0.1",
-    "resolve": "1.22.8",
+    "rate-limiter-flexible": "^7.0.0",
+    "rehype": "^13.0.2",
+    "rehype-minify-whitespace": "^6.0.2",
+    "resolve": "1.22.10",
     "rusty-store-kv": "^1.3.1",
     "security": "1.0.0",
-    "semver": "^7.6.3",
-    "socket.io": "^4.7.5",
-    "socket.io-client": "^4.7.5",
-    "superagent": "10.1.0",
+    "semver": "^7.7.1",
+    "socket.io": "^4.8.1",
+    "socket.io-client": "^4.8.1",
+    "superagent": "10.2.0",
     "swagger-ui-express": "^5.0.1",
     "tinycon": "0.6.8",
-    "tsx": "4.19.1",
-    "ueberdb2": "^5.0.2",
+    "tsx": "4.19.3",
+    "ueberdb2": "^5.0.6",
     "underscore": "1.13.7",
     "unorm": "1.6.0",
-    "wtfnode": "^0.9.3"
+    "wtfnode": "^0.10.0"
   },
   "bin": {
     "etherpad-healthcheck": "../bin/etherpad-healthcheck",
     "etherpad-lite": "node/server.ts"
   },
   "devDependencies": {
-    "@playwright/test": "^1.47.1",
+    "@playwright/test": "^1.52.0",
     "@types/async": "^3.2.24",
     "@types/express": "^4.17.21",
     "@types/formidable": "^3.4.5",
     "@types/http-errors": "^2.0.4",
-    "@types/jquery": "^3.5.30",
+    "@types/jquery": "^3.5.32",
     "@types/js-cookie": "^3.0.6",
     "@types/jsdom": "^21.1.7",
-    "@types/jsonwebtoken": "^9.0.7",
+    "@types/jsonwebtoken": "^9.0.9",
     "@types/mime-types": "^2.1.4",
-    "@types/mocha": "^10.0.8",
-    "@types/node": "^22.5.5",
-    "@types/oidc-provider": "^8.5.2",
-    "@types/semver": "^7.5.8",
+    "@types/mocha": "^10.0.9",
+    "@types/node": "^22.14.1",
+    "@types/oidc-provider": "^8.8.1",
+    "@types/semver": "^7.7.0",
     "@types/sinon": "^17.0.3",
     "@types/supertest": "^6.0.2",
-    "@types/swagger-ui-express": "^4.1.6",
-    "@types/underscore": "^1.11.15",
+    "@types/swagger-ui-express": "^4.1.8",
+    "@types/underscore": "^1.13.0",
     "@types/whatwg-mimetype": "^3.0.2",
-    "chokidar": "^4.0.0",
-    "eslint": "^9.10.0",
+    "chokidar": "^4.0.3",
+    "eslint": "^9.23.0",
     "eslint-config-etherpad": "^4.0.4",
     "etherpad-cli-client": "^3.0.2",
-    "mocha": "^10.7.3",
+    "mocha": "^11.1.0",
     "mocha-froth": "^0.2.10",
     "nodeify": "^1.0.1",
     "openapi-schema-validation": "^0.4.2",
-    "set-cookie-parser": "^2.7.0",
-    "sinon": "^19.0.2",
+    "set-cookie-parser": "^2.7.1",
+    "sinon": "^20.0.0",
     "split-grid": "^1.0.11",
-    "supertest": "^7.0.0",
-    "typescript": "^5.6.2",
-    "vitest": "^2.1.1"
+    "supertest": "^7.1.0",
+    "typescript": "^5.8.2",
+    "vitest": "^3.1.1"
   },
   "engines": {
     "node": ">=18.18.2",
@@ -141,6 +142,6 @@
     "debug:socketio": "cross-env DEBUG=socket.io* node --require tsx/cjs node/server.ts",
     "test:vitest": "vitest"
   },
-  "version": "2.2.5",
+  "version": "2.3.0",
   "license": "Apache-2.0"
 }

src/static/js/ace2_inner.ts

@@ -3475,7 +3475,7 @@ function Ace2Inner(editorInfo, cssManagers) {
         // use that for displaying the side div line number inline with the first line
         // of content -- This is used in ep_headings, ep_font_size etc. where the line
         // height is increased.
-        const elementStyle = window.getComputedStyle(docLine.firstChild);
+        const elementStyle = window.getComputedStyle(docLine.firstElementChild);
         const lineHeight = parseInt(elementStyle.getPropertyValue('line-height'));
         const marginBottom = parseInt(elementStyle.getPropertyValue('margin-bottom'));
         lineHeights.push(lineHeight + marginBottom);

src/static/js/pad_editor.ts

@@ -75,11 +75,20 @@ const padeditor = (() => {
         padutils.setCheckbox($('#options-rtlcheck'), ('rtl' === html10n.getDirection()));
       });
 
+
+
       // font family change
       $('#viewfontmenu').on('change', () => {
         pad.changeViewOption('padFontFamily', $('#viewfontmenu').val());
       });
 
+      // delete pad
+      $('#delete-pad').on('click', () => {
+        if (window.confirm(html10n.get('pad.delete.confirm'))) {
+          pad.collabClient.sendMessage({type: 'PAD_DELETE', data:{padId: pad.getPadId()}});
+        }
+      })
+
       // Language
       html10n.bind('localized', () => {
         $('#languagemenu').val(html10n.getLanguage());

src/static/js/pad_userlist.ts

@@ -186,7 +186,7 @@ const paduserlist = (() => {
         const tr = input.closest('tr');
         if (tr.length > 0) {
           const index = tr.parent().children().index(tr);
-          if (index >= 0) {
+          if (index >= 0 && rowsPresent.length > index) {
             const userId = rowsPresent[index].data.id;
             rowManagerMakeNameEditor($(this), userId);
           }

src/static/js/pluginfw/installer.ts

@@ -162,23 +162,18 @@ export const install = async (pluginName: string, cb:Function|null = null) => {
 export let availablePlugins:MapArrayType<PackageInfo>|null = null;
 let cacheTimestamp = 0;
 
-export const getAvailablePlugins = (maxCacheAge: number|false) => {
+export const getAvailablePlugins = async (maxCacheAge: number | false) => {
   const nowTimestamp = Math.round(Date.now() / 1000);
 
-  return new Promise<MapArrayType<PackageInfo>>(async (resolve, reject) => {
   // check cache age before making any request
   if (availablePlugins && maxCacheAge && (nowTimestamp - cacheTimestamp) <= maxCacheAge) {
-      return resolve(availablePlugins);
+    return availablePlugins;
   }
 
-    await axios.get(`${settings.updateServer}/plugins.json`, {headers})
-        .then((pluginsLoaded:AxiosResponse<MapArrayType<PackageInfo>>) => {
+  const pluginsLoaded: AxiosResponse<MapArrayType<PackageInfo>> = await axios.get(`${settings.updateServer}/plugins.json`, {headers})
   availablePlugins = pluginsLoaded.data;
   cacheTimestamp = nowTimestamp;
-          resolve(availablePlugins);
-        })
-        .catch(async (err) => reject(err));
-  });
+  return availablePlugins;
 };
 
 
@@ -211,4 +206,7 @@ export const search = (searchTerm: string, maxCacheAge: number) => getAvailableP
 
       return res;
     }
-);
+).catch((err)=>{
+  logger.error(`Error searching plugins: ${err}`);
+  return {} as MapArrayType<PackageInfo>;
+});

src/static/js/socketio.ts

@@ -24,7 +24,7 @@ const connect = (etherpadBaseUrl, namespace = '/', options = {}) => {
   let socketOptions = {
     path: socketioUrl.pathname,
     upgrade: true,
-    transports: ['websocket'],
+    transports: ['polling', 'websocket'],
   };
   socketOptions = Object.assign(options, socketOptions);
 

src/static/js/types/SocketIOMessage.ts

@@ -192,6 +192,14 @@ export type ClientSaveRevisionMessage = {
   type: 'SAVE_REVISION'
 }
 
+
+export type PadDeleteMessage = {
+  type: 'PAD_DELETE'
+  data: {
+    padId: string
+  }
+}
+
 export type GetChatMessageMessage = {
   type: 'GET_CHAT_MESSAGES',
   start: number,
@@ -283,7 +291,7 @@ export type ChangesetRequestMessage = {
 
 export type CollabroomMessage = {
   type: 'COLLABROOM'
-  data: ClientSendUserInfoUpdate | ClientUserChangesMessage | ChatMessageMessage | GetChatMessageMessage | ClientSaveRevisionMessage | ClientMessageMessage
+  data: ClientSendUserInfoUpdate | ClientUserChangesMessage | ChatMessageMessage | GetChatMessageMessage | ClientSaveRevisionMessage | ClientMessageMessage | PadDeleteMessage
 }
 
 export type ClientVarMessage =  | ClientVarData | ClientDisconnectedMessage | ClientReadyMessage| ChangesetRequestMessage | CollabroomMessage | CustomMessage

src/static/js/vendors/html10n.ts

@@ -538,7 +538,7 @@ export class Html10n {
       for (let i=0, n=langs.length; i < n; i++) {
         lang = langs[i]
         if(!lang) continue;
-        if(!(lang in langs)) {// uh, we don't have this lang availbable..
+        if(!langs.includes(lang)) {// uh, we don't have this lang availbable..
           // then check for related langs
           if(~lang.indexOf('-') != -1) {
             lang = lang.split('-')[0];

src/static/skins/colibris/src/components/popup.css

@@ -81,3 +81,7 @@
 .skin-variant-container {
   text-transform: capitalize;
 }
+
+#delete-pad {
+  background-color: #ff7b72;
+}

src/templates/pad.html

@@ -164,10 +164,10 @@
             </p>
             <% e.end_block(); %>
           </div>
-
+          <button data-l10n-id="pad.settings.delete" id="delete-pad">Delete pad</button>
           <h2 data-l10n-id="pad.settings.about">About</h2>
           <span data-l10n-id="pad.settings.poweredBy">Powered by</span>
-          <a href="https://etherpad.org">Etherpad</a>
+          <a href="https://etherpad.org" target="_blank" referrerpolicy="no-referrer" rel="noopener">Etherpad</a>
           <% if (settings.exposeVersion) { %>(commit <%=settings.getGitCommit()%>)<% } %>
       </div></div>
 

src/tests/backend/common.ts

@@ -250,6 +250,19 @@ export const sendUserChanges = async (socket:any, data:any) => await sendMessage
   },
 });
 
+
+/*
+  * Convenience function to send a delete pad request.
+ */
+export const sendPadDelete = async (socket:any, data:any) => await sendMessage(socket, {
+  type: 'PAD_DELETE',
+  component: 'pad',
+  data: {
+    padId: data.padId
+  },
+});
+
+
 /**
  * Convenience function that waits for an ACCEPT_COMMIT message. Asserts that the new revision
  * matches the expected revision.

ui/package.json

@@ -11,7 +11,7 @@
   },
   "devDependencies": {
     "ep_etherpad-lite": "workspace:../src",
-    "typescript": "^5.6.2",
-    "vite": "^5.4.7"
+    "typescript": "^5.8.2",
+    "vite": "^6.3.2"
   }
 }

ui/pad.html

@@ -385,7 +385,7 @@
       </p>
 
     </div>
-
+    <button data-l10n-id="pad.settings.delete">Delete pad</button>
     <h2 data-l10n-id="pad.settings.about">About</h2>
     <span data-l10n-id="pad.settings.poweredBy">Powered by</span>
     <a href="https://etherpad.org">Etherpad</a>

var/js/.gitignore

@@ -1,2 +0,0 @@
-*.js
-*.map