Fix to correctly test if hash ref is empty

(remove leaked debug code)

.github/build/deb.sh

@@ -0,0 +1,221 @@
+#!/usr/bin/env bash
+#
+# Copyright @iliajie <ilia@webmin.dev>
+#
+# Automatically builds and updates a repo metadata.
+# Pulls latest changes from GitHub, detects release
+# version based on what's available in the repo
+#
+#                  (Debian)
+#
+# Usage:
+#
+#   # Pull and build production versions
+#   # of both Webmin and Usermin
+#      ./deb.sh
+#
+#   # Pull and build devel versions
+#   # of both Webmin and Usermin
+#      ./deb.sh --devel
+#
+#   # Pull and build production Webmin version 2.101, forcing
+#   # release version 3, displaying detailed output
+#      ./deb.sh webmin 2.101 3 --debug
+#
+#   # Pull and build production Usermin version 2.000,
+#   # automatically setting release version to minimal
+#      ./deb.sh usermin 2.000
+#
+
+# shellcheck disable=SC1091
+# Source build variables
+source ./vars.sh || exit 1
+
+# Source build init
+source ./init.sh || exit 1
+
+# Source general build functions
+source ./funcs.sh || exit 1
+
+# Build product func
+build_prod() {
+
+    # Pack with English only in devel builds
+    local english_only=0
+    if [[ "'$*'" == *"--devel"* ]]; then
+        english_only=1
+    fi
+
+    # Always return back to root directory
+    cd "$root" || exit 1
+
+    # Define root
+    local ver=""
+    local prod=$1
+    root_prod="$root/$prod"
+    root_apt="$root_prod/deb"
+
+    # Print build actual date
+    date=$(get_current_date)
+
+    # Print opening header
+    echo "************************************************************************"
+    echo "        build start date: $date                                         "
+    echo "          package format: DEB                                           "
+    echo "                 product: $prod                                         "
+    (make_prod_repos "$root_prod") &
+    spinner "  package output version:"
+
+    # Pull main project first to get the latest tag
+    cd "$root_prod" || exit 1
+    cmd="git pull $verbosity_level"
+    eval "$cmd"
+    rs1=$?
+    # Clean and try again
+    if [ "$rs1" != "0" ]; then
+        cmd="git checkout \"*\" $verbosity_level && git clean -f -d $verbosity_level && git pull $verbosity_level"
+        eval "$cmd"
+        rs1=$?
+    fi
+
+    # Descend to theme dir
+    cd "authentic-theme" || exit 1
+    cmd="git pull $verbosity_level"
+    eval "$cmd"
+    rs2=$?
+    # Clean and try again
+    if [ "$rs2" != "0" ]; then
+        cmd="git checkout \"*\" $verbosity_level && git clean -f -d $verbosity_level && git pull $verbosity_level"
+        eval "$cmd"
+        rs2=$?
+    fi
+    if [ "$rs1" != "0" ] || [ "$rs2" != "0" ]; then
+        rs=1
+    else
+        rs=0
+    fi
+
+    # Build number
+    date_version=$(get_latest_commit_date_version)
+
+    # Handle other params
+    cd "$root_prod" || exit 1
+    if [[ "'$2'" != *"--"* ]]; then
+        ver=$2
+    fi
+    if [[ "'$3'" != *"--"* ]] && [[ -n "$3" ]]; then
+        rel=$3
+        relval="-$3"
+    else
+        rel=1
+        relval=""
+    fi
+    if [ -z "$ver" ]; then
+        ver=$(get_current_repo_tag)
+    fi
+    if [[ "'$*'" == *"--devel"* ]]; then
+        ver="$ver.$date_version"
+        # Set actual product version
+        echo "${ver}" >"version"
+    fi
+    printf "$ver-$rel\n"
+    echo "************************************************************************"
+
+    echo "Pulling latest changes.."
+    # We need to pull first to get the latest tag,
+    # so here we only report an error if any
+    postcmd $rs
+    echo
+
+    echo "Pre-clean up .."
+    # Make sure directories exist
+    make_dir "$root_repos/"
+    make_dir "$root_apt/"
+    make_dir "$root_prod/newkey/deb/"
+    make_dir "$root_prod/umodules/"
+    make_dir "$root_prod/minimal/"
+    make_dir "$root_prod/tarballs/"
+
+    # Re-create legacy link
+    rm -rf "$root/webadmin"
+    ln -s "$root/webmin" "$root/webadmin"
+
+    # Purge old files
+    purge_dir "$root_prod/newkey/deb"
+    purge_dir "$root_prod/umodules"
+    purge_dir "$root_prod/minimal"
+    purge_dir "$root_prod/tarballs"
+    if [ "$prod" != "" ]; then
+        # XXXX Need to check for
+        # product name exactly
+        rm -f "$root_repos/$prod-latest"*
+    fi
+    postcmd $?
+    echo
+
+    # Descend to project dir
+    cd "$root_prod" || exit 1
+
+    if [ "$english_only" = "1" ]; then
+        echo "Cleaning languages .."
+        cmd="./bin/language-manager --mode=clean --yes $verbosity_level_with_input"
+        eval "$cmd"
+        postcmd $?
+        echo
+    else
+        # Force restore build directory
+        if [ ! -f "lang/ja" ]; then
+            echo "Restoring languages .."
+            cmd="git checkout \"*\" $verbosity_level && git clean -f -d $verbosity_level && git pull $verbosity_level"
+            eval "$cmd"
+            postcmd $?
+            echo
+        fi
+    fi
+
+    echo "Pre-building package .."
+    eval "$cmd"
+    cmd="./makedist.pl \"${ver}${relval}\" $verbosity_level"
+    eval "$cmd"
+    postcmd $?
+    echo
+
+    echo "Building package .."
+    if [ "$relval" == "" ]; then
+        cmd="./makedebian.pl \"$ver\" $verbosity_level"
+    else
+        cmd="./makedebian.pl \"$ver\" \"$rel\" $verbosity_level"
+    fi
+    eval "$cmd"
+    postcmd $?
+    echo
+
+    cd "$root" || exit 1
+    echo "Preparing built files for upload .."
+    cmd="cp -f $root_prod/tarballs/${prod}-${ver}*\.tar.gz $root_repos/${prod}-latest.tar.gz $verbosity_level"
+    eval "$cmd"
+    cmd="echo $ver-$rel \($date\) > $root_repos/${prod}-latest.version $verbosity_level_to_file"
+    eval "$cmd"
+    cmd="find $root_apt -name ${prod}_${ver}${relval}*\.deb -exec mv '{}' $root_repos \; $verbosity_level"
+    eval "$cmd"
+    cmd="mv -f $root_repos/${prod}_${ver}${relval}*\.deb $root_repos/${prod}-latest.deb $verbosity_level"
+    eval "$cmd"
+    postcmd $?
+}
+
+if [ -n "$1" ] && [[ "'$1'" != *"--"* ]]; then
+    build_prod $@
+    
+    cloud_upload_list_upload=("$root_repos/$1*")
+    cloud_upload cloud_upload_list_upload
+    
+    cloud_repo_sign_and_update
+else
+    build_prod webmin $@
+    build_prod usermin $@
+
+    cloud_upload_list_upload=("$root_repos/*")
+    cloud_upload cloud_upload_list_upload
+
+    cloud_repo_sign_and_update
+fi

.github/build/funcs.sh

