Set version to 24.02

Also keep this document direct, short and introductory, there's a
already a section in the ejabberd Docs site with all the details.

.github/container/Dockerfile

@@ -1,9 +1,9 @@
 #' Define default build variables
 ## specifc ARGs for METHOD='direct'
-ARG OTP_VSN='25.3'
-ARG ELIXIR_VSN='1.14.4'
+ARG OTP_VSN='26.2'
+ARG ELIXIR_VSN='1.16.1'
 ## specifc ARGs for METHOD='package'
-ARG ALPINE_VSN='3.17'
+ARG ALPINE_VSN='3.19'
 ## general ARGs
 ARG UID='9000'
 ARG USER='ejabberd'

.github/container/ejabberdctl.template

@@ -15,8 +15,8 @@ SCRIPT_DIR="$(cd "$(dirname "$SCRIPT")" && pwd -P)"
 # shellcheck disable=SC2034
 ERTS_VSN="{{erts_vsn}}"
 ERL="{{erl}}"
-IEX="{{bindir}}/iex"
 EPMD="{{epmd}}"
+IEX="{{iexpath}}"
 COOKIE_FILE="$HOME"/.erlang.cookie
 [ -n "$ERLANG_COOKIE" ] && [ ! -f "$COOKIE_FILE" ] && echo "$ERLANG_COOKIE" > "$COOKIE_FILE" && chmod 400 "$COOKIE_FILE"
 
@@ -60,7 +60,6 @@ done
 # define ejabberd variables if not already defined from the command line
 : "${CONFIG_DIR:="{{config_dir}}"}"
 : "${LOGS_DIR:="{{logs_dir}}"}"
-: "${SPOOL_DIR:="{{spool_dir}}"}"
 : "${EJABBERD_CONFIG_PATH:="$CONFIG_DIR/ejabberd.yml"}"
 : "${EJABBERDCTL_CONFIG_PATH:="$CONFIG_DIR/ejabberdctl.cfg"}"
 # Allows passing extra Erlang command-line arguments in vm.args file
@@ -69,6 +68,7 @@ done
 [ -f "$EJABBERDCTL_CONFIG_PATH" ] && . "$EJABBERDCTL_CONFIG_PATH"
 [ -n "$ERLANG_NODE_ARG" ] && ERLANG_NODE="$ERLANG_NODE_ARG"
 [ "$ERLANG_NODE" = "${ERLANG_NODE%.*}" ] && S="-s"
+: "${SPOOL_DIR:="{{spool_dir}}"}"
 : "${EJABBERD_LOG_PATH:="$LOGS_DIR/ejabberd.log"}"
 
 # define erl parameters
@@ -90,11 +90,12 @@ ERL_CRASH_DUMP="$LOGS_DIR"/erl_crash_$(date "+%Y%m%d-%H%M%S").dump
 ERL_INETRC="$CONFIG_DIR"/inetrc
 
 # define ejabberd parameters
-EJABBERD_OPTS="$EJABBERD_OPTS\
-$(sed '/^log_rotate_size/!d;s/:[ \t]*\([0-9]\{1,\}\).*/ \1/;s/:[ \t]*\(infinity\).*/ \1/;s/^/ /' "$EJABBERD_CONFIG_PATH")\
-$(sed '/^log_rotate_count/!d;s/:[ \t]*\([0-9]*\).*/ \1/;s/^/ /' "$EJABBERD_CONFIG_PATH")\
-$(sed '/^log_burst_limit_count/!d;s/:[ \t]*\([0-9]*\).*/ \1/;s/^/ /' "$EJABBERD_CONFIG_PATH")\
-$(sed '/^log_burst_limit_window_time/!d;s/:[ \t]*\([0-9]*[a-z]*\).*/ \1/;s/^/ /' "$EJABBERD_CONFIG_PATH")"
+EJABBERD_OPTS="\
+$(sed '/^log_rotate_size/!d;s/:[ \t]*\([0-9]\{1,\}\).*/ \1/;s/:[ \t]*\(infinity\).*/ \1 /;s/^/ /' "$EJABBERD_CONFIG_PATH")\
+$(sed '/^log_rotate_count/!d;s/:[ \t]*\([0-9]*\).*/ \1 /;s/^/ /' "$EJABBERD_CONFIG_PATH")\
+$(sed '/^log_burst_limit_count/!d;s/:[ \t]*\([0-9]*\).*/ \1 /;s/^/ /' "$EJABBERD_CONFIG_PATH")\
+$(sed '/^log_burst_limit_window_time/!d;s/:[ \t]*\([0-9]*[a-z]*\).*/ \1 /;s/^/ /' "$EJABBERD_CONFIG_PATH")\
+$EJABBERD_OPTS"
 [ -n "$EJABBERD_OPTS" ] && EJABBERD_OPTS="-ejabberd $EJABBERD_OPTS"
 EJABBERD_OPTS="-mnesia dir \"$SPOOL_DIR\" $MNESIA_OPTIONS $EJABBERD_OPTS -s ejabberd"
 
@@ -187,8 +188,8 @@ livewarning()
         echo "Please be extremely cautious with your actions,"
         echo "and exit immediately if you are not completely sure."
         echo ""
-        echo "To exit this LIVE mode and stop ejabberd, press:"
-        echo "  q().  and press the Enter key"
+        echo "To exit and detach this shell from ejabberd, press:"
+        echo "  control+g and then q"
         echo ""
         echo "--------------------------------------------------------------------"
         echo "To bypass permanently this warning, add to ejabberdctl.cfg the line:"
@@ -199,6 +200,39 @@ livewarning()
     fi
 }
 
+check_etop_result()
+{
+    result=$?
+    if [ $result -eq 1 ] ; then
+        echo ""
+        echo "It seems there was some problem running 'ejabberdctl etop'."
+        echo "Is the error message something like this?"
+        echo "  Failed to load module 'etop' because it cannot be found..."
+        echo "Then probably ejabberd was compiled with development tools disabled."
+        echo "To use 'etop', recompile ejabberd with: ./configure --enable-tools"
+        echo ""
+        exit $result
+    fi
+}
+
+check_iex_result()
+{
+    result=$?
+    if [ $result -eq 127 ] ; then
+        echo ""
+        echo "It seems there was some problem finding 'iex' binary from Elixir."
+        echo "Probably ejabberd was compiled with Rebar3 and Elixir disabled, like:"
+        echo "  ./configure"
+        echo "which is equivalent to:"
+        echo "  ./configure --with-rebar=rebar3 --disable-elixir"
+        echo "To use 'iex', recompile ejabberd enabling Elixir or using Mix:"
+        echo "  ./configure --enable-elixir"
+        echo "  ./configure --with-rebar=mix"
+        echo ""
+        exit $result
+    fi
+}
+
 help()
 {
     echo ""
@@ -227,16 +261,30 @@ help()
 }
 
 # dynamic node name helper
-uid()
-{
-    uuid=$(uuidgen 2>/dev/null)
-    random=$(awk 'BEGIN { srand(); print int(rand()*32768) }' /dev/null)
-    [ -z "$uuid" ] && [ -f /proc/sys/kernel/random/uuid ] && uuid=$(cat /proc/sys/kernel/random/uuid)
-    [ -z "$uuid" ] && uuid=$(printf "%X" "${random:-$$}$(date +%M%S)")
-    uuid=$(printf '%s' $uuid | sed 's/^\(...\).*$/\1/')
-    [ $# -eq 0 ] && echo "${uuid}-${ERLANG_NODE}"
-    [ $# -eq 1 ] && echo "${uuid}-${1}-${ERLANG_NODE}"
-    [ $# -eq 2 ] && echo "${uuid}-${1}@${2}"
+uid() {
+  ERTSVERSION="$("$ERL" -version 2>&1 | sed 's|.*\([0-9][0-9]\).*|\1|g')"
+  if [ $ERTSVERSION -lt 11 ] ; then # otp 23.0 includes erts 11.0
+    # Erlang/OTP lower than 23, which doesn's support dynamic node code
+    N=1
+    PF=$(( $$ % 97 ))
+    while
+      case $# in
+        0) NN="${PF}-${N}-${ERLANG_NODE}"
+          ;;
+        1) NN="${PF}-${N}-${1}-${ERLANG_NODE}"
+          ;;
+        2) NN="${PF}-${N}-${1}@${2}"
+          ;;
+      esac
+      N=$(( N + 1 + ( $$ % 5 ) ))
+      "$EPMD" -names 2>/dev/null | grep -q " ${NN%@*} "
+    do :; done
+    echo $NN
+  else
+    # Erlang/OTP 23 or higher: use native dynamic node code
+    # https://www.erlang.org/patches/otp-23.0#OTP-13812
+    echo undefined
+  fi
 }
 
 # stop epmd if there is no other running node
@@ -283,13 +331,18 @@ post_waiter_loop()
     LIST=$@
     HEAD=${LIST%% ; *}
     TAIL=${LIST#* ; }
-    echo ":> ejabberdctl $HEAD"
-    $0 $HEAD
+    HEAD2=${HEAD#\! *}
+    echo ":> ejabberdctl $HEAD2"
+    $0 $HEAD2
     ctlstatus=$?
     if [ $ctlstatus -ne 0 ] ; then
-        echo ":> FAILURE in command '$HEAD' !!! Stopping ejabberd..."
-        $0 halt > /dev/null
-        exit $ctlstatus
+        if [ "$HEAD" != "$HEAD2" ] ; then
+            echo ":> FAILURE in command '$HEAD2' !!! Ignoring result"
+        else
+            echo ":> FAILURE in command '$HEAD' !!! Stopping ejabberd..."
+            $0 halt > /dev/null
+            exit $ctlstatus
+        fi
     fi
     [ "$HEAD" = "$TAIL" ] || post_waiter_loop $TAIL
 }
@@ -307,7 +360,9 @@ wait_status()
         if [ $timeout -eq 0 ] ; then
             status="$1"
         else
-            run_erl "$(uid ctl)" -hidden -noinput -s ejabberd_ctl \
+            run_erl "$(uid ctl)" -hidden -noinput \
+                     -eval 'net_kernel:connect_node('"'$ERLANG_NODE'"')' \
+                     -s ejabberd_ctl \
                      -extra "$ERLANG_NODE" $NO_TIMEOUT status > /dev/null
             status="$?"
         fi
@@ -350,24 +405,31 @@ case $1 in
         ;;
     etop)
         set_dist_client
-        exec_erl "$(uid top)" -hidden -node "$ERLANG_NODE" -s etop \
-                 -s erlang halt -output text
+        exec_erl "$(uid top)" -hidden -remsh "$ERLANG_NODE" \
+                 -eval 'net_kernel:connect_node('"'$ERLANG_NODE'"')' \
+                 -s etop \
+                 -output text
+        check_etop_result
         ;;
     iexdebug)
         debugwarning
         set_dist_client
         exec_iex "$(uid debug)" --remsh "$ERLANG_NODE"
+        check_iex_result
         ;;
     iexlive)
         livewarning
         exec_iex "$ERLANG_NODE" --erl "$EJABBERD_OPTS"
+        check_iex_result
         ;;
     ping)
         PEER=${2:-$ERLANG_NODE}
         [ "$PEER" = "${PEER%.*}" ] && PS="-s"
         set_dist_client
         exec_cmd "$ERL" ${PS:--}name "$(uid ping "$(hostname $PS)")" $ERLANG_OPTS \
-                 -noinput -hidden -eval 'io:format("~p~n",[net_adm:ping('"'$PEER'"')])' \
+                 -noinput -hidden \
+                 -eval 'net_kernel:connect_node('"'$PEER'"')' \
+                 -eval 'io:format("~p~n",[net_adm:ping('"'$PEER'"')])' \
                  -s erlang halt -output text
         ;;
     started)
@@ -383,7 +445,9 @@ case $1 in
         ;;
     *)
         set_dist_client
-        run_erl "$(uid ctl)" -hidden -noinput -s ejabberd_ctl \
+        run_erl "$(uid ctl)" -hidden -noinput \
+                 -eval 'net_kernel:connect_node('"'$ERLANG_NODE'"')' \
+                 -s ejabberd_ctl \
                  -extra "$ERLANG_NODE" $NO_TIMEOUT "$@"
         result=$?
         case $result in

.github/workflows/ci.yml

@@ -25,7 +25,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        otp: ['20.0', '25.3', '26.1']
+        otp: ['20.0', '25', '26', '27.0-rc1']
     runs-on: ubuntu-20.04
     services:
       redis:
@@ -38,7 +38,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Test shell scripts
-      if: matrix.otp == '25.3'
+      if: matrix.otp == '26'
       run: |
         shellcheck test/ejabberd_SUITE_data/gencerts.sh
         shellcheck tools/captcha.sh
@@ -46,13 +46,12 @@ jobs:
         shellcheck -x ejabberdctl.template
 
     - name: Get specific Erlang/OTP
-      if: matrix.otp != '25.3'
       uses: erlef/setup-beam@v1
       with:
         otp-version: ${{ matrix.otp }}
 
     - name: Get a compatible Rebar3
-      if: matrix.otp <= '21.3'
+      if: matrix.otp < 24
       run: |
         rm rebar3
         wget https://github.com/processone/ejabberd/raw/21.12/rebar3
@@ -104,14 +103,14 @@ jobs:
       run: sed -i 's|, syntax_tools||g' src/ejabberd.app.src.script
 
     - name: Cache rebar
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: |
           ~/.cache/rebar3/
         key: ${{matrix.otp}}-${{hashFiles('rebar.config')}}
 
     - name: Download test logs
-      if: matrix.otp == '25.3' && github.repository == 'processone/ejabberd'
+      if: matrix.otp == '26' && github.repository == 'processone/ejabberd'
       continue-on-error: true
       run: |
         mkdir -p _build/test
@@ -191,7 +190,7 @@ jobs:
         find logs/ -name exunit.log -exec cat '{}' ';'
 
     - name: Send to coveralls
-      if: matrix.otp == '25.3'
+      if: matrix.otp == '26'
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
@@ -220,7 +219,7 @@ jobs:
         echo "::notice::View CT results: https://processone.github.io/ecil/logs/$CTRUN/"
 
     - name: Check for changes to trigger schema upgrade test
-      uses: dorny/paths-filter@v2
+      uses: dorny/paths-filter@v3
       id: filter
       with:
         filters: |
@@ -301,7 +300,7 @@ jobs:
 
     - name: Upload CT logs
       if: failure()
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ejabberd-ct-logs-${{matrix.otp}}
         #

.github/workflows/container.yml

@@ -19,7 +19,7 @@ env:
 jobs:
   container:
     name: Container
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions:
       packages: write
     steps:
@@ -29,14 +29,14 @@ jobs:
           fetch-depth: 0
 
       - name: Cache build directory
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/build/
-          key: ${{runner.os}}-ctr-ct-ng-1.25.0
+          key: ${{runner.os}}-ctr-ct-ng-1.26.0
 
       - name: Get erlang/OTP version for bootstrapping
         run: |
-          echo "OTP_VSN=$(awk '/^otp_vsn=/ {{gsub(/[^0-9.]/, ""); print}}' tools/make-binaries)" >> $GITHUB_ENV
+          echo "OTP_VSN=$(awk '/^otp_vsn=/ {{gsub(/[^0-9.rc-]/, ""); print}}' tools/make-binaries)" >> $GITHUB_ENV
           echo "ELIXIR_VSN=$(awk '/^elixir_vsn=/ {{gsub(/[^0-9.]/, ""); print}}' tools/make-binaries)" >> $GITHUB_ENV
 
       - name: Install prerequisites

.github/workflows/installers.yml

@@ -21,10 +21,10 @@ on:
 jobs:
   binaries:
     name: Binaries
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Cache build directory
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/build/
           key: ${{runner.os}}-ct-ng-1.26.0
@@ -55,7 +55,7 @@ jobs:
           mkdir ejabberd-packages
           mv ejabberd_*.deb ejabberd-*.rpm ejabberd-*.run ejabberd-packages
       - name: Upload packages
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ejabberd-packages
           #
@@ -70,11 +70,11 @@ jobs:
   release:
     name: Release
     needs: [binaries]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     if: github.ref_type == 'tag'
     steps:
       - name: Download packages
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: ejabberd-packages
       - name: Draft Release

.github/workflows/runtime.yml

@@ -31,12 +31,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        otp: ['20.3', '25.3', '26']
+        otp: ['20', '25', '26', '27']
         rebar: ['rebar', 'rebar3']
-        exclude:
-        - otp: '26'
-          rebar: 'rebar'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     container:
       image: erlang:${{ matrix.otp }}
 
@@ -44,89 +41,259 @@ jobs:
 
     - uses: actions/checkout@v4
 
+    - name: Get compatible Rebar binaries
+      if: matrix.otp < 24
+      run: |
+        rm rebar
+        rm rebar3
+        wget https://github.com/processone/ejabberd/raw/21.12/rebar
+        wget https://github.com/processone/ejabberd/raw/21.12/rebar3
+        chmod +x rebar
+        chmod +x rebar3
+
     - name: Prepare libraries
       run: |
         apt-get -qq update
-        apt-get purge -y libgd3
+        apt-get purge -y libgd3 nginx
         apt-get -qq install libexpat1-dev libgd-dev libpam0g-dev \
                             libsqlite3-dev libwebp-dev libyaml-dev
 
     - name: Compile
       run: |
         ./autogen.sh
-        ./configure --with-rebar=`which ${{ matrix.rebar }}` \
+        ./configure --with-rebar=./${{ matrix.rebar }} \
                     --prefix=/tmp/ejabberd \
                     --enable-all \
                     --disable-elixir \
+                    --disable-tools \
                     --disable-odbc
         make update
         make
 
     - run: make xref
 
-    - name: Test rel (rebar2)
+    - name: Prepare rel (rebar2)
       if: matrix.rebar == 'rebar'
       run: |
-        make rel
-        rel/ejabberd/bin/ejabberdctl start \
-          && rel/ejabberd/bin/ejabberdctl started
-        rel/ejabberd/bin/ejabberdctl register user1 localhost s0mePass
-        rel/ejabberd/bin/ejabberdctl registered_users localhost
-        cat rel/ejabberd/logs/*
+        mkdir -p _build/prod && ln -s `pwd`/rel/ _build/prod/rel
+        mkdir -p _build/dev  && ln -s `pwd`/rel/ _build/dev/rel
 
-    - name: Test rel
-      if: matrix.rebar != 'rebar'
+    - name: Run rel
       run: |
         make rel
         _build/prod/rel/ejabberd/bin/ejabberdctl start \
           && _build/prod/rel/ejabberd/bin/ejabberdctl started
         _build/prod/rel/ejabberd/bin/ejabberdctl register user1 localhost s0mePass
-        _build/prod/rel/ejabberd/bin/ejabberdctl registered_users localhost
+        _build/prod/rel/ejabberd/bin/ejabberdctl registered_users localhost > registered.log
         _build/prod/rel/ejabberd/bin/ejabberdctl stop \
           && _build/prod/rel/ejabberd/bin/ejabberdctl stopped
-        cat _build/prod/rel/ejabberd/logs/*
 
-    - name: Test dev
-      if: matrix.rebar != 'rebar'
+    - name: Run dev
       run: |
         make dev
         _build/dev/rel/ejabberd/bin/ejabberdctl start \
           && _build/dev/rel/ejabberd/bin/ejabberdctl started
-        _build/dev/rel/ejabberd/bin/ejabberdctl register user1 localhost s0mePass
-        _build/dev/rel/ejabberd/bin/ejabberdctl registered_users localhost
+        _build/dev/rel/ejabberd/bin/ejabberdctl register user2 localhost s0mePass
+        _build/dev/rel/ejabberd/bin/ejabberdctl registered_users localhost >> registered.log
         _build/dev/rel/ejabberd/bin/ejabberdctl stop \
           && _build/dev/rel/ejabberd/bin/ejabberdctl stopped
+
+    - name: Run install
+      run: |
+        make install
+        /tmp/ejabberd/sbin/ejabberdctl start \
+          && /tmp/ejabberd/sbin/ejabberdctl started
+        /tmp/ejabberd/sbin/ejabberdctl register user3 localhost s0mePass
+        /tmp/ejabberd/sbin/ejabberdctl registered_users localhost >> registered.log
+        /tmp/ejabberd/sbin/ejabberdctl stop \
+          && /tmp/ejabberd/sbin/ejabberdctl stopped
+
+    - name: View logs
+      run: |
+        echo "===> Registered:"
+        cat registered.log
+        echo "===> Prod:"
+        cat _build/prod/rel/ejabberd/logs/*
+        echo "===> Dev:"
         cat _build/dev/rel/ejabberd/logs/*
+        echo "===> Install:"
+        cat /tmp/ejabberd/var/log/ejabberd/*
+
+    - name: Check logs
+      run: |
+        grep -q '^user1$' registered.log
+        grep -q '^user2$' registered.log
+        grep -q '^user3$' registered.log
+        grep -q 'is started' _build/prod/rel/ejabberd/logs/ejabberd.log
+        grep -q 'is stopped' _build/prod/rel/ejabberd/logs/ejabberd.log
+        test $(find _build/prod/rel/ -empty -name error.log)
+        grep -q 'is started' _build/dev/rel/ejabberd/logs/ejabberd.log
+        grep -q 'is stopped' _build/dev/rel/ejabberd/logs/ejabberd.log
+        test $(find _build/dev/rel/ -empty -name error.log)
+        grep -q 'is started' /tmp/ejabberd/var/log/ejabberd/ejabberd.log
+        grep -q 'is stopped' /tmp/ejabberd/var/log/ejabberd/ejabberd.log
+        test $(find /tmp/ejabberd/var/log/ejabberd/ -empty -name error.log)
+
+    - name: View logs failures
+      if: always()
+      run: |
+        cat _build/prod/rel/ejabberd/logs/ejabberd.log
+        cat _build/prod/rel/ejabberd/logs/error.log
+        cat _build/dev/rel/ejabberd/logs/ejabberd.log
+        cat _build/dev/rel/ejabberd/logs/error.log
+        cat /tmp/ejabberd/var/log/ejabberd/ejabberd.log
+        cat /tmp/ejabberd/var/log/ejabberd/error.log
+
+  rebar3-elixir:
+    name: Rebar3+Elixir
+    strategy:
+      fail-fast: false
+      matrix:
+        otp: ['23.0', '25', '26', '27.0-rc1']
+        elixir: ['1.13.4', '1.15.7', '1.16']
+        exclude:
+        - otp: '23.0'
+          elixir: '1.15.7'
+        - otp: '23.0'
+          elixir: '1.16'
+        - otp: '26'
+          elixir: '1.13.4'
+        - otp: '27.0-rc1'
+          elixir: '1.13.4'
+    runs-on: ubuntu-20.04
+
+    steps:
+
+    - uses: actions/checkout@v4
+
+    - name: Get specific Erlang/OTP
+      uses: erlef/setup-beam@v1
+      with:
+        otp-version: ${{matrix.otp}}
+        elixir-version: ${{matrix.elixir}}
+
+    - name: Get compatible Rebar binaries
+      if: matrix.otp < 24
+      run: |
+        rm rebar
+        rm rebar3
+        wget https://github.com/processone/ejabberd/raw/21.12/rebar
+        wget https://github.com/processone/ejabberd/raw/21.12/rebar3
+        chmod +x rebar
+        chmod +x rebar3
+
+    - name: Prepare libraries
+      run: |
+        sudo apt-get -qq update
+        sudo apt-get -y purge libgd3 nginx
+        sudo apt-get -qq install libexpat1-dev libgd-dev libpam0g-dev \
+                                 libsqlite3-dev libwebp-dev libyaml-dev
+
+    - name: Enable ModPresenceDemo and an Elixir dependency
+      run: |
+        sed -i "s|^modules:|modules:\n  'ModPresenceDemo': {}|g" ejabberd.yml.example
+        cat ejabberd.yml.example
+        sed -i 's|^{deps, \(.*\)|{deps, \1\n  {decimal, ".*", {git, "https://github.com/ericmj/decimal", {branch, "main"}}}, |g' rebar.config
+        cat rebar.config
+
+    - name: Compile
+      run: |
+        ./autogen.sh
+        ./configure --with-rebar=./rebar3 \
+                    --prefix=/tmp/ejabberd \
+                    --enable-all \
+                    --disable-odbc
+        make update
+        make
+
+    - run: make xref
+
+    - name: Run rel
+      run: |
+        make rel
+        _build/prod/rel/ejabberd/bin/ejabberdctl start \
+          && _build/prod/rel/ejabberd/bin/ejabberdctl started
+        _build/prod/rel/ejabberd/bin/ejabberdctl register user1 localhost s0mePass
+        _build/prod/rel/ejabberd/bin/ejabberdctl registered_users localhost > registered.log
+        _build/prod/rel/ejabberd/bin/ejabberdctl stop \
+          && _build/prod/rel/ejabberd/bin/ejabberdctl stopped
+
+    - name: Run dev
+      run: |
+        make dev
+        _build/dev/rel/ejabberd/bin/ejabberdctl start \
+          && _build/dev/rel/ejabberd/bin/ejabberdctl started
+        _build/dev/rel/ejabberd/bin/ejabberdctl register user2 localhost s0mePass
+        _build/dev/rel/ejabberd/bin/ejabberdctl registered_users localhost >> registered.log
+        _build/dev/rel/ejabberd/bin/ejabberdctl stop \
+          && _build/dev/rel/ejabberd/bin/ejabberdctl stopped
+
+    - name: Run install
+      run: |
+        make install
+        /tmp/ejabberd/sbin/ejabberdctl start \
+          && /tmp/ejabberd/sbin/ejabberdctl started
+        /tmp/ejabberd/sbin/ejabberdctl register user3 localhost s0mePass
+        /tmp/ejabberd/sbin/ejabberdctl registered_users localhost >> registered.log
+        /tmp/ejabberd/sbin/ejabberdctl stop \
+          && /tmp/ejabberd/sbin/ejabberdctl stopped
+
+    - name: View logs
+      if: always()
+      run: |
+        echo "===> Registered:"
+        cat registered.log
+        echo "===> Prod:"
+        cat _build/prod/rel/ejabberd/logs/*
+        echo "===> Dev:"
+        cat _build/dev/rel/ejabberd/logs/*
+        echo "===> Install:"
+        cat /tmp/ejabberd/var/log/ejabberd/*
+
+    - name: Check logs
+      if: always()
+      run: |
+        grep -q '^user1$' registered.log
+        grep -q '^user2$' registered.log
+        grep -q '^user3$' registered.log
+        grep -q 'is started' _build/prod/rel/ejabberd/logs/ejabberd.log
+        grep -q 'is stopped' _build/prod/rel/ejabberd/logs/ejabberd.log
+        grep -q 'module Presence Demo' _build/prod/rel/ejabberd/logs/ejabberd.log
+        test $(find _build/prod/ -empty -name error.log)
+        grep -q 'is started' _build/dev/rel/ejabberd/logs/ejabberd.log
+        grep -q 'is stopped' _build/dev/rel/ejabberd/logs/ejabberd.log
+        grep -q 'module Presence Demo' _build/dev/rel/ejabberd/logs/ejabberd.log
+        test $(find _build/dev/ -empty -name error.log)
+        grep -q 'is started' /tmp/ejabberd/var/log/ejabberd/ejabberd.log
+        grep -q 'is stopped' /tmp/ejabberd/var/log/ejabberd/ejabberd.log
+        grep -q 'module Presence Demo' /tmp/ejabberd/var/log/ejabberd/ejabberd.log
+        test $(find /tmp/ejabberd/var/log/ejabberd/ -empty -name error.log)
+
+    - name: View logs failures
+      if: failure()
+      run: |
+        cat _build/prod/rel/ejabberd/logs/ejabberd.log
+        cat _build/prod/rel/ejabberd/logs/error.log
+        cat _build/dev/rel/ejabberd/logs/ejabberd.log
+        cat _build/dev/rel/ejabberd/logs/error.log
+        cat /tmp/ejabberd/var/log/ejabberd/ejabberd.log
+        cat /tmp/ejabberd/var/log/ejabberd/error.log
 
   mix:
     name: Mix
     strategy:
       fail-fast: false
       matrix:
-        otp: ['21.3', '25.0', '26']
-        elixir: ['1.10.3', '1.11.4', '1.12.3', '1.13.4', '1.14.5', '1.15']
+        otp: ['23.0', '25', '26', '27.0-rc1']
+        elixir: ['1.13.4', '1.15.7', '1.16']
         exclude:
-        - otp: '21.3'
-          elixir: '1.12.3'
-        - otp: '21.3'
+        - otp: '23.0'
+          elixir: '1.15.7'
+        - otp: '23.0'
+          elixir: '1.16'
+        - otp: '26'
           elixir: '1.13.4'
-        - otp: '21.3'
-          elixir: '1.14.5'
-        - otp: '21.3'
-          elixir: '1.15'
-        - otp: '25.0'
-          elixir: '1.10.3'
-        - otp: '25.0'
-          elixir: '1.11.4'
-        - otp: '25.0'
-          elixir: '1.12.3'
-        - otp: '26'
-          elixir: '1.10.3'
-        - otp: '26'
-          elixir: '1.11.4'
-        - otp: '26'
-          elixir: '1.12.3'
-        - otp: '26'
+        - otp: '27.0-rc1'
           elixir: '1.13.4'
     runs-on: ubuntu-20.04
 
@@ -155,19 +322,27 @@ jobs:
         echo "::remove-matcher owner=elixir-mixTestFailure::"
         echo "::remove-matcher owner=elixir-dialyzerOutputDefault::"
 
+    - name: Enable ModPresenceDemo and an Elixir dependency
+      run: |
+        sed -i "s|^modules:|modules:\n  'ModPresenceDemo': {}|g" ejabberd.yml.example
+        cat ejabberd.yml.example
+        sed -i 's|^{deps, \(.*\)|{deps, \1\n  {decimal, ".*", {git, "https://github.com/ericmj/decimal", {branch, "main"}}}, |g' rebar.config
+        cat rebar.config
+
     - name: Compile
       run: |
         ./autogen.sh
         ./configure --with-rebar=mix \
                     --prefix=/tmp/ejabberd \
                     --enable-all \
-                    --disable-elixir \
                     --disable-odbc
         mix deps.get
         make
 
     - run: make xref
 
+    - run: make edoc
+
     - name: Run rel
       run: |
         make rel
@@ -188,17 +363,46 @@ jobs:
         _build/dev/rel/ejabberd/bin/ejabberdctl stop \
           && _build/dev/rel/ejabberd/bin/ejabberdctl stopped
 
-    - name: Check rel
+    - name: Run install
+      run: |
+        make install
+        /tmp/ejabberd/sbin/ejabberdctl start \
+          && /tmp/ejabberd/sbin/ejabberdctl started
+        /tmp/ejabberd/sbin/ejabberdctl register user3 localhost s0mePass
+        /tmp/ejabberd/sbin/ejabberdctl registered_users localhost >> registered.log
+        /tmp/ejabberd/sbin/ejabberdctl stop \
+          && /tmp/ejabberd/sbin/ejabberdctl stopped
+
+    - name: View logs
+      if: always()
+      run: |
+        echo "===> Registered:"
+        cat registered.log
+        echo "===> Prod:"
+        cat _build/prod/rel/ejabberd/logs/*
+        echo "===> Dev:"
+        cat _build/dev/rel/ejabberd/logs/*
+        echo "===> Install:"
+        cat /tmp/ejabberd/var/log/ejabberd/*
+
+    - name: Check logs
       if: always()
       run: |
         grep -q '^user1$' registered.log
         grep -q '^user2$' registered.log
+        grep -q '^user3$' registered.log
         grep -q 'is started' _build/prod/rel/ejabberd/logs/ejabberd.log
         grep -q 'is stopped' _build/prod/rel/ejabberd/logs/ejabberd.log
+        grep -q 'module Presence Demo' _build/prod/rel/ejabberd/logs/ejabberd.log
         test $(find _build/prod/ -empty -name error.log)
         grep -q 'is started' _build/dev/rel/ejabberd/logs/ejabberd.log
         grep -q 'is stopped' _build/dev/rel/ejabberd/logs/ejabberd.log
+        grep -q 'module Presence Demo' _build/dev/rel/ejabberd/logs/ejabberd.log
         test $(find _build/dev/ -empty -name error.log)
+        grep -q 'is started' /tmp/ejabberd/var/log/ejabberd/ejabberd.log
+        grep -q 'is stopped' /tmp/ejabberd/var/log/ejabberd/ejabberd.log
+        grep -q 'module Presence Demo' /tmp/ejabberd/var/log/ejabberd/ejabberd.log
+        test $(find /tmp/ejabberd/var/log/ejabberd/ -empty -name error.log)
 
     - name: View logs failures
       if: failure()
@@ -207,3 +411,5 @@ jobs:
         cat _build/prod/rel/ejabberd/logs/error.log
         cat _build/dev/rel/ejabberd/logs/ejabberd.log
         cat _build/dev/rel/ejabberd/logs/error.log
+        cat /tmp/ejabberd/var/log/ejabberd/ejabberd.log
+        cat /tmp/ejabberd/var/log/ejabberd/error.log

CHANGELOG.md

@@ -1,4 +1,86 @@
-# Version 23.10
+## Version 24.02
+
+Core:
+- Added Matrix gateway in `mod_matrix_gw`
+- Support SASL2 and Bind2
+- Support tls-server-end-point channel binding and sasl2 codec
+- Support tls-exporter channel binding
+- Support XEP-0474: SASL SCRAM Downgrade Protection
+- Fix presenting features and returning results of inline bind2 elements
+- [`disable_sasl_scram_downgrade_protection`](https://docs.ejabberd.im/admin/configuration/toplevel/#disable-sasl-scram-downgrade-protection): New option to disable XEP-0474
+- [`negotiation_timeout`](https://docs.ejabberd.im/admin/configuration/toplevel/#negotiation-timeout): Increase default value from 30s to 2m
+- mod_carboncopy: Teach how to interact with bind2 inline requests
+
+Other:
+- ejabberdctl: Fix startup problem when having set `EJABBERD_OPTS` and logger options
+- ejabberdctl: Set EJABBERD_OPTS back to `""`, and use previous flags as example
+- eldap: Change logic for `eldap tls_verify=soft` and `false`
+- eldap: Don't set `fail_if_no_peer_cert` for eldap ssl client connections
+- Ignore hints when checking for chat states
+- mod_mam: Support XEP-0424 Message Retraction
+- mod_mam: Fix XEP-0425: Message Moderation with SQL storage
+- mod_ping: Support XEP-0198 pings when stream management is enabled
+- mod_pubsub: Normalize pubsub `max_items` node options on read
+- mod_pubsub: PEP nodetree: Fix reversed logic in node fixup function
+- mod_pubsub: Only care about PEP bookmarks options when creating node from scratch
+
+SQL:
+- MySQL: Support `sha256_password` auth plugin
+- ejabberd_sql_schema: Use the first unique index as a primary key
+- Update SQL schema files for MAM's XEP-0424
+- New option [`sql_flags`](https://docs.ejabberd.im/admin/configuration/toplevel/#sql-flags): right now only useful to enable `mysql_alternative_upsert`
+
+Installers and Container:
+- Container: Add ability to ignore failures in execution of `CTL_ON_*` commands
+- Container: Update to Erlang/OTP 26.2, Elixir 1.16.1 and Alpine 3.19
+- Container: Update this custom ejabberdctl to match the main one
+- make-binaries: Bump OpenSSL 3.2.1, Erlang/OTP 26.2.2, Elixir 1.16.1
+- make-binaries: Bump many dependency versions
+
+Commands API:
+- `print_sql_schema`: New command available in ejabberdctl command-line script
+- ejabberdctl: Rework temporary node name generation
+- ejabberdctl: Print argument description, examples and note in help
+- ejabberdctl: Document exclusive ejabberdctl commands like all the others
+- Commands: Add a new [`muc_sub`](https://docs.ejabberd.im/developer/ejabberd-api/admin-tags/#muc-sub) tag to all the relevant commands
+- Commands: Improve syntax of many commands documentation
+- Commands: Use list arguments in many commands that used separators
+- Commands: [`set_presence`](https://docs.ejabberd.im/developer/ejabberd-api/admin-api/#set-presence): switch priority argument from string to integer
+- ejabberd_commands: Add the command API version as [a tag `vX`](https://docs.ejabberd.im/developer/ejabberd-api/admin-tags/#v1)
+- ejabberd_ctl: Add support for list and tuple arguments
+- ejabberd_xmlrpc: Fix support for restuple error response
+- mod_http_api: When no specific API version is requested, use the latest
+
+Compilation with Rebar3/Elixir/Mix:
+- Fix compilation with Erlang/OTP 27: don't use the reserved word 'maybe'
+- configure: Fix explanation of `--enable-group` option ([#4135](https://github.com/processone/ejabberd/issues/4135))
+- Add observer and runtime_tools in releases when `--enable-tools`
+- Update "make translations" to reduce build requirements
+- Use Luerl 1.0 for Erlang 20, 1.1.1 for 21-26, and temporary fork for 27
+- Makefile: Add `install-rel` and `uninstall-rel`
+- Makefile: Rename `make rel` to `make prod`
+- Makefile: Update `make edoc` to use ExDoc, requires mix
+- Makefile: No need to use `escript` to run rebar|rebar3|mix
+- configure: If `--with-rebar=rebar3` but rebar3 not system-installed, use local one
+- configure: Use Mix or Rebar3 by default instead of Rebar2 to compile ejabberd
+- ejabberdctl: Detect problem running iex or etop and show explanation
+- Rebar3: Include Elixir files when making a release
+- Rebar3: Workaround to fix protocol consolidation
+- Rebar3: Add support to compile Elixir dependencies
+- Rebar3: Compile explicitly our Elixir files when `--enable-elixir`
+- Rebar3: Provide proper path to `iex`
+- Rebar/Rebar3: Update binaries to work with Erlang/OTP 24-27
+- Rebar/Rebar3: Remove Elixir as a rebar dependency
+- Rebar3/Mix: If `dev` profile/environment, enable tools automatically
+- Elixir: Fix compiling ejabberd as a dependency ([#4128](https://github.com/processone/ejabberd/issues/4128))
+- Elixir: Fix ejabberdctl start/live when installed
+- Elixir: Fix: `FORMATTER ERROR: bad return value` ([#4087](https://github.com/processone/ejabberd/issues/4087))
+- Elixir: Fix: Couldn't find file `Elixir Hex API`
+- Mix: Enable stun by default when `vars.config` not found
+- Mix: New option `vars_config_path` to set path to `vars.config` ([#4128](https://github.com/processone/ejabberd/issues/4128))
+- Mix: Fix ejabberdctl iexlive problem locating iex in an OTP release
+
+## Version 23.10
 
 Compilation:
 - Erlang/OTP: Raise the requirement to Erlang/OTP 20.0 as a minimum
@@ -106,7 +188,7 @@ SQL:
 - `mod_privacy_sql`: Optimize `set_list`
 - `mod_privacy_sql`: Use more efficient way to calculate changes in `set_privacy_list`
 
-# Version 23.04
+## Version 23.04
 
 General:
 - New `s2s_out_bounce_packet` hook
@@ -190,7 +272,7 @@ Installers:
 - make-binaries: Fix building with erlang/otp v25.x
 - make-packages: Fix for installers workflow, which didn't find lynx
 
-# Version 23.01
+## Version 23.01
 
 General:
 - Add `misc:uri_parse/2` to allow declaring default ports for protocols
@@ -244,7 +326,7 @@ VSCode:
 - Add Erlang LS default configuration
 - Add Elvis default configuration
 
-# Version 22.10
+## Version 22.10
 
 Core:
 - Add `log_burst_limit_*` options ([#3865](https://github.com/processone/ejabberd/issues/3865))
@@ -284,7 +366,7 @@ MUC:
 - Don't persist `none` role ([#3330](https://github.com/processone/ejabberd/issues/3330))
 - Allow MUC service admins to bypass max_user_conferences limitation
 - Show allow_query_users room option in disco info ([#3830](https://github.com/processone/ejabberd/issues/3830))
-- Don't set affiliation to `none` if it's already `none` in `mod_muc_room:process_item_change/3`
+- mod_muc_room: Don't set affiliation to `none` if it's already `none` in `process_item_change/3`
 - Fix mucsub unsubscribe notification payload to have muc_unsubcribe in it
 - Allow muc_{un}subscribe hooks to modify sent packets
 - Pass room state to muc_{un}subscribed hook
@@ -354,7 +436,7 @@ Workflows Actions:
 - CI: Remove syntax_tools from applications, as fast_xml fails Dialyzer
 - Runtime: Add Xref options to be as strict as CI
 
-# Version 22.05
+## Version 22.05
 
 Core
 - C2S: Don't expect that socket will be available in `c2s_terminated` hook
@@ -459,7 +541,7 @@ Workflows
 - Installers: New workflow to build binary packages
 - Runtime: New workflow to test compilation, rel, starting and ejabberdctl
 
-# Version 21.12
+## Version 21.12
 
 Commands
 - `create_room_with_opts`: Fixed when using SQL storage
@@ -506,7 +588,7 @@ Other
 - Update export/import of scram password to XEP-0227 1.1
 - Update Jose to 1.11.1 (the last in hex.pm correctly versioned)
 
-# Version 21.07
+## Version 21.07
 
 Compilation
 - Add rebar3 3.15.2 binary
@@ -552,7 +634,7 @@ SQL:
 - mod_mqtt: Add mqtt_pub table definition for MSSQL
 - mod_shared_roster: Add missing indexes to `sr_group` tables in all SQL databases
 
-# Version 21.04
+## Version 21.04
 
 API Commands:
 - `add_rosteritem/...`: Add argument guards to roster commands
@@ -590,7 +672,7 @@ Modules:
 - `mod_pubsub`: Fix `gen_pubsub_node:get_state` return value
 - `mod_vcard`: Obtain and provide photo type in vCard LDAP
 
-# Version 21.01
+## Version 21.01
 
 Miscellaneous changes:
 - `log_rotate_size` option: Fix handling of ‘infinity’ value
@@ -625,7 +707,7 @@ Translations:
 - Moved gettext PO files to a new `ejabberd-po` repository
 - Improved several translations: Catalan, Chinese, German, Greek, Indonesian, Norwegian, Portuguese (Brazil), Spanish.
 
-# Version 20.12
+## Version 20.12
 
 - Add support for `SCRAM-SHA-{256,512}-{PLUS}` authentication
 - Don't use same value in cache for user don't exist and wrong password
@@ -660,7 +742,7 @@ Translations:
 - WebAdmin: Mark dangerous buttons with CSS
 - WebSocket: Make websocket send put back pressure on c2s process
 
-# Version 20.07
+## Version 20.07
 
 * Changes in this version
 - Add support for using unix sockets in listeners.
@@ -687,7 +769,7 @@ Translations:
   they were passed to handler modules
 - Make stun module work better with ipv6 addresses
 
-# Version 20.03
+## Version 20.03
 
 * Changes in this version
 - Add support of ssl connection when connection to mysql
@@ -707,7 +789,7 @@ Translations:
 - Fix reporting errors in `send_stanza` command when xml
   passed to it couldn't be passed correctly
 
-# Version 20.02
+## Version 20.02
 
 * Changes in this version
 - Fix problems when trying to use string format with unicode
@@ -725,7 +807,7 @@ Translations:
   override built-in values
 - Fix return value of reload_config and dump_config commands
 
-# Version 20.01
+## Version 20.01
 
 * New features
 - Implement OAUTH authentication in mqtt
@@ -758,7 +840,7 @@ Translations:
   failed
 - Fix crash in stream management when timeout was not set
 
-# Version 19.09
+## Version 19.09
 
 * Admin
 - The minimum required Erlang/OTP version is now 19.3
@@ -811,7 +893,7 @@ Translations:
 - Correctly handle unicode in log messages
 - Fix unicode processing in ejabberd.yml
 
-# Version 19.08
+## Version 19.08
 
 * Administration
 - Improve ejabberd halting procedure
@@ -856,7 +938,7 @@ Translations:
 - Remove deprecated pubsub plugins
 - Expose access_model and publish_model in pubsub#metadata
 
-# Version 19.05
+## Version 19.05
 
 * Admin
 - The minimum required Erlang/OTP version is now 19.1
@@ -933,7 +1015,7 @@ Translations:
 - mod_mqtt: Support other socket modules
 - mod_push: Check for payload in encrypted messages
 
-# Version 19.02
+## Version 19.02
 
 * Admin
 - Fix in configure.ac the Erlang/OTP version: from 17.5 to 19.0
@@ -987,7 +1069,7 @@ Translations:
 - Translations: fixed "make translations"
 - WebAdmin: Fix support to restart module with new options
 
-# Version 18.12
+## Version 18.12
 
 * MAM data store compression
 * Proxy protocol support

COMPILE.md

@@ -28,7 +28,8 @@ Other optional libraries are:
 - PAM library, for Pluggable Authentication Modules (PAM)
 - ImageMagick's Convert program and Ghostscript fonts, for CAPTCHA
   challenges
-- Elixir ≥ 1.10.3, to support Elixir, and alternative to rebar/rebar3
+- Elixir ≥ 1.10.3, for Elixir support. It is recommended Elixir 1.13.4 or higher
+  and Erlang/OTP 23.0 or higher.
 
 If your system splits packages in libraries and development headers,
 install the development packages too.
@@ -89,13 +90,8 @@ Build an OTP Release
 Instead of installing ejabberd in the system, you can build an OTP release
 that includes all necessary to run ejabberd in a subdirectory:
 
-    ./configure --with-rebar=rebar3
-    make rel
-
-Or, if you have Elixir available and plan to develop Elixir code:
-
-    ./configure --with-rebar=mix
-    make dev
+    ./configure
+    make prod
 
 Check the full list of targets:
 

CONTAINER.md

@@ -19,7 +19,7 @@ that includes [XMPP][xmpp] Server, [MQTT][mqtt] Broker and [SIP][sip] Service.
 This document explains how to use the `ejabberd` container image available in
 [ghcr.io/processone/ejabberd](https://github.com/processone/ejabberd/pkgs/container/ejabberd),
 built using the files in `.github/container/`.
-This image is based in Alpine 3.17, includes Erlang/OTP 25.3 and Elixir 1.14.4.
+This image is based in Alpine 3.19, includes Erlang/OTP 26.2 and Elixir 1.16.1.
 
 Alternatively, there is also the `ecs` container image available in
 [docker.io/ejabberd/ecs](https://hub.docker.com/r/ejabberd/ecs/),
@@ -33,9 +33,9 @@ If you are using a Windows operating system, check the tutorials mentioned in
 
 
 Start ejabberd
-==============
+--------------
 
-## With default configuration
+### With default configuration
 
 Start ejabberd in a new container:
 
@@ -59,7 +59,7 @@ docker restart ejabberd
 ```
 
 
-## Start with Erlang console attached
+### Start with Erlang console attached
 
 Start ejabberd with an Erlang console attached using the `live` command:
 
@@ -70,7 +70,7 @@ docker run --name ejabberd -it -p 5222:5222 ghcr.io/processone/ejabberd live
 That uses the default configuration file and XMPP domain "localhost".
 
 
-## Start with your configuration and database
+### Start with your configuration and database
 
 Pass a configuration file as a volume
 and share the local directory to store database:
@@ -92,9 +92,9 @@ and the volumes you mount must grant proper rights to that account.
 
 
 Next steps
-==========
+----------
 
-## Register the administrator account
+### Register the administrator account
 
 The default ejabberd configuration does not grant admin privileges
 to any account,
@@ -111,7 +111,7 @@ Then edit conf/ejabberd.yml and add the ACL as explained in
 [ejabberd Docs: Administration Account](https://docs.ejabberd.im/admin/installation/#administration-account)
 
 
-## Check ejabberd log files
+### Check ejabberd log files
 
 Check the content of the log files inside the container,
 even if you do not put it on a shared persistent drive:
@@ -121,7 +121,7 @@ docker exec -it ejabberd tail -f logs/ejabberd.log
 ```
 
 
-## Inspect the container files
+### Inspect the container files
 
 The container uses Alpine Linux. Start a shell inside the container:
 
@@ -130,7 +130,7 @@ docker exec -it ejabberd sh
 ```
 
 
-## Open ejabberd debug console
+### Open ejabberd debug console
 
 Open an interactive debug Erlang console attached to a running ejabberd in a running container:
 
@@ -139,7 +139,7 @@ docker exec -it ejabberd ejabberdctl debug
 ```
 
 
-## CAPTCHA
+### CAPTCHA
 
 ejabberd includes two example CAPTCHA scripts.
 If you want to use any of them, first install some additional required libraries:
@@ -177,9 +177,9 @@ documentation section.
 
 
 Advanced Container Configuration
-================================
+--------------------------------
 
-## Ports
+### Ports
 
 This container image exposes the ports:
 
@@ -192,7 +192,7 @@ This container image exposes the ports:
 - `5210`: Erlang connectivity when `ERL_DIST_PORT` is set, alternative to EPMD
 
 
-## Volumes
+### Volumes
 
 ejabberd produces two types of data: log files and database spool files (Mnesia).
 This is the kind of data you probably want to store on a persistent or local drive (at least the database).
@@ -213,7 +213,7 @@ It's possible to install additional ejabberd modules using volumes,
 explains how to install an additional module using docker-compose.
 
 
-## Commands on start
+### Commands on start
 
 The ejabberdctl script reads the `CTL_ON_CREATE` environment variable
 the first time the container is started,
@@ -221,17 +221,20 @@ and reads `CTL_ON_START` every time the container is started.
 Those variables can contain one ejabberdctl command,
 or several commands separated with the blankspace and `;` characters.
 
+By default failure of any of commands executed that way would
+abort start, this can be disabled by prefixing commands with `!`
+
 Example usage (or check the [full example](#customized-example)):
 ```yaml
     environment:
-      - CTL_ON_CREATE=register admin localhost asd
+      - CTL_ON_CREATE=\! register admin localhost asd
       - CTL_ON_START=stats registeredusers ;
                      check_password admin localhost asd ;
                      status
 ```
 
 
-## Clustering
+### Clustering
 
 When setting several containers to form a
 [cluster of ejabberd nodes](https://docs.ejabberd.im/admin/guide/clustering/),
@@ -270,7 +273,7 @@ Example using environment variables (see full example [docker-compose.yml](https
 
 
 Build a Container Image
-=======================
+-----------------------
 
 This container image includes ejabberd as a standalone OTP release built using Elixir.
 That OTP release is configured with:
@@ -280,7 +283,7 @@ That OTP release is configured with:
 - `config/runtime.exs`: Customize ejabberd paths
 - `ejabberd.yml.template`: ejabberd default config file
 
-## Direct build
+### Direct build
 
 Build ejabberd Community Server container image from ejabberd master git repository:
 
@@ -291,7 +294,7 @@ docker buildx build \
     .
 ```
 
-## Podman build
+### Podman build
 
 It's also possible to use podman instead of docker, just notice:
 - `EXPOSE 4369-4399` port range is not supported, remove that in Dockerfile
@@ -312,7 +315,7 @@ podman exec -it eja1 sh
 podman stop eja1
 ```
 
-## Package build for `arm64`
+### Package build for `arm64`
 
 By default, `.github/container/Dockerfile` builds this container by directly compiling ejabberd,
 it is a fast and direct method.
@@ -338,9 +341,9 @@ docker buildx build \
 
 
 Composer Examples
-=================
+-----------------
 
-## Minimal Example
+### Minimal Example
 
 This is the barely minimal file to get a usable ejabberd.
 Store it as `docker-compose.yml`:
@@ -362,7 +365,7 @@ Create and start the container with the command:
 docker-compose up
 ```
 
-## Customized Example
+### Customized Example
 
 This example shows the usage of several customizations:
 it uses a local configuration file,
@@ -405,13 +408,15 @@ services:
       - ./database:/opt/ejabberd/database
 ```
 
-## Clustering Example
+### Clustering Example
 
 In this example, the main container is created first.
 Once it is fully started and healthy, a second container is created,
 and once ejabberd is started in it, it joins the first one.
 
-An account is registered in the first node when created,
+An account is registered in the first node when created (and
+we ignore errors that can happen when doing that - for example
+whenn account already exists),
 and it should exist in the second node after join.
 
 Notice that in this example the main container does not have access
@@ -428,7 +433,7 @@ services:
     environment:
       - ERLANG_NODE_ARG=ejabberd@main
       - ERLANG_COOKIE=dummycookie123
-      - CTL_ON_CREATE=register admin localhost asd
+      - CTL_ON_CREATE=\! register admin localhost asd
 
   replica:
     image: ghcr.io/processone/ejabberd

CONTRIBUTING.md

@@ -3,21 +3,21 @@
 We'd love for you to contribute to our source code and to make ejabberd even better than it is
 today! Here are the guidelines we'd like you to follow:
 
-* [Code of Conduct](#coc)
-* [Questions and Problems](#question)
-* [Issues and Bugs](#issue)
-* [Feature Requests](#feature)
-* [Issue Submission Guidelines](#submit)
-* [Pull Request Submission Guidelines](#submit-pr)
-* [Signing the CLA](#cla)
+* [Code of Conduct](#code-of-conduct)
+* [Questions and Problems](#questions-bugs-features)
+* [Issues and Bugs](#found-an-issue-or-bug)
+* [Feature Requests](#missing-a-feature)
+* [Issue Submission Guidelines](#issue-submission-guidelines)
+* [Pull Request Submission Guidelines](#pull-request-submission-guidelines)
+* [Signing the CLA](#signing-the-contributor-license-agreement-cla)
 
-## <a name="coc"></a> Code of Conduct
+## Code of Conduct
 
 Help us keep ejabberd community open-minded and inclusive. Please read and follow our [Code of Conduct][coc].
 
-## <a name="requests"></a> Questions, Bugs, Features
+## Questions, Bugs, Features
 
-### <a name="question"></a> Got a Question or Problem?
+### Got a Question or Problem?
 
 Do not open issues for general support questions as we want to keep GitHub issues for bug reports
 and feature requests. You've got much better chances of getting your question answered on dedicated
@@ -38,12 +38,12 @@ Other channels for support are:
 - [ejabberd XMPP room logs][logs]
 - [ejabberd Mailing List][list]
 
-### <a name="issue"></a> Found an Issue or Bug?
+### Found an Issue or Bug?
 
 If you find a bug in the source code, you can help us by submitting an issue to our
 [GitHub Repository][github]. Even better, you can submit a Pull Request with a fix.
 
-### <a name="feature"></a> Missing a Feature?
+### Missing a Feature?
 
 You can request a new feature by submitting an issue to our [GitHub Repository][github-issues].
 
@@ -54,7 +54,7 @@ If you would like to implement a new feature then consider what kind of change i
 * **Small Changes** can directly be crafted and submitted to the [GitHub Repository][github]
   as a Pull Request. See the section about [Pull Request Submission Guidelines](#submit-pr).
 
-## <a name="submit"></a> Issue Submission Guidelines
+## Issue Submission Guidelines
 
 Before you submit your issue search the archive, maybe your question was already answered.
 
@@ -64,7 +64,7 @@ the effort we can spend fixing issues and adding new features, by not reporting
 The "[new issue][github-new-issue]" form contains a number of prompts that you should fill out to
 make it easier to understand and categorize the issue.
 
-## <a name="submit-pr"></a> Pull Request Submission Guidelines
+## Pull Request Submission Guidelines
 
 By submitting a pull request for a code or doc contribution, you need to have the right
 to grant your contribution's copyright license to ProcessOne. Please check [ProcessOne CLA][cla]
@@ -123,7 +123,7 @@ restarted.
 
 That's it! Thank you for your contribution!
 
-## <a name="cla"></a> Signing the Contributor License Agreement (CLA)
+## Signing the Contributor License Agreement (CLA)
 
 Upon submitting a Pull Request, we will ask you to sign our CLA if you haven't done
 so before. It's a quick process, we promise, and you will be able to do it all online

Makefile.in

@@ -1,8 +1,22 @@
-REBAR = @ESCRIPT@ @rebar@
+#.
+#' definitions
+#
+
+ESCRIPT = @ESCRIPT@
+REBAR = @rebar@
 MIX = @rebar@
+AWK = @AWK@
 INSTALL = @INSTALL@
+MKDIR_P = @MKDIR_P@
 SED = @SED@
 ERL = @ERL@
+EPMD = @EPMD@
+IEX = @IEX@
+
+INSTALLUSER=@INSTALLUSER@
+INSTALLGROUP=@INSTALLGROUP@
+
+REBAR_ENABLE_ELIXIR = @elixir@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
@@ -71,7 +85,10 @@ SPOOLDIR = @localstatedir@/lib/ejabberd
 # /var/log/ejabberd/
 LOGDIR = @localstatedir@/log/ejabberd
 
-INSTALLUSER=@INSTALLUSER@
+#.
+#' install user
+#
+
 # if no user was enabled, don't set privileges or ownership
 ifeq ($(INSTALLUSER),)
   O_USER=
@@ -86,18 +103,22 @@ else
   CHOWN_OUTPUT=&1
   INIT_USER=$(INSTALLUSER)
 endif
+
 # if no group was enabled, don't set privileges or ownership
-INSTALLGROUP=@INSTALLGROUP@
 ifneq ($(INSTALLGROUP),)
   G_USER=-g $(INSTALLGROUP)
 endif
 
-ifeq "$(MIX)" "mix"
+#.
+#' rebar / rebar3 / mix
+#
+
+ifeq "$(notdir $(MIX))" "mix"
 REBAR_VER:=6
 REBAR_VER_318:=0
 else
-REBAR_VER:=$(shell $(REBAR) --version | awk -F '[ .]' '/rebar / {print $$2}')
-REBAR_VER_318:=$(shell $(REBAR) --version | awk -F '[ .]' '/rebar / {print ($$2 == 3 && $$3 >= 18 ? 1 : 0)}')
+REBAR_VER:=$(shell $(REBAR) --version | $(AWK) -F '[ .]' '/rebar / {print $$2}')
+REBAR_VER_318:=$(shell $(REBAR) --version | $(AWK) -F '[ .]' '/rebar / {print ($$2 == 3 && $$3 >= 18 ? 1 : 0)}')
 endif
 
 ifeq "$(REBAR_VER)" "6"
@@ -112,11 +133,25 @@ ifeq "$(REBAR_VER)" "6"
   CONFIGURE_DEPS=(cd deps/eimp; ./configure)
   EBINDIR=$(DEPSDIR)/ejabberd/ebin
   XREFOPTIONS=graph
+  EDOCPRE=MIX_ENV=edoc
+  EDOCTASK=docs --proglang erlang
   CLEANARG=--deps
+  ELIXIR_LIBDIR_RAW=$(shell elixir -e "IO.puts(:filename.dirname(:code.lib_dir(:elixir)))" -e ":erlang.halt")
+  ELIXIR_LIBDIR=":$(ELIXIR_LIBDIR_RAW)"
   REBARREL=MIX_ENV=prod $(REBAR) release --overwrite
   REBARDEV=MIX_ENV=dev $(REBAR) release --overwrite
-  RELIVECMD=escript rel/relive.escript && MIX_ENV=dev RELIVE=true iex --name ejabberd@localhost -S mix run
+  RELIVECMD=$(ESCRIPT) rel/relive.escript && MIX_ENV=dev RELIVE=true $(IEX) --name ejabberd@localhost -S mix run
+  REL_LIB_DIR = _build/dev/rel/ejabberd/lib
+  COPY_REL_TARGET = dev
+  GET_DEPS_TRANSLATIONS=MIX_ENV=translations $(REBAR) $(GET_DEPS)
+  DEPSDIR_TRANSLATIONS=deps
 else
+ifeq ($(REBAR_ENABLE_ELIXIR),true)
+  ELIXIR_LIBDIR_RAW=$(shell elixir -e "IO.puts(:filename.dirname(:code.lib_dir(:elixir)))" -e ":erlang.halt")
+  ELIXIR_LIBDIR=":$(ELIXIR_LIBDIR_RAW)"
+  EXPLICIT_ELIXIR_COMPILE=MIX_ENV=default mix compile.elixir
+  PREPARE_ELIXIR_SCRIPTS=$(MKDIR_P) rel/overlays; cp $(ELIXIR_LIBDIR_RAW)/../bin/iex rel/overlays/; cp $(ELIXIR_LIBDIR_RAW)/../bin/elixir rel/overlays/; sed -i 's|ERTS_BIN=$$|ERTS_BIN=$$SCRIPT_PATH/../../erts-{{erts_vsn}}/bin/|' rel/overlays/elixir
+endif
 ifeq "$(REBAR_VER)" "3"
   SKIPDEPS=
   LISTDEPS=tree
@@ -134,8 +169,12 @@ endif
   XREFOPTIONS=
   CLEANARG=--all
   REBARREL=$(REBAR) as prod tar
-  REBARDEV=REBAR_PROFILE=dev $(REBAR) release
+  REBARDEV=$(REBAR) as dev release
   RELIVECMD=$(REBAR) relive
+  REL_LIB_DIR = _build/dev/rel/ejabberd/lib
+  COPY_REL_TARGET = dev
+  GET_DEPS_TRANSLATIONS=$(REBAR) as translations $(GET_DEPS)
+  DEPSDIR_TRANSLATIONS=_build/translations/lib
 else
   SKIPDEPS=skip_deps=true
   LISTDEPS=-q list-deps
@@ -151,10 +190,16 @@ else
   REBARREL=$(REBAR) generate
   REBARDEV=
   RELIVECMD=@echo "Rebar2 detected... relive not supported.\
-	 \nTry: ./configure --with-rebar=./rebar3 ; make relive"
+	 \nTry: ./configure --with-rebar=rebar3 ; make relive"
+  REL_LIB_DIR = rel/ejabberd/lib
+  COPY_REL_TARGET = rel
 endif
 endif
 
+#.
+#' main targets
+#
+
 all: scripts deps src
 
 deps: $(DEPSDIR)/.got
@@ -162,7 +207,7 @@ deps: $(DEPSDIR)/.got
 $(DEPSDIR)/.got:
 	rm -rf $(DEPSDIR)/.got
 	rm -rf $(DEPSDIR)/.built
-	mkdir -p $(DEPSDIR)
+	$(MKDIR_P) $(DEPSDIR)
 	$(REBAR) $(GET_DEPS) && :> $(DEPSDIR)/.got
 	$(CONFIGURE_DEPS)
 
@@ -171,6 +216,7 @@ $(DEPSDIR)/.built: $(DEPSDIR)/.got
 
 src: $(DEPSDIR)/.built
 	$(REBAR) $(SKIPDEPS) compile
+	$(EXPLICIT_ELIXIR_COMPILE)
 
 update:
 	rm -rf $(DEPSDIR)/.got
@@ -188,14 +234,35 @@ options: all
 	tools/opt_types.sh ejabberd_option $(EBINDIR)
 
 translations:
-	tools/prepare-tr.sh $(DEPSDIR)
+	$(GET_DEPS_TRANSLATIONS)
+	tools/prepare-tr.sh $(DEPSDIR_TRANSLATIONS)
 
 doap:
 	tools/generate-doap.sh
 
-edoc:
-	$(ERL) -noinput +B -eval \
-        'case edoc:application(ejabberd, ".", []) of ok -> halt(0); error -> halt(1) end.'
+#.
+#' edoc
+#
+
+edoc: edoc_files edoc_compile
+	$(EDOCPRE) $(REBAR) $(EDOCTASK)
+
+edoc_compile: deps
+	$(EDOCPRE) $(REBAR) compile
+
+edoc_files: _build/edoc/docs.md _build/edoc/logo.png
+
+_build/edoc/docs.md: edoc_compile
+	echo "For much more detailed and complete ejabberd documentation, " \
+	     "go to the [ejabberd Docs](https://docs.ejabberd.im/) site." \
+	     > _build/edoc/docs.md
+
+_build/edoc/logo.png: edoc_compile
+	wget https://docs.ejabberd.im/static/shared/images/footer_logo_e.png -O _build/edoc/logo.png
+
+#.
+#' copy-files
+#
 
 JOIN_PATHS=$(if $(wordlist 2,1000,$(1)),$(firstword $(1))/$(call JOIN_PATHS,$(wordlist 2,1000,$(1))),$(1))
 
@@ -282,26 +349,56 @@ copy-files:
 
 copy-files-sub: copy-files-sub2
 
+#.
+#' copy-files-rel
+#
+
+copy-files-rel: $(COPY_REL_TARGET)
+	#
+	# Libraries
+	(cd $(REL_LIB_DIR) && find . -follow -type f ! -executable -exec $(INSTALL) -vDm 640 $(G_USER) {} $(DESTDIR)$(LIBDIR)/{} \;)
+	#
+	# *.so:
+	(cd $(REL_LIB_DIR) && find . -follow -type f -executable -name *.so -exec $(INSTALL) -vDm 640 $(G_USER) {} $(DESTDIR)$(LIBDIR)/{} \;)
+	#
+	# Executable files
+	(cd $(REL_LIB_DIR) && find . -follow -type f -executable ! -name *.so -exec $(INSTALL) -vDm 550 $(G_USER) {} $(DESTDIR)$(LIBDIR)/{} \;)
+
+#.
+#' uninstall-librel
+#
+
+uninstall-librel:
+	(cd $(REL_LIB_DIR) && find . -follow -type f -exec rm -fv -v $(DESTDIR)$(LIBDIR)/{} \;)
+	(cd $(REL_LIB_DIR) && find . -follow -depth -type d -exec rm -dv -v $(DESTDIR)$(LIBDIR)/{} \;)
+
+#.
+#' relive
+#
+
 relive:
 	$(RELIVECMD)
 
 relivelibdir=$(shell pwd)/$(DEPSDIR)
 relivedir=$(shell pwd)/_build/relive
-iexpath=$(shell which iex)
 CONFIG_DIR = ${relivedir}/conf
 SPOOL_DIR = ${relivedir}/database
 LOGS_DIR = ${relivedir}/logs
 
+#.
+#' scripts
+#
+
 ejabberdctl.relive:
-	$(SED)  -e "s*{{installuser}}*@INSTALLUSER@*g" \
+	$(SED)  -e "s*{{installuser}}*${INSTALLUSER}*g" \
 		-e "s*{{config_dir}}*${CONFIG_DIR}*g" \
 		-e "s*{{logs_dir}}*${LOGS_DIR}*g" \
 		-e "s*{{spool_dir}}*${SPOOL_DIR}*g" \
-		-e "s*{{bindir}}/iex*$(iexpath)*g" \
-		-e "s*{{bindir}}*@bindir@*g" \
-		-e "s*{{libdir}}*${relivelibdir}*g" \
-		-e "s*{{erl}}*@ERL@*g" \
-		-e "s*{{epmd}}*@EPMD@*g" ejabberdctl.template \
+		-e "s*{{bindir}}*${BINDIR}*g" \
+		-e "s*{{libdir}}*${relivelibdir}${ELIXIR_LIBDIR}*g" \
+		-e "s*{{iexpath}}*${IEX}*g" \
+		-e "s*{{erl}}*${ERL}*g" \
+		-e "s*{{epmd}}*${EPMD}*g" ejabberdctl.template \
 		> ejabberdctl.relive
 
 ejabberd.init:
@@ -317,19 +414,28 @@ ejabberd.service:
 	chmod 644 ejabberd.service
 
 ejabberdctl.example: vars.config
-	$(SED)  -e "s*{{installuser}}*@INSTALLUSER@*g" \
+	$(SED)  -e "s*{{installuser}}*${INSTALLUSER}*g" \
 		-e "s*{{config_dir}}*${ETCDIR}*g" \
 		-e "s*{{logs_dir}}*${LOGDIR}*g" \
 		-e "s*{{spool_dir}}*${SPOOLDIR}*g" \
-		-e "s*{{bindir}}*@bindir@*g" \
-		-e "s*{{libdir}}*@libdir@*g" \
-		-e "s*{{erl}}*@ERL@*g" \
-		-e "s*{{epmd}}*@EPMD@*g" ejabberdctl.template \
+		-e "s*{{bindir}}*${BINDIR}*g" \
+		-e "s*{{libdir}}*${LIBDIR}${ELIXIR_LIBDIR}*g" \
+		-e "s*{{iexpath}}*${IEX}*g" \
+		-e "s*{{erl}}*${ERL}*g" \
+		-e "s*{{epmd}}*${EPMD}*g" ejabberdctl.template \
 		> ejabberdctl.example
 
 scripts: ejabberd.init ejabberd.service ejabberdctl.example
 
-install: copy-files
+#.
+#' install
+#
+
+install: copy-files install-main
+
+install-rel: copy-files-rel install-main
+
+install-main:
 	#
 	# Configuration files
 	$(INSTALL) -d -m 750 $(G_USER) $(DESTDIR)$(ETCDIR)
@@ -352,12 +458,12 @@ install: copy-files
 	#
 	# Spool directory
 	$(INSTALL) -d -m 750 $(O_USER) $(DESTDIR)$(SPOOLDIR)
-	$(CHOWN_COMMAND) -R @INSTALLUSER@ $(DESTDIR)$(SPOOLDIR) >$(CHOWN_OUTPUT)
+	$(CHOWN_COMMAND) -R $(INSTALLUSER) $(DESTDIR)$(SPOOLDIR) >$(CHOWN_OUTPUT)
 	chmod -R 750 $(DESTDIR)$(SPOOLDIR)
 	#
 	# Log directory
 	$(INSTALL) -d -m 750 $(O_USER) $(DESTDIR)$(LOGDIR)
-	$(CHOWN_COMMAND) -R @INSTALLUSER@ $(DESTDIR)$(LOGDIR) >$(CHOWN_OUTPUT)
+	$(CHOWN_COMMAND) -R $(INSTALLUSER) $(DESTDIR)$(LOGDIR) >$(CHOWN_OUTPUT)
 	chmod -R 750 $(DESTDIR)$(LOGDIR)
 	#
 	# Documentation
@@ -368,8 +474,14 @@ install: copy-files
 		|| echo "Man page not included in sources"
 	$(INSTALL) -m 644 COPYING $(DESTDIR)$(DOCDIR)
 
+#.
+#' uninstall
+#
+
 uninstall: uninstall-binary
 
+uninstall-rel: uninstall-binary uninstall-librel
+
 uninstall-binary:
 	rm -f  $(DESTDIR)$(SBINDIR)/ejabberdctl
 	rm -f  $(DESTDIR)$(BINDIR)/iex
@@ -398,6 +510,7 @@ uninstall-binary:
 	rm -fr $(DESTDIR)$(LUADIR)
 	rm -fr $(DESTDIR)$(PRIVDIR)
 	rm -fr $(DESTDIR)$(EJABBERDDIR)
+	rm -f  $(DESTDIR)$(MANDIR)/ejabberd.yml.5
 
 uninstall-all: uninstall-binary
 	rm -rf $(DESTDIR)$(ETCDIR)
@@ -405,6 +518,10 @@ uninstall-all: uninstall-binary
 	rm -rf $(DESTDIR)$(SPOOLDIR)
 	rm -rf $(DESTDIR)$(LOGDIR)
 
+#.
+#' clean
+#
+
 clean:
 	rm -rf $(DEPSDIR)/.got
 	rm -rf $(DEPSDIR)/.built
@@ -427,19 +544,39 @@ distclean: clean clean-rel
 	rm -f Makefile
 	rm -f vars.config
 
-rel:
+#.
+#' releases
+#
+
+rel: prod
+
+prod:
+	$(PREPARE_ELIXIR_SCRIPTS)
 	$(REBARREL)
 
 DEV_CONFIG = _build/dev/rel/ejabberd/conf/ejabberd.yml
 
 dev $(DEV_CONFIG):
+	$(PREPARE_ELIXIR_SCRIPTS)
 	$(REBARDEV)
 
+#.
+#' tags
+#
+
 TAGS:
-	etags *.erl
+	etags src/*.erl
+
+#.
+#' makefile
+#
 
 Makefile: Makefile.in
 
+#.
+#' dialyzer
+#
+
 ifeq "$(REBAR_VER)" "3"
 dialyzer:
 	find src/*_opt.erl -type f \! -regex ".*git.*" -exec sed -i 's/re:mp/  tuple/g' {} \;
@@ -449,7 +586,7 @@ else
 deps := $(wildcard $(DEPSDIR)/*/ebin)
 
 dialyzer/erlang.plt:
-	@mkdir -p dialyzer
+	@$(MKDIR_P) dialyzer
 	@dialyzer --build_plt --output_plt dialyzer/erlang.plt \
 	-o dialyzer/erlang.log --apps kernel stdlib sasl crypto \
 	public_key ssl mnesia inets odbc compiler erts \
@@ -457,13 +594,13 @@ dialyzer/erlang.plt:
 	status=$$? ; if [ $$status -ne 2 ]; then exit $$status; else exit 0; fi
 
 dialyzer/deps.plt:
-	@mkdir -p dialyzer
+	@$(MKDIR_P) dialyzer
 	@dialyzer --build_plt --output_plt dialyzer/deps.plt \
 	-o dialyzer/deps.log $(deps); \
 	status=$$? ; if [ $$status -ne 2 ]; then exit $$status; else exit 0; fi
 
 dialyzer/ejabberd.plt:
-	@mkdir -p dialyzer
+	@$(MKDIR_P) dialyzer
 	@dialyzer --build_plt --output_plt dialyzer/ejabberd.plt \
 	-o dialyzer/ejabberd.log ebin; \
 	status=$$? ; if [ $$status -ne 2 ]; then exit $$status; else exit 0; fi
@@ -486,6 +623,10 @@ dialyzer: erlang_plt deps_plt ejabberd_plt
 	status=$$? ; if [ $$status -ne 2 ]; then exit $$status; else exit 0; fi
 endif
 
+#.
+#' test
+#
+
 test:
 	@echo "************************** NOTICE ***************************************"
 	@cat test/README
@@ -493,9 +634,18 @@ test:
 	@cd priv && ln -sf ../sql
 	$(REBAR) $(SKIPDEPS) ct
 
-.PHONY: src edoc dialyzer Makefile TAGS clean clean-rel distclean rel \
+#.
+#' phony
+#
+
+.PHONY: src edoc dialyzer Makefile TAGS clean clean-rel distclean prod rel \
 	install uninstall uninstall-binary uninstall-all translations deps test \
-	quicktest erlang_plt deps_plt ejabberd_plt xref hooks options
+	all dev doap help install-rel relive scripts uninstall-rel update \
+	erlang_plt deps_plt ejabberd_plt xref hooks options
+
+#.
+#' help
+#
 
 help:
 	@echo ""
@@ -503,25 +653,31 @@ help:
 	@echo "  scripts        Prepare ejabberd start scripts"
 	@echo "  deps           Get and configure dependencies"
 	@echo "  src            Compile dependencies and ejabberd"
-	@echo "  update         Update dependencies' source code"
+	@echo "  update         Update dependencies source code"
 	@echo "  clean          Clean binary files"
 	@echo "  distclean      Clean completely the development files"
 	@echo ""
 	@echo "  install        Install ejabberd to /usr/local"
+	@echo "  install-rel    Install ejabberd to /usr/local (using release)"
 	@echo "  uninstall      Uninstall ejabberd (buggy)"
+	@echo "  uninstall-rel  Uninstall ejabberd (using release)"
 	@echo "  uninstall-all  Uninstall also configuration, logs, mnesia... (buggy)"
 	@echo ""
-	@echo "  rel            Build a production release"
+	@echo "  prod           Build a production release"
 	@echo "  dev            Build a development release"
 	@echo "  relive         Start a live ejabberd in _build/relive/"
 	@echo ""
 	@echo "  doap           Generate DOAP file"
-	@echo "  edoc           Generate edoc documentation (unused)"
+	@echo "  edoc           Generate EDoc documentation [mix]"
 	@echo "  options        Generate ejabberd_option.erl"
-	@echo "  translations   Extract translation files (requires --enable-tools)"
-	@echo "  tags           Generate tags file for text editors"
+	@echo "  translations   Extract translation files"
+	@echo "  TAGS           Generate tags file for text editors"
 	@echo ""
-	@echo "  dialyzer       Run Dialyzer static analyzer"
+	@echo "  dialyzer       Run Dialyzer static analyzer [rebar3]"
 	@echo "  hooks          Run hooks validator"
-	@echo "  test           Run Common Tests suite"
-	@echo "  xref           Run cross reference analysis"
+	@echo "  test           Run Common Tests suite [rebar3]"
+	@echo "  xref           Run cross reference analysis [rebar3]"
+
+#.
+#'
+# vim: foldmarker=#',#. foldmethod=marker:

README.md

@@ -37,9 +37,9 @@ Installation
 There are several ways to install ejabberd:
 
 - Source code: compile yourself, see [COMPILE](COMPILE.md)
-- Installers from [ProcessOne Download][p1download] or [ejabberd GitHub Releases][releases] (run/deb/rpm for x64 and arm64)
-- `ecs` container image available in [Docker Hub][hubecs] and [Github Packages][packagesecs], see [ecs README][docker-ecs-readme] (for x64)
-- `ejabberd` container image available in [Github Packages][packages], see [CONTAINER](CONTAINER.md) (for x64 and arm64)
+- Installers: [ProcessOne Download][p1download] and [GitHub Releases][releases] for releases, [GitHub Actions](https://github.com/processone/ejabberd/actions/workflows/installers.yml) for master branch (run/deb/rpm for x64 and arm64)
+- `ecs` container image: [Docker Hub][hubecs] and [Github Packages][packagesecs], see [ecs README][docker-ecs-readme] (for x64)
+- `ejabberd` container image: [Github Packages][packages] for releases and master branch, see [CONTAINER](CONTAINER.md) (for x64 and arm64)
 - Using your [Operating System package][osp]
 - Using the [Homebrew][homebrew] package manager
 
@@ -71,6 +71,10 @@ or in your local machine as explained in [Localization][localization].
 
 Documentation for developers is available in [ejabberd docs: Developers][docs-dev].
 
+There are nightly builds of ejabberd, both for `master` branch and for Pull Requests:
+- Installers: go to [GitHub Actions: Installers](https://github.com/processone/ejabberd/actions/workflows/installers.yml), open the most recent commit, on the bottom of that commit page, download the `ejabberd-packages.zip` artifact.
+- `ejabberd` container image: go to [ejabberd Github Packages][packages]
+
 Security reports or concerns should preferably be reported privately,
 please send an email to the address: contact at process-one dot net
 or some other method from [ProcessOne Contact][p1contact].
@@ -92,7 +96,7 @@ There are several places to get in touch with other ejabberd developers and admi
 License
 -------
 
-ejabberd is released under the GNU General Public License v2 (see [COPYING](COPYING.md)),
+ejabberd is released under the GNU General Public License v2 (see [COPYING](COPYING)),
 and [ejabberd translations](https://github.com/processone/ejabberd-po/) under MIT License.
 
 
@@ -123,3 +127,4 @@ and [ejabberd translations](https://github.com/processone/ejabberd-po/) under MI
 [xeps]: https://www.process-one.net/en/ejabberd/protocols/
 [xmpp]: https://xmpp.org/
 [xmppej]: https://xmpp.org/software/servers/ejabberd/
+

config/runtime.exs

@@ -8,6 +8,6 @@ end
 rootpath = System.get_env("RELEASE_ROOT", rootdefault)
 config :ejabberd,
   file: Path.join(rootpath, "conf/ejabberd.yml"),
-  log_path: Path.join(rootpath, 'logs/ejabberd.log')
+  log_path: Path.join(rootpath, "logs/ejabberd.log")
 config :mnesia,
-  dir: Path.join(rootpath, 'database/')
+  dir: Path.join(rootpath, "database/")

configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(ejabberd, m4_esyscmd([echo `git describe --tags 2>/dev/null || echo 23.10` | sed 's/-g.*//;s/-/./' | tr -d '\012']), [ejabberd@process-one.net], [ejabberd])
+AC_INIT(ejabberd, m4_esyscmd([echo `git describe --tags 2>/dev/null || echo 24.02` | sed 's/-g.*//;s/-/./' | tr -d '\012']), [ejabberd@process-one.net], [ejabberd])
 REQUIRE_ERLANG_MIN="9.0.5 (Erlang/OTP 20.0)"
 REQUIRE_ERLANG_MAX="100.0.0 (No Max)"
 
@@ -10,7 +10,9 @@ AC_CONFIG_MACRO_DIR([m4])
 
 # Checks for programs.
 AC_PROG_MAKE_SET
+AC_PROG_AWK
 AC_PROG_INSTALL
+AC_PROG_MKDIR_P
 AC_PROG_SED
 
 if test "x$GCC" = "xyes"; then
@@ -28,18 +30,42 @@ fi
 ])
 
 AC_ARG_WITH(rebar,
-	AS_HELP_STRING([--with-rebar=bin],[use the rebar/rebar3/mix binary specified]),
+	AS_HELP_STRING([--with-rebar=bin],[use as build tool the rebar/rebar3/mix binary specified]),
 [if test "$withval" = "yes" -o "$withval" = "no" -o "X$with_rebar" = "X"; then
-    rebar="rebar"
+    rebar="rebar3"
 else
     rebar="$with_rebar"
 fi
-], [rebar="rebar"])
+], [rebar="unconfigured"])
 
 AC_PATH_TOOL(ERL, erl, , [${extra_erl_path}$PATH])
 AC_PATH_TOOL(ERLC, erlc, , [${extra_erl_path}$PATH])
 AC_PATH_TOOL(EPMD, epmd, , [${extra_erl_path}$PATH])
 
+AC_PATH_TOOL(REBAR, rebar, , [${extra_erl_path}$PATH])
+AC_PATH_TOOL(REBAR3, rebar3, , [${extra_erl_path}$PATH])
+AC_PATH_TOOL(ELIXIR, elixir, , [${extra_erl_path}$PATH])
+AC_PATH_TOOL(IEX, iex, , [${extra_erl_path}$PATH])
+AC_PATH_TOOL(MIX, mix, , [${extra_erl_path}$PATH])
+
+if test "$rebar" = unconfigured; then
+    if test "x$ELIXIR" = "x" -o "x$IEX" = "x" -o "x$MIX" = "x"; then
+        if test "x$REBAR3" = "x"; then
+            rebar="rebar3"
+        else
+            rebar=$REBAR3
+        fi
+    else
+        rebar=$MIX
+    fi
+fi
+if test "x$rebar" = "xrebar" -a "x$REBAR" = "x" ; then
+    rebar="./rebar"
+fi
+if test "x$rebar" = "xrebar3" -a "x$REBAR3" = "x" ; then
+    rebar="./rebar3"
+fi
+
 AC_ERLANG_NEED_ERL
 AC_ERLANG_NEED_ERLC
 
@@ -84,7 +110,7 @@ AC_ARG_ENABLE(debug,
 esac],[if test "x$debug" = "x"; then debug=true; fi])
 
 AC_ARG_ENABLE(elixir,
-[AS_HELP_STRING([--enable-elixir],[enable Elixir support (default: no)])],
+[AS_HELP_STRING([--enable-elixir],[enable Elixir support in Rebar3 (default: no)])],
 [case "${enableval}" in
   yes) elixir=true ;;
   no)  elixir=false ;;
@@ -112,7 +138,7 @@ esac],[full_xml=false])
 
 ENABLEGROUP=""
 AC_ARG_ENABLE(group,
-  [AS_HELP_STRING([--enable-group[[[[=GROUP]]]]], [allow this system group to start ejabberd (default: no)])],
+  [AS_HELP_STRING([--enable-group[[=GROUP]]], [specify the group of the account defined in --enable-user (default: no)])],
   [case "${enableval}" in
      yes) ENABLEGROUP=`groups |head -n 1` ;;
      no) ENABLEGROUP="" ;;
@@ -237,7 +263,7 @@ AC_ARG_ENABLE(system_deps,
 esac],[if test "x$system_deps" = "x"; then system_deps=false; fi])
 
 AC_ARG_ENABLE(tools,
-[AS_HELP_STRING([--enable-tools],[build development tools (default: no)])],
+[AS_HELP_STRING([--enable-tools],[include debugging/development tools (default: no)])],
 [case "${enableval}" in
   yes) tools=true ;;
   no)  tools=false ;;
@@ -246,7 +272,7 @@ esac],[if test "x$tools" = "x"; then tools=false; fi])
 
 ENABLEUSER=""
 AC_ARG_ENABLE(user,
-  [AS_HELP_STRING([--enable-user[[[[=USER]]]]], [allow this system user to start ejabberd (default: no)])],
+  [AS_HELP_STRING([--enable-user[[=USER]]], [allow this system user to start ejabberd (default: no)])],
   [case "${enableval}" in
      yes) ENABLEUSER=`whoami` ;;
      no) ENABLEUSER="" ;;
@@ -280,6 +306,8 @@ case "`uname`" in
   ;;
 esac
 
+AC_MSG_RESULT([build tool to use (change using --with-rebar): $rebar])
+
 AC_SUBST(roster_gateway_workaround)
 AC_SUBST(new_sql_schema)
 AC_SUBST(full_xml)

ejabberd.doap

@@ -631,11 +631,29 @@
     </implements>
     <implements>
       <xmpp:SupportedXep>
-        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0398.html"/>
-        <xmpp:version>0.2.00.2.0</xmpp:version>
-        <xmpp:since>17.09</xmpp:since>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0386.html"/>
+        <xmpp:version>0.3.0</xmpp:version>
+        <xmpp:since>24.02</xmpp:since>
         <xmpp:status></xmpp:status>
-        <xmpp:note>mod_avatar, mod_vcard_xupdate</xmpp:note>
+        <xmpp:note></xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0388.html"/>
+        <xmpp:version>0.4.0</xmpp:version>
+        <xmpp:since>24.02</xmpp:since>
+        <xmpp:status></xmpp:status>
+        <xmpp:note></xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0398.html"/>
+        <xmpp:version>0.2.0</xmpp:version>
+        <xmpp:since>18.03</xmpp:since>
+        <xmpp:status></xmpp:status>
+        <xmpp:note>mod_avatar</xmpp:note>
       </xmpp:SupportedXep>
     </implements>
     <implements>
@@ -683,6 +701,15 @@
         <xmpp:note>mod_muc_occupantid</xmpp:note>
       </xmpp:SupportedXep>
     </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0424.html"/>
+        <xmpp:version>0.4.0</xmpp:version>
+        <xmpp:since>24.02</xmpp:since>
+        <xmpp:status></xmpp:status>
+        <xmpp:note></xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
     <implements>
       <xmpp:SupportedXep>
         <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0425.html"/>
@@ -692,6 +719,15 @@
         <xmpp:note>mod_mam</xmpp:note>
       </xmpp:SupportedXep>
     </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0440.html"/>
+        <xmpp:version>0.4.0</xmpp:version>
+        <xmpp:since>24.02</xmpp:since>
+        <xmpp:status></xmpp:status>
+        <xmpp:note></xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
     <implements>
       <xmpp:SupportedXep>
         <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0441.html"/>
@@ -701,5 +737,14 @@
         <xmpp:note>mod_mam</xmpp:note>
       </xmpp:SupportedXep>
     </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0474.html"/>
+        <xmpp:version>0.3.0</xmpp:version>
+        <xmpp:since>24.02</xmpp:since>
+        <xmpp:status></xmpp:status>
+        <xmpp:note></xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
   </Project>
 </rdf:RDF>

ejabberdctl.cfg.example

@@ -109,7 +109,10 @@
 #' ERL_OPTIONS: Additional Erlang options
 #
 # The next variable allows to specify additional options passed to
-# erlang. See erl(1) for more info.
+# all commands using erlang interpreter. This applies to starting
+# ejabberd server itself but also auxiliary commands like for example
+# starting debug shell. See erl(1) for list of commands that can be
+# used here.
 #
 # It might be useful to add "-pa /usr/local/lib/ejabberd/ebin" if you
 # want to add local modules in this path.
@@ -126,10 +129,11 @@
 # ejabberd is started from an init.d script options -noshell and -detached are
 # added implicitly. See erl(1) for more info.
 #
+# For example you can use value "-heart -env HEART_BEAT_TIMEOUT 120 -env ERL_CRASH_DUMP_SECONDS 60"
+#
 # Default: ""
 #
 #EJABBERD_OPTS=""
-EJABBERD_OPTS="-heart -env HEART_BEAT_TIMEOUT 120 -env ERL_CRASH_DUMP_SECONDS 60"
 
 #.
 #' ERLANG_NODE: Erlang node name

ejabberdctl.template

@@ -15,8 +15,8 @@ SCRIPT_DIR="$(cd "$(dirname "$SCRIPT")" && pwd -P)"
 # shellcheck disable=SC2034
 ERTS_VSN="{{erts_vsn}}"
 ERL="{{erl}}"
-IEX="{{bindir}}/iex"
 EPMD="{{epmd}}"
+IEX="{{iexpath}}"
 INSTALLUSER="{{installuser}}"
 
 # check the proper system user is used
@@ -89,11 +89,12 @@ ERL_CRASH_DUMP="$LOGS_DIR"/erl_crash_$(date "+%Y%m%d-%H%M%S").dump
 ERL_INETRC="$CONFIG_DIR"/inetrc
 
 # define ejabberd parameters
-EJABBERD_OPTS="$EJABBERD_OPTS\
-$(sed '/^log_rotate_size/!d;s/:[ \t]*\([0-9]\{1,\}\).*/ \1/;s/:[ \t]*\(infinity\).*/ \1/;s/^/ /' "$EJABBERD_CONFIG_PATH")\
-$(sed '/^log_rotate_count/!d;s/:[ \t]*\([0-9]*\).*/ \1/;s/^/ /' "$EJABBERD_CONFIG_PATH")\
-$(sed '/^log_burst_limit_count/!d;s/:[ \t]*\([0-9]*\).*/ \1/;s/^/ /' "$EJABBERD_CONFIG_PATH")\
-$(sed '/^log_burst_limit_window_time/!d;s/:[ \t]*\([0-9]*[a-z]*\).*/ \1/;s/^/ /' "$EJABBERD_CONFIG_PATH")"
+EJABBERD_OPTS="\
+$(sed '/^log_rotate_size/!d;s/:[ \t]*\([0-9]\{1,\}\).*/ \1/;s/:[ \t]*\(infinity\).*/ \1 /;s/^/ /' "$EJABBERD_CONFIG_PATH")\
+$(sed '/^log_rotate_count/!d;s/:[ \t]*\([0-9]*\).*/ \1 /;s/^/ /' "$EJABBERD_CONFIG_PATH")\
+$(sed '/^log_burst_limit_count/!d;s/:[ \t]*\([0-9]*\).*/ \1 /;s/^/ /' "$EJABBERD_CONFIG_PATH")\
+$(sed '/^log_burst_limit_window_time/!d;s/:[ \t]*\([0-9]*[a-z]*\).*/ \1 /;s/^/ /' "$EJABBERD_CONFIG_PATH")\
+$EJABBERD_OPTS"
 [ -n "$EJABBERD_OPTS" ] && EJABBERD_OPTS="-ejabberd $EJABBERD_OPTS"
 EJABBERD_OPTS="-mnesia dir \"$SPOOL_DIR\" $MNESIA_OPTIONS $EJABBERD_OPTS -s ejabberd"
 
@@ -174,8 +175,8 @@ livewarning()
         echo "Please be extremely cautious with your actions,"
         echo "and exit immediately if you are not completely sure."
         echo ""
-        echo "To exit this LIVE mode and stop ejabberd, press:"
-        echo "  q().  and press the Enter key"
+        echo "To exit and detach this shell from ejabberd, press:"
+        echo "  control+g and then q"
         echo ""
         echo "--------------------------------------------------------------------"
         echo "To bypass permanently this warning, add to ejabberdctl.cfg the line:"
@@ -186,6 +187,39 @@ livewarning()
     fi
 }
 
+check_etop_result()
+{
+    result=$?
+    if [ $result -eq 1 ] ; then
+        echo ""
+        echo "It seems there was some problem running 'ejabberdctl etop'."
+        echo "Is the error message something like this?"
+        echo "  Failed to load module 'etop' because it cannot be found..."
+        echo "Then probably ejabberd was compiled with development tools disabled."
+        echo "To use 'etop', recompile ejabberd with: ./configure --enable-tools"
+        echo ""
+        exit $result
+    fi
+}
+
+check_iex_result()
+{
+    result=$?
+    if [ $result -eq 127 ] ; then
+        echo ""
+        echo "It seems there was some problem finding 'iex' binary from Elixir."
+        echo "Probably ejabberd was compiled with Rebar3 and Elixir disabled, like:"
+        echo "  ./configure"
+        echo "which is equivalent to:"
+        echo "  ./configure --with-rebar=rebar3 --disable-elixir"
+        echo "To use 'iex', recompile ejabberd enabling Elixir or using Mix:"
+        echo "  ./configure --enable-elixir"
+        echo "  ./configure --with-rebar=mix"
+        echo ""
+        exit $result
+    fi
+}
+
 help()
 {
     echo ""
@@ -214,16 +248,30 @@ help()
 }
 
 # dynamic node name helper
-uid()
-{
-    uuid=$(uuidgen 2>/dev/null)
-    random=$(awk 'BEGIN { srand(); print int(rand()*32768) }' /dev/null)
-    [ -z "$uuid" ] && [ -f /proc/sys/kernel/random/uuid ] && uuid=$(cat /proc/sys/kernel/random/uuid)
-    [ -z "$uuid" ] && uuid=$(printf "%X" "${random:-$$}$(date +%M%S)")
-    uuid=$(printf '%s' $uuid | sed 's/^\(...\).*$/\1/')
-    [ $# -eq 0 ] && echo "${uuid}-${ERLANG_NODE}"
-    [ $# -eq 1 ] && echo "${uuid}-${1}-${ERLANG_NODE}"
-    [ $# -eq 2 ] && echo "${uuid}-${1}@${2}"
+uid() {
+  ERTSVERSION="$("$ERL" -version 2>&1 | sed 's|.*\([0-9][0-9]\).*|\1|g')"
+  if [ $ERTSVERSION -lt 11 ] ; then # otp 23.0 includes erts 11.0
+    # Erlang/OTP lower than 23, which doesn's support dynamic node code
+    N=1
+    PF=$(( $$ % 97 ))
+    while
+      case $# in
+        0) NN="${PF}-${N}-${ERLANG_NODE}"
+          ;;
+        1) NN="${PF}-${N}-${1}-${ERLANG_NODE}"
+          ;;
+        2) NN="${PF}-${N}-${1}@${2}"
+          ;;
+      esac
+      N=$(( N + 1 + ( $$ % 5 ) ))
+      "$EPMD" -names 2>/dev/null | grep -q " ${NN%@*} "
+    do :; done
+    echo $NN
+  else
+    # Erlang/OTP 23 or higher: use native dynamic node code
+    # https://www.erlang.org/patches/otp-23.0#OTP-13812
+    echo undefined
+  fi
 }
 
 # stop epmd if there is no other running node
@@ -266,7 +314,9 @@ wait_status()
         if [ $timeout -eq 0 ] ; then
             status="$1"
         else
-            exec_erl "$(uid ctl)" -hidden -noinput -s ejabberd_ctl \
+            exec_erl "$(uid ctl)" -hidden -noinput \
+                     -eval 'net_kernel:connect_node('"'$ERLANG_NODE'"')' \
+                     -s ejabberd_ctl \
                      -extra "$ERLANG_NODE" $NO_TIMEOUT status > /dev/null
             status="$?"
         fi
@@ -309,22 +359,27 @@ case $1 in
         set_dist_client
         exec_erl "$(uid top)" -hidden -remsh "$ERLANG_NODE" -s etop \
                  -output text
+        check_etop_result
         ;;
     iexdebug)
         debugwarning
         set_dist_client
         exec_iex "$(uid debug)" --remsh "$ERLANG_NODE"
+        check_iex_result
         ;;
     iexlive)
         livewarning
         exec_iex "$ERLANG_NODE" --erl "$EJABBERD_OPTS"
+        check_iex_result
         ;;
     ping)
         PEER=${2:-$ERLANG_NODE}
         [ "$PEER" = "${PEER%.*}" ] && PS="-s"
         set_dist_client
         exec_cmd "$ERL" ${PS:--}name "$(uid ping "$(hostname $PS)")" $ERLANG_OPTS \
-                 -noinput -hidden -eval 'io:format("~p~n",[net_adm:ping('"'$PEER'"')])' \
+                 -noinput -hidden \
+                 -eval 'net_kernel:connect_node('"'$PEER'"')' \
+                 -eval 'io:format("~p~n",[net_adm:ping('"'$PEER'"')])' \
                  -s erlang halt -output text
         ;;
     started)
@@ -337,7 +392,9 @@ case $1 in
         ;;
     *)
         set_dist_client
-        exec_erl "$(uid ctl)" -hidden -noinput -s ejabberd_ctl \
+        exec_erl "$(uid ctl)" -hidden -noinput \
+                 -eval 'net_kernel:connect_node('"'$ERLANG_NODE'"')' \
+                 -s ejabberd_ctl \
                  -extra "$ERLANG_NODE" $NO_TIMEOUT "$@"
         result=$?
         case $result in

include/bosh.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/ejabberd_auth.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/ejabberd_commands.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -67,42 +67,24 @@
          args_example = none     :: none | [any()] | '_',
          result_example = none   :: any()}).
 
-%% TODO Fix me: Type is not up to date
--type ejabberd_commands() :: #ejabberd_commands{name :: atom(),
-                                                tags :: [atom()],
-                                                desc :: string(),
-                                                longdesc :: string(),
-                                                version :: integer(),
-                                                module :: atom(),
-                                                function :: atom(),
-                                                args :: [aterm()],
-                                                policy :: open | restricted | admin | user,
-                                                access :: [{atom(),atom(),atom()}|atom()],
-                                                result :: rterm()}.
+-type ejabberd_commands() :: #ejabberd_commands{name                    :: atom(),
+                                                tags                    :: [atom()],
+                                                desc                    :: string(),
+                                                longdesc                :: string(),
+                                                version                 :: integer(),
+                                                note                    :: string(),
+                                                weight                  :: integer(),
+                                                module                  :: atom(),
+                                                function                :: atom(),
+                                                args                    :: [aterm()],
+                                                policy                  :: open | restricted | admin | user,
+                                                access                  :: [{atom(),atom(),atom()}|atom()],
+                                                definer                 :: atom(),
+                                                result                  :: rterm(),
+                                                args_rename             :: [{atom(),atom()}],
+                                                args_desc               :: none | [string()] | '_',
+                                                result_desc             :: none | string() | '_',
+                                                args_example            :: none | [any()] | '_',
+                                                result_example          :: any()
+                                               }.
 
-%% @type ejabberd_commands() = #ejabberd_commands{
-%%    name = atom(),
-%%    tags = [atom()],
-%%    desc = string(),
-%%    longdesc = string(),
-%%    module = atom(),
-%%    function = atom(),
-%%    args = [aterm()],
-%%    result = rterm()
-%%    }.
-%% desc: Description of the command
-%% args: Describe the accepted arguments.
-%% This way the function that calls the command can format the
-%% arguments before calling.
-
-%% @type atype() = integer | string | {tuple, [aterm()]} | {list, aterm()}.
-%% Allowed types for arguments are integer, string, tuple and list.
-
-%% @type rtype() = integer | string | atom | {tuple, [rterm()]} | {list, rterm()} | rescode | restuple.
-%% A rtype is either an atom or a tuple with two elements.
-
-%% @type aterm() = {Name::atom(), Type::atype()}.
-%% An argument term is a tuple with the term name and the term type.
-
-%% @type rterm() = {Name::atom(), Type::rtype()}.
-%% A result term is a tuple with the term name and the term type.

include/ejabberd_ctl.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/ejabberd_http.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/ejabberd_oauth.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/ejabberd_sm.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/ejabberd_sql.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -53,7 +53,8 @@
 
 
 -record(sql_index, {columns,
-                    unique = false :: boolean()}).
+                    unique = false :: boolean(),
+                    meta = #{}}).
 -record(sql_column, {name :: binary(),
                      type,
                      default = false,
@@ -67,3 +68,8 @@
                      update = []}).
 -record(sql_references, {table :: binary(),
                          column :: binary()}).
+
+-record(sql_schema_info,
+        {db_type :: pgsql | mysql | sqlite,
+         db_version :: any(),
+         new_schema = true :: boolean()}).

include/ejabberd_sql_pt.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/ejabberd_stacktrace.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/ejabberd_web_admin.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/eldap.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/http_bind.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/logger.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/mod_announce.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/mod_caps.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/mod_last.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/mod_mam.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -26,7 +26,8 @@
 	 bare_peer = {<<"">>, <<"">>, <<"">>} :: ljid(),
 	 packet = #xmlel{}                    :: xmlel() | message(),
 	 nick = <<"">>                        :: binary(),
-	 type = chat                          :: chat | groupchat}).
+	 type = chat                          :: chat | groupchat,
+         origin_id = <<"">>                   :: binary()}).
 
 -record(archive_prefs,
 	{us = {<<"">>, <<"">>} :: {binary(), binary()},

include/mod_matrix_gw.hrl

@@ -0,0 +1,28 @@
+%%%----------------------------------------------------------------------
+%%%
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
+%%%
+%%% This program is free software; you can redistribute it and/or
+%%% modify it under the terms of the GNU General Public License as
+%%% published by the Free Software Foundation; either version 2 of the
+%%% License, or (at your option) any later version.
+%%%
+%%% This program is distributed in the hope that it will be useful,
+%%% but WITHOUT ANY WARRANTY; without even the implied warranty of
+%%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+%%% General Public License for more details.
+%%%
+%%% You should have received a copy of the GNU General Public License along
+%%% with this program; if not, write to the Free Software Foundation, Inc.,
+%%% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+%%%
+%%%----------------------------------------------------------------------
+
+-record(room_version,
+        {id :: binary(),
+         %% use the same field names as in Synapse
+         knock_restricted_join_rule :: boolean(),
+         enforce_int_power_levels :: boolean(),
+         implicit_room_creator :: boolean(),
+         updated_redaction_rules :: boolean()
+        }).

include/mod_muc.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/mod_muc_room.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/mod_offline.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/mod_privacy.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/mod_private.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/mod_proxy65.hrl

@@ -2,7 +2,7 @@
 %%% RFC 1928 constants.
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/mod_push.hrl

@@ -1,5 +1,5 @@
 %%%----------------------------------------------------------------------
-%%% ejabberd, Copyright (C) 2017-2023 ProcessOne
+%%% ejabberd, Copyright (C) 2017-2024 ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/mod_roster.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/mod_shared_roster.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/mod_vcard.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

include/mqtt.hrl

@@ -1,6 +1,6 @@
 %%%-------------------------------------------------------------------
 %%% @author Evgeny Khramtsov <ekhramtsov@process-one.net>
-%%% @copyright (C) 2002-2023 ProcessOne, SARL. All Rights Reserved.
+%%% @copyright (C) 2002-2024 ProcessOne, SARL. All Rights Reserved.
 %%%
 %%% Licensed under the Apache License, Version 2.0 (the "License");
 %%% you may not use this file except in compliance with the License.

include/pubsub.hrl

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

lib/ejabberd/config/ejabberd_module.ex

@@ -60,7 +60,7 @@ defmodule Ejabberd.Config.EjabberdModule do
   defp fetch_and_store_repo_source_if_not_exists(path, repo) do
     unless File.exists?(path) do
       IO.puts "[info] Fetching: #{repo}"
-      :os.cmd('git clone #{repo} #{path}')
+      :os.cmd(~c"git clone #{repo} #{path}")
     end
   end
 

lib/mod_presence_demo.ex

@@ -2,19 +2,19 @@ defmodule ModPresenceDemo do
   use Ejabberd.Module
 
   def start(host, _opts) do
-    info('Starting ejabberd module Presence Demo')
+    info("Starting ejabberd module Presence Demo")
     Ejabberd.Hooks.add(:set_presence_hook, host, __MODULE__, :on_presence, 50)
     :ok
   end
 
   def stop(host) do
-    info('Stopping ejabberd module Presence Demo')
+    info("Stopping ejabberd module Presence Demo")
     Ejabberd.Hooks.delete(:set_presence_hook, host, __MODULE__, :on_presence, 50)
     :ok
   end
 
   def on_presence(user, _server, _resource, _packet) do
-    info('Receive presence for #{user}')
+    info("Receive presence for #{user}")
     :none
   end
 
@@ -27,7 +27,7 @@ defmodule ModPresenceDemo do
   end
 
   def mod_doc() do
-    %{:desc => 'This is just a demonstration.'}
+    %{:desc => "This is just a demonstration."}
   end
 
 end

man/ejabberd.yml.5

@@ -2,12 +2,12 @@
 .\"     Title: ejabberd.yml
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 10/16/2023
+.\"      Date: 02/24/2024
 .\"    Manual: \ \&
 .\"    Source: \ \&
 .\"  Language: English
 .\"
-.TH "EJABBERD\&.YML" "5" "10/16/2023" "\ \&" "\ \&"
+.TH "EJABBERD\&.YML" "5" "02/24/2024" "\ \&" "\ \&"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -82,7 +82,7 @@ All options can be changed in runtime by running \fIejabberdctl reload\-config\f
 .sp
 Some options can be specified for particular virtual host(s) only using \fIhost_config\fR or \fIappend_host_config\fR options\&. Such options are called \fIlocal\fR\&. Examples are \fImodules\fR, \fIauth_method\fR and \fIdefault_db\fR\&. The options that cannot be defined per virtual host are called \fIglobal\fR\&. Examples are \fIloglevel\fR, \fIcertfiles\fR and \fIlisten\fR\&. It is a configuration mistake to put \fIglobal\fR options under \fIhost_config\fR or \fIappend_host_config\fR section \- ejabberd will refuse to load such configuration\&.
 .sp
-It is not recommended to write ejabberd\&.yml from scratch\&. Instead it is better to start from "default" configuration file available at https://github\&.com/processone/ejabberd/blob/23\&.10/ejabberd\&.yml\&.example\&. Once you get ejabberd running you can start changing configuration options to meet your requirements\&.
+It is not recommended to write ejabberd\&.yml from scratch\&. Instead it is better to start from "default" configuration file available at https://github\&.com/processone/ejabberd/blob/24\&.02/ejabberd\&.yml\&.example\&. Once you get ejabberd running you can start changing configuration options to meet your requirements\&.
 .sp
 Note that this document is intended to provide comprehensive description of all configuration options that can be consulted to understand the meaning of a particular option, its format and possible values\&. It will be quite hard to understand how to configure ejabberd by reading this document only \- for this purpose the reader is recommended to read online Configuration Guide available at https://docs\&.ejabberd\&.im/admin/configuration\&.
 .SH "TOP LEVEL OPTIONS"
@@ -405,7 +405,7 @@ will be used\&.
 .RS 4
 Supplement check for user existence based on
 \fImod_last\fR
-data, for authentication methods that don\(cqt have a way to reliable tell if user exists (like is the case for
+data, for authentication methods that don\(cqt have a way to reliably tell if a user exists (like is the case for
 \fIjwt\fR
 and certificate based authentication)\&. This helps with processing offline message for those users\&. The default value is
 \fItrue\fR\&.
@@ -430,7 +430,9 @@ Git repository\&. Please refer to that module\(cqs README file for details\&.
 .PP
 \fBauth_password_format\fR: \fIplain | scram\fR
 .RS 4
-The option defines in what format the users passwords are stored:
+The option defines in what format the users passwords are stored, plain text or in
+SCRAM
+format:
 .sp
 .RS 4
 .ie n \{\
@@ -440,7 +442,7 @@ The option defines in what format the users passwords are stored:
 .sp -1
 .IP \(bu 2.3
 .\}
-\fIplain\fR: The password is stored as plain text in the database\&. This is risky because the passwords can be read if your database gets compromised\&. This is the default value\&. This format allows clients to authenticate using: the old Jabber Non\-SASL (XEP\-0078), SASL PLAIN, SASL DIGEST\-MD5, and SASL SCRAM\-SHA\-1\&.
+\fIplain\fR: The password is stored as plain text in the database\&. This is risky because the passwords can be read if your database gets compromised\&. This is the default value\&. This format allows clients to authenticate using: the old Jabber Non\-SASL (XEP\-0078), SASL PLAIN, SASL DIGEST\-MD5, and SASL SCRAM\-SHA\-1/256/512(\-PLUS)\&.
 .RE
 .sp
 .RS 4
@@ -451,14 +453,19 @@ The option defines in what format the users passwords are stored:
 .sp -1
 .IP \(bu 2.3
 .\}
-\fIscram\fR: The password is not stored, only some information that allows to verify the hash provided by the client\&. It is impossible to obtain the original plain password from the stored information; for this reason, when this value is configured it cannot be changed to plain anymore\&. This format allows clients to authenticate using: SASL PLAIN and SASL SCRAM\-SHA\-1\&. The default value is
-\fIplain\fR\&.
+\fIscram\fR: The password is not stored, only some information required to verify the hash provided by the client\&. It is impossible to obtain the original plain password from the stored information; for this reason, when this value is configured it cannot be changed to plain anymore\&. This format allows clients to authenticate using: SASL PLAIN and SASL SCRAM\-SHA\-1/256/512(\-PLUS)\&. The SCRAM variant depends on the
+\fIauth_scram_hash\fR
+option\&.
 .RE
 .RE
+.sp
+The default value is \fIplain\fR\&.
 .PP
 \fBauth_scram_hash\fR: \fIsha | sha256 | sha512\fR
 .RS 4
-Hash algorithm that should be used to store password in SCRAM format\&. You shouldn\(cqt change this if you already have passwords generated with a different algorithm \- users that have such passwords will not be able to authenticate\&. The default value is
+Hash algorithm that should be used to store password in
+SCRAM
+format\&. You shouldn\(cqt change this if you already have passwords generated with a different algorithm \- users that have such passwords will not be able to authenticate\&. The default value is
 \fIsha\fR\&.
 .RE
 .PP
@@ -725,6 +732,14 @@ or
 is case\-insensitive\&. The default value is an empty list, i\&.e\&. no mechanisms are disabled by default\&.
 .RE
 .PP
+\fBdisable_sasl_scram_downgrade_protection\fR: \fItrue | false\fR
+.RS 4
+Allows to disable sending data required by
+\fIXEP\-0474: SASL SCRAM Downgrade Protection\fR\&. There are known buggy clients (like those that use strophejs 1\&.6\&.2) which will not be able to authenticatate when servers sends data from that specification\&. This options allows server to disable it to allow even buggy clients connects, but in exchange decrease MITM protection\&. The default value of this option is
+\fIfalse\fR
+which enables this extension\&.
+.RE
+.PP
 \fBdomain_balancing\fR: \fI{Domain: Options}\fR
 .RS 4
 An algorithm to load balance the components that are plugged on an ejabberd cluster\&. It means that you can plug one or several instances of the same component on each ejabberd node and that the traffic will be automatically distributed\&. The algorithm to deliver messages to the component(s) can be specified by this option\&. For any component connected as
@@ -751,7 +766,7 @@ attribute;
 \fIfrom\fR
 attribute;
 \fIbare_destination\fR
-\- by the the bare JID (without resource) of the packet\(cqs
+\- by the bare JID (without resource) of the packet\(cqs
 \fIto\fR
 attribute;
 \fIbare_source\fR
@@ -916,7 +931,7 @@ This ACL rule defines accounts that can use only this auth method, even if other
 .RS 4
 By default, the JID is defined in the
 \fI"jid"\fR
-JWT field\&. This option allows to specify other JWT field name where the JID is defined\&.
+JWT field\&. In this option you can specify other JWT field name where the JID is defined\&.
 .RE
 .PP
 \fBjwt_key\fR: \fIFilePath\fR
@@ -1123,7 +1138,7 @@ section for details\&.
 \fBnegotiation_timeout\fR: \fItimeout()\fR
 .RS 4
 Time to wait for an XMPP stream negotiation to complete\&. When timeout occurs, the corresponding XMPP stream is closed\&. The default value is
-\fI30\fR
+\fI120\fR
 seconds\&.
 .RE
 .PP
@@ -1139,9 +1154,9 @@ This option can be used to tune tick time parameter of
 Whether to use
 \fInew\fR
 SQL schema\&. All schemas are located at
-https://github\&.com/processone/ejabberd/tree/23\&.10/sql\&. There are two schemas available\&. The default legacy schema allows to store one XMPP domain into one ejabberd database\&. The
+https://github\&.com/processone/ejabberd/tree/24\&.02/sql\&. There are two schemas available\&. The default legacy schema stores one XMPP domain into one ejabberd database\&. The
 \fInew\fR
-schema allows to handle several XMPP domains in a single ejabberd database\&. Using this
+schema can handle several XMPP domains in a single ejabberd database\&. Using this
 \fInew\fR
 schema is best when serving several XMPP domains and/or changing domains from time to time\&. This avoid need to manage several databases and handle complex configuration changes\&. The default depends on configuration flag
 \fI\-\-enable\-new\-sql\-schema\fR
@@ -1689,6 +1704,15 @@ seconds\&.
 An SQL database name\&. For SQLite this must be a full path to a database file\&. The default value is
 \fIejabberd\fR\&.
 .RE
+.sp
+\fINote\fR about the next option: added in 24\&.02:
+.PP
+\fBsql_flags\fR: \fI[mysql_alternative_upsert]\fR
+.RS 4
+This option accepts a list of SQL flags, and is empty by default\&.
+\fImysql_alternative_upsert\fR
+forces the alternative upsert implementation in MySQL\&.
+.RE
 .PP
 \fBsql_keepalive_interval\fR: \fItimeout()\fR
 .RS 4
@@ -1738,7 +1762,7 @@ for MS SQL\&. The option has no effect for SQLite\&.
 .RS 4
 This option is
 \fItrue\fR
-by default, and is useful to disable prepared statements\&. The option is valid for PostgreSQL\&.
+by default, and is useful to disable prepared statements\&. The option is valid for PostgreSQL and MySQL\&.
 .RE
 .PP
 \fBsql_query_timeout\fR: \fItimeout()\fR
@@ -1831,12 +1855,18 @@ A user name for SQL authentication\&. The default value is
 Specify what proxies are trusted when an HTTP request contains the header
 \fIX\-Forwarded\-For\fR\&. You can specify
 \fIall\fR
-to allow all proxies, or specify a list of IPs, possibly with masks\&. The default value is an empty list\&. This allows, if enabled, to be able to know the real IP of the request, for admin purpose, or security configuration (for example using
+to allow all proxies, or specify a list of IPs, possibly with masks\&. The default value is an empty list\&. Using this option you can know the real IP of the request, for admin purpose, or security configuration (for example using
 \fImod_fail2ban\fR)\&. IMPORTANT: The proxy MUST be configured to set the
 \fIX\-Forwarded\-For\fR
 header if you enable this option as, otherwise, the client can set it itself and as a result the IP value cannot be trusted for security rules in ejabberd\&.
 .RE
 .PP
+\fBupdate_sql_schema\fR: \fItrue | false\fR
+.RS 4
+Allow ejabberd to update SQL schema\&. The default value is
+\fItrue\fR\&.
+.RE
+.PP
 \fBuse_cache\fR: \fItrue | false\fR
 .RS 4
 Enable or disable cache\&. The default is
@@ -2186,7 +2216,7 @@ Limit any given JID by the number of avatars it is able to convert per minute\&.
 .RE
 .SS "mod_block_strangers"
 .sp
-This module allows to block/log messages coming from an unknown entity\&. If a writing entity is not in your roster, you can let this module drop and/or log the message\&. By default you\(cqll just not receive message from that entity\&. Enable this module if you want to drop SPAM messages\&.
+This module blocks and logs any messages coming from an unknown entity\&. If a writing entity is not in your roster, you can let this module drop and/or log the message\&. By default you\(cqll just not receive message from that entity\&. Enable this module if you want to drop SPAM messages\&.
 .sp
 .it 1 an-trap
 .nr an-no-space-flag 1
@@ -3040,7 +3070,7 @@ List of accounts that are allowed to use this service\&. Default value:
 \fBExamples:\fR
 .RS 4
 .sp
-This example configuration will serve the files from the local directory \fI/var/www\fR in the address \fIhttp://example\&.org:5280/pub/archive/\fR\&. In this example a new content type \fIogg\fR is defined, \fIpng\fR is redefined, and \fIjpg\fR definition is deleted:
+This example configuration will serve the files from the local directory \fI/var/www\fR in the address \fIhttp://example\&.org:5280/pub/content/\fR\&. In this example a new content type \fIogg\fR is defined, \fIpng\fR is redefined, and \fIjpg\fR definition is deleted:
 .sp
 .if n \{\
 .RS 4
@@ -3053,7 +3083,7 @@ listen:
     module: ejabberd_http
     request_handlers:
       \&.\&.\&.
-      /pub/archive: mod_http_fileserver
+      /pub/content: mod_http_fileserver
       \&.\&.\&.
   \&.\&.\&.
 
@@ -3545,6 +3575,96 @@ When this option is disabled, for each individual subscriber a separa mucsub mes
 \fIfalse\fR\&.
 .RE
 .RE
+.SS "mod_matrix_gw"
+.sp
+Matrix gateway\&.
+.sp
+This module is available since ejabberd 24\&.02\&.
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.ps +1
+\fBAvailable options:\fR
+.RS 4
+.PP
+\fBhost\fR: \fIHost\fR
+.RS 4
+This option defines the Jabber IDs of the service\&. If the
+\fIhost\fR
+option is not specified, the Jabber ID will be the hostname of the virtual host with the prefix
+\fI"matrix\&."\fR\&. The keyword
+\fI@HOST@\fR
+is replaced with the real virtual host name\&.
+.RE
+.PP
+\fBkey\fR: \fIstring()\fR
+.RS 4
+Value of the matrix signing key, in base64\&.
+.RE
+.PP
+\fBkey_name\fR: \fIstring()\fR
+.RS 4
+Name of the matrix signing key\&.
+.RE
+.PP
+\fBmatrix_domain\fR: \fIDomain\fR
+.RS 4
+Specify a domain in the Matrix federation\&. The keyword
+\fI@HOST@\fR
+is replaced with the hostname\&. The default value is
+\fI@HOST@\fR\&.
+.RE
+.PP
+\fBmatrix_id_as_jid\fR: \fItrue | false\fR
+.RS 4
+If set to
+\fIfalse\fR, all packets failing to be delivered via an XMPP server\-to\-server connection will then be routed to the Matrix gateway by translating a Jabber ID
+\fIuser@matrixdomain\&.tld\fR
+to a Matrix user identifier
+\fI@user:matrixdomain\&.tld\fR\&. When set to
+\fItrue\fR, messages must be explicitly sent to the matrix gateway service Jabber ID to be routed to a remote Matrix server\&. In this case, to send a message to Matrix user
+\fI@user:matrixdomain\&.tld\fR, the client must send a message to the JID
+\fIuser%\fR\fImatrixdomain\&.tld@matrix\&.myxmppdomain\fR\fI\&.tld\fR, where
+\fImatrix\&.myxmppdomain\&.tld\fR
+is the JID of the gateway service as set by the
+\fIhost\fR
+option\&. The default is
+\fIfalse\fR\&.
+.RE
+.RE
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.ps +1
+\fBExample:\fR
+.RS 4
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+listen:
+  \-
+    port: 8448
+    module: ejabberd_http
+    tls: true
+    request_handlers:
+      "/_matrix": mod_matrix_gw
+
+modules:
+  mod_matrix_gw:
+    key_name: "key1"
+    key: "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
+    matrix_id_as_jid: true
+.fi
+.if n \{\
+.RE
+.\}
+.RE
 .SS "mod_metrics"
 .sp
 This module sends events to external backend (by now only grapherl is supported)\&. Supported events are:
@@ -3913,7 +4033,7 @@ or
 \fIsubscribe\fR
 or both, and
 \fIauthentication\fR
-section with username/password field or certfile pointing to client certificate\&. Accepted urls can use schema mqtt, mqtts (mqtt with tls), mqtt5, mqtt5s (both to trigger v5 protocol), ws, wss, ws5, wss5\&. Certifcate authentication can be only used with mqtts, mqtt5s, wss, wss5\&.
+section with username/password field or certfile pointing to client certificate\&. Accepted urls can use schema mqtt, mqtts (mqtt with tls), mqtt5, mqtt5s (both to trigger v5 protocol), ws, wss, ws5, wss5\&. Certificate authentication can be only used with mqtts, mqtt5s, wss, wss5\&.
 .RE
 .RE
 .sp
@@ -4027,7 +4147,7 @@ option, but applied to this module only\&.
 .PP
 \fBdefault_room_options\fR: \fIOptions\fR
 .RS 4
-This option allows to define the desired default room options\&. Note that the creator of a room can modify the options of his room at any time using an XMPP client with MUC capability\&. The
+Define the default room options\&. Note that the creator of a room can modify the options of his room at any time using an XMPP client with MUC capability\&. The
 \fIOptions\fR
 are:
 .PP
@@ -4609,7 +4729,7 @@ to a remote file\&. By default a predefined CSS will be embedded into the HTML p
 .PP
 \fBdirname\fR: \fIroom_jid | room_name\fR
 .RS 4
-Allows to configure the name of the room directory\&. If set to
+Configure the name of the room directory\&. If set to
 \fIroom_jid\fR, the room directory name will be the full room JID\&. Otherwise, the room directory name will be only the room name, not including the MUC service name\&. The default value is
 \fIroom_jid\fR\&.
 .RE
@@ -5050,7 +5170,11 @@ This module implements support for XEP\-0199: XMPP Ping and periodic keepalives\
 .PP
 \fBping_ack_timeout\fR: \fItimeout()\fR
 .RS 4
-How long to wait before deeming that a client has not answered a given server ping request\&. The default value is
+How long to wait before deeming that a client has not answered a given server ping request\&. NOTE: when
+\fImod_stream_mgmt\fR
+is loaded and stream management is enabled by a client, this value is ignored, and the
+ack_timeout
+applies instead\&. The default value is
 \fIundefined\fR\&.
 .RE
 .PP
@@ -5689,7 +5813,7 @@ or
 To specify whether or not pubsub should cache last items\&. Value is
 \fItrue\fR
 or
-\fIfalse\fR\&. If not defined, pubsub does not cache last items\&. On systems with not so many nodes, caching last items speeds up pubsub and allows to raise user connection rate\&. The cost is memory usage, as every item is stored in memory\&.
+\fIfalse\fR\&. If not defined, pubsub does not cache last items\&. On systems with not so many nodes, caching last items speeds up pubsub and allows you to raise the user connection rate\&. The cost is memory usage, as every item is stored in memory\&.
 .RE
 .sp
 \fINote\fR about the next option: added in 21\&.12:
@@ -5770,7 +5894,7 @@ nodetree before\&.
 .PP
 \fBpep_mapping\fR: \fIList of Key:Value\fR
 .RS 4
-This allows to define a list of key\-value to choose defined node plugins on given PEP namespace\&. The following example will use
+In this option you can provide a list of key\-value to choose defined node plugins on given PEP namespace\&. The following example will use
 \fInode_tune\fR
 instead of
 \fInode_pep\fR
@@ -5823,7 +5947,7 @@ plugin handles the default behaviour and follows standard XEP\-0060 implementati
 .IP \(bu 2.3
 .\}
 \fIpep\fR
-plugin adds extension to handle Personal Eventing Protocol (XEP\-0163) to the PubSub engine\&. Adding pep allows to handle PEP automatically\&.
+plugin adds extension to handle Personal Eventing Protocol (XEP\-0163) to the PubSub engine\&. When enabled, PEP is handled automatically\&.
 .RE
 .RE
 .PP
@@ -6094,7 +6218,7 @@ on the requested username, registration of that user name is denied\&. There are
 .RS 4
 By default,
 \fIejabberd\fR
-doesn\(cqt allow to register new accounts from s2s or existing c2s sessions\&. You can change it by defining access rule in this option\&. Use with care: allowing registration from s2s leads to uncontrolled massive accounts creation by rogue users\&.
+doesn\(cqt allow the client to register new accounts from s2s or existing c2s sessions\&. You can change it by defining access rule in this option\&. Use with care: allowing registration from s2s leads to uncontrolled massive accounts creation by rogue users\&.
 .RE
 .PP
 \fBaccess_remove\fR: \fIAccessName\fR
@@ -6954,7 +7078,7 @@ It is not enough to just load this module\&. You should also configure listeners
 .PP
 \fBalways_record_route\fR: \fItrue | false\fR
 .RS 4
-Always insert "Record\-Route" header into SIP messages\&. This approach allows to bypass NATs/firewalls a bit more easily\&. The default value is
+Always insert "Record\-Route" header into SIP messages\&. With this approach it is possible to bypass NATs/firewalls a bit more easily\&. The default value is
 \fItrue\fR\&.
 .RE
 .PP
@@ -7797,13 +7921,13 @@ TODO
 ProcessOne\&.
 .SH "VERSION"
 .sp
-This document describes the configuration file of ejabberd 23\&.10\&. Configuration options of other ejabberd versions may differ significantly\&.
+This document describes the configuration file of ejabberd 24\&.02\&. Configuration options of other ejabberd versions may differ significantly\&.
 .SH "REPORTING BUGS"
 .sp
 Report bugs to https://github\&.com/processone/ejabberd/issues
 .SH "SEE ALSO"
 .sp
-Default configuration file: https://github\&.com/processone/ejabberd/blob/23\&.10/ejabberd\&.yml\&.example
+Default configuration file: https://github\&.com/processone/ejabberd/blob/24\&.02/ejabberd\&.yml\&.example
 .sp
 Main site: https://ejabberd\&.im
 .sp
@@ -7814,4 +7938,4 @@ Configuration Guide: https://docs\&.ejabberd\&.im/admin/configuration
 Source code: https://github\&.com/processone/ejabberd
 .SH "COPYING"
 .sp
-Copyright (c) 2002\-2023 ProcessOne\&.
+Copyright (c) 2002\-2024 ProcessOne\&.

mix.exs

@@ -3,12 +3,13 @@ defmodule Ejabberd.MixProject do
 
   def project do
     [app: :ejabberd,
+     source_url: "https://github.com/processone/ejabberd",
      version: version(),
      description: description(),
      elixir: elixir_required_version(),
      elixirc_paths: ["lib"],
      compile_path: ".",
-     compilers: [:asn1] ++ Mix.compilers(),
+     compilers: [:asn1, :yecc] ++ Mix.compilers(),
      erlc_options: erlc_options(),
      erlc_paths: ["asn1", "src"],
      # Elixir tests are starting the part of ejabberd they need
@@ -17,17 +18,18 @@ defmodule Ejabberd.MixProject do
      language: :erlang,
      releases: releases(),
      package: package(),
+     docs: docs(),
      deps: deps()]
   end
 
   def version do
     case config(:vsn) do
       :false -> "0.0.0" # ./configure wasn't run: vars.config not created
-      '0.0' -> "0.0.0" # the full git repository wasn't downloaded
-      'latest.0' -> "0.0.0" # running 'docker-ejabberd/ecs/build.sh latest'
+      ~c"0.0" -> "0.0.0" # the full git repository wasn't downloaded
+      ~c"latest.0" -> "0.0.0" # running 'docker-ejabberd/ecs/build.sh latest'
       [_, _, ?., _, _] = x ->
         head = String.replace(:erlang.list_to_binary(x), ~r/\.0+([0-9])/, ".\\1")
-        <<head::binary, ".0">>
+        "#{head}.0"
       vsn -> String.replace(:erlang.list_to_binary(vsn), ~r/\.0+([0-9])/, ".\\1")
     end
   end
@@ -40,14 +42,14 @@ defmodule Ejabberd.MixProject do
 
   def application do
     [mod: {:ejabberd_app, []},
-     extra_applications: [:mix],
-     applications: [:idna, :inets, :kernel, :sasl, :ssl, :stdlib,
+     applications: [:idna, :inets, :kernel, :sasl, :ssl, :stdlib, :mix,
                     :base64url, :fast_tls, :fast_xml, :fast_yaml, :jiffy, :jose,
-                    :p1_utils, :stringprep, :syntax_tools, :yconf],
+                    :p1_utils, :stringprep, :syntax_tools, :yconf]
+     ++ cond_apps(),
      included_applications: [:mnesia, :os_mon,
                              :cache_tab, :eimp, :mqtree, :p1_acme,
                              :p1_oauth2, :pkix, :xmpp]
-     ++ cond_apps()]
+     ++ cond_included_apps()]
   end
 
   defp if_version_above(ver, okResult) do
@@ -68,20 +70,22 @@ defmodule Ejabberd.MixProject do
 
   defp erlc_options do
     # Use our own includes + includes from all dependencies
-    includes = ["include"] ++ deps_include(["fast_xml", "xmpp", "p1_utils"])
+    includes = ["include", deps_include()]
     result = [{:d, :ELIXIR_ENABLED}] ++
              cond_options() ++
              Enum.map(includes, fn (path) -> {:i, path} end) ++
-             if_version_above('20', [{:d, :DEPRECATED_GET_STACKTRACE}]) ++
-             if_version_above('20', [{:d, :HAVE_URI_STRING}]) ++
-             if_version_above('20', [{:d, :HAVE_ERL_ERROR}]) ++
-             if_version_below('21', [{:d, :USE_OLD_HTTP_URI}]) ++
-             if_version_below('22', [{:d, :LAGER}]) ++
-             if_version_below('21', [{:d, :NO_CUSTOMIZE_HOSTNAME_CHECK}]) ++
-             if_version_below('23', [{:d, :USE_OLD_CRYPTO_HMAC}]) ++
-             if_version_below('23', [{:d, :USE_OLD_PG2}]) ++
-             if_version_below('24', [{:d, :COMPILER_REPORTS_ONLY_LINES}]) ++
-             if_version_below('24', [{:d, :SYSTOOLS_APP_DEF_WITHOUT_OPTIONAL}])
+             if_version_above(~c"20", [{:d, :DEPRECATED_GET_STACKTRACE}]) ++
+             if_version_above(~c"20", [{:d, :HAVE_URI_STRING}]) ++
+             if_version_above(~c"20", [{:d, :HAVE_ERL_ERROR}]) ++
+             if_version_below(~c"21", [{:d, :USE_OLD_HTTP_URI}]) ++
+             if_version_below(~c"22", [{:d, :LAGER}]) ++
+             if_version_below(~c"21", [{:d, :NO_CUSTOMIZE_HOSTNAME_CHECK}]) ++
+             if_version_below(~c"23", [{:d, :USE_OLD_CRYPTO_HMAC}]) ++
+             if_version_below(~c"23", [{:d, :USE_OLD_PG2}]) ++
+             if_version_below(~c"24", [{:d, :COMPILER_REPORTS_ONLY_LINES}]) ++
+             if_version_below(~c"24", [{:d, :SYSTOOLS_APP_DEF_WITHOUT_OPTIONAL}]) ++
+             if_version_below(~c"24", [{:d, :OTP_BELOW_24}]) ++
+             if_version_below(~c"25", [{:d, :OTP_BELOW_25}])
     defines = for {:d, value} <- result, do: {:d, value}
     result ++ [{:d, :ALL_DEFS, defines}]
   end
@@ -101,9 +105,9 @@ defmodule Ejabberd.MixProject do
     [{:base64url, "~> 1.0"},
      {:cache_tab, "~> 1.0"},
      {:eimp, "~> 1.0"},
-     {:ex_doc, ">= 0.0.0", only: :dev},
-     {:fast_tls, "~> 1.1"},
-     {:fast_xml, "~> 1.1"},
+     {:ex_doc, "~> 0.31", only: [:dev, :edoc], runtime: false},
+     {:fast_tls, ">= 1.1.18"},
+     {:fast_xml, ">= 1.1.51"},
      {:fast_yaml, "~> 1.0"},
      {:idna, "~> 6.0"},
      {:jiffy, "~> 1.1.1"},
@@ -114,13 +118,13 @@ defmodule Ejabberd.MixProject do
      {:p1_utils, "~> 1.0"},
      {:pkix, "~> 1.0"},
      {:stringprep, ">= 1.0.26"},
-     {:xmpp, git: "https://github.com/processone/xmpp.git", ref: "68cb07d5d0f36d5c51bfea496c638f3ee9b36027", override: true},
+     {:xmpp, ">= 1.8.0"},
      {:yconf, "~> 1.0"}]
     ++ cond_deps()
   end
 
-  defp deps_include(deps) do
-    base = if Mix.Project.umbrella?() do
+  defp deps_include() do
+    if Mix.Project.umbrella?() do
       "../../deps"
     else
       case Mix.Project.deps_paths()[:ejabberd] do
@@ -128,17 +132,21 @@ defmodule Ejabberd.MixProject do
         _ -> ".."
       end
     end
-    Enum.map(deps, fn dep -> base<>"/#{dep}/include" end)
   end
 
   defp cond_deps do
     for {:true, dep} <- [{config(:pam), {:epam, "~> 1.0"}},
+                         {Mix.env() == :translations,
+                          {:ejabberd_po, git: "https://github.com/processone/ejabberd-po.git"}},
                          {config(:redis), {:eredis, "~> 1.2.0"}},
                          {config(:sip), {:esip, "~> 1.0"}},
                          {config(:zlib), {:ezlib, "~> 1.0"}},
-                         {if_version_below('22', true), {:lager, "~> 3.9.1"}},
-                         {config(:lua), {:luerl, "~> 1.0"}},
-                         {config(:mysql), {:p1_mysql, " >= 1.0.22"}},
+                         {if_version_below(~c"22", true), {:lager, "~> 3.9.1"}},
+                         {config(:lua) and if_version_below(~c"27", true),
+                                         {:luerl, "~> 1.1.1"}},
+                         {config(:lua) and if_version_above(~c"26", true),
+                                         {:luerl, git: "https://github.com/processone/luerl", branch: "otp27"}},
+                         {config(:mysql), {:p1_mysql, ">= 1.0.23" }},
                          {config(:pgsql), {:p1_pgsql, "~> 1.1"}},
                          {config(:sqlite), {:sqlite3, "~> 1.1"}},
                          {config(:stun), {:stun, "~> 1.0"}}], do:
@@ -146,10 +154,17 @@ defmodule Ejabberd.MixProject do
   end
 
   defp cond_apps do
+    for {:true, app} <- [{config(:stun), :stun},
+                         {config(:tools), :observer}], do:
+      app
+  end
+
+  defp cond_included_apps do
     for {:true, app} <- [{config(:pam), :epam},
                          {config(:lua), :luerl},
                          {config(:redis), :eredis},
-                         {if_version_below('22', true), :lager},
+                         {Mix.env() == :edoc, :ex_doc},
+                         {if_version_below(~c"22", true), :lager},
                          {config(:mysql), :p1_mysql},
                          {config(:sip), :esip},
                          {config(:odbc), :odbc},
@@ -172,9 +187,19 @@ defmodule Ejabberd.MixProject do
   end
 
   defp vars do
-    case :file.consult("vars.config") do
+    filepath = case Application.fetch_env(:ejabberd, :vars_config_path) do
+      :error ->
+        "vars.config"
+      {:ok, path} ->
+        path
+    end
+    config2 = case :file.consult(filepath) do
       {:ok,config} -> config
-      _ -> [zlib: true]
+      _ -> [stun: true, zlib: true]
+    end
+    case Mix.env() do
+      :dev -> List.keystore(config2, :tools, 0, {:tools, true})
+      _ -> config2
     end
   end
 
@@ -203,7 +228,7 @@ defmodule Ejabberd.MixProject do
           _ -> :ok
         end
         case Version.match?(System.version(), "< 1.11.4")
-          and :erlang.system_info(:otp_release) > '23' do
+          and :erlang.system_info(:otp_release) > ~c"23" do
           true ->
             IO.puts("ERROR: To build releases with Elixir lower than 1.11.4, Erlang/OTP lower than 24 is required.")
           _ -> :ok
@@ -239,6 +264,8 @@ defmodule Ejabberd.MixProject do
       config_dir: config(:config_dir),
       logs_dir: config(:logs_dir),
       spool_dir: config(:spool_dir),
+      vsn: config(:vsn),
+      iexpath: config(:iexpath),
       erl: config(:erl),
       epmd: config(:epmd),
       bindir: Path.join([config(:release_dir), "releases", version()]),
@@ -253,7 +280,7 @@ defmodule Ejabberd.MixProject do
     execute = fn(command) ->
       case function_exported?(System, :shell, 1) do
         true ->
-          System.shell(command)
+          System.shell(command, into: IO.stream())
         false ->
           :os.cmd(to_charlist(command))
       end
@@ -319,13 +346,38 @@ defmodule Ejabberd.MixProject do
     end
 
     case Mix.env() do
-      :dev -> execute.("REL_DIR_TEMP=$PWD/rel/overlays/ rel/setup-dev.sh")
+      :dev -> execute.("REL_DIR_TEMP=$PWD/rel/overlays/ rel/setup-dev.sh mix")
       _ -> :ok
     end
 
     release
   end
 
+  defp docs do
+    [
+      main: "readme",
+      logo: "_build/edoc/logo.png",
+      source_ref: "master",
+      extra_section: "", # No need for Pages section name, it's the only one
+      api_reference: false, # API section has just Elixir, hide it
+      filter_modules: "aaaaa", # Module section has just Elixir modules, hide them
+      extras: [
+        "README.md": [title: "Readme"],
+        "COMPILE.md": [title: "Compile and Install"],
+        "CONTAINER.md": [title: "Container Image"],
+        "CONTRIBUTING.md": [title: "Contributing"],
+        "CONTRIBUTORS.md": [title: "Contributors"],
+        "CODE_OF_CONDUCT.md": [title: "Code of Conduct"],
+        "CHANGELOG.md": [title: "ChangeLog"],
+        "COPYING": [title: "Copying License"],
+        "_build/edoc/docs.md": [title: "&xrArr; ejabberd Docs"]
+      ],
+      groups_for_extras: [
+        "": Path.wildcard("*.md") ++ ["COPYING"],
+        "For more documentation": "_build/edoc/docs.md"
+      ]
+    ]
+  end
 end
 
 defmodule Mix.Tasks.Compile.Asn1 do

mix.lock

@@ -1,35 +1,35 @@
 %{
   "base64url": {:hex, :base64url, "1.0.1", "f8c7f2da04ca9a5d0f5f50258f055e1d699f0e8bf4cfdb30b750865368403cf6", [:rebar3], [], "hexpm", "f9b3add4731a02a9b0410398b475b33e7566a695365237a6bdee1bb447719f5c"},
   "cache_tab": {:hex, :cache_tab, "1.0.30", "6d35eecfb65fbe5fc85988503a27338d32de01243f3fc8ea3ee7161af08725a4", [:rebar3], [{:p1_utils, "1.0.25", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm", "6d8a5e00d8f84c42627706a6dbedb02e34d58495f3ed61935c8475ca0531cda0"},
-  "earmark_parser": {:hex, :earmark_parser, "1.4.33", "3c3fd9673bb5dcc9edc28dd90f50c87ce506d1f71b70e3de69aa8154bc695d44", [:mix], [], "hexpm", "2d526833729b59b9fdb85785078697c72ac5e5066350663e5be6a1182da61b8f"},
+  "earmark_parser": {:hex, :earmark_parser, "1.4.39", "424642f8335b05bb9eb611aa1564c148a8ee35c9c8a8bba6e129d51a3e3c6769", [:mix], [], "hexpm", "06553a88d1f1846da9ef066b87b57c6f605552cfbe40d20bd8d59cc6bde41944"},
   "eimp": {:hex, :eimp, "1.0.22", "fa9b376ef0b50e8455db15c7c11dea4522c6902e04412288aab436d26335f6eb", [:rebar3], [{:p1_utils, "1.0.25", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm", "b3b9ffb1d9a5f4a2ba88ac418a819164932d9a9d3a2fc3d32ca338ce855c4392"},
-  "epam": {:hex, :epam, "1.0.12", "2a5625d4133bca4b3943791a3f723ba764455a461ae9b6ba5debb262efcf4b40", [:rebar3], [], "hexpm", "54c166c4459cef72f2990a3d89a8f0be27180fe0ab0f24b28ddcc3b815f49f7f"},
+  "epam": {:hex, :epam, "1.0.14", "aa0b85d27f4ef3a756ae995179df952a0721237e83c6b79d644347b75016681a", [:rebar3], [], "hexpm", "2f3449e72885a72a6c2a843f561add0fc2f70d7a21f61456930a547473d4d989"},
   "eredis": {:hex, :eredis, "1.2.0", "0b8e9cfc2c00fa1374cd107ea63b49be08d933df2cf175e6a89b73dd9c380de4", [:rebar3], [], "hexpm", "d9b5abef2c2c8aba8f32aa018203e0b3dc8b1157773b254ab1d4c2002317f1e1"},
-  "esip": {:hex, :esip, "1.0.50", "e657d3af332c711311f4eb540e73eb540ea485a25977aef8736fb8cd3845ed9f", [:rebar3], [{:fast_tls, "1.1.16", [hex: :fast_tls, repo: "hexpm", optional: false]}, {:p1_utils, "1.0.25", [hex: :p1_utils, repo: "hexpm", optional: false]}, {:stun, "1.2.10", [hex: :stun, repo: "hexpm", optional: false]}], "hexpm", "7dfb9f16c65c5e49eeba77025d0f894b5fb240be745d11b978ea1438cd47533d"},
-  "ex_doc": {:hex, :ex_doc, "0.30.6", "5f8b54854b240a2b55c9734c4b1d0dd7bdd41f71a095d42a70445c03cf05a281", [:mix], [{:earmark_parser, "~> 1.4.31", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "bd48f2ddacf4e482c727f9293d9498e0881597eae6ddc3d9562bd7923375109f"},
+  "esip": {:hex, :esip, "1.0.52", "a2840287c493a4280e6fba57a257706843b025c315875e38b03fd07190e22dba", [:rebar3], [{:fast_tls, "1.1.19", [hex: :fast_tls, repo: "hexpm", optional: false]}, {:p1_utils, "1.0.25", [hex: :p1_utils, repo: "hexpm", optional: false]}, {:stun, "1.2.12", [hex: :stun, repo: "hexpm", optional: false]}], "hexpm", "6f00165395900500aa262ce0297162d93931c78c1464d89fd0edc6e3d6bc011f"},
+  "ex_doc": {:hex, :ex_doc, "0.31.1", "8a2355ac42b1cc7b2379da9e40243f2670143721dd50748bf6c3b1184dae2089", [:mix], [{:earmark_parser, "~> 1.4.39", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_c, ">= 0.1.1", [hex: :makeup_c, repo: "hexpm", optional: true]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "3178c3a407c557d8343479e1ff117a96fd31bafe52a039079593fb0524ef61b0"},
   "ezlib": {:hex, :ezlib, "1.0.12", "ffe906ba10d03aaee7977e1e0e81d9ffc3bb8b47fb9cd8e2e453507a2e56221f", [:rebar3], [{:p1_utils, "1.0.25", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm", "30e94355fb42260aab6e12582cb0c56bf233515e655c8aeaf48760e7561e4ebb"},
-  "fast_tls": {:hex, :fast_tls, "1.1.16", "85fa7f3112ea4ff5ccb4f3abadc130a8c855ad74eb00869487399cb0c322d208", [:rebar3], [{:p1_utils, "1.0.25", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm", "aa08cca89b4044e74f1f12e399817d8beaeae3ee006c98a893c0bfb1d81fba51"},
-  "fast_xml": {:hex, :fast_xml, "1.1.49", "67d9bfcadd04efd930e0ee1412b5ea09d3e791f1fdbd4d3e9a8c8f29f8bfed8c", [:rebar3], [{:p1_utils, "1.0.25", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm", "01da064d2f740818956961036637fee2475c17bf8aab9442217f90dc77883593"},
+  "fast_tls": {:hex, :fast_tls, "1.1.19", "f52731a4b35259fa06cf23e2a0732920ad9efce7c3d68377f129a474998747bb", [:rebar3], [{:p1_utils, "1.0.25", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm", "db34322c8782d4c5139ccb80709d8ec8c38089b44262edd0c2f660ac495bd389"},
+  "fast_xml": {:hex, :fast_xml, "1.1.51", "a7f8c6942591632309099386d5c339c89997ac2bbdd1216f6c196dee6d7828a9", [:rebar3], [{:p1_utils, "1.0.25", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm", "7fce41b7d1a4ba438a2d7a088dabe74a3ca0739f1af2abcb77e62daf43e0409a"},
   "fast_yaml": {:hex, :fast_yaml, "1.0.36", "65413a34a570fd4e205a460ba602e4ee7a682f35c22d2e1c839025dbf515105c", [:rebar3], [{:p1_utils, "1.0.25", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm", "1abe8f758fc2a86b08edff80bbc687cfd41ebc1412cfec0ef4a0acfcd032052f"},
   "idna": {:hex, :idna, "6.0.0", "689c46cbcdf3524c44d5f3dde8001f364cd7608a99556d8fbd8239a5798d4c10", [:rebar3], [{:unicode_util_compat, "0.4.1", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "4bdd305eb64e18b0273864920695cb18d7a2021f31a11b9c5fbcd9a253f936e2"},
   "jiffy": {:hex, :jiffy, "1.1.1", "aca10f47aa91697bf24ab9582c74e00e8e95474c7ef9f76d4f1a338d0f5de21b", [:rebar3], [], "hexpm", "62e1f0581c3c19c33a725c781dfa88410d8bff1bbafc3885a2552286b4785c4c"},
   "jose": {:hex, :jose, "1.11.5", "3bc2d75ffa5e2c941ca93e5696b54978323191988eb8d225c2e663ddfefd515e", [:mix, :rebar3], [], "hexpm", "dcd3b215bafe02ea7c5b23dafd3eb8062a5cd8f2d904fd9caa323d37034ab384"},
-  "luerl": {:hex, :luerl, "1.0.0", "1b68c30649323590d5339b967b419260500ffe520cd3abc1987482a82d3b5a6c", [:rebar3], [], "hexpm", "c17bc45cb4b0845ec975387f9a5d8c81ab60456698527a29c96f78992af86bd1"},
-  "makeup": {:hex, :makeup, "1.1.0", "6b67c8bc2882a6b6a445859952a602afc1a41c2e08379ca057c0f525366fc3ca", [:mix], [{:nimble_parsec, "~> 1.2.2 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "0a45ed501f4a8897f580eabf99a2e5234ea3e75a4373c8a52824f6e873be57a6"},
+  "luerl": {:hex, :luerl, "1.1.1", "083518e437586f6631150d39c4bff242ed2ec80cb14a3299a0c2628f07a2ff7f", [:rebar3], [], "hexpm", "e17ef246a7ff876ec90e68792a39708979416004d4eacfe8a7643206b9470773"},
+  "makeup": {:hex, :makeup, "1.1.1", "fa0bc768698053b2b3869fa8a62616501ff9d11a562f3ce39580d60860c3a55e", [:mix], [{:nimble_parsec, "~> 1.2.2 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "5dc62fbdd0de44de194898b6710692490be74baa02d9d108bc29f007783b0b48"},
   "makeup_elixir": {:hex, :makeup_elixir, "0.16.1", "cc9e3ca312f1cfeccc572b37a09980287e243648108384b97ff2b76e505c3555", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.2.3 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "e127a341ad1b209bd80f7bd1620a15693a9908ed780c3b763bccf7d200c767c6"},
-  "makeup_erlang": {:hex, :makeup_erlang, "0.1.2", "ad87296a092a46e03b7e9b0be7631ddcf64c790fa68a9ef5323b6cbb36affc72", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "f3f5a1ca93ce6e092d92b6d9c049bcda58a3b617a8d888f8e7231c85630e8108"},
-  "mqtree": {:hex, :mqtree, "1.0.15", "bc54d8b88698fdaebc1e27a9ac43688b927e3dbc05bd5cee4057e69a89a8cf17", [:rebar3], [{:p1_utils, "1.0.25", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm", "294ac43c9b3d372e24eeea56c259e19c655522dcff64a55c401a639663b9d829"},
-  "nimble_parsec": {:hex, :nimble_parsec, "1.3.1", "2c54013ecf170e249e9291ed0a62e5832f70a476c61da16f6aac6dca0189f2af", [:mix], [], "hexpm", "2682e3c0b2eb58d90c6375fc0cc30bc7be06f365bf72608804fb9cffa5e1b167"},
+  "makeup_erlang": {:hex, :makeup_erlang, "0.1.4", "29563475afa9b8a2add1b7a9c8fb68d06ca7737648f28398e04461f008b69521", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "f4ed47ecda66de70dd817698a703f8816daa91272e7e45812469498614ae8b29"},
+  "mqtree": {:hex, :mqtree, "1.0.16", "f8f8b4971e4ca94313ba9bcaaa1aa1077daaba5e3fd3468ffb491420a4cc3593", [:rebar3], [{:p1_utils, "1.0.25", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm", "c87d1c95575db65af29b795c9daa3bed43f5c1bf84072a74469659bcf53594eb"},
+  "nimble_parsec": {:hex, :nimble_parsec, "1.4.0", "51f9b613ea62cfa97b25ccc2c1b4216e81df970acd8e16e8d1bdc58fef21370d", [:mix], [], "hexpm", "9c565862810fb383e9838c1dd2d7d2c437b3d13b267414ba6af33e50d2d1cf28"},
   "p1_acme": {:hex, :p1_acme, "1.0.22", "b40a8031ef0f4592e97e6a8e08e53dbd31a2198cb8377b249f0caea4f8025a1d", [:rebar3], [{:base64url, "1.0.1", [hex: :base64url, repo: "hexpm", optional: false]}, {:idna, "6.0.0", [hex: :idna, repo: "hexpm", optional: false]}, {:jiffy, "1.1.1", [hex: :jiffy, repo: "hexpm", optional: false]}, {:jose, "1.11.5", [hex: :jose, repo: "hexpm", optional: false]}, {:yconf, "1.0.15", [hex: :yconf, repo: "hexpm", optional: false]}], "hexpm", "c2b25a7b295a435dac4f278a73d8417ff2b0020c45e1683504e8692ef03e2057"},
-  "p1_mysql": {:hex, :p1_mysql, "1.0.22", "593107adbce3df1bb460fd442320ff540dfba0232f45278441ef8d2de8d08163", [:rebar3], [], "hexpm", "188f04b3ba265a6e7657c67a6780a2f5f973fe86670159ef593aaf44dbd3d5a2"},
-  "p1_oauth2": {:hex, :p1_oauth2, "0.6.11", "96b4e85c08355720523c2f892011a81a07994d15c179ce4dd82d704fecad15b2", [:rebar3], [], "hexpm", "9c3c6ae59382b9525473bb02a32949889808f33f95f6db10594fd92acd1f63db"},
-  "p1_pgsql": {:hex, :p1_pgsql, "1.1.23", "4a8c17b642dcf5265a910d1a0b86ffb2a9dd057c7b51c3def5eacbcc4f27ced9", [:rebar3], [{:xmpp, "1.7.0", [hex: :xmpp, repo: "hexpm", optional: false]}], "hexpm", "819222bcb5a74581263282ff9cdc679adeefc663dcf49ddc778aeaae90be05a6"},
+  "p1_mysql": {:hex, :p1_mysql, "1.0.23", "9b4e98f1f01e2cc4a759f611f0f015365e65c5f61ea453aa4bdfe950d20a5f11", [:rebar3], [], "hexpm", "9cef98265fb287374e7b64bf4022c4df5ec66196ca31cf4bed73c67c45bf824e"},
+  "p1_oauth2": {:hex, :p1_oauth2, "0.6.14", "1c5f82535574de87e2059695ac4b91f8f9aebacbc1c80287dae6f02552d47aea", [:rebar3], [], "hexpm", "1fd3ac474e43722d9d5a87c6df8d36f698ed87af7bb81cbbb66361451d99ae8f"},
+  "p1_pgsql": {:hex, :p1_pgsql, "1.1.25", "f59b7faa457fadf0c2713ac335202f41ca1b06b7c4926925b3cb0bc6f0578601", [:rebar3], [{:xmpp, "1.8.1", [hex: :xmpp, repo: "hexpm", optional: false]}], "hexpm", "b654c1e07d3e775b626b407e7696cacfd88d17be83e7168b9d89c3832d913de7"},
   "p1_utils": {:hex, :p1_utils, "1.0.25", "2d39b5015a567bbd2cc7033eeb93a7c60d8c84efe1ef69a3473faa07fa268187", [:rebar3], [], "hexpm", "9219214428f2c6e5d3187ff8eb9a8783695c2427420be9a259840e07ada32847"},
   "pkix": {:hex, :pkix, "1.0.9", "eb20b2715d71a23b4fe7e754dae9281a964b51113d0bba8adf9da72bf9d65ac2", [:rebar3], [], "hexpm", "daab2c09cdd4eda05c9b45a5c00e994a1a5f27634929e1377e2e59b707103e3a"},
   "sqlite3": {:hex, :sqlite3, "1.1.14", "f9ea0cff8540865fdfdb7e24eef34dc46677364b1c070896e99b5bf08c8a7fd7", [:rebar3], [], "hexpm", "85054b6ca297343c159ed6794a473ff2c8eeabd854b6fe02f711c0bfd373ce86"},
   "stringprep": {:hex, :stringprep, "1.0.29", "02f23e8c3a219a3dfe40a22e908bece3a2f68af0ff599ea8a7b714ecb21e62ee", [:rebar3], [{:p1_utils, "1.0.25", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm", "928eba304c3006eb1512110ebd7b87db163b00859a09375a1e4466152c6c462a"},
-  "stun": {:hex, :stun, "1.2.10", "53f8be69e14f9476dcaf1dfb626b9dad2380f3fba8faf2c30bdf74311cfdc008", [:rebar3], [{:fast_tls, "1.1.16", [hex: :fast_tls, repo: "hexpm", optional: false]}, {:p1_utils, "1.0.25", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm", "19d3eecbfcc6935f0880f8ef7e77ff373900c604092937a1acda166ae3fb40e9"},
+  "stun": {:hex, :stun, "1.2.12", "a65df67a8aaaecb6a94d687977b2e9f161820819910cb97bbe26a3525356525b", [:rebar3], [{:fast_tls, "1.1.19", [hex: :fast_tls, repo: "hexpm", optional: false]}, {:p1_utils, "1.0.25", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm", "a2055032b6d338d0454142004bcb12fafb0c64ab1f273f1d0c6923ebbc8ede40"},
   "unicode_util_compat": {:hex, :unicode_util_compat, "0.4.1", "d869e4c68901dd9531385bb0c8c40444ebf624e60b6962d95952775cac5e90cd", [:rebar3], [], "hexpm", "1d1848c40487cdb0b30e8ed975e34e025860c02e419cb615d255849f3427439d"},
-  "xmpp": {:git, "https://github.com/processone/xmpp.git", "68cb07d5d0f36d5c51bfea496c638f3ee9b36027", [ref: "68cb07d5d0f36d5c51bfea496c638f3ee9b36027"]},
+  "xmpp": {:hex, :xmpp, "1.8.1", "134a350dbc6e2e99512fb38669191c1d1c134b3b6836f4c6740801882afa650a", [:rebar3], [{:ezlib, "1.0.12", [hex: :ezlib, repo: "hexpm", optional: false]}, {:fast_tls, "1.1.19", [hex: :fast_tls, repo: "hexpm", optional: false]}, {:fast_xml, "1.1.51", [hex: :fast_xml, repo: "hexpm", optional: false]}, {:idna, "6.0.0", [hex: :idna, repo: "hexpm", optional: false]}, {:p1_utils, "1.0.25", [hex: :p1_utils, repo: "hexpm", optional: false]}, {:stringprep, "1.0.29", [hex: :stringprep, repo: "hexpm", optional: false]}], "hexpm", "32d4a308a6613e4e4155fa4e82eccdc8833096d0fa8d99c8d428c800611e59d3"},
   "yconf": {:hex, :yconf, "1.0.15", "e22998b3d7728270bdd06162a9515bd142b14fae8927cbdbd3ef639c32aa6f7a", [:rebar3], [{:fast_yaml, "1.0.36", [hex: :fast_yaml, repo: "hexpm", optional: false]}], "hexpm", "7ff2ab24d3c9833842716b9aaaa01a8f96641a7695cbb701b03445c4def01117"},
 }

priv/msgs/bg.msg

@@ -48,6 +48,7 @@
 {"Anyone with a presence subscription of both or from may subscribe and retrieve items","Всеки, който има абонамент за присъствие на двете или от: може да се абонира и да извлича елементи"}.
 {"Anyone with Voice","Всеки, с възможност за гласово обаждане"}.
 {"Anyone","Всеки"}.
+{"Apparently your account has no administration rights in this server. Please check how to grant admin rights in: https://docs.ejabberd.im/admin/installation/#administration-account","Очевидно Вашият акаунт няма административни права за този сървър. Моля, проверете как да предоставите администраторски права на: https://docs.ejabberd.im/admin/installation/#administration-account"}.
 {"April","Април"}.
 {"Attribute 'channel' is required for this request","Атрибутът 'канал' е задължителен за тази заявка"}.
 {"Attribute 'id' is mandatory for MIX messages","Атрибутът 'id' е задължителен за MIX съобщения"}.
@@ -123,6 +124,9 @@
 {"Dynamically specify a replyto of the item publisher","Динамично задаване на отговор към публикувалия елемента"}.
 {"Edit Properties","Редактиране на свойства"}.
 {"Either approve or decline the voice request.","Одобрете или отхвърлете заявката за гласова връзка."}.
+{"ejabberd vCard module","ejabberd vCard модул"}.
+{"ejabberd Web Admin","Уеб администрация на ejabberd"}.
+{"ejabberd","ejabberd"}.
 {"Elements","Елементи"}.
 {"Email Address","Имейл адрес"}.
 {"Email","Илейл"}.
@@ -247,7 +251,7 @@
 {"Maximum file size","Максимален размер на файла"}.
 {"Maximum Number of History Messages Returned by Room","Максимален брой съобщения от хронологията, върнати от стая"}.
 {"Maximum number of items to persist","Максимален брой елементи за запазване"}.
-{"Maximum Number of Occupants","Максимален брой потребители"}.
+{"Maximum Number of Occupants","Максимален брой участници"}.
 {"May","Май"}.
 {"Members not added (inexistent vhost!): ","Членовете не са добавени (несъществуващ vhost!): "}.
 {"Membership is required to enter this room","Изисква се членство, за вход в тази стая"}.
@@ -329,7 +333,7 @@
 {"Notify subscribers when the node is deleted","Уведоми абонатите, когато нодът бъде изтрит"}.
 {"November","Ноември"}.
 {"Number of answers required","Брой на необходимите отговори"}.
-{"Number of occupants","Брой потребители"}.
+{"Number of occupants","Брой участници"}.
 {"Number of Offline Messages","Брой офлайн съобщения"}.
 {"Number of online users","Брой онлайн потребители"}.
 {"Number of registered users","Брой регистрирани потребители"}.
@@ -346,6 +350,7 @@
 {"Online Users:","Онлайн потребители:"}.
 {"Online","Онлайн"}.
 {"Only admins can see this","Само администратори могат да видят това"}.
+{"Only collection node owners may associate leaf nodes with the collection","Само собственици на колекционни нодове имат право да свързват листови нодове към колекцията"}.
 {"Only deliver notifications to available users","Доставяне на известия само до наличните потребители"}.
 {"Only <enable/> or <disable/> tags are allowed","Само тагове <enable/> и <disable/> са разрешени"}.
 {"Only <list/> element is allowed in this query","Само елементът <list/> е разрешен за тази заявка"}.
@@ -354,11 +359,12 @@
 {"Only moderators are allowed to change the subject in this room","Само модераторите имат право да сменят темата в тази стая"}.
 {"Only moderators are allowed to retract messages","Само модераторите имат право да оттеглят съобщения"}.
 {"Only moderators can approve voice requests","Само модераторите могат да одобряват гласови заявки"}.
-{"Only occupants are allowed to send messages to the conference","Само обитателите имат право да изпращат съобщения до конференцията"}.
-{"Only occupants are allowed to send queries to the conference","Само обитателите имат право да изпращат запитвания до конференцията"}.
+{"Only occupants are allowed to send messages to the conference","Само участници имат право да изпращат съобщения до конференцията"}.
+{"Only occupants are allowed to send queries to the conference","Само участници имат право да изпращат запитвания до конференцията"}.
 {"Only publishers may publish","Само издателите могат да публикуват"}.
 {"Only service administrators are allowed to send service messages","Само администраторите на услуги имат право да изпращат системни съобщения"}.
-{"Only those on a whitelist may subscribe and retrieve items","Само тези в белия списък могат да се абонират и да извличат елементи"}.
+{"Only those on a whitelist may associate leaf nodes with the collection","Само тези от списъка с позволени могат да свързват листови нодове с колекцията"}.
+{"Only those on a whitelist may subscribe and retrieve items","Само тези от списъка с позволени могат да се абонират и да извличат елементи"}.
 {"Organization Name","Име на организацията"}.
 {"Organization Unit","Отдел"}.
 {"Other Modules Available:","Други налични модули:"}.
@@ -375,6 +381,7 @@
 {"Password:","Парола:"}.
 {"Path to Dir","Път към директория"}.
 {"Path to File","Път до файл"}.
+{"Payload semantic type information","Информация за семантичен тип полезен товар"}.
 {"Pending","В очакване"}.
 {"Period: ","Период: "}.
 {"Persist items to storage","Запазване на елементите в хранилището"}.
@@ -395,9 +402,9 @@
 {"Publish model","Модел за публикуване"}.
 {"Publish-Subscribe","Публикуване-Абониране"}.
 {"PubSub subscriber request","Заявка от абонат за PubSub"}.
-{"Purge all items when the relevant publisher goes offline","Изчисти всички елементи, когато съответният издател премине в режим офлайн"}.
+{"Purge all items when the relevant publisher goes offline","Изчисти всички елементи, когато съответният публикуващ премине в режим офлайн"}.
 {"Push record not found","Push записът не е намерен"}.
-{"Queries to the conference members are not allowed in this room","В тази зала не се допускат запитвания към членовете на конференцията"}.
+{"Queries to the conference members are not allowed in this room","В тази стая не се допускат запитвания към членовете на конференцията"}.
 {"Query to another users is forbidden","Заявка към други потребители е забранена"}.
 {"RAM and disc copy","Копие в RAM и на диск"}.
 {"RAM copy","Копие в RAM"}.
@@ -406,7 +413,7 @@
 {"Receive notification from direct child nodes only","Получаване на известия само от директни подчинени нодове"}.
 {"Receive notification of new items only","Получаване на известия само за нови елементи"}.
 {"Receive notification of new nodes only","Получаване на известия само за нови нодове"}.
-{"Recipient is not in the conference room","Получателят не е в конферентната зала"}.
+{"Recipient is not in the conference room","Получателят не е в конферентната стая"}.
 {"Register an XMPP account","Регистрирай XMPP акаунт"}.
 {"Registered Users","Регистрирани потребители"}.
 {"Registered Users:","Регистрирани потребители:"}.
@@ -434,7 +441,7 @@
 {"Room Configuration","Конфигурация на стаята"}.
 {"Room creation is denied by service policy","Създаването на стая е отказано поради политика на услугата"}.
 {"Room description","Описание на стаята"}.
-{"Room Occupants","Обитатели на стаята"}.
+{"Room Occupants","Участници в стаята"}.
 {"Room terminates","Стаята се прекратява"}.
 {"Room title","Заглавие на стаята"}.
 {"Roster groups allowed to subscribe","Групи от списъци с контакти, на които е разрешено да се абонират"}.
@@ -443,6 +450,7 @@
 {"Roster:","Списък с контакти:"}.
 {"RPC Call Error","Грешка при RPC повикване"}.
 {"Running Nodes","Работещи нодове"}.
+{"~s invites you to the room ~s","~s ви кани в стая ~s"}.
 {"Saturday","Събота"}.
 {"Script check","Проверка на скрипт"}.
 {"Search from the date","Търси от дата"}.
@@ -470,7 +478,7 @@
 {"Sources Specs:","Спецификации на източниците:"}.
 {"Specify the access model","Задай модела за достъп"}.
 {"Specify the event message type","Задай типа на съобщението за събитие"}.
-{"Specify the publisher model","Задай модела на издателя"}.
+{"Specify the publisher model","Задайте модела на публикуващия"}.
 {"Stanza id is not valid","Невалидно ID на строфата"}.
 {"Stanza ID","ID на строфа"}.
 {"Statically specify a replyto of the node owner(s)","Статично задаване на replyto на собственика(ците) на нода"}.
@@ -496,7 +504,7 @@
 {"Text associated with a sound","Текст, свързан със звук"}.
 {"Text associated with a video","Текст, свързан с видео"}.
 {"Text associated with speech","Текст, свързан с реч"}.
-{"That nickname is already in use by another occupant","Този псевдоним вече се използва от друг потребител"}.
+{"That nickname is already in use by another occupant","Този псевдоним вече се използва от друг участник"}.
 {"That nickname is registered by another person","Този псевдоним е регистриран от друго лице"}.
 {"The account already exists","Профилът вече съществува"}.
 {"The account was not unregistered","Профилът не е дерегистриран"}.
@@ -504,6 +512,8 @@
 {"The CAPTCHA is valid.","CAPTCHA предизвикателството е валидно."}.
 {"The CAPTCHA verification has failed","Проверката на CAPTCHA предизвикателството е неуспешна"}.
 {"The captcha you entered is wrong","Въведеният captcha код е грешен"}.
+{"The child nodes (leaf or collection) associated with a collection","Дъщерните нодове (листови или колекция), свързани с колекция"}.
+{"The collections with which a node is affiliated","Колекциите, с които даден нод е свързан"}.
 {"The DateTime at which a leased subscription will end or has ended","Датата и часът, на който абонамент ще приключи или е приключил"}.
 {"The datetime when the node was created","Датата, когато нодът е бил създаден"}.
 {"The default language of the node","Езикът по подразбиране на нода"}.
@@ -514,10 +524,12 @@
 {"The JIDs of those with an affiliation of publisher","JID-та на лица с принадлежност към публикуващи"}.
 {"The list of all online users","Списък на всички онлайн потребители"}.
 {"The list of all users","Списък на всички потребители"}.
+{"The list of JIDs that may associate leaf nodes with a collection","Списъкът с JID, които могат да асоциират листови нодове с колекция"}.
 {"The maximum number of child nodes that can be associated with a collection, or `max` for no specific limit other than a server imposed maximum","Максимален брой подчинени нодове, които могат да бъдат свързани с колекция, или `max` за липса на конкретен лимит, различен от наложения от сървъра максимум"}.
 {"The minimum number of milliseconds between sending any two notification digests","Минималният брой милисекунди между изпращането на две извадки на известия"}.
 {"The name of the node","Името на нода"}.
 {"The node is a collection node","Нодът е от тип колекция"}.
+{"The node is a leaf node (default)","Нодът е листов (по подразбиране)"}.
 {"The NodeID of the relevant node","NodeID на съответния нод"}.
 {"The number of pending incoming presence subscription requests","Броят на чакащите входящи заявки за абонамент за присъствие"}.
 {"The number of subscribers to the node","Бротят абонати на нода"}.
@@ -534,6 +546,124 @@
 {"The semantic type information of data in the node, usually specified by the namespace of the payload (if any)","Информацията за семантичния тип данни на нода, обикновено зададена от пространството на имената на прикачените данни (ако има такива)"}.
 {"The sender of the last received message","Подателят на последното получено съобщение"}.
 {"The stanza MUST contain only one <active/> element, one <default/> element, or one <list/> element","Строфата ТРЯБВА да съдържа само един <active/> елемент, един <default/> елемент или един <list/> елемент"}.
+{"The subscription identifier associated with the subscription request","Идентификаторът на абонамента, свързан със заявката за абонамент"}.
 {"The URL of an XSL transformation which can be applied to payloads in order to generate an appropriate message body element.","URL адрес на XSL трансформацията, която може да се приложи към прикачените данни, за да се генерира подходящ елемент от тялото на съобщението."}.
 {"The URL of an XSL transformation which can be applied to the payload format in order to generate a valid Data Forms result that the client could display using a generic Data Forms rendering engine","URL адрес на XSL трансформацията, която може да се приложи към формата на прикачените данни, за да се генерира валиден резултат от Data Forms, който клиентът може да покаже с помощта на общ механизъм за визуализация на Data Forms."}.
+{"There was an error changing the password: ","Възникна грешка при промяна на паролата: "}.
+{"There was an error creating the account: ","Възникна грешка при създаването на профила: "}.
+{"There was an error deleting the account: ","Възникна грешка при изтриването на профила: "}.
+{"This is case insensitive: macbeth is the same that MacBeth and Macbeth.","Не е чувствително към регистъра (главни и малки букви): \"macbeth\"е същото като \"MacBeth\"и \"Macbeth\"."}.
+{"This page allows to register an XMPP account in this XMPP server. Your JID (Jabber ID) will be of the form: username@server. Please read carefully the instructions to fill correctly the fields.","Тази страница позволява регистриране на XMPP профил на този сървър. Вашият JID (Jabber ID) ще бъде във формата: username@server. Моля, прочетете внимателно инструкциите, за да попълните правилно полетата."}.
+{"This page allows to unregister an XMPP account in this XMPP server.","Тази страница позволява премахване на XMPP профил от този сървър."}.
+{"This room is not anonymous","Тази стая не е анонимна"}.
+{"This service can not process the address: ~s","Тази услуга не може да обработи адреса: ~s"}.
+{"Thursday","Четвъртък"}.
+{"Time delay","Закъснение"}.
+{"Timed out waiting for stream resumption","Времето за изчакване за възобновяване на потока изтече"}.
+{"Time","Час"}.
+{"To register, visit ~s","За да се регистрирате, посетете ~s"}.
+{"To ~ts","До ~ts"}.
+{"Token TTL","Токен TTL"}.
+{"Too many active bytestreams","Твърде много активни \"bytestreams\" потоци"}.
+{"Too many CAPTCHA requests","Твърде много CAPTCHA заявки"}.
+{"Too many child elements","Твърде много дъщерни елементи"}.
+{"Too many <item/> elements","Твърде много <item/> елементи"}.
+{"Too many <list/> elements","Твърде много <list/> елементи"}.
+{"Too many (~p) failed authentications from this IP address (~s). The address will be unblocked at ~s UTC","Твърде много (~p) неуспешни опити за удостоверявания от този IP адрес (~s). Адресът ще бъде деблокиран в ~s UTC"}.
+{"Too many receiver fields were specified","Посочени са твърде много полета за получател"}.
+{"Too many unacked stanzas","Твърде много непотвърдени строфи"}.
+{"Too many users in this conference","Твърде много потребители в тази конференция"}.
+{"Total rooms","Общо стаи"}.
+{"To","До"}.
+{"Traffic rate limit is exceeded","Лимитът за трафик е надвишен"}.
+{"Transactions Aborted:","Прекратени транзакции:"}.
+{"Transactions Committed:","Извършени транзакции:"}.
+{"Transactions Logged:","Регистрирани транзакции:"}.
+{"Transactions Restarted:","Рестартирани транзакции:"}.
+{"~ts's Offline Messages Queue","Офлайн съобщения на ~ts"}.
+{"Tuesday","Вторник"}.
+{"Unable to generate a CAPTCHA","Не може да се генерира CAPTCHA"}.
+{"Unable to register route on existing local domain","Не може да се регистрира маршрут в съществуващ локален домейн"}.
+{"Unauthorized","Неоторизиран"}.
+{"Unexpected action","Неочаквано действие"}.
+{"Unexpected error condition: ~p","Неочаквано състояние на грешка: ~p"}.
+{"Uninstall","Деинсталирай"}.
+{"Unregister an XMPP account","Дерегистрирай XMPP профил"}.
+{"Unregister","Дерегистрирай"}.
+{"Unselect All","Размаркирай всички"}.
+{"Unsupported <index/> element","Неподдържан елемент <index/>"}.
+{"Unsupported version","Неподдържана версия"}.
+{"Update message of the day (don't send)","Актуализирай съобщението на деня (не изпращай)"}.
+{"Update message of the day on all hosts (don't send)","Актуализирай съобщението на деня на всички хостове (не изпращай)"}.
+{"Update plan","План за актуализация"}.
+{"Update ~p","Актуализирай ~p"}.
+{"Update script","Актуализиращ скрипт"}.
+{"Update specs to get modules source, then install desired ones.","Актуализирайте спецификациите, за да получите източник на модули, след което инсталирайте желаните."}.
+{"Update Specs","Актуализирай спецификациите"}.
+{"Update","Актуализирай"}.
+{"Upgrade","Обнови"}.
+{"Uptime:","Време на работа:"}.
+{"URL for Archived Discussion Logs","URL адрес за дневници на архивирани дискусии"}.
+{"User already exists","Потребителят вече съществува"}.
+{"User (jid)","Потребител (jid)"}.
+{"User JID","Потребител JID"}.
+{"User Management","Управление на потребители"}.
+{"User removed","Потребителят е премахнат"}.
+{"User session not found","Потребителската сесия не е намерена"}.
+{"User session terminated","Потребителската сесия е прекратена"}.
+{"User ~ts","Потребител ~ts"}.
+{"Username:","Потребителско име:"}.
+{"Users are not allowed to register accounts so quickly","Не е разрешено потребителите да регистрират профили толкова бързо"}.
+{"Users Last Activity","Последна активност на потребителите"}.
+{"Users","Потребители"}.
+{"User","Потребител"}.
+{"Validate","Валидирай"}.
+{"Value 'get' of 'type' attribute is not allowed","Стойността 'get' на атрибут 'type' не е разрешена"}.
+{"Value of '~s' should be boolean","Стойността на '~s' трябва да е булева"}.
+{"Value of '~s' should be datetime string","Стойността на '~s' трябва да бъде низ за дата и час"}.
+{"Value of '~s' should be integer","Стойността на '~s' трябва да бъде цяло число"}.
+{"Value 'set' of 'type' attribute is not allowed","Стойността 'set' на атрибут 'type' не е разрешена"}.
+{"View joined MIX channels","Вижте присъединените MIX канали"}.
+{"View Queue","Вижте опашката"}.
 {"View Roster","Преглед на списъка с контакти"}.
+{"Virtual Hosts","Виртуални хостове"}.
+{"Visitors are not allowed to change their nicknames in this room","Посетителите нямат право да променят псевдонимите си в тази стая"}.
+{"Visitors are not allowed to send messages to all occupants","На посетителите не е разрешено да изпращат съобщения до всички участници"}.
+{"Visitor","Посетител"}.
+{"Voice requests are disabled in this conference","Гласовите обаждания са деактивирани в тази конференция"}.
+{"Voice request","Заявка за гласово обаждане"}.
+{"Wednesday","Сряда"}.
+{"When a new subscription is processed and whenever a subscriber comes online","Когато се обработва нов абонамент и всеки път, когато абонат се появи онлайн"}.
+{"When a new subscription is processed","Когато се обработва нов абонамент"}.
+{"When to send the last published item","Кога да изпратите последния публикуван елемент"}.
+{"Whether an entity wants to receive an XMPP message body in addition to the payload format","Дали даден обект иска да получи тяло на XMPP съобщение в допълнение към формата на полезен товар"}.
+{"Whether an entity wants to receive digests (aggregations) of notifications or all notifications individually","Дали даден обект желае да получава обобщения за известия или всички известия поотделно"}.
+{"Whether an entity wants to receive or disable notifications","Дали даден обект желае да получава или деактивира известия"}.
+{"Whether owners or publisher should receive replies to items","Дали собствениците или публикуващите трябва да получават отговори на елементи"}.
+{"Whether the node is a leaf (default) or a collection","Дали нодът е листов (по подразбиране) или колекция"}.
+{"Whether to allow subscriptions","Дали да се разрешат абонаменти"}.
+{"Whether to make all subscriptions temporary, based on subscriber presence","Дали всички абонаменти да бъдат временни въз основа на присъствието на абонат"}.
+{"Whether to notify owners about new subscribers and unsubscribes","Дали да се уведомяват собствениците за нови абонати и откази от абонамент"}.
+{"Who can send private messages","Кой може да изпраща лични съобщения"}.
+{"Who may associate leaf nodes with a collection","Кой може да асоциира листови нодове с колекция"}.
+{"Wrong parameters in the web formulary","Грешни параметри в уеб формуляра"}.
+{"Wrong xmlns","Грешен xmlns"}.
+{"XMPP Account Registration","Регистриране на XMPP профил"}.
+{"XMPP Domains","XMPP домейни"}.
+{"XMPP Show Value of Away","XMPP покажи стойност на Отсъства"}.
+{"XMPP Show Value of Chat","XMPP покажи стойност на Чат"}.
+{"XMPP Show Value of DND (Do Not Disturb)","XMPP покажи стойност на DND (Не ме безпокой)"}.
+{"XMPP Show Value of XA (Extended Away)","XMPP покажи стойност на Продължително отсъствие"}.
+{"You are being removed from the room because of a system shutdown","Премахнати сте от стаята поради изключване на системата"}.
+{"You are not allowed to send private messages","Нямате право да изпращате лични съобщения"}.
+{"You are not joined to the channel","Не сте присъединени към канала"}.
+{"You can later change your password using an XMPP client.","По-късно можете да промените паролата си с помощта на XMPP клиент."}.
+{"You have been banned from this room","Достъпът ви до тази стая е забранен"}.
+{"You have joined too many conferences","Присъединили сте се към твърде много конференции"}.
+{"You must fill in field \"Nickname\" in the form","Трябва да попълните полето \"Псевдоним\" във формата"}.
+{"You need a client that supports x:data and CAPTCHA to register","За да се регистрирате Ви е нужен клиент, който поддържа x:data и CAPTCHA"}.
+{"You need a client that supports x:data to register the nickname","За да регистрирате псевдонима, Ви е необходим клиент, който поддържа x:data"}.
+{"You need an x:data capable client to search","За да търсите, Ви е нужен клиент, който поддържа x:data"}.
+{"Your XMPP account was successfully registered.","Вашият XMPP акаунт, беше регистриран успешно."}.
+{"Your XMPP account was successfully unregistered.","Вашият XMPP акаунт, беше успешно дерегистриран."}.
+{"You're not allowed to create nodes","Нямате право да създавате нодове"}.

priv/msgs/cs.msg

@@ -115,6 +115,7 @@
 {"February",". února"}.
 {"File larger than ~w bytes","Soubor větší než ~w bytů"}.
 {"Friday","Pátek"}.
+{"From ~ts","Od ~ts"}.
 {"From","Od"}.
 {"Full Name","Celé jméno"}.
 {"Get Number of Online Users","Získat počet online uživatelů"}.
@@ -151,16 +152,18 @@
 {"Incorrect value of 'action' attribute","Nesprávná hodnota atributu 'action'"}.
 {"Incorrect value of 'action' in data form","Nesprávná hodnota atributu 'action' v datovém formuláři"}.
 {"Incorrect value of 'path' in data form","Nesprávná hodnota atributu 'path' v datovém formuláři"}.
+{"Installed Modules:","Instalované moduly:"}.
 {"Insufficient privilege","Nedostatečné oprávnění"}.
 {"Invalid 'from' attribute in forwarded message","Nesprávný atribut 'from' v přeposlané zprávě"}.
 {"Invitations are not allowed in this conference","Pozvánky nejsou povoleny v této místnosti"}.
 {"IP addresses","IP adresy"}.
 {"is now known as","se přejmenoval(a) na"}.
 {"It is not allowed to send error messages to the room. The participant (~s) has sent an error message (~s) and got kicked from the room","Není povoleno posílat chybové zprávy do místnosti. Účastník (~s) odeslal chybovou zprávu (~s) a byl vyhozen z místnosti"}.
-{"It is not allowed to send private messages of type \"groupchat\"","Není dovoleno odeslání soukromé zprávy typu \"skupinová zpráva\" "}.
+{"It is not allowed to send private messages of type \"groupchat\"","Není dovoleno odeslání soukromých zpráv typu \"skupinová zpráva\""}.
 {"It is not allowed to send private messages to the conference","Není povoleno odesílat soukromé zprávy v této místnosti"}.
 {"Jabber ID","Jabber ID"}.
 {"January",". ledna"}.
+{"Joined MIX channels:","Připojené MIX kanály:"}.
 {"joins the room","vstoupil(a) do místnosti"}.
 {"July",". července"}.
 {"June",". června"}.
@@ -181,7 +184,7 @@
 {"Malformed username","Chybně formátováné jméno uživatele"}.
 {"March",". března"}.
 {"Max payload size in bytes","Maximální náklad v bajtech"}.
-{"Maximum Number of Occupants","Počet účastníků"}.
+{"Maximum Number of Occupants","Maximální počet účastníků"}.
 {"May",". května"}.
 {"Members:","Členové:"}.
 {"Membership is required to enter this room","Pro vstup do místnosti musíte být členem"}.
@@ -200,7 +203,7 @@
 {"Name","Jméno"}.
 {"Name:","Jméno:"}.
 {"Neither 'jid' nor 'nick' attribute found","Nebyl nalezen atribut 'jid' ani 'nick'"}.
-{"Neither 'role' nor 'affiliation' attribute found","Nebyl nalezen atribut 'role'  ani 'affiliation'"}.
+{"Neither 'role' nor 'affiliation' attribute found","Nebyl nalezen atribut 'role' ani 'affiliation'"}.
 {"Never","Nikdy"}.
 {"New Password:","Nové heslo:"}.
 {"Nickname Registration at ","Registrace přezdívky na "}.
@@ -266,6 +269,7 @@
 {"Only service administrators are allowed to send service messages","Pouze správci služby smí odesílat servisní zprávy"}.
 {"Organization Name","Název firmy"}.
 {"Organization Unit","Oddělení"}.
+{"Other Modules Available:","Ostatní dostupné moduly:"}.
 {"Outgoing s2s Connections","Odchozí s2s spojení"}.
 {"Outgoing s2s Connections:","Odchozí s2s spojení:"}.
 {"Owner privileges required","Jsou vyžadována práva vlastníka"}.
@@ -319,7 +323,9 @@
 {"Room Occupants","Počet účastníků"}.
 {"Room title","Název místnosti"}.
 {"Roster groups allowed to subscribe","Skupiny kontaktů, které mohou odebírat"}.
+{"Roster of ~ts","Seznam kontaktů ~ts"}.
 {"Roster size","Velikost seznamu kontaktů"}.
+{"Roster:","Seznam kontaktů:"}.
 {"RPC Call Error","Chyba RPC volání"}.
 {"Running Nodes","Běžící uzly"}.
 {"Saturday","Sobota"}.
@@ -333,7 +339,7 @@
 {"September",". září"}.
 {"Server:","Server:"}.
 {"Set message of the day and send to online users","Nastavit zprávu dne a odeslat ji online uživatelům"}.
-{"Set message of the day on all hosts and send to online users","Nastavit zprávu dne a odeslat ji online uživatelům"}.
+{"Set message of the day on all hosts and send to online users","Nastavit zprávu dne na všech hostitelích a odeslat ji online uživatelům"}.
 {"Shared Roster Groups","Skupiny pro sdílený seznam kontaktů"}.
 {"Show Integral Table","Zobrazit kompletní tabulku"}.
 {"Show Ordinary Table","Zobrazit běžnou tabulku"}.
@@ -357,17 +363,20 @@
 {"Sunday","Neděle"}.
 {"That nickname is already in use by another occupant","Přezdívka je již používána jiným členem"}.
 {"That nickname is registered by another person","Přezdívka je zaregistrována jinou osobou"}.
+{"The account was not unregistered","Účet nebyl smazán"}.
 {"The CAPTCHA is valid.","CAPTCHA souhlasí."}.
 {"The CAPTCHA verification has failed","Ověření CAPTCHA se nezdařilo"}.
 {"The collections with which a node is affiliated","Kolekce, se kterými je uzel spřízněn"}.
 {"The feature requested is not supported by the conference","Požadovaná vlastnost není podporována touto místností"}.
+{"The number of subscribers to the node","Počet odběratelů uzlu"}.
 {"The password contains unacceptable characters","Heslo obsahuje nepovolené znaky"}.
 {"The password is too weak","Heslo je příliš slabé"}.
 {"the password is","heslo je"}.
 {"The query is only allowed from local users","Dotaz je povolen pouze pro místní uživatele"}.
 {"The query must not contain <item/> elements","Dotaz nesmí obsahovat elementy <item/>"}.
-{"The stanza MUST contain only one <active/> element, one <default/> element, or one <list/> element","Stanza MUSÍ obsahovat pouze jeden element  <active/>, jeden element <default/> nebo jeden element <list/>"}.
-{"There was an error creating the account: ","Při vytváření účtu došlo k chybě:"}.
+{"The stanza MUST contain only one <active/> element, one <default/> element, or one <list/> element","Stanza MUSÍ obsahovat pouze jeden element <active/>, jeden element <default/> nebo jeden element <list/>"}.
+{"There was an error changing the password: ","Při změně hesla došlo k chybě: "}.
+{"There was an error creating the account: ","Při vytváření účtu došlo k chybě: "}.
 {"There was an error deleting the account: ","Při mazání účtu došlo k chybě: "}.
 {"This room is not anonymous","Tato místnost není anonymní"}.
 {"Thursday","Čtvrtek"}.
@@ -416,8 +425,8 @@
 {"User","Uživatel"}.
 {"Validate","Ověřit"}.
 {"Value 'get' of 'type' attribute is not allowed","Hodnota 'get' atrubutu 'type' není povolena"}.
-{"Value of '~s' should be boolean","Hodnota  '~s' by měla být boolean"}.
-{"Value of '~s' should be datetime string","Hodnota  '~s' by měla být datetime řetězec"}.
+{"Value of '~s' should be boolean","Hodnota '~s' by měla být boolean"}.
+{"Value of '~s' should be datetime string","Hodnota '~s' by měla být datetime řetězec"}.
 {"Value of '~s' should be integer","Hodnota '~s' by měla být celé číslo"}.
 {"Value 'set' of 'type' attribute is not allowed","Hodnota 'set' atrubutu 'type' není povolena"}.
 {"vCard User Search","Hledání uživatelů ve vizitkách"}.

priv/msgs/it.msg

@@ -3,40 +3,80 @@
 %% To improve translations please read:
 %%   https://docs.ejabberd.im/developer/extending-ejabberd/localization/
 
-{" (Add * to the end of field to match substring)"," Riempire il modulo per la ricerca di utenti Jabber corrispondenti ai criteri (Aggiungere * alla fine del campo per la ricerca di una sottostringa"}.
+{" (Add * to the end of field to match substring)"," (Aggiungere * alla fine del campo per far corrispondere la sottostringa)"}.
 {" has set the subject to: "," ha modificato l'oggetto in: "}.
+{"# participants","# partecipanti"}.
+{"A description of the node","Una descrizione del nodo"}.
 {"A friendly name for the node","Un nome comodo per il nodo"}.
-{"A password is required to enter this room","Per entrare in questa stanza è prevista una password"}.
+{"A password is required to enter this room","Per entrare in questa stanza è necessaria una password"}.
+{"A Web Page","Un Pagina Web"}.
+{"Accept","Accettare"}.
 {"Access denied by service policy","Accesso impedito dalle politiche del servizio"}.
+{"Access model","Modello di accesso"}.
+{"Account doesn't exist","L'account non esiste"}.
 {"Action on user","Azione sull'utente"}.
-{"Add Jabber ID","Aggiungere un Jabber ID (Jabber ID)"}.
-{"Add New","Aggiungere nuovo"}.
-{"Add User","Aggiungere un utente"}.
+{"Add a hat to a user","Aggiungere un cappello a un utente"}.
+{"Add Jabber ID","Aggiungere un Jabber ID"}.
+{"Add New","Aggiungere Nuovo"}.
+{"Add User","Aggiungere un Utente"}.
 {"Administration of ","Amministrazione di "}.
 {"Administration","Amministrazione"}.
-{"Administrator privileges required","Necessari i privilegi di amministratore"}.
+{"Administrator privileges required","Sono richiesti privilegi di amministratore"}.
 {"All activity","Tutta l'attività"}.
-{"All Users","Tutti gli utenti"}.
-{"Allow this Jabber ID to subscribe to this pubsub node?","Consentire a questo Jabber ID l'iscrizione a questo nodo pubsub?"}.
+{"All Users","Tutti gli Utenti"}.
+{"Allow subscription","Consenti iscrizione"}.
+{"Allow this Jabber ID to subscribe to this pubsub node?","Consentire a questo ID Jabber di iscriversi a questo nodo pubsub?"}.
+{"Allow this person to register with the room?","Permettere a questa persona di registrarsi con la stanza?"}.
 {"Allow users to change the subject","Consentire agli utenti di cambiare l'oggetto"}.
 {"Allow users to query other users","Consentire agli utenti query verso altri utenti"}.
-{"Allow users to send invites","Consentire agli utenti l'invio di inviti"}.
-{"Allow users to send private messages","Consentire agli utenti l'invio di messaggi privati"}.
+{"Allow users to send invites","Consenti agli utenti di inviare inviti"}.
+{"Allow users to send private messages","Consenti agli utenti di inviare messaggi privati"}.
 {"Allow visitors to change nickname","Consentire ai visitatori di cambiare il nickname"}.
 {"Allow visitors to send private messages to","Consentire agli ospiti l'invio di messaggi privati a"}.
 {"Allow visitors to send status text in presence updates","Consentire ai visitatori l'invio di testo sullo stato in aggiornamenti sulla presenza"}.
 {"Allow visitors to send voice requests","Consentire agli ospiti l'invio di richieste di parola"}.
+{"An associated LDAP group that defines room membership; this should be an LDAP Distinguished Name according to an implementation-specific or deployment-specific definition of a group.","Un gruppo LDAP associato che definisce l'appartenenza alla sala; deve trattarsi di un nome distinto LDAP in base a una definizione di gruppo specifica dell'implementazione o della distribuzione."}.
 {"Announcements","Annunci"}.
+{"Answer associated with a picture","Risposta associata ad un'immagine"}.
+{"Answer associated with a video","Risposta associata a un video"}.
+{"Answer associated with speech","Risposta associata al discorso"}.
+{"Answer to a question","Risposta a una domanda"}.
+{"Anyone in the specified roster group(s) may subscribe and retrieve items","Chiunque nei gruppi di elenco specificati può iscriversi e recuperare elementi"}.
+{"Anyone may associate leaf nodes with the collection","Chiunque può associare i nodi foglia alla raccolta"}.
+{"Anyone may publish","Chiunque può pubblicare"}.
+{"Anyone may subscribe and retrieve items","Chiunque può iscriversi e recuperare elementi"}.
+{"Anyone with a presence subscription of both or from may subscribe and retrieve items","Chiunque abbia un abbonamento di presenza di entrambi o di può sottoscrivere e recuperare elementi"}.
+{"Anyone with Voice","Chiunque abbia la Voce"}.
+{"Anyone","Chiunque"}.
+{"Apparently your account has no administration rights in this server. Please check how to grant admin rights in: https://docs.ejabberd.im/admin/installation/#administration-account","A quanto pare il tuo account non ha diritti di amministrazione su questo server. Controlla come concedere i diritti di amministratore in: https://docs.ejabberd.im/admin/installation/#administration-account"}.
 {"April","Aprile"}.
+{"Attribute 'channel' is required for this request","Per questa richiesta è richiesto l'attributo 'canale'"}.
+{"Attribute 'id' is mandatory for MIX messages","L'attributo 'id' è obbligatorio per i messaggi MIX"}.
+{"Attribute 'jid' is not allowed here","L'attributo \"jid\" non è consentito qui"}.
+{"Attribute 'node' is not allowed here","L'attributo \"nodo\" non è consentito qui"}.
+{"Attribute 'to' of stanza that triggered challenge","Attributo \"a\" della strofa che ha innescato la sfida"}.
 {"August","Agosto"}.
-{"Backup Management","Gestione dei salvataggi"}.
-{"Backup to File at ","Salvataggio sul file "}.
-{"Backup","Salvare"}.
+{"Automatic node creation is not enabled","La creazione automatica del nodo non è abilitata"}.
+{"Backup Management","Gestione dei Backup"}.
+{"Backup of ~p","Backup di ~p"}.
+{"Backup to File at ","Backup su file in "}.
+{"Backup","Backup"}.
 {"Bad format","Formato non valido"}.
 {"Birthday","Compleanno"}.
+{"Both the username and the resource are required","Sono richiesti sia il nome utente che la risorsa"}.
+{"Bytestream already activated","Bytestream già attivato"}.
+{"Cannot remove active list","Impossibile rimuovere l'elenco attivo"}.
+{"Cannot remove default list","Impossibile rimuovere l'elenco predefinito"}.
 {"CAPTCHA web page","Pagina web CAPTCHA"}.
-{"Change Password","Modificare la password"}.
+{"Challenge ID","ID Sfida"}.
+{"Change Password","Cambiare la password"}.
 {"Change User Password","Cambiare la password dell'utente"}.
+{"Changing password is not allowed","Non è consentito modificare la password"}.
+{"Changing role/affiliation is not allowed","Non è consentito cambiare ruolo/affiliazione"}.
+{"Channel already exists","Canale già esistente"}.
+{"Channel does not exist","Il canale non esiste"}.
+{"Channel JID","Canale JID"}.
+{"Channels","Canali"}.
 {"Characters not allowed:","Caratteri non consentiti:"}.
 {"Chatroom configuration modified","Configurazione della stanza modificata"}.
 {"Chatroom is created","La stanza è creata"}.
@@ -46,39 +86,59 @@
 {"Chatrooms","Stanze"}.
 {"Choose a username and password to register with this server","Scegliere un nome utente e una password per la registrazione con questo server"}.
 {"Choose storage type of tables","Selezionare una modalità di conservazione delle tabelle"}.
-{"Choose whether to approve this entity's subscription.","Scegliere se approvare l'iscrizione per questa entità"}.
+{"Choose whether to approve this entity's subscription.","Scegliere se approvare l'iscrizione per questa entità."}.
 {"City","Città"}.
+{"Client acknowledged more stanzas than sent by server","Il client ha riconosciuto più stanze di quelle inviate dal server"}.
 {"Commands","Comandi"}.
 {"Conference room does not exist","La stanza per conferenze non esiste"}.
 {"Configuration of room ~s","Configurazione per la stanza ~s"}.
 {"Configuration","Configurazione"}.
 {"Connected Resources:","Risorse connesse:"}.
+{"Contact Addresses (normally, room owner or owners)","Indirizzi di contatto (normalmente, proprietario o proprietari della stanza)"}.
+{"Contrib Modules","Moduli di Contributo"}.
 {"Country","Paese"}.
 {"CPU Time:","Tempo CPU:"}.
+{"Current Discussion Topic","Argomento di discussione attuale"}.
+{"Database failure","Errore del database"}.
+{"Database Tables at ~p","Tabelle del database a ~p"}.
 {"Database Tables Configuration at ","Configurazione delle tabelle del database su "}.
 {"Database","Database"}.
 {"December","Dicembre"}.
 {"Default users as participants","Definire per default gli utenti come partecipanti"}.
+{"Delete content","Elimina contenuto"}.
 {"Delete message of the day on all hosts","Eliminare il messaggio del giorno (MOTD) su tutti gli host"}.
 {"Delete message of the day","Eliminare il messaggio del giorno (MOTD)"}.
-{"Delete Selected","Eliminare gli elementi selezionati"}.
+{"Delete Selected","Elimina Selezionato"}.
+{"Delete table","Elimina tabella"}.
 {"Delete User","Eliminare l'utente"}.
 {"Deliver event notifications","Inviare notifiche degli eventi"}.
 {"Deliver payloads with event notifications","Inviare il contenuto del messaggio con la notifica dell'evento"}.
 {"Description:","Descrizione:"}.
-{"Disc only copy","Copia su disco soltanto"}.
+{"Disc only copy","Copia solo su disco"}.
+{"'Displayed groups' not added (they do not exist!): ","'Gruppi visualizzati' non aggiunti (non esistono!): "}.
+{"Displayed:","Visualizzato:"}.
+{"Don't tell your password to anybody, not even the administrators of the XMPP server.","Non rivelare la tua password a nessuno, nemmeno agli amministratori del server XMPP."}.
 {"Dump Backup to Text File at ","Trascrivere il salvataggio sul file di testo "}.
 {"Dump to Text File","Trascrivere su file di testo"}.
+{"Duplicated groups are not allowed by RFC6121","I gruppi duplicati non sono consentiti da RFC6121"}.
+{"Dynamically specify a replyto of the item publisher","Specifica dinamicamente una risposta dell'editore dell'elemento"}.
 {"Edit Properties","Modificare le proprietà"}.
 {"Either approve or decline the voice request.","Approva oppure respingi la richiesta di parola."}.
+{"ejabberd HTTP Upload service","Servizio di Caricamento HTTP di ejabberd"}.
 {"ejabberd MUC module","Modulo MUC per ejabberd"}.
+{"ejabberd Multicast service","Servizio Multicast ejabberd"}.
 {"ejabberd Publish-Subscribe module","Modulo Pubblicazione/Iscrizione (PubSub) per ejabberd"}.
 {"ejabberd SOCKS5 Bytestreams module","Modulo SOCKS5 Bytestreams per ejabberd"}.
 {"ejabberd vCard module","Modulo vCard per ejabberd"}.
 {"ejabberd Web Admin","Amministrazione web ejabberd"}.
+{"ejabberd","ejabberd"}.
 {"Elements","Elementi"}.
+{"Email Address","Indirizzo di Posta Elettronica"}.
 {"Email","E-mail"}.
-{"Enable logging","Abilitare i log"}.
+{"Enable hats","Abilitare i cappelli"}.
+{"Enable logging","Abilitare la registrazione"}.
+{"Enable message archiving","Abilita l'archiviazione dei messaggi"}.
+{"Enabling push without 'node' attribute is not supported","L'abilitazione del push senza l'attributo 'nodo' non è supportata"}.
 {"End User Session","Terminare la sessione dell'utente"}.
 {"Enter nickname you want to register","Immettere il nickname che si vuole registrare"}.
 {"Enter path to backup file","Immettere il percorso del file di salvataggio"}.
@@ -86,30 +146,55 @@
 {"Enter path to jabberd14 spool file","Immettere il percorso del file di spool di jabberd14"}.
 {"Enter path to text file","Immettere il percorso del file di testo"}.
 {"Enter the text you see","Immettere il testo visibile"}.
+{"Erlang XMPP Server","Server XMPP Erlang"}.
 {"Error","Errore"}.
 {"Exclude Jabber IDs from CAPTCHA challenge","Escludi degli ID Jabber dal passaggio CAPTCHA"}.
+{"Export all tables as SQL queries to a file:","Esporta tutte le tabelle come query SQL in un file:"}.
 {"Export data of all users in the server to PIEFXIS files (XEP-0227):","Esportare i dati di tutti gli utenti nel server in file PIEFXIS (XEP-0227):"}.
 {"Export data of users in a host to PIEFXIS files (XEP-0227):","Esportare i dati degli utenti di un host in file PIEFXIS (XEP-0227):"}.
+{"External component failure","Guasto del componente esterno"}.
+{"External component timeout","Timeout del componente esterno"}.
+{"Failed to activate bytestream","Impossibile attivare il flusso di byte"}.
 {"Failed to extract JID from your voice request approval","Impossibile estrarre il JID dall'approvazione della richiesta di parola"}.
+{"Failed to map delegated namespace to external component","Impossibile mappare lo spazio dei nomi delegato al componente esterno"}.
+{"Failed to parse HTTP response","Impossibile analizzare la risposta HTTP"}.
+{"Failed to process option '~s'","Impossibile elaborare l'opzione '~s'"}.
 {"Family Name","Cognome"}.
+{"FAQ Entry","Inserimento delle domande frequenti"}.
 {"February","Febbraio"}.
+{"File larger than ~w bytes","File più grande di ~w byte"}.
+{"Fill in the form to search for any matching XMPP User","Compila il modulo per cercare qualsiasi utente XMPP corrispondente"}.
 {"Friday","Venerdì"}.
+{"From ~ts","Da ~ts"}.
 {"From","Da"}.
+{"Full List of Room Admins","Elenco Completo degli Amministratori delle Stanze"}.
+{"Full List of Room Owners","Elenco Completo dei Proprietari delle Stanze"}.
 {"Full Name","Nome completo"}.
+{"Get List of Online Users","Ottieni L'elenco degli Utenti Online"}.
+{"Get List of Registered Users","Ottieni L'elenco degli Utenti Registrati"}.
 {"Get Number of Online Users","Ottenere il numero di utenti online"}.
 {"Get Number of Registered Users","Ottenere il numero di utenti registrati"}.
+{"Get Pending","Ottieni in sospeso"}.
 {"Get User Last Login Time","Ottenere la data di ultimo accesso dell'utente"}.
 {"Get User Password","Ottenere la password dell'utente"}.
 {"Get User Statistics","Ottenere le statistiche dell'utente"}.
+{"Given Name","Nome di battesimo"}.
 {"Grant voice to this person?","Dare parola a questa persona?"}.
 {"Group","Gruppo"}.
+{"Groups that will be displayed to the members","Gruppi che verranno visualizzati ai membri"}.
 {"Groups","Gruppi"}.
 {"has been banned","è stata/o bandita/o"}.
 {"has been kicked because of a system shutdown","è stato espulso a causa dello spegnimento del sistema"}.
 {"has been kicked because of an affiliation change","è stato espulso a causa di un cambiamento di appartenenza"}.
 {"has been kicked because the room has been changed to members-only","è stato espulso per la limitazione della stanza ai soli membri"}.
 {"has been kicked","è stata/o espulsa/o"}.
+{"Hat title","Titolo del Cappello"}.
+{"Hat URI","URI Cappello"}.
+{"Hats limit exceeded","Limite di cappelli superato"}.
+{"Host unknown","Host sconosciuto"}.
 {"Host","Host"}.
+{"HTTP File Upload","Caricamento file HTTP"}.
+{"Idle connection","Connessione inattiva"}.
 {"If you don't see the CAPTCHA image here, visit the web page.","Se qui non vedi l'immagine CAPTCHA, visita la pagina web."}.
 {"Import Directory","Importare una directory"}.
 {"Import File","Importare un file"}.
@@ -119,22 +204,50 @@
 {"Import users data from jabberd14 spool directory:","Importare i dati utenti da directory di spool di jabberd14:"}.
 {"Import Users from Dir at ","Importare utenti dalla directory "}.
 {"Import Users From jabberd14 Spool Files","Importare utenti da file di spool di jabberd14"}.
+{"Improper domain part of 'from' attribute","Parte del dominio non corretta dell'attributo 'da'"}.
 {"Improper message type","Tipo di messaggio non corretto"}.
+{"Incoming s2s Connections:","Connessioni s2s in Entrata:"}.
+{"Incorrect CAPTCHA submit","Invio CAPTCHA errato"}.
+{"Incorrect data form","Modulo dati errato"}.
 {"Incorrect password","Password non esatta"}.
+{"Incorrect value of 'action' attribute","Valore errato dell'attributo 'azione'"}.
+{"Incorrect value of 'action' in data form","Valore errato di 'azione' nel modulo dati"}.
+{"Incorrect value of 'path' in data form","Valore errato di 'percorso' nel modulo dati"}.
+{"Installed Modules:","Moduli installati:"}.
+{"Install","Installare"}.
+{"Insufficient privilege","Privilegio insufficiente"}.
+{"Internal server error","Errore interno del server"}.
+{"Invalid 'from' attribute in forwarded message","Attributo 'da' non valido nel messaggio inoltrato"}.
+{"Invalid node name","Nome del nodo non valido"}.
+{"Invalid 'previd' value","Valore 'previd' non valido"}.
+{"Invitations are not allowed in this conference","Non sono ammessi inviti a questa conferenza"}.
 {"IP addresses","Indirizzi IP"}.
 {"is now known as","è ora conosciuta/o come"}.
+{"It is not allowed to send error messages to the room. The participant (~s) has sent an error message (~s) and got kicked from the room","Non è consentito inviare messaggi di errore alla stanza. Il partecipante (~s) ha inviato un messaggio di errore (~s) ed è stato espulso dalla stanza"}.
 {"It is not allowed to send private messages of type \"groupchat\"","Non è consentito l'invio di messaggi privati di tipo \"groupchat\""}.
 {"It is not allowed to send private messages to the conference","Non è consentito l'invio di messaggi privati alla conferenza"}.
 {"Jabber ID","Jabber ID (Jabber ID)"}.
 {"January","Gennaio"}.
+{"JID normalization denied by service policy","Normalizzazione JID negata dalla politica del servizio"}.
+{"JID normalization failed","La normalizzazione JID non è riuscita"}.
+{"Joined MIX channels of ~ts","Canali MIX uniti di ~ts"}.
+{"Joined MIX channels:","Canali MIX uniti:"}.
 {"joins the room","entra nella stanza"}.
 {"July","Luglio"}.
 {"June","Giugno"}.
+{"Just created","Appena creato"}.
+{"Label:","Etichetta:"}.
 {"Last Activity","Ultima attività"}.
 {"Last login","Ultimo accesso"}.
+{"Last message","Ultimo messaggio"}.
 {"Last month","Ultimo mese"}.
 {"Last year","Ultimo anno"}.
+{"Least significant bits of SHA-256 hash of text should equal hexadecimal label","I bit meno significativi dell'hash di testo SHA-256 devono corrispondere all'etichetta esadecimale"}.
 {"leaves the room","esce dalla stanza"}.
+{"List of rooms","Elenco delle stanze"}.
+{"List of users with hats","Elenco degli utenti con cappelli"}.
+{"List users with hats","Elenca gli utenti con cappelli"}.
+{"Logging","Registrazione"}.
 {"Low level update script","Script di aggiornamento di basso livello"}.
 {"Make participants list public","Rendere pubblica la lista dei partecipanti"}.
 {"Make room CAPTCHA protected","Rendere la stanza protetta da CAPTCHA"}.
@@ -143,41 +256,104 @@
 {"Make room password protected","Rendere la stanza protetta da password"}.
 {"Make room persistent","Rendere la stanza persistente"}.
 {"Make room public searchable","Rendere la sala visibile al pubblico"}.
+{"Malformed username","Nome utente malformato"}.
+{"MAM preference modification denied by service policy","Modifica delle preferenze MAM negata dalla policy del servizio"}.
 {"March","Marzo"}.
+{"Max # of items to persist, or `max` for no specific limit other than a server imposed maximum","Numero massimo di elementi da persistere o `max` per nessun limite specifico diverso da quello massimo imposto dal server"}.
 {"Max payload size in bytes","Dimensione massima del contenuto del messaggio in byte"}.
+{"Maximum file size","Dimensione massima del file"}.
+{"Maximum Number of History Messages Returned by Room","Numero Massimo di Messaggi di Cronologia Restituiti dalla Stanza"}.
+{"Maximum number of items to persist","Numero massimo di elementi da persistere"}.
 {"Maximum Number of Occupants","Numero massimo di occupanti"}.
 {"May","Maggio"}.
+{"Members not added (inexistent vhost!): ","Membri non aggiunti (vhost inesistente!): "}.
 {"Membership is required to enter this room","Per entrare in questa stanza è necessario essere membro"}.
 {"Members:","Membri:"}.
+{"Memorize your password, or write it in a paper placed in a safe place. In XMPP there isn't an automated way to recover your password if you forget it.","Memorizza la tua password, oppure scrivila su un foglio riposto in un luogo sicuro. In XMPP non esiste un modo automatico per recuperare la password se la dimentichi."}.
 {"Memory","Memoria"}.
+{"Mere Availability in XMPP (No Show Value)","Mera disponibilità in XMPP (Nessun Valore Mostrato)"}.
 {"Message body","Corpo del messaggio"}.
+{"Message not found in forwarded payload","Messaggio non trovato nel payload inoltrato"}.
+{"Messages from strangers are rejected","I messaggi provenienti da sconosciuti vengono rifiutati"}.
+{"Messages of type headline","Messaggi di tipo headline"}.
+{"Messages of type normal","Messaggi di tipo normale"}.
 {"Middle Name","Altro nome"}.
 {"Minimum interval between voice requests (in seconds)","Intervallo minimo fra due richieste di parola (in secondi)"}.
 {"Moderator privileges required","Necessari i privilegi di moderatore"}.
+{"Moderator","Moderatore/Moderatrice"}.
+{"Moderators Only","Solo i Moderatori"}.
 {"Modified modules","Moduli modificati"}.
+{"Module failed to handle the query","Il modulo non è riuscito a gestire la query"}.
 {"Monday","Lunedì"}.
+{"Multicast","Multicast"}.
+{"Multiple <item/> elements are not allowed by RFC6121","Più elementi <item/> non sono consentiti da RFC6121"}.
+{"Multi-User Chat","Chat Multiutente"}.
+{"Name in the rosters where this group will be displayed","Nome nei roster in cui verrà visualizzato questo gruppo"}.
 {"Name","Nome"}.
 {"Name:","Nome:"}.
+{"Natural Language for Room Discussions","Linguaggio Naturale per le Discussioni in Sala"}.
+{"Natural-Language Room Name","Nome della Stanza in Linguaggio Naturale"}.
+{"Neither 'jid' nor 'nick' attribute found","Né l'attributo 'jid' né quello 'nick' sono stati trovati"}.
+{"Neither 'role' nor 'affiliation' attribute found","Non sono stati trovati né gli attributi 'ruolo' né 'affiliazione'"}.
 {"Never","Mai"}.
 {"New Password:","Nuova password:"}.
+{"Nickname can't be empty","Il soprannome non può essere vuoto"}.
 {"Nickname Registration at ","Registrazione di un nickname su "}.
 {"Nickname ~s does not exist in the room","Il nickname ~s non esiste nella stanza"}.
-{"Nickname","Nickname"}.
+{"Nickname","Soprannome"}.
+{"No address elements found","Nessun elemento dell'indirizzo trovato"}.
+{"No addresses element found","Nessun elemento degli indirizzi trovato"}.
+{"No 'affiliation' attribute found","Nessun attributo 'affiliazione' trovato"}.
+{"No available resource found","Nessuna risorsa disponibile trovata"}.
 {"No body provided for announce message","Nessun corpo fornito per il messaggio di annuncio"}.
+{"No child elements found","Non sono stati trovati elementi figlio"}.
+{"No data form found","Nessun modulo dati trovato"}.
 {"No Data","Nessuna informazione"}.
+{"No features available","Nessuna funzionalità disponibile"}.
+{"No <forwarded/> element found","Nessun elemento <forwarded/> trovato"}.
+{"No hook has processed this command","Nessun hook ha elaborato questo comando"}.
+{"No info about last activity found","Nessuna informazione sull'ultima attività trovata"}.
+{"No 'item' element found","Nessun elemento 'item' trovato"}.
+{"No items found in this query","Nessun elemento trovato in questa query"}.
 {"No limit","Nessun limite"}.
-{"Node ID","ID del nodo"}.
+{"No module is handling this query","Nessun modulo gestisce questa query"}.
+{"No node specified","Nessun nodo specificato"}.
+{"No 'password' found in data form","Nessuna 'password' trovata nel modulo dati"}.
+{"No 'password' found in this query","Nessuna \"password\" trovata in questa query"}.
+{"No 'path' found in data form","Nessun 'percorso' trovato nel modulo dati"}.
+{"No pending subscriptions found","Nessuna sottoscrizione in attesa trovata"}.
+{"No privacy list with this name found","Nessun elenco di privacy con questo nome trovato"}.
+{"No private data found in this query","Non sono stati trovati dati privati in questa query"}.
+{"No running node found","Nessun nodo in esecuzione trovato"}.
+{"No services available","Nessun servizio disponibile"}.
+{"No statistics found for this item","Nessuna statistica trovata per questa voce"}.
+{"No 'to' attribute found in the invitation","Nessun attributo 'a' trovato nell'invito"}.
+{"Nobody","Nessuno"}.
+{"Node already exists","Il nodo esiste già"}.
+{"Node ID","ID del Nodo"}.
+{"Node index not found","Indice del nodo non trovato"}.
 {"Node not found","Nodo non trovato"}.
+{"Node ~p","Nodo ~p"}.
+{"Node","Nodo"}.
+{"Nodeprep has failed","Nodeprep non è riuscito"}.
 {"Nodes","Nodi"}.
-{"None","Nessuno"}.
+{"None","Niente"}.
+{"Not allowed","Non consentito"}.
 {"Not Found","Non trovato"}.
+{"Not subscribed","Non sottoscritto"}.
 {"Notify subscribers when items are removed from the node","Notificare gli iscritti quando sono eliminati degli elementi dal nodo"}.
 {"Notify subscribers when the node configuration changes","Notificare gli iscritti quando la configurazione del nodo cambia"}.
 {"Notify subscribers when the node is deleted","Notificare gli iscritti quando il nodo è cancellato"}.
 {"November","Novembre"}.
+{"Number of answers required","Numero di risposte richieste"}.
 {"Number of occupants","Numero di presenti"}.
+{"Number of Offline Messages","Numero di messaggi offline"}.
 {"Number of online users","Numero di utenti online"}.
 {"Number of registered users","Numero di utenti registrati"}.
+{"Number of seconds after which to automatically purge items, or `max` for no specific limit other than a server imposed maximum","Numero di secondi dopo i quali eliminare automaticamente gli elementi o `max` per nessun limite specifico diverso da quello massimo imposto dal server"}.
+{"Occupants are allowed to invite others","Gli occupanti possono invitare altri"}.
+{"Occupants are allowed to query others","Gli occupanti possono interrogare gli altri"}.
+{"Occupants May Change the Subject","Gli Occupanti Possono Cambiare il Soggetto"}.
 {"October","Ottobre"}.
 {"Offline Messages","Messaggi offline"}.
 {"Offline Messages:","Messaggi offline:"}.
@@ -186,50 +362,85 @@
 {"Online Users:","Utenti connessi:"}.
 {"Online Users","Utenti online"}.
 {"Online","Online"}.
+{"Only admins can see this","Solo gli amministratori possono vedere questo"}.
+{"Only collection node owners may associate leaf nodes with the collection","Solo i proprietari dei nodi di raccolta possono associare i nodi foglia alla collezione"}.
 {"Only deliver notifications to available users","Inviare le notifiche solamente agli utenti disponibili"}.
+{"Only <enable/> or <disable/> tags are allowed","Sono consentiti solo i tag <enable/> o <disable/>"}.
+{"Only <list/> element is allowed in this query","In questa query è consentito solo l'elemento <list/>"}.
+{"Only members may query archives of this room","Solo i membri possono interrogare gli archivi di questa stanza"}.
 {"Only moderators and participants are allowed to change the subject in this room","La modifica dell'oggetto di questa stanza è consentita soltanto ai moderatori e ai partecipanti"}.
 {"Only moderators are allowed to change the subject in this room","La modifica dell'oggetto di questa stanza è consentita soltanto ai moderatori"}.
+{"Only moderators are allowed to retract messages","Solo i moderatori possono ritirare i messaggi"}.
 {"Only moderators can approve voice requests","Soltanto i moderatori possono approvare richieste di parola"}.
 {"Only occupants are allowed to send messages to the conference","L'invio di messaggi alla conferenza è consentito soltanto ai presenti"}.
 {"Only occupants are allowed to send queries to the conference","L'invio di query alla conferenza è consentito ai soli presenti"}.
+{"Only publishers may publish","Solo gli editori possono pubblicare"}.
 {"Only service administrators are allowed to send service messages","L'invio di messaggi di servizio è consentito solamente agli amministratori del servizio"}.
+{"Only those on a whitelist may associate leaf nodes with the collection","Solo chi fa parte di una whitelist può associare i nodi foglia alla collezione"}.
+{"Only those on a whitelist may subscribe and retrieve items","Solo chi fa parte di una whitelist può sottoscrivere e recuperare le voci"}.
 {"Organization Name","Nome dell'organizzazione"}.
 {"Organization Unit","Unità dell'organizzazione"}.
+{"Other Modules Available:","Altri Moduli Disponibili:"}.
 {"Outgoing s2s Connections","Connessioni s2s in uscita"}.
 {"Outgoing s2s Connections:","Connessioni s2s in uscita:"}.
 {"Owner privileges required","Necessari i privilegi di proprietario"}.
+{"Packet relay is denied by service policy","Il relay dei pacchetti è negato dalla politica di servizio"}.
 {"Packet","Pacchetto"}.
+{"Participant ID","ID Partecipante"}.
+{"Participant","Partecipante"}.
 {"Password Verification","Verifica della password"}.
 {"Password Verification:","Verifica della password:"}.
 {"Password","Password"}.
 {"Password:","Password:"}.
 {"Path to Dir","Percorso della directory"}.
 {"Path to File","Percorso del file"}.
+{"Payload semantic type information","Informazioni sul tipo semantico del payload"}.
 {"Pending","Pendente"}.
-{"Period: ","Periodo:"}.
+{"Period: ","Periodo: "}.
 {"Persist items to storage","Conservazione persistente degli elementi"}.
+{"Persistent","Persistente"}.
+{"Ping query is incorrect","La query ping non è corretta"}.
 {"Ping","Ping"}.
 {"Please note that these options will only backup the builtin Mnesia database. If you are using the ODBC module, you also need to backup your SQL database separately.","N.B.: Queste opzioni comportano il salvataggio solamente del database interno Mnesia. Se si sta utilizzando il modulo ODBC, è necessario salvare anche il proprio database SQL separatamente."}.
 {"Please, wait for a while before sending new voice request","Attendi qualche istante prima di inviare una nuova richiesta di parola"}.
 {"Pong","Pong"}.
+{"Possessing 'ask' attribute is not allowed by RFC6121","Il possesso dell'attributo 'chiedi' non è consentito da RFC6121"}.
 {"Present real Jabber IDs to","Rendere visibile il Jabber ID reale a"}.
+{"Previous session not found","Sessione precedente non trovata"}.
+{"Previous session PID has been killed","Il PID della sessione precedente è stato ucciso"}.
+{"Previous session PID has exited","Il PID della sessione precedente è terminato"}.
+{"Previous session PID is dead","Il PID della sessione precedente è morto"}.
+{"Previous session timed out","La sessione precedente è scaduta"}.
 {"private, ","privato, "}.
+{"Public","Pubblico"}.
+{"Publish model","Pubblica modello"}.
 {"Publish-Subscribe","Pubblicazione-Iscrizione"}.
 {"PubSub subscriber request","Richiesta di iscrizione per PubSub"}.
 {"Purge all items when the relevant publisher goes offline","Cancella tutti gli elementi quando chi li ha pubblicati non è più online"}.
+{"Push record not found","Record push non trovato"}.
 {"Queries to the conference members are not allowed in this room","In questa stanza non sono consentite query ai membri della conferenza"}.
+{"Query to another users is forbidden","La richiesta ad altri utenti è vietata"}.
 {"RAM and disc copy","Copia in memoria (RAM) e su disco"}.
 {"RAM copy","Copia in memoria (RAM)"}.
 {"Really delete message of the day?","Si conferma l'eliminazione del messaggio del giorno (MOTD)?"}.
+{"Receive notification from all descendent nodes","Ricevere una notifica da tutti i nodi discendenti"}.
+{"Receive notification from direct child nodes only","Ricevere notifiche solo dai nodi figli diretti"}.
+{"Receive notification of new items only","Ricevere una notifica solo per le nuove voce"}.
+{"Receive notification of new nodes only","Ricevere solo la notifica di nuovi nodi"}.
 {"Recipient is not in the conference room","Il destinatario non è nella stanza per conferenze"}.
+{"Register an XMPP account","Registra un account XMPP"}.
 {"Registered Users","Utenti registrati"}.
 {"Registered Users:","Utenti registrati:"}.
 {"Register","Registra"}.
 {"Remote copy","Copia remota"}.
-{"Remove All Offline Messages","Eliminare tutti i messaggi offline"}.
-{"Remove User","Eliminare l'utente"}.
+{"Remove a hat from a user","Rimuovere un cappello da un utente"}.
+{"Remove All Offline Messages","Eliminare Tutti i Messaggi Offline"}.
+{"Remove User","Rimuovere l'utente"}.
 {"Remove","Eliminare"}.
 {"Replaced by new connection","Sostituito da una nuova connessione"}.
+{"Request has timed out","La richiesta è scaduta"}.
+{"Request is ignored","La richiesta viene ignorata"}.
+{"Requested role","Ruolo richiesto"}.
 {"Resources","Risorse"}.
 {"Restart Service","Riavviare il servizio"}.
 {"Restart","Riavviare"}.
@@ -238,34 +449,53 @@
 {"Restore binary backup immediately:","Recuperare un salvataggio binario adesso:"}.
 {"Restore plain text backup immediately:","Recuperare un salvataggio come semplice testo adesso:"}.
 {"Restore","Recuperare"}.
+{"Roles and Affiliations that May Retrieve Member List","Ruoli e Affiliazioni che Possono Recuperare L'elenco dei Membri"}.
+{"Roles for which Presence is Broadcasted","Ruoli per i quali viene Trasmessa la Presenza"}.
+{"Roles that May Send Private Messages","Ruoli che possono inviare messaggi privati"}.
 {"Room Configuration","Configurazione della stanza"}.
 {"Room creation is denied by service policy","La creazione di stanze è impedita dalle politiche del servizio"}.
 {"Room description","Descrizione della stanza"}.
 {"Room Occupants","Presenti nella stanza"}.
+{"Room terminates","La stanza termina"}.
 {"Room title","Titolo della stanza"}.
 {"Roster groups allowed to subscribe","Gruppi roster abilitati alla registrazione"}.
+{"Roster of ~ts","Roster di ~ts"}.
 {"Roster size","Dimensione della lista dei contatti"}.
+{"Roster:","Lista dei contatti:"}.
 {"RPC Call Error","Errore di chiamata RPC"}.
 {"Running Nodes","Nodi attivi"}.
+{"~s invites you to the room ~s","~s ti invita nella stanza ~s"}.
 {"Saturday","Sabato"}.
 {"Script check","Verifica dello script"}.
+{"Search from the date","Cerca dalla data"}.
 {"Search Results for ","Risultati della ricerca per "}.
+{"Search the text","Cerca nel testo"}.
+{"Search until the date","Cerca fino alla data"}.
 {"Search users in ","Cercare utenti in "}.
+{"Select All","Seleziona tutto"}.
 {"Send announcement to all online users on all hosts","Inviare l'annuncio a tutti gli utenti online su tutti gli host"}.
 {"Send announcement to all online users","Inviare l'annuncio a tutti gli utenti online"}.
 {"Send announcement to all users on all hosts","Inviare l'annuncio a tutti gli utenti su tutti gli host"}.
 {"Send announcement to all users","Inviare l'annuncio a tutti gli utenti"}.
 {"September","Settembre"}.
 {"Server:","Server:"}.
+{"Service list retrieval timed out","Il recupero dell'elenco dei servizi è scaduto"}.
+{"Session state copying timed out","La copia dello stato della sessione è scaduta"}.
 {"Set message of the day and send to online users","Impostare il messaggio del giorno (MOTD) ed inviarlo agli utenti online"}.
 {"Set message of the day on all hosts and send to online users","Impostare il messaggio del giorno (MOTD) su tutti gli host e inviarlo agli utenti online"}.
 {"Shared Roster Groups","Gruppi di liste di contatti comuni"}.
 {"Show Integral Table","Mostrare la tabella integrale"}.
 {"Show Ordinary Table","Mostrare la tabella normale"}.
 {"Shut Down Service","Terminare il servizio"}.
+{"SOCKS5 Bytestreams","SOCKS5 flussi di byte"}.
+{"Some XMPP clients can store your password in the computer, but you should do this only in your personal computer for safety reasons.","Alcuni client XMPP possono memorizzare la tua password nel computer, ma dovresti farlo solo sul tuo computer personale per motivi di sicurezza."}.
+{"Sources Specs:","Sorgenti Specifiche:"}.
 {"Specify the access model","Specificare il modello di accesso"}.
 {"Specify the event message type","Specificare il tipo di messaggio di evento"}.
 {"Specify the publisher model","Definire il modello di pubblicazione"}.
+{"Stanza id is not valid","L'id della stanza non è valido"}.
+{"Stanza ID","Stanza ID"}.
+{"Statically specify a replyto of the node owner(s)","Specificare staticamente una risposta del proprietario(i) del nodo"}.
 {"Statistics of ~p","Statistiche di ~p"}.
 {"Statistics","Statistiche"}.
 {"Stop","Arrestare"}.
@@ -273,64 +503,186 @@
 {"Storage Type","Tipo di conservazione"}.
 {"Store binary backup:","Conservare un salvataggio binario:"}.
 {"Store plain text backup:","Conservare un salvataggio come semplice testo:"}.
+{"Stream management is already enabled","La gestione del flusso è già abilitata"}.
+{"Stream management is not enabled","La gestione del flusso non è abilitata"}.
 {"Subject","Oggetto"}.
 {"Submit","Inviare"}.
 {"Submitted","Inviato"}.
 {"Subscriber Address","Indirizzo dell'iscritta/o"}.
+{"Subscribers may publish","I sottoscrittori possono pubblicare"}.
+{"Subscription requests must be approved and only subscribers may retrieve items","Le richieste di sottoscrizione devono essere approvate e solo i sottoscrittori possono recuperare le voci"}.
 {"Subscription","Iscrizione"}.
+{"Subscriptions are not allowed","Le sottoscrizioni non sono consentite"}.
 {"Sunday","Domenica"}.
+{"Text associated with a picture","Testo associato a un'immagine"}.
+{"Text associated with a sound","Testo associato a un suono"}.
+{"Text associated with a video","Testo associato a un video"}.
+{"Text associated with speech","Testo associato al parlato"}.
 {"That nickname is already in use by another occupant","Il nickname è già in uso all'interno della conferenza"}.
 {"That nickname is registered by another person","Questo nickname è registrato da un'altra persona"}.
+{"The account already exists","L'account esiste già"}.
+{"The account was not unregistered","L'account non era non registrato"}.
+{"The body text of the last received message","Il corpo del testo dell'ultimo messaggio ricevuto"}.
 {"The CAPTCHA is valid.","Il CAPTCHA è valido."}.
 {"The CAPTCHA verification has failed","La verifica del CAPTCHA ha avuto esito negativo"}.
+{"The captcha you entered is wrong","Il captcha che hai inserito è sbagliato"}.
+{"The child nodes (leaf or collection) associated with a collection","I nodi figlio (foglia o raccolta) associati a una raccolta"}.
 {"The collections with which a node is affiliated","Le collezioni a cui è affiliato un nodo"}.
+{"The DateTime at which a leased subscription will end or has ended","Il DateTime in cui un abbonamento in leasing terminerà o è terminato"}.
+{"The datetime when the node was created","La dataora in cui è stato creato il nodo"}.
+{"The default language of the node","La lingua predefinita del nodo"}.
+{"The feature requested is not supported by the conference","La funzionalità richiesta non è supportata dalla conferenza"}.
+{"The JID of the node creator","Il JID del creatore del nodo"}.
+{"The JIDs of those to contact with questions","I JID di coloro da contattare per domande"}.
+{"The JIDs of those with an affiliation of owner","I JID di coloro che hanno un'affiliazione di proprietario"}.
+{"The JIDs of those with an affiliation of publisher","I JID di coloro che hanno un'affiliazione di editore"}.
+{"The list of all online users","L'elenco di tutti gli utenti online"}.
+{"The list of all users","L'elenco di tutti gli utenti"}.
+{"The list of JIDs that may associate leaf nodes with a collection","L'elenco dei JID che possono associare i nodi foglia a una collezione"}.
+{"The maximum number of child nodes that can be associated with a collection, or `max` for no specific limit other than a server imposed maximum","Il numero massimo di nodi figli che possono essere associati a una collezione, o `max` per non avere un limite specifico, se non quello imposto dal server"}.
+{"The minimum number of milliseconds between sending any two notification digests","Il numero minimo di millisecondi tra l'invio di due digest di notifica qualsiasi"}.
+{"The name of the node","Il nome del nodo"}.
+{"The node is a collection node","Il nodo è un nodo di raccolta"}.
+{"The node is a leaf node (default)","Il nodo è un nodo foglia (predefinito)"}.
+{"The NodeID of the relevant node","Il NodeID del nodo rilevante"}.
+{"The number of pending incoming presence subscription requests","Il numero di richieste di sottoscrizione di presenza in entrata in sospeso"}.
+{"The number of subscribers to the node","Il numero di abbonati al nodo"}.
+{"The number of unread or undelivered messages","Il numero di messaggi non letti o non consegnati"}.
+{"The password contains unacceptable characters","La password contiene caratteri non accettabili"}.
 {"The password is too weak","La password è troppo debole"}.
 {"the password is","la password è"}.
+{"The password of your XMPP account was successfully changed.","La password del tuo account XMPP è stata modificata con successo."}.
+{"The password was not changed","La password non è stata modificata"}.
+{"The passwords are different","Le password sono diverse"}.
+{"The presence states for which an entity wants to receive notifications","Gli stati di presenza per i quali un'entità desidera ricevere le notifiche"}.
+{"The query is only allowed from local users","La query è consentita solo da utenti locali"}.
+{"The query must not contain <item/> elements","La query non deve contenere elementi <item/>"}.
+{"The room subject can be modified by participants","L'oggetto della stanza potrà essere modificato dai partecipanti"}.
+{"The semantic type information of data in the node, usually specified by the namespace of the payload (if any)","Le informazioni sul tipo semantico dei dati nel nodo, solitamente specificate dallo spazio dei nomi del payload (se presente)"}.
+{"The sender of the last received message","Il mittente dell'ultimo messaggio ricevuto"}.
+{"The stanza MUST contain only one <active/> element, one <default/> element, or one <list/> element","La stanza DEVE contenere solo un elemento <active/>, un elemento <default/> o un elemento <list/>"}.
+{"The subscription identifier associated with the subscription request","L'identificatore di sottoscrizione associato alla richiesta di sottoscrizione"}.
+{"The URL of an XSL transformation which can be applied to payloads in order to generate an appropriate message body element.","L'URL di una trasformazione XSL che può essere applicata ai payload per generare un elemento del corpo del messaggio appropriato."}.
+{"The URL of an XSL transformation which can be applied to the payload format in order to generate a valid Data Forms result that the client could display using a generic Data Forms rendering engine","L'URL di una trasformazione XSL che può essere applicata al formato del payload per generare un risultato valido di Data Forms che il client può visualizzare utilizzando un motore di rendering Data Forms generico"}.
+{"There was an error changing the password: ","Si è verificato un errore durante la modifica della password: "}.
 {"There was an error creating the account: ","Si è verificato un errore nella creazione dell'account: "}.
 {"There was an error deleting the account: ","Si è verificato un errore nella cancellazione dell'account: "}.
+{"This is case insensitive: macbeth is the same that MacBeth and Macbeth.","Questo è insensibile alle maiuscole: macbeth è lo stesso che MacBeth e Macbeth."}.
+{"This page allows to register an XMPP account in this XMPP server. Your JID (Jabber ID) will be of the form: username@server. Please read carefully the instructions to fill correctly the fields.","Questa pagina consente di registrare un account XMPP in questo server XMPP. Il tuo JID (Jabber ID) sarà nel formato: nomeutente@server. Si prega di leggere attentamente le istruzioni per compilare correttamente i campi."}.
+{"This page allows to unregister an XMPP account in this XMPP server.","Questa pagina consente di annullare la registrazione di un account XMPP in questo server XMPP."}.
 {"This room is not anonymous","Questa stanza non è anonima"}.
+{"This service can not process the address: ~s","Questo servizio non può elaborare l'indirizzo: ~s"}.
 {"Thursday","Giovedì"}.
 {"Time delay","Ritardo"}.
+{"Timed out waiting for stream resumption","Timed out in attesa della ripresa dello stream"}.
 {"Time","Ora"}.
+{"To register, visit ~s","Per registrarsi, visita ~s"}.
+{"To ~ts","A ~ts"}.
 {"To","A"}.
+{"Token TTL","Gettone TTL"}.
+{"Too many active bytestreams","Troppi bytestream attivi"}.
 {"Too many CAPTCHA requests","Troppe richieste CAPTCHA"}.
+{"Too many child elements","Troppi elementi figlio"}.
+{"Too many <item/> elements","Troppi elementi <item/>"}.
+{"Too many <list/> elements","Troppi elementi <list/>"}.
+{"Too many (~p) failed authentications from this IP address (~s). The address will be unblocked at ~s UTC","Troppe (~p) autenticazioni non riuscite da questo indirizzo IP (~s). L'indirizzo verrà sbloccato alle ~s UTC"}.
+{"Too many receiver fields were specified","Sono stati specificati troppi campi del ricevitore"}.
+{"Too many users in this conference","Troppi utenti in questa conferenza"}.
+{"Total rooms","Stanze totali"}.
 {"Traffic rate limit is exceeded","Limite di traffico superato"}.
 {"Transactions Aborted:","Transazioni abortite:"}.
 {"Transactions Committed:","Transazioni avvenute:"}.
 {"Transactions Logged:","Transazioni con log:"}.
 {"Transactions Restarted:","Transazioni riavviate:"}.
+{"~ts's Offline Messages Queue","La Coda dei Messaggi Offline di ~ts"}.
 {"Tuesday","Martedì"}.
 {"Unable to generate a CAPTCHA","Impossibile generare un CAPTCHA"}.
+{"Unable to register route on existing local domain","Impossibile registrare il percorso sul dominio locale esistente"}.
 {"Unauthorized","Non autorizzato"}.
+{"Unexpected action","Azione inaspettata"}.
+{"Unexpected error condition: ~p","Condizione di errore imprevisto: ~p"}.
+{"Uninstall","Disinstallare"}.
+{"Unregister an XMPP account","Disregistrare un account XMPP"}.
 {"Unregister","Elimina"}.
+{"Unselect All","Deseleziona Tutto"}.
+{"Unsupported <index/> element","Elemento <index/> non supportato"}.
+{"Unsupported version","Versione non supportata"}.
 {"Update message of the day (don't send)","Aggiornare il messaggio del giorno (MOTD) (non inviarlo)"}.
 {"Update message of the day on all hosts (don't send)","Aggiornare il messaggio del giorno (MOTD) su tutti gli host (non inviarlo)"}.
+{"Update ~p","Aggiorna ~p"}.
 {"Update plan","Piano di aggiornamento"}.
 {"Update script","Script di aggiornamento"}.
+{"Update specs to get modules source, then install desired ones.","Aggiorna le specifiche per ottenere il sorgente dei moduli, quindi installa quelli desiderati."}.
+{"Update Specs","Aggiorna Specifiche"}.
 {"Update","Aggiornare"}.
+{"Upgrade","Aggiornamento"}.
 {"Uptime:","Tempo dall'avvio:"}.
+{"URL for Archived Discussion Logs","URL per i Registri delle Discussioni Archiviati"}.
+{"User already exists","L'utente esiste già"}.
 {"User JID","JID utente"}.
+{"User (jid)","Utente (jid)"}.
 {"User Management","Gestione degli utenti"}.
+{"User removed","Utente rimosso"}.
+{"User session not found","Sessione utente non trovata"}.
+{"User session terminated","Sessione utente terminata"}.
+{"User ~ts","Utente ~ts"}.
 {"Username:","Nome utente:"}.
 {"Users are not allowed to register accounts so quickly","Non è consentito agli utenti registrare account così rapidamente"}.
 {"Users Last Activity","Ultima attività degli utenti"}.
 {"Users","Utenti"}.
 {"User","Utente"}.
 {"Validate","Validare"}.
+{"Value 'get' of 'type' attribute is not allowed","Il valore 'get' dell'attributo 'type' non è consentito"}.
+{"Value of '~s' should be boolean","Il valore di '~s' dovrebbe essere booleano"}.
+{"Value of '~s' should be datetime string","Il valore di '~s' deve essere una stringa dataora"}.
+{"Value of '~s' should be integer","Il valore di '~s' dovrebbe essere un intero"}.
+{"Value 'set' of 'type' attribute is not allowed","Il valore 'set' dell'attributo 'type' non è consentito"}.
 {"vCard User Search","Ricerca di utenti per vCard"}.
+{"View joined MIX channels","Visualizza i canali MIX uniti"}.
+{"View Queue","Visualizza Coda"}.
+{"View Roster","Visualizza il Roster"}.
 {"Virtual Hosts","Host Virtuali"}.
 {"Visitors are not allowed to change their nicknames in this room","Non è consentito ai visitatori cambiare il nickname in questa stanza"}.
 {"Visitors are not allowed to send messages to all occupants","Non è consentito ai visitatori l'invio di messaggi a tutti i presenti"}.
+{"Visitor","Visitatore"}.
 {"Voice request","Richiesta di parola"}.
 {"Voice requests are disabled in this conference","In questa conferenza le richieste di parola sono escluse"}.
 {"Wednesday","Mercoledì"}.
+{"When a new subscription is processed and whenever a subscriber comes online","Quando viene elaborato una nuova sottoscrizione e ogni volta che una sottoscrizione entra in linea"}.
+{"When a new subscription is processed","Quando viene elaborata una nuova sottoscrizione"}.
 {"When to send the last published item","Quando inviare l'ultimo elemento pubblicato"}.
-{"Whether to allow subscriptions","Consentire iscrizioni?"}.
+{"Whether an entity wants to receive an XMPP message body in addition to the payload format","Se un'entità vuole ricevere un corpo del messaggio XMPP inoltre al formato del payload"}.
+{"Whether an entity wants to receive digests (aggregations) of notifications or all notifications individually","Se un'entità desidera ricevere i digest (aggregazioni) di notifiche o tutte le notifiche individualmente"}.
+{"Whether an entity wants to receive or disable notifications","Se un'entità desidera ricevere o disabilitare le notifiche"}.
+{"Whether owners or publisher should receive replies to items","Se i proprietari o l'editore dovrebbero ricevere le risposte alle voci"}.
+{"Whether the node is a leaf (default) or a collection","Se il nodo è una foglia (impostazione predefinita) o una collezione"}.
+{"Whether to allow subscriptions","Se consentire le iscrizioni"}.
+{"Whether to make all subscriptions temporary, based on subscriber presence","Se rendere temporanee tutte le sottoscrizioni, in base alla presenza della sottoscrizione"}.
+{"Whether to notify owners about new subscribers and unsubscribes","Se notificare ai proprietari le nuove sottoscrizioni e le cancellazioni"}.
+{"Who can send private messages","Chi può inviare messaggi privati"}.
+{"Who may associate leaf nodes with a collection","Chi può associare i nodi foglia a una collezione"}.
+{"Wrong parameters in the web formulary","Parametri errati nel formulario web"}.
+{"Wrong xmlns","xmlns errati"}.
+{"XMPP Account Registration","Registrazione dell'account XMPP"}.
+{"XMPP Domains","Domini XMPP"}.
+{"XMPP Show Value of Away","XMPP Mostra Valore di Assenza"}.
+{"XMPP Show Value of Chat","XMPP Mostra il Valore della Chat"}.
+{"XMPP Show Value of DND (Do Not Disturb)","XMPP Mostra Valore di DND (Non Disturbare)"}.
+{"XMPP Show Value of XA (Extended Away)","XMPP Mostra Valore di XA (Extended Away)"}.
+{"XMPP URI of Associated Publish-Subscribe Node","URI XMPP del Nodo di Pubblicazione-Sottoscrizione Associato"}.
+{"You are being removed from the room because of a system shutdown","Stai per essere rimosso dalla stanza a causa di un arresto del sistema"}.
+{"You are not allowed to send private messages","Non ti è consentito inviare messaggi privati"}.
+{"You are not joined to the channel","Non si è connessi al canale"}.
+{"You can later change your password using an XMPP client.","È possibile modificare successivamente la tua password utilizzando un client XMPP."}.
 {"You have been banned from this room","Sei stata/o bandita/o da questa stanza"}.
+{"You have joined too many conferences","Hai partecipato a troppe conferenze"}.
 {"You must fill in field \"Nickname\" in the form","Si deve riempire il campo \"Nickname\" nel modulo"}.
 {"You need a client that supports x:data and CAPTCHA to register","La registrazione richiede un client che supporti x:data e CAPTCHA"}.
 {"You need a client that supports x:data to register the nickname","Per registrare il nickname è necessario un client che supporti x:data"}.
 {"You need an x:data capable client to search","Per effettuare ricerche è necessario un client che supporti x:data"}.
 {"Your active privacy list has denied the routing of this stanza.","In base alla tua attuale lista privacy questa stanza è stata esclusa dalla navigazione."}.
-{"Your contact offline message queue is full. The message has been discarded.","La coda dei messaggi offline del contatto è piena. Il messaggio è stato scartato"}.
+{"Your contact offline message queue is full. The message has been discarded.","La coda dei messaggi offline del contatto è piena. Il messaggio è stato scartato."}.
 {"Your subscription request and/or messages to ~s have been blocked. To unblock your subscription request, visit ~s","I messaggi verso ~s sono bloccati. Per sbloccarli, visitare ~s"}.
+{"Your XMPP account was successfully registered.","Il tuo account XMPP è stato registrato con successo."}.
+{"Your XMPP account was successfully unregistered.","L'account XMPP è stato disregistrato con successo."}.
+{"You're not allowed to create nodes","Non ti è consentito creare nodi"}.

priv/msgs/ja.msg

@@ -4,7 +4,7 @@
 %%   https://docs.ejabberd.im/developer/extending-ejabberd/localization/
 
 {" (Add * to the end of field to match substring)"," (* を最後に付けると部分文字列にマッチします)"}.
-{" has set the subject to: "," は件名を設定しました: "}.
+{" has set the subject to: "," は題を設定しました: "}.
 {"A description of the node","ノードの説明"}.
 {"A friendly name for the node","ノードのフレンドリネーム"}.
 {"A password is required to enter this room","このチャットルームに入るにはパスワードが必要です"}.
@@ -36,6 +36,7 @@
 {"Anyone","誰にでも"}.
 {"April","4月"}.
 {"August","8月"}.
+{"Automatic node creation is not enabled","ノードの自動作成は有効になっていません"}.
 {"Backup Management","バックアップ管理"}.
 {"Backup of ~p","バックアップ: ~p"}.
 {"Backup to File at ","ファイルにバックアップ: "}.
@@ -44,11 +45,13 @@
 {"Birthday","誕生日"}.
 {"Both the username and the resource are required","ユーザー名とリソースの両方が必要"}.
 {"CAPTCHA web page","CAPTCHA ウェブページ"}.
+{"Challenge ID","チャレンジ ID"}.
 {"Change Password","パスワードを変更"}.
 {"Change User Password","パスワードを変更"}.
 {"Changing password is not allowed","パスワード変更の権限がありません"}.
 {"Channel already exists","チャンネルは既に存在します"}.
 {"Channel does not exist","チャンネルは存在しません"}.
+{"Channel JID","チャンネル ID"}.
 {"Channels","チャンネル"}.
 {"Characters not allowed:","使用できない文字:"}.
 {"Chatroom configuration modified","チャットルームの設定が変更されました"}.
@@ -70,6 +73,7 @@
 {"Country","国"}.
 {"CPU Time:","CPU時間:"}.
 {"Current Discussion Topic","現在の話題"}.
+{"Database failure","データーベース障害"}.
 {"Database Tables at ~p","データーベーステーブル: ~p"}.
 {"Database Tables Configuration at ","データーベーステーブル設定 "}.
 {"Database","データーベース"}.
@@ -117,8 +121,11 @@
 {"Export all tables as SQL queries to a file:","すべてのテーブルをSQL形式でファイルにエクスポート: "}.
 {"Export data of all users in the server to PIEFXIS files (XEP-0227):","サーバーにあるすべてのユーザーデータを PIEFXIS ファイルにエクスポート (XEP-0227):"}.
 {"Export data of users in a host to PIEFXIS files (XEP-0227):","ホストのユーザーデータを PIEFXIS ファイルにエクスポート (XEP-0227):"}.
+{"External component failure","外部コンポーネントの障害"}.
+{"External component timeout","外部コンポーネントのタイムアウト"}.
 {"Failed to extract JID from your voice request approval","発言権要求の承認から JID を取り出すことに失敗しました"}.
 {"Failed to parse HTTP response","HTTP 応答のパースに失敗しました"}.
+{"Failed to process option '~s'","オプション '~s' の処理に失敗しました"}.
 {"Family Name","姓"}.
 {"February","2月"}.
 {"Fill in the form to search for any matching XMPP User","XMPP ユーザーを検索するには欄に入力してください"}.
@@ -128,8 +135,11 @@
 {"Full List of Room Admins","チャットルーム管理者の一覧"}.
 {"Full List of Room Owners","チャットルーム主宰者の一覧"}.
 {"Full Name","氏名"}.
+{"Get List of Online Users","オンラインユーザーの一覧を取得"}.
+{"Get List of Registered Users","登録ユーザーの一覧を取得"}.
 {"Get Number of Online Users","オンラインユーザー数を取得"}.
 {"Get Number of Registered Users","登録ユーザー数を取得"}.
+{"Get Pending","保留中の取得"}.
 {"Get User Last Login Time","最終ログイン時間を取得"}.
 {"Get User Password","パスワードを取得"}.
 {"Get User Statistics","ユーザー統計を取得"}.
@@ -158,8 +168,12 @@
 {"Incoming s2s Connections:","内向き s2s コネクション:"}.
 {"Incorrect data form","データ形式が違います"}.
 {"Incorrect password","パスワードが違います"}.
+{"Installed Modules:","インストールされているモジュール:"}.
+{"Install","インストール"}.
+{"Insufficient privilege","権限が不十分です"}.
 {"Internal server error","内部サーバーエラー"}.
 {"Invalid node name","無効なノード名です"}.
+{"Invalid 'previd' value","無効な 'previd' の値です"}.
 {"Invitations are not allowed in this conference","この会議では、招待はできません"}.
 {"IP addresses","IP アドレス"}.
 {"is now known as","は名前を変更しました: "}.
@@ -168,6 +182,7 @@
 {"It is not allowed to send private messages to the conference","この会議にプライベートメッセージを送信することはできません"}.
 {"Jabber ID","Jabber ID"}.
 {"January","1月"}.
+{"JID normalization failed","JID の正規化に失敗しました"}.
 {"joins the room","がチャットルームに参加しました"}.
 {"July","7月"}.
 {"June","6月"}.
@@ -216,14 +231,22 @@
 {"Nickname Registration at ","ニックネーム登録: "}.
 {"Nickname ~s does not exist in the room","ニックネーム ~s はこのチャットルームにいません"}.
 {"Nickname","ニックネーム"}.
+{"No address elements found","アドレス要素が見つかりません"}.
+{"No addresses element found","アドレス要素が見つかりません"}.
 {"No body provided for announce message","アナウンスメッセージはありませんでした"}.
+{"No child elements found","子要素が見つかりません"}.
 {"No Data","データなし"}.
+{"No <forwarded/> element found","<forwarded/> 要素が見つかりません"}.
+{"No 'item' element found","'item' 要素が見つかりません"}.
 {"No limit","制限なし"}.
+{"No 'password' found in this query","このクエリに 'password' が見つかりません"}.
+{"No services available","利用できるサービスはありません"}.
 {"Node already exists","ノードは既に存在しています"}.
 {"Node ID","ノードID"}.
 {"Node not found","ノードが見つかりません"}.
 {"Node ~p","ノード ~p"}.
 {"Nodes","ノード"}.
+{"Node","ノード"}.
 {"None","なし"}.
 {"Not Found","見つかりません"}.
 {"Notify subscribers when items are removed from the node","アイテムがノードから消された時に購読者へ通知する"}.
@@ -245,6 +268,8 @@
 {"Online Users:","オンラインユーザー:"}.
 {"Online","オンライン"}.
 {"Only deliver notifications to available users","有効なユーザーにのみ告知を送信する"}.
+{"Only <enable/> or <disable/> tags are allowed","<enable/> タグまたは <disable/> タグのみが許可されます"}.
+{"Only <list/> element is allowed in this query","このクエリでは <list/> 要素のみが許可されます"}.
 {"Only members may query archives of this room","メンバーのみがこのルームのアーカイブを取得できます"}.
 {"Only moderators and participants are allowed to change the subject in this room","モデレーターと参加者のみがチャットルームの件名を変更できます"}.
 {"Only moderators are allowed to change the subject in this room","モデレーターのみがチャットルームの件名を変更できます"}.
@@ -258,6 +283,7 @@
 {"Outgoing s2s Connections:","外向き s2s コネクション:"}.
 {"Owner privileges required","主宰者の権限が必要です"}.
 {"Packet","パケット"}.
+{"Participant ID","参加者 ID"}.
 {"Participant","参加者"}.
 {"Password Verification","パスワード (確認)"}.
 {"Password Verification:","パスワード (確認):"}.
@@ -274,11 +300,14 @@
 {"Please, wait for a while before sending new voice request","新しい発言権の要求を送るまで少し間をおいてください"}.
 {"Pong","Pong"}.
 {"Present real Jabber IDs to","本当の Jabber ID を公開"}.
+{"Previous session not found","前のセッションが見つかりません"}.
 {"private, ","プライベート、"}.
+{"Public","公開"}.
 {"Publish-Subscribe","Publish-Subscribe"}.
 {"PubSub subscriber request","PubSub 購読者のリクエスト"}.
 {"Purge all items when the relevant publisher goes offline","公開者がオフラインになるときに、すべてのアイテムを削除"}.
 {"Queries to the conference members are not allowed in this room","このチャットルームでは、会議のメンバーへのクエリーは禁止されています"}.
+{"Query to another users is forbidden","他のユーザーへのクエリは禁止されています"}.
 {"RAM and disc copy","RAM, ディスクコピー"}.
 {"RAM copy","RAM コピー"}.
 {"Really delete message of the day?","本当にお知らせメッセージを削除しますか ?"}.
@@ -292,6 +321,7 @@
 {"Remove User","ユーザーを削除"}.
 {"Remove","削除"}.
 {"Replaced by new connection","新しいコネクションによって置き換えられました"}.
+{"Request is ignored","リクエストは無視されます"}.
 {"Resources","リソース"}.
 {"Restart Service","サービスを再起動"}.
 {"Restart","再起動"}.
@@ -330,6 +360,7 @@
 {"Show Integral Table","累積の表を表示"}.
 {"Show Ordinary Table","通常の表を表示"}.
 {"Shut Down Service","サービスを停止"}.
+{"SOCKS5 Bytestreams","SOCKS5 Bytestreams"}.
 {"Some XMPP clients can store your password in the computer, but you should do this only in your personal computer for safety reasons.","XMPP クライアントはコンピューターにパスワードを記憶できます。コンピューターが安全であると信頼できる場合にのみ、この機能を使用してください。"}.
 {"Specify the access model","アクセスモデルを設定する"}.
 {"Specify the event message type","イベントメッセージ種別を設定"}.
@@ -377,6 +408,7 @@
 {"Too many CAPTCHA requests","CAPTCHA 要求が多すぎます"}.
 {"Too many (~p) failed authentications from this IP address (~s). The address will be unblocked at ~s UTC","~p回の認証に失敗しました。このIPアドレス(~s)は~s UTCまでブロックされます。"}.
 {"Too many unacked stanzas","多くのスタンザが応答していません"}.
+{"Too many users in this conference","この会議にはユーザーが多すぎます"}.
 {"Total rooms","チャットルーム数"}.
 {"To","To"}.
 {"Traffic rate limit is exceeded","トラフィックレートの制限を超えました"}.
@@ -388,8 +420,12 @@
 {"Tuesday","火曜日"}.
 {"Unable to generate a CAPTCHA","CAPTCHA を生成できません"}.
 {"Unauthorized","認証されていません"}.
+{"Unexpected action","予期しないアクション"}.
+{"Unexpected error condition: ~p","予期しないエラー状態: ~p"}.
+{"Uninstall","アンインストール"}.
 {"Unregister an XMPP account","XMPP アカウントを削除"}.
 {"Unregister","削除"}.
+{"Unselect All","すべての選択を解除"}.
 {"Unsupported version","対応していないバージョン"}.
 {"Update message of the day (don't send)","お知らせメッセージを更新 (送信しない)"}.
 {"Update message of the day on all hosts (don't send)","全ホストのお知らせメッセージを更新 (送信しない)"}.
@@ -397,12 +433,15 @@
 {"Update ~p","更新 ~p"}.
 {"Update script","スクリプトの更新"}.
 {"Update","更新"}.
+{"Upgrade","アップグレード"}.
 {"Uptime:","起動時間:"}.
 {"User already exists","ユーザーは既に存在しています"}.
 {"User (jid)","ユーザー (JID)"}.
 {"User JID","ユーザー JID"}.
 {"User Management","ユーザー管理"}.
 {"User removed","ユーザーを削除しました"}.
+{"User session not found","ユーザーセッションが見つかりません"}.
+{"User session terminated","ユーザーセッションが終了しました"}.
 {"User ~ts","ユーザー ~ts"}.
 {"Username:","ユーザー名:"}.
 {"Users are not allowed to register accounts so quickly","それほど速くアカウントを登録することはできません"}.
@@ -410,6 +449,8 @@
 {"Users","ユーザー"}.
 {"User","ユーザー"}.
 {"Validate","検証"}.
+{"Value of '~s' should be boolean","'~s' の値はブール値である必要があります"}.
+{"Value of '~s' should be integer","'~s' の値は整数である必要があります"}.
 {"vCard User Search","vCard検索"}.
 {"View Queue","キューを表示"}.
 {"View Roster","名簿を表示"}.
@@ -420,11 +461,15 @@
 {"Voice requests are disabled in this conference","この会議では、発言権の要求はできません"}.
 {"Voice request","発言権を要求"}.
 {"Wednesday","水曜日"}.
+{"When a new subscription is processed","新しい購読が処理されるとき"}.
 {"When to send the last published item","最後の公開アイテムを送信するタイミングで"}.
 {"Whether to allow subscriptions","購読を許可するかどうか"}.
+{"Who can send private messages","誰がプライベートメッセージを送れるか"}.
 {"XMPP Account Registration","XMPP アカウント登録"}.
 {"XMPP Domains","XMPP ドメイン"}.
 {"You are being removed from the room because of a system shutdown","システムシャットダウンのためチャットルームから削除されました"}.
+{"You are not allowed to send private messages","プライベートメッセージを送信する権限がありません"}.
+{"You are not joined to the channel","チャンネルに参加していません"}.
 {"You can later change your password using an XMPP client.","あなたは後で XMPP クライアントを使用してパスワードを変更できます。"}.
 {"You have been banned from this room","あなたはこのチャットルームから締め出されています"}.
 {"You must fill in field \"Nickname\" in the form","フォームの\"ニックネーム\"欄を入力する必要があります"}.

priv/msgs/nl.msg

@@ -3,6 +3,7 @@
 %% To improve translations please read:
 %%   https://docs.ejabberd.im/developer/extending-ejabberd/localization/
 
+{" (Add * to the end of field to match substring)"," Gebruik de velden om te zoeken (Voeg achteraan het teken * toe om te zoeken naar alles wat met het eerste deel begint.)."}.
 {" has set the subject to: "," veranderde het onderwerp in: "}.
 {"A friendly name for the node","Bijnaam voor deze knoop"}.
 {"A password is required to enter this room","U hebt een wachtwoord nodig om deze chatruimte te kunnen betreden"}.

priv/msgs/pt.msg

@@ -48,6 +48,7 @@
 {"Anyone with a presence subscription of both or from may subscribe and retrieve items","Qualquer pessoa com uma assinatura presente dos dois ou de ambos pode se inscrever e recuperar os itens"}.
 {"Anyone with Voice","Qualquer pessoa com voz"}.
 {"Anyone","Qualquer pessoa"}.
+{"Apparently your account has no administration rights in this server. Please check how to grant admin rights in: https://docs.ejabberd.im/admin/installation/#administration-account","Aparentemente, a sua conta não tem direitos de administração neste servidor. Verifique como conceder os direitos administrativos em: https://docs.ejabberd.im/admin/installation/#administration-account"}.
 {"April","Abril"}.
 {"Attribute 'channel' is required for this request","O atributo 'canal' é necessário para esta solicitação"}.
 {"Attribute 'id' is mandatory for MIX messages","O atributo 'id' é obrigatório para mensagens MIX"}.
@@ -369,6 +370,7 @@
 {"Only members may query archives of this room","Somente os membros podem procurar nos arquivos desta sala"}.
 {"Only moderators and participants are allowed to change the subject in this room","Somente os moderadores e os participamentes podem alterar o assunto desta sala"}.
 {"Only moderators are allowed to change the subject in this room","Somente os moderadores podem alterar o assunto desta sala"}.
+{"Only moderators are allowed to retract messages","Apenas moderadores estão autorizados de retirar mensagens"}.
 {"Only moderators can approve voice requests","Somente moderadores podem aprovar requisições de voz"}.
 {"Only occupants are allowed to send messages to the conference","Só os ocupantes podem enviar mensagens para a sala"}.
 {"Only occupants are allowed to send queries to the conference","Só os ocupantes podem enviar consultas para a sala"}.
@@ -392,6 +394,7 @@
 {"Password:","Palavra-chave:"}.
 {"Path to Dir","Caminho para o directório"}.
 {"Path to File","Caminho do ficheiro"}.
+{"Payload semantic type information","Informações de tipo semântico de carga útil"}.
 {"Pending","Pendente"}.
 {"Period: ","Período: "}.
 {"Persist items to storage","Persistir elementos ao armazenar"}.
@@ -490,6 +493,7 @@
 {"Specify the access model","Especificar os modelos de acesso"}.
 {"Specify the event message type","Especificar o tipo de mensagem para o evento"}.
 {"Specify the publisher model","Especificar o modelo do publicante"}.
+{"Stanza id is not valid","A Stanza ID é inválido"}.
 {"Stanza ID","ID da estrofe"}.
 {"Statically specify a replyto of the node owner(s)","Defina uma resposta fixa do(s) proprietário(s) do nó"}.
 {"Statistics of ~p","Estatísticas de ~p"}.
@@ -554,6 +558,7 @@
 {"The query is only allowed from local users","Esta consulta só é permitida a partir de utilizadores locais"}.
 {"The query must not contain <item/> elements","A consulta não pode conter elementos <item/>"}.
 {"The room subject can be modified by participants","O tema da sala pode ser alterada pelos próprios participantes"}.
+{"The semantic type information of data in the node, usually specified by the namespace of the payload (if any)","Informações de tipo semântico dos dados no nó, geralmente especificadas pelo espaço de nomes da carga útil (se houver)"}.
 {"The sender of the last received message","O remetente da última mensagem que foi recebida"}.
 {"The stanza MUST contain only one <active/> element, one <default/> element, or one <list/> element","A instância DEVE conter apenas um elemento <active/>, um elemento <default/>, ou um elemento <list/>"}.
 {"The subscription identifier associated with the subscription request","O identificador da assinatura associado à solicitação da assinatura"}.
@@ -655,6 +660,7 @@
 {"Whether to allow subscriptions","Permitir subscrições"}.
 {"Whether to make all subscriptions temporary, based on subscriber presence","Caso todas as assinaturas devam ser temporárias, com base na presença do assinante"}.
 {"Whether to notify owners about new subscribers and unsubscribes","Caso deva notificar os proprietários sobre os novos assinantes e aqueles que cancelaram a assinatura"}.
+{"Who can send private messages","Quem pode enviar mensagens privadas"}.
 {"Who may associate leaf nodes with a collection","Quem pode associar as folhas dos nós numa coleção"}.
 {"Wrong parameters in the web formulary","O formulário web está com os parâmetros errados"}.
 {"Wrong xmlns","Xmlns errado"}.
@@ -666,6 +672,7 @@
 {"XMPP Show Value of XA (Extended Away)","XMPP Exiba o valor do XA (Ausência Estendida)"}.
 {"XMPP URI of Associated Publish-Subscribe Node","XMPP URI da publicação do nó associado da assinatura"}.
 {"You are being removed from the room because of a system shutdown","Está a ser removido da sala devido ao desligamento do sistema"}.
+{"You are not allowed to send private messages","Não tem permissão de enviar mensagens privadas"}.
 {"You are not joined to the channel","Não está inscrito no canal"}.
 {"You can later change your password using an XMPP client.","Pode alterar a sua palavra-passe mais tarde usando um cliente XMPP."}.
 {"You have been banned from this room","Foi banido desta sala"}.

priv/msgs/uk.msg

@@ -12,6 +12,7 @@
 {"A Web Page","Веб-сторінка"}.
 {"Accept","Прийняти"}.
 {"Access denied by service policy","Доступ заборонений політикою служби"}.
+{"Access model","Права доступу"}.
 {"Account doesn't exist","Обліковий запис не існує"}.
 {"Action on user","Дія над користувачем"}.
 {"Add a hat to a user","Додати капелюх користувачу"}.
@@ -94,6 +95,7 @@
 {"Configuration","Конфігурація"}.
 {"Connected Resources:","Підключені ресурси:"}.
 {"Contact Addresses (normally, room owner or owners)","Контактні адреси (зазвичай, власника або власників кімнати)"}.
+{"Contrib Modules","Запуск модулів"}.
 {"Country","Країна"}.
 {"CPU Time:","Час роботи процесора:"}.
 {"Current Discussion Topic","Поточна тема обговорення"}.
@@ -166,11 +168,15 @@
 {"Full List of Room Admins","Повний перелік адміністраторів кімнати"}.
 {"Full List of Room Owners","Повний перелік власників кімнати"}.
 {"Full Name","Повне ім'я"}.
+{"Get List of Online Users","Отримати кількість користувачів в мережі"}.
+{"Get List of Registered Users","Отримати кількість зареєстрованих користувачів"}.
 {"Get Number of Online Users","Отримати Кількість Підключених Користувачів"}.
 {"Get Number of Registered Users","Отримати Кількість Зареєстрованих Користувачів"}.
+{"Get Pending","Очікування"}.
 {"Get User Last Login Time","Отримати Час Останнього Підключення Користувача"}.
 {"Get User Password","Отримати Пароль Користувача"}.
 {"Get User Statistics","Отримати Статистику по Користувачу"}.
+{"Given Name","По-батькові"}.
 {"Grant voice to this person?","Надати голос персоні?"}.
 {"Groups that will be displayed to the members","Групи, які показуватимуться учасникам"}.
 {"Groups","Групи"}.
@@ -180,6 +186,9 @@
 {"has been kicked because of an affiliation change","вигнано з кімнати внаслідок зміни рангу"}.
 {"has been kicked because the room has been changed to members-only","вигнано з кімнати тому, що вона стала тільки для учасників"}.
 {"has been kicked","вигнали з кімнати"}.
+{"Hat title","Назва кімнати"}.
+{"Hat URI","Назва URI"}.
+{"Hats limit exceeded","Перевищено швидкість передачі інформації"}.
 {"Host unknown","Невідоме ім'я сервера"}.
 {"Host","Хост"}.
 {"HTTP File Upload","Відвантаження файлів по HTTP"}.
@@ -202,6 +211,8 @@
 {"Incorrect value of 'action' attribute","Неправильне значення атрибута \"action\""}.
 {"Incorrect value of 'action' in data form","Неправильне значення \"action\" у формі даних"}.
 {"Incorrect value of 'path' in data form","Неправильне значення \"path\" у формі даних"}.
+{"Installed Modules:","Запуск модулів:"}.
+{"Install","Встановлення"}.
 {"Insufficient privilege","Недостатньо привілеїв"}.
 {"Internal server error","Внутрішня помилка сервера"}.
 {"Invalid 'from' attribute in forwarded message","Неприйнятний атрибут \"from\" у пересланому повідомленні"}.
@@ -215,6 +226,7 @@
 {"It is not allowed to send private messages to the conference","Не дозволяється надсилати приватні повідомлення в конференцію"}.
 {"Jabber ID","Jabber ID"}.
 {"January","січня"}.
+{"JID normalization denied by service policy","Створювати конференцію заборонено політикою служби"}.
 {"JID normalization failed","Помилка нормалізації JID"}.
 {"joins the room","увійшов(ла) в кімнату"}.
 {"July","липня"}.
@@ -226,6 +238,7 @@
 {"Last message","Останнє повідомлення"}.
 {"Last month","За останній місяць"}.
 {"Last year","За останній рік"}.
+{"Least significant bits of SHA-256 hash of text should equal hexadecimal label","Найменш значущі біти хеш-функції SHA-256 від тексту мають відповідати шістнадцятковій мітці."}.
 {"leaves the room","вийшов(ла) з кімнати"}.
 {"List of rooms","Перелік кімнат"}.
 {"List of users with hats","Список користувачів із капелюхами"}.
@@ -240,7 +253,9 @@
 {"Make room persistent","Зробити кімнату постійною"}.
 {"Make room public searchable","Зробити кімнату видимою всім"}.
 {"Malformed username","Неправильне ім’я користувача"}.
+{"MAM preference modification denied by service policy","Зміна налаштувань MAM відхилена через політики сервісу"}.
 {"March","березня"}.
+{"Max # of items to persist, or `max` for no specific limit other than a server imposed maximum","Максимальна кількість елементів для зберігання, або max для встановлення не конкретизованого ліміту, окрім максимального, накладеного сервером"}.
 {"Max payload size in bytes","Максимальний розмір корисного навантаження в байтах"}.
 {"Maximum file size","Макс. розмір файлу"}.
 {"Maximum Number of History Messages Returned by Room","Максимальна кількість повідомлень історії на кімнату"}.
@@ -250,7 +265,9 @@
 {"Members not added (inexistent vhost!): ","Учасників не додано (вірт. сервер не існує!): "}.
 {"Membership is required to enter this room","В цю конференцію можуть входити тільки її члени"}.
 {"Members:","Члени:"}.
+{"Memorize your password, or write it in a paper placed in a safe place. In XMPP there isn't an automated way to recover your password if you forget it.","Запам'ятайте свій пароль або запишіть його на папері та зберігайте у безпечному місці. У XMPP не існує автоматизованого способу відновлення паролю, якщо ви його забудете."}.
 {"Memory","Пам'ять"}.
+{"Mere Availability in XMPP (No Show Value)","Проста доступність у XMPP (без показу статусу)"}.
 {"Message body","Тіло повідомлення"}.
 {"Message not found in forwarded payload","Повідомлення не знайдено в пересланому вмісті"}.
 {"Messages from strangers are rejected","Повідомлення від незнайомців відхиляються"}.
@@ -259,6 +276,7 @@
 {"Middle Name","По-батькові"}.
 {"Minimum interval between voice requests (in seconds)","Мінімальний інтервал між голосовими запитами (в секундах)"}.
 {"Moderator privileges required","Необхідні права модератора"}.
+{"Moderators Only","Тільки модераторам"}.
 {"Moderator","Модератор"}.
 {"Modified modules","Змінені модулі"}.
 {"Module failed to handle the query","Модулю не вдалося обробити запит"}.
@@ -266,8 +284,11 @@
 {"Multicast","Мультікаст"}.
 {"Multiple <item/> elements are not allowed by RFC6121","Кілька елементів <item/> не дозволені RFC6121"}.
 {"Multi-User Chat","Багато-користувальницький чат"}.
+{"Name in the rosters where this group will be displayed","Назва у списку контактів, де ця група буде відображена"}.
 {"Name","Назва"}.
 {"Name:","Назва:"}.
+{"Natural Language for Room Discussions","Розмовна мова для обговорень у кімнаті"}.
+{"Natural-Language Room Name","Назва кімнати розмовною мовою"}.
 {"Neither 'jid' nor 'nick' attribute found","Не знайдено ні атрибута \"jid\", ні \"nick\""}.
 {"Neither 'role' nor 'affiliation' attribute found","Не знайдено ні атрибута \"role\", ні \"affiliation\""}.
 {"Never","Ніколи"}.
@@ -303,6 +324,7 @@
 {"No services available","Немає доступних сервісів"}.
 {"No statistics found for this item","Для цього елемента статистичні дані не знайдено"}.
 {"No 'to' attribute found in the invitation","У запрошенні не знайдено атрибут \"до\""}.
+{"Nobody","Ніхто"}.
 {"Node already exists","Вузол уже існує"}.
 {"Node ID","ID вузла"}.
 {"Node index not found","Індекс вузла не знайдено"}.
@@ -324,6 +346,10 @@
 {"Number of Offline Messages","Кількість автономних повідомлень"}.
 {"Number of online users","Кількість підключених користувачів"}.
 {"Number of registered users","Кількість зареєстрованих користувачів"}.
+{"Number of seconds after which to automatically purge items, or `max` for no specific limit other than a server imposed maximum","Кількість секунд, після яких автоматично видаляти елементи, або `max` для встановлення невизначеного ліміту, окрім максимального, накладеного сервером."}.
+{"Occupants are allowed to invite others","Учасникам дозволено запрошувати інших"}.
+{"Occupants are allowed to query others","Учасникам дозволено ставити запитання іншим"}.
+{"Occupants May Change the Subject","Учасникам дозволено змінювати тему"}.
 {"October","грудня"}.
 {"Offline Messages","Офлайнові повідомлення"}.
 {"Offline Messages:","Офлайнові повідомлення:"}.
@@ -340,19 +366,23 @@
 {"Only members may query archives of this room","Тільки модератори можуть запитувати архіви цієї кімнати"}.
 {"Only moderators and participants are allowed to change the subject in this room","Тільки модератори та учасники можуть змінювати тему в цій кімнаті"}.
 {"Only moderators are allowed to change the subject in this room","Тільки модератори можуть змінювати тему в цій кімнаті"}.
+{"Only moderators are allowed to retract messages","Тільки модераторам дозволено відкликати повідомлення"}.
 {"Only moderators can approve voice requests","Тільки модератори можуть схвалювати голосові запити"}.
 {"Only occupants are allowed to send messages to the conference","Тільки присутнім дозволяється надсилати повідомленняя в конференцію"}.
 {"Only occupants are allowed to send queries to the conference","Тільки присутнім дозволяється відправляти запити в конференцію"}.
 {"Only publishers may publish","Тільки видавці можуть публікувати"}.
 {"Only service administrators are allowed to send service messages","Тільки адміністратор сервісу може надсилати службові повідомлення"}.
 {"Only those on a whitelist may associate leaf nodes with the collection","Лише ті, хто входить до білого списку, можуть асоціювати листові вузли з колекцією"}.
+{"Only those on a whitelist may subscribe and retrieve items","Тільки ті, хто є в білому списку, можуть підписуватися та отримувати елементи"}.
 {"Organization Name","Назва організації"}.
 {"Organization Unit","Відділ організації"}.
+{"Other Modules Available:","Інші доступні модулі:"}.
 {"Outgoing s2s Connections","Вихідні s2s-з'єднання"}.
 {"Outgoing s2s Connections:","Вихідні s2s-з'єднання:"}.
 {"Owner privileges required","Необхідні права власника"}.
 {"Packet relay is denied by service policy","Пересилання пакетів заборонене політикою сервісу"}.
 {"Packet","Пакет"}.
+{"Participant ID","ID учасника"}.
 {"Participant","Учасник"}.
 {"Password Verification","Перевірка Пароля"}.
 {"Password Verification:","Перевірка Пароля:"}.
@@ -360,24 +390,36 @@
 {"Password:","Пароль:"}.
 {"Path to Dir","Шлях до директорії"}.
 {"Path to File","Шлях до файла"}.
+{"Payload semantic type information","Інформація про тип вмісту даних"}.
 {"Pending","Очікування"}.
 {"Period: ","Період: "}.
-{"Persist items to storage","Зберегати публікації до сховища"}.
-{"Ping","Пінг"}.
-{"Please note that these options will only backup the builtin Mnesia database. If you are using the ODBC module, you also need to backup your SQL database separately.","Зауважте, що ця опція відповідає за резервне копіювання тільки вбудованної бази даних Mnesia. Якщо Ви також використовуєте інше сховище для даних (наприклад за допомогою модуля ODBC), то його резервне копіювання потрібно робити окремо."}.
-{"Please, wait for a while before sending new voice request","Будь ласка, почекайте деякий час перед тим, як знову відправляти голосовий запит"}.
-{"Pong","Понг"}.
-{"Present real Jabber IDs to","Зробити реальні Jabber ID учасників видимими"}.
-{"Previous session not found","Попередній сеанс не знайдено"}.
+{"Persist items to storage","Зберігати елементи в сховищі"}.
+{"Persistent","Тривалий"}.
+{"Ping query is incorrect","Запит ping некоректний"}.
+{"Ping","Затримка (пінг)"}.
+{"Please note that these options will only backup the builtin Mnesia database. If you are using the ODBC module, you also need to backup your SQL database separately.","Зверніть увагу, що ці налаштування створюють резервну копію лише вбудованої бази даних Mnesia. Якщо ви використовуєте модуль ODBC, вам також потрібно окремо створити резервну копію вашої SQL-бази даних."}.
+{"Please, wait for a while before sending new voice request","Будь ласка, зачекайте трохи перед тим, як відправляти новий голосовий запит"}.
+{"Pong","Pong (відповідь на Ping, підтвердження взаємодії)"}.
+{"Possessing 'ask' attribute is not allowed by RFC6121","Наявність атрибуту 'ask' не дозволена згідно з RFC6121"}.
+{"Present real Jabber IDs to","Показувати реальні Jabber ID для"}.
+{"Previous session not found","Попередню сесію не знайдено"}.
+{"Previous session PID has been killed","PID попередньої сесії був зупинений"}.
+{"Previous session PID has exited","PID попередньої сесії завершив роботу"}.
+{"Previous session PID is dead","PID попередньої сесії більше не активний"}.
+{"Previous session timed out","Час попередньої сесії вичерпано"}.
 {"private, ","приватна, "}.
+{"Public","Публічний"}.
+{"Publish model","Модель публікації"}.
 {"Publish-Subscribe","Публікація-Підписка"}.
-{"PubSub subscriber request","Запит на підписку PubSub"}.
-{"Purge all items when the relevant publisher goes offline","Видалити всі елементи, коли особа, що їх опублікувала, вимикається від мережі"}.
+{"PubSub subscriber request","Запит підписника PubSub"}.
+{"Purge all items when the relevant publisher goes offline","Видалити всі елементи, коли автор публікації виходить офлайн"}.
 {"Push record not found","Push-запис не знайдено"}.
-{"Queries to the conference members are not allowed in this room","Запити до користувачів в цій конференції заборонені"}.
-{"RAM and disc copy","ОЗП та диск"}.
-{"RAM copy","ОЗП"}.
-{"Really delete message of the day?","Насправді, видалити повідомлення дня?"}.
+{"Queries to the conference members are not allowed in this room","Запити до учасників конференції не дозволені в цій кімнаті"}.
+{"Query to another users is forbidden","Запит до інших користувачів заборонено"}.
+{"RAM and disc copy","Копія оперативної пам'яті та диску"}.
+{"RAM copy","Копія оперативної пам'яті"}.
+{"Really delete message of the day?","Дійсно видалити повідомлення дня?"}.
+{"Receive notification from all descendent nodes","Отримувати сповіщення від усіх підпорядкованих вузлів"}.
 {"Recipient is not in the conference room","Адресата немає в конференції"}.
 {"Register an XMPP account","Зареєструвати XMPP-запис"}.
 {"Registered Users","Зареєстровані користувачі"}.

priv/msgs/zh.msg

@@ -4,8 +4,8 @@
 %%   https://docs.ejabberd.im/developer/extending-ejabberd/localization/
 
 {" (Add * to the end of field to match substring)"," (在字段末添加*来匹配子串)"}.
-{" has set the subject to: "," 已将标题设置为: "}.
-{"# participants","# 个参与人"}.
+{" has set the subject to: "," 已将标题设置为： "}.
+{"# participants","# 参与者"}.
 {"A description of the node","该节点的描述"}.
 {"A friendly name for the node","该节点的友好名称"}.
 {"A password is required to enter this room","进入此房间需要密码"}.
@@ -14,9 +14,9 @@
 {"Access denied by service policy","访问被服务策略拒绝"}.
 {"Access model","访问模型"}.
 {"Account doesn't exist","账号不存在"}.
-{"Action on user","对用户的动作"}.
+{"Action on user","对用户执行的操作"}.
 {"Add a hat to a user","给用户添加头衔"}.
-{"Add Jabber ID","添加Jabber ID"}.
+{"Add Jabber ID","添加 Jabber ID"}.
 {"Add New","添加新用户"}.
 {"Add User","添加用户"}.
 {"Administration of ","管理 "}.
@@ -25,18 +25,18 @@
 {"All activity","所有活动"}.
 {"All Users","所有用户"}.
 {"Allow subscription","允许订阅"}.
-{"Allow this Jabber ID to subscribe to this pubsub node?","允许该Jabber ID订阅该pubsub节点?"}.
-{"Allow this person to register with the room?","允许此人注册到该房间?"}.
+{"Allow this Jabber ID to subscribe to this pubsub node?","允许此 Jabber ID 订阅此 pubsub 节点？"}.
+{"Allow this person to register with the room?","允许此用户注册此房间？"}.
 {"Allow users to change the subject","允许用户更改主题"}.
 {"Allow users to query other users","允许用户查询其它用户"}.
 {"Allow users to send invites","允许用户发送邀请"}.
-{"Allow users to send private messages","允许用户发送私聊消息"}.
-{"Allow visitors to change nickname","允许用户更改昵称"}.
-{"Allow visitors to send private messages to","允许访客发送私聊消息至"}.
-{"Allow visitors to send status text in presence updates","更新在线状态时允许用户发送状态文本"}.
-{"Allow visitors to send voice requests","允许访客发送声音请求"}.
-{"An associated LDAP group that defines room membership; this should be an LDAP Distinguished Name according to an implementation-specific or deployment-specific definition of a group.","与定义房间会员资格相关联的LDAP群组; 按群组特定于实现或特定于部署的定义, 应该是一个LDAP专有名称."}.
-{"Announcements","通知"}.
+{"Allow users to send private messages","允许用户发送私信"}.
+{"Allow visitors to change nickname","允许访客更改昵称"}.
+{"Allow visitors to send private messages to","允许访客发送私信至"}.
+{"Allow visitors to send status text in presence updates","允许访客在在线状态更新中发送状态文本"}.
+{"Allow visitors to send voice requests","允许访客发送发言请求"}.
+{"An associated LDAP group that defines room membership; this should be an LDAP Distinguished Name according to an implementation-specific or deployment-specific definition of a group.","与定义房间成员资格相关联的 LDAP 群组；按群组特定于实现或特定于部署的定义，应该是一个 LDAP 专有名称。"}.
+{"Announcements","公告"}.
 {"Answer associated with a picture","与图片关联的回答"}.
 {"Answer associated with a video","与视频关联的回答"}.
 {"Answer associated with speech","与讲话关联的回答"}.
@@ -46,11 +46,12 @@
 {"Anyone may publish","任何人都可以发布"}.
 {"Anyone may subscribe and retrieve items","任何人都可以订阅和检索内容项"}.
 {"Anyone with a presence subscription of both or from may subscribe and retrieve items","对全部或来源进行了状态订阅的任何人均可订阅并检索内容项"}.
-{"Anyone with Voice","任何带声音的人"}.
+{"Anyone with Voice","任何有发言权的人"}.
 {"Anyone","任何人"}.
+{"Apparently your account has no administration rights in this server. Please check how to grant admin rights in: https://docs.ejabberd.im/admin/installation/#administration-account","显然，您的账号在此服务器上没有管理权限。请检查如何授予管理员权限：https://docs.ejabberd.im/admin/installation/#administration-account"}.
 {"April","四月"}.
 {"Attribute 'channel' is required for this request","此请求要求'频道'属性"}.
-{"Attribute 'id' is mandatory for MIX messages","对MIX消息, 'id' 属性为必填项"}.
+{"Attribute 'id' is mandatory for MIX messages","对 MIX 消息，'id' 属性为必填项"}.
 {"Attribute 'jid' is not allowed here","此处不允许 'jid' 属性"}.
 {"Attribute 'node' is not allowed here","此处不允许 'node' 属性"}.
 {"Attribute 'to' of stanza that triggered challenge","触发挑战一节的 'to' 属性"}.
@@ -64,46 +65,46 @@
 {"Birthday","出生日期"}.
 {"Both the username and the resource are required","用户名和资源均为必填项"}.
 {"Bytestream already activated","字节流已经被激活"}.
-{"Cannot remove active list","无法移除活跃列表"}.
-{"Cannot remove default list","无法移除缺省列表"}.
+{"Cannot remove active list","无法移除活动列表"}.
+{"Cannot remove default list","无法移除默认列表"}.
 {"CAPTCHA web page","验证码网页"}.
-{"Challenge ID","挑战ID"}.
+{"Challenge ID","挑战 ID"}.
 {"Change Password","更改密码"}.
 {"Change User Password","更改用户密码"}.
 {"Changing password is not allowed","不允许修改密码"}.
-{"Changing role/affiliation is not allowed","不允许修改角色/单位"}.
+{"Changing role/affiliation is not allowed","不允许修改角色/从属关系"}.
 {"Channel already exists","频道已存在"}.
 {"Channel does not exist","频道不存在"}.
 {"Channel JID","频道 JID"}.
 {"Channels","频道"}.
 {"Characters not allowed:","不允许字符："}.
 {"Chatroom configuration modified","聊天室配置已修改"}.
-{"Chatroom is created","聊天室已被创建"}.
-{"Chatroom is destroyed","聊天室已被销毁"}.
-{"Chatroom is started","聊天室已被启动"}.
-{"Chatroom is stopped","聊天室已被停用"}.
+{"Chatroom is created","聊天室已创建"}.
+{"Chatroom is destroyed","聊天室已解散"}.
+{"Chatroom is started","聊天室已启动"}.
+{"Chatroom is stopped","聊天室已停用"}.
 {"Chatrooms","聊天室"}.
-{"Choose a username and password to register with this server","请选择在此服务器上注册所需的用户名和密码"}.
+{"Choose a username and password to register with this server","选择要在此服务器上注册的用户名和密码"}.
 {"Choose storage type of tables","请选择表格的存储类型"}.
-{"Choose whether to approve this entity's subscription.","选择是否允许该实体的订阅."}.
+{"Choose whether to approve this entity's subscription.","选择是否允许该实体的订阅。"}.
 {"City","城市"}.
 {"Client acknowledged more stanzas than sent by server","客户端确认的节数多于服务器发送的节数"}.
 {"Commands","命令"}.
 {"Conference room does not exist","会议室不存在"}.
 {"Configuration of room ~s","房间~s的配置"}.
 {"Configuration","配置"}.
-{"Connected Resources:","已连接资源:"}.
-{"Contact Addresses (normally, room owner or owners)","联系人地址 (通常为房间持有人)"}.
+{"Connected Resources:","已连接资源："}.
+{"Contact Addresses (normally, room owner or owners)","联系人地址(通常为房间所有者)"}.
 {"Contrib Modules","Contrib 模块"}.
-{"Country","国家"}.
-{"CPU Time:","CPU时间："}.
+{"Country","国家/地区"}.
+{"CPU Time:","CPU 时间："}.
 {"Current Discussion Topic","当前讨论话题"}.
 {"Database failure","数据库失败"}.
 {"Database Tables at ~p","位于~p的数据库表"}.
 {"Database Tables Configuration at ","数据库表格配置位于 "}.
 {"Database","数据库"}.
 {"December","十二月"}.
-{"Default users as participants","用户默认被视为参与人"}.
+{"Default users as participants","默认用户为参与者"}.
 {"Delete content","删除内容"}.
 {"Delete message of the day on all hosts","删除所有主机上的每日消息"}.
 {"Delete message of the day","删除每日消息"}.
@@ -112,62 +113,62 @@
 {"Delete User","删除用户"}.
 {"Deliver event notifications","传递事件通知"}.
 {"Deliver payloads with event notifications","用事件通告传输有效负载"}.
-{"Description:","描述:"}.
+{"Description:","描述："}.
 {"Disc only copy","仅磁盘复制"}.
-{"'Displayed groups' not added (they do not exist!): ","'显示的群组' 未被添加 (它们不存在!): "}.
-{"Displayed:","已显示:"}.
-{"Don't tell your password to anybody, not even the administrators of the XMPP server.","不要将密码告诉任何人, 就算是XMPP服务器的管理员也不可以."}.
+{"'Displayed groups' not added (they do not exist!): ","'显示的群组' 未被添加(它们不存在!)： "}.
+{"Displayed:","已显示："}.
+{"Don't tell your password to anybody, not even the administrators of the XMPP server.","不要将密码告诉任何人，甚至是 XMPP 服务器的管理员。"}.
 {"Dump Backup to Text File at ","将备份转储到位于以下位置的文本文件 "}.
 {"Dump to Text File","转储到文本文件"}.
-{"Duplicated groups are not allowed by RFC6121","按照RFC6121的规则，不允许有重复的群组"}.
+{"Duplicated groups are not allowed by RFC6121","按照 RFC6121 的规则，不允许有重复的群组"}.
 {"Dynamically specify a replyto of the item publisher","为项目发布者动态指定一个 replyto"}.
 {"Edit Properties","编辑属性"}.
-{"Either approve or decline the voice request.","接受或拒绝声音请求."}.
+{"Either approve or decline the voice request.","批准或拒绝发言请求。"}.
 {"ejabberd HTTP Upload service","ejabberd HTTP 上传服务"}.
 {"ejabberd MUC module","ejabberd MUC 模块"}.
-{"ejabberd Multicast service","ejabberd多重映射服务"}.
+{"ejabberd Multicast service","ejabberd 多重映射服务"}.
 {"ejabberd Publish-Subscribe module","ejabberd 发行-订阅模块"}.
 {"ejabberd SOCKS5 Bytestreams module","ejabberd SOCKS5 字节流模块"}.
-{"ejabberd vCard module","ejabberd vCard模块"}.
-{"ejabberd Web Admin","ejabberd网页管理"}.
+{"ejabberd vCard module","ejabberd vCard 模块"}.
+{"ejabberd Web Admin","ejabberd Web 管理员"}.
 {"ejabberd","ejabberd"}.
 {"Elements","元素"}.
-{"Email Address","电邮地址"}.
+{"Email Address","电子邮件地址"}.
 {"Email","电子邮件"}.
 {"Enable hats","启用头衔"}.
 {"Enable logging","启用服务器端聊天记录"}.
-{"Enable message archiving","启用消息归档"}.
+{"Enable message archiving","启用消息存档"}.
 {"Enabling push without 'node' attribute is not supported","不支持未使用'node'属性就开启推送"}.
 {"End User Session","结束用户会话"}.
 {"Enter nickname you want to register","请输入您想要注册的昵称"}.
 {"Enter path to backup file","请输入备份文件的路径"}.
-{"Enter path to jabberd14 spool dir","请输入jabberd14 spool目录的路径"}.
+{"Enter path to jabberd14 spool dir","请输入 jabberd14 spool 目录的路径"}.
 {"Enter path to jabberd14 spool file","请输入 jabberd14 spool 文件的路径"}.
 {"Enter path to text file","请输入文本文件的路径"}.
 {"Enter the text you see","请输入您所看到的文本"}.
 {"Erlang XMPP Server","Erlang XMPP 服务器"}.
 {"Error","错误"}.
-{"Exclude Jabber IDs from CAPTCHA challenge","从验证码挑战中排除Jabber ID"}.
-{"Export all tables as SQL queries to a file:","将所有表以SQL查询语句导出到文件:"}.
-{"Export data of all users in the server to PIEFXIS files (XEP-0227):","将服务器上所有用户的数据导出到 PIEFXIS 文件 (XEP-0227):"}.
-{"Export data of users in a host to PIEFXIS files (XEP-0227):","将某主机的用户数据导出到 PIEFXIS 文件 (XEP-0227):"}.
+{"Exclude Jabber IDs from CAPTCHA challenge","从验证码挑战中排除 Jabber ID"}.
+{"Export all tables as SQL queries to a file:","将所有表以 SQL 查询语句导出到文件："}.
+{"Export data of all users in the server to PIEFXIS files (XEP-0227):","将服务器上所有用户的数据导出到 PIEFXIS 文件(XEP-0227)："}.
+{"Export data of users in a host to PIEFXIS files (XEP-0227):","将某主机的用户数据导出到 PIEFXIS 文件(XEP-0227)："}.
 {"External component failure","外部组件失败"}.
 {"External component timeout","外部组件超时"}.
 {"Failed to activate bytestream","激活字节流失败"}.
-{"Failed to extract JID from your voice request approval","无法从你的声音请求确认信息中提取JID"}.
+{"Failed to extract JID from your voice request approval","从您的发言请求批准提取 JID 失败"}.
 {"Failed to map delegated namespace to external component","未能将代理命名空间映射到外部组件"}.
-{"Failed to parse HTTP response","HTTP响应解析失败"}.
+{"Failed to parse HTTP response","HTTP 响应解析失败"}.
 {"Failed to process option '~s'","选项'~s'处理失败"}.
 {"Family Name","姓氏"}.
 {"FAQ Entry","常见问题入口"}.
 {"February","二月"}.
 {"File larger than ~w bytes","文件大于 ~w 字节"}.
-{"Fill in the form to search for any matching XMPP User","填充表单来搜索任何匹配的XMPP用户"}.
+{"Fill in the form to search for any matching XMPP User","填充表单来搜索任何匹配的 XMPP 用户"}.
 {"Friday","星期五"}.
 {"From ~ts","来自 ~ts"}.
 {"From","从"}.
 {"Full List of Room Admins","房间管理员完整列表"}.
-{"Full List of Room Owners","房间持有人完整列表"}.
+{"Full List of Room Owners","房间所有者完整列表"}.
 {"Full Name","全名"}.
 {"Get List of Online Users","获取在线用户列表"}.
 {"Get List of Registered Users","获取注册用户列表"}.
@@ -178,34 +179,34 @@
 {"Get User Password","获取用户密码"}.
 {"Get User Statistics","获取用户统计"}.
 {"Given Name","中间名"}.
-{"Grant voice to this person?","为此人授权声音?"}.
-{"Groups that will be displayed to the members","将显示给会员的群组"}.
+{"Grant voice to this person?","允许此用户发言？"}.
+{"Groups that will be displayed to the members","将显示给成员的群组"}.
 {"Groups","组"}.
 {"Group","组"}.
 {"has been banned","已被禁止"}.
 {"has been kicked because of a system shutdown","因系统关机而被踢出"}.
-{"has been kicked because of an affiliation change","因联属关系改变而被踢出"}.
-{"has been kicked because the room has been changed to members-only","因该房间改为只对会员开放而被踢出"}.
+{"has been kicked because of an affiliation change","因从属关系改变而被踢出"}.
+{"has been kicked because the room has been changed to members-only","被踢了，因为房间已改为仅成员进入"}.
 {"has been kicked","已被踢出"}.
 {"Hat title","头衔标题"}.
 {"Hat URI","头衔 URI"}.
 {"Hats limit exceeded","已超过头衔限制"}.
-{"Host unknown","主人未知"}.
+{"Host unknown","主机未知"}.
 {"Host","主机"}.
-{"HTTP File Upload","HTTP文件上传"}.
-{"Idle connection","空闲的连接"}.
-{"If you don't see the CAPTCHA image here, visit the web page.","如果您在这里没有看到验证码图片, 请访问网页."}.
+{"HTTP File Upload","HTTP 文件上传"}.
+{"Idle connection","空闲连接"}.
+{"If you don't see the CAPTCHA image here, visit the web page.","如果您在此处没有看到 CAPTCHA 图片，请访问网页。"}.
 {"Import Directory","导入目录"}.
 {"Import File","导入文件"}.
-{"Import user data from jabberd14 spool file:","从 jabberd14 Spool 文件导入用户数据:"}.
+{"Import user data from jabberd14 spool file:","从 jabberd14 Spool 文件导入用户数据："}.
 {"Import User from File at ","从以下位置的文件导入用户 "}.
-{"Import users data from a PIEFXIS file (XEP-0227):","从 PIEFXIS 文件 (XEP-0227) 导入用户数据:"}.
-{"Import users data from jabberd14 spool directory:","从jabberd14 Spool目录导入用户数据:"}.
+{"Import users data from a PIEFXIS file (XEP-0227):","从 PIEFXIS 文件(XEP-0227) 导入用户数据："}.
+{"Import users data from jabberd14 spool directory:","从jabberd14 Spool目录导入用户数据："}.
 {"Import Users from Dir at ","从以下位置目录导入用户 "}.
 {"Import Users From jabberd14 Spool Files","从 jabberd14 Spool 文件导入用户"}.
 {"Improper domain part of 'from' attribute","不恰当的'from'属性域名部分"}.
 {"Improper message type","不恰当的消息类型"}.
-{"Incoming s2s Connections:","入站 s2s 连接:"}.
+{"Incoming s2s Connections:","入站 s2s 连接："}.
 {"Incorrect CAPTCHA submit","提交的验证码不正确"}.
 {"Incorrect data form","数据形式不正确"}.
 {"Incorrect password","密码不正确"}.
@@ -219,65 +220,65 @@
 {"Invalid 'from' attribute in forwarded message","转发的信息中 'from' 属性的值无效"}.
 {"Invalid node name","无效的节点名称"}.
 {"Invalid 'previd' value","无效的 'previd' 值"}.
-{"Invitations are not allowed in this conference","此会议不允许邀请"}.
-{"IP addresses","IP地址"}.
+{"Invitations are not allowed in this conference","此群聊不允许邀请"}.
+{"IP addresses","IP 地址"}.
 {"is now known as","现在称呼为"}.
-{"It is not allowed to send error messages to the room. The participant (~s) has sent an error message (~s) and got kicked from the room","不允许将错误消息发送到该房间. 参与者(~s)已发送过一条消息(~s)并已被踢出房间"}.
-{"It is not allowed to send private messages of type \"groupchat\"","\"群组聊天\"类型不允许发送私聊消息"}.
-{"It is not allowed to send private messages to the conference","不允许向会议发送私聊消息"}.
+{"It is not allowed to send error messages to the room. The participant (~s) has sent an error message (~s) and got kicked from the room","不允许向此房间发送错误消息。参与者(~s) 发送了错误消息(~s)，被踢出了此房间"}.
+{"It is not allowed to send private messages of type \"groupchat\"","不允许发送“群聊”类型的私信"}.
+{"It is not allowed to send private messages to the conference","不允许向群聊发送私信"}.
 {"Jabber ID","Jabber ID"}.
 {"January","一月"}.
-{"JID normalization denied by service policy","JID规范化被服务策略拒绝"}.
-{"JID normalization failed","JID规范化失败"}.
+{"JID normalization denied by service policy","JID 规范化被服务策略拒绝"}.
+{"JID normalization failed","JID 规范化失败"}.
 {"Joined MIX channels of ~ts","加入了 ~ts 的 MIX 频道"}.
 {"Joined MIX channels:","加入了 MIX 频道："}.
 {"joins the room","加入房间"}.
 {"July","七月"}.
 {"June","六月"}.
 {"Just created","刚刚创建"}.
-{"Label:","标签:"}.
+{"Label:","标签："}.
 {"Last Activity","上次活动"}.
 {"Last login","上次登录"}.
 {"Last message","最近消息"}.
 {"Last month","上个月"}.
 {"Last year","上一年"}.
-{"Least significant bits of SHA-256 hash of text should equal hexadecimal label","文本的SHA-256哈希的最低有效位应等于十六进制标签"}.
+{"Least significant bits of SHA-256 hash of text should equal hexadecimal label","文本的 SHA-256 哈希的最低有效位应等于十六进制标签"}.
 {"leaves the room","离开房间"}.
 {"List of rooms","房间列表"}.
 {"List of users with hats","有头衔用户的列表"}.
 {"List users with hats","有头衔用户列表"}.
 {"Logging","正在记录"}.
 {"Low level update script","低级别更新脚本"}.
-{"Make participants list public","公开参与人列表"}.
-{"Make room CAPTCHA protected","保护房间验证码"}.
-{"Make room members-only","设置房间只接收会员"}.
-{"Make room moderated","设置房间只接收主持人"}.
-{"Make room password protected","进入此房间需要密码"}.
-{"Make room persistent","永久保存该房间"}.
-{"Make room public searchable","使房间可被公开搜索"}.
-{"Malformed username","用户名无效"}.
-{"MAM preference modification denied by service policy","MAM偏好被服务策略拒绝"}.
+{"Make participants list public","公开参与者列表"}.
+{"Make room CAPTCHA protected","使房间受验证码保护"}.
+{"Make room members-only","使房间仅成员进入"}.
+{"Make room moderated","对房间进行审核"}.
+{"Make room password protected","使房间受密码保护"}.
+{"Make room persistent","使房间持久"}.
+{"Make room public searchable","使房间可公开搜索"}.
+{"Malformed username","用户名格式不正确"}.
+{"MAM preference modification denied by service policy","MAM 偏好被服务策略拒绝"}.
 {"March","三月"}.
 {"Max # of items to persist, or `max` for no specific limit other than a server imposed maximum","要保留的最大项目数 #，`max`表示除了服务器强加的最大值之外没有特定限制"}.
 {"Max payload size in bytes","最大有效负载字节数"}.
 {"Maximum file size","最大文件大小"}.
 {"Maximum Number of History Messages Returned by Room","房间返回的历史消息最大值"}.
 {"Maximum number of items to persist","持久化内容的最大条目数"}.
-{"Maximum Number of Occupants","允许的与会人最大数"}.
+{"Maximum Number of Occupants","最大占用人数"}.
 {"May","五月"}.
-{"Members not added (inexistent vhost!): ","成员未添加 (不存在的vhost!): "}.
-{"Membership is required to enter this room","进入此房间需要会员身份"}.
-{"Members:","会员:"}.
-{"Memorize your password, or write it in a paper placed in a safe place. In XMPP there isn't an automated way to recover your password if you forget it.","记住你的密码, 或将其记到纸上并放于安全位置. 如果你忘记了密码, XMPP也没有自动恢复密码的方式."}.
+{"Members not added (inexistent vhost!): ","成员未添加(不存在的vhost!)： "}.
+{"Membership is required to enter this room","进入此房间需要成员资格"}.
+{"Members:","成员："}.
+{"Memorize your password, or write it in a paper placed in a safe place. In XMPP there isn't an automated way to recover your password if you forget it.","请记住您的密码，或将其写在纸上并放在安全的地方。 在 XMPP 中，如果您忘记密码，则没有自动恢复密码的方法。"}.
 {"Memory","内存"}.
-{"Mere Availability in XMPP (No Show Value)","仅XMPP中的可用性 (不显示值)"}.
+{"Mere Availability in XMPP (No Show Value)","仅 XMPP 中的可用性(不显示值)"}.
 {"Message body","消息主体"}.
 {"Message not found in forwarded payload","转发的有效载荷中找不到消息"}.
-{"Messages from strangers are rejected","陌生人的消息会被拒绝"}.
+{"Messages from strangers are rejected","拒绝来自陌生人的消息"}.
 {"Messages of type headline","标题类型的消息"}.
 {"Messages of type normal","普通类型的消息"}.
 {"Middle Name","中间名"}.
-{"Minimum interval between voice requests (in seconds)","声音请求的最小间隔(以秒为单位)"}.
+{"Minimum interval between voice requests (in seconds)","发言请求的最小间隔(秒)"}.
 {"Moderator privileges required","需要主持人权限"}.
 {"Moderators Only","仅限主持人"}.
 {"Moderator","主持人"}.
@@ -289,13 +290,13 @@
 {"Multi-User Chat","多用户聊天"}.
 {"Name in the rosters where this group will be displayed","花名册中将显示的该分组的名称"}.
 {"Name","姓名"}.
-{"Name:","姓名:"}.
+{"Name:","姓名："}.
 {"Natural Language for Room Discussions","房间讨论的自然语言"}.
 {"Natural-Language Room Name","自然语言房间名称"}.
 {"Neither 'jid' nor 'nick' attribute found","属性 'jid' 或 'nick' 均未发现"}.
 {"Neither 'role' nor 'affiliation' attribute found","属性 'role' 或 'affiliation' 均未发现"}.
 {"Never","从未"}.
-{"New Password:","新密码:"}.
+{"New Password:","新密码："}.
 {"Nickname can't be empty","昵称不能为空"}.
 {"Nickname Registration at ","昵称注册于 "}.
 {"Nickname ~s does not exist in the room","昵称~s不在该房间"}.
@@ -329,7 +330,7 @@
 {"No 'to' attribute found in the invitation","邀请中未发现 'to' 标签"}.
 {"Nobody","没有人"}.
 {"Node already exists","节点已存在"}.
-{"Node ID","节点ID"}.
+{"Node ID","节点 ID"}.
 {"Node index not found","没有找到节点索引"}.
 {"Node not found","没有找到节点"}.
 {"Node ~p","节点~p"}.
@@ -340,82 +341,84 @@
 {"Not allowed","不允许"}.
 {"Not Found","没有找到"}.
 {"Not subscribed","未订阅"}.
-{"Notify subscribers when items are removed from the node","当从节点删除内容条目时通知订阅人"}.
-{"Notify subscribers when the node configuration changes","当节点设置改变时通知订阅人"}.
-{"Notify subscribers when the node is deleted","当节点被删除时通知订阅人"}.
+{"Notify subscribers when items are removed from the node","当从节点删除内容条目时通知订阅者"}.
+{"Notify subscribers when the node configuration changes","当节点设置改变时通知订阅者"}.
+{"Notify subscribers when the node is deleted","当节点被删除时通知订阅者"}.
 {"November","十一月"}.
 {"Number of answers required","需要的回答数量"}.
-{"Number of occupants","驻留人数"}.
+{"Number of occupants","占用人数"}.
 {"Number of Offline Messages","离线消息数量"}.
 {"Number of online users","在线用户数"}.
 {"Number of registered users","注册用户数"}.
 {"Number of seconds after which to automatically purge items, or `max` for no specific limit other than a server imposed maximum","等待多少秒后自动清除项目，“max”表示除服务器施加的最大值外没有特定限制"}.
-{"Occupants are allowed to invite others","允许成员邀请其他人"}.
-{"Occupants are allowed to query others","成员可查询其他人"}.
-{"Occupants May Change the Subject","成员可以修改主题"}.
+{"Occupants are allowed to invite others","允许占用者邀请别人"}.
+{"Occupants are allowed to query others","允许占用者查询别人"}.
+{"Occupants May Change the Subject","占用者可以修改主题"}.
 {"October","十月"}.
 {"Offline Messages","离线消息"}.
-{"Offline Messages:","离线消息:"}.
+{"Offline Messages:","离线消息："}.
 {"OK","确定"}.
-{"Old Password:","旧密码:"}.
+{"Old Password:","旧密码："}.
 {"Online Users","在线用户"}.
-{"Online Users:","在线用户:"}.
+{"Online Users:","在线用户："}.
 {"Online","在线"}.
 {"Only admins can see this","仅管理员可以看见此内容"}.
 {"Only collection node owners may associate leaf nodes with the collection","只有集合节点所有者可以将叶子节点与集合关联"}.
 {"Only deliver notifications to available users","仅将通知发送给可发送的用户"}.
 {"Only <enable/> or <disable/> tags are allowed","仅允许 <enable/> 或 <disable/> 标签"}.
 {"Only <list/> element is allowed in this query","此查询中只允许 <list/> 元素"}.
-{"Only members may query archives of this room","只有会员可以查询本房间的存档"}.
-{"Only moderators and participants are allowed to change the subject in this room","只有主持人和参与人可以在此房间里更改主题"}.
-{"Only moderators are allowed to change the subject in this room","只有主持人可以在此房间里更改主题"}.
-{"Only moderators can approve voice requests","仅主持人能确认声音请求"}.
-{"Only occupants are allowed to send messages to the conference","只有与会人可以向大会发送消息"}.
-{"Only occupants are allowed to send queries to the conference","只有与会人可以向大会发出查询请求"}.
+{"Only members may query archives of this room","只有成员才能查询此房间的存档"}.
+{"Only moderators and participants are allowed to change the subject in this room","只有主持人和参与者才允许在此房间更改主题"}.
+{"Only moderators are allowed to change the subject in this room","只有主持人才允许在此房间更改主题"}.
+{"Only moderators are allowed to retract messages","只有主持人才允许撤回消息"}.
+{"Only moderators can approve voice requests","只有主持人才能批准发言请求"}.
+{"Only occupants are allowed to send messages to the conference","只有占用者才允许向群聊发送消息"}.
+{"Only occupants are allowed to send queries to the conference","只有占用者才允许向群聊发送查询"}.
 {"Only publishers may publish","只有发布人可以发布"}.
-{"Only service administrators are allowed to send service messages","只有服务管理员可以发送服务消息"}.
+{"Only service administrators are allowed to send service messages","只有服务管理员才允许发送服务消息"}.
 {"Only those on a whitelist may associate leaf nodes with the collection","仅白名单用户可以将叶节点与集合关联"}.
 {"Only those on a whitelist may subscribe and retrieve items","仅白名单用户可以订阅和检索内容项"}.
 {"Organization Name","组织名称"}.
 {"Organization Unit","组织单位"}.
 {"Other Modules Available:","其他可用模块："}.
 {"Outgoing s2s Connections","出站 s2s 连接"}.
-{"Outgoing s2s Connections:","出站 s2s 连接:"}.
-{"Owner privileges required","需要持有人权限"}.
+{"Outgoing s2s Connections:","出站 s2s 连接："}.
+{"Owner privileges required","需要所有者权限"}.
 {"Packet relay is denied by service policy","包中继被服务策略拒绝"}.
 {"Packet","数据包"}.
 {"Participant ID","参与者 ID"}.
-{"Participant","参与人"}.
-{"Password Verification:","密码确认:"}.
+{"Participant","参与者"}.
+{"Password Verification:","密码确认："}.
 {"Password Verification","确认密码"}.
 {"Password","密码"}.
-{"Password:","密码:"}.
+{"Password:","密码："}.
 {"Path to Dir","目录的路径"}.
 {"Path to File","文件路径"}.
+{"Payload semantic type information","有效载荷语义类型信息"}.
 {"Pending","挂起"}.
-{"Period: ","持续时间: "}.
+{"Period: ","持续时间： "}.
 {"Persist items to storage","持久化内容条目"}.
-{"Persistent","永久"}.
+{"Persistent","持久"}.
 {"Ping query is incorrect","Ping 查询不正确"}.
 {"Ping","Ping"}.
-{"Please note that these options will only backup the builtin Mnesia database. If you are using the ODBC module, you also need to backup your SQL database separately.","注意：这些选项仅将备份内置的 Mnesia 数据库. 如果您正在使用 ODBC 模块, 您还需要分别备份您的数据库."}.
-{"Please, wait for a while before sending new voice request","请稍后再发送新的声音请求"}.
+{"Please note that these options will only backup the builtin Mnesia database. If you are using the ODBC module, you also need to backup your SQL database separately.","注意：这些选项仅将备份内置的 Mnesia 数据库。如果您正在使用 ODBC 模块，您还需要分别备份您的数据库。"}.
+{"Please, wait for a while before sending new voice request","请稍候，然后再发送新的发言请求"}.
 {"Pong","Pong"}.
 {"Possessing 'ask' attribute is not allowed by RFC6121","按照 RFC6121， 不允许处理 'ask' 属性"}.
-{"Present real Jabber IDs to","将真实Jabber ID显示给"}.
+{"Present real Jabber IDs to","将真实 Jabber ID 显示给"}.
 {"Previous session not found","上一个会话未找到"}.
-{"Previous session PID has been killed","上一个会话的PID已被杀掉"}.
-{"Previous session PID has exited","上一个会话的PID已退出"}.
-{"Previous session PID is dead","上一个会话的PID已死"}.
+{"Previous session PID has been killed","上一个会话的 PID 已被杀掉"}.
+{"Previous session PID has exited","上一个会话的 PID 已退出"}.
+{"Previous session PID is dead","上一个会话的 PID 已死"}.
 {"Previous session timed out","上一个会话已超时"}.
-{"private, ","保密, "}.
+{"private, ","保密， "}.
 {"Public","公开"}.
 {"Publish model","发布模型"}.
 {"Publish-Subscribe","发布-订阅"}.
-{"PubSub subscriber request","PubSub订阅人请求"}.
+{"PubSub subscriber request","PubSub 订阅者请求"}.
 {"Purge all items when the relevant publisher goes offline","相关发布人离线后清除所有选项"}.
 {"Push record not found","没有找到推送记录"}.
-{"Queries to the conference members are not allowed in this room","本房间不可以查询会议成员信息"}.
+{"Queries to the conference members are not allowed in this room","不允许在此群聊中查询群聊成员"}.
 {"Query to another users is forbidden","禁止查询其他用户"}.
 {"RAM and disc copy","内存与磁盘复制"}.
 {"RAM copy","内存(RAM)复制"}.
@@ -425,9 +428,9 @@
 {"Receive notification of new items only","仅接收新内容项的通知"}.
 {"Receive notification of new nodes only","仅接收新节点的通知"}.
 {"Recipient is not in the conference room","接收人不在会议室"}.
-{"Register an XMPP account","注册XMPP帐户"}.
+{"Register an XMPP account","注册 XMPP 账号"}.
 {"Registered Users","注册用户"}.
-{"Registered Users:","注册用户:"}.
+{"Registered Users:","注册用户："}.
 {"Register","注册"}.
 {"Remote copy","远程复制"}.
 {"Remove a hat from a user","移除用户头衔"}.
@@ -442,26 +445,26 @@
 {"Restart Service","重启服务"}.
 {"Restart","重启"}.
 {"Restore Backup from File at ","从以下位置的文件恢复备份 "}.
-{"Restore binary backup after next ejabberd restart (requires less memory):","在下次 ejabberd 重启后恢复二进制备份(需要的内存更少):"}.
-{"Restore binary backup immediately:","立即恢复二进制备份:"}.
-{"Restore plain text backup immediately:","立即恢复普通文本备份:"}.
+{"Restore binary backup after next ejabberd restart (requires less memory):","在下次 ejabberd 重启后恢复二进制备份(需要的内存更少)："}.
+{"Restore binary backup immediately:","立即恢复二进制备份："}.
+{"Restore plain text backup immediately:","立即恢复普通文本备份："}.
 {"Restore","恢复"}.
-{"Roles and Affiliations that May Retrieve Member List","可能会检索成员列表的角色和从属关系"}.
+{"Roles and Affiliations that May Retrieve Member List","可以检索成员列表的角色和从属关系"}.
 {"Roles for which Presence is Broadcasted","被广播状态的角色"}.
-{"Roles that May Send Private Messages","可以发送私聊消息的角色"}.
+{"Roles that May Send Private Messages","可以发送私信的角色"}.
 {"Room Configuration","房间配置"}.
 {"Room creation is denied by service policy","创建房间被服务策略拒绝"}.
 {"Room description","房间描述"}.
-{"Room Occupants","房间人数"}.
+{"Room Occupants","房间占用者"}.
 {"Room terminates","房间终止"}.
 {"Room title","房间标题"}.
 {"Roster groups allowed to subscribe","允许订阅的花名册组"}.
 {"Roster of ~ts","~ts的花名册"}.
 {"Roster size","花名册大小"}.
-{"Roster:","花名册:"}.
+{"Roster:","花名册："}.
 {"RPC Call Error","RPC 调用错误"}.
 {"Running Nodes","运行中的节点"}.
-{"~s invites you to the room ~s","~s邀请你到房间~s"}.
+{"~s invites you to the room ~s","~s 邀请您到房间 ~s"}.
 {"Saturday","星期六"}.
 {"Script check","脚本检查"}.
 {"Search from the date","从日期搜索"}.
@@ -475,7 +478,7 @@
 {"Send announcement to all users on all hosts","发送通知给所有主机上的所有用户"}.
 {"Send announcement to all users","发送通知给所有用户"}.
 {"September","九月"}.
-{"Server:","服务器:"}.
+{"Server:","服务器："}.
 {"Service list retrieval timed out","服务列表检索超时"}.
 {"Session state copying timed out","会话状态复制超时"}.
 {"Set message of the day and send to online users","设定每日消息并发送给所有在线用户"}.
@@ -485,28 +488,29 @@
 {"Show Ordinary Table","显示普通列表"}.
 {"Shut Down Service","关闭服务"}.
 {"SOCKS5 Bytestreams","SOCKS5 字节流"}.
-{"Some XMPP clients can store your password in the computer, but you should do this only in your personal computer for safety reasons.","某些 XMPP 客户端可以在计算机里存储你的密码. 处于安全考虑, 请仅在你的个人计算机里使用该功能."}.
+{"Some XMPP clients can store your password in the computer, but you should do this only in your personal computer for safety reasons.","某些 XMPP 客户端可以将您的密码存储在计算机中，但出于安全原因，您应该仅在个人计算机中这样做。"}.
 {"Sources Specs:","源参数："}.
 {"Specify the access model","指定访问范例"}.
 {"Specify the event message type","指定事件消息类型"}.
 {"Specify the publisher model","指定发布人范例"}.
-{"Stanza ID","节ID"}.
+{"Stanza id is not valid","节 id 无效"}.
+{"Stanza ID","节 ID"}.
 {"Statically specify a replyto of the node owner(s)","静态指定节点所有者的回复"}.
 {"Statistics of ~p","~p的统计"}.
 {"Statistics","统计"}.
 {"Stopped Nodes","已经停止的节点"}.
 {"Stop","停止"}.
 {"Storage Type","存储类型"}.
-{"Store binary backup:","存储为二进制备份:"}.
-{"Store plain text backup:","存储为普通文本备份:"}.
+{"Store binary backup:","存储为二进制备份："}.
+{"Store plain text backup:","存储为普通文本备份："}.
 {"Stream management is already enabled","流管理已启用"}.
 {"Stream management is not enabled","流管理未启用"}.
 {"Subject","标题"}.
 {"Submitted","已提交"}.
 {"Submit","提交"}.
-{"Subscriber Address","订阅人地址"}.
-{"Subscribers may publish","订阅人可以发布"}.
-{"Subscription requests must be approved and only subscribers may retrieve items","订阅请求必须得到批准, 只有订阅人才能检索项目"}.
+{"Subscriber Address","订阅者地址"}.
+{"Subscribers may publish","订阅者可以发布"}.
+{"Subscription requests must be approved and only subscribers may retrieve items","订阅请求必须得到批准，只有订阅者才能检索项目"}.
 {"Subscriptions are not allowed","不允许订阅"}.
 {"Subscription","订阅"}.
 {"Sunday","星期天"}.
@@ -514,92 +518,93 @@
 {"Text associated with a sound","与声音相关的文字"}.
 {"Text associated with a video","与视频相关的文字"}.
 {"Text associated with speech","与语音相关的文字"}.
-{"That nickname is already in use by another occupant","该昵称已被另一用户使用"}.
-{"That nickname is registered by another person","该昵称已被另一个人注册了"}.
-{"The account already exists","帐户已存在"}.
-{"The account was not unregistered","帐户未注册"}.
+{"That nickname is already in use by another occupant","该昵称已被另一占用者使用了"}.
+{"That nickname is registered by another person","该昵称已被另一用户注册了"}.
+{"The account already exists","此账号已存在"}.
+{"The account was not unregistered","此账号未注销"}.
 {"The body text of the last received message","最后收到的消息的正文"}.
-{"The CAPTCHA is valid.","验证码有效."}.
+{"The CAPTCHA is valid.","验证码有效。"}.
 {"The CAPTCHA verification has failed","验证码检查失败"}.
 {"The captcha you entered is wrong","您输入的验证码有误"}.
-{"The child nodes (leaf or collection) associated with a collection","关联集合的字节点 (叶子或集合)"}.
+{"The child nodes (leaf or collection) associated with a collection","关联集合的字节点(叶子或集合)"}.
 {"The collections with which a node is affiliated","加入结点的集合"}.
 {"The DateTime at which a leased subscription will end or has ended","租赁订阅将结束或已结束的日期时间"}.
 {"The datetime when the node was created","节点创建的日期时间"}.
 {"The default language of the node","该节点的默认语言"}.
 {"The feature requested is not supported by the conference","会议不支持所请求的特征"}.
-{"The JID of the node creator","节点创建人的JID"}.
-{"The JIDs of those to contact with questions","问题联系人的JID"}.
-{"The JIDs of those with an affiliation of owner","隶属所有人的JID"}.
-{"The JIDs of those with an affiliation of publisher","隶属发布人的JID"}.
+{"The JID of the node creator","节点创建人的 JID"}.
+{"The JIDs of those to contact with questions","问题联系人的 JID"}.
+{"The JIDs of those with an affiliation of owner","拥有所有者从属关系的用户的 JID"}.
+{"The JIDs of those with an affiliation of publisher","隶属发布人的 JID"}.
 {"The list of all online users","所有在线用户列表"}.
 {"The list of all users","所有用户列表"}.
-{"The list of JIDs that may associate leaf nodes with a collection","可以将叶节点与集合关联的JID列表"}.
+{"The list of JIDs that may associate leaf nodes with a collection","可以将叶节点与集合关联的 JID 列表"}.
 {"The maximum number of child nodes that can be associated with a collection, or `max` for no specific limit other than a server imposed maximum","可以与集合相关联的最大子节点数，“max”表示除服务器施加的最大值外没有特定限制"}.
 {"The minimum number of milliseconds between sending any two notification digests","发送任何两个通知摘要之间的最小毫秒数"}.
 {"The name of the node","该节点的名称"}.
 {"The node is a collection node","该节点是集合节点"}.
-{"The node is a leaf node (default)","该节点是叶子节点 (默认)"}.
-{"The NodeID of the relevant node","相关节点的NodeID"}.
+{"The node is a leaf node (default)","该节点是叶子节点(默认)"}.
+{"The NodeID of the relevant node","相关节点的 NodeID"}.
 {"The number of pending incoming presence subscription requests","待处理的传入状态订阅请求数"}.
 {"The number of subscribers to the node","该节点的订阅用户数"}.
 {"The number of unread or undelivered messages","未读或未发送的消息数"}.
 {"The password contains unacceptable characters","密码包含不可接受的字符"}.
 {"The password is too weak","密码强度太弱"}.
 {"the password is","密码是"}.
-{"The password of your XMPP account was successfully changed.","你的XMPP帐户密码更新成功."}.
+{"The password of your XMPP account was successfully changed.","您的 XMPP 账号密码已成功更改。"}.
 {"The password was not changed","密码未更新"}.
 {"The passwords are different","密码不一致"}.
 {"The presence states for which an entity wants to receive notifications","实体要为其接收通知的状态"}.
 {"The query is only allowed from local users","仅本地用户可以查询"}.
 {"The query must not contain <item/> elements","查询不能包含 <item/> 元素"}.
-{"The room subject can be modified by participants","房间主题可以被参与者修改"}.
+{"The room subject can be modified by participants","房间主题可由参与者修改"}.
+{"The semantic type information of data in the node, usually specified by the namespace of the payload (if any)","节点中数据的语义类型信息，通常由有效负载的命名空间指定(如果有)"}.
 {"The sender of the last received message","最后收到的消息的发送者"}.
 {"The stanza MUST contain only one <active/> element, one <default/> element, or one <list/> element","本节必须只含一个 <active/> 元素， <default/> 元素，或 <list/> 元素"}.
 {"The subscription identifier associated with the subscription request","与订阅请求关联的订阅标识符"}.
-{"The URL of an XSL transformation which can be applied to payloads in order to generate an appropriate message body element.","XSL转换的URL，可以将其应用于有效负载以生成适当的消息正文元素。"}.
-{"The URL of an XSL transformation which can be applied to the payload format in order to generate a valid Data Forms result that the client could display using a generic Data Forms rendering engine","XSL转换的URL, 可以将其应用于有效负载格式, 以生成有效的数据表单结果, 客户端可以使用通用数据表单呈现引擎来显示该结果"}.
-{"There was an error changing the password: ","修改密码出错: "}.
-{"There was an error creating the account: ","帐户创建出错: "}.
-{"There was an error deleting the account: ","帐户删除失败: "}.
-{"This is case insensitive: macbeth is the same that MacBeth and Macbeth.","此处不区分大小写: macbeth 与 MacBeth 和 Macbeth 是一样的."}.
-{"This page allows to register an XMPP account in this XMPP server. Your JID (Jabber ID) will be of the form: username@server. Please read carefully the instructions to fill correctly the fields.","本页面允许在此服务器上注册XMPP帐户. 你的JID (Jabber ID) 的形式如下: 用户名@服务器. 请仔细阅读说明并正确填写相应字段."}.
-{"This page allows to unregister an XMPP account in this XMPP server.","此页面允许在此 XMPP 服务器上注销 XMPP 帐户。"}.
+{"The URL of an XSL transformation which can be applied to payloads in order to generate an appropriate message body element.","XSL 转换的 URL，可以将其应用于有效负载以生成适当的消息正文元素。"}.
+{"The URL of an XSL transformation which can be applied to the payload format in order to generate a valid Data Forms result that the client could display using a generic Data Forms rendering engine","XSL 转换的 URL，可以将其应用于有效负载格式，以生成有效的数据表单结果，客户端可以使用通用数据表单呈现引擎来显示该结果"}.
+{"There was an error changing the password: ","修改密码出错： "}.
+{"There was an error creating the account: ","创建账号时出错： "}.
+{"There was an error deleting the account: ","删除账号时出错： "}.
+{"This is case insensitive: macbeth is the same that MacBeth and Macbeth.","此处不区分大小写：macbeth 与 MacBeth 和 Macbeth 是一样的。"}.
+{"This page allows to register an XMPP account in this XMPP server. Your JID (Jabber ID) will be of the form: username@server. Please read carefully the instructions to fill correctly the fields.","本页面允许在此服务器上注册 XMPP 账号。您的 JID (Jabber ID) 的形式如下：username@server。请仔细阅读说明以正确填写字段。"}.
+{"This page allows to unregister an XMPP account in this XMPP server.","此页面允许在此 XMPP 服务器上注销 XMPP 账号。"}.
 {"This room is not anonymous","此房间不是匿名房间"}.
-{"This service can not process the address: ~s","此服务无法处理地址: ~s"}.
+{"This service can not process the address: ~s","此服务无法处理地址：~s"}.
 {"Thursday","星期四"}.
 {"Time delay","时间延迟"}.
 {"Timed out waiting for stream resumption","等待流恢复超时"}.
 {"Time","时间"}.
 {"To register, visit ~s","要注册，请访问 ~s"}.
 {"To ~ts","发送到~ts"}.
-{"Token TTL","TTL令牌"}.
+{"Token TTL","TTL 令牌"}.
 {"Too many active bytestreams","活跃的字节流太多"}.
 {"Too many CAPTCHA requests","验证码请求太多"}.
 {"Too many child elements","太多子元素"}.
 {"Too many <item/> elements","太多 <item/> 元素"}.
 {"Too many <list/> elements","太多 <list/> 元素"}.
-{"Too many (~p) failed authentications from this IP address (~s). The address will be unblocked at ~s UTC","来自IP地址(~p)的(~s)失败认证太多。将在UTC时间 ~s 解除对该地址的封锁"}.
+{"Too many (~p) failed authentications from this IP address (~s). The address will be unblocked at ~s UTC","来自 IP 地址(~p)的(~s)失败认证太多。将在 UTC 时间 ~s 解除对该地址的封锁"}.
 {"Too many receiver fields were specified","指定的接收者字段太多"}.
 {"Too many unacked stanzas","未被确认的节太多"}.
 {"Too many users in this conference","该会议的用户太多"}.
 {"Total rooms","所有房间"}.
 {"To","到"}.
 {"Traffic rate limit is exceeded","已经超过传输率限制"}.
-{"Transactions Aborted:","取消的事务:"}.
-{"Transactions Committed:","提交的事务:"}.
-{"Transactions Logged:","记入日志的事务:"}.
-{"Transactions Restarted:","重启的事务:"}.
+{"Transactions Aborted:","取消的事务："}.
+{"Transactions Committed:","提交的事务："}.
+{"Transactions Logged:","记入日志的事务："}.
+{"Transactions Restarted:","重启的事务："}.
 {"~ts's Offline Messages Queue","~ts的离线消息队列"}.
 {"Tuesday","星期二"}.
 {"Unable to generate a CAPTCHA","无法生成验证码"}.
 {"Unable to register route on existing local domain","在已存在的本地域上无法注册路由"}.
 {"Unauthorized","未认证的"}.
 {"Unexpected action","意外行为"}.
-{"Unexpected error condition: ~p","意外错误条件: ~p"}.
+{"Unexpected error condition: ~p","意外错误条件：~p"}.
 {"Uninstall","卸载"}.
-{"Unregister an XMPP account","注销XMPP帐户"}.
-{"Unregister","取消注册"}.
+{"Unregister an XMPP account","注销 XMPP 账号"}.
+{"Unregister","注销"}.
 {"Unselect All","取消全选"}.
 {"Unsupported <index/> element","不支持的 <index/> 元素"}.
 {"Unsupported version","不支持的版本"}.
@@ -612,18 +617,18 @@
 {"Update Specs","更新参数"}.
 {"Update","更新"}.
 {"Upgrade","升级"}.
-{"Uptime:","正常运行时间:"}.
-{"URL for Archived Discussion Logs","已归档对话日志的URL"}.
+{"Uptime:","正常运行时间："}.
+{"URL for Archived Discussion Logs","已存档对话日志的 URL"}.
 {"User already exists","用户已存在"}.
 {"User (jid)","用户 (jid)"}.
-{"User JID","用户JID"}.
+{"User JID","用户 JID"}.
 {"User Management","用户管理"}.
 {"User removed","用户已移除"}.
 {"User session not found","用户会话未找到"}.
 {"User session terminated","用户会话已终止"}.
 {"User ~ts","用户~ts"}.
-{"Username:","用户名:"}.
-{"Users are not allowed to register accounts so quickly","不允许用户太频繁地注册帐户"}.
+{"Username:","用户名："}.
+{"Users are not allowed to register accounts so quickly","不允许用户太频繁地注册账号"}.
 {"Users Last Activity","用户上次活动"}.
 {"Users","用户"}.
 {"User","用户"}.
@@ -633,50 +638,52 @@
 {"Value of '~s' should be datetime string","'~s' 的值应为日期时间字符串"}.
 {"Value of '~s' should be integer","'~s' 的值应为整数"}.
 {"Value 'set' of 'type' attribute is not allowed","不允许 'type' 属性的 'set' 值"}.
-{"vCard User Search","vCard用户搜索"}.
+{"vCard User Search","vCard 用户搜索"}.
 {"View joined MIX channels","查看已加入的 MIX 频道"}.
 {"View Queue","查看队列"}.
 {"View Roster","查看花名册"}.
 {"Virtual Hosts","虚拟主机"}.
-{"Visitors are not allowed to change their nicknames in this room","此房间不允许用户更改昵称"}.
-{"Visitors are not allowed to send messages to all occupants","不允许访客给所有占有者发送消息"}.
+{"Visitors are not allowed to change their nicknames in this room","访客不允许在此房间更改其昵称"}.
+{"Visitors are not allowed to send messages to all occupants","访客不允许向所有占用者发送信息"}.
 {"Visitor","访客"}.
-{"Voice requests are disabled in this conference","该会议的声音请求已被禁用"}.
-{"Voice request","声音请求"}.
+{"Voice requests are disabled in this conference","此群聊中禁用发言请求"}.
+{"Voice request","发言请求"}.
 {"Wednesday","星期三"}.
 {"When a new subscription is processed and whenever a subscriber comes online","当新的订阅被处理和当订阅者上线"}.
 {"When a new subscription is processed","当新的订阅被处理"}.
 {"When to send the last published item","何时发送最新发布的内容条目"}.
-{"Whether an entity wants to receive an XMPP message body in addition to the payload format","除有效载荷格式外，实体是否还希望接收XMPP消息正文"}.
-{"Whether an entity wants to receive digests (aggregations) of notifications or all notifications individually","实体是否要接收通知的摘要（汇总）或单独接收所有通知"}.
+{"Whether an entity wants to receive an XMPP message body in addition to the payload format","除有效载荷格式外，实体是否还希望接收 XMPP 消息正文"}.
+{"Whether an entity wants to receive digests (aggregations) of notifications or all notifications individually","实体是否要接收通知的摘要(汇总)或单独接收所有通知"}.
 {"Whether an entity wants to receive or disable notifications","实体是否要接收或禁用通知"}.
-{"Whether owners or publisher should receive replies to items","持有人或创建人是否要接收项目回复"}.
+{"Whether owners or publisher should receive replies to items","所有者或发布者是否应收到对项目的回复"}.
 {"Whether the node is a leaf (default) or a collection","节点是叶子(默认)还是集合"}.
 {"Whether to allow subscriptions","是否允许订阅"}.
 {"Whether to make all subscriptions temporary, based on subscriber presence","是否根据订阅者的存在将所有订阅设为临时"}.
-{"Whether to notify owners about new subscribers and unsubscribes","是否将新订阅人和退订通知所有者"}.
+{"Whether to notify owners about new subscribers and unsubscribes","是否通知所有者新的订阅者和退订者"}.
+{"Who can send private messages","谁可以发送私信"}.
 {"Who may associate leaf nodes with a collection","谁可以将叶子节点与集合关联"}.
 {"Wrong parameters in the web formulary","网络配方中的参数错误"}.
 {"Wrong xmlns","错误的 xmlns"}.
-{"XMPP Account Registration","XMPP帐户注册"}.
-{"XMPP Domains","XMPP域"}.
-{"XMPP Show Value of Away","XMPP的不在显示值"}.
-{"XMPP Show Value of Chat","XMPP的聊天显示值"}.
-{"XMPP Show Value of DND (Do Not Disturb)","XMPP的DND(勿扰)显示值"}.
-{"XMPP Show Value of XA (Extended Away)","XMPP的XA (扩展不在)显示值"}.
-{"XMPP URI of Associated Publish-Subscribe Node","发布-订阅节点关联的XMPP URI"}.
-{"You are being removed from the room because of a system shutdown","因系统关机, 你正在被从房间移除"}.
+{"XMPP Account Registration","XMPP 账号注册"}.
+{"XMPP Domains","XMPP 域"}.
+{"XMPP Show Value of Away","XMPP 的离开显示值"}.
+{"XMPP Show Value of Chat","XMPP 的聊天显示值"}.
+{"XMPP Show Value of DND (Do Not Disturb)","XMPP 的 DND (勿扰)显示值"}.
+{"XMPP Show Value of XA (Extended Away)","XMPP 的 XA (延长离开)显示值"}.
+{"XMPP URI of Associated Publish-Subscribe Node","发布-订阅节点关联的 XMPP URI"}.
+{"You are being removed from the room because of a system shutdown","由于系统关闭，您将被从房间中移除"}.
+{"You are not allowed to send private messages","不允许您发送私信"}.
 {"You are not joined to the channel","您未加入频道"}.
-{"You can later change your password using an XMPP client.","你可以稍后用XMPP客户端修改你的密码."}.
+{"You can later change your password using an XMPP client.","您稍后可以使用 XMPP 客户端更改密码。"}.
 {"You have been banned from this room","您已被禁止进入该房间"}.
 {"You have joined too many conferences","您加入的会议太多"}.
-{"You must fill in field \"Nickname\" in the form","您必须填充表单中\"昵称\"项"}.
+{"You must fill in field \"Nickname\" in the form","您必须填充表单中“昵称”项"}.
 {"You need a client that supports x:data and CAPTCHA to register","您需要一个支持 x:data 和验证码的客户端进行注册"}.
 {"You need a client that supports x:data to register the nickname","您需要一个支持 x:data 的客户端来注册昵称"}.
 {"You need an x:data capable client to search","您需要一个兼容 x:data 的客户端来搜索"}.
-{"Your active privacy list has denied the routing of this stanza.","你的活跃私聊列表拒绝了在此房间进行路由分发."}.
+{"Your active privacy list has denied the routing of this stanza.","您的活动隐私列表已拒绝路由此节。"}.
 {"Your contact offline message queue is full. The message has been discarded.","您的联系人离线消息队列已满。消息已被丢弃。"}.
-{"Your subscription request and/or messages to ~s have been blocked. To unblock your subscription request, visit ~s","您发送给~s的消息已被阻止. 要解除阻止, 请访问 ~s"}.
-{"Your XMPP account was successfully registered.","你的XMPP帐户注册成功."}.
-{"Your XMPP account was successfully unregistered.","你的XMPP帐户注销成功."}.
+{"Your subscription request and/or messages to ~s have been blocked. To unblock your subscription request, visit ~s","您发送给~s的消息已被阻止。要解除阻止，请访问 ~s"}.
+{"Your XMPP account was successfully registered.","您的 XMPP 账号注册成功。"}.
+{"Your XMPP account was successfully unregistered.","您的 XMPP 账号注销成功。"}.
 {"You're not allowed to create nodes","您不可以创建节点"}.

rebar.config

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -25,20 +25,16 @@
 {deps, [{base64url, ".*", {git, "https://github.com/dvv/base64url", {tag, "1.0.1"}}},
         {cache_tab, ".*", {git, "https://github.com/processone/cache_tab", {tag, "1.0.30"}}},
         {eimp, ".*", {git, "https://github.com/processone/eimp", {tag, "1.0.22"}}},
-        {if_var_true, tools,
-         {ejabberd_po, ".*", {git, "https://github.com/processone/ejabberd-po", {branch, "main"}}}},
-        {if_var_true, elixir,
-         {elixir, ".*", {git, "https://github.com/elixir-lang/elixir", {tag, "v1.4.4"}}}},
         {if_var_true, pam,
          {epam, ".*", {git, "https://github.com/processone/epam", {tag, "1.0.14"}}}},
         {if_var_true, redis,
          {eredis, ".*", {git, "https://github.com/wooga/eredis", {tag, "v1.2.0"}}}},
         {if_var_true, sip,
-         {esip, ".*", {git, "https://github.com/processone/esip", {tag, "1.0.50"}}}},
+         {esip, ".*", {git, "https://github.com/processone/esip", {tag, "1.0.52"}}}},
         {if_var_true, zlib,
          {ezlib, ".*", {git, "https://github.com/processone/ezlib", {tag, "1.0.12"}}}},
-        {fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.1.16"}}},
-        {fast_xml, ".*", {git, "https://github.com/processone/fast_xml", {tag, "1.1.49"}}},
+        {fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.1.19"}}},
+        {fast_xml, ".*", {git, "https://github.com/processone/fast_xml", {tag, "1.1.51"}}},
         {fast_yaml, ".*", {git, "https://github.com/processone/fast_yaml", {tag, "1.0.36"}}},
         {idna, ".*", {git, "https://github.com/benoitc/erlang-idna", {tag, "6.0.0"}}},
         {if_version_above, "19",
@@ -52,36 +48,47 @@
         {if_version_below, "22",
          {lager, ".*", {git, "https://github.com/erlang-lager/lager", {tag, "3.9.1"}}}
         },
+        %% Lua, rebar, OTP 20: 1.0 git tag
         {if_var_true, lua,
          {if_not_rebar3,
-          {luerl, ".*", {git, "https://github.com/rvirding/luerl", {tag, "1.0"}}}
-         }},
+          {if_version_below, "21",
+           {luerl, ".*", {git, "https://github.com/rvirding/luerl", {tag, "1.0"}}}
+        }}},
+        %% Lua, rebar3, OTP 20: 1.0.0 hex package
         {if_var_true, lua,
          {if_rebar3,
-          {luerl, ".*", {git, "https://github.com/rvirding/luerl", {tag, "1.0.0"}}}
-         }},
-        {mqtree, ".*", {git, "https://github.com/processone/mqtree", {tag, "1.0.15"}}},
+          {if_version_below, "21",
+           {luerl, ".*", {git, "https://github.com/rvirding/luerl", {tag, "1.0.0"}}}
+        }}},
+        %% Lua, any rebar, OTP 21-26: 1.1.1 git tag / 1.1.1 hex package
+        {if_var_true, lua,
+         {if_version_above, "20", {if_version_below, "27",
+          {luerl, ".*", {git, "https://github.com/rvirding/luerl", {tag, "1.1.1"}}}
+        }}},
+        %% Lua, any rebar, OTP 27: temporary otp27 branch from fork
+        {if_var_true, lua,
+         {if_version_above, "26",
+          {luerl, ".*", {git, "https://github.com/processone/luerl", {branch, "otp27"}}}
+        }},
+        {mqtree, ".*", {git, "https://github.com/processone/mqtree", {tag, "1.0.16"}}},
         {p1_acme, ".*", {git, "https://github.com/processone/p1_acme", {tag, "1.0.22"}}},
         {if_var_true, mysql,
-         {p1_mysql, ".*", {git, "https://github.com/processone/p1_mysql", {tag, "1.0.22"}}}},
-        {p1_oauth2, ".*", {git, "https://github.com/processone/p1_oauth2", {tag, "0.6.11"}}},
+         {p1_mysql, ".*", {git, "https://github.com/processone/p1_mysql", {tag, "1.0.23"}}}},
+        {p1_oauth2, ".*", {git, "https://github.com/processone/p1_oauth2", {tag, "0.6.14"}}},
         {if_var_true, pgsql,
-         {p1_pgsql, ".*", {git, "https://github.com/processone/p1_pgsql", {tag, "1.1.23"}}}},
+         {p1_pgsql, ".*", {git, "https://github.com/processone/p1_pgsql", {tag, "1.1.25"}}}},
         {p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.25"}}},
         {pkix, ".*", {git, "https://github.com/processone/pkix", {tag, "1.0.9"}}},
-        {if_not_rebar3, %% Needed because modules are not fully migrated to new structure and mix
-         {if_var_true, elixir,
-          {rebar_elixir_plugin, ".*", {git, "https://github.com/processone/rebar_elixir_plugin", "0.1.0"}}}},
         {if_var_true, sqlite,
          {sqlite3, ".*", {git, "https://github.com/processone/erlang-sqlite3", {tag, "1.1.14"}}}},
         {stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.29"}}},
         {if_var_true, stun,
-         {stun, ".*", {git, "https://github.com/processone/stun", {tag, "1.2.10"}}}},
-        {xmpp, ".*", {git, "https://github.com/processone/xmpp", {tag, "1.7.0"}}},
+         {stun, ".*", {git, "https://github.com/processone/stun", {tag, "1.2.12"}}}},
+        {xmpp, ".*", {git, "https://github.com/processone/xmpp", {tag, "1.8.1"}}},
         {yconf, ".*", {git, "https://github.com/processone/yconf", {tag, "1.0.15"}}}
        ]}.
 
-{gitonly_deps, [elixir]}.
+{gitonly_deps, [ejabberd_po]}.
 
 {if_var_true, latest_deps,
  {floating_deps, [cache_tab,
@@ -136,6 +143,7 @@
             {if_version_below, "23", {d, 'USE_OLD_PG2'}},
             {if_version_below, "24", {d, 'COMPILER_REPORTS_ONLY_LINES'}},
             {if_version_below, "24", {d, 'SYSTOOLS_APP_DEF_WITHOUT_OPTIONAL'}},
+            {if_version_below, "24", {d, 'OTP_BELOW_24'}},
             {if_version_below, "25", {d, 'OTP_BELOW_25'}},
             {if_var_false, debug, no_debug_info},
             {if_var_true, debug, debug_info},
@@ -146,23 +154,26 @@
             {if_var_true, stun, {d, 'STUN'}},
             {src_dirs, [src,
                         {if_rebar3, sql},
-                        {if_var_true, tools, tools},
-                        {if_var_true, elixir, include}]}]}.
+                        {if_var_true, tools, tools}]}]}.
 
-{if_rebar3, {plugins, [rebar3_hex, {provider_asn1, "0.2.0"}]}}.
+{if_rebar3, {plugins, [rebar3_hex, {provider_asn1, "0.2.0"},
+                       %% Protocol consolidation doesn't work correctly in upstream rebar_mix, see
+                       %% https://github.com/Supersonido/rebar_mix/issues/27#issuecomment-894873335
+                       %% Let's use this fixed rebar_mix fork, see its PR:
+                       %% https://github.com/Supersonido/rebar_mix/pull/31
+                       {if_var_true, elixir, {rebar_mix, ".*",
+                                              {git, "https://github.com/bsanyi/rebar_mix.git",
+                                               {branch, "consolidation_fix"}}}
+                       }]}}.
 {if_rebar3, {project_plugins, [configure_deps]}}.
 {if_not_rebar3, {plugins, [
-                           deps_erl_opts, override_deps_versions2, override_opts, configure_deps,
-                           {if_var_true, elixir, rebar_elixir_compiler},
-                           {if_var_true, elixir, rebar_exunit}
+                           deps_erl_opts, override_deps_versions2, override_opts, configure_deps
                           ]}}.
 
 {if_rebar3, {if_var_true, elixir,
-              {project_app_dirs, [".", "elixir/lib"]}}}.
-{if_not_rebar3, {if_var_true, elixir,
-              {lib_dirs, ["deps/elixir/lib"]}}}.
-{if_var_true, elixir,
-              {src_dirs, ["include"]}}.
+    {provider_hooks, [
+      {post, [{compile, {mix, consolidate_protocols}}]}
+    ]}}}.
 
 {sub_dirs, ["rel"]}.
 
@@ -198,7 +209,8 @@
                    {if_var_false, sqlite, "(\"sqlite3\":_/_)"},
                    {if_var_false, zlib, "(\"ezlib\":_/_)"}]}.
 
-{xref_ignores, [{eldap_filter_yecc, return_error, 2} ]}.
+{xref_ignores, [{eldap_filter_yecc, return_error, 2},
+                {http_uri, encode, 1}]}.
 
 {eunit_compile_opts, [{i, "tools"},
                       {i, "include"}]}.
@@ -207,14 +219,31 @@
             {if_version_above, "25",
              {plt_extra_apps,
               [asn1, odbc, public_key, stdlib, syntax_tools,
-               eredis, idna, jiffy, luerl, jose,
-               cache_tab, eimp, epam, esip, ezlib, fast_tls, fast_xml, fast_yaml,
-               mqtree, p1_acme, p1_mysql, p1_oauth2, p1_pgsql, p1_utils, pkix,
-               sqlite3, stringprep, stun, xmpp, yconf]},
+               idna, jiffy, jose,
+               cache_tab, eimp, fast_tls, fast_xml, fast_yaml,
+               mqtree, p1_acme, p1_oauth2, p1_utils, pkix,
+               stringprep, xmpp, yconf,
+               {if_var_true, pam, epam},
+               {if_var_true, redis, eredis},
+               {if_var_true, sip, esip},
+               {if_var_true, zlib, ezlib},
+               {if_var_true, lua, luerl},
+               {if_var_true, mysql, p1_mysql},
+               {if_var_true, pgsql, p1_pgsql},
+               {if_var_true, stun, stun},
+               {if_var_true, sqlite, sqlite3}]},
              {plt_extra_apps, % For Erlang/OTP 25 and older
-              [cache_tab, eimp, epam, esip, ezlib, fast_tls, fast_xml, fast_yaml,
-               mqtree, p1_acme, p1_mysql, p1_oauth2, p1_pgsql, p1_utils, pkix,
-               sqlite3, stringprep, stun, xmpp, yconf]}
+              [cache_tab, eimp, fast_tls, fast_xml, fast_yaml,
+               mqtree, p1_acme, p1_oauth2, p1_utils, pkix, stringprep, xmpp, yconf,
+               {if_var_true, pam, epam},
+               {if_var_true, redis, eredis},
+               {if_var_true, sip, esip},
+               {if_var_true, zlib, ezlib},
+               {if_var_true, lua, luerl},
+               {if_var_true, mysql, p1_mysql},
+               {if_var_true, pgsql, p1_pgsql},
+               {if_var_true, stun, stun},
+               {if_var_true, sqlite, sqlite3}]}
             } ]}.
 
 {ct_opts, [{keep_logs, 20}]}.
@@ -238,6 +267,12 @@
                    {mkdir, "conf"},
                    {copy, "rel/files/erl", "erts-\{\{erts_vsn\}\}/bin/erl"},
                    {template, "ejabberdctl.template", "bin/ejabberdctl"},
+                   {copy, "_build/default/lib/ejabberd/ebin/Elixir.*", "lib/ejabberd-{{release_version}}/ebin/"},
+                   {copy, "{{base_dir}}/consolidated/*", "lib/ejabberd-{{release_version}}/ebin/"},
+                   {copy, "rel/overlays/iex", "releases/{{release_version}}/"},
+                   {if_var_true, elixir,
+                    {template, "rel/overlays/elixir", "releases/{{release_version}}/elixir"}
+                   },
                    {copy, "inetrc", "conf/inetrc"},
                    {copy, "tools/captcha*.sh", "lib/ejabberd-\{\{release_version\}\}/priv/bin/"},
                    {copy, "rel/files/install_upgrade.escript", "bin/install_upgrade.escript"}]}
@@ -251,7 +286,7 @@
                             {overlay, [{copy, "sql/*", "lib/ejabberd-\{\{release_version\}\}/priv/sql/"},
                                        {copy, "ejabberdctl.cfg.example", "conf/ejabberdctl.cfg"},
                                        {copy, "ejabberd.yml.example", "conf/ejabberd.yml"}]}]}]},
-            {dev, [{post_hooks, [{release, "rel/setup-dev.sh"}]},
+            {dev, [{post_hooks, [{release, "rel/setup-dev.sh rebar3"}]},
                    {relx, [{debug_info, keep},
                            {dev_mode, true},
                            {include_erts, true},
@@ -262,6 +297,7 @@
                                       {copy, "ejabberd.yml.example", "conf/ejabberd.yml.example"},
                                       {copy, "test/ejabberd_SUITE_data/ca.pem", "conf/"},
                                       {copy, "test/ejabberd_SUITE_data/cert.pem", "conf/"}]}]}]},
+            {translations, [{deps, [{ejabberd_po, ".*", {git, "https://github.com/processone/ejabberd-po", {branch, "main"}}}]}]},
             {test, [{erl_opts, [nowarn_export_all]}]}]}.
 
 {alias, [{relive, [{shell, "--apps ejabberd \

rebar.config.script

@@ -1,6 +1,6 @@
 %%%----------------------------------------------------------------------
 %%%
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -353,15 +353,11 @@ VarsApps = case file:consult(filename:join([filename:dirname(SCRIPT),"vars.confi
 
 ProcessRelx = fun(Relx, Deps) ->
     {value, {release, NameVersion, DefaultApps}, RelxTail} = lists:keytake(release, 1, Relx),
-    ProfileApps = case os:getenv("REBAR_PROFILE") of
-                  "dev" -> [observer, runtime_tools, wx, debugger];
-                      _ -> []
-              end,
     DepApps = lists:map(fun({DepName, _, _}) -> DepName;
                         ({DepName, _}) -> DepName;
                         (DepName) -> DepName
                 end, Deps),
-    [{release, NameVersion, DefaultApps ++ VarsApps ++ ProfileApps ++ DepApps} | RelxTail]
+    [{release, NameVersion, DefaultApps ++ VarsApps ++ DepApps} | RelxTail]
     end,
 
 GithubConfig = case {os:getenv("GITHUB_ACTIONS"), os:getenv("GITHUB_TOKEN")} of

rel/reltool.config.script

@@ -1,6 +1,6 @@
 %%%-------------------------------------------------------------------
 %%% @author Evgeniy Khramtsov <ekhramtsov@process-one.net>
-%%% @copyright (C) 2013-2023, Evgeniy Khramtsov
+%%% @copyright (C) 2013-2024, Evgeniy Khramtsov
 %%% @doc
 %%%
 %%% @end
@@ -53,6 +53,8 @@ OTPApps = RequiredOTPApps ++ ConfiguredOTPApps,
 
 DepApps = lists:usort(lists:flatten(GetDeps(filename:join(TopDir, "rebar.config"), GetDeps))),
 
+SysVer = erlang:system_info(otp_release),
+
 Sys = [{lib_dirs, []},
        {erts, [{mod_cond, derived}, {app_file, strip}]},
        {app_file, strip},
@@ -70,13 +72,17 @@ Sys = [{lib_dirs, []},
        {boot_rel, "ejabberd"},
        {profile, embedded},
        {incl_cond, exclude},
-       {excl_archive_filters, [".*"]}, %% Do not archive built libs
        {excl_sys_filters, ["^bin/.*", "^erts.*/bin/(dialyzer|typer)",
                            "^erts.*/(doc|info|include|lib|man|src)"]},
        {excl_app_filters, ["\.gitignore"]},
        {app, stdlib, [{incl_cond, include}]},
        {app, kernel, [{incl_cond, include}]},
        {app, ejabberd, [{incl_cond, include}, {lib_dir, ".."}]}]
+++ if SysVer < "26" ->
+          [{excl_archive_filters, [".*"]}]; %% Do not archive built libs
+      true ->
+          []
+   end
 ++ lists:map(
      fun(App) ->
              {app, App, [{incl_cond, include},

rel/setup-dev.sh

@@ -23,5 +23,14 @@ sed -i "s|#' POLL|EJABBERD_BYPASS_WARNINGS=true\n\n#' POLL|g" ejabberdctl.cfg.ex
 
 echo ""
 echo "===> Some example ways to start this ejabberd dev:"
-echo "     _build/dev/rel/ejabberd/bin/ejabberd console"
 echo "     _build/dev/rel/ejabberd/bin/ejabberdctl live"
+case "$1" in
+    "rebar3")
+        echo "     _build/dev/rel/ejabberd/bin/ejabberd console"
+        ;;
+    "mix")
+        echo "     RELEASE_NODE=ejabberd@localhost _build/dev/rel/ejabberd/bin/ejabberd start"
+        ;;
+    "*")
+        ;;
+esac

sql/lite.new.sql

@@ -1,5 +1,5 @@
 --
--- ejabberd, Copyright (C) 2002-2023   ProcessOne
+-- ejabberd, Copyright (C) 2002-2024   ProcessOne
 --
 -- This program is free software; you can redistribute it and/or
 -- modify it under the terms of the GNU General Public License as
@@ -106,6 +106,7 @@ CREATE TABLE archive (
     id INTEGER PRIMARY KEY AUTOINCREMENT,
     kind text,
     nick text,
+    origin_id text,
     created_at timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
 );
 
@@ -113,6 +114,11 @@ CREATE INDEX i_archive_sh_username_timestamp ON archive (server_host, username,
 CREATE INDEX i_archive_sh_username_peer ON archive (server_host, username, peer);
 CREATE INDEX i_archive_sh_username_bare_peer ON archive (server_host, username, bare_peer);
 CREATE INDEX i_archive_sh_timestamp ON archive (server_host, timestamp);
+CREATE INDEX i_archive_sh_username_origin_id ON archive (server_host, username, origin_id);
+
+-- To update 'archive' from ejabberd <= 23.10:
+-- ALTER TABLE archive ADD COLUMN origin_id text NOT NULL DEFAULT '';
+-- CREATE INDEX i_archive_sh_username_origin_id ON archive (server_host, username, origin_id);
 
 CREATE TABLE archive_prefs (
     username text NOT NULL,

sql/lite.sql

@@ -1,5 +1,5 @@
 --
--- ejabberd, Copyright (C) 2002-2023   ProcessOne
+-- ejabberd, Copyright (C) 2002-2024   ProcessOne
 --
 -- This program is free software; you can redistribute it and/or
 -- modify it under the terms of the GNU General Public License as
@@ -94,6 +94,7 @@ CREATE TABLE archive (
     id INTEGER PRIMARY KEY AUTOINCREMENT,
     kind text,
     nick text,
+    origin_id text,
     created_at timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
 );
 
@@ -101,6 +102,11 @@ CREATE INDEX i_username_timestamp ON archive(username, timestamp);
 CREATE INDEX i_archive_username_peer ON archive (username, peer);
 CREATE INDEX i_archive_username_bare_peer ON archive (username, bare_peer);
 CREATE INDEX i_timestamp ON archive(timestamp);
+CREATE INDEX i_archive_username_origin_id ON archive (username, origin_id);
+
+-- To update 'archive' from ejabberd <= 23.10:
+-- ALTER TABLE archive ADD COLUMN origin_id text NOT NULL DEFAULT '';
+-- CREATE INDEX i_archive_username_origin_id ON archive (username, origin_id);
 
 CREATE TABLE archive_prefs (
     username text NOT NULL PRIMARY KEY,

sql/mssql.new.sql

@@ -1,5 +1,5 @@
 --
--- ejabberd, Copyright (C) 2002-2023   ProcessOne
+-- ejabberd, Copyright (C) 2002-2024   ProcessOne
 --
 -- This program is free software; you can redistribute it and/or
 -- modify it under the terms of the GNU General Public License as
@@ -32,6 +32,7 @@ CREATE TABLE [dbo].[archive] (
         [id] [bigint] IDENTITY(1,1) NOT NULL,
         [kind] [varchar] (10) NULL,
         [nick] [varchar] (250) NULL,
+        [origin_id] [varchar] (250) NOT NULL,
         [created_at] [datetime] NOT NULL DEFAULT GETDATE(),
  CONSTRAINT [archive_PK] PRIMARY KEY CLUSTERED
 (
@@ -51,6 +52,9 @@ WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW
 CREATE INDEX [archive_sh_timestamp] ON [archive] (server_host, timestamp)
 WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON);
 
+CREATE INDEX [archive_sh_username_origin_id] ON [archive] (server_host, username, origin_id)
+WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON);
+
 CREATE TABLE [dbo].[archive_prefs] (
         [username] [varchar] (250) NOT NULL,
         [server_host] [varchar] (250) NOT NULL,

sql/mssql.sql

@@ -1,5 +1,5 @@
 --
--- ejabberd, Copyright (C) 2002-2023   ProcessOne
+-- ejabberd, Copyright (C) 2002-2024   ProcessOne
 --
 -- This program is free software; you can redistribute it and/or
 -- modify it under the terms of the GNU General Public License as
@@ -31,6 +31,7 @@ CREATE TABLE [dbo].[archive] (
         [id] [bigint] IDENTITY(1,1) NOT NULL,
         [kind] [varchar] (10) NULL,
         [nick] [varchar] (250) NULL,
+        [origin_id] [varchar] (250) NOT NULL,
         [created_at] [datetime] NOT NULL DEFAULT GETDATE(),
  CONSTRAINT [archive_PK] PRIMARY KEY CLUSTERED
 (
@@ -50,6 +51,9 @@ WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW
 CREATE INDEX [archive_timestamp] ON [archive] (timestamp)
 WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON);
 
+CREATE INDEX [archive_username_origin_id] ON [archive] (username, origin_id)
+WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON);
+
 CREATE TABLE [dbo].[archive_prefs] (
         [username] [varchar] (250) NOT NULL,
         [def] [text] NOT NULL,

sql/mysql.new.sql

@@ -1,5 +1,5 @@
 --
--- ejabberd, Copyright (C) 2002-2023   ProcessOne
+-- ejabberd, Copyright (C) 2002-2024   ProcessOne
 --
 -- This program is free software; you can redistribute it and/or
 -- modify it under the terms of the GNU General Public License as
@@ -110,6 +110,7 @@ CREATE TABLE archive (
     id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT UNIQUE,
     kind varchar(10),
     nick varchar(191),
+    origin_id varchar(191),
     created_at timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
 ) ENGINE=InnoDB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
@@ -118,6 +119,12 @@ CREATE INDEX i_archive_sh_username_timestamp USING BTREE ON archive(server_host(
 CREATE INDEX i_archive_sh_username_peer USING BTREE ON archive(server_host(191), username(191), peer(191));
 CREATE INDEX i_archive_sh_username_bare_peer USING BTREE ON archive(server_host(191), username(191), bare_peer(191));
 CREATE INDEX i_archive_sh_timestamp USING BTREE ON archive(server_host(191), timestamp);
+CREATE INDEX i_archive_sh_username_origin_id USING BTREE ON archive(server_host(191), username(191), origin_id(191));
+
+-- To update 'archive' from ejabberd <= 23.10:
+-- ALTER TABLE archive ADD COLUMN origin_id text NOT NULL DEFAULT '';
+-- ALTER TABLE archive ALTER COLUMN origin_id DROP DEFAULT;
+-- CREATE INDEX i_archive_sh_username_origin_id USING BTREE ON archive(server_host(191), username(191), origin_id(191));
 
 CREATE TABLE archive_prefs (
     username varchar(191) NOT NULL,

sql/mysql.sql

@@ -1,5 +1,5 @@
 --
--- ejabberd, Copyright (C) 2002-2023   ProcessOne
+-- ejabberd, Copyright (C) 2002-2024   ProcessOne
 --
 -- This program is free software; you can redistribute it and/or
 -- modify it under the terms of the GNU General Public License as
@@ -98,6 +98,7 @@ CREATE TABLE archive (
     id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT UNIQUE,
     kind varchar(10),
     nick varchar(191),
+    origin_id varchar(191),
     created_at timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
 ) ENGINE=InnoDB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
@@ -106,6 +107,12 @@ CREATE INDEX i_username_timestamp USING BTREE ON archive(username(191), timestam
 CREATE INDEX i_username_peer USING BTREE ON archive(username(191), peer(191));
 CREATE INDEX i_username_bare_peer USING BTREE ON archive(username(191), bare_peer(191));
 CREATE INDEX i_timestamp USING BTREE ON archive(timestamp);
+CREATE INDEX i_archive_username_origin_id USING BTREE ON archive(username(191), origin_id(191));
+
+-- To update 'archive' from ejabberd <= 23.10:
+-- ALTER TABLE archive ADD COLUMN origin_id text NOT NULL DEFAULT '';
+-- ALTER TABLE archive ALTER COLUMN origin_id DROP DEFAULT;
+-- CREATE INDEX i_archive_username_origin_id USING BTREE ON archive(username(191), origin_id(191));
 
 CREATE TABLE archive_prefs (
     username varchar(191) NOT NULL PRIMARY KEY,

sql/pg.new.sql

@@ -1,5 +1,5 @@
 --
--- ejabberd, Copyright (C) 2002-2023   ProcessOne
+-- ejabberd, Copyright (C) 2002-2024   ProcessOne
 --
 -- This program is free software; you can redistribute it and/or
 -- modify it under the terms of the GNU General Public License as
@@ -261,6 +261,7 @@ CREATE TABLE archive (
     id BIGSERIAL,
     kind text,
     nick text,
+    origin_id text,
     created_at TIMESTAMP NOT NULL DEFAULT now()
 );
 
@@ -268,6 +269,12 @@ CREATE INDEX i_archive_sh_username_timestamp ON archive USING btree (server_host
 CREATE INDEX i_archive_sh_username_peer ON archive USING btree (server_host, username, peer);
 CREATE INDEX i_archive_sh_username_bare_peer ON archive USING btree (server_host, username, bare_peer);
 CREATE INDEX i_archive_sh_timestamp ON archive USING btree (server_host, timestamp);
+CREATE INDEX i_archive_sh_username_origin_id ON archive USING btree (server_host, username, origin_id);
+
+-- To update 'archive' from ejabberd <= 23.10:
+-- ALTER TABLE archive ADD COLUMN origin_id text NOT NULL DEFAULT '';
+-- ALTER TABLE archive ALTER COLUMN origin_id DROP DEFAULT;
+-- CREATE INDEX i_archive_sh_username_origin_id ON archive USING btree (server_host, username, origin_id);
 
 CREATE TABLE archive_prefs (
     username text NOT NULL,

sql/pg.sql

@@ -1,5 +1,5 @@
 --
--- ejabberd, Copyright (C) 2002-2023   ProcessOne
+-- ejabberd, Copyright (C) 2002-2024   ProcessOne
 --
 -- This program is free software; you can redistribute it and/or
 -- modify it under the terms of the GNU General Public License as
@@ -98,6 +98,7 @@ CREATE TABLE archive (
     id BIGSERIAL,
     kind text,
     nick text,
+    origin_id text,
     created_at TIMESTAMP NOT NULL DEFAULT now()
 );
 
@@ -105,6 +106,12 @@ CREATE INDEX i_username_timestamp ON archive USING btree (username, timestamp);
 CREATE INDEX i_username_peer ON archive USING btree (username, peer);
 CREATE INDEX i_username_bare_peer ON archive USING btree (username, bare_peer);
 CREATE INDEX i_timestamp ON archive USING btree (timestamp);
+CREATE INDEX i_archive_username_origin_id ON archive USING btree (username, origin_id);
+
+-- To update 'archive' from ejabberd <= 23.10:
+-- ALTER TABLE archive ADD COLUMN origin_id text NOT NULL DEFAULT '';
+-- ALTER TABLE archive ALTER COLUMN origin_id DROP DEFAULT;
+-- CREATE INDEX i_archive_username_origin_id ON archive USING btree (username, origin_id);
 
 CREATE TABLE archive_prefs (
     username text NOT NULL PRIMARY KEY,

src/acl.erl

@@ -1,5 +1,5 @@
 %%%----------------------------------------------------------------------
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

src/econf.erl

@@ -3,7 +3,7 @@
 %%% Purpose : Validator for ejabberd configuration options
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

src/ejabberd.app.src.script

@@ -1,13 +1,33 @@
-Vars = case file:consult(filename:join([filename:dirname(SCRIPT), "..", "vars.config"])) of
+{Vars, ElixirApps} = case file:consult(filename:join([filename:dirname(SCRIPT), "..", "vars.config"])) of
     {ok, Terms} ->
         Backends = [mssql, mysql, odbc, pgsql, redis, sqlite],
         EBs = lists:filter(fun(Backend) -> lists:member({Backend, true}, Terms) end, Backends),
-        [lists:keyfind(description, 1, Terms),
+        Elixirs = case lists:keyfind(elixir, 1, Terms) of
+            {elixir, true} -> [elixir, iex, logger, mix];
+            _ -> []
+        end,
+
+        ProfileEnvironmentVariable = os:getenv("REBAR_PROFILE"),
+        AsProfiles = case lists:dropwhile(fun("as") -> false; (_) -> true end,
+                                               init:get_plain_arguments()) of
+                              ["as", Profiles | _] -> string:split(Profiles, ",");
+                              _ -> []
+                          end,
+        Terms2 = case lists:member("dev", [ProfileEnvironmentVariable | AsProfiles]) of
+            true -> lists:keystore(tools, 1, Terms, {tools, true});
+            false -> Terms
+        end,
+        Tools = case lists:keyfind(tools, 1, Terms2) of
+            {tools, true} -> [observer];
+            _ -> []
+        end,
+
+        {[lists:keyfind(description, 1, Terms),
          lists:keyfind(vsn, 1, Terms),
          {env, [{enabled_backends, EBs}]}
-        ];
+        ], Elixirs ++ Tools};
     _Err ->
-        []
+        {[], []}
     end,
 
 {application, ejabberd,
@@ -27,7 +47,7 @@ Vars = case file:consult(filename:join([filename:dirname(SCRIPT), "..", "vars.co
      pkix,
      stringprep,
      yconf,
-     xmpp]},
+     xmpp | ElixirApps]},
   {mod, {ejabberd_app, []}}]}.
 
 %% Local Variables:

src/ejabberd.erl

@@ -5,7 +5,7 @@
 %%% Created : 16 Nov 2002 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -39,6 +39,11 @@
 -protocol({xep, 243, '1.0'}).
 -protocol({xep, 270, '1.0'}).
 -protocol({xep, 368, '1.1.0'}).
+-protocol({xep, 386, '0.3.0', '24.02', "", ""}).
+-protocol({xep, 388, '0.4.0', '24.02', "", ""}).
+-protocol({xep, 424, '0.4.0', '24.02', "", ""}).
+-protocol({xep, 440, '0.4.0', '24.02', "", ""}).
+-protocol({xep, 474, '0.3.0', '24.02', "", ""}).
 
 -export([start/0, stop/0, halt/0, start_app/1, start_app/2,
 	 get_pid_file/0, check_apps/0, module_name/1, is_loaded/0]).
@@ -132,7 +137,7 @@ check_apps() ->
       fun() ->
 	      Apps = [ejabberd |
 		      [App || {App, _, _} <- application:which_applications(),
-			      App /= ejabberd]],
+			      App /= ejabberd, App /= hex]],
 	      ?DEBUG("Checking consistency of applications: ~ts",
 		     [misc:join_atoms(Apps, <<", ">>)]),
 	      misc:peach(

src/ejabberd_access_permissions.erl

@@ -5,7 +5,7 @@
 %%% Created :  7 Sep 2016 by Paweł Chmielowski <pawel@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

src/ejabberd_acme.erl

@@ -1,5 +1,5 @@
 %%%----------------------------------------------------------------------
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -450,11 +450,11 @@ delete_obsolete_data() ->
 %%%===================================================================
 get_commands_spec() ->
     [#ejabberd_commands{name = request_certificate, tags = [acme],
-			desc = "Requests certificates for all or the specified "
-			       "domains: all | domain1,domain2,...",
+			desc = "Requests certificates for all or some domains",
+			longdesc = "Domains can be `all`, or a list of domains separared with comma characters",
 			module = ?MODULE, function = request_certificate,
 			args_desc = ["Domains for which to acquire a certificate"],
-			args_example = ["all | domain.tld,conference.domain.tld,..."],
+			args_example = ["example.com,domain.tld,conference.domain.tld"],
 			args = [{domains, string}],
 			result = {res, restuple}},
      #ejabberd_commands{name = list_certificates, tags = [acme],

src/ejabberd_admin.erl

@@ -5,7 +5,7 @@
 %%% Created :  7 May 2006 by Mickael Remond <mremond@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -126,15 +126,19 @@ get_commands_spec() ->
 			module = ?MODULE, function = restart,
 			args = [], result = {res, rescode}},
      #ejabberd_commands{name = reopen_log, tags = [logs],
-			desc = "Reopen the log files after being renamed",
-			longdesc = "This can be useful when an external tool is "
+			desc = "Reopen maybe the log files after being renamed",
+			longdesc = "Has no effect on ejabberd main log files, "
+			"only on log files generated by some modules.\n"
+			"This can be useful when an external tool is "
 			"used for log rotation. See "
-			"https://docs.ejabberd.im/admin/guide/troubleshooting/#log-files",
+			"[Log Files](https://docs.ejabberd.im/admin/guide/troubleshooting/#log-files).",
 			policy = admin,
 			module = ?MODULE, function = reopen_log,
 			args = [], result = {res, rescode}},
      #ejabberd_commands{name = rotate_log, tags = [logs],
-			desc = "Rotate the log files",
+			desc = "Rotate maybe log file of some module",
+			longdesc = "Has no effect on ejabberd main log files, "
+			"only on log files generated by some modules.",
 			module = ?MODULE, function = rotate_log,
 			args = [], result = {res, rescode}},
      #ejabberd_commands{name = stop_kindly, tags = [server],
@@ -157,9 +161,10 @@ get_commands_spec() ->
                         result = {levelatom, atom}},
      #ejabberd_commands{name = set_loglevel, tags = [logs],
 			desc = "Set the loglevel",
+			longdesc = "Possible loglevels: `none`, `emergency`, `alert`, `critical`,
+			           `error`, `warning`, `notice`, `info`, `debug`.",
 			module = ?MODULE, function = set_loglevel,
-			args_desc = ["Desired logging level: none | emergency | alert | critical "
-				     "| error | warning | notice | info | debug"],
+			args_desc = ["Desired logging level"],
 			args_example = ["debug"],
 			args = [{loglevel, string}],
 			result = {res, rescode}},
@@ -171,7 +176,8 @@ get_commands_spec() ->
 			result_example = ["mod_configure", "mod_vcard"],
 			result = {modules, {list, {module, string}}}},
      #ejabberd_commands{name = update, tags = [server],
-			desc = "Update the given module, or use the keyword: all",
+			desc = "Update the given module",
+			longdesc = "To update all the possible modules, use `all`.",
 			module = ?MODULE, function = update,
 			args_example = ["mod_vcard"],
 			args = [{module, string}],
@@ -373,7 +379,7 @@ get_commands_spec() ->
 			result = {res, rescode}},
      #ejabberd_commands{name = set_master, tags = [cluster],
 			desc = "Set master node of the clustered Mnesia tables",
-			longdesc = "If you provide as nodename `self`, this "
+			longdesc = "If `nodename` is set to `self`, then this "
 			"node will be set as its own master.",
 			module = ?MODULE, function = set_master,
 			args_desc = ["Name of the erlang node that will be considered master of this node"],

src/ejabberd_app.erl

@@ -5,7 +5,7 @@
 %%% Created : 31 Jan 2003 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

src/ejabberd_auth.erl

@@ -5,7 +5,7 @@
 %%% Created : 23 Nov 2002 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -425,7 +425,7 @@ user_exists(User, Server) ->
 	    false
     end.
 
--spec user_exists_in_other_modules(atom(), binary(), binary()) -> boolean() | maybe.
+-spec user_exists_in_other_modules(atom(), binary(), binary()) -> boolean() | maybe_exists.
 user_exists_in_other_modules(Module, User, Server) ->
     user_exists_in_other_modules_loop(
       auth_modules(Server) -- [Module], User, Server).
@@ -439,7 +439,7 @@ user_exists_in_other_modules_loop([AuthModule | AuthModules], User, Server) ->
 	{false, _} ->
 	    user_exists_in_other_modules_loop(AuthModules, User, Server);
 	{{error, _}, _} ->
-	    maybe
+	    maybe_exists
     end.
 
 -spec which_users_exists(list({binary(), binary()})) -> list({binary(), binary()}).

src/ejabberd_auth_anonymous.erl

@@ -5,7 +5,7 @@
 %%% Created : 17 Feb 2006 by Mickael Remond <mremond@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -153,7 +153,7 @@ check_password(User, _AuthzId, Server, _Password) ->
 	 %% If user exists in other module, reject anonnymous authentication
 	 true -> false;
 	 %% If we are not sure whether the user exists in other module, reject anon auth
-	 maybe -> false;
+	 maybe_exists -> false;
 	 false -> login(User, Server)
      end}.
 

src/ejabberd_auth_external.erl

@@ -5,7 +5,7 @@
 %%% Created : 12 Dec 2004 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

src/ejabberd_auth_jwt.erl

@@ -5,7 +5,7 @@
 %%% Created : 16 Mar 2019 by Mickael Remond <mremond@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

src/ejabberd_auth_ldap.erl

@@ -5,7 +5,7 @@
 %%% Created : 12 Dec 2004 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

src/ejabberd_auth_mnesia.erl

@@ -5,7 +5,7 @@
 %%% Created : 12 Dec 2004 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

src/ejabberd_auth_pam.erl

@@ -5,7 +5,7 @@
 %%% Created : 5 Jul 2007 by Evgeniy Khramtsov <xram@jabber.ru>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

src/ejabberd_auth_sql.erl

@@ -5,7 +5,7 @@
 %%% Created : 12 Dec 2004 by Alexey Shchepin <alexey@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -34,6 +34,7 @@
 	 get_users/2, count_users/2, get_password/2,
 	 remove_user/2, store_type/1, plain_password_required/1,
 	 export/1, which_users_exists/2]).
+-export([sql_schemas/0]).
 
 -include_lib("xmpp/include/scram.hrl").
 -include("logger.hrl").
@@ -46,10 +47,10 @@
 %%% API
 %%%----------------------------------------------------------------------
 start(Host) ->
-    ejabberd_sql_schema:update_schema(Host, ?MODULE, schemas()),
+    ejabberd_sql_schema:update_schema(Host, ?MODULE, sql_schemas()),
     ok.
 
-schemas() ->
+sql_schemas() ->
     [#sql_schema{
         version = 1,
         tables =

src/ejabberd_backend_sup.erl

@@ -2,7 +2,7 @@
 %%% Created : 24 Feb 2017 by Evgeny Khramtsov <ekhramtsov@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

src/ejabberd_batch.erl

@@ -5,7 +5,7 @@
 %%% Created : 8 mar 2022 by Paweł Chmielowski <pawel@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2023  ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024  ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

src/ejabberd_bosh.erl

@@ -5,7 +5,7 @@
 %%% Created : 20 Jul 2011 by Evgeniy Khramtsov <ekhramtsov@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

src/ejabberd_c2s.erl

@@ -2,7 +2,7 @@
 %%% Created :  8 Dec 2016 by Evgeny Khramtsov <ekhramtsov@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as
@@ -40,7 +40,10 @@
 	 handle_stream_start/2, handle_stream_end/2,
 	 handle_unauthenticated_packet/2, handle_authenticated_packet/2,
 	 handle_auth_success/4, handle_auth_failure/4, handle_send/3,
-	 handle_recv/3, handle_cdata/2, handle_unbinded_packet/2]).
+	 handle_recv/3, handle_cdata/2, handle_unbinded_packet/2,
+	 inline_stream_features/1, handle_sasl2_inline/2,
+	 handle_sasl2_inline_post/3, handle_bind2_inline/2,
+	 handle_bind2_inline_post/3, sasl_options/1]).
 %% Hooks
 -export([handle_unexpected_cast/2, handle_unexpected_call/3,
 	 process_auth_result/3, reject_unauthenticated_packet/2,
@@ -212,7 +215,12 @@ open_session(#{user := U, server := S, resource := R,
 	       Pres -> get_priority_from_presence(Pres)
 	   end,
     Info = [{ip, IP}, {conn, Conn}, {auth_module, AuthModule}],
-    ejabberd_sm:open_session(SID, U, S, R, Prio, Info),
+    case State of
+	#{bind2_session_id := Tag} ->
+	    ejabberd_sm:open_session(SID, U, S, R, Prio, Info, Tag);
+	_ ->
+	    ejabberd_sm:open_session(SID, U, S, R, Prio, Info)
+    end,
     xmpp_stream_in:establish(State2).
 
 %%%===================================================================
@@ -381,6 +389,9 @@ unauthenticated_stream_features(#{lserver := LServer}) ->
 authenticated_stream_features(#{lserver := LServer}) ->
     ejabberd_hooks:run_fold(c2s_post_auth_features, LServer, [], [LServer]).
 
+inline_stream_features(#{lserver := LServer}) ->
+    ejabberd_hooks:run_fold(c2s_inline_features, LServer, {[], []}, [LServer]).
+
 sasl_mechanisms(Mechs, #{lserver := LServer, stream_encrypted := Encrypted} = State) ->
     Type = ejabberd_auth:store_type(LServer),
     Mechs1 = ejabberd_option:disable_sasl_mechanisms(LServer),
@@ -407,6 +418,12 @@ sasl_mechanisms(Mechs, #{lserver := LServer, stream_encrypted := Encrypted} = St
 	 (_) -> false
       end, Mechs -- Mechs1).
 
+sasl_options(#{lserver := LServer}) ->
+    case ejabberd_option:disable_sasl_scram_downgrade_protection(LServer) of
+	true -> [{scram_downgrade_protection, false}];
+	_ -> []
+    end.
+
 get_password_fun(_Mech, #{lserver := LServer}) ->
     fun(U) ->
 	    ejabberd_auth:get_password_with_authmodule(U, LServer)
@@ -533,6 +550,22 @@ handle_cdata(Data, #{lserver := LServer} = State) ->
     ejabberd_hooks:run_fold(c2s_handle_cdata, LServer,
 			    State, [Data]).
 
+handle_sasl2_inline(Els, #{lserver := LServer} = State) ->
+    ejabberd_hooks:run_fold(c2s_handle_sasl2_inline, LServer,
+			    {State, Els, []}, []).
+
+handle_sasl2_inline_post(Els, Results, #{lserver := LServer} = State) ->
+    ejabberd_hooks:run_fold(c2s_handle_sasl2_inline_post, LServer,
+			    State, [Els, Results]).
+
+handle_bind2_inline(Els, #{lserver := LServer} = State) ->
+    ejabberd_hooks:run_fold(c2s_handle_bind2_inline, LServer,
+			    {State, Els, []}, []).
+
+handle_bind2_inline_post(Els, Results, #{lserver := LServer} = State) ->
+    ejabberd_hooks:run_fold(c2s_handle_bind2_inline_post, LServer,
+			    State, [Els, Results]).
+
 handle_recv(El, Pkt, #{lserver := LServer} = State) ->
     ejabberd_hooks:run_fold(c2s_handle_recv, LServer, State, [El, Pkt]).
 

src/ejabberd_c2s_config.erl

@@ -6,7 +6,7 @@
 %%% Created :  2 Nov 2007 by Mickael Remond <mremond@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

src/ejabberd_captcha.erl

@@ -5,7 +5,7 @@
 %%% Created : 26 Apr 2008 by Evgeniy Khramtsov <xramtsov@gmail.com>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

src/ejabberd_cluster.erl

@@ -3,7 +3,7 @@
 %%% Created :  5 Jul 2017 by Evgeny Khramtsov <ekhramtsov@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as

src/ejabberd_cluster_mnesia.erl

@@ -5,7 +5,7 @@
 %%% Created : 7 Oct 2015 by Christophe Romain <christophe.romain@process-one.net>
 %%%
 %%%
-%%% ejabberd, Copyright (C) 2002-2023   ProcessOne
+%%% ejabberd, Copyright (C) 2002-2024   ProcessOne
 %%%
 %%% This program is free software; you can redistribute it and/or
 %%% modify it under the terms of the GNU General Public License as