@@ -0,0 +1,163 @@
+#!/usr/bin/env bash
+#
+# Copyright @iliajie <ilia@webmin.dev>
+#
+# General build functions
+#
+#
+
+# Upload to cloud
+# Usage:
+#   cloud_upload_list_delete=("$cloud_upload_ssh_dir/repodata")
+#   cloud_upload_list_upload=("$root_repos/*" "$root_repos/repodata")
+#   cloud_upload cloud_upload_list_upload cloud_upload_list_delete
+cloud_upload() {
+    # Print new block only if definded
+    local ssh_args="-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"
+    if [ -n "$1" ]; then
+        echo
+    fi
+    # Delete files on remote if needed
+    if [ -n "$2" ]; then
+        echo "Deleting given files in $cloud_upload_ssh_host .."
+        local -n arr_del=$2
+        local err=0
+        for d in "${arr_del[@]}"; do
+            if [ -n "$d" ]; then
+                local cmd1="ssh $ssh_args $cloud_upload_ssh_user@$cloud_upload_ssh_host \"rm -rf $d\" $verbosity_level"
+                eval "$cmd1"
+                if [ "$?" != "0" ]; then
+                    err=1
+                fi
+            fi
+        done
+        postcmd $err
+        echo
+    fi
+    
+    # Upload files to remote
+    if [ -n "$1" ]; then
+        echo "Uploading built files to $cloud_upload_ssh_host .."
+        local -n arr_upl=$1
+        local err=0
+        for u in "${arr_upl[@]}"; do
+            if [ -n "$u" ]; then
+                local cmd2="scp $ssh_args -r $u $cloud_upload_ssh_user@$cloud_upload_ssh_host:$cloud_upload_ssh_dir/ $verbosity_level"
+                eval "$cmd2"
+                if [ "$?" != "0" ]; then
+                    err=1
+                fi
+            fi
+        done
+        postcmd $err
+        echo
+    fi
+}
+
+# Sign and update repos metadata in remote
+cloud_repo_sign_and_update() {
+    echo "Signing and updating repos metadata in $cloud_upload_ssh_host .."
+    local ssh_args="-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"
+    local remote_cmd="cd ~/.scripts && ./update-repo-packages-signature.bash $cloud_upload_gpg_passphrase"
+    local cmd1="ssh $ssh_args $cloud_upload_ssh_user@$cloud_upload_ssh_host \"$remote_cmd\" $verbosity_level"
+    eval "$cmd1"
+    postcmd $?
+    echo
+}
+
+# Post command func
+postcmd() {
+    if [ "$1" != "0" ]; then
+        echo ".. failed"
+        exit 1
+    else
+        echo ".. done"
+    fi
+}
+
+# Get max number from array
+max() {
+    local -n arr_nums=$1
+    IFS=$'\n'
+    echo "${arr_nums[*]}" | sort -nr | head -n1
+}
+
+# Mkdir and children dirs
+make_dir() {
+    if [ ! -d "$1" ]; then
+        mkdir -p "$1"
+    fi
+}
+
+# Remove all content in dir
+purge_dir() {
+    for file in "$1"/*; do
+        rm -rf "$file"
+    done
+}
+
+# Get latest tag version
+get_current_repo_tag() {
+    cd "$root_prod" || exit 1
+    tg=$(git rev-list --tags --max-count=1)
+    ds=$(git describe --tags "$tg")
+    echo "$ds" | sed 's/v//'
+}
+
+# Get latest commit date
+get_current_date() {
+    echo $(date +'%Y-%m-%d %H:%M:%S %z')
+}
+
+# Get latest commit date version
+get_latest_commit_date_version() {
+    local theme_version
+    local prod_version
+    local max_prod
+    local highest_version
+
+    theme_version=$(git log -n1 --pretty='format:%cd' --date=format:'%Y%m%d%H%M')
+    cd "$root_prod" || exit 1
+    prod_version=$(git log -n1 --pretty='format:%cd' --date=format:'%Y%m%d%H%M')
+    max_prod=("$theme_version" "$prod_version")
+    highest_version=$(max max_prod)
+    echo "$highest_version"
+}
+
+# Pull project repo and theme
+make_prod_repos() {
+    # Webmin or Usermin
+    if [ ! -d "$1" ]; then
+        local repo="webmin/$prod.git"
+        cmd="git clone https://github.com/$repo $verbosity_level"
+        eval "$cmd"
+        if [ ! -d "webmin" ]; then
+            cmd="git clone --depth 1 https://github.com/webmin/webmin $verbosity_level"
+            eval "$cmd"
+        fi
+    fi
+    # Theme
+    theme="authentic-theme"
+    if [ ! -d "$1/$theme" ]; then
+        cd "$1" || exit 1
+        local repo="webmin/$theme.git"
+        cmd="git clone --depth 1 https://github.com/$repo $verbosity_level"
+        eval "$cmd"
+    fi
+}
+
+spinner() {
+  local msg=$1
+  local pid=$!
+  local spin='-\|/'
+  local i=0
+  printf "$msg "
+  while kill -0 $pid 2>/dev/null; do
+    (( i = (i + 1) % 4 ))
+    # No spinner if not an interactive shell
+    if [ -n "$PS1" ]; then
+        printf '%c\b' "${spin:i:1}"
+    fi
+    sleep .1
+  done
+}

.github/build/init.sh

@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+#
+# Copyright @iliajie <ilia@webmin.dev>
+#
+# Build init
+#
+#
+
+# Set up SSH dev keys
+if [ -n "$WEBMIN_DEV__SSH_PRV_KEY" ] && [ -n "$WEBMIN_DEV__SSH_PUB_KEY" ]; then
+    # Generate new pair with right permissions
+    cmd="ssh-keygen -t rsa -q -f \"$HOME/.ssh/id_rsa\" -N \"\"$verbosity_level"
+    eval "$cmd"
+    # Import SSH keys from secrets to be able to connect to the remote host
+    echo "$WEBMIN_DEV__SSH_PRV_KEY" > "$HOME/.ssh/id_rsa"
+    echo "$WEBMIN_DEV__SSH_PUB_KEY" > "$HOME/.ssh/id_rsa.pub"
+
+# Set up SSH production keys
+elif [ -n "$WEBMIN_PROD__SSH_PRV_KEY" ] && [ -n "$WEBMIN_PROD__SSH_PUB_KEY" ]; then
+    # Generate new pair with right permissions
+    cmd="ssh-keygen -t rsa -q -f \"$HOME/.ssh/id_rsa\" -N \"\"$verbosity_level"
+    eval "$cmd"
+    # Import SSH keys from secrets to be able to connect to the remote host
+    echo "$WEBMIN_PROD__SSH_PRV_KEY" > "$HOME/.ssh/id_rsa"
+    echo "$WEBMIN_PROD__SSH_PUB_KEY" > "$HOME/.ssh/id_rsa.pub"
+fi
+
+# Create symlink to Perl
+ln -fs /usr/bin/perl /usr/local/bin/perl

.github/build/rpm.sh

@@ -0,0 +1,243 @@
+#!/usr/bin/env bash
+#
+# Copyright @iliajie <ilia@webmin.dev>
+#
+# Automatically builds and updates a repo metadata.
+# Pulls latest changes from GitHub, detects release
+# version based on what's available in the repo
+#
+#                    (RHEL)
+#
+# Usage:
+#
+#   # Pull and build production versions
+#   # of both Webmin and Usermin
+#      ./rpm.sh
+#
+#   # Pull and build devel versions
+#   # of both Webmin and Usermin
+#      ./rpm.sh --devel
+#
+#   # Pull and build production Webmin version 2.101, forcing
+#   # release version 3, displaying detailed output
+#      ./rpm.sh webmin 2.101 3 --debug
+#
+#   # Pull and build production Usermin version 2.000,
+#   # automatically setting release version to minimal
+#      ./rpm.sh usermin 2.000
+#
+
+# shellcheck disable=SC1091
+# Source build variables
+source ./vars.sh || exit 1
+
+# Source build init
+source ./init.sh || exit 1
+
+# Source general build functions
+source ./funcs.sh || exit 1
+
+# Build product func
+build_prod() {
+
+    # Pack with English only in devel builds
+    local english_only=0
+    if [[ "'$*'" == *"--devel"* ]]; then
+        english_only=1
+    fi
+
+    # Always return back to root directory
+    cd "$root" || exit 1
+
+    # Define root
+    local ver=""
+    local prod=$1
+    root_prod="$root/$prod"
+
+    # Print build actual date
+    date=$(get_current_date)
+
+    # Print opening header
+    echo "************************************************************************"
+    echo "        build start date: $date                                         "
+    echo "          package format: RPM                                           "
+    echo "                 product: $prod                                         "
+    (make_prod_repos "$root_prod") &
+    spinner "  package output version:"
+
+    # Pull main project first to get the latest tag
+    cd "$root_prod" || exit 1
+    cmd="git pull $verbosity_level"
+    eval "$cmd"
+    rs1=$?
+    # Clean and try again
+    if [ "$rs1" != "0" ]; then
+        cmd="git checkout \"*\" $verbosity_level && git clean -f -d $verbosity_level && git pull $verbosity_level"
+        eval "$cmd"
+        rs1=$?
+    fi
+
+    # Pull theme to theme dir
+    cd "authentic-theme" || exit 1
+    cmd="git pull $verbosity_level"
+    eval "$cmd"
+    rs2=$?
+    # Clean and try again
+    if [ "$rs2" != "0" ]; then
+        cmd="git checkout \"*\" $verbosity_level && git clean -f -d $verbosity_level && git pull $verbosity_level"
+        eval "$cmd"
+        rs2=$?
+    fi
+    if [ "$rs1" != "0" ] || [ "$rs2" != "0" ]; then
+        rs=1
+    else
+        rs=0
+    fi
+    
+    # Build number
+    date_version=$(get_latest_commit_date_version)
+
+    # Handle other params
+    cd "$root_prod" || exit 1
+    if [[ "'$2'" != *"--"* ]]; then
+        ver=$2
+    fi
+    if [[ "'$3'" != *"--"* ]] && [[ -n "$3" ]]; then
+        rel=$3
+    else
+        rel=1
+    fi
+    if [ -z "$ver" ]; then
+        ver=$(get_current_repo_tag)
+    fi
+    if [[ "'$*'" == *"--devel"* ]]; then
+        ver="$ver.$date_version"
+        # Set actual product version
+        echo "${ver}" >"version"
+    fi
+
+    printf "$ver-$rel\n"
+    echo "************************************************************************"
+
+    echo "Pulling latest changes.."
+    # We need to pull first to get the latest tag,
+    # so here we only report an error if any
+    postcmd $rs
+    echo
+
+    echo "Pre-clean up .."
+    # Make sure directories exist
+    make_dir "$root_prod/newkey/rpm/"
+    make_dir "$root_prod/umodules/"
+    make_dir "$root_prod/minimal/"
+    make_dir "$root_prod/tarballs/"
+    make_dir "$root_build/BUILD/"
+    make_dir "$root_build/BUILDROOT/"
+    make_dir "$root_build/RPMS/"
+    make_dir "$root_build/SOURCES/"
+    make_dir "$root_build/SPECS/"
+    make_dir "$root_build/SRPMS/"
+    make_dir "$root_repos/"
+
+    # Re-create legacy link
+    rm -rf "$root/webadmin"
+    ln -s "$root/webmin" "$root/webadmin"
+
+    # Purge old files
+    purge_dir "$root_prod/newkey/rpm"
+    purge_dir "$root_prod/umodules"
+    purge_dir "$root_prod/minimal"
+    purge_dir "$root_prod/tarballs"
+    purge_dir "$root_build/BUILD"
+    purge_dir "$root_build/BUILDROOT"
+    purge_dir "$root_build/RPMS"
+    purge_dir "$root_build/SOURCES"
+    purge_dir "$root_build/SPECS"
+    purge_dir "$root_build/SRPMS"
+    rm -rf "$root_repos/repodata"
+    if [ "$prod" != "" ]; then
+        # XXXX Need to check for
+        # product name exactly
+        rm -f "$root_repos/$prod-latest"*
+    fi
+    postcmd $?
+    make_dir "$root_build/RPMS/noarch"
+    echo
+
+    # Descend to project dir
+    cd "$root_prod" || exit 1
+    
+    if [ "$english_only" = "1" ]; then
+        echo "Cleaning languages .."
+        cmd="./bin/language-manager --mode=clean --yes $verbosity_level_with_input"
+        eval "$cmd"
+        postcmd $?
+        echo
+    else
+        # Force restore build directory
+        if [ ! -f "lang/ja" ]; then
+            echo "Restoring languages .."
+            cmd="git checkout \"*\" $verbosity_level && git clean -f -d $verbosity_level && git pull $verbosity_level"
+            eval "$cmd"
+            postcmd $?
+            echo
+        fi
+    fi
+    echo "Pre-building package .."
+    eval "$cmd"
+    if [ "$rel" = "1" ]; then
+        args="$ver"
+    else
+        args="$ver-$rel"
+    fi
+
+    cmd="./makedist.pl \"$args\" $verbosity_level"
+    eval "$cmd"
+    postcmd $?
+    echo
+
+    echo "Building package .."
+    cmd="./makerpm.pl \"$ver\" \"$rel\" $verbosity_level"
+    eval "$cmd"
+    postcmd $?
+    echo
+
+    cd "$root" || exit 1
+    echo "Preparing built files for upload .."
+    cmd="cp -f $root_prod/tarballs/$prod-$ver*\.tar.gz $root_repos/${prod}-latest.tar.gz $verbosity_level"
+    eval "$cmd"
+    cmd="echo $ver-$rel \($date\) > $root_repos/$prod-latest.version"
+    eval "$cmd"
+    cmd="find $root_rpms -name $prod-$ver-$rel*\.rpm -exec mv '{}' $root_repos \; $verbosity_level"
+    eval "$cmd"
+    cmd="mv -f $root_repos/$prod-$ver-$rel*\.rpm $root_repos/${prod}-latest.rpm $verbosity_level"
+    eval "$cmd"
+    postcmd $?
+    echo
+
+    echo "Post-clean up .."
+    cd "$root_build" || exit 1
+    for dir in *; do
+        cmd="rm -rf \"$dir/*\" $verbosity_level"
+        eval "$cmd"
+    done
+    postcmd $?
+}
+
+if [ -n "$1" ] && [[ "'$1'" != *"--"* ]]; then
+    build_prod $@
+    
+    cloud_upload_list_upload=("$root_repos/$1*")
+    cloud_upload cloud_upload_list_upload
+    
+    cloud_repo_sign_and_update
+
+else
+    build_prod webmin $@
+    build_prod usermin $@
+
+    cloud_upload_list_upload=("$root_repos/*")
+    cloud_upload cloud_upload_list_upload
+    
+    cloud_repo_sign_and_update
+fi

.github/build/vars.sh

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+#
+# Copyright @iliajie <ilia@webmin.dev>
+#
+# Build variables
+#
+#
+
+# Set defaults
+root="${ENV_BUILD__ROOT:-$HOME}"
+root_repos="${ENV_BUILD__ROOT_REPOS:-$root/repo}"
+root_build="${ENV_BUILD__ROOT_BUILD:-$root/rpmbuild}"
+root_rpms="${ENV_BUILD__ROOT_RPMS:-$root_build/RPMS/noarch}"
+
+# Cloud upload config
+cloud_upload_ssh_user="${ENV_BUILD__CLOUD_UPLOAD_SSH_USER:-webmin.dev}"
+cloud_upload_ssh_host="${ENV_BUILD__CLOUD_UPLOAD_SSH_HOST:-webmin.dev}"
+cloud_upload_ssh_dir="${ENV_BUILD__CLOUD_UPLOAD_SSH_DIR:-~/domains/builds.webmin.dev/public_html}"
+cloud_upload_gpg_passphrase="${WEBMIN_DEV__GPG_PH}"
+
+# Define verbosity level
+verbosity_level=' >/dev/null 2>&1 </dev/null'
+verbosity_level_to_file='2> /dev/null'
+verbosity_level_with_input=' >/dev/null 2>&1'
+if [[ "'$*'" == *"--debug"* ]]; then
+    unset verbosity_level verbosity_level_to_file verbosity_level_with_input
+fi

.github/workflows/webmin.dev-deploy-webmin-package.yml

@@ -0,0 +1,30 @@
+name: "webmin.dev: Deploy Webmin package"
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-22.04
+    if: contains(github.event.head_commit.message, '[build]')
+    steps:
+      - uses: actions/checkout@v3
+      - uses: awalsh128/cache-apt-pkgs-action@latest
+        with: 
+          packages: git tar gzip openssl curl openssh-client rpm perl libdigest-sha-perl liblist-moreutils-perl libencode-detect-perl
+          version: 1.0
+      - uses: szenius/set-timezone@v1.2
+        with:
+          timezoneLinux: "Europe/Nicosia"
+      - name: Build and upload packages
+        env:
+          WEBMIN_DEV__SSH_PRV_KEY: ${{ secrets.WEBMIN_DEV__SSH_PRV_KEY }}
+          WEBMIN_DEV__SSH_PUB_KEY: ${{ secrets.WEBMIN_DEV__SSH_PUB_KEY }}
+          WEBMIN_DEV__GPG_PH: ${{ secrets.WEBMIN_DEV__GPG_PH }}
+          ENV_BUILD__CLOUD_UPLOAD_SSH_HOST: ${{ secrets.WEBMIN_DEV__IP_ADDR }}
+        working-directory: ./.github/build
+        run: |-
+          ./deb.sh webmin --devel
+          ./rpm.sh webmin --devel

.gitignore

@@ -21,3 +21,4 @@ core
 tarballs/
 minimal/
 .DS_Store
+.vscode/settings.json

CHANGELOG.md

@@ -1,5 +1,162 @@
 ## Changelog
 
+#### 2.104 (October 16, 2023)
+* Add support for numbered and bulleted lists in email HTML editor
+* Add ability to display active file locks in `Webmin Configuration ⇾ File Locking` page
+* Fix hostname detection on `systemd` systems to avoid excessive logging  [#2020](https://github.com/webmin/webmin/issues/2020)
+* Fix Webmin version display [#2023](https://github.com/webmin/webmin/issues/2023)
+* Fix to check if UI library is loaded before using it [#2021](https://github.com/webmin/webmin/issues/2021)
+* Fix the absent init script for legacy systems after the initial installation
+* Update the Authentic theme to the latest version with various fixes and improvements
+
+#### 2.103 (October 08, 2023)
+* Add support for hostname detection using `hostnamectl` command
+* Add support for other ACME services
+* Add ability to hide dotfiles in File Manager [#1578](https://github.com/webmin/authentic-theme/issues/1578)
+* Add `xz`, `zstd` and plain `tar` support when creating archives in File Manager [#2009](https://github.com/webmin/webmin/issues/2009)
+* Add support for English (United States) (military time) locale
+* Fix to correctly switch key hash type with ACME services
+* Fix bug when `backend` wasn't saved correctly in Fail2Ban module [#1992](https://github.com/webmin/webmin/issues/1992)
+* Fix large files download in Upload and Download module
+* Fix Google Authentication on RHEL systems derivatives
+* Update the Authentic theme to the latest version with various fixes and improvements
+
+#### 2.102 (August 23, 2023)
+* Add support for Amazon Linux 2023
+* Fix a bug in Network Configuration module when parsing network size [sourceforge.net/discussion#55377]( https://sourceforge.net/p/webadmin/discussion/55377/thread/78e5aa05f3)
+* Fix Netplan related bugs in Network Configuration module
+* Fix Terminal focus bug
+* Fix to correctly compare Webmin semantic versions
+* Fix to suppress output from `monitor.pl` command [#1984](https://github.com/webmin/webmin/issues/1984)
+
+#### 2.101 (August 5, 2023)
+* Add support for reading gzipped email messages
+* Add `error_stderr` API
+* Fix to show correct locale for sudo-capable users [webmin/authentic-theme#1663](https://github.com/webmin/authentic-theme/issues/1663)
+* Fix new signing key import on Debian and derivatives
+* Fix to check if password hash format is valid for `yescrypt` and `SHA512`
+* Fix various XSS related issues
+* Fix updating Webmin from repository if a package is available
+
+#### 2.100 (July 22, 2023)
+* Add support for showing defaults for options in PHP Configuration module
+* Add significant improvements to email display, reply and compose
+* Add support for WebGL in the Terminal module
+* Add screen reader support in Terminal module
+* Add full support for NetworkManager in Network Configuration module
+* Fix correctly displaying bridges with Netplan in Network Configuration module
+* Fix displaying active network interfaces in Network Configuration module
+* Fix to consider current drive temperature in `smartctl` output #1881
+* Fix to properly stop Usermin https://github.com/webmin/usermin/issues/89
+* Fix no to add hashed password to the old password list if it's already in there https://github.com/virtualmin/virtualmin-pro/issues/35
+* Fix displaying placeholder on input to reflect strftime-style format
+* Update the Authentic theme to the latest version adding new vertical column layout
+
+#### 2.021 (March 19, 2023)
+* Add ability to set locale in Webmin Users module for consistency
+* Fix an error when `make_date` is called on undefined value #1860
+* Fix clearing packages caches before checking for updates in status collection #1863
+* Update the Authentic theme to the latest version
+
+#### 2.020 (March 08, 2023)
+* Add full locale support
+* Add slave zone file format option in BIND DNS module
+* Add support for editing ACLs in File Manager
+* Add support to configure SSL connection for MySQL/MariaDB module
+* Add support for compressed backups in PostgreSQL module
+* Add support for displaying inodes too in Disk Usage in the Dashboard
+* Add better support for CloudLinux
+* Fix to always default to RSA key type in Let's Encrypt requests
+* Fix setup repository script for Oracle
+* Fix shutdown timeout to avoid termination of running processes
+* Fix support for SpamAssassin 4
+* Fix to use system default hashing format for `htpasswd` file
+* Fix FastRPC issues
+* Update the Authentic theme to the latest version, with sped-up Dashboard performance
+
+#### 2.013 (January 19, 2023)
+* Fix Authentic theme issue with error handling
+* Fix Framed theme to respect selected mode in left menu
+* Fix search bar in left menu in Framed theme
+
+#### 2.012 (January 18, 2023)
+* Fix to set the correct algorithm when setting up RNDC #1817
+* Fix the loop bug when sourcing other network configs in Debian
+* Fix to include all Debian network config files in backups
+* Fix to stop doing expensive package re-fetch on upgrades
+* Add support for defining hostname for WebSocket connection
+* Add Debian 12 support
+
+#### 2.011 (January 10, 2023)
+* Add ability to set shell character encoding and set `TERM` environmental variable in the new Terminal module
+* Add support for editing network interfaces in include files for Debian systems
+* Add various improvements to the old good Framed Theme
+* Fix to change Gray Framed Theme name to Framed Theme
+* Fix to verify and close WebSocket session, if parent session was closed
+* Fix to remove `RC4` from the list of strong ciphers
+* Fix don't fail LDAP user or group deletion, if they have already been deleted
+* Fix error handling in MySQL/MariaDB Database server module when executing SQL commands
+* Fix adding an extra server attachment field and other bugs in Read User Mail module
+* Fix the link to release notes for Rocky Linux
+* Fix issues with freezing and thawing dynamic reverse zones in BIND DNS Server module
+* Fix bugs for modules granting anonymous access
+* Fix `mailbox_idle_check_interval` option related bugs in Dovecot module [sourceforge.net#5602](https://sourceforge.net/p/webadmin/bugs/5602/)
+* Fix to use correct extension for package file when upgrading Webmin [webmin/authentic-theme#1633](https://github.com/webmin/authentic-theme/issues/1633)
+* Update the Authentic theme to the latest version
+
+#### 2.010 (November 27, 2022)
+* Add a new Terminal module (interactive shell)
+* Add a new `setup-repos.sh` script to setup Webmin repos
+* Add to replace old Gray Theme with Virtualmin Framed Theme
+* Add _systemd_ improvements
+* Add proper support for openSUSE Leap and Tumbleweed
+* Add Linux Lite support
+* Fix connecting to external IPv6 LDAP server
+* Fix self-signed certificate generation
+* Fix setting hostname using `hostnamectl` command on _systemd_ systems
+* Fix to exclude sensors with unknown temperatures
+* Fix for FreeBSD to support Let's Encrypt certificates requests
+* Fix to support attachment filenames with slash in them
+
+#### 2.001 (September 18, 2022)
+* Fix missing origins and action for direct rules in FirewallD module
+* Removed the need for a full restart when updating SSH keys
+* Improved the Javascript for redirects to HTTPS
+
+#### 2.000 (August 21, 2022)
+* Add to enforce HTTP Strict Transport Security (HSTS) policy in SSL enabled mode
+* Add better `http` to `https` redirects when SSL is enabled
+* Add support for installing multiple versions of Webmin on `systemd` systems
+* Add support for AMD CPU thermisters #1714
+* Add better support for Webmin minor (release) versions upgrades
+* Add Webmin and Usermin configuration modules display minor (release) version
+* Add Mint Linux support
+* Add latest Authentic 20.00 [theme update](https://github.com/webmin/authentic-theme/releases/tag/20.00) with number of bug fixes
+* Fix to also restart dependent services (i.e. `fail2ban`) upon `firewalld` restart
+* Fix to preserve service state for Webmin and Usermin upon package upgrades (i.e. don't start stopped)
+* Fix Bind module config incorrectly updated upon Webmin upgrades on CentOS 7
+
+#### 1.999 (August 4, 2022)
+* Fix to allow IPv6 addresses for slaves in BIND module
+* Fix to send `HUP` signal on reload with `systemd`
+* Fix icons in Servers Index module for newer distros (Alma and Rocky)
+* Fix to remove depricated option `UsePrivilegeSeparation` with OpenSSH 7.5+
+* Fix Oracle Linux support
+* Fix Ubuntu release notes links
+* Add Webmin release note message
+* Add latest Authentic [theme update](https://github.com/webmin/authentic-theme/releases/tag/19.99) with number of bug fixes
+
+#### 1.998 (July 25, 2022)
+* Fix Apache, BIND, MySQL, ProFTPd and other modules configs on newest distros for new installs
+* Fix to use Cron default path when run from UI
+* Fix post uninstall cleanups
+* Fix version detection bug for Log File Rotation module
+* Add improvements to Partitions on Local Disks module
+* Add better support for CentOS Stream Linux for new installs
+* Add improvements for searching and naming global PHP configs files
+* Add support for unix extensions option for Samba module https://github.com/webmin/webmin/issues/1695
+* Add latest Authentic [theme update](https://github.com/webmin/authentic-theme/releases/tag/19.98) with various bug fixes and small improvements
+
 #### 1.997 (July 12, 2022)
 * Add support for mirror and RAID volumes in LVM module
 * Add latest Authentic [theme update](https://github.com/webmin/authentic-theme/releases/tag/19.97) with nice new features in File Manager and other fixes

README.md

@@ -1,18 +1,31 @@
-## Contents
+ 
+<p align="center"><img src="https://user-images.githubusercontent.com/4426533/218263860-f7baf9d6-cb19-4ddc-86dc-ac1b7a3c3a8a.png" alt="Webmin" width="310px"></p>
+&nbsp;
+<p align="center"> <a href="https://webmin.com/docs/" target="_blank">Documentation</a> &nbsp;&nbsp;|&nbsp;&nbsp; <a href="https://webmin.com/faq/" target="_blank">FAQ</a> &nbsp;&nbsp;|&nbsp;&nbsp; <a href="https://webmin.com/security/" target="_blank">Security</a> &nbsp;&nbsp;|&nbsp;&nbsp; <a href="https://webmin.com/screenshots/" target="_blank">Screenshots</a>&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp; <a href="https://forum.virtualmin.com/c/webmin/12" target="_blank">Forum</a> <br><br> <a href="https://webmin.com/"><img src="https://img.shields.io/badge/downloads-25M+-brightgreen.svg" alt="Downloads"></a> <a href="https://github.com/webmin/webmin/releases/"><img src="https://img.shields.io/github/release/webmin/webmin" alt="Latest release"></a> <a href="https://github.com/webmin/webmin/stargazers"><img src="https://img.shields.io/github/stars/webmin/webmin" alt="Stars"></a> <a href="https://github.com/webmin/webmin/network/members"><img src="https://img.shields.io/github/forks/webmin/webmin" alt="Members"></a> <a href="https://github.com/webmin/webmin/contributors/"><img src="https://img.shields.io/github/contributors/webmin/webmin" alt="Contributors"></a> <a href="https://github.com/webmin/webmin/issues/"><img src="https://img.shields.io/github/issues-raw/webmin/webmin" alt="Issues"></a> <a href="https://github.com/webmin/webmin/blob/master/LICENCE"><img src="https://img.shields.io/github/license/webmin/webmin" alt="License"></a> </p>
+&nbsp;
+
+---
+
+&nbsp;
+
 * [Changelog](https://github.com/webmin/webmin/blob/master/CHANGELOG.md)
 * [About](#about)
-* [Installation](#installation)[<img src="https://github.com/webmin-devel/webmin/blob/master/media/download-23x14-stable.png?raw=true" title="Stable Versions">](http://webmin.com/download.html)[<img src="https://github.com/webmin-devel/webmin/blob/master/media/download-23x14-devel.png?raw=true" title="Development Versions">](http://webmin.com/devel.html)
-* [Documentation](#documentation)
+* [Installation](#installation)
 * [Development](#development)
 * [License](#license)
 
-* [中文版](https://github.com/webmin/webmin/blob/master/README-zh.md)
-
 ## About
 
-**Webmin** is a web-based system administration tool for Unix-like servers, and services with over _1,000,000_ installations worldwide. Using it, it is possible to configure operating system internals, such as users, disk quotas, services or configuration files, as well as modify, and control open-source apps, such as BIND DNS Server, Apache HTTP Server, PHP, MySQL, and [many more](https://doxfer.webmin.com/Webmin/Introduction). 
+**Webmin** is a web-based system administration tool for Unix-like servers, and services with about _1,000,000_ yearly installations worldwide. Using it, it is possible to configure operating system internals, such as users, disk quotas, services or configuration files, as well as modify, and control open-source apps, such as BIND DNS Server, Apache HTTP Server, PHP, MySQL, and many more.
 
-[![Quick UI overview 2021](https://user-images.githubusercontent.com/4426533/114315375-61a1c480-9b07-11eb-9aaf-4aa949a39ab7.png)](https://www.youtube.com/watch?v=daYG6O4AsEw)
+<p align="center">
+  <a href="https://webmin.com/screenshots/#gh-light-mode-only" target="_blank">
+    <img width="1440" alt="Dashboard screenshot" src="https://user-images.githubusercontent.com/4426533/218264253-c08fb45a-8d75-44bf-93b3-37a2ecae3d20.png">
+  </a>
+  <a href="https://webmin.com/screenshots/#gh-dark-mode-only" target="_blank">
+    <img width="1440" alt="Dashboard screenshot" src="https://user-images.githubusercontent.com/4426533/218265232-31140aa6-ada1-4019-bd75-04240aeabc83.png">
+  </a>
+</p>
 
 Usability can be expanded by installing modules, which can be custom made. Aside from this, there are two other major projects that extend its functionality:
 
@@ -26,22 +39,13 @@ Webmin includes _116_ [standard modules](https://doxfer.webmin.com/Webmin/Webmin
 Perl 5.10 or higher.
 
 ## Installation
-Webmin can be installed in two different ways:
-
- 1. By downloading a pre-built package, available for different distributions (CentOS, Fedora, SuSE, Mandriva, Debian, Ubuntu, Solaris and [other](http://www.webmin.com/support.html)) under [latest release assets](https://github.com/webmin/webmin/releases/latest) or from our [download page](http://webmin.com/download.html);
-  <kbd>Note: It is highly recommended to [add repository](https://doxfer.webmin.com/Webmin/Installation) to your system for having automatic updates.</kbd>
-
- 2. By downloading, extracting [source file](https://prdownloads.sourceforge.net/webadmin/webmin-1.997.tar.gz), and running [_setup.sh_](http://www.webmin.com/tgz.html) script, with no arguments, which will setup to run it directly from this directory, or with a command-line argument, such as targeted directory.
-  <kbd>Note: If you are installing Webmin [on Windows](http://www.webmin.com/windows.html) system, you must run the command `perl setup.pl` instead. The Windows version depends on several programs, and modules that may not be part of the standard distribution. You will need _process.exe_ command, _sc.exe_ command, and _Win32::Daemon_ Perl module.</kbd>
-
-## Documentation
-Complete set of documentation for Webmin and all of its modules can be found at out [Wiki page](https://doxfer.webmin.com/Webmin/Main_Page).
+For detailed installation instructions check our guide on [webmin.com/download](https://webmin.com/download) page.
 
 ## Development
 
 ### Lead developer
 
-* [Jamie Cameron](http://www.webmin.com/about.html) [![](https://github.com/webmin-devel/webmin/blob/master/media/linkedin-15x15.png?raw=true)](https://www.linkedin.com/in/jamiecameron2)
+* [Jamie Cameron](https://www.webmin.com/about.html) [![](https://github.com/webmin-devel/webmin/blob/master/media/linkedin-15x15.png?raw=true)](https://www.linkedin.com/in/jamiecameron2)
 
 ### Developers
 * [Ilia Rostovtsev](https://github.com/iliajie)

acl/acl-lib.pl

@@ -88,6 +88,8 @@ while(my $l = <$fh>) {
 		$user{'modules'} = $acl{$user[0]};
 		$user{'lang'} = $gconfig{"lang_$user[0]"};
 		$user{'langauto'} = $gconfig{"langauto_$user[0]"};
+		$user{'locale'} = $gconfig{"locale_$user[0]"};
+		$user{'dateformat'} = $gconfig{"dateformat_$user[0]"};
 		$user{'notabs'} = $gconfig{"notabs_$user[0]"};
 		$user{'rbacdeny'} = $gconfig{"rbacdeny_$user[0]"};
 		if ($gconfig{"theme_$user[0]"}) {
@@ -702,6 +704,10 @@ else {
 	$gconfig{"lang_".$user->{'name'}} = $user->{'lang'} if ($user->{'lang'});
 	delete($gconfig{"langauto_".$username});
 	$gconfig{"langauto_".$user->{'name'}} = $user->{'langauto'} if (defined($user->{'langauto'}));
+	delete($gconfig{"locale_".$username});
+	$gconfig{"locale_".$user->{'name'}} = $user->{'locale'} if (defined($user->{'locale'}));
+	delete($gconfig{"dateformat_".$username});
+	$gconfig{"dateformat_".$user->{'name'}} = $user->{'dateformat'} if (defined($user->{'dateformat'}));
 	delete($gconfig{"notabs_".$username});
 	$gconfig{"notabs_".$user->{'name'}} = $user->{'notabs'}
 		if ($user->{'notabs'});
@@ -768,14 +774,16 @@ if ($oldpass ne $user->{'pass'} &&
 	my $nolock = $oldpass;
 	$nolock =~ s/^\!//;
 	$user->{'olds'} ||= [];
-	unshift(@{$user->{'olds'}}, $nolock);
-	if ($miniserv->{'pass_oldblock'}) {
-		while(scalar(@{$user->{'olds'}}) >
-		      $miniserv->{'pass_oldblock'}) {
-			pop(@{$user->{'olds'}});
+	if (&indexof($nolock, @{$user->{'olds'}}) < 0) {
+		unshift(@{$user->{'olds'}}, $nolock);
+		if ($miniserv->{'pass_oldblock'}) {
+			while(scalar(@{$user->{'olds'}}) >
+			      $miniserv->{'pass_oldblock'}) {
+				pop(@{$user->{'olds'}});
+				}
 			}
+		$user->{'lastchange'} = time();
 		}
-	$user->{'lastchange'} = time();
 	}
 }
 
@@ -1959,16 +1967,8 @@ my $miniserv = { };
 my @anon = split(/\s+/, $miniserv->{'anonymous'} || "");
 my ($user, $found) = &get_anonymous_access($path, $miniserv);
 return 1 if ($found >= 0);		# Already setup
-
-# Grant access to the user and path
-&lock_file(&get_miniserv_config_file());
-$user ||= '';
-push(@anon, "$path=$user");
-$miniserv->{'anonymous'} = join(" ", @anon);
-&put_miniserv_config($miniserv);
-&unlock_file(&get_miniserv_config_file());
-
-if (!$user) {
+my $auser = grep { $_->{'name'} eq $user } &list_users();
+if (!$auser) {
 	# Create a user if need be
 	$user = "anonymous";
 	my $uinfo = { 'name' => $user,
@@ -1980,16 +1980,23 @@ if (!$user) {
 else {
 	# Make sure the user has the module
 	my ($uinfo) = grep { $_->{'name'} eq $user } &list_users();
-	$uinfo->{'modules'} ||= [];
 	if ($uinfo && &indexof($mod, @{$uinfo->{'modules'}}) < 0) {
+		$uinfo->{'modules'} ||= [];
 		push(@{$uinfo->{'modules'}}, $mod);
 		&modify_user($uinfo->{'name'}, $uinfo);
 		}
 	else {
-		print STDERR "Anonymous access is granted to user $user, but he doesn't exist!\n";
+		print STDERR "Anonymous access attempted to be granted to user $user, but it doesn't exist!\n";
 		}
 	}
 
+# Grant access to the user and path
+&lock_file(&get_miniserv_config_file());
+push(@anon, "$path=$user");
+$miniserv->{'anonymous'} = join(" ", @anon);
+&put_miniserv_config($miniserv);
+&unlock_file(&get_miniserv_config_file());
+
 &reload_miniserv();
 }
 

acl/acl_security.pl

@@ -82,6 +82,6 @@ $o->{'gassign'} = $in{'gassign_def'} ? '*' :
 sub list_acl_yesno_fields
 {
 return ('create', 'delete', 'rename', 'acl', 'cert', 'others', 'chcert',
-	'lang', 'cats', 'theme', 'ips', 'perms', 'sync', 'unix', 'sessions',
+	'lang', 'locale', 'cats', 'theme', 'ips', 'perms', 'sync', 'unix', 'sessions',
 	'switch', 'times', 'pass', 'sql');
 }

acl/config.info

@@ -2,4 +2,4 @@ line1=Configurable options,11
 display=User and group display mode,1,1-Names only,0-Names and modules
 order=Sort users and groups by,1,0-Order in file,1-Name
 line2=System configuration,11
-ssleay=Path to openssl or ssleay program,3,Automatic
+ssleay=Path to <tt>openssl</tt> or <tt>ssleay</tt> program,3,Automatic

acl/defaultacl

@@ -8,6 +8,7 @@ cert=1
 acl=1
 chcert=1
 lang=1
+locale=1
 groups=1
 gassign=*
 perms=0

acl/edit_user.cgi

@@ -7,7 +7,7 @@ use warnings;
 no warnings 'redefine';
 no warnings 'uninitialized';
 require './acl-lib.pl';
-our (%in, %text, %config, %access, $config_directory, $base_remote_user, $remote_user);
+our (%in, %text, %config, %gconfig, %access, $config_directory, $base_remote_user, $remote_user);
 &foreign_require("webmin", "webmin-lib.pl");
 
 &ReadParse();
@@ -204,6 +204,22 @@ if ($access{'lang'}) {
 		  ]));
 	}
 
+if ($access{'locale'}) {
+	# Current locale
+	eval "use DateTime; use DateTime::Locale; use DateTime::TimeZone;";
+	if (!$@ && $] > 5.011) {
+		my $locales = &list_locales();
+		my %localesrev = reverse %{$locales};
+		my $locale_auto = &parse_accepted_language();
+		print &ui_table_row($text{'edit_locale'},
+			&ui_radio("locale_def", $user{'locale'} ? 0 : 1,
+			  [ [ 1, $text{'default'} ],
+			    [ 0, &ui_select("locale", $user{'locale'} || $gconfig{'locale'} || &get_default_system_locale(),
+					   [ map { [ $localesrev{$_}, $_ ] } sort values %{$locales} ]) ] ]), 
+			undef, [ "valign=middle","valign=middle" ]);
+		}
+	}
+
 if ($access{'cats'}) {
 	# Show categorized modules?
 	print &ui_table_row($text{'edit_notabs'},

acl/lang/af.auto

@@ -57,6 +57,7 @@ edit_twofactorcancel=Verwyder tweefaktor-verifikasievereiste
 edit_twofactornone=Nog geen opstelling nie
 edit_twofactoradd=Aktiveer tweefaktor vir gebruiker
 edit_lang=Taal
+edit_locale=Lokaal
 edit_notabs=Kategoriseer modules?
 edit_logout=Uitlogtyd vir onaktiwiteit
 edit_mins=minute
@@ -197,6 +198,7 @@ acl_delete=Kan gebruikers verwyder?
 acl_rename=Kan gebruikers hernoem word?
 acl_acl=Kan die module toegangsbeheer beheer?
 acl_lang=Kan taal verander?
+acl_locale=Kan jy van plek verander?
 acl_chcert=Kan SSL-sertifikaatnaam verander?
 acl_euser=U mag nie die ACL vir hierdie gebruiker wysig nie
 acl_egroup=U mag nie ACL's vir groepe wysig nie
@@ -354,6 +356,7 @@ sessions_actions=Optrede..
 sessions_all=Alle sessies..
 sessions_logouts=Toon ook afgemelde sessies..
 sessions_state=staat
+sessions_action=Aksies
 sessions_this=Hierdie aanmelding
 sessions_in=Aangemeld
 sessions_out=Uitgeteken

acl/lang/ar.auto

@@ -27,6 +27,7 @@ edit_twofactorcancel=إزالة متطلبات المصادقة ثنائية
 edit_twofactornone=لا شيء الإعداد بعد
 edit_twofactoradd=تمكين عامل اثنين للمستخدم
 edit_lang=لغة
+edit_locale=لغة
 edit_notabs=تصنيف الوحدات؟
 edit_logout=وقت تسجيل الخمول
 edit_mins=الدقائق
@@ -123,6 +124,8 @@ cert_msg=يسمح لك هذا النموذج بطلب شهادة عميل SSL و
 cert_ou=قسم
 cert_ekey=لم يقدم متصفحك مفتاح SSL جديدًا - ربما لا يدعم شهادات عميل SSL.
 
+acl_locale=يمكن تغيير اللغة؟
+
 log_modify=Modified Webmin user $1
 log_rename=Renamed Webmin user $1 to $2
 log_create=Created Webmin user $1
@@ -242,6 +245,7 @@ sessions_actions=أجراءات..
 sessions_all=كل الجلسات..
 sessions_logouts=اعرض أيضًا جلسات تسجيل الخروج..
 sessions_state=حالة
+sessions_action=أجراءات
 sessions_this=هذا تسجيل الدخول
 sessions_in=تسجيل الدخول
 sessions_out=تسجيل الخروج

acl/lang/be.auto

@@ -57,6 +57,7 @@ edit_twofactorcancel=Выдаліце двухфакторную аўтэнты
 edit_twofactornone=Пакуль няма налад
 edit_twofactoradd=Уключыць для карыстальніка два фактары
 edit_lang=Мова
+edit_locale=Лакаль
 edit_notabs=Класіфікаваць модулі?
 edit_logout=Час выхаду з рэжыму бяздзейнасці
 edit_mins=хвілін
@@ -197,6 +198,7 @@ acl_delete=Ці можна выдаляць карыстальнікаў?
 acl_rename=Ці можаце перайменаваць карыстальнікаў?
 acl_acl=Ці можна рэдагаваць кантроль доступу модуля?
 acl_lang=Ці можна змяніць мову?
+acl_locale=Ці можна змяніць лакаль?
 acl_chcert=Ці можна змяніць імя сертыфіката SSL?
 acl_euser=Вам нельга рэдагаваць ACL для гэтага карыстальніка
 acl_egroup=Вам не дазволена рэдагаваць групавыя ACL
@@ -354,6 +356,7 @@ sessions_actions=Дзеянні..
 sessions_all=Усе сеансы..
 sessions_logouts=Таксама паказаць выходныя сесіі.
 sessions_state=Дзярж
+sessions_action=Дзеянні
 sessions_this=Гэта ўваход
 sessions_in=Ўвайшлі ў
 sessions_out=Выйшаў

acl/lang/bg.auto

@@ -1,6 +1,7 @@
 index_screate=Създайте нов безопасен потребител.
 
 edit_title3=Създайте безопасен потребител на Webmin
+edit_locale=локал
 edit_safe=Ниво на привилегии
 edit_safe0=неограничен
 edit_safe1=Само безопасни модули
@@ -8,9 +9,12 @@ edit_unsafe=Нулиране до неограничено
 
 save_eunixname=Потребителското име '$1' не е потребител на Unix и затова не може да се използва в безопасен режим
 
+acl_locale=Може ли да промени локала?
+
 sync_modify=Преименувайте съответстващия потребител на Webmin, когато потребител на Unix е преименуван.
 
 sessions_all=Всички сесии..
+sessions_action=Действия
 
 sql_nocache0=Кеш връзки към база данни
 sql_nocache1=Отворете нова връзка за всяко търсене

acl/lang/ca.auto

@@ -1,6 +1,7 @@
 index_screate=Creeu un nou usuari segur.
 
 edit_title3=Creeu un usuari Webmin segur
+edit_locale=Localització
 edit_safe=Nivell de privilegi
 edit_safe0=Sense restriccions
 edit_safe1=Només mòduls segurs
@@ -8,9 +9,12 @@ edit_unsafe=Restableix-lo a sense restriccions
 
 save_eunixname=El nom d'usuari '$1' no és un usuari Unix, per la qual cosa no es pot utilitzar en mode segur
 
+acl_locale=Es pot canviar la configuració regional?
+
 sync_modify=Canvieu el nom de l'usuari Webmin coincident quan es canvia el nom d'un usuari Unix.
 
 sessions_all=Totes les sessions..
+sessions_action=Accions
 
 sql_nocache0=Connexions de memòria cau a la base de dades
 sql_nocache1=Obriu una connexió nova per a cada cerca

acl/lang/cs.auto

@@ -10,6 +10,7 @@ edit_twofactorprov=Použití poskytovatele $1 s ID $2
 edit_twofactorcancel=Odstraňte požadavek na dvoufaktorovou autentizaci
 edit_twofactornone=Zatím žádné nastavení
 edit_twofactoradd=Povolit pro uživatele dvoufaktor
+edit_locale=Národní prostředí
 edit_nochange=Vynutit dny změny hesla?
 edit_egone=Vybraný uživatel již neexistuje!
 edit_overlay=Překrytí osobního motivu
@@ -34,6 +35,7 @@ delete_eanonuser=Tento uživatel je používán pro anonymní přístup k modulu
 
 cert_etempdir=Neplatný soubor certifikátu
 
+acl_locale=Lze změnit národní prostředí?
 acl_pass=Lze změnit omezení hesla?
 acl_sql=Lze konfigurovat databázi uživatelů a skupin?
 
@@ -64,6 +66,7 @@ sessions_actions=Akce..
 sessions_all=Všechny relace..
 sessions_logouts=Zobrazit také odhlášené relace.
 sessions_state=Stát
+sessions_action=Akce
 sessions_this=Toto přihlášení
 sessions_in=Přihlášen
 sessions_out=Odhlásit

acl/lang/da.auto

@@ -1,6 +1,7 @@
 index_screate=Opret en ny sikker bruger.
 
 edit_title3=Opret sikker webmin-bruger
+edit_locale=Lokalitet
 edit_safe=Privilegieniveau
 edit_safe0=Ubegrænset
 edit_safe1=Kun sikre moduler
@@ -8,9 +9,12 @@ edit_unsafe=Nulstil til ubegrænset
 
 save_eunixname=Brugernavnet '$1' er ikke en Unix-bruger, og kan derfor ikke bruges i sikker tilstand
 
+acl_locale=Kan du ændre lokalitet?
+
 sync_modify=Omdøb den matchende Webmin-bruger, når en Unix-bruger omdøbes.
 
 sessions_all=Alle sessioner..
+sessions_action=Handlinger
 
 sql_nocache0=Cache-forbindelser til databasen
 sql_nocache1=Åbn en ny forbindelse til hvert opslag

acl/lang/de.auto

@@ -1,6 +1,11 @@
+edit_locale=Gebietsschema
+
+acl_locale=Kann das Gebietsschema ändern?
+
 sync_modify=Benennen Sie den passenden Webmin-Benutzer um, wenn ein Unix-Benutzer umbenannt wird.
 
 sessions_all=Alle Sitzungen..
+sessions_action=Aktionen
 
 sql_nocache0=Cache-Verbindungen zur Datenbank
 sql_nocache1=Öffnen Sie für jede Suche eine neue Verbindung

acl/lang/el.auto

@@ -1,6 +1,7 @@
 index_screate=Δημιουργήστε ένα νέο ασφαλές χρήστη.
 
 edit_title3=Δημιουργία ασφαλούς χρήστη Webmin
+edit_locale=Μικρός λοβός
 edit_safe=Επίπεδο προνομίου
 edit_safe0=Απεριόριστος
 edit_safe1=Μόνο ασφαλή μονάδες
@@ -8,9 +9,12 @@ edit_unsafe=Επαναφορά σε απεριόριστη
 
 save_eunixname=Το όνομα χρήστη '$1' δεν είναι χρήστης Unix και έτσι δεν μπορεί να χρησιμοποιηθεί σε ασφαλή λειτουργία
 
+acl_locale=Μπορεί να αλλάξει τοπική;
+
 sync_modify=Μετονομάστε τον αντίστοιχο χρήστη Webmin όταν μετονομάζεται ένας χρήστης Unix.
 
 sessions_all=Όλες οι συνεδρίες..
+sessions_action=Ενέργειες
 
 sql_nocache0=Συνδέσεις προσωρινής μνήμης με βάση δεδομένων
 sql_nocache1=Ανοίξτε μια νέα σύνδεση για κάθε αναζήτηση

acl/lang/en

@@ -57,6 +57,7 @@ edit_twofactorcancel=Remove two-factor authentication requirement
 edit_twofactornone=None setup yet
 edit_twofactoradd=Enable Two-Factor For User
 edit_lang=Language
+edit_locale=Locale
 edit_notabs=Categorize modules?
 edit_logout=Inactivity logout time
 edit_mins=minutes
@@ -197,6 +198,7 @@ acl_delete=Can delete users?
 acl_rename=Can rename users?
 acl_acl=Can edit module access control?
 acl_lang=Can change language?
+acl_locale=Can change locale?
 acl_chcert=Can change SSL certificate name?
 acl_euser=You are not allowed to edit the ACL for this user
 acl_egroup=You are not allowed to edit group ACLs

acl/lang/es.auto

@@ -1,6 +1,7 @@
 index_screate=Crea un nuevo usuario seguro.
 
 edit_title3=Crear usuario seguro de Webmin
+edit_locale=Lugar
 edit_safe=Nivel de privilegio
 edit_safe0=Irrestricto
 edit_safe1=Solo módulos seguros
@@ -10,12 +11,15 @@ save_eunixname=El nombre de usuario '$1' no es un usuario de Unix, por lo que no
 
 delete_eanonuser=Este usuario se está utilizando para acceder al módulo anónimo
 
+acl_locale=¿Se puede cambiar de ubicación?
+
 sync_modify=Cambie el nombre del usuario de Webmin coincidente cuando se cambie el nombre de un usuario de Unix.
 
 sessions_actions=Comportamiento..
 sessions_all=Todas las sesiones..
 sessions_logouts=Mostrar también sesiones cerradas.
 sessions_state=Estado
+sessions_action=Comportamiento
 sessions_this=Este inicio de sesión
 sessions_in=Conectado
 sessions_out=Desconectado

acl/lang/eu.auto

@@ -11,6 +11,7 @@ edit_twofactorprov=Hornitzailea $1 erabiliz $2
 edit_twofactorcancel=Kendu bi faktoreen autentikazio baldintza
 edit_twofactornone=Ez dago oraindik konfigurazioa
 edit_twofactoradd=Gaitu erabiltzailearentzako bi faktore
+edit_locale=Tokikoa
 edit_egone=Aukeratutako erabiltzailea ez da existitzen!
 edit_overlay=Gai pertsonalen gainjartzea
 edit_proto=Biltegiratze mota
@@ -30,6 +31,7 @@ delete_eanonuser=Erabiltzaile hau modulu anonimoetarako sarbidea erabiltzen ari
 
 cert_etempdir=Ziurtagiri fitxategi baliogabea
 
+acl_locale=Tokia alda daiteke?
 acl_pass=Pasahitz murrizketak alda ditzakezu?
 acl_sql=Erabiltzaileen eta taldeen datu-basea konfiguratu al dezakezu?
 
@@ -60,6 +62,7 @@ sessions_actions=Ekintzak..
 sessions_all=Saio guztiak..
 sessions_logouts=Erakutsi itxitako saioak ere..
 sessions_state=Estatu
+sessions_action=Ekintzak
 sessions_this=Saioa hasiera
 sessions_in=Saioa hasi
 sessions_out=Saioa amaitu

acl/lang/fa.auto

@@ -17,6 +17,7 @@ edit_twofactorprov=Using provider $1 with ID $2
 edit_twofactorcancel=نیاز به تأیید اعتبار دو عاملی را حذف کنید
 edit_twofactornone=هنوز هیچ راه اندازی نشده است
 edit_twofactoradd=دو عامل را برای کاربر فعال کنید
+edit_locale=محلی
 edit_logout=زمان خروج از عدم فعالیت
 edit_mins=دقایق
 edit_chars=نامه ها
@@ -62,6 +63,7 @@ delete_eanonuser=این کاربر برای دسترسی به ماژول ناش
 
 cert_etempdir=پرونده گواهی نامعتبر است
 
+acl_locale=آیا می توان منطقه را تغییر داد؟
 acl_egroup=شما مجاز به ویرایش ACL های گروهی نیستید
 acl_times=آیا می توان بار ورود به سیستم مجاز را تغییر داد؟
 acl_pass=آیا می توانید محدودیت های رمز عبور را تغییر دهید؟
@@ -115,6 +117,7 @@ sessions_actions=اقدامات..
 sessions_all=تمام جلسات..
 sessions_logouts=همچنین جلسات ورود به سیستم را نشان دهید..
 sessions_state=دولت
+sessions_action=اقدامات
 sessions_this=این ورود
 sessions_in=وارد شده
 sessions_out=خارج شد

acl/lang/fi.auto

@@ -57,6 +57,7 @@ edit_twofactorcancel=Poista kaksifaktorinen todennusvaatimus
 edit_twofactornone=Ei vielä mitään asennusta
 edit_twofactoradd=Ota käyttöön kaksikerroinen käyttäjä
 edit_lang=Kieli
+edit_locale=Alue
 edit_notabs=Luokittele moduulit?
 edit_logout=Toimimattomuudesta poistumisaika
 edit_mins=pöytäkirja
@@ -197,6 +198,7 @@ acl_delete=Voiko käyttäjiä poistaa?
 acl_rename=Voivatko käyttäjät nimetä uudelleen?
 acl_acl=Voiko muokata moduulin pääsynhallintaa?
 acl_lang=Voiko kieltä vaihtaa?
+acl_locale=Voiko aluetta vaihtaa?
 acl_chcert=Voiko SSL-varmenteen nimeä muuttaa?
 acl_euser=Et voi muokata tämän käyttäjän ACL-luetteloa
 acl_egroup=Et voi muokata ryhmän ACL-luetteloita
@@ -354,6 +356,7 @@ sessions_actions=Toiminnot..
 sessions_all=Kaikki istunnot..
 sessions_logouts=Näytä myös kirjautuneet istunnot..
 sessions_state=Osavaltio
+sessions_action=Toiminnot
 sessions_this=Tämä kirjautuminen
 sessions_in=Kirjautunut sisään
 sessions_out=Kirjautunut ulos

acl/lang/fr.auto

@@ -12,6 +12,7 @@ edit_twofactorprov=Utilisation du fournisseur $1 avec l'ID $2
 edit_twofactorcancel=Supprimer l'exigence d'authentification à deux facteurs
 edit_twofactornone=Aucune configuration pour le moment
 edit_twofactoradd=Activer deux facteurs pour l'utilisateur
+edit_locale=Lieu
 edit_nochange=Appliquer les jours de changement de mot de passe?
 edit_overlay=Superposition de thème personnel
 edit_temppass=Forcer le changement à la prochaine connexion
@@ -32,6 +33,8 @@ delete_eanonuser=Cet utilisateur est utilisé pour l'accès au module anonyme
 
 cert_etempdir=Fichier de certificat non valide
 
+acl_locale=Peut changer de paramètres régionaux ?
+
 log_joingroup=Ajout de $1 utilisateurs Webmin au groupe $2 
 log_pass=Restrictions de mot de passe modifiées
 log_unix=Authentification utilisateur Unix modifiée
@@ -57,6 +60,7 @@ unix_header=Paramètres d'authentification utilisateur Unix
 unix_utable=Utilisateurs Unix autorisés
 
 sessions_all=Toutes les séances..
+sessions_action=Actions
 
 udeletes_jerr=Échec de l'ajout d'utilisateurs au groupe
 

acl/lang/he.auto

@@ -57,6 +57,7 @@ edit_twofactorcancel=הסר את דרישת האימות של שני גורמי
 edit_twofactornone=טרם התקנה
 edit_twofactoradd=הפעל שני גורמים למשתמש
 edit_lang=שפה
+edit_locale=מקום
 edit_notabs=לסווג מודולים?
 edit_logout=זמן יציאה מחוסר פעילות
 edit_mins=דקות
@@ -197,6 +198,7 @@ acl_delete=האם ניתן למחוק משתמשים?
 acl_rename=האם ניתן לשנות שם של משתמשים?
 acl_acl=האם ניתן לערוך בקרת גישה למודול?
 acl_lang=האם ניתן לשנות שפה?
+acl_locale=האם ניתן לשנות מיקום?
 acl_chcert=האם ניתן לשנות את שם אישור ה- SSL?
 acl_euser=אינך רשאי לערוך את ה- ACL למשתמש זה
 acl_egroup=אינך מורשה לערוך רשימות ACL בקבוצות
@@ -354,6 +356,7 @@ sessions_actions=פעולות..
 sessions_all=כל המפגשים..
 sessions_logouts=הראה גם הפעלות לא מחוברות..
 sessions_state=מדינה
+sessions_action=פעולות
 sessions_this=כניסה זו
 sessions_in=מחובר
 sessions_out=התנתק

acl/lang/hr.auto

@@ -11,6 +11,7 @@ edit_twofactorprov=Korištenje davatelja $1 s ID-om $2
 edit_twofactorcancel=Uklonite dvofaktorni zahtjev za provjeru autentičnosti
 edit_twofactornone=Još nema postavljanja
 edit_twofactoradd=Omogući korisniku dva faktora
+edit_locale=Lokalitet
 edit_nochange=Da li provodite dane za promjenu zaporke?
 edit_egone=Odabrani korisnik više ne postoji!
 edit_overlay=Prekrivanje osobne teme
@@ -35,6 +36,7 @@ delete_eanonuser=Ovaj korisnik se koristi za anonimni pristup modulu
 
 cert_etempdir=Nevažeća datoteka certifikata
 
+acl_locale=Može li se promijeniti lokalizacija?
 acl_pass=Mogu li promijeniti ograničenja zaporke?
 acl_sql=Mogu li konfigurirati korisničku i grupnu bazu podataka?
 
@@ -65,6 +67,7 @@ sessions_actions=Akcije..
 sessions_all=Sve sesije..
 sessions_logouts=Prikaži i odjavljene sesije..
 sessions_state=država
+sessions_action=Radnje
 sessions_this=Ova prijava
 sessions_in=Prijavljeni
 sessions_out=Odjavljen

acl/lang/hu.auto

@@ -15,6 +15,7 @@ edit_twofactorprov=A $2 azonosítóval
 edit_twofactorcancel=Távolítsa el a kéttényezős hitelesítési követelményt
 edit_twofactornone=Még nincs beállítva
 edit_twofactoradd=Két tényező engedélyezése a felhasználó számára
+edit_locale=Nyelv
 edit_chars=betűk
 edit_minsize=Minimális jelszóhossz
 edit_nochange=Végrehajtja a jelszócsere napjait?
@@ -52,6 +53,7 @@ delete_eanonuser=Ezt a felhasználót anonim modul-hozzáféréshez használják
 
 cert_etempdir=Érvénytelen tanúsítványfájl
 
+acl_locale=Meg lehet változtatni a nyelvet?
 acl_times=Megváltoztathatja az engedélyezett bejelentkezési időket?
 acl_pass=Meg lehet változtatni a jelszó korlátozásait?
 acl_sql=Konfigurálhatunk felhasználói és csoportos adatbázist?
@@ -91,6 +93,7 @@ sessions_actions=Hozzászólások..
 sessions_all=Minden ülés..
 sessions_logouts=A kijelentkezett munkamenetek megjelenítése is
 sessions_state=Állapot
+sessions_action=Akciók
 sessions_this=Ez a bejelentkezés
 sessions_in=Bejelentkezve
 sessions_out=Kilépett

acl/lang/it.auto

@@ -8,6 +8,7 @@ edit_twofactorprov=Utilizzo del provider $1 con ID $2
 edit_twofactorcancel=Rimuovere i requisiti di autenticazione a due fattori
 edit_twofactornone=Nessuna configurazione ancora
 edit_twofactoradd=Abilita due fattori per l'utente
+edit_locale=Locale
 edit_safe=Livello di privilegio
 edit_safe0=illimitato
 edit_safe1=Solo moduli sicuri
@@ -19,6 +20,8 @@ delete_eanonuser=Questo utente viene utilizzato per l'accesso al modulo anonimo
 
 cert_etempdir=File di certificato non valido
 
+acl_locale=È possibile modificare le impostazioni locali?
+
 log_joingroup=Aggiunti $1 utenti Webmin al gruppo $2
 log_twofactor=Utente registrato $1 con provider a due fattori $2
 log_onefactor=Utente non registrato $1 per l'autenticazione a due fattori
@@ -40,6 +43,7 @@ sessions_actions=Azioni..
 sessions_all=Tutte le sessioni..
 sessions_logouts=Mostra anche sessioni disconnesse.
 sessions_state=Stato
+sessions_action=Azioni
 sessions_this=Questo login
 sessions_in=Connesso
 sessions_out=Disconnesso

acl/lang/ja.auto

@@ -10,6 +10,7 @@ edit_twofactorprov=ID $2 のプロバイダー $1 を使用する
 edit_twofactorcancel=二要素認証要件を削除する
 edit_twofactornone=まだセットアップなし
 edit_twofactoradd=ユーザーの2要素を有効にする
+edit_locale=ロケール
 edit_egone=選択したユーザーは存在しません！
 edit_overlay=個人テーマのオーバーレイ
 edit_overlayglobal=なし-テーマのデフォルトを使用
@@ -32,6 +33,7 @@ delete_eanonuser=このユーザーは匿名モジュールアクセスに使用
 
 cert_etempdir=無効な証明書ファイル
 
+acl_locale=ロケールを変更できますか?
 acl_pass=パスワード制限を変更できますか？
 acl_sql=ユーザーおよびグループデータベースを構成できますか？
 
@@ -62,6 +64,7 @@ sessions_actions=行動..
 sessions_all=すべてのセッション。
 sessions_logouts=ログアウトしたセッションも表示します。
 sessions_state=状態
+sessions_action=行動
 sessions_this=このログイン
 sessions_in=ログイン済み
 sessions_out=ログアウトしました

acl/lang/ko.auto

@@ -10,6 +10,7 @@ edit_twofactorprov=ID가 $2 인 제공자 $1 사용
 edit_twofactorcancel=이중 인증 요구 사항 제거
 edit_twofactornone=아직 설정이 없습니다
 edit_twofactoradd=사용자에 대해 2 단계 요인 사용
+edit_locale=장소
 edit_egone=선택된 사용자가 더 이상 존재하지 않습니다!
 edit_overlay=개인 테마 오버레이
 edit_overlayglobal=없음-테마 기본값 사용
@@ -32,6 +33,7 @@ delete_eanonuser=이 사용자는 익명 모듈 액세스에 사용되고 있습
 
 cert_etempdir=유효하지 않은 인증서 파일
 
+acl_locale=로케일을 변경할 수 있습니까?
 acl_pass=비밀번호 제한을 변경할 수 있습니까?
 acl_sql=사용자 및 그룹 데이터베이스를 구성 할 수 있습니까?
 
@@ -62,6 +64,7 @@ sessions_actions=행위..
 sessions_all=모든 세션..
 sessions_logouts=로그 아웃 된 세션도 표시하십시오.
 sessions_state=상태
+sessions_action=행위
 sessions_this=이 로그인
 sessions_in=로그인
 sessions_out=로그 아웃

acl/lang/lt.auto

@@ -57,6 +57,7 @@ edit_twofactorcancel=Pašalinkite dviejų veiksnių autentifikavimo reikalavimą
 edit_twofactornone=Dar nėra sąrankos
 edit_twofactoradd=Įgalinti dviejų faktorių vartotojui
 edit_lang=Kalba
+edit_locale=Lokalė
 edit_notabs=Klasifikuokite modulius?
 edit_logout=Neaktyvumo atsijungimo laikas
 edit_mins=minučių
@@ -197,6 +198,7 @@ acl_delete=Ar galima ištrinti vartotojus?
 acl_rename=Ar galima pervardyti vartotojus?
 acl_acl=Ar galima redaguoti modulio prieigos valdymą?
 acl_lang=Ar gali pakeisti kalbą?
+acl_locale=Ar galima pakeisti lokalę?
 acl_chcert=Ar galima pakeisti SSL sertifikato pavadinimą?
 acl_euser=Jums neleidžiama redaguoti šio vartotojo ACL
 acl_egroup=Jums neleidžiama redaguoti grupės ACL
@@ -354,6 +356,7 @@ sessions_actions=Veiksmai..
 sessions_all=Visi užsiėmimai..
 sessions_logouts=Taip pat rodyti atsijungusius seansus..
 sessions_state=Valstybė
+sessions_action=Veiksmai
 sessions_this=Šis prisijungimas
 sessions_in=Prisijungęs
 sessions_out=Atsijungęs

acl/lang/lv.auto

@@ -57,6 +57,7 @@ edit_twofactorcancel=Noņemiet divu faktoru autentifikācijas prasību
 edit_twofactornone=Pagaidām nav iestatīta
 edit_twofactoradd=Iespējojiet divfaktoru lietotājam
 edit_lang=Valoda
+edit_locale=Lokalizācija
 edit_notabs=Kategorizēt moduļus?
 edit_logout=Neaktivitātes atteikšanās laiks
 edit_mins=minūtes
@@ -197,6 +198,7 @@ acl_delete=Vai var izdzēst lietotājus?
 acl_rename=Vai lietotājus var pārdēvēt?
 acl_acl=Vai var rediģēt moduļa piekļuves kontroli?
 acl_lang=Vai var mainīt valodu?
+acl_locale=Vai var mainīt lokalizāciju?
 acl_chcert=Vai var mainīt SSL sertifikāta nosaukumu?
 acl_euser=Jums nav atļauts rediģēt šī lietotāja ACL
 acl_egroup=Jums nav atļauts rediģēt grupas ACL
@@ -354,6 +356,7 @@ sessions_actions=Darbības..
 sessions_all=Visas sesijas..
 sessions_logouts=Rādīt arī atteikšanās sesijas..
 sessions_state=Valsts
+sessions_action=Darbības
 sessions_this=Šī pieteikšanās
 sessions_in=Pieteicies
 sessions_out=Izlogojies

acl/lang/ms.auto

@@ -1,6 +1,7 @@
 index_screate=Buat pengguna selamat yang baru.
 
 edit_title3=Buat Pengguna Webmin Selamat
+edit_locale=Tempatan
 edit_safe=Tahap keistimewaan
 edit_safe0=Tidak terkawal
 edit_safe1=Modul selamat sahaja
@@ -10,12 +11,15 @@ save_eunixname=Nama pengguna '$1' bukan pengguna Unix, dan oleh itu tidak boleh
 
 delete_eanonuser=Pengguna ini sedang digunakan untuk akses modul tanpa nama
 
+acl_locale=Boleh tukar tempat?
+
 sync_modify=Ganti nama pengguna Webmin yang sepadan apabila pengguna Unix dinamakan semula.
 
 sessions_actions=Tindakan..
 sessions_all=Semua sesi..
 sessions_logouts=Juga tunjukkan sesi log keluar..
 sessions_state=Negeri
+sessions_action=Tindakan
 sessions_this=Log masuk ini
 sessions_in=Log masuk
 sessions_out=Logged out

acl/lang/mt.auto

@@ -57,6 +57,7 @@ edit_twofactorcancel=Neħħi l-ħtieġa ta 'awtentikazzjoni b'żewġ fatturi
 edit_twofactornone=L-ebda setup għadu ma sar
 edit_twofactoradd=Jippermetti Żewġ Fatturi Għall-Utent
 edit_lang=Lingwa
+edit_locale=Lokali
 edit_notabs=Tikkategorizza l-moduli?
 edit_logout=Ħin tat-tluq għall-inattività
 edit_mins=minuti
@@ -197,6 +198,7 @@ acl_delete=Tista 'tħassar l-utenti?
 acl_rename=Jistgħu isemmi l-utenti?
 acl_acl=Jista 'jeditja l-modulu ta' kontroll ta 'aċċess?
 acl_lang=Tista 'tbiddel il-lingwa?
+acl_locale=Tista' tbiddel il-lokal?
 acl_chcert=Tista 'tibdel l-isem taċ-ċertifikat SSL?
 acl_euser=M'għandekx permess teditja l-ACL għal dan l-utent
 acl_egroup=M'għandekx permess teditja l-ACLs tal-grupp
@@ -354,6 +356,7 @@ sessions_actions=Azzjonijiet..
 sessions_all=Is-sessjonijiet kollha..
 sessions_logouts=Uri wkoll sessjonijiet illoggjati..
 sessions_state=Stat
+sessions_action=Azzjonijiet
 sessions_this=Dan id-dħul
 sessions_in=Dħalt
 sessions_out=Dħalt

acl/lang/nl.auto

@@ -8,6 +8,7 @@ edit_twofactorprov=Gebruik provider $1 met ID $2
 edit_twofactorcancel=Verwijder twee-factor authenticatie vereiste
 edit_twofactornone=Nog geen configuratie
 edit_twofactoradd=Twee-factor voor gebruiker inschakelen
+edit_locale=Lokaal
 edit_safe=Privilege niveau
 edit_safe0=onbeperkt
 edit_safe1=Alleen veilige modules
@@ -19,6 +20,8 @@ delete_eanonuser=Deze gebruiker wordt gebruikt voor anonieme moduletoegang
 
 cert_etempdir=Ongeldig certificaatbestand
 
+acl_locale=Kan de locatie worden gewijzigd?
+
 log_joingroup= $1 Webmin-gebruikers toegevoegd aan $2 
 log_twofactor=Ingeschreven gebruiker $1 bij two-factor provider $2 
 log_onefactor=Uitgeschreven gebruiker $1 voor tweefactorauthenticatie
@@ -39,6 +42,7 @@ sessions_actions=Acties..
 sessions_all=Alle sessies..
 sessions_logouts=Toon ook uitgelogde sessies..
 sessions_state=Staat
+sessions_action=Acties
 sessions_this=Deze login
 sessions_in=Ingelogd
 sessions_out=Uitgelogd

acl/lang/no.auto

@@ -1,6 +1,11 @@
+edit_locale=Språk
+
+acl_locale=Kan du endre lokalitet?
+
 sync_modify=Gi nytt navn til den samsvarende Webmin-brukeren når en Unix-bruker får nytt navn.
 
 sessions_all=Alle økter..
+sessions_action=Handlinger
 
 sql_nocache0=Cache-tilkoblinger til databasen
 sql_nocache1=Åpne en ny forbindelse for hvert oppslag

acl/lang/pl.auto

@@ -1,6 +1,7 @@
 index_screate=Utwórz nowego bezpiecznego użytkownika.
 
 edit_title3=Utwórz bezpiecznego użytkownika Webmin
+edit_locale=Widownia
 edit_safe=Poziom uprawnień
 edit_safe0=Nieograniczony
 edit_safe1=Tylko bezpieczne moduły
@@ -8,12 +9,15 @@ edit_unsafe=Zresetuj do nieograniczonego
 
 save_eunixname=Nazwa użytkownika „$1” nie jest użytkownikiem systemu Unix, dlatego nie można jej używać w trybie awaryjnym
 
+acl_locale=Czy można zmienić język?
+
 sync_modify=Zmień nazwę pasującego użytkownika Webmin, gdy zmieniona zostanie nazwa użytkownika Uniksa.
 
 sessions_actions=Działania..
 sessions_all=Wszystkie sesje...
 sessions_logouts=Pokaż także wylogowane sesje.
 sessions_state=Stan
+sessions_action=działania
 sessions_this=Ten login
 sessions_in=Zalogowany
 sessions_out=Wylogowano

acl/lang/pt.auto

@@ -42,6 +42,7 @@ edit_twofactorcancel=Remover requisito de autenticação de dois fatores
 edit_twofactornone=Nenhuma configuração ainda
 edit_twofactoradd=Ativar dois fatores para o usuário
 edit_lang=Língua
+edit_locale=Localidade
 edit_notabs=Categorizar módulos?
 edit_logout=Tempo de logoff de inatividade
 edit_mins=minutos
@@ -173,6 +174,7 @@ acl_delete=Pode excluir usuários?
 acl_rename=Pode renomear usuários?
 acl_acl=Pode editar o controle de acesso do módulo?
 acl_lang=Pode mudar o idioma?
+acl_locale=Pode mudar de localidade?
 acl_chcert=Pode alterar o nome do certificado SSL?
 acl_euser=Você não tem permissão para editar a ACL para este usuário
 acl_egroup=Você não tem permissão para editar ACLs de grupo
@@ -330,6 +332,7 @@ sessions_actions=Ações..
 sessions_all=Todas as sessões..
 sessions_logouts=Mostrar também sessões desconectadas.
 sessions_state=Estado
+sessions_action=Ações
 sessions_this=Este login
 sessions_in=Logado
 sessions_out=Desconectado

acl/lang/pt_BR.auto

@@ -10,6 +10,7 @@ edit_twofactorprov=Usando o provedor $1 com o ID $2
 edit_twofactorcancel=Remover requisito de autenticação de dois fatores
 edit_twofactornone=Nenhuma configuração ainda
 edit_twofactoradd=Ativar dois fatores para o usuário
+edit_locale=Localidade
 edit_egone=O usuário selecionado não existe mais!
 edit_proto=Tipo de armazenamento
 edit_proto_mysql=Banco de dados MySQL
@@ -28,6 +29,7 @@ delete_eanonuser=Este usuário está sendo usado para acesso anônimo ao módulo
 
 cert_etempdir=Arquivo de certificado inválido
 
+acl_locale=Pode mudar de localidade?
 acl_pass=Pode alterar as restrições de senha?
 acl_sql=Pode configurar o banco de dados de usuários e grupos?
 
@@ -58,6 +60,7 @@ sessions_actions=Ações..
 sessions_all=Todas as sessões..
 sessions_logouts=Mostrar também sessões desconectadas.
 sessions_state=Estado
+sessions_action=Ações
 sessions_this=Este login
 sessions_in=Logado
 sessions_out=Desconectado

acl/lang/ro.auto

@@ -57,6 +57,7 @@ edit_twofactorcancel=Eliminați cerința de autentificare cu doi factori
 edit_twofactornone=Nici o configurație nu este încă
 edit_twofactoradd=Activați două factori pentru utilizator
 edit_lang=Limba
+edit_locale=Locale
 edit_notabs=Categorizați modulele?
 edit_logout=Timp de deconectare a inactivității
 edit_mins=minute
@@ -197,6 +198,7 @@ acl_delete=Pot șterge utilizatorii?
 acl_rename=Pot redenumi utilizatorii?
 acl_acl=Poate edita controlul accesului modulului?
 acl_lang=Poate schimba limba?
+acl_locale=Se poate schimba locația?
 acl_chcert=Poate schimba numele certificatului SSL?
 acl_euser=Nu aveți voie să editați ACL pentru acest utilizator
 acl_egroup=Nu aveți voie să editați ACL-urile de grup
@@ -354,6 +356,7 @@ sessions_actions=Acțiuni..
 sessions_all=Toate sesiunile..
 sessions_logouts=Arată, de asemenea, sesiuni deconectate..
 sessions_state=Stat
+sessions_action=Acțiuni
 sessions_this=Această autentificare
 sessions_in=Conectat
 sessions_out=Delogat

acl/lang/ru.auto

@@ -10,6 +10,7 @@ edit_twofactorprov=Использование поставщика $1 с иде
 edit_twofactorcancel=Удалить требование двухфакторной аутентификации
 edit_twofactornone=Нет настройки еще
 edit_twofactoradd=Включить двухфакторный для пользователя
+edit_locale=Регион
 edit_nochange=Принудительно менять дни?
 edit_egone=Выбранный пользователь больше не существует!
 edit_rbacdeny0=RBAC контролирует только выбранные ACL модуля
@@ -30,6 +31,7 @@ delete_eanonuser=Этот пользователь используется дл
 
 cert_etempdir=Неверный файл сертификата
 
+acl_locale=Может сменить локаль?
 acl_pass=Можно ли изменить ограничения пароля?
 acl_sql=Можно настроить базу данных пользователей и групп?
 
@@ -62,6 +64,7 @@ sessions_actions=Действия..
 sessions_all=Все сеансы..
 sessions_logouts=Также показать сеансы выхода из системы.
 sessions_state=состояние
+sessions_action=Действия
 sessions_this=Этот логин
 sessions_in=Войти в систему
 sessions_out=Вышли из

acl/lang/sk.auto

@@ -17,6 +17,7 @@ edit_twofactorprov=Použitie poskytovateľa $1 s ID $2
 edit_twofactorcancel=Odstráňte požiadavku dvojfaktorovej autentifikácie
 edit_twofactornone=Zatiaľ žiadne nastavenie
 edit_twofactoradd=Povoliť používateľom dvojfaktorový režim
+edit_locale=Miestne nastavenie
 edit_logout=Čas odhlásenia nečinnosti
 edit_chars=literatúra
 edit_minsize=Minimálna dĺžka hesla
@@ -60,6 +61,7 @@ cert_etempdir=Neplatný súbor certifikátu
 acl_rbac=Získať nastavenia riadenia prístupu z RBAC?
 acl_rbacyes=Áno (prepíše nastavenia nižšie)
 
+acl_locale=Dá sa zmeniť miestne nastavenie?
 acl_times=Môžu zmeniť povolené časy prihlásenia?
 acl_pass=Môžete zmeniť obmedzenia hesiel?
 acl_sql=Môžete nakonfigurovať databázu používateľov a skupín?
@@ -107,6 +109,7 @@ sessions_actions=Akcia..
 sessions_all=Všetky relácie..
 sessions_logouts=Zobraziť aj odhlásené relácie.
 sessions_state=Štát
+sessions_action=Akcie
 sessions_this=Toto prihlásenie
 sessions_in=Prihlásený
 sessions_out=Odhlasený

acl/lang/sl.auto

@@ -57,6 +57,7 @@ edit_twofactorcancel=Odstranite dvofaktorsko preverjanje pristnosti
 edit_twofactornone=Ni nastavitve še
 edit_twofactoradd=Omogoči dvofaktor za uporabnika
 edit_lang=Jezik
+edit_locale=Locale
 edit_notabs=Razvrstiti module?
 edit_logout=Čas odjave iz neaktivnosti
 edit_mins=minut
@@ -197,6 +198,7 @@ acl_delete=Ali lahko uporabnike izbrišete?
 acl_rename=Ali lahko preimenujete uporabnike?
 acl_acl=Ali lahko urejate nadzor dostopa modula?
 acl_lang=Ali lahko spremenite jezik?
+acl_locale=Ali lahko spremenite jezik?
 acl_chcert=Ali lahko spremenim ime potrdila SSL?
 acl_euser=Nimate dovoljenja za urejanje ACL za tega uporabnika
 acl_egroup=Nimate dovoljenja za urejanje skupinskih ACL-jev
@@ -354,6 +356,7 @@ sessions_actions=Ukrepi..
 sessions_all=Vse seje..
 sessions_logouts=Prikaži tudi odjavne seje.
 sessions_state=Država
+sessions_action=Dejanja
 sessions_this=Ta prijava
 sessions_in=Prijavljeni
 sessions_out=Odjavljeni

acl/lang/sv.auto

@@ -10,6 +10,7 @@ edit_twofactorprov=Använda leverantör $1 med ID $2
 edit_twofactorcancel=Ta bort tvåfaktors autentiseringskrav
 edit_twofactornone=Ingen installation ännu
 edit_twofactoradd=Aktivera tvåfaktorer för användare
+edit_locale=Plats
 edit_egone=Den valda användaren finns inte längre!
 edit_proto=Lagringstyp
 edit_proto_mysql=MySQL-databas
@@ -30,6 +31,7 @@ delete_eanonuser=Den här användaren används för anonym modulåtkomst
 
 cert_etempdir=Ogiltig certifikatfil
 
+acl_locale=Kan du byta språk?
 acl_pass=Kan ändra lösenordsbegränsningar?
 acl_sql=Kan konfigurera användar- och gruppdatabas?
 
@@ -62,6 +64,7 @@ sessions_actions=Handlingar..
 sessions_all=Alla sessioner..
 sessions_logouts=Visa även utloggade sessioner..
 sessions_state=stat
+sessions_action=Åtgärder
 sessions_this=Den här inloggningen
 sessions_in=Inloggad
 sessions_out=Utloggad

acl/lang/th.auto

@@ -57,6 +57,7 @@ edit_twofactorcancel=ลบข้อกำหนดการตรวจสอ
 edit_twofactornone=ยังไม่มีการตั้งค่า
 edit_twofactoradd=เปิดใช้งาน Two-Factor สำหรับผู้ใช้
 edit_lang=ภาษา
+edit_locale=สถานที่
 edit_notabs=จัดหมวดหมู่โมดูลหรือไม่
 edit_logout=ไม่มีเวลาออกจากระบบ
 edit_mins=นาที
@@ -197,6 +198,7 @@ acl_delete=สามารถลบผู้ใช้ได้หรือไม
 acl_rename=สามารถเปลี่ยนชื่อผู้ใช้?
 acl_acl=สามารถแก้ไขการควบคุมการเข้าถึงโมดูลได้หรือไม่
 acl_lang=เปลี่ยนภาษาได้ไหม
+acl_locale=เปลี่ยนโลแคลได้ไหม
 acl_chcert=สามารถเปลี่ยนชื่อใบรับรอง SSL ได้หรือไม่
 acl_euser=คุณไม่ได้รับอนุญาตให้แก้ไข ACL สำหรับผู้ใช้รายนี้
 acl_egroup=คุณไม่ได้รับอนุญาตให้แก้ไขกลุ่ม ACL
@@ -354,6 +356,7 @@ sessions_actions=การดำเนินการ..
 sessions_all=ทุกวาระ..
 sessions_logouts=แสดงเซสชันการออกจากระบบด้วย..
 sessions_state=สถานะ
+sessions_action=การกระทำ
 sessions_this=เข้าสู่ระบบนี้
 sessions_in=เข้าสู่ระบบ
 sessions_out=ออกจากระบบ

acl/lang/tr.auto

@@ -19,6 +19,7 @@ edit_twofactorprov=$2 kimliğiyle $1 sağlayıcısını kullanma
 edit_twofactorcancel=İki faktörlü kimlik doğrulama gereksinimini kaldırın
 edit_twofactornone=Henüz kurulum yok
 edit_twofactoradd=Kullanıcı için İki Faktörü Etkinleştir
+edit_locale=yerel ayar
 edit_logout=Etkinlik dışı kalma süresi
 edit_mins=dakika
 edit_chars=harfler
@@ -70,6 +71,7 @@ cert_etempdir=Geçersiz sertifika dosyası
 acl_rbac=RBAC'den erişim kontrolü ayarları alınıyor mu?
 acl_rbacyes=Evet (aşağıdaki ayarları geçersiz kılar)
 
+acl_locale=Yerel ayarı değiştirebilir miyim?
 acl_times=İzin verilen giriş zamanlarını değiştirebilir mi?
 acl_pass=Şifre kısıtlamalarını değiştirebilir mi?
 acl_sql=Kullanıcı ve grup veritabanını yapılandırabilir mi?
@@ -123,6 +125,7 @@ sessions_actions=Hareketler..
 sessions_all=Tüm oturumlar..
 sessions_logouts=Oturumu kapatılmış oturumları da göster..
 sessions_state=Durum
+sessions_action=Hareketler
 sessions_this=Bu giriş
 sessions_in=Giriş
 sessions_out=Çıkış yapıldı

acl/lang/uk.auto

@@ -55,6 +55,7 @@ edit_twofactorcancel=Видаліть двофакторну аутентифі
 edit_twofactornone=Ще немає налаштувань
 edit_twofactoradd=Увімкнути двофакторну для користувача
 edit_lang=Мову
+edit_locale=Локаль
 edit_notabs=Класифікувати модулі?
 edit_logout=Час виходу з бездіяльності
 edit_mins=хвилин
@@ -193,6 +194,7 @@ acl_delete=Чи можете видалити користувачів?
 acl_rename=Чи можете перейменувати користувачів?
 acl_acl=Чи можна редагувати контроль доступу до модуля?
 acl_lang=Можна змінити мову?
+acl_locale=Чи можна змінити мову?
 acl_chcert=Чи можна змінити ім'я сертифіката SSL?
 acl_euser=Вам заборонено редагувати ACL для цього користувача
 acl_egroup=Вам заборонено редагувати групові ACL
@@ -349,6 +351,7 @@ sessions_actions=Дії..
 sessions_all=Всі сеанси..
 sessions_logouts=Показати також сеанси виходу з системи..
 sessions_state=Держава
+sessions_action=Дії
 sessions_this=Це логін
 sessions_in=Увійшли в
 sessions_out=Вийшли з системи

acl/lang/ur.auto

@@ -57,6 +57,7 @@ edit_twofactorcancel=دو عنصر کی توثیق کی ضرورت کو ہٹا
 edit_twofactornone=ابھی تک کوئی سیٹ اپ نہیں ہے
 edit_twofactoradd=صارف کے لئے دو فیکٹر کو فعال کریں
 edit_lang=زبان
+edit_locale=لوکیل
 edit_notabs=ماڈیول کی درجہ بندی کریں؟
 edit_logout=غیر فعال لاگ آؤٹ وقت
 edit_mins=منٹ
@@ -197,6 +198,7 @@ acl_delete=کیا صارفین کو حذف کرسکتے ہیں؟
 acl_rename=کیا صارفین کا نام تبدیل کر سکتے ہیں؟
 acl_acl=کیا ماڈیول ایکسیس کنٹرول میں ترمیم کی جاسکتی ہے؟
 acl_lang=کیا زبان بدل سکتی ہے؟
+acl_locale=لوکل تبدیل کر سکتے ہیں؟
 acl_chcert=کیا SSL سرٹیفکیٹ کا نام تبدیل کر سکتے ہیں؟
 acl_euser=آپ کو اس صارف کے لئے ACL میں ترمیم کرنے کی اجازت نہیں ہے
 acl_egroup=آپ کو گروپ ACL میں ترمیم کرنے کی اجازت نہیں ہے
@@ -354,6 +356,7 @@ sessions_actions=عمل..
 sessions_all=تمام سیشنز..
 sessions_logouts=لاگ آؤٹ سیشن بھی دکھائیں..
 sessions_state=حالت
+sessions_action=اعمال
 sessions_this=یہ لاگ ان
 sessions_in=لاگ ان
 sessions_out=لاگ آؤٹ

acl/lang/vi.auto

@@ -57,6 +57,7 @@ edit_twofactorcancel=Xóa yêu cầu xác thực hai yếu tố
 edit_twofactornone=Chưa có thiết lập nào
 edit_twofactoradd=Kích hoạt hai yếu tố cho người dùng
 edit_lang=Ngôn ngữ
+edit_locale=địa phương
 edit_notabs=Phân loại mô-đun?
 edit_logout=Thời gian đăng xuất không hoạt động
 edit_mins=phút
@@ -197,6 +198,7 @@ acl_delete=Có thể xóa người dùng?
 acl_rename=Có thể đổi tên người dùng?
 acl_acl=Có thể chỉnh sửa điều khiển truy cập mô-đun?
 acl_lang=Có thể thay đổi ngôn ngữ?
+acl_locale=Có thể thay đổi ngôn ngữ?
 acl_chcert=Có thể thay đổi tên chứng chỉ SSL?
 acl_euser=Bạn không được phép chỉnh sửa ACL cho người dùng này
 acl_egroup=Bạn không được phép chỉnh sửa ACL nhóm
@@ -354,6 +356,7 @@ sessions_actions=Hành động..
 sessions_all=Tất cả các phiên..
 sessions_logouts=Cũng hiển thị các phiên đăng xuất..
 sessions_state=Tiểu bang
+sessions_action=Hành động
 sessions_this=Thông tin đăng nhập này
 sessions_in=Đăng nhập
 sessions_out=Đăng xuất

acl/lang/zh.auto

@@ -21,6 +21,7 @@ edit_twofactorprov=使用提供方 $1 和ID $2
 edit_twofactorcancel=删除两因素身份验证要求
 edit_twofactornone=尚未设定
 edit_twofactoradd=为用户启用两因素
+edit_locale=语言环境
 edit_logout=不活动注销时间
 edit_mins=分钟
 edit_chars=字母
@@ -85,6 +86,7 @@ acl_rbac=从RBAC获得访问控制设置？
 acl_rbacyes=是（覆盖下面的设置）
 
 acl_uthis=该用户
+acl_locale=可以改locale吗？
 acl_sessions=可以查看和取消登录会话吗？
 acl_cats=可以更改分类吗？
 acl_theme=可以改变个人主题吗？
@@ -163,6 +165,7 @@ sessions_actions=动作..
 sessions_all=所有会议..
 sessions_logouts=同时显示注销的会话。
 sessions_state=州
+sessions_action=行动
 sessions_this=此登录名
 sessions_in=登录
 sessions_out=登出

acl/lang/zh_TW.auto

@@ -19,6 +19,7 @@ edit_twofactorprov=使用提供方 $1 和ID $2
 edit_twofactorcancel=刪除兩因素身份驗證要求
 edit_twofactornone=尚未設定
 edit_twofactoradd=為用戶啟用兩因素
+edit_locale=語言環境
 edit_logout=不活動註銷時間
 edit_mins=分鐘
 edit_chars=字母
@@ -75,6 +76,7 @@ acl_reset=重置為完全訪問權限
 acl_rbac=從RBAC獲得訪問控制設置？
 acl_rbacyes=是（覆蓋下面的設置）
 
+acl_locale=可以改locale嗎？
 acl_switch=可以切換到其他用戶嗎？
 acl_times=可以更改允許的登錄時間嗎？
 acl_pass=可以更改密碼限制嗎？
@@ -141,6 +143,7 @@ sessions_actions=動作..
 sessions_all=所有會議..
 sessions_logouts=還顯示註銷的會話。
 sessions_state=州
+sessions_action=行動
 sessions_this=此登錄名
 sessions_in=登錄
 sessions_out=登出

acl/save_user.cgi

@@ -200,6 +200,8 @@ my $salt = chr(int(rand(26))+65).chr(int(rand(26))+65);
 $user{'name'} = $in{'name'};
 $user{'lang'} = !$access{'lang'} ? $old->{'lang'} :
 		$in{'lang_def'} ? undef : $in{'lang'};
+$user{'locale'} = !$access{'locale'} ? $old->{'locale'} :
+		$in{'locale_def'} ? undef : $in{'locale'};
 if (!$access{'theme'}) {
 	$user{'theme'} = $old->{'theme'};
 	$user{'overlay'} = $old->{'overlay'};

acl/system_info.pl

@@ -51,7 +51,6 @@ if (@logins) {
 				$state = "<font color=orange>$state</font>";
 				}
 			}
-		$main::theme_allow_make_date = 1;
 		my @links;
 		if (&foreign_available("webminlog")) {
 		      push(@links,

apache/apache-lib.pl

@@ -38,7 +38,9 @@ if ($module_name ne 'htaccess') {
 		# Need to build list of supported modules
 		local ($ver, $mods, $fullver) = &httpd_info($httpd);
 		if ($ver) {
-			local @mods = map { "$_/$ver" } &configurable_modules();
+			my @allmods = &available_modules();
+			local @mods = map { "$_/$ver" }
+				          &configurable_modules(\@allmods);
 			foreach my $m (@mods) {
 				if ($m =~ /(\S+)\/(\S+)/) {
 					$httpd_modules{$1} = $2;
@@ -47,10 +49,14 @@ if ($module_name ne 'htaccess') {
 			# Call again now that known modules have been set, as
 			# sometimes there are dependencies due to LoadModule
 			# statements in an IfModule block
-			@mods = map { "$_/$ver" } &configurable_modules();
+			undef(@get_config_cache);
+			@allmods = &available_modules();
+			@mods = map { "$_/$ver" }
+				    &configurable_modules(\@allmods);
 			local %site = ( 'size' => $st[7],
 					'path' => $httpd,
 					'modules' => join(' ', @mods),
+					'allmodules' => join(' ', @allmods),
 					'version' => $ver,
 					'fullversion' => $fullver,
 					'webmin' => &get_webmin_version() );
@@ -72,6 +78,9 @@ if (&read_file($site_file, \%site)) {
 			$httpd_modules{$1} = $2;
 			}
 		}
+	foreach $m (split(/\s+/, $site{'allmodules'})) {
+		$all_httpd_modules{$m} = $site{'version'};
+		}
 	foreach $m (keys %httpd_modules) {
 		if (!-r "$module_root_directory/$m.pl") {
 			delete($httpd_modules{$m});
@@ -1825,46 +1834,46 @@ for(my $i=0; $i<$secs; $i++) {
 return 0;
 }
 
-# configurable_modules()
+# configurable_modules([&all-mods])
 # Returns a list of Apaches that are compiled in or dynamically loaded, and
 # supported by Webmin.
 sub configurable_modules
 {
-local ($ver, $mods) = &httpd_info(&find_httpd());
-local @rv;
-local $m;
+my ($allmods) = @_;
+$allmods ||= [ &available_modules() ];
+return grep { -r "$module_root_directory/$_.pl" } @$allmods;
+}
+
+# available_modules()
+# Returns a list of Apaches that are compiled in or dynamically loaded
+sub available_modules
+{
+my ($ver, $mods) = &httpd_info(&find_httpd());
+my @rv;
 
 # Add compiled-in modules
-foreach $m (@$mods) {
-	if (-r "$module_root_directory/$m.pl") {
-		push(@rv, $m);
-		}
-	}
+push(@rv, @$mods);
 
 # Add dynamically loaded modules
-local $conf = &get_config();
-foreach $l (&find_directive_struct("LoadModule", $conf)) {
-	if ($l->{'words'}->[1] =~ /(mod_\S+)\.(so|dll)/ &&
-	    -r "$module_root_directory/$1.pl") {
+my $conf = &get_config();
+foreach my $l (&find_directive_struct("LoadModule", $conf)) {
+	if ($l->{'words'}->[1] =~ /(mod_\S+)\.(so|dll)/) {
 		push(@rv, $1);
 		}
-	elsif ($l->{'words'}->[1] =~ /libssl\.so/ &&
-	       -r "$module_root_directory/mod_apachessl.pl") {
+	elsif ($l->{'words'}->[1] =~ /libssl\.so/) {
 		push(@rv, "mod_apachessl");
 		}
-	elsif ($l->{'words'}->[1] =~ /lib([^\/\s]+)\.(so|dll)/ &&
-	       -r "$module_root_directory/mod_$1.pl") {
+	elsif ($l->{'words'}->[1] =~ /lib([^\/\s]+)\.(so|dll)/) {
 		push(@rv, "mod_$1");
 		}
 	}
-undef(@get_config_cache);	# Cache is no longer valid
 
 # Add dynamically loaded modules
 if ($config{'apachectl_path'}) {
 	&open_execute_command(APACHE,
 		"$config{'apachectl_path'} -M 2>/dev/null", 1);
 	while(<APACHE>) {
-		if (/(\S+)_module/ && -r "$module_root_directory/mod_${1}.pl") {
+		if (/(\S+)_module/) {
 			push(@rv, "mod_${1}");
 			}
 		}

apache/config-AlmaLinux-7.0-ALL

@@ -1,4 +1,4 @@
-show_list=0
+show_list=1
 httpd_dir=/etc/httpd
 httpd_path=/usr/sbin/httpd
 mime_types=/etc/mime.types

apache/config-CentOS-Stream-Linux-8.0-ALL

@@ -1,9 +1,9 @@
-show_list=0
+show_list=1
 httpd_dir=/etc/httpd
 httpd_path=/usr/sbin/httpd
 mime_types=/etc/mime.types
 start_cmd=systemctl start httpd.service
-apply_cmd=/usr/sbin/apachectl graceful
+apply_cmd=systemctl reload httpd.service
 stop_cmd=systemctl stop httpd.service
 show_order=0
 max_servers=100
@@ -15,5 +15,5 @@ test_apachectl=1
 auto_mods=1
 show_names=0
 allow_virtualmin=0
-pid_file=/etc/httpd/run/httpd.pid
+pid_file=/run/httpd/httpd.pid
 format_config=1

apache/config-CloudLinux-8.0-ALL

@@ -0,0 +1,19 @@
+show_list=1
+httpd_dir=/etc/httpd
+httpd_path=/usr/sbin/httpd
+mime_types=/etc/mime.types
+start_cmd=systemctl start httpd.service
+apply_cmd=systemctl reload httpd.service
+stop_cmd=systemctl stop httpd.service
+show_order=0
+max_servers=100
+test_config=1
+test_manual=0
+apachectl_path=/usr/sbin/apachectl
+test_always=0
+test_apachectl=1
+auto_mods=1
+show_names=0
+allow_virtualmin=0
+pid_file=/run/httpd/httpd.pid
+format_config=1

apache/config-Fedora-Linux-20.00-ALL

@@ -0,0 +1,19 @@
+show_list=1
+httpd_dir=/etc/httpd
+httpd_path=/usr/sbin/httpd
+mime_types=/etc/mime.types
+start_cmd=systemctl start httpd.service
+apply_cmd=systemctl reload httpd.service
+stop_cmd=systemctl stop httpd.service
+show_order=0
+max_servers=100
+test_config=1
+test_manual=0
+apachectl_path=/usr/sbin/apachectl
+test_always=0
+test_apachectl=1
+auto_mods=1
+show_names=0
+allow_virtualmin=0
+pid_file=/run/httpd/httpd.pid
+format_config=1

apache/config-Oracle-Linux-8.0-ALL

@@ -0,0 +1,19 @@
+show_list=1
+httpd_dir=/etc/httpd
+httpd_path=/usr/sbin/httpd
+mime_types=/etc/mime.types
+start_cmd=systemctl start httpd.service
+apply_cmd=systemctl reload httpd.service
+stop_cmd=systemctl stop httpd.service
+show_order=0
+max_servers=100
+test_config=1
+test_manual=0
+apachectl_path=/usr/sbin/apachectl
+test_always=0
+test_apachectl=1
+auto_mods=1
+show_names=0
+allow_virtualmin=0
+pid_file=/run/httpd/httpd.pid
+format_config=1

apache/config-Redhat-Enterprise-Linux-7.0-ALL

@@ -1,4 +1,4 @@
-show_list=0
+show_list=1
 httpd_dir=/etc/httpd
 httpd_path=/usr/sbin/httpd
 mime_types=/etc/mime.types

apache/config-Rocky-Linux-7.0-ALL

@@ -1,4 +1,4 @@
-show_list=0
+show_list=1
 httpd_dir=/etc/httpd
 httpd_path=/usr/sbin/httpd
 mime_types=/etc/mime.types

apache/config-debian-linux-10.0-ALL

@@ -0,0 +1,23 @@
+httpd_dir=/etc/apache2
+httpd_path=/usr/sbin/apache2
+httpd_conf=/etc/apache2/apache2.conf
+mime_types=/etc/mime.types
+start_cmd=systemctl start apache2
+apply_cmd=systemctl reload apache2
+stop_cmd=systemctl stop apache2
+show_order=0
+max_servers=100
+test_config=1
+test_manual=0
+test_always=0
+test_apachectl=1
+virt_file=/etc/apache2/sites-available
+link_dir=/etc/apache2/sites-enabled
+auto_mods=1
+defines_file=/etc/apache2/envvars
+defines_name=APACHE_ARGUMENTS
+apachectl_path=/usr/sbin/apache2ctl
+show_names=0
+allow_virtualmin=0
+format_config=1
+show_list=1

apache/config-freebsd-11.0-ALL

@@ -0,0 +1,19 @@
+show_list=0
+httpd_dir=/usr/local
+httpd_path=/usr/local/sbin/httpd
+apachectl_path=/usr/local/sbin/apachectl
+httpd_conf=/usr/local/etc/apache24/httpd.conf
+mime_types=/usr/local/etc/apache24/mime.types
+srm_conf=/usr/local/etc/apache24/srm.conf
+access_conf=/usr/local/etc/apache24/access.conf
+show_order=0
+max_servers=100
+test_config=1
+test_manual=0
+test_always=0
+test_apachectl=1
+auto_mods=1
+pid_file=/var/run/httpd.pid
+show_names=0
+allow_virtualmin=0
+format_config=1

apache/config-openSUSE-Linux-15.0-ALL

@@ -0,0 +1,23 @@
+show_list=0
+httpd_dir=/srv/www
+httpd_conf=/etc/apache2/httpd.conf
+mime_types=/etc/apache2/mime.types
+httpd_path=/usr/sbin/httpd
+start_cmd=systemctl start apache2
+stop_cmd=systemctl stop apache2
+apply_cmd=systemctl reload apache2
+show_order=0
+max_servers=100
+test_config=1
+test_manual=0
+test_always=0
+test_apachectl=1
+apachectl_path=/usr/sbin/apache2ctl
+virt_file=/etc/apache2/vhosts.d
+pid_file=/run/httpd.pid
+defines_file=/etc/sysconfig/apache2
+defines_name=APACHE_SERVER_FLAGS
+auto_mods=1
+show_names=0
+allow_virtualmin=0
+format_config=1

apache/config-redhat-linux-24.0-ALL

@@ -1,9 +1,9 @@
-show_list=0
+show_list=1
 httpd_dir=/etc/httpd
 httpd_path=/usr/sbin/httpd
 mime_types=/etc/mime.types
 start_cmd=systemctl start httpd.service
-apply_cmd=/usr/sbin/apachectl graceful
+apply_cmd=systemctl reload httpd.service
 stop_cmd=systemctl stop httpd.service
 show_order=0
 max_servers=100
@@ -15,4 +15,5 @@ test_apachectl=1
 auto_mods=1
 show_names=0
 allow_virtualmin=0
+pid_file=/run/httpd/httpd.pid
 format_config=1

apache/config-solaris-11-ALL

@@ -1,11 +1,11 @@
 show_list=0
-httpd_dir=/usr/apache2/2.2
-httpd_conf=/etc/apache2/2.2/httpd.conf
-httpd_path=/usr/apache2/2.2/bin/httpd
-apachectl_path=/usr/apache2/2.2/bin/apachectl
-pid_file=/var/run/apache2/2.2/httpd.pid
-start_cmd=svcadm enable svc:/network/http:apache22
-stop_cmd=svcadm disable svc:/network/http:apache22
+httpd_dir=/usr/apache2/2.4
+httpd_conf=/etc/apache2/2.4/httpd.conf
+httpd_path=/usr/apache2/2.4/bin/httpd
+apachectl_path=/usr/apache2/2.4/bin/apachectl
+pid_file=/var/run/apache2/2.4/httpd.pid
+start_cmd=svcadm enable svc:/network/http:apache24
+stop_cmd=svcadm disable svc:/network/http:apache24
 mime_types=
 srm_conf=
 access_conf=

apache/core.pl

@@ -779,11 +779,23 @@ local(@po, $po, @rv);
 if ($in{'Options_def'}) { return ( [ ] ); }
 @po = ("ExecCGI", "FollowSymLinks", "Includes", "IncludesNOEXEC",
        "Indexes", "MultiViews", "SymLinksIfOwnerMatch");
+my $abscount = 0;
+my $pluscount = 0;
 foreach $po (@po) {
-	if ($in{$po} == 1) { push(@rv, $po); }
-	elsif ($in{$po} == 2) { push(@rv, "+$po"); }
-	elsif ($in{$po} == 3) { push(@rv, "-$po"); }
+	if ($in{$po} == 1) {
+		push(@rv, $po);
+		$abscount++;
+		}
+	elsif ($in{$po} == 2) {
+		push(@rv, "+$po");
+		$pluscount++;
+		}
+	elsif ($in{$po} == 3) {
+		push(@rv, "-$po");
+		$pluscount++;
+		}
 	}
+$abscount && $pluscount && &error($text{'core_eoptionsboth'});
 return @rv ? ( [ join(' ', @rv) ] ) : ( [ "None" ] );
 }
 
@@ -1041,7 +1053,7 @@ sub edit_LimitRequestBody
 {
 return (1, $text{'core_maxbody'},
 	&opt_input($_[0]->{'value'}, "LimitRequestBody", $text{'core_default'}, 8)
-		.$text{'bytes'});
+		.&ui_space(2).$text{'bytes'});
 }
 sub save_LimitRequestBody
 {
@@ -1052,7 +1064,7 @@ sub edit_LimitXMLRequestBody
 {
 return (1, $text{'core_maxxml'},
 	&opt_input($_[0]->{'value'}, "LimitXMLRequestBody",
-		   $text{'core_default'}, 8).$text{'bytes'});
+		   $text{'core_default'}, 8).&ui_space(2).$text{'bytes'});
 }
 sub save_LimitXMLRequestBody
 {

apache/lang/en

@@ -501,6 +501,7 @@ core_actmod=Active modules
 core_option=Option
 core_setdir=Set for directory
 core_merge=Merge with parent
+core_eoptionsboth=Directory options : Active options must be all either Set For Directory or Merged With Parent, but not both
 core_users=Only these users
 core_groups=Only these groups
 core_allusers=All valid users

apache/lang/it

@@ -577,10 +577,10 @@ mod_proxy_netbit=Sottorete (Network/bits)
 mod_proxy_maxfw=Numero massimo di proxy nella catena di richiesta
 mod_proxy_emaxfs=Il Numero massimo di proxy nella catena di richiesta deve essere un intero
 mod_proxy_preserve=Preserva originale l'header Host:
+
 mod_proxy_timeout=Timeout delle richieste proxy in secondi
 mod_proxy_etimeout=Il timeout delle richieste proxy deve essere un numero di secondi
 mod_proxy_via=Setta header Via:
-
 mod_log_agent_default=Default
 mod_log_agent_file=File..
 mod_log_agent_program=Programma..

apache/lang/uk

@@ -566,10 +566,10 @@ mod_proxy_netbit=Мережа/біт
 mod_proxy_maxfw=Максимальна кількість проксі в ланцюжку запитів
 mod_proxy_emaxfs=Максимальна кількість проксі в ланцюжку запитів належний бути цілої числом
 mod_proxy_preserve=Зарезервувати оригінальний вузол: заголовок
+
 mod_proxy_timeout=Час чекання виконання запиту проксі в секундах
 mod_proxy_etimeout=Час чекання виконання запиту проксі повинне бути числом секунд
 mod_proxy_via=Установити через: заголовки
-
 mod_log_agent_default=За замовчуванням
 mod_log_agent_file=Файл..
 mod_log_agent_program=Програма..

apache/lang/zh

@@ -573,10 +573,10 @@ mod_proxy_netbit=网络/位
 mod_proxy_maxfw=请求链中最大的代理数
 mod_proxy_emaxfs=请求链中最大的代理数必须是整数
 mod_proxy_preserve=保持原来的主机：文件头
+
 mod_proxy_timeout=代理请求超时秒数
 mod_proxy_etimeout=代理请求超时必须是一个有效的秒数
 mod_proxy_via=设置通过：头
-
 mod_log_agent_default=默认
 mod_log_agent_file=文件…
 mod_log_agent_program=程序…

apache/lang/zh_TW

@@ -583,10 +583,10 @@ mod_proxy_netbit=網路/位元
 mod_proxy_maxfw=請求鏈中最大的代理數
 mod_proxy_emaxfs=請求鏈中最大的代理數必須是整數
 mod_proxy_preserve=保留原始主機: 檔頭
+
 mod_proxy_timeout=Proxy回應逾時秒數
 mod_proxy_etimeout=Proxy回應逾時秒數必須是個秒數數字
 mod_proxy_via=設定經由: 檔頭
-
 mod_log_agent_default=預設
 mod_log_agent_file=檔案..
 mod_log_agent_program=程式..

apache/mod_proxy.pl

@@ -25,6 +25,7 @@ $rv = [ [ 'ProxyRequests', 0, 13, 'virtual', undef, 11 ],
 	[ 'ProxyMaxForwards', 0, 13, 'virtual', 2.0 ],
 	[ 'ProxyPreserveHost', 0, 13, 'virtual', 2.031 ],
 	[ 'ProxyTimeout', 0, 13, 'virtual', 2.031 ],
+	[ 'ProxyPreserveHost', 0, 13, 'virtual', 2.3 ],
 	[ 'ProxyVia', 0, 13, 'virtual', 2.0 ] ];
 return &make_directives($rv, $_[0], "mod_proxy");
 }
@@ -291,7 +292,16 @@ sub save_ProxyVia
 return &parse_choice("ProxyVia", "");
 }
 
-
+sub edit_ProxyPreserveHost
+{
+return (1, $text{'mod_proxy_preserve'},
+	&choice_input($_[0]->{'value'}, "ProxyPreserveHost", "",
+	      "$text{'yes'},on", "$text{'no'},off", "$text{'default'},"));
+}
+sub save_ProxyPreserveHost
+{
+return &parse_choice("ProxyPreserveHost", "");
+}
 
 1;
 

apache/mod_suexec.pl

@@ -13,6 +13,7 @@ sub edit_SuexecUserGroup
 local $rv;
 $rv .= sprintf "<input type=radio name=SuexecUserGroup_def value=1 %s> %s\n",
 		$_[0] ? "" : "checked", $text{'suexec_none'};
+$rv .= &ui_newline();
 $rv .= sprintf "<input type=radio name=SuexecUserGroup_def value=0 %s>\n",
 		$_[0] ? "checked" : "";
 $rv .= sprintf "%s <input name=SuexecUserGroup_u size=8 value='%s'> %s\n",

apache/show.cgi

@@ -68,8 +68,8 @@ print "<table border><tr><td $cb><pre>\n\n";
 &show_directives($conf, 0);
 print "</pre></td></tr></table>\n";
 print "</td></tr>\n";
-
-if ($in{'virt'} || $in{'file'} || defined($in{'idx'})) {
+if ($access{'types'} eq '*' &&
+   ($in{'virt'} || $in{'file'} || defined($in{'idx'}))) {
 	print "<tr>\n";
 	print "<td><form action=manual_form.cgi>";
 	print "<input type=submit name=these value='$text{'show_these'}'>";

at/config-openSUSE-Linux-15.0-ALL

@@ -0,0 +1,4 @@
+at_style=linux
+at_dir=/var/spool/atjobs
+allow_file=/etc/at.allow
+deny_file=/etc/at.deny

backup-config/backup-config-lib.pl

@@ -159,7 +159,9 @@ $rv .= "<table id='show_backup_destination' cellpadding=1 cellspacing=0>";
 # Local file field
 $rv .= "<tr><td>".&ui_oneradio("$_[0]_mode", 0, undef, $mode == 0)."</td>\n";
 $rv .= "<td>$text{'backup_mode0'}&nbsp;</td><td colspan='3'>".
-	&ui_textbox("$_[0]_file", $mode == 0 ? $path : "", 60).
+	&ui_textbox("$_[0]_file", $mode == 0 ? $path : "", 60, undef, undef,
+	    ($_[2] != 1 && $config{'date_subs'}) ?
+	        'placeholder="/backups/configs-%y-%m-%d-%H-%M-%S.tar.gz"' : undef).
 	" ".&file_chooser_button("$_[0]_file")."</td> </tr>\n";
 
 # FTP file fields

backup-config/config

@@ -1,3 +1,3 @@
-date_subs=0
+date_subs=1
 webmin_subs=0
 apply=1

backup-config/index.cgi

@@ -48,13 +48,12 @@ if (@backups) {
 	print &ui_columns_end();
 	}
 else {
-	print "<b>$text{'index_none'}</b><p>\n";
+	print "<strong>$text{'index_none'}</strong><br>\n";
 	}
 print &ui_link("edit.cgi?new=1", $text{'index_add'});
-print "<p>\n";
+print "\n";
 if ($using_strftime && !$config{'date_subs'}) {
-	print "<font color=#ff0000><b>$text{'index_nostrftime'}",
-	      "</b></font><p>\n";
+	print &ui_alert_box($text{'index_nostrftime'}, 'warn'),"\n";
 	}
 print &ui_tabs_end_tab();
 

backup-config/lang/en

@@ -16,7 +16,7 @@ index_now2=Restore Now
 index_apply=Apply configurations?
 index_test=Just show what will be restored?
 index_jobs=Scheduled Backups
-index_nostrftime=Warning - some backup jobs use % in their filenames, but strftime substitution is not enabled on the Module Config page.
+index_nostrftime=Some backup jobs use % in their filenames, but strftime substitution is not enabled on the Module Config page.
 index_tabsched=Scheduled backups
 index_tabbackup=Backup now
 index_tabrestore=Restore now

bacula-backup/BorderPanel.java

@@ -1 +0,0 @@
-../file/BorderPanel.java

bacula-backup/CbButton.java

@@ -1 +0,0 @@
-../file/CbButton.java

bacula-backup/CbScrollbar.java

@@ -1 +0,0 @@
-../file/CbScrollbar.